Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[cdt-patch] Partially address bug43130

bug43130- Selected Resources is disabled but selected.

This is an eclipse framework bug, so all we can do is handle the case when 
it happens.

ui :
-modified CSearchPage.performAction()

no tests with this patch, its all UI.
(automated tests still pass on windows)

-Andrew

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/ChangeLog,v
retrieving revision 1.193
diff -u -r1.193 ChangeLog
--- ChangeLog	26 Sep 2003 15:25:45 -0000	1.193
+++ ChangeLog	26 Sep 2003 17:34:06 -0000
@@ -1,3 +1,8 @@
+2003-09-26 Andrew Niefer
+	-bug43130 - Selected Resources is disabled but selected
+		-this is a core bug, if this happens, use workspace scope instead.
+		* src/org/eclipse/cdt/internal/ui/search/CSearchPage.java
+
 2003-09-25 Andrew Niefer
 	-bug43129 - Search: Cannot search for definitions of global variables
 		- modify UI to allow selecting Definitions for more items
Index: src/org/eclipse/cdt/internal/ui/search/CSearchPage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java,v
retrieving revision 1.11
diff -u -r1.11 CSearchPage.java
--- src/org/eclipse/cdt/internal/ui/search/CSearchPage.java	26 Sep 2003 14:58:08 -0000	1.11
+++ src/org/eclipse/cdt/internal/ui/search/CSearchPage.java	26 Sep 2003 17:34:07 -0000
@@ -86,13 +86,17 @@
 		String scopeDescription = ""; //$NON-NLS-1$
 		
 		switch( getContainer().getSelectedScope() ) {
+
+			case ISearchPageContainer.SELECTION_SCOPE:
+				if( fStructuredSelection != null && fStructuredSelection.iterator().hasNext() ){
+					scopeDescription = CSearchMessages.getString("SelectionScope"); //$NON-NLS-1$
+					scope = CSearchScopeFactory.getInstance().createCSearchScope(fStructuredSelection);
+					break;
+				}
+				/* else fall through to workspace scope */
 			case ISearchPageContainer.WORKSPACE_SCOPE:
 				scopeDescription = CSearchMessages.getString("WorkspaceScope"); //$NON-NLS-1$
 				scope = SearchEngine.createWorkspaceScope();
-				break;
-			case ISearchPageContainer.SELECTION_SCOPE:
-				scopeDescription = CSearchMessages.getString("SelectionScope"); //$NON-NLS-1$
-				scope = CSearchScopeFactory.getInstance().createCSearchScope(fStructuredSelection);
 				break;
 			case ISearchPageContainer.WORKING_SET_SCOPE:
 				IWorkingSet[] workingSets= getContainer().getSelectedWorkingSets();

Back to the top