Bugzilla 260907 (GUI) - Refactoring
diff --git a/plugins/org.eclipse.tigerstripe.workbench.ui.base/plugin.xml b/plugins/org.eclipse.tigerstripe.workbench.ui.base/plugin.xml
index 80cfe4e..9725186 100644
--- a/plugins/org.eclipse.tigerstripe.workbench.ui.base/plugin.xml
+++ b/plugins/org.eclipse.tigerstripe.workbench.ui.base/plugin.xml
@@ -435,282 +435,6 @@
          </factory>
          </extension>
   <extension
-        point="org.eclipse.core.expressions.definitions">
-     <definition
-           id="org.eclipse.tigerstripe.workbench.ui.base.TSProjectSelected">
-        <iterate
-              ifEmpty="false">
-           <adapt
-                 type="org.eclipse.core.resources.IResource">
-              <test
-                    property="org.eclipse.core.resources.projectNature"
-                    value="org.eclipse.tigerstripe.workbench.base.tigerstripeProject">
-              </test>
-           </adapt>
-        </iterate>
-     </definition>
-     <definition
-           id="org.eclipse.tigerstripe.workbench.ui.base.TSEditorsActive">
-        <or>
-           <with
-                 variable="activeEditorId">
-              <equals
-                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.entityEditor">
-              </equals>
-           </with>
- 
-           <with
-                 variable="activeEditorId">
-              <equals
-                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.exceptionEditor">
-              </equals>
-           </with>
-
-           <with
-                 variable="activeEditorId">
-              <equals
-                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.queryEditor">
-              </equals>
-           </with>
-
-           <with
-                 variable="activeEditorId">
-              <equals
-                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.eventEditor">
-              </equals>
-           </with>
-
-           <with
-                 variable="activeEditorId">
-              <equals
-                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.datatypeEditor">
-              </equals>
-           </with>
-
-           <with
-                 variable="activeEditorId">
-              <equals
-                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.sessionEditor">
-              </equals>
-           </with>
-
-           <with
-                 variable="activeEditorId">
-              <equals
-                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.associationEditor">
-              </equals>
-           </with>
-
-           <with
-                 variable="activeEditorId">
-              <equals
-                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.associationClassEditor">
-              </equals>
-           </with>
-
-           <with
-                 variable="activeEditorId">
-              <equals
-                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.dependencyEditor">
-              </equals>
-           </with>
-           <with
-                 variable="activeEditorId">
-              <equals
-                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.enumEditor">
-              </equals>
-           </with>
-           <with
-                 variable="activeEditorId">
-              <equals
-                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.updateProcedureEditor">
-              </equals>
-           </with>
-           <with
-                 variable="activeEditorId">
-              <equals
-                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.packageEditor">
-              </equals>
-           </with>
-           <with
-                 variable="activeEditorId">
-              <equals
-                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.descriptorEditor">
-              </equals>
-           </with>
-           <with
-                 variable="activeEditorId">
-              <equals
-                    value="org.eclipse.tigerstripe.workbench.ui.visualeditor.diagram.part.TigerstripeDiagramEditorID">
-              </equals>
-           </with>
-           <with
-                 variable="activeEditorId">
-              <equals
-                    value="org.eclipse.tigerstripe.workbench.ui.instancediagram.diagram.part.InstanceDiagramEditorID">
-              </equals>
-           </with>
-        </or>
-        
-     </definition>
-     <definition
-           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.entity">
-        <iterate
-              ifEmpty="false">
-           <adapt
-                 type="org.eclipse.core.resources.IResource">
-              <test
-                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.entityEnabled"
-                    value="true">
-              </test>
-           </adapt>
-        </iterate>
-     </definition>
-     <definition
-           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.datatype">
-        <iterate
-              ifEmpty="false">
-           <adapt
-                 type="org.eclipse.core.resources.IResource">
-              <test
-                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.datatypeEnabled"
-                    value="true">
-              </test>
-           </adapt>
-        </iterate>
-     </definition>
-     <definition
-           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.event">
-        <iterate
-              ifEmpty="false">
-           <adapt
-                 type="org.eclipse.core.resources.IResource">
-              <test
-                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.eventEnabled"
-                    value="true">
-              </test>
-           </adapt>
-        </iterate>
-     </definition>
-     <definition
-           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.enumeration">
-        <iterate
-              ifEmpty="false">
-           <adapt
-                 type="org.eclipse.core.resources.IResource">
-              <test
-                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.enumerationEnabled"
-                    value="true">
-              </test>
-           </adapt>
-        </iterate>
-     </definition>
-     <definition
-           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.exception">
-        <iterate
-              ifEmpty="false">
-           <adapt
-                 type="org.eclipse.core.resources.IResource">
-              <test
-                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.exceptionEnabled"
-                    value="true">
-              </test>
-           </adapt>
-        </iterate>
-     </definition>
-     <definition
-           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.query">
-        <iterate
-              ifEmpty="false">
-           <adapt
-                 type="org.eclipse.core.resources.IResource">
-              <test
-                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.queryEnabled"
-                    value="true">
-              </test>
-           </adapt>
-        </iterate>
-     </definition>
-     <definition
-           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.updateProcedure">
-        <iterate
-              ifEmpty="false">
-           <adapt
-                 type="org.eclipse.core.resources.IResource">
-              <test
-                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.updateProcedureEnabled"
-                    value="true">
-              </test>
-           </adapt>
-        </iterate>
-     </definition>
-     <definition
-           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.session">
-        <iterate
-              ifEmpty="false">
-           <adapt
-                 type="org.eclipse.core.resources.IResource">
-              <test
-                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.sessionEnabled"
-                    value="true">
-              </test>
-           </adapt>
-        </iterate>
-     </definition>
-     <definition
-           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.association">
-        <iterate
-              ifEmpty="false">
-           <adapt
-                 type="org.eclipse.core.resources.IResource">
-              <test
-                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.associationEnabled"
-                    value="true">
-              </test>
-           </adapt>
-        </iterate>
-     </definition>
-     <definition
-           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.associationClass">
-        <iterate
-              ifEmpty="false">
-           <adapt
-                 type="org.eclipse.core.resources.IResource">
-              <test
-                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.associationClassEnabled"
-                    value="true">
-              </test>
-           </adapt>
-        </iterate>
-     </definition>
-     <definition
-           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.dependency">
-        <iterate
-              ifEmpty="false">
-           <adapt
-                 type="org.eclipse.core.resources.IResource">
-              <test
-                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.dependencyEnabled"
-                    value="true">
-              </test>
-           </adapt>
-        </iterate>
-     </definition>
-     <definition
-           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.package">
-        <iterate
-              ifEmpty="false">
-           <adapt
-                 type="org.eclipse.core.resources.IResource">
-              <test
-                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.packageEnabled"
-                    value="true">
-              </test>
-           </adapt>
-        </iterate>
-     </definition>
-  </extension>
-  <extension
         point="org.eclipse.ui.commands">
      <category
            description="Top Level Tigerstripe Commands"
@@ -871,7 +595,7 @@
         </toolbar>
      </menuContribution>
      <menuContribution
-           locationURI="popup:org.eclipse.ui.popup.any?after=org.eclipse.jdt.ui.refactoring.menu">
+           locationURI="popup:org.eclipse.ui.popup.any?after=group.build">
         <menu
               label="Refactor Model">
            <command
@@ -916,6 +640,273 @@
      </menuContribution>
   </extension>
   <extension
+        point="org.eclipse.core.expressions.definitions">
+     <definition
+           id="org.eclipse.tigerstripe.workbench.ui.base.TSProjectSelected">
+        <iterate
+              ifEmpty="false">
+           <adapt
+                 type="org.eclipse.core.resources.IResource">
+              <test
+                    property="org.eclipse.core.resources.projectNature"
+                    value="org.eclipse.tigerstripe.workbench.base.tigerstripeProject">
+              </test>
+           </adapt>
+        </iterate>
+     </definition>
+     <definition
+           id="org.eclipse.tigerstripe.workbench.ui.base.TSEditorsActive">
+        <or>
+           <with
+                 variable="activeEditorId">
+              <equals
+                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.entityEditor">
+              </equals>
+           </with>
+           <with
+                 variable="activeEditorId">
+              <equals
+                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.exceptionEditor">
+              </equals>
+           </with>
+           <with
+                 variable="activeEditorId">
+              <equals
+                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.queryEditor">
+              </equals>
+           </with>
+           <with
+                 variable="activeEditorId">
+              <equals
+                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.eventEditor">
+              </equals>
+           </with>
+           <with
+                 variable="activeEditorId">
+              <equals
+                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.datatypeEditor">
+              </equals>
+           </with>
+           <with
+                 variable="activeEditorId">
+              <equals
+                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.sessionEditor">
+              </equals>
+           </with>
+           <with
+                 variable="activeEditorId">
+              <equals
+                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.associationEditor">
+              </equals>
+           </with>
+           <with
+                 variable="activeEditorId">
+              <equals
+                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.associationClassEditor">
+              </equals>
+           </with>
+           <with
+                 variable="activeEditorId">
+              <equals
+                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.dependencyEditor">
+              </equals>
+           </with>
+           <with
+                 variable="activeEditorId">
+              <equals
+                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.enumEditor">
+              </equals>
+           </with>
+           <with
+                 variable="activeEditorId">
+              <equals
+                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.updateProcedureEditor">
+              </equals>
+           </with>
+           <with
+                 variable="activeEditorId">
+              <equals
+                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.ossj.packageEditor">
+              </equals>
+           </with>
+           <with
+                 variable="activeEditorId">
+              <equals
+                    value="org.eclipse.tigerstripe.workbench.ui.eclipse.editors.descriptorEditor">
+              </equals>
+           </with>
+           <with
+                 variable="activeEditorId">
+              <equals
+                    value="org.eclipse.tigerstripe.workbench.ui.visualeditor.diagram.part.TigerstripeDiagramEditorID">
+              </equals>
+           </with>
+           <with
+                 variable="activeEditorId">
+              <equals
+                    value="org.eclipse.tigerstripe.workbench.ui.instancediagram.diagram.part.InstanceDiagramEditorID">
+              </equals>
+           </with>
+        </or>
+     </definition>
+     <definition
+           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.entity">
+        <iterate
+              ifEmpty="false">
+           <adapt
+                 type="org.eclipse.core.resources.IResource">
+              <test
+                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.entityEnabled"
+                    value="true">
+              </test>
+           </adapt>
+        </iterate>
+     </definition>
+     <definition
+           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.datatype">
+        <iterate
+              ifEmpty="false">
+           <adapt
+                 type="org.eclipse.core.resources.IResource">
+              <test
+                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.datatypeEnabled"
+                    value="true">
+              </test>
+           </adapt>
+        </iterate>
+     </definition>
+     <definition
+           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.event">
+        <iterate
+              ifEmpty="false">
+           <adapt
+                 type="org.eclipse.core.resources.IResource">
+              <test
+                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.eventEnabled"
+                    value="true">
+              </test>
+           </adapt>
+        </iterate>
+     </definition>
+     <definition
+           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.enumeration">
+        <iterate
+              ifEmpty="false">
+           <adapt
+                 type="org.eclipse.core.resources.IResource">
+              <test
+                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.enumerationEnabled"
+                    value="true">
+              </test>
+           </adapt>
+        </iterate>
+     </definition>
+     <definition
+           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.exception">
+        <iterate
+              ifEmpty="false">
+           <adapt
+                 type="org.eclipse.core.resources.IResource">
+              <test
+                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.exceptionEnabled"
+                    value="true">
+              </test>
+           </adapt>
+        </iterate>
+     </definition>
+     <definition
+           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.query">
+        <iterate
+              ifEmpty="false">
+           <adapt
+                 type="org.eclipse.core.resources.IResource">
+              <test
+                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.queryEnabled"
+                    value="true">
+              </test>
+           </adapt>
+        </iterate>
+     </definition>
+     <definition
+           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.updateProcedure">
+        <iterate
+              ifEmpty="false">
+           <adapt
+                 type="org.eclipse.core.resources.IResource">
+              <test
+                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.updateProcedureEnabled"
+                    value="true">
+              </test>
+           </adapt>
+        </iterate>
+     </definition>
+     <definition
+           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.session">
+        <iterate
+              ifEmpty="false">
+           <adapt
+                 type="org.eclipse.core.resources.IResource">
+              <test
+                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.sessionEnabled"
+                    value="true">
+              </test>
+           </adapt>
+        </iterate>
+     </definition>
+     <definition
+           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.association">
+        <iterate
+              ifEmpty="false">
+           <adapt
+                 type="org.eclipse.core.resources.IResource">
+              <test
+                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.associationEnabled"
+                    value="true">
+              </test>
+           </adapt>
+        </iterate>
+     </definition>
+     <definition
+           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.associationClass">
+        <iterate
+              ifEmpty="false">
+           <adapt
+                 type="org.eclipse.core.resources.IResource">
+              <test
+                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.associationClassEnabled"
+                    value="true">
+              </test>
+           </adapt>
+        </iterate>
+     </definition>
+     <definition
+           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.dependency">
+        <iterate
+              ifEmpty="false">
+           <adapt
+                 type="org.eclipse.core.resources.IResource">
+              <test
+                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.dependencyEnabled"
+                    value="true">
+              </test>
+           </adapt>
+        </iterate>
+     </definition>
+     <definition
+           id="org.eclipse.tigerstripe.workbench.ui.base.enabledInProfile.package">
+        <iterate
+              ifEmpty="false">
+           <adapt
+                 type="org.eclipse.core.resources.IResource">
+              <test
+                    property="org.eclipse.tigerstripe.workbench.ui.base.enabledArtifact.packageEnabled"
+                    value="true">
+              </test>
+           </adapt>
+        </iterate>
+     </definition>
+  </extension>
+  <extension
         point="org.eclipse.ui.handlers">
      <handler
            class="org.eclipse.tigerstripe.workbench.ui.internal.handlers.TigerstripeCommandHandler"