Fixed district master after platform master external dep upgrade

gitlab simantics/platform#486

diff --git a/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java b/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java
index 3632cb02b619a4b73d273863e40cb7f558408d96..430a06eaf3588774a3a7557093f7e16157bc2e10 100644 (file)
--- a/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java
+++ b/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java
@@ -17,7 +17,6 @@ public class DistrictNetworkResource {
     public final Resource BrowseContext;
     public final Resource Composite;
     public final Resource Connection;
-    public final Resource ConnectionLineStyle;
     public final Resource Diagram;
     public final Resource Diagram_DefaultPipeTechTypeId;
     public final Resource Diagram_DefaultPipeTechTypeId_Inverse;
@@ -58,12 +57,18 @@ public class DistrictNetworkResource {
     public final Resource Diagram_Visualisations_KeyVariableEdgeHover_Inverse;
     public final Resource Diagram_Visualisations_KeyVariableVertexHover;
     public final Resource Diagram_Visualisations_KeyVariableVertexHover_Inverse;
+    public final Resource Diagram_Visualisations_NotInSimulation;
+    public final Resource Diagram_Visualisations_NotInSimulation_Inverse;
     public final Resource Diagram_Visualisations_ResetVisualisation;
     public final Resource Diagram_Visualisations_ResetVisualisation_Inverse;
     public final Resource Diagram_Visualisations_ShowColorBarTicks;
     public final Resource Diagram_Visualisations_ShowColorBarTicks_Inverse;
     public final Resource Diagram_Visualisations_ShowColorBars;
     public final Resource Diagram_Visualisations_ShowColorBars_Inverse;
+    public final Resource Diagram_Visualisations_ShowConnectedComponents;
+    public final Resource Diagram_Visualisations_ShowConnectedComponents_Inverse;
+    public final Resource Diagram_Visualisations_ShowElevationServerBoundingBox;
+    public final Resource Diagram_Visualisations_ShowElevationServerBoundingBox_Inverse;
     public final Resource Diagram_Visualisations_ShowSizeBarTicks;
     public final Resource Diagram_Visualisations_ShowSizeBarTicks_Inverse;
     public final Resource Diagram_Visualisations_ShowSizeBars;
@@ -165,7 +170,6 @@ public class DistrictNetworkResource {
     public final Resource Diagram_splitToMultipleEnabled_Inverse;
     public final Resource Diagram_trackChangesEnabled;
     public final Resource Diagram_trackChangesEnabled_Inverse;
-    public final Resource DistrictNetworkStaticInfoStyle;
     public final Resource DistrictNodeGroup;
     public final Resource DistrictNodeGroup_hasComponentTypeName;
     public final Resource DistrictNodeGroup_hasComponentTypeName_Inverse;
@@ -195,7 +199,6 @@ public class DistrictNetworkResource {
     public final Resource Edge_HasTGround;
     public final Resource Edge_HasTGround_Inverse;
     public final Resource Element;
-    public final Resource ElevationRectangleStyle;
     public final Resource Functions;
     public final Resource Functions_compositeInstantiator;
     public final Resource Functions_constantOne;
@@ -376,7 +379,6 @@ public class DistrictNetworkResource {
     public final Resource VertexDefaultMapping;
     public final Resource VertexDefaultMapping_Inverse;
     public final Resource VertexMappingParameterType;
-    public final Resource VertexSymbolStyle;
     public final Resource Vertex_HasAddress;
     public final Resource Vertex_HasAddress_Inverse;
     public final Resource Vertex_HasAltElevation;
@@ -465,7 +467,6 @@ public class DistrictNetworkResource {
         public static final String BrowseContext = "http://www.simantics.org/DistrictNetwork-1.0/BrowseContext";
         public static final String Composite = "http://www.simantics.org/DistrictNetwork-1.0/Composite";
         public static final String Connection = "http://www.simantics.org/DistrictNetwork-1.0/Connection";
-        public static final String ConnectionLineStyle = "http://www.simantics.org/DistrictNetwork-1.0/ConnectionLineStyle";
         public static final String Diagram = "http://www.simantics.org/DistrictNetwork-1.0/Diagram";
         public static final String Diagram_DefaultPipeTechTypeId = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/DefaultPipeTechTypeId";
         public static final String Diagram_DefaultPipeTechTypeId_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/DefaultPipeTechTypeId/Inverse";
@@ -506,12 +507,18 @@ public class DistrictNetworkResource {
         public static final String Diagram_Visualisations_KeyVariableEdgeHover_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/Visualisations/KeyVariableEdgeHover/Inverse";
         public static final String Diagram_Visualisations_KeyVariableVertexHover = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/Visualisations/KeyVariableVertexHover";
         public static final String Diagram_Visualisations_KeyVariableVertexHover_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/Visualisations/KeyVariableVertexHover/Inverse";
+        public static final String Diagram_Visualisations_NotInSimulation = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/Visualisations/NotInSimulation";
+        public static final String Diagram_Visualisations_NotInSimulation_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/Visualisations/NotInSimulation/Inverse";
         public static final String Diagram_Visualisations_ResetVisualisation = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/Visualisations/ResetVisualisation";
         public static final String Diagram_Visualisations_ResetVisualisation_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/Visualisations/ResetVisualisation/Inverse";
         public static final String Diagram_Visualisations_ShowColorBarTicks = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/Visualisations/ShowColorBarTicks";
         public static final String Diagram_Visualisations_ShowColorBarTicks_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/Visualisations/ShowColorBarTicks/Inverse";
         public static final String Diagram_Visualisations_ShowColorBars = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/Visualisations/ShowColorBars";
         public static final String Diagram_Visualisations_ShowColorBars_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/Visualisations/ShowColorBars/Inverse";
+        public static final String Diagram_Visualisations_ShowConnectedComponents = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/Visualisations/ShowConnectedComponents";
+        public static final String Diagram_Visualisations_ShowConnectedComponents_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/Visualisations/ShowConnectedComponents/Inverse";
+        public static final String Diagram_Visualisations_ShowElevationServerBoundingBox = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/Visualisations/ShowElevationServerBoundingBox";
+        public static final String Diagram_Visualisations_ShowElevationServerBoundingBox_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/Visualisations/ShowElevationServerBoundingBox/Inverse";
         public static final String Diagram_Visualisations_ShowSizeBarTicks = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/Visualisations/ShowSizeBarTicks";
         public static final String Diagram_Visualisations_ShowSizeBarTicks_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/Visualisations/ShowSizeBarTicks/Inverse";
         public static final String Diagram_Visualisations_ShowSizeBars = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/Visualisations/ShowSizeBars";
@@ -613,7 +620,6 @@ public class DistrictNetworkResource {
         public static final String Diagram_splitToMultipleEnabled_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/splitToMultipleEnabled/Inverse";
         public static final String Diagram_trackChangesEnabled = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/trackChangesEnabled";
         public static final String Diagram_trackChangesEnabled_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/trackChangesEnabled/Inverse";
-        public static final String DistrictNetworkStaticInfoStyle = "http://www.simantics.org/DistrictNetwork-1.0/DistrictNetworkStaticInfoStyle";
         public static final String DistrictNodeGroup = "http://www.simantics.org/DistrictNetwork-1.0/DistrictNodeGroup";
         public static final String DistrictNodeGroup_hasComponentTypeName = "http://www.simantics.org/DistrictNetwork-1.0/DistrictNodeGroup/hasComponentTypeName";
         public static final String DistrictNodeGroup_hasComponentTypeName_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/DistrictNodeGroup/hasComponentTypeName/Inverse";
@@ -643,7 +649,6 @@ public class DistrictNetworkResource {
         public static final String Edge_HasTGround = "http://www.simantics.org/DistrictNetwork-1.0/Edge/HasTGround";
         public static final String Edge_HasTGround_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Edge/HasTGround/Inverse";
         public static final String Element = "http://www.simantics.org/DistrictNetwork-1.0/Element";
-        public static final String ElevationRectangleStyle = "http://www.simantics.org/DistrictNetwork-1.0/ElevationRectangleStyle";
         public static final String Functions = "http://www.simantics.org/DistrictNetwork-1.0/Functions";
         public static final String Functions_compositeInstantiator = "http://www.simantics.org/DistrictNetwork-1.0/Functions/compositeInstantiator";
         public static final String Functions_constantOne = "http://www.simantics.org/DistrictNetwork-1.0/Functions/constantOne";
@@ -824,7 +829,6 @@ public class DistrictNetworkResource {
         public static final String VertexDefaultMapping = "http://www.simantics.org/DistrictNetwork-1.0/VertexDefaultMapping";
         public static final String VertexDefaultMapping_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/VertexDefaultMapping/Inverse";
         public static final String VertexMappingParameterType = "http://www.simantics.org/DistrictNetwork-1.0/VertexMappingParameterType";
-        public static final String VertexSymbolStyle = "http://www.simantics.org/DistrictNetwork-1.0/VertexSymbolStyle";
         public static final String Vertex_HasAddress = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasAddress";
         public static final String Vertex_HasAddress_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasAddress/Inverse";
         public static final String Vertex_HasAltElevation = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasAltElevation";
@@ -923,7 +927,6 @@ public class DistrictNetworkResource {
         BrowseContext = getResourceOrNull(graph, URIs.BrowseContext);
         Composite = getResourceOrNull(graph, URIs.Composite);
         Connection = getResourceOrNull(graph, URIs.Connection);
-        ConnectionLineStyle = getResourceOrNull(graph, URIs.ConnectionLineStyle);
         Diagram = getResourceOrNull(graph, URIs.Diagram);
         Diagram_DefaultPipeTechTypeId = getResourceOrNull(graph, URIs.Diagram_DefaultPipeTechTypeId);
         Diagram_DefaultPipeTechTypeId_Inverse = getResourceOrNull(graph, URIs.Diagram_DefaultPipeTechTypeId_Inverse);
@@ -964,12 +967,18 @@ public class DistrictNetworkResource {
         Diagram_Visualisations_KeyVariableEdgeHover_Inverse = getResourceOrNull(graph, URIs.Diagram_Visualisations_KeyVariableEdgeHover_Inverse);
         Diagram_Visualisations_KeyVariableVertexHover = getResourceOrNull(graph, URIs.Diagram_Visualisations_KeyVariableVertexHover);
         Diagram_Visualisations_KeyVariableVertexHover_Inverse = getResourceOrNull(graph, URIs.Diagram_Visualisations_KeyVariableVertexHover_Inverse);
+        Diagram_Visualisations_NotInSimulation = getResourceOrNull(graph, URIs.Diagram_Visualisations_NotInSimulation);
+        Diagram_Visualisations_NotInSimulation_Inverse = getResourceOrNull(graph, URIs.Diagram_Visualisations_NotInSimulation_Inverse);
         Diagram_Visualisations_ResetVisualisation = getResourceOrNull(graph, URIs.Diagram_Visualisations_ResetVisualisation);
         Diagram_Visualisations_ResetVisualisation_Inverse = getResourceOrNull(graph, URIs.Diagram_Visualisations_ResetVisualisation_Inverse);
         Diagram_Visualisations_ShowColorBarTicks = getResourceOrNull(graph, URIs.Diagram_Visualisations_ShowColorBarTicks);
         Diagram_Visualisations_ShowColorBarTicks_Inverse = getResourceOrNull(graph, URIs.Diagram_Visualisations_ShowColorBarTicks_Inverse);
         Diagram_Visualisations_ShowColorBars = getResourceOrNull(graph, URIs.Diagram_Visualisations_ShowColorBars);
         Diagram_Visualisations_ShowColorBars_Inverse = getResourceOrNull(graph, URIs.Diagram_Visualisations_ShowColorBars_Inverse);
+        Diagram_Visualisations_ShowConnectedComponents = getResourceOrNull(graph, URIs.Diagram_Visualisations_ShowConnectedComponents);
+        Diagram_Visualisations_ShowConnectedComponents_Inverse = getResourceOrNull(graph, URIs.Diagram_Visualisations_ShowConnectedComponents_Inverse);
+        Diagram_Visualisations_ShowElevationServerBoundingBox = getResourceOrNull(graph, URIs.Diagram_Visualisations_ShowElevationServerBoundingBox);
+        Diagram_Visualisations_ShowElevationServerBoundingBox_Inverse = getResourceOrNull(graph, URIs.Diagram_Visualisations_ShowElevationServerBoundingBox_Inverse);
         Diagram_Visualisations_ShowSizeBarTicks = getResourceOrNull(graph, URIs.Diagram_Visualisations_ShowSizeBarTicks);
         Diagram_Visualisations_ShowSizeBarTicks_Inverse = getResourceOrNull(graph, URIs.Diagram_Visualisations_ShowSizeBarTicks_Inverse);
         Diagram_Visualisations_ShowSizeBars = getResourceOrNull(graph, URIs.Diagram_Visualisations_ShowSizeBars);
@@ -1071,7 +1080,6 @@ public class DistrictNetworkResource {
         Diagram_splitToMultipleEnabled_Inverse = getResourceOrNull(graph, URIs.Diagram_splitToMultipleEnabled_Inverse);
         Diagram_trackChangesEnabled = getResourceOrNull(graph, URIs.Diagram_trackChangesEnabled);
         Diagram_trackChangesEnabled_Inverse = getResourceOrNull(graph, URIs.Diagram_trackChangesEnabled_Inverse);
-        DistrictNetworkStaticInfoStyle = getResourceOrNull(graph, URIs.DistrictNetworkStaticInfoStyle);
         DistrictNodeGroup = getResourceOrNull(graph, URIs.DistrictNodeGroup);
         DistrictNodeGroup_hasComponentTypeName = getResourceOrNull(graph, URIs.DistrictNodeGroup_hasComponentTypeName);
         DistrictNodeGroup_hasComponentTypeName_Inverse = getResourceOrNull(graph, URIs.DistrictNodeGroup_hasComponentTypeName_Inverse);
@@ -1101,7 +1109,6 @@ public class DistrictNetworkResource {
         Edge_HasTGround = getResourceOrNull(graph, URIs.Edge_HasTGround);
         Edge_HasTGround_Inverse = getResourceOrNull(graph, URIs.Edge_HasTGround_Inverse);
         Element = getResourceOrNull(graph, URIs.Element);
-        ElevationRectangleStyle = getResourceOrNull(graph, URIs.ElevationRectangleStyle);
         Functions = getResourceOrNull(graph, URIs.Functions);
         Functions_compositeInstantiator = getResourceOrNull(graph, URIs.Functions_compositeInstantiator);
         Functions_constantOne = getResourceOrNull(graph, URIs.Functions_constantOne);
@@ -1282,7 +1289,6 @@ public class DistrictNetworkResource {
         VertexDefaultMapping = getResourceOrNull(graph, URIs.VertexDefaultMapping);
         VertexDefaultMapping_Inverse = getResourceOrNull(graph, URIs.VertexDefaultMapping_Inverse);
         VertexMappingParameterType = getResourceOrNull(graph, URIs.VertexMappingParameterType);
-        VertexSymbolStyle = getResourceOrNull(graph, URIs.VertexSymbolStyle);
         Vertex_HasAddress = getResourceOrNull(graph, URIs.Vertex_HasAddress);
         Vertex_HasAddress_Inverse = getResourceOrNull(graph, URIs.Vertex_HasAddress_Inverse);
         Vertex_HasAltElevation = getResourceOrNull(graph, URIs.Vertex_HasAltElevation);

diff --git a/org.simantics.district.network/META-INF/MANIFEST.MF b/org.simantics.district.network/META-INF/MANIFEST.MF
index f5976e2652b317ba2ead9c0aa5697c5efbf8d204..f49358b930c22c1b77c4c87d6a12a0430b507a5c 100644 (file)
--- a/org.simantics.district.network/META-INF/MANIFEST.MF
+++ b/org.simantics.district.network/META-INF/MANIFEST.MF
@@ -20,8 +20,7 @@ Require-Bundle: org.simantics.db,
  org.simantics.modeling,
  org.simantics.db.indexing,
  org.simantics.scl.osgi,
- org.eclipse.collections.eclipse-collections,
- org.eclipse.collections.eclipse-collections-api,
+ org.eclipse.collections,
  org.simantics.structural.synchronization.client
 Export-Package: org.simantics.district.network,
  org.simantics.district.network.changeset,