Also update plugin.xml which was accidentally left out of previous commit.

fixes #4486

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@28146 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.sysdyn.ui/plugin.xml b/org.simantics.sysdyn.ui/plugin.xml
index e422b73e14dec79066956b45ece147bee75c001f..93da0d703b718099f6164fa603838265ca38c8be 100644 (file)
--- a/org.simantics.sysdyn.ui/plugin.xml
+++ b/org.simantics.sysdyn.ui/plugin.xml
@@ -17,6 +17,7 @@
          point="org.eclipse.ui.editors">\r
       <editor\r
             class="org.simantics.modeling.ui.diagramEditor.DiagramEditor:viewer=org.simantics.sysdyn.ui.editor.DiagramViewer"\r
+            contributorClass="org.simantics.ui.toolbar.ToolbarContributor:toolbar=org.simantics.sysdyn.ui.diagramToolbar"\r
             default="false"\r
             icon="platform:/plugin/com.famfamfam.silk/icons/plugin.png"\r
             id="org.simantics.sysdyn.ui.diagramViewer"\r
@@ -39,28 +40,6 @@
             name="Chart Viewer">\r
       </editor>\r
    </extension>\r
-   <extension\r
-         point="org.simantics.ui.resourceEditorAdapter">\r
-         <adapterClass\r
-         class="org.simantics.sysdyn.ui.editor.OpenDiagramFromConfigurationAdapter"\r
-         groupId="org.simantics.diagramEditor.group"\r
-         priority="100">\r
-      </adapterClass>\r
-      <adapterClass\r
-         class="org.simantics.sysdyn.ui.editor.OpenDiagramFromComponentAdapter"\r
-         priority="90">\r
-      </adapterClass>\r
-      <adapter\r
-            editorId="org.simantics.sysdyn.ui.modelicaEditor"\r
-            priority="2"\r
-            type_uris="http://www.simantics.org/Sysdyn-0.0/Configuration">\r
-      </adapter>\r
-      <adapter\r
-            editorId="org.simantics.sysdyn.ui.jfreeChartEditor"\r
-            priority="2"\r
-            type_uris="http://www.simantics.org/JFreeChart-0.0/Chart">\r
-      </adapter>\r
-   </extension>\r
    <extension\r
          point="org.eclipse.ui.views">\r
       <category\r
@@ -239,6 +218,9 @@
                   id="org.simantics.sysdyn.ui.exportAs.button">\r
             </command>\r
          </toolbar>\r
+         <toolbar\r
+               id="org.simantics.sysdyn.ui.diagramToolbar">\r
+         </toolbar>\r
          <toolbar\r
                id="org.simantics.sysdyn.ui.experimentControlToolbar">\r
             <command\r
@@ -565,7 +547,8 @@
             <command\r
                   commandId="org.simantics.sysdyn.ui.saveSensitivityAnalysisResults"\r
                   icon="platform:/plugin/com.famfamfam.silk/icons/table_save.png"\r
-                  id="org.simantics.sysdyn.ui.saveSensitivityAnalysis.button">\r
+                  id="org.simantics.sysdyn.ui.saveSensitivityAnalysis.button"\r
+                  label="Save Sensitivity Analysis Results">\r
                <visibleWhen>\r
                   <with\r
                         variable="activeContexts">\r
@@ -1504,6 +1487,24 @@
             id="org.simantics.sysdyn.ui.exportModelAsButton"\r
             name="Export Model As...">\r
       </command>\r
+      <command\r
+            id="org.simantics.sysdyn.ui.diagramTool"\r
+            name="Diagram Tool">\r
+         <state\r
+               id="org.eclipse.ui.commands.radioState">\r
+            <class\r
+                  class="org.eclipse.ui.handlers.RadioState">\r
+               <parameter\r
+                     name="default"\r
+                     value="pointer">\r
+               </parameter>\r
+               <parameter\r
+                     name="persisted"\r
+                     value="false">\r
+               </parameter>\r
+            </class>\r
+         </state>\r
+      </command>\r
    </extension>\r
    <extension\r
          point="org.eclipse.ui.handlers">\r
@@ -1919,6 +1920,100 @@
             </or>\r
          </activeWhen>\r
       </handler>\r
+      <handler\r
+            class="org.simantics.sysdyn.ui.handlers.DiagramToolHandler"\r
+            commandId="org.simantics.sysdyn.ui.diagramTool">\r
+      </handler>\r
+   </extension>\r
+   <extension\r
+         point="org.eclipse.ui.importWizards">\r
+      <wizard\r
+            class="org.simantics.sysdyn.ui.wizards.models.ImportWizardModel"\r
+            icon="platform:/plugin/com.famfamfam.silk/icons/chart_organisation.png"\r
+            id="org.simantics.sysdyn.ui.wizards.modelImport"\r
+            name="Import Model">\r
+      </wizard>\r
+      <wizard\r
+            class="org.simantics.sysdyn.ui.wizards.modules.ImportWizardModule"\r
+            icon="platform:/plugin/com.famfamfam.silk/icons/bricks.png"\r
+            id="org.simantics.sysdyn.ui.wizards.moduleImport"\r
+            name="Import Module">\r
+      </wizard>\r
+      <wizard\r
+            class="org.simantics.sysdyn.ui.wizards.functions.ImportWizardFunction"\r
+            icon="platform:/plugin/com.famfamfam.silk/icons/brick.png"\r
+            id="org.simantics.sysdyn.ui.wizards.functionImport"\r
+            name="Import Function Library">\r
+      </wizard>\r
+      <wizard\r
+            class="org.simantics.sysdyn.ui.wizards.mdl.ImportWizardMdl"\r
+            icon="platform:/plugin/com.famfamfam.silk/icons/chart_organisation.png"\r
+            id="org.simantics.sysdyn.ui.wizards.mdlImport"\r
+            name="Import Vensim Model (.mdl)">\r
+      </wizard>\r
+   </extension>\r
+   <extension\r
+         point="org.eclipse.ui.exportWizards">\r
+      <wizard\r
+            class="org.simantics.sysdyn.ui.wizards.models.ExportWizardModel"\r
+            icon="platform:/plugin/com.famfamfam.silk/icons/chart_organisation.png"\r
+            id="org.simantics.sysdyn.ui.wizard1"\r
+            name="Export Model">\r
+      </wizard>\r
+      <wizard\r
+            class="org.simantics.sysdyn.ui.wizards.modules.ExportWizardModule"\r
+            icon="platform:/plugin/com.famfamfam.silk/icons/bricks.png"\r
+            id="org.simantics.sysdyn.ui.wizard2"\r
+            name="Export Module">\r
+      </wizard>\r
+      <wizard\r
+            class="org.simantics.sysdyn.ui.wizards.functions.ExportWizardFunction"\r
+            icon="platform:/plugin/com.famfamfam.silk/icons/brick.png"\r
+            id="org.simantics.sysdyn.ui.wizard3"\r
+            name="Export Function Library">\r
+      </wizard>\r
+   </extension>\r
+   <extension\r
+         point="org.eclipse.core.expressions.propertyTesters">\r
+      <propertyTester\r
+            class="org.simantics.browsing.ui.swt.NodePropertyTester"\r
+            id="org.simantics.browsing.ui.nodePropertyTester"\r
+            namespace="org.simantics.sysdyn.ui"\r
+            properties="nodeClass"\r
+            type="org.eclipse.jface.viewers.IStructuredSelection">\r
+      </propertyTester>\r
+      <propertyTester\r
+            class="org.simantics.sysdyn.ui.browser.nodes.ExportTester"\r
+            id="org.simantics.sysdyn.ui.selectionPropertyTester"\r
+            namespace="org.simantics.sysdyn.ui"\r
+            properties="nodeClass2"\r
+            type="org.eclipse.jface.viewers.IStructuredSelection">\r
+      </propertyTester>\r
+   </extension>\r
+   <extension\r
+         id="product"\r
+         point="org.eclipse.core.runtime.products">\r
+      <product\r
+            application="org.simantics.workbench.application"\r
+            description="Simantics System Dynamic Modelling Environment"\r
+            name="Simantics System Dynamic Tool">\r
+         <property\r
+               name="appName"\r
+               value="Simantics System Dynamic Tool">\r
+         </property>\r
+         <property\r
+               name="preferenceCustomization"\r
+               value="plugin_customization.ini">\r
+         </property>\r
+         <property\r
+               name="windowImages"\r
+               value="icons/sysdyn.png">\r
+         </property>\r
+         <property\r
+               name="aboutText"\r
+               value="%about.text">\r
+         </property>\r
+      </product>\r
    </extension>\r
    <extension\r
          point="org.simantics.browsing.ui.common.viewpointContributionBinding">\r
@@ -2333,21 +2428,57 @@
       </binding>\r
    </extension>\r
    <extension\r
-         point="org.eclipse.core.expressions.propertyTesters">\r
-      <propertyTester\r
-            class="org.simantics.browsing.ui.swt.NodePropertyTester"\r
-            id="org.simantics.browsing.ui.nodePropertyTester"\r
-            namespace="org.simantics.sysdyn.ui"\r
-            properties="nodeClass"\r
-            type="org.eclipse.jface.viewers.IStructuredSelection">\r
-      </propertyTester>\r
-      <propertyTester\r
-            class="org.simantics.sysdyn.ui.browser.nodes.ExportTester"\r
-            id="org.simantics.sysdyn.ui.selectionPropertyTester"\r
-            namespace="org.simantics.sysdyn.ui"\r
-            properties="nodeClass2"\r
-            type="org.eclipse.jface.viewers.IStructuredSelection">\r
-      </propertyTester>\r
+         point="org.simantics.browsing.ui.common.selectionProcessorBinding">\r
+      <binding\r
+            browseContext="http://www.simantics.org/Sysdyn-0.0/Browser">\r
+         <implementation\r
+               class="org.simantics.sysdyn.ui.properties.ResourceSelectionProcessor">\r
+         </implementation>\r
+      </binding>\r
+      <binding\r
+            browseContext="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext">\r
+         <implementation\r
+               class="org.simantics.sysdyn.ui.properties.ResourceSelectionProcessor">\r
+         </implementation>\r
+      </binding>\r
+      <binding\r
+            browseContext="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext">\r
+         <implementation\r
+               class="org.simantics.sysdyn.ui.properties.ResourceSelectionProcessor">\r
+         </implementation>\r
+      </binding>\r
+   </extension>\r
+   <extension\r
+         point="org.simantics.browsing.ui.common.checkedStateBinding">\r
+      <binding\r
+            browseContext="http://www.simantics.org/Sysdyn-0.0/EnumerationIndexes">\r
+         <implementation\r
+               class="org.simantics.sysdyn.ui.properties.widgets.arrays.ShowInChartsCheckBox"\r
+               preference="2.0">\r
+         </implementation>\r
+      </binding>\r
+   </extension>\r
+   <extension\r
+         point="org.simantics.ui.resourceEditorAdapter">\r
+      <adapterClass\r
+            class="org.simantics.sysdyn.ui.editor.OpenDiagramFromConfigurationAdapter"\r
+            groupId="org.simantics.diagramEditor.group"\r
+            priority="100">\r
+      </adapterClass>\r
+      <adapterClass\r
+            class="org.simantics.sysdyn.ui.editor.OpenDiagramFromComponentAdapter"\r
+            priority="90">\r
+      </adapterClass>\r
+      <adapter\r
+            editorId="org.simantics.sysdyn.ui.modelicaEditor"\r
+            priority="2"\r
+            type_uris="http://www.simantics.org/Sysdyn-0.0/Configuration">\r
+      </adapter>\r
+      <adapter\r
+            editorId="org.simantics.sysdyn.ui.jfreeChartEditor"\r
+            priority="2"\r
+            type_uris="http://www.simantics.org/JFreeChart-0.0/Chart">\r
+      </adapter>\r
    </extension>\r
    <extension\r
          point="org.simantics.ui.doubleClick">\r
@@ -2383,48 +2514,31 @@
       </doubleClickAction>\r
    </extension>\r
    <extension\r
-         point="org.simantics.browsing.ui.common.selectionProcessorBinding">\r
-      <binding\r
-            browseContext="http://www.simantics.org/Sysdyn-0.0/Browser">\r
-         <implementation\r
-               class="org.simantics.sysdyn.ui.properties.ResourceSelectionProcessor">\r
-         </implementation>\r
-      </binding>\r
-      <binding\r
-            browseContext="http://www.simantics.org/Modeling-0.0/ModelingBrowseContext">\r
-         <implementation\r
-               class="org.simantics.sysdyn.ui.properties.ResourceSelectionProcessor">\r
-         </implementation>\r
-      </binding>\r
-      <binding\r
-            browseContext="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext">\r
-         <implementation\r
-               class="org.simantics.sysdyn.ui.properties.ResourceSelectionProcessor">\r
-         </implementation>\r
-      </binding>\r
-   </extension>\r
-   <extension\r
-         id="product"\r
-         point="org.eclipse.core.runtime.products">\r
-      <product\r
-            application="org.simantics.workbench.application"\r
-            description="Simantics System Dynamic Modelling Environment"\r
-            name="Simantics System Dynamic Tool">\r
-         <property\r
-               name="appName"\r
-               value="Simantics System Dynamic Tool"/>\r
-         <property\r
-               name="preferenceCustomization"\r
-               value="plugin_customization.ini"/>\r
-         <property\r
-               name="windowImages"\r
-               value="icons/sysdyn.png">\r
-         </property>\r
-          <property\r
-               name="aboutText"\r
-               value="%about.text">\r
-         </property>\r
-      </product>\r
+         point="org.simantics.ui.toolbarCommand">\r
+      <command\r
+            commandId="org.simantics.sysdyn.ui.diagramTool"\r
+            image="icons/cursor.png"\r
+            name="Pointer"\r
+            toolbarId="org.simantics.sysdyn.ui.diagramToolbar"\r
+            type="radio"\r
+            value="pointer">\r
+      </command>\r
+      <command\r
+            commandId="org.simantics.sysdyn.ui.diagramTool"\r
+            image="icons/dependency.png"\r
+            name="Create Dependency"\r
+            toolbarId="org.simantics.sysdyn.ui.diagramToolbar"\r
+            type="radio"\r
+            value="dependency">\r
+      </command>\r
+      <command\r
+            commandId="org.simantics.sysdyn.ui.diagramTool"\r
+            image="icons/flow.png"\r
+            name="Create Flow"\r
+            toolbarId="org.simantics.sysdyn.ui.diagramToolbar"\r
+            type="radio"\r
+            value="flow">\r
+      </command>\r
    </extension>\r
    <extension\r
          point="org.simantics.project.feature">\r
@@ -2444,65 +2558,7 @@
             label="System Dynamics Ontology Dependencies">\r
       </feature>\r
    </extension>\r
-   <extension\r
-         point="org.simantics.browsing.ui.common.checkedStateBinding">\r
-      <binding\r
-            browseContext="http://www.simantics.org/Sysdyn-0.0/EnumerationIndexes">\r
-         <implementation\r
-               class="org.simantics.sysdyn.ui.properties.widgets.arrays.ShowInChartsCheckBox"\r
-               preference="2.0">\r
-         </implementation>\r
-      </binding>\r
-   </extension>\r
    \r
-   <extension\r
-         point="org.eclipse.ui.importWizards">\r
-      <wizard\r
-            class="org.simantics.sysdyn.ui.wizards.models.ImportWizardModel"\r
-            icon="platform:/plugin/com.famfamfam.silk/icons/chart_organisation.png"\r
-            id="org.simantics.sysdyn.ui.wizards.modelImport"\r
-            name="Import Model">\r
-      </wizard>\r
-      <wizard\r
-            class="org.simantics.sysdyn.ui.wizards.modules.ImportWizardModule"\r
-            icon="platform:/plugin/com.famfamfam.silk/icons/bricks.png"\r
-            id="org.simantics.sysdyn.ui.wizards.moduleImport"\r
-            name="Import Module">\r
-      </wizard>\r
-      <wizard\r
-            class="org.simantics.sysdyn.ui.wizards.functions.ImportWizardFunction"\r
-            icon="platform:/plugin/com.famfamfam.silk/icons/brick.png"\r
-            id="org.simantics.sysdyn.ui.wizards.functionImport"\r
-            name="Import Function Library">\r
-      </wizard>\r
-      <wizard\r
-            class="org.simantics.sysdyn.ui.wizards.mdl.ImportWizardMdl"\r
-            icon="platform:/plugin/com.famfamfam.silk/icons/chart_organisation.png"\r
-            id="org.simantics.sysdyn.ui.wizards.mdlImport"\r
-            name="Import Vensim Model (.mdl)">\r
-      </wizard>\r
-   </extension>\r
-   <extension\r
-         point="org.eclipse.ui.exportWizards">\r
-      <wizard\r
-            class="org.simantics.sysdyn.ui.wizards.models.ExportWizardModel"\r
-            icon="platform:/plugin/com.famfamfam.silk/icons/chart_organisation.png"\r
-            id="org.simantics.sysdyn.ui.wizard1"\r
-            name="Export Model">\r
-      </wizard>\r
-      <wizard\r
-            class="org.simantics.sysdyn.ui.wizards.modules.ExportWizardModule"\r
-            icon="platform:/plugin/com.famfamfam.silk/icons/bricks.png"\r
-            id="org.simantics.sysdyn.ui.wizard2"\r
-            name="Export Module">\r
-      </wizard>\r
-      <wizard\r
-            class="org.simantics.sysdyn.ui.wizards.functions.ExportWizardFunction"\r
-            icon="platform:/plugin/com.famfamfam.silk/icons/brick.png"\r
-            id="org.simantics.sysdyn.ui.wizard3"\r
-            name="Export Function Library">\r
-      </wizard>\r
-   </extension>\r
    \r
    <extension point="org.simantics.scl.reflection.binding">\r
       <namespace path="http://www.simantics.org/Sysdyn-0.0/Validations">\r