Add UI fragments of change vetex to point

gitlab #49

Change-Id: I501a20dd96bc79919e0a4fb311a21e17c5849aaa

diff --git a/org.simantics.district.network.ui/META-INF/MANIFEST.MF b/org.simantics.district.network.ui/META-INF/MANIFEST.MF
index 34b23c96b2f962b949982625f27ad3a3938a8d65..71ba32e59882e6854754d24143df227cad847421 100644 (file)
--- a/org.simantics.district.network.ui/META-INF/MANIFEST.MF
+++ b/org.simantics.district.network.ui/META-INF/MANIFEST.MF
@@ -8,7 +8,8 @@ Export-Package: org.simantics.district.network.ui,
  org.simantics.district.network.ui.adapters,
  org.simantics.district.network.ui.breakdown,
  org.simantics.district.network.ui.function,
- org.simantics.district.network.ui.nodes
+ org.simantics.district.network.ui.nodes,
+ org.simantics.district.network.ui.participants
 Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="1.1.100.v20150407-1430",
  org.eclipse.swt,
  org.simantics.g2d,
@@ -34,7 +35,10 @@ Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="1.1.100.v20150
  org.simantics.district.route,
  org.simantics.scenegraph.profile,
  org.simantics.district.geotools;bundle-version="1.0.0",
- org.simantics.maps.elevation.server
+ org.simantics.maps.elevation.server,
+ org.eclipse.e4.core.services,
+ org.eclipse.osgi.services;bundle-version="3.6.0",
+ org.eclipse.nebula.widgets.nattable.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.annotation;version="1.0.0";resolution:=optional,
   javax.inject;version="1.0.0"

diff --git a/org.simantics.district.network.ui/fragment.e4xmi b/org.simantics.district.network.ui/fragment.e4xmi
index 93ff59c6a0050cc30d2c1ebf7adb961eb4c63beb..c4357ea45278e790aa33415d4d21db8b04012f7a 100644 (file)
--- a/org.simantics.district.network.ui/fragment.e4xmi
+++ b/org.simantics.district.network.ui/fragment.e4xmi
@@ -13,6 +13,9 @@
       <parameters xmi:id="_lH-1cFoDEem2uLDOwusbsQ" elementId="org.simantics.district.network.ui.commandparameter.0" name="cut"/>
     </elements>
     <elements xsi:type="commands:Command" xmi:id="_T3or0Fn_Eem2uLDOwusbsQ" elementId="org.simantics.district.network.ui.command.pastedistrictvertex" commandName="Paste District Vertex"/>
+    <elements xsi:type="commands:Command" xmi:id="_CLKOUHVvEemS_rRAHnCQSw" elementId="org.simantics.district.network.ui.command.changeroutepointtovertex" commandName="Change Route Point to Vertex"/>
+    <elements xsi:type="commands:Command" xmi:id="_Ee0TAHVvEemS_rRAHnCQSw" elementId="org.simantics.district.network.ui.command.changevertextoroutepoint" commandName="Change Vertex to Route Point"/>
+    <elements xsi:type="commands:Command" xmi:id="_QcEKQIAGEemKlokjSaREFQ" elementId="org.simantics.district.network.ui.command.importcsv" commandName="Import CSV"/>
   </fragments>
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_Js7rUMMAEea1mdgpHNVHMA" featurename="menuContributions" parentElementId="xpath:/">
     <elements xsi:type="menu:MenuContribution" xmi:id="_T-jiEN8NEeaigNyzMJBOrg" elementId="org.simantics.district.network.ui.menucontribution.districtDiagramPopup" parentId="#DistrictDiagramPopup">
@@ -23,11 +26,13 @@
       <children xsi:type="menu:HandledMenuItem" xmi:id="_ZE-9sOGeEei2MexsDMErvQ" elementId="org.simantics.district.network.ui.handledmenuitem.toggledrawmap" label="Toggle Draw Map" iconURI="platform:/plugin/com.famfamfam.silk/icons/map_add.png" command="_qillYOGQEeiIMuq1qhQJRQ"/>
       <children xsi:type="menu:HandledMenuItem" xmi:id="_bd3S0OJdEei2MexsDMErvQ" elementId="org.simantics.district.network.ui.handledmenuitem.changebackgroundcolor" label="Change Background Color" iconURI="platform:/plugin/com.famfamfam.silk/icons/palette.png" command="_Uv6NEOJdEei2MexsDMErvQ"/>
       <children xsi:type="menu:DynamicMenuContribution" xmi:id="_jK8QQD9EEemjkrTOYZxVwQ" elementId="org.simantics.district.network.ui.dynamicmenucontribution.elementActions" label="Element Actions" contributionURI="bundleclass://org.simantics.district.network.ui/org.simantics.district.network.ui.contributions.NetworkElementActionMenuContribution"/>
-      <children xsi:type="menu:HandledMenuItem" xmi:id="_aqopoFn_Eem2uLDOwusbsQ" elementId="org.simantics.district.network.ui.handledmenuitem.copy" label="Copy (WIP)" enabled="false" command="_RJIeMFn_Eem2uLDOwusbsQ"/>
+      <children xsi:type="menu:HandledMenuItem" xmi:id="_aqopoFn_Eem2uLDOwusbsQ" elementId="org.simantics.district.network.ui.handledmenuitem.copy" label="Copy" enabled="false" command="_RJIeMFn_Eem2uLDOwusbsQ"/>
       <children xsi:type="menu:HandledMenuItem" xmi:id="_dGH0oFn_Eem2uLDOwusbsQ" elementId="org.simantics.district.network.ui.handledmenuitem.paste" label="Paste" command="_T3or0Fn_Eem2uLDOwusbsQ"/>
       <children xsi:type="menu:HandledMenuItem" xmi:id="_ajCQAFoDEem2uLDOwusbsQ" elementId="org.simantics.district.network.ui.handledmenuitem.cut" label="Cut" command="_RJIeMFn_Eem2uLDOwusbsQ">
         <parameters xmi:id="_qNYB8FoDEem2uLDOwusbsQ" elementId="org.simantics.district.network.ui.parameter.0" name="org.simantics.district.network.ui.commandparameter.0" value="true"/>
       </children>
+      <children xsi:type="menu:HandledMenuItem" xmi:id="_KOAqcHVvEemS_rRAHnCQSw" elementId="org.simantics.district.network.ui.handledmenuitem.changevertextoroutepoint" label="Change Vertex to Route Point" command="_Ee0TAHVvEemS_rRAHnCQSw"/>
+      <children xsi:type="menu:HandledMenuItem" xmi:id="_NgV94HVvEemS_rRAHnCQSw" elementId="org.simantics.district.network.ui.handledmenuitem.changeroutepointtovertex" label="Change Route Point to Vertex" command="_CLKOUHVvEemS_rRAHnCQSw"/>
     </elements>
   </fragments>
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_dbiHcMMBEea1mdgpHNVHMA" featurename="handlers" parentElementId="xpath:/">
@@ -40,5 +45,8 @@
     <elements xsi:type="commands:Handler" xmi:id="_kc-uoPhxEeiSu98FclGtqA" elementId="org.simantics.district.network.ui.handler.4" contributionURI="bundleclass://org.simantics.district.network.ui/org.simantics.district.network.ui.contributions.ToggleSplitToMultipleDiagrams" command="_f4ugUPhxEeiSu98FclGtqA"/>
     <elements xsi:type="commands:Handler" xmi:id="_WEwqsFn_Eem2uLDOwusbsQ" elementId="org.simantics.district.network.ui.handler.5" contributionURI="bundleclass://org.simantics.district.network.ui/org.simantics.district.network.ui.contributions.CopyDistrictVertexHandler" command="_RJIeMFn_Eem2uLDOwusbsQ"/>
     <elements xsi:type="commands:Handler" xmi:id="_X7QSQFn_Eem2uLDOwusbsQ" elementId="org.simantics.district.network.ui.handler.6" contributionURI="bundleclass://org.simantics.district.network.ui/org.simantics.district.network.ui.contributions.PasteDistrictVertexHandler" command="_T3or0Fn_Eem2uLDOwusbsQ"/>
+    <elements xsi:type="commands:Handler" xmi:id="_F9vvIHVvEemS_rRAHnCQSw" elementId="org.simantics.district.network.ui.handler.7" contributionURI="bundleclass://org.simantics.district.network.ui/org.simantics.district.network.ui.contributions.ChangeRoutePointToVertexHandler" command="_CLKOUHVvEemS_rRAHnCQSw"/>
+    <elements xsi:type="commands:Handler" xmi:id="_H7TA8HVvEemS_rRAHnCQSw" elementId="org.simantics.district.network.ui.handler.8" contributionURI="bundleclass://org.simantics.district.network.ui/org.simantics.district.network.ui.contributions.ChangeVertexToRoutePointHandler" command="_Ee0TAHVvEemS_rRAHnCQSw"/>
+    <elements xsi:type="commands:Handler" xmi:id="_akE8EIAGEemKlokjSaREFQ" elementId="org.simantics.district.network.ui.handler.9" contributionURI="bundleclass://org.simantics.district.network.ui/org.simantics.district.network.ui.table.ImportCSVHandler" command="_QcEKQIAGEemKlokjSaREFQ"/>
   </fragments>
 </fragment:ModelFragments>