X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.modeling%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Ftypicals%2FTypicalUtil.java;h=952cd286271560e20a712d788d5510fb65ab399a;hb=80d69fc3f7a2e14c5b9e44a601ba15b0434454a8;hp=9c29290a50e03e2e1da3e01c6afc591aa6b4d9ea;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/typicals/TypicalUtil.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/typicals/TypicalUtil.java
index 9c29290a5..952cd2862 100644
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/typicals/TypicalUtil.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/typicals/TypicalUtil.java
@@ -130,21 +130,21 @@ public class TypicalUtil {
         }
     };
 
-    public static Collection<NamedResource> toNamedResources(RequestProcessor processor, final Collection<Resource> rs) throws DatabaseException {
+    public static List<NamedResource> toNamedResources(RequestProcessor processor, final Collection<Resource> rs) throws DatabaseException {
         return toNamedResources(processor, rs, new TypicalNamingFunction());
     }
 
-    public static Collection<NamedResource> toNamedResources(RequestProcessor processor, final Collection<Resource> rs, final Function2<ReadGraph, Resource, String> namingFunction) throws DatabaseException {
-        return processor.syncRequest(new UniqueRead<Collection<NamedResource>>() {
+    public static List<NamedResource> toNamedResources(RequestProcessor processor, final Collection<Resource> rs, final Function2<ReadGraph, Resource, String> namingFunction) throws DatabaseException {
+        return processor.syncRequest(new UniqueRead<List<NamedResource>>() {
             @Override
-            public Collection<NamedResource> perform(ReadGraph graph) throws DatabaseException {
+            public List<NamedResource> perform(ReadGraph graph) throws DatabaseException {
                 return toNamedResources(graph, rs, namingFunction);
             }
         });
     }
 
-    public static Collection<NamedResource> toNamedResources(ReadGraph graph, Collection<Resource> rs, final Function2<ReadGraph, Resource, String> namingFunction) throws DatabaseException {
-        Collection<NamedResource> result = new ArrayList<NamedResource>(rs.size());
+    public static List<NamedResource> toNamedResources(ReadGraph graph, Collection<Resource> rs, final Function2<ReadGraph, Resource, String> namingFunction) throws DatabaseException {
+        List<NamedResource> result = new ArrayList<>(rs.size());
         for (Resource r : rs)
             result.add(new NamedResource(namingFunction.apply(graph, r), r));
         return result;
@@ -157,8 +157,11 @@ public class TypicalUtil {
         return s;
     }
 
-    public static WriteResult<Resource> instantiateTemplate(final Resource target, final NamedResource template,
-            final Consumer<Pair<WriteGraph, Resource>> successContinuation) {
+    public static WriteResult<Resource> instantiateTemplate(
+            Resource target,
+            NamedResource template,
+            Consumer<Pair<WriteGraph, Resource>> successContinuation)
+    {
         return new WriteResultRequest<Resource>() {
             @Override
             public Resource perform(WriteGraph graph) throws DatabaseException {
@@ -619,15 +622,19 @@ public class TypicalUtil {
                 // Attach the same symbol contributions to the created typical
                 // diagram type as are attached to the model-designated
                 // contribution source diagram type.
+                boolean clonedIndexRootContribution = false;
                 for (Resource symbolContributionSource : cloneSymbolContributionsFrom) {
                     for (Resource contribution : graph.getObjects(symbolContributionSource, DIA.HasSymbolContribution)) {
                         graph.claim(diagramType, DIA.HasSymbolContribution, contribution);
+                        clonedIndexRootContribution |= graph.isInstanceOf(contribution, DIA.IndexRootSymbolContribution);
                     }
                 }
 
-                Resource indexContribution = graph.newResource();
-                graph.claim(indexContribution, L0.InstanceOf, DIA.IndexRootSymbolContribution);
-                graph.claim(diagramType, DIA.HasSymbolContribution, indexContribution);
+                if (!clonedIndexRootContribution) {
+                    Resource indexContribution = graph.newResource();
+                    graph.claim(indexContribution, L0.InstanceOf, DIA.IndexRootSymbolContribution);
+                    graph.claim(diagramType, DIA.HasSymbolContribution, indexContribution);
+                }
 
                 // Add comment to change set.
                 CommentMetadata cm = graph.getMetadata(CommentMetadata.class);