Merge "(refs #7453) Switch component type of the component"

diff --combined bundles/org.simantics.modeling.ui/plugin.xml
index 41bf9eccc5170e1ee55b1653c4c7dab4e1d2ea30,2612bb742fc4b54dea1b1c1d175d76923e07814d..363cb9894e7ccebd2ab0b19e15ef04e58fda17c9
--- 1/bundles/org.simantics.modeling.ui/plugin.xml
--- 2/bundles/org.simantics.modeling.ui/plugin.xml
+++ b/bundles/org.simantics.modeling.ui/plugin.xml
@@@ -146,20 -146,6 +146,20 @@@
              class="org.simantics.modeling.ui.componentTypeEditor.ComponentTypeScriptEditor"
              id="org.simantics.modeling.ui.componentTypeScriptEditor">
        </editor>
 +      <editor
 +            class="org.simantics.modeling.ui.scl.scriptEditor.SCLScriptEditor"
 +            default="false"
 +            icon="platform:/plugin/com.famfamfam.silk/icons/script_go.png"
 +            id="org.simantics.modeling.ui.scl.scriptEditor"
 +            name="SCL Script Editor">
 +      </editor>
 +   </extension>
 +   <extension
 +         point="org.eclipse.ui.elementFactories">
 +      <factory
 +            class="org.simantics.modeling.ui.scl.scriptEditor.SCLScriptEditorInputFactory"
 +            id="org.simantics.modeling.ui.scl.scriptEditor.inputFactory">
 +      </factory>
     </extension>
     <extension
           point="org.eclipse.core.expressions.definitions">
@@@ -198,15 -184,6 +198,15 @@@
              </equals>
           </with>
        </definition>
 +      <definition
 +            id="org.simantics.modeling.ui.inSCLScriptEditor">
 +         <with
 +               variable="activePartId">
 +            <equals
 +                  value="org.simantics.modeling.ui.scl.scriptEditor">
 +            </equals>
 +         </with>
 +      </definition>
     </extension>
     <extension
           point="org.eclipse.ui.commands">
@@@ -400,11 -377,6 +400,11 @@@
              categoryId="org.simantics.modeling.ui.category"
              id="org.simantics.modeling.typical.sync.toggleRealtime">
        </command>
 +      <command
 +            name="Run SCL Script"
 +            categoryId="org.simantics.modeling.ui.category"
 +            id="org.simantics.modeling.ui.scl.scriptEditor.run">
 +      </command>
     </extension>
     <extension
           point="org.eclipse.core.expressions.definitions">
@@@ -990,15 -962,6 +990,15 @@@
              commandId="org.simantics.modeling.typical.sync.toggleRealtime"
              class="org.simantics.modeling.ui.typicals.ToggleTypicalRealtimeSync">
        </handler>
 +      <handler
 +            commandId="org.simantics.modeling.ui.scl.scriptEditor.run"
 +            class="org.simantics.modeling.ui.scl.scriptEditor.RunSCLScriptHandler">
 +         <enabledWhen>
 +            <reference
 +                  definitionId="org.simantics.modeling.ui.inSCLScriptEditor">
 +            </reference>
 +         </enabledWhen>
 +      </handler>
     </extension>
     <extension
           point="org.eclipse.ui.bindings">
@@@ -1038,12 -1001,6 +1038,12 @@@
              schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
              sequence="F1">
        </key>
 +      <key
 +            commandId="org.simantics.modeling.ui.scl.scriptEditor.run"
 +            contextId="org.simantics.modeling.ui.scl.scriptEditor.context"
 +            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
 +            sequence="Ctrl+R">
 +      </key>
     </extension>
     <extension
           point="org.eclipse.ui.menus">
@@@ -1288,6 -1245,10 +1288,10 @@@
                 class="org.simantics.diagram.handler.ConnectionRoutingMenuContribution"
                 id="connectionRouting">
           </dynamic>
+          <dynamic
+                class="org.simantics.modeling.ui.actions.SwitchComponentTypeContribution"
+                id="org.simantics.modeling.ui.switchComponentType">
+          </dynamic>
        </menuContribution>
        <menuContribution
              locationURI="toolbar:org.simantics.browsing.ui.graph.propertyView">
@@@ -1482,17 -1443,6 +1486,17 @@@
                 id="org.simantics.modeling.ui.elementtoolbar">
           </toolbar>
        </menuContribution>-->
 +      <menuContribution
 +            allPopups="false"
 +            locationURI="popup:org.simantics.modeling.ui.scl.scriptEditor.EditorContext?after=additions">
 +         <command
 +               commandId="org.simantics.modeling.ui.scl.scriptEditor.run"
 +               label="Run Script"
 +               icon="platform:/plugin/com.famfamfam.silk/companion/script_start.png"
 +               style="push"
 +               tooltip="Run the Current Contents of This SCL Script">
 +         </command>
 +      </menuContribution>
     </extension>
     <extension
           point="org.eclipse.ui.contexts">
@@@ -1516,11 -1466,6 +1520,11 @@@
              id="org.simantics.ui.undoContext"
              parentId="org.eclipse.ui.contexts.window">
        </context>
 +      <context
 +            name="In SCL Script Editor"
 +            id="org.simantics.modeling.ui.scl.scriptEditor.context"
 +            parentId="org.eclipse.ui.contexts.window">
 +      </context>
     </extension>
     <extension
           point="org.simantics.ui.perspectiveContextBinding">
@@@ -1618,11 -1563,6 +1622,11 @@@
              id="org.simantics.modeling.ui.sclModuleEditor2"
              priority="10">
        </adapterClass>
 +      <adapterClass
 +            class="org.simantics.modeling.ui.scl.scriptEditor.SCLScriptEditorAdapter"
 +            id="org.simantics.modeling.ui.scl.scriptEditor.adapter"
 +            priority="20">
 +      </adapterClass>
     </extension>
     <extension
           point="org.eclipse.core.runtime.preferences">