From b03158193f6f864fa56225e2f43cf014d42cbf06 Mon Sep 17 00:00:00 2001
From: Doug Schaefer <doug.schaefer@windriver.com>
Date: Mon, 14 Jul 2003 15:34:57 +0000
Subject: [PATCH] Patch for Bogdan Gheorge: - UI for C/C++ Search

---
 core/org.eclipse.cdt.ui/ChangeLog             |  10 ++
 core/org.eclipse.cdt.ui/plugin.properties     |  10 +-
 core/org.eclipse.cdt.ui/plugin.xml            | 105 ++++++++++++------
 .../cdt/ui/CElementContentProvider.java       |   1 -
 .../eclipse/cdt/ui/IWorkingCopyManager.java   |   6 +-
 .../cdt/ui/wizards/ReferenceBlock.java        |  11 +-
 .../eclipse/cdt/ui/wizards/TabFolderPage.java |   9 +-
 7 files changed, 101 insertions(+), 51 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index ed0095a2d63..8ffdc563d09 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,13 @@
+2003-07-11 Bogdan Gheorghe
+	Added new C/C++ Search menu item.
+	
+	Added:
+	* src/org/eclipse/cdt/internal/ui/search/OpenCSearchPageAction.java
+	
+	Modified:
+	* plugin.properties
+	* plugin.xml
+	
 2003-07-08 John Camelon
 	Updated IScanner, clients & implementations to use IScannerInfo.  
 
diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index 696721737ba..e98d67e8a7c 100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -94,8 +94,9 @@ ToolName.archiver = Archiver
 ToolName.linker = Linker
 ToolName.command = Command Line
 
-#C/C++ Search
+# C/C++ Search
 CSearchPage.label= C/C++ Search
+openCSearchPageAction.label= &C/C++...
 ElementNameSorter.label= &Name
 ElementNameSorter.tooltip= Sort the view by C Element Name
 ParentNameSorter.label= &Parent Name
@@ -103,3 +104,10 @@ ParentNameSorter.tooltip= Sort the view by C Element Parent Name
 PathNameSorter.label= P&ath
 PathNameSorter.tooltip= Sort the view by Resource Path
 
+# Action sets
+CSearchActionSet.label= C/C++ Search
+CSearchActionSet.description= Action set containing search related C/C++ actions
+
+# Menus
+searchMenu.label= Se&arch
+ 
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 5cd156a5904..ef4008fef7c 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -26,9 +26,9 @@
    <extension-point id="CCompletionContributor" name="%completionContributorName"/>
    <extension-point id="CElementFilters" name="%elementFiltersName"/>
 <!-- =========================================================================== -->
-<!-- Extension point: org.eclipse.cdt.ui.textHovers                        -->
-<!-- Purpose: Provide a perspective specific text hovering for CEditor files     -->
 <!-- Extension Implementation: must implement org.eclipse.jface.text.ITextHover  -->
+<!-- Purpose: Provide a perspective specific text hovering for CEditor files     -->
+<!-- Extension point: org.eclipse.cdt.ui.textHovers                        -->
 <!-- =========================================================================== -->
    <extension-point id="textHovers" name="%textHoversName"/>
    <extension-point id="CToolTabGroup" name="C/C++ Tool Configuration Tabs" schema="schema/CToolTabGroup.exsd"/>
@@ -137,8 +137,8 @@
             id="org.eclipse.cdt.ui.MakeView">
       </view>
    </extension>
-<!-- For C Wizards -->
 <!-- The wizards -->
+<!-- For C Wizards -->
    <extension
          point="org.eclipse.ui.newWizards">
       <category
@@ -316,12 +316,12 @@
             class="org.eclipse.cdt.internal.ui.preferences.BuildConsolePreferencePage"
             id="org.eclipse.cdt.ui.preferneces.CBuildConsolePreferernces">
       </page>
-      <page 
+      <page
             name="%todoTaskPrefName"
-	    id = "org.eclipse.cdt.ui.preferences.TodoTaskPreferencePage"
-	    class="org.eclipse.cdt.internal.ui.preferences.TodoTaskPreferencePage"
-	    category= "org.eclipse.cdt.ui.preferences.CPluginPreferencePage">
-      </page>		
+            category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
+            class="org.eclipse.cdt.internal.ui.preferences.TodoTaskPreferencePage"
+            id="org.eclipse.cdt.ui.preferences.TodoTaskPreferencePage">
+      </page>
    </extension>
    <extension
          point="org.eclipse.ui.propertyPages">
@@ -346,13 +346,16 @@
                value="org.eclipse.cdt.core.managedBuildNature">
          </filter>
       </page>
-     <page 
-           name="%todoPageName"
-  	   id="org.eclipse.cdt.ui.propertyPages.TodoTaskPropertyPage"
-           objectClass="org.eclipse.core.resources.IProject"
-           class="org.eclipse.cdt.internal.ui.preferences.TodoTaskPropertyPage">
-           <filter name="nature" value="org.eclipse.cdt.core.cnature"/>
-     </page>
+      <page
+            objectClass="org.eclipse.core.resources.IProject"
+            name="%todoPageName"
+            class="org.eclipse.cdt.internal.ui.preferences.TodoTaskPropertyPage"
+            id="org.eclipse.cdt.ui.propertyPages.TodoTaskPropertyPage">
+         <filter
+               name="nature"
+               value="org.eclipse.cdt.core.cnature">
+         </filter>
+      </page>
    </extension>
    <extension
          point="org.eclipse.ui.editorActions">
@@ -526,7 +529,6 @@
             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
       </keyBinding>
    </extension>
-   
 <!--
    <extension
          point="org.eclipse.ui.views">
@@ -958,27 +960,62 @@
       <sorter
             pageId="org.eclipse.cdt.ui.CSearchPage"
             label="%ElementNameSorter.label"
-            class="org.eclipse.cdt.internal.ui.search.ElementNameSorter"
-            tooltip="%ElementNameSorter.tooltip"
             icon="icons/full/clcl16/search_sortmatch.gif"
-            id="org.eclipse.search.internal.ui.ElementNameSorter" >
+            tooltip="%ElementNameSorter.tooltip"
+            class="org.eclipse.cdt.internal.ui.search.ElementNameSorter"
+            id="org.eclipse.search.internal.ui.ElementNameSorter">
       </sorter>
       <sorter
-		id="org.eclipse.search.internal.ui.ParentNameSorter"
-		pageId="org.eclipse.cdt.ui.CSearchPage"
-		label="%ParentNameSorter.label"
-		tooltip="%ParentNameSorter.tooltip"
-		icon="icons/full/clcl16/search_sortmatch.gif"
-		class="org.eclipse.cdt.internal.ui.search.ParentNameSorter">
-	</sorter>
-	<sorter
-		id="org.eclipse.search.internal.ui.PathNameSorter"
-		pageId="org.eclipse.cdt.ui.JavaSearchPage"
-		label="%PathNameSorter.label"
-		tooltip="%PathNameSorter.tooltip"
-		icon="icons/full/clcl16/search_sortmatch.gif"
-		class="org.eclipse.cdt.internal.ui.search.PathNameSorter">
-	</sorter>
+            pageId="org.eclipse.cdt.ui.CSearchPage"
+            label="%ParentNameSorter.label"
+            icon="icons/full/clcl16/search_sortmatch.gif"
+            tooltip="%ParentNameSorter.tooltip"
+            class="org.eclipse.cdt.internal.ui.search.ParentNameSorter"
+            id="org.eclipse.search.internal.ui.ParentNameSorter">
+      </sorter>
+      <sorter
+            pageId="org.eclipse.cdt.ui.JavaSearchPage"
+            label="%PathNameSorter.label"
+            icon="icons/full/clcl16/search_sortmatch.gif"
+            tooltip="%PathNameSorter.tooltip"
+            class="org.eclipse.cdt.internal.ui.search.PathNameSorter"
+            id="org.eclipse.search.internal.ui.PathNameSorter">
+      </sorter>
+   </extension>
+   <extension
+         point="org.eclipse.ui.actionSets">
+      <actionSet
+            label="%CSearchActionSet.label"
+            description="%CSearchActionSet.description"
+            visible="false"
+            id="org.eclipse.cdt.ui.SearchActionSet">
+         <action
+               label="%openCSearchPageAction.label"
+               icon="icons/full/obj16/csearch_obj.gif"
+               class="org.eclipse.cdt.internal.ui.search.OpenCSearchPageAction"
+               menubarPath="org.eclipse.search.menu/dialogGroup"
+               id="org.eclipse.cdt.ui.actions.OpenCSearchPage">
+         </action>
+         <menu
+               label="%searchMenu.label"
+               id="org.eclipse.search.menu">
+         </menu>
+      </actionSet>
+   </extension>
+   <extension
+         point="org.eclipse.ui.actionSetPartAssociations">
+      <actionSetPartAssociation
+            targetID="org.eclipse.cdt.ui.SearchActionSet">
+         <part
+               id="org.eclipse.cdt.ui.CView">
+         </part>
+         <part
+               id="org.eclipse.cdt.ui.editor.CEditor">
+         </part>
+         <part
+               id="org.eclipse.search.SearchResultView">
+         </part>
+      </actionSetPartAssociation>
    </extension>
 
 </plugin>
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java
index b539c96526a..9c87b4afc2f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java
@@ -11,7 +11,6 @@ import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.model.ElementChangedEvent;
 import org.eclipse.cdt.core.model.IArchive;
 import org.eclipse.cdt.core.model.IBinary;
-import org.eclipse.cdt.core.model.ICContainer;
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.ICElementDelta;
 import org.eclipse.cdt.core.model.ICModel;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IWorkingCopyManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IWorkingCopyManager.java
index c3588c44f58..bd7d35dc6a0 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IWorkingCopyManager.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IWorkingCopyManager.java
@@ -10,11 +10,9 @@
  *******************************************************************************/
 package org.eclipse.cdt.ui;
 
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.ui.IEditorInput;
-
 import org.eclipse.cdt.core.model.ITranslationUnit;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.ui.IEditorInput;
 
 /**
  * Interface for accessing working copies of <code>ITranslationUnit</code>
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ReferenceBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ReferenceBlock.java
index 2236d5a79a3..9f9e4a4f831 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ReferenceBlock.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ReferenceBlock.java
@@ -7,6 +7,11 @@ package org.eclipse.cdt.ui.wizards;
 
 import java.util.ArrayList;
 
+import org.eclipse.cdt.core.model.CoreModel;
+import org.eclipse.cdt.internal.ui.CPluginImages;
+import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.cdt.utils.ui.controls.ControlFactory;
+import org.eclipse.cdt.utils.ui.swt.IValidation;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
 import org.eclipse.core.resources.IWorkspace;
@@ -28,12 +33,6 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.model.WorkbenchContentProvider;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
 
-import org.eclipse.cdt.core.model.CoreModel;
-import org.eclipse.cdt.internal.ui.CPluginImages;
-import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.cdt.utils.ui.controls.ControlFactory;
-import org.eclipse.cdt.utils.ui.swt.IValidation;
-
 public class ReferenceBlock implements IWizardTab {
 
 	private static final String PREFIX = "ReferenceBlock"; // $NON-NLS-1$
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/TabFolderPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/TabFolderPage.java
index e0c46fc79e8..cc98911ef94 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/TabFolderPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/TabFolderPage.java
@@ -5,16 +5,15 @@ package org.eclipse.cdt.ui.wizards;
  * All Rights Reserved.
  */
  
+import org.eclipse.cdt.internal.ui.wizards.swt.MGridData;
+import org.eclipse.cdt.internal.ui.wizards.swt.MGridLayout;
+import org.eclipse.cdt.utils.ui.controls.TabFolderLayout;
+import org.eclipse.cdt.utils.ui.swt.IValidation;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.TabFolder;
 
-import org.eclipse.cdt.internal.ui.wizards.swt.MGridData;
-import org.eclipse.cdt.internal.ui.wizards.swt.MGridLayout;
-import org.eclipse.cdt.utils.ui.swt.IValidation;
-import org.eclipse.cdt.utils.ui.controls.TabFolderLayout;
-
 /**
  * Standard main page for a wizard that is creates a project resource.
  * <p>