Unify names and categories of all district-related views

gitlab #87

Change-Id: I077065132eace9d390955ef1016e86b7a063a959

diff --git a/org.simantics.district.network.ui/plugin.xml b/org.simantics.district.network.ui/plugin.xml
index b8a712d8d12f7e06113e75bbcad20c7ce77c99d4..cee0a77f6b24ecd5a7b14b9d5da3bc5f71feb02d 100644 (file)
--- a/org.simantics.district.network.ui/plugin.xml
+++ b/org.simantics.district.network.ui/plugin.xml
@@ -33,28 +33,31 @@
             restorable="true">
       </e4view>
       <e4view
+            allowMultiple="false"
+            category="org.simantics.district"
             class="org.simantics.district.network.ui.table.DistrictCSVTableView"
             icon="platform:/plugin/com.famfamfam.silk/icons/table_edit.png"
             id="org.simantics.district.network.ui.table.csvTableView"
             name="District CSV Import Table"
-            restorable="true"
-            allowMultiple="false">
+            restorable="true">
       </e4view>
       <e4view
+            allowMultiple="false"
+            category="org.simantics.district"
             class="org.simantics.district.network.ui.techtype.table.TechTypeTableView"
             icon="platform:/plugin/com.famfamfam.silk/icons/table_edit.png"
             id="org.simantics.district.network.ui.techtype.table.techtypeTableView"
             name="Tech Type Table"
-            restorable="true"
-            allowMultiple="false">
+            restorable="true">
       </e4view>
       <e4view
+            allowMultiple="false"
+            category="org.simantics.district"
             class="org.simantics.district.network.ui.visualisations.DynamicVisualisationsView"
             icon="platform:/plugin/com.famfamfam.silk/icons/table_edit.png"
             id="org.simantics.district.network.ui.visualisations.dynamicVisualisationsView"
             name="District Visualisations"
-            restorable="true"
-            allowMultiple="false">
+            restorable="true">
       </e4view>
    </extension>
   <extension

diff --git a/org.simantics.district.region.ui/plugin.xml b/org.simantics.district.region.ui/plugin.xml
index 3fba72d36b9f898de12f5291629f0278d666ff8e..e3bf961cf1a2ed79c4f376f0993ac037cba317de 100644 (file)
--- a/org.simantics.district.region.ui/plugin.xml
+++ b/org.simantics.district.region.ui/plugin.xml
@@ -12,12 +12,13 @@
    <extension
          point="org.eclipse.ui.views">
       <e4view
+            allowMultiple="false"
+            category="org.simantics.district"
             class="org.simantics.district.region.ui.DiagramRegionsTableView"
             icon="platform:/plugin/com.famfamfam.silk/icons/table_edit.png"
             id="org.simantics.diagram.regions.table.diagramRegionsTable"
-            name="Diagram Regions Table"
-            restorable="true"
-            allowMultiple="false">
+            name="District Diagram Regions"
+            restorable="true">
       </e4view>
    </extension>
 </plugin>

diff --git a/org.simantics.district.route.ui/OSGI-INF/l10n/bundle.properties b/org.simantics.district.route.ui/OSGI-INF/l10n/bundle.properties
index 7b710bee907bec8c877981a72c51d76e346feb9c..b5033f9ea2c4953ddeeacc055b3dc9d7b20e8c3a 100644 (file)
--- a/org.simantics.district.route.ui/OSGI-INF/l10n/bundle.properties
+++ b/org.simantics.district.route.ui/OSGI-INF/l10n/bundle.properties
@@ -1,2 +1,2 @@
 #Properties file for org.simantics.district.route.ui
-view.name = Routes
+view.name = District Routes

diff --git a/org.simantics.district.route.ui/fragment.e4xmi b/org.simantics.district.route.ui/fragment.e4xmi
index 291140d8190e800246a0e52eb9c530812c423543..525e902dcc1e0016b0e06224cb645685859e0d96 100644 (file)
--- a/org.simantics.district.route.ui/fragment.e4xmi
+++ b/org.simantics.district.route.ui/fragment.e4xmi
@@ -2,7 +2,7 @@
 <fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmi:id="_BxaXACerEeWxCPrV0pAZQQ">
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_n2jsIMq-EeeUz6Cs9kKeKg" featurename="categories" parentElementId="xpath:/"/>
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_4fyr4MqVEeeUz6Cs9kKeKg" featurename="commands" parentElementId="xpath:/">
-    <elements xsi:type="commands:Command" xmi:id="_x1nG0H4WEei74IuRct85qQ" elementId="org.simantics.district.route.ui.commands.openRouteView" commandName="Open Routes View"/>
+    <elements xsi:type="commands:Command" xmi:id="_x1nG0H4WEei74IuRct85qQ" elementId="org.simantics.district.route.ui.commands.openRouteView" commandName="Open District Routes View"/>
     <elements xsi:type="commands:Command" xmi:id="_k63rkP6zEeiBo8tg-6EPYA" elementId="org.simantics.district.route.ui.command.selectRouteOnDiagram" commandName="Select Route on Diagram"/>
     <elements xsi:type="commands:Command" xmi:id="_bA61IAI7EemGocelWS26pQ" elementId="org.simantics.district.route.ui.command.discardRoute" commandName="Discard Route"/>
     <elements xsi:type="commands:Command" xmi:id="_bfN6sAI7EemGocelWS26pQ" elementId="org.simantics.district.route.ui.command.renameRoute" commandName="Rename Route"/>

diff --git a/org.simantics.district.route.ui/plugin.xml b/org.simantics.district.route.ui/plugin.xml
index 1d942a28426fa9f77efdbc4564004e78a6a874e2..dafb23747679c51ca42bbc7bc5b34fc9c839ab53 100644 (file)
--- a/org.simantics.district.route.ui/plugin.xml
+++ b/org.simantics.district.route.ui/plugin.xml
@@ -12,12 +12,13 @@
    <extension
          point="org.eclipse.ui.views">
       <e4view
+            allowMultiple="true"
+            category="org.simantics.district"
             class="org.simantics.district.route.ui.RouteView"
             icon="platform:/plugin/com.famfamfam.silk/icons/chart_line.png"
             id="org.simantics.district.route.ui.routeView"
             name="%view.name"
-            restorable="true"
-            allowMultiple="true">
+            restorable="true">
       </e4view>
    </extension>
 </plugin>