From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 23 Oct 2019 22:01:23 +0000 (+0000)
Subject: Merge "Allow product-specific customization of new network diagram creation"
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=81cb57a515193f9d1167d35a7cfde321e4e7a993;p=simantics%2Fdistrict.git

Merge "Allow product-specific customization of new network diagram creation"
---

81cb57a515193f9d1167d35a7cfde321e4e7a993
diff --cc org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java
index abcf4482,8644aaa0..eeaa39e5
--- 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
@@@ -13,8 -13,9 +13,7 @@@ public class DistrictNetworkResource 
      public final Resource ActionContext;
      public final Resource ActionContext_newDiagramContribution;
      public final Resource Actions;
-     public final Resource Actions_NewDNDiagram;
      public final Resource AddLayerToDNDiagramTemplate;
 -    public final Resource ArrowLengthPropertyParameterType;
 -    public final Resource ArrowLengthStyle;
      public final Resource BrowseContext;
      public final Resource Composite;
      public final Resource Connection;
@@@ -449,8 -463,9 +448,7 @@@
          public static final String ActionContext = "http://www.simantics.org/DistrictNetwork-1.0/ActionContext";
          public static final String ActionContext_newDiagramContribution = "http://www.simantics.org/DistrictNetwork-1.0/ActionContext/newDiagramContribution";
          public static final String Actions = "http://www.simantics.org/DistrictNetwork-1.0/Actions";
-         public static final String Actions_NewDNDiagram = "http://www.simantics.org/DistrictNetwork-1.0/Actions/NewDNDiagram";
          public static final String AddLayerToDNDiagramTemplate = "http://www.simantics.org/DistrictNetwork-1.0/AddLayerToDNDiagramTemplate";
 -        public static final String ArrowLengthPropertyParameterType = "http://www.simantics.org/DistrictNetwork-1.0/ArrowLengthPropertyParameterType";
 -        public static final String ArrowLengthStyle = "http://www.simantics.org/DistrictNetwork-1.0/ArrowLengthStyle";
          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";
@@@ -895,8 -923,9 +893,7 @@@
          ActionContext = getResourceOrNull(graph, URIs.ActionContext);
          ActionContext_newDiagramContribution = getResourceOrNull(graph, URIs.ActionContext_newDiagramContribution);
          Actions = getResourceOrNull(graph, URIs.Actions);
-         Actions_NewDNDiagram = getResourceOrNull(graph, URIs.Actions_NewDNDiagram);
          AddLayerToDNDiagramTemplate = getResourceOrNull(graph, URIs.AddLayerToDNDiagramTemplate);
 -        ArrowLengthPropertyParameterType = getResourceOrNull(graph, URIs.ArrowLengthPropertyParameterType);
 -        ArrowLengthStyle = getResourceOrNull(graph, URIs.ArrowLengthStyle);
          BrowseContext = getResourceOrNull(graph, URIs.BrowseContext);
          Composite = getResourceOrNull(graph, URIs.Composite);
          Connection = getResourceOrNull(graph, URIs.Connection);