[cdt-patch] extensions and search

["Alain Magloire" <alain@xxxxxxx>]

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/ChangeLog,v
retrieving revision 1.51
diff -u -r1.51 ChangeLog
--- ChangeLog	10 Jan 2003 18:38:55 -0000	1.51
+++ ChangeLog	23 Jan 2003 16:48:09 -0000
@@ -1,3 +1,10 @@
+2003-01-21 Alain Magloire
+
+	* src/org/eclipse/cdt/internal/ui/cview/CViewSorter.java (category):
+	Use get{Header,Source}Extensions().
+	* src/org/eclipse/cdt/internal/ui/editor/SearchForReferences.java (run):
+	Use getTranslationUnitExtensions().
+
 2003-01-10 Alain Magloire
 
 	Bug 28994
Index: src/org/eclipse/cdt/internal/ui/cview/CViewSorter.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewSorter.java,v
retrieving revision 1.2
diff -u -r1.2 CViewSorter.java
--- src/org/eclipse/cdt/internal/ui/cview/CViewSorter.java	18 Nov 2002 15:50:37 -0000	1.2
+++ src/org/eclipse/cdt/internal/ui/cview/CViewSorter.java	23 Jan 2003 16:48:09 -0000
@@ -6,6 +6,7 @@
  */
  
 import org.eclipse.cdt.core.model.CModelException;
+import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.model.IArchive;
 import org.eclipse.cdt.core.model.IArchiveContainer;
 import org.eclipse.cdt.core.model.IBinaryContainer;
@@ -56,12 +57,18 @@
 			if (res != null) {
 				String ext = res.getFileExtension();
 				if (ext != null) {
-					if (ext.equals("h") || ext.equals("hh")) {
-						return 42;
-					}
-					if (ext.equals("c") || ext.equals("C") || ext.equals("cc") || ext.equals("cpp")) {
-						return 44;
+					String[] headers = CoreModel.getDefault().getHeaderExtensions();
+					for (int i = 0; i < headers.length; i++) {
+						if (ext.equals(headers[i])) {
+							return 42;
+						}
 					}
+					String[] sources = CoreModel.getDefault().getSourceExtensions();
+					for (int i = 0; i < sources.length; i++) {
+						if (ext.equals(sources[i])) {
+							return 44;
+						}
+					}					
 					return 48;
 				}
 				return 49;
Index: src/org/eclipse/cdt/internal/ui/editor/SearchForReferencesAction.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SearchForReferencesAction.java,v
retrieving revision 1.2
diff -u -r1.2 SearchForReferencesAction.java
--- src/org/eclipse/cdt/internal/ui/editor/SearchForReferencesAction.java	29 Oct 2002 21:40:58 -0000	1.2
+++ src/org/eclipse/cdt/internal/ui/editor/SearchForReferencesAction.java	23 Jan 2003 16:48:09 -0000
@@ -5,6 +5,7 @@
  * All Rights Reserved.
  */
 
+import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.internal.ui.CPluginImages;
 import org.eclipse.cdt.ui.CUIPlugin;
@@ -85,10 +86,15 @@
 			//TextSearchEngine engine = new TextSearchEngine();
 			TextSearchScope scope= TextSearchScope.newWorkspaceScope();
 			// Add the extensions from the C editor definition for now
-			scope.addExtension("c");
-			scope.addExtension("h");
-			scope.addExtension("cc");
-			scope.addExtension("hh");
+			// FIXME: For C/C++ not all files rely on extension to be C++ for <cstring>
+			String[] cexts = CoreModel.getDefault().getTranslationUnitExtensions();
+			for (int i = 0; i < cexts.length; i++) {
+				scope.addExtension("*." + cexts[i]);
+			}
+//			scope.addExtension("*.c");
+//			scope.addExtension("*.h");
+//			scope.addExtension("*.cc");
+//			scope.addExtension("*.hh");
 			
 			TextSearchOperation op= new TextSearchOperation(
 				CUIPlugin.getWorkspace(),