Added DN.Element as base type for DH diagram elements

Removed useless part descriptor from fragment.e4xmi.

gitlab #9

Change-Id: I34c7003e4e2655f16ab02b356e90a512bce953da
(cherry picked from commit 1e6f4461465fc45d71b30535d02bbe1cd7672d4a)

diff --git a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
index 8b42129cb035cc2fefd4a968268053e77b35daa6..435bd55d9813e30a19bb8ab66e0ae8c26342d26a 100644 (file)
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -15,11 +15,13 @@ DN = <http://www.simantics.org/DistrictNetwork-1.0> : L0.Ontology
 
 DN.Layer <T DIA.Layer
 
-DN.Edge <T DIA.Element : L0.Type
+DN.Element <T DIA.Element : L0.Type
+
+DN.Edge <T DN.Element
     @L0.assert DN.Edge.HasDiameter 0.1
     @L0.assert DN.Edge.HasOuterDiameter 0.11
 
-DN.Vertex <T DIA.Element : L0.Type
+DN.Vertex <T DN.Element
     @L0.assert DN.Vertex.HasElevation 0.0
 
 DN.EdgeDefaultMapping <R L0.HasProperty : DN.EdgeMappingParameterType
@@ -370,7 +372,7 @@ DN.DistrictProfile : DIA.Profile
 DN.Groups : L0.Library
 
 DN.Groups.ElementGroup : DIA.TypeGroup
-  DIA.TypeGroup.HasType DIA.Element
+  DIA.TypeGroup.HasType DN.Element
 
 DN.ComponentNameStyle : DIA.ResourceSCLTextGridStyle
     @MOD.scl DIA.ResourceSCLTextGridStyle.texts 

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 5859e2fdc9836a0762c36151c00d8efe1756d63f..159af7ba9fdd92402907b8d886240ac3e0238315 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
@@ -22,6 +22,7 @@ public class DistrictNetworkResource {
     public final Resource Connection;
     public final Resource Diagram;
     public final Resource Diagram_MappedDiagram;
+    public final Resource Diagram_MappedFromDiagram;
     public final Resource DistrictProfile;
     public final Resource DistrictProfile_entry;
     public final Resource DistrictProfile_entry1;
@@ -48,6 +49,7 @@ public class DistrictNetworkResource {
     public final Resource Edge_HasOuterDiameter_Inverse;
     public final Resource Edge_HasTGround;
     public final Resource Edge_HasTGround_Inverse;
+    public final Resource Element;
     public final Resource Functions;
     public final Resource Functions_compositeInstantiator;
     public final Resource Functions_convertToValue;
@@ -78,6 +80,7 @@ public class DistrictNetworkResource {
     public final Resource InLayer;
     public final Resource Layer;
     public final Resource MappedComponent;
+    public final Resource MappedFromElement;
     public final Resource Mapping;
     public final Resource MappingParameterType;
     public final Resource Mapping_Base;
@@ -217,6 +220,7 @@ public class DistrictNetworkResource {
         public static final String Connection = "http://www.simantics.org/DistrictNetwork-1.0/Connection";
         public static final String Diagram = "http://www.simantics.org/DistrictNetwork-1.0/Diagram";
         public static final String Diagram_MappedDiagram = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/MappedDiagram";
+        public static final String Diagram_MappedFromDiagram = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/MappedFromDiagram";
         public static final String DistrictProfile = "http://www.simantics.org/DistrictNetwork-1.0/DistrictProfile";
         public static final String DistrictProfile_entry = "http://www.simantics.org/DistrictNetwork-1.0/DistrictProfile/entry";
         public static final String DistrictProfile_entry1 = "http://www.simantics.org/DistrictNetwork-1.0/DistrictProfile/entry1";
@@ -243,6 +247,7 @@ public class DistrictNetworkResource {
         public static final String Edge_HasOuterDiameter_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Edge/HasOuterDiameter/Inverse";
         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 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_convertToValue = "http://www.simantics.org/DistrictNetwork-1.0/Functions/convertToValue";
@@ -273,6 +278,7 @@ public class DistrictNetworkResource {
         public static final String InLayer = "http://www.simantics.org/DistrictNetwork-1.0/InLayer";
         public static final String Layer = "http://www.simantics.org/DistrictNetwork-1.0/Layer";
         public static final String MappedComponent = "http://www.simantics.org/DistrictNetwork-1.0/MappedComponent";
+        public static final String MappedFromElement = "http://www.simantics.org/DistrictNetwork-1.0/MappedFromElement";
         public static final String Mapping = "http://www.simantics.org/DistrictNetwork-1.0/Mapping";
         public static final String MappingParameterType = "http://www.simantics.org/DistrictNetwork-1.0/MappingParameterType";
         public static final String Mapping_Base = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/Base";
@@ -422,6 +428,7 @@ public class DistrictNetworkResource {
         Connection = getResourceOrNull(graph, URIs.Connection);
         Diagram = getResourceOrNull(graph, URIs.Diagram);
         Diagram_MappedDiagram = getResourceOrNull(graph, URIs.Diagram_MappedDiagram);
+        Diagram_MappedFromDiagram = getResourceOrNull(graph, URIs.Diagram_MappedFromDiagram);
         DistrictProfile = getResourceOrNull(graph, URIs.DistrictProfile);
         DistrictProfile_entry = getResourceOrNull(graph, URIs.DistrictProfile_entry);
         DistrictProfile_entry1 = getResourceOrNull(graph, URIs.DistrictProfile_entry1);
@@ -448,6 +455,7 @@ public class DistrictNetworkResource {
         Edge_HasOuterDiameter_Inverse = getResourceOrNull(graph, URIs.Edge_HasOuterDiameter_Inverse);
         Edge_HasTGround = getResourceOrNull(graph, URIs.Edge_HasTGround);
         Edge_HasTGround_Inverse = getResourceOrNull(graph, URIs.Edge_HasTGround_Inverse);
+        Element = getResourceOrNull(graph, URIs.Element);
         Functions = getResourceOrNull(graph, URIs.Functions);
         Functions_compositeInstantiator = getResourceOrNull(graph, URIs.Functions_compositeInstantiator);
         Functions_convertToValue = getResourceOrNull(graph, URIs.Functions_convertToValue);
@@ -478,6 +486,7 @@ public class DistrictNetworkResource {
         InLayer = getResourceOrNull(graph, URIs.InLayer);
         Layer = getResourceOrNull(graph, URIs.Layer);
         MappedComponent = getResourceOrNull(graph, URIs.MappedComponent);
+        MappedFromElement = getResourceOrNull(graph, URIs.MappedFromElement);
         Mapping = getResourceOrNull(graph, URIs.Mapping);
         MappingParameterType = getResourceOrNull(graph, URIs.MappingParameterType);
         Mapping_Base = getResourceOrNull(graph, URIs.Mapping_Base);

diff --git a/org.simantics.district.network.ui/fragment.e4xmi b/org.simantics.district.network.ui/fragment.e4xmi
index c879a4f98c8518d366ceeb24d425f1bfae782ffb..197f7f192727955f976e0954a7e3323b89d3a4d8 100644 (file)
--- a/org.simantics.district.network.ui/fragment.e4xmi
+++ b/org.simantics.district.network.ui/fragment.e4xmi
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/descriptor/basic" 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="_lkvWIML0Eea1mdgpHNVHMA">
+<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="_lkvWIML0Eea1mdgpHNVHMA">
   <imports xsi:type="commands:Command" xmi:id="_luNasN8NEeaigNyzMJBOrg" elementId="org.simantics.modeling.ui.importSVG"/>
-  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_nMVscML8Eea1mdgpHNVHMA" featurename="descriptors" parentElementId="xpath:/">
-    <elements xsi:type="basic:PartDescriptor" xmi:id="_bSU8EML9Eea1mdgpHNVHMA" elementId="org.simantics.district.network.ui.partdescriptor.districteditor" label="District Editor" tooltip="Test" contributionURI="bundleclass://org.simantics.district.network.ui/org.simantics.district.network.ui.DistrictEditor"/>
-  </fragments>
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_4mZBIML_Eea1mdgpHNVHMA" featurename="commands" parentElementId="xpath:/">
     <elements xsi:type="commands:Command" xmi:id="_A1HBQOFYEeaJP6VyXP72Jw" elementId="org.simantics.district.network.ui.joinVertices" commandName="Join Vertices"/>
     <elements xsi:type="commands:Command" xmi:id="_QzdUQOIcEeaJP6VyXP72Jw" elementId="org.simantics.district.network.ui.setFocusable" commandName="Set Focusable"/>