Corrected actionset-part associations for refactor, debugging, analysis, and comment/uncomment actions

2 files changed, 116 insertions, 94 deletions

diff --git a/org.eclipse.photran.ui.vpg/plugin.xml b/org.eclipse.photran.ui.vpg/plugin.xml
index 32db9412..4d175df6 100644
--- a/org.eclipse.photran.ui.vpg/plugin.xml
+++ b/org.eclipse.photran.ui.vpg/plugin.xml
@@ -1,29 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.2"?>
 <plugin>
+   <!--=========================================-->
+   <!-- Fortran-specific project property pages -->
+   <!--=========================================-->
+   <extension
+         point="org.eclipse.ui.propertyPages">
+      <page
+            objectClass="org.eclipse.core.resources.IProject"
+            adaptable="true"
+            name="Analysis/Refactoring"
+            class="org.eclipse.photran.internal.ui.properties.SearchPathsPropertyPage"
+            id="org.eclipse.photran.ui.SearchPathsPropertyPage"
+            category="org.eclipse.photran.ui.newui.Page_head_general">
+         <!--filter
+               name="nature"
+               value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
+         </filter-->
+      </page>
+   </extension>
 
    <!-- Commands, key bindings, and popup menu entries
-   
-        - Open Declaration (F3 or Ctrl+F3)
         
         Each command should have its ID declared as a constant in AbstractFortranEditor, and
         it must be set up in AbstractFortranEditor#createActions().
         
         For menubarPath, see class ITextEditorActionConstants -->
+        
+   <!--  win32:  M1=CTRL,    M2=SHIFT, M3=ALT, M4=-
+         carbon: M1=COMMAND, M2=SHIFT, M3=ALT, M4=CTRL -->
 
-   <extension point="org.eclipse.ui.popupMenus">
-	  <viewerContribution 
-	        targetID="#FortranEditorContextMenu" 
-	        id="org.eclipse.photran.ui.NavigationContribution">
-	     <action
-            class="org.eclipse.photran.internal.ui.actions.OpenDeclaration"
-            definitionId="org.eclipse.photran.ui.OpenDeclarationCommand"
-            id="org.eclipse.photran.ui.OpenDeclarationMenuAction"
-            label="&amp;Open Declaration"
-            menubarPath="group.open"/>
-	  </viewerContribution>
-   </extension>
-
+   <!--==================================-->
+   <!-- Open Declaration (F3 or Ctrl+F3) -->
+   <!--==================================-->
    <extension
          point="org.eclipse.ui.commands">
       <category
@@ -38,7 +47,6 @@
             name="Open Declaration">
       </command>
    </extension>
-
    <extension
             point="org.eclipse.ui.bindings">
       <!--  win32:  M1=CTRL,    M2=SHIFT, M3=ALT, M4=-
@@ -54,12 +62,11 @@
             contextId="org.eclipse.photran.ui.FortranEditorContext"
             commandId="org.eclipse.photran.ui.OpenDeclarationCommand"/>
    </extension>
-
    <extension point="org.eclipse.ui.actionSets">
       <actionSet
             label="Fortran Analysis Actions"
             description="Fortran Analysis Actions"
-            visible="true"
+            visible="false"
             id="org.eclipse.photran.ui.AnalysisActionSet">
          <action
                label="&amp;Open Declaration"
@@ -69,34 +76,48 @@
                id="org.eclipse.photran.ui.OpenDeclarationAction"/>
       </actionSet>
    </extension>
-
-   <!--=========================================-->
-   <!-- Fortran-specific project property pages -->
-   <!--=========================================-->
-   <extension
-         point="org.eclipse.ui.propertyPages">
-      <page
-            objectClass="org.eclipse.core.resources.IProject"
-            adaptable="true"
-            name="Analysis/Refactoring"
-            class="org.eclipse.photran.internal.ui.properties.SearchPathsPropertyPage"
-            id="org.eclipse.photran.ui.SearchPathsPropertyPage"
-            category="org.eclipse.photran.ui.newui.Page_head_general">
-         <!--filter
-               name="nature"
-               value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
-         </filter-->
-      </page>
+   <extension point="org.eclipse.ui.popupMenus">
+	  <viewerContribution 
+	        targetID="#FortranEditorContextMenu" 
+	        id="org.eclipse.photran.ui.NavigationContribution">
+	     <action
+            class="org.eclipse.photran.internal.ui.actions.OpenDeclaration"
+            definitionId="org.eclipse.photran.ui.OpenDeclarationCommand"
+            id="org.eclipse.photran.ui.OpenDeclarationMenuAction"
+            label="&amp;Open Declaration"
+            menubarPath="group.open"/>
+	  </viewerContribution>
    </extension>
 
-   <!--============================-->
-   <!-- Actions for debugging only -->
-   <!--============================-->
+   <!--=======================================-->
+   <!-- Debugging Actions in Refactoring Menu -->
+   <!--=======================================-->
+   <!--extension
+         point="org.eclipse.ui.commands">
+      <category
+            name="Fortran Refactoring Debugging Commands"
+            id="org.eclipse.photran.ui.DebuggingCategory">
+      </category>
+      <command
+            name="Select Enclosing Scope"
+            categoryId="org.eclipse.photran.ui.DebuggingCategory"
+            id="org.eclipse.photran.ui.SelectEnclosingScopeCommand">
+      </command>
+   </extension>
+   <extension
+         point="org.eclipse.ui.bindings">
+     <key
+            sequence="M3+M2+M1+D"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+            contextId="org.eclipse.photran.ui.FortranEditorContext"
+            commandId="org.eclipse.photran.ui.SelectEnclosingScopeCommand"
+     />
+   </extension-->
    <extension point="org.eclipse.ui.actionSets">
       <actionSet
             label="Fortran Debug Actions"
             description="Fortran Debug Actions"
-            visible="true"
+            visible="false"
             id="org.eclipse.photran.ui.DebugActionSet">
          <menu
                label="Refac&amp;tor"
@@ -115,6 +136,7 @@
                label="Select Enclosing &amp;Scope"
                class="org.eclipse.photran.internal.ui.actions.SelectEnclosingScope"
                menubarPath="org.eclipse.jdt.ui.refactoring.menu/org.eclipse.photran.ui.AnalysisDebuggingMenu/debugging"
+               definitionId="org.eclipse.photran.ui.SelectEnclosingScopeCommand"
                id="org.eclipse.photran.ui.FindEnclosingScopeAction"/>
          <action
                label="Find All &amp;Declarations in Scope"
@@ -133,47 +155,10 @@
                menubarPath="org.eclipse.jdt.ui.refactoring.menu/org.eclipse.photran.ui.AnalysisDebuggingMenu/debugging"/>
       </actionSet>
    </extension>
-
-
-
-
-
-
-   <!-- Fortran editor popup menu -->
-   <extension point="org.eclipse.ui.popupMenus">
-      <viewerContribution 
-            targetID="#FortranEditorContextMenu" 
-            id="org.eclipse.photran.refactoring.refactoringEditorContribution">
-         <menu
-               id="org.eclipse.photran.ui.RefactoringMenu"
-               label="Refac&amp;tor"
-               path="group.reorganize">
-            <separator name="refactorings"/>
-         </menu>
-         <!--action 
-               label="E&amp;xtract Procedure..." 
-               class="org.eclipse.photran.internal.refactoring.ui.ExtractProcedureAction" 
-               menubarPath="org.eclipse.photran.ui.RefactoringMenu/refactorings" 
-               id="org.eclipse.photran.ui.ExtractProcedureRefactoringAction"/-->
-         <!--action 
-               label="Extract &amp;Local Variable..." 
-               class="org.eclipse.photran.internal.refactoring.ui.ExtractLocalVariableAction" 
-               menubarPath="org.eclipse.photran.ui.RefactoringMenu/refactorings" 
-               id="org.eclipse.photran.ui.ExtractLocalVariableRefactoringAction"/-->
-         <action 
-               label="&amp;Introduce Implicit None" 
-               class="org.eclipse.photran.internal.refactoring.ui.IntroImplicitNoneAction" 
-               menubarPath="org.eclipse.photran.ui.RefactoringMenu/refactorings" 
-               id="org.eclipse.photran.ui.IntroImplicitNoneRefactoringAction"/>
-         <action 
-               label="&amp;Rename..." 
-               class="org.eclipse.photran.internal.refactoring.ui.RenameAction" 
-               menubarPath="org.eclipse.photran.ui.RefactoringMenu/refactorings" 
-               id="org.eclipse.photran.ui.RenameRefactoringAction"/>
-      </viewerContribution>
-   </extension>
-
-   <!-- Commands and keybindings -->
+   
+   <!--==============-->
+   <!-- Refactorings -->
+   <!--==============-->
    <extension
          point="org.eclipse.ui.commands">
       <category
@@ -201,8 +186,6 @@
             id="org.eclipse.photran.ui.RenameRefactoringCommand">
       </command>
    </extension>
-   <!--  win32:  M1=CTRL,    M2=SHIFT, M3=ALT, M4=-
-         carbon: M1=COMMAND, M2=SHIFT, M3=ALT, M4=CTRL -->
    <extension
          point="org.eclipse.ui.bindings">
      <!--key
@@ -230,8 +213,6 @@
             commandId="org.eclipse.photran.ui.RenameRefactoringCommand"
      />
    </extension>
-   
-   <!-- Refactoring menu in menu bar -->
    <extension point="org.eclipse.ui.actionSets">
       <actionSet
             label="Fortran Refactorings"
@@ -271,15 +252,57 @@
                menubarPath="org.eclipse.jdt.ui.refactoring.menu/reorgGroup"
                id="org.eclipse.photran.ui.RenameRefactoringAction"/>
       </actionSet>
-   </extension> 
+   </extension>
+   <extension point="org.eclipse.ui.popupMenus">
+      <viewerContribution 
+            targetID="#FortranEditorContextMenu" 
+            id="org.eclipse.photran.refactoring.refactoringEditorContribution">
+         <menu
+               id="org.eclipse.photran.ui.RefactoringMenu"
+               label="Refac&amp;tor"
+               path="group.reorganize">
+            <separator name="refactorings"/>
+         </menu>
+         <!--action 
+               label="E&amp;xtract Procedure..." 
+               class="org.eclipse.photran.internal.refactoring.ui.ExtractProcedureAction" 
+               menubarPath="org.eclipse.photran.ui.RefactoringMenu/refactorings" 
+               id="org.eclipse.photran.ui.ExtractProcedureRefactoringAction"/-->
+         <!--action 
+               label="Extract &amp;Local Variable..." 
+               class="org.eclipse.photran.internal.refactoring.ui.ExtractLocalVariableAction" 
+               menubarPath="org.eclipse.photran.ui.RefactoringMenu/refactorings" 
+               id="org.eclipse.photran.ui.ExtractLocalVariableRefactoringAction"/-->
+         <action 
+               label="&amp;Introduce Implicit None" 
+               class="org.eclipse.photran.internal.refactoring.ui.IntroImplicitNoneAction" 
+               menubarPath="org.eclipse.photran.ui.RefactoringMenu/refactorings" 
+               id="org.eclipse.photran.ui.IntroImplicitNoneRefactoringAction"/>
+         <action 
+               label="&amp;Rename..." 
+               class="org.eclipse.photran.internal.refactoring.ui.RenameAction" 
+               menubarPath="org.eclipse.photran.ui.RefactoringMenu/refactorings" 
+               id="org.eclipse.photran.ui.RenameRefactoringAction"/>
+      </viewerContribution>
+   </extension>
+    
    <!--extension
          point="org.eclipse.ui.perspectiveExtensions">
       <perspectiveExtension targetID="org.eclipse.photran.ui.FortranPerspective">
          <actionSet id="org.eclipse.photran.ui.RefactoringActionSet"/>
       </perspectiveExtension>
    </extension-->
+   
    <extension
          point="org.eclipse.ui.actionSetPartAssociations">
+      <actionSetPartAssociation targetID="org.eclipse.photran.ui.AnalysisActionSet">
+         <part id="org.eclipse.photran.ui.FreeFormFortranEditor"/>
+         <part id="org.eclipse.photran.ui.FixedFormFortranEditor"/>
+      </actionSetPartAssociation>
+      <actionSetPartAssociation targetID="org.eclipse.photran.ui.DebugActionSet">
+         <part id="org.eclipse.photran.ui.FreeFormFortranEditor"/>
+         <part id="org.eclipse.photran.ui.FixedFormFortranEditor"/>
+      </actionSetPartAssociation>
       <actionSetPartAssociation targetID="org.eclipse.photran.ui.RefactoringActionSet">
          <part id="org.eclipse.photran.ui.FreeFormFortranEditor"/>
          <!--part id="org.eclipse.photran.ui.FixedFormFortranEditor"/-->
diff --git a/org.eclipse.photran.ui/plugin.xml b/org.eclipse.photran.ui/plugin.xml
index ac3c5541..bd0d766f 100644
--- a/org.eclipse.photran.ui/plugin.xml
+++ b/org.eclipse.photran.ui/plugin.xml
@@ -89,7 +89,7 @@
       <actionSet
             label="Comment/Uncomment"
             description="Comment/Uncomment"
-            visible="true"
+            visible="false"
             id="org.eclipse.photran.ui.CommentUncomment">
 	     <action 
 	           label="Comment/Uncomment" 
@@ -102,11 +102,10 @@
    </extension>
    <extension
          point="org.eclipse.ui.actionSetPartAssociations">
-      <actionSetPartAssociation
-            targetID="org.eclipse.photran.ui.CommentUncomment">
-         <part id="org.eclipse.photran.ui.editor.FreeFormFortranEditor"/>
-         <part id="org.eclipse.photran.ui.editor.FixedFormFortranEditor"/>
-      </actionSetPartAssociation>      
+      <actionSetPartAssociation targetID="org.eclipse.photran.ui.CommentUncomment">
+         <part id="org.eclipse.photran.ui.FreeFormFortranEditor"/>
+         <part id="org.eclipse.photran.ui.FixedFormFortranEditor"/>
+      </actionSetPartAssociation>
    </extension>
    <extension
             point="org.eclipse.ui.bindings">
@@ -163,8 +162,8 @@
          point="org.eclipse.ui.actionSetPartAssociations">
       <actionSetPartAssociation
             targetID="org.eclipse.ui.edit.text.actionSet.annotationNavigation">
-         <part id="org.eclipse.photran.ui.editor.FreeFormFortranEditor"/>
-         <part id="org.eclipse.photran.ui.editor.FixedFormFortranEditor"/>
+         <part id="org.eclipse.photran.ui.FreeFormFortranEditor"/>
+         <part id="org.eclipse.photran.ui.FixedFormFortranEditor"/>
       </actionSetPartAssociation>      
    </extension>