From e82140cb52a5a6c4207ba8372d4e421f56669448 Mon Sep 17 00:00:00 2001
From: jkauttio <jkauttio@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Tue, 29 Oct 2013 11:56:03 +0000
Subject: [PATCH] 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
---
 org.simantics.sysdyn.ui/plugin.xml | 332 +++++++++++++++++------------
 1 file changed, 194 insertions(+), 138 deletions(-)

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