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

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 e15f5036d..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 {