From 363468682f0e4f48b1e0ab040f6f06005266db35 Mon Sep 17 00:00:00 2001
From: Reino Ruusu <reino.ruusu@semantum.fi>
Date: Fri, 27 Mar 2020 16:01:31 +0200
Subject: [PATCH] Unify names and categories of all district-related views

gitlab #87

Change-Id: I077065132eace9d390955ef1016e86b7a063a959
---
 org.simantics.district.network.ui/plugin.xml      | 15 +++++++++------
 org.simantics.district.region.ui/plugin.xml       |  7 ++++---
 .../OSGI-INF/l10n/bundle.properties               |  2 +-
 org.simantics.district.route.ui/fragment.e4xmi    |  2 +-
 org.simantics.district.route.ui/plugin.xml        |  5 +++--
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/org.simantics.district.network.ui/plugin.xml b/org.simantics.district.network.ui/plugin.xml
index b8a712d8..cee0a77f 100644
--- 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 3fba72d3..e3bf961c 100644
--- 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 7b710bee..b5033f9e 100644
--- 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 291140d8..525e902d 100644
--- 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 1d942a28..dafb2374 100644
--- 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>
-- 
2.47.1