Implemented feature #18809
diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIPluginResources.properties b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIPluginResources.properties
index e9768fa..81c9663 100644
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIPluginResources.properties
+++ b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIPluginResources.properties
@@ -270,7 +270,7 @@
SearchPage.options.myComputerSettings = Settings...
SearchPage.options.fullModeCheck = Show results in extended form
SearchPage.options.bookmarkCheck = Search bookmarked sites
-SearchPage.options.discoveryCheck = Search sites in "Places to Visit" folder
+SearchPage.options.discoveryCheck = Search sites in "Sites to Visit" folder
SearchPage.options.filterCheck = Only include features applicable to this environment
MyComputerSearchDialog.label = Select the volumes that should be searched:
diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/search/SearchObject.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/search/SearchObject.java
index 8851532..b41c21c 100644
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/search/SearchObject.java
+++ b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/search/SearchObject.java
@@ -271,6 +271,7 @@
public void computeSearchSources(ArrayList sources) {
addMyComputerSites(sources);
+ addDiscoverySites(sources);
addBookmarks(sources);
}
@@ -369,4 +370,14 @@
result.add(bookmark);
}
}
+ private void addDiscoverySites(ArrayList result) {
+ if (getSearchDiscovery() == false)
+ return;
+ DiscoveryFolder dfolder = new DiscoveryFolder();
+ Object [] children = dfolder.getChildren(dfolder);
+ for (int i=0; i<children.length; i++) {
+ SiteBookmark bookmark = (SiteBookmark)children[i];
+ result.add(bookmark);
+ }
+ }
}
\ No newline at end of file
