Use unique names at the model scope instead of pipe run

[simantics/3d.git] / org.simantics.objmap2 / src / org / simantics / objmap / structural / rules / domain / StructuralRelatedObjectsAccessor.java

diff --git a/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/StructuralRelatedObjectsAccessor.java b/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/StructuralRelatedObjectsAccessor.java
index ce1295cfe9df5e41367de0d33c0d06f332561764..c2bc6f9eebe67f19807390c42a7227519868a59b 100644 (file)
--- a/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/StructuralRelatedObjectsAccessor.java
+++ b/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/StructuralRelatedObjectsAccessor.java
@@ -21,12 +21,10 @@ import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;\r
 import org.simantics.db.WriteGraph;\r
 import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.layer0.Layer0;\r
 import org.simantics.objmap.exceptions.MappingException;\r
 import org.simantics.objmap.graph.rules.domain.IDomainAccessor;\r
 import org.simantics.objmap.graph.rules.domain.MappingUtils;\r
 import org.simantics.objmap.structural.StructuralResource;\r
-import org.simantics.structural.stubs.StructuralResource2;\r
 \r
 \r
 public class StructuralRelatedObjectsAccessor implements IDomainAccessor<StructuralResource,Collection<StructuralResource>> {\r
@@ -48,7 +46,7 @@ public class StructuralRelatedObjectsAccessor implements IDomainAccessor<Structu
                    LOGGER.info("        RelatedObjectsAccessor.get");\r
                        \r
                    if (!element.isStructural())\r
-                       return Collections.EMPTY_LIST;\r
+                       return Collections.emptyList();\r
                    \r
                    // Structural instance\r
                    Resource instance = StructuralUtils.getContainingInstance(element);\r
@@ -56,7 +54,7 @@ public class StructuralRelatedObjectsAccessor implements IDomainAccessor<Structu
                    Resource publicRelation = StructuralUtils.getPublishedRelation(g, element, relation);\r
                    \r
                    if (publicRelation == null)\r
-                     return Collections.EMPTY_LIST;\r
+                     return Collections.emptyList();\r
                    \r
                    Collection<Resource> coll = g.getObjects(instance, publicRelation);\r
                        List<StructuralResource> result = new ArrayList<StructuralResource>(coll.size());\r