X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.structural2%2Fsrc%2Forg%2Fsimantics%2Fstructural2%2Fqueries%2FConnectionPointMapOfResource.java;fp=bundles%2Forg.simantics.structural2%2Fsrc%2Forg%2Fsimantics%2Fstructural2%2Fqueries%2FConnectionPointMapOfResource.java;h=d7ba2901bc09bfe814b1fbace9a3ff91b8803908;hb=3850fec72035293b9a4ede780d01aedc5fbc9056;hp=3b2e42ae77f184f9e77bd141a9eef634eb495a9f;hpb=1e957fc9da518f3bef8a2c19cad72772087e1b6a;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.structural2/src/org/simantics/structural2/queries/ConnectionPointMapOfResource.java b/bundles/org.simantics.structural2/src/org/simantics/structural2/queries/ConnectionPointMapOfResource.java index 3b2e42ae7..d7ba2901b 100644 --- a/bundles/org.simantics.structural2/src/org/simantics/structural2/queries/ConnectionPointMapOfResource.java +++ b/bundles/org.simantics.structural2/src/org/simantics/structural2/queries/ConnectionPointMapOfResource.java @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; import gnu.trove.map.hash.THashMap; -public class ConnectionPointMapOfResource extends TransientResourceRead> { +public class ConnectionPointMapOfResource extends TransientResourceRead> { private static final Logger LOGGER = LoggerFactory.getLogger(ConnectionPointMapOfResource.class); @@ -41,18 +41,18 @@ public class ConnectionPointMapOfResource extends TransientResourceRead perform(ReadGraph graph, Resource resource) throws DatabaseException { + public Map perform(ReadGraph graph, Resource resource) throws DatabaseException { Collection predicates = graph.getPredicates(resource); - THashMap result = null; + THashMap result = null; for(Resource predicate : predicates) { PropertyInfo info = graph.syncRequest(new PossibleConnectionPointInfo(predicate), TransientCacheAsyncListener.instance()); if(info != null) { - if (result == null) result = new THashMap(predicates.size()); - if (result.put(info.name, predicate) != null) + if (result == null) result = new THashMap(predicates.size()); + if (result.put(info.name, info) != null) LOGGER.error("The database contains siblings with the same name " + info.name + " (resource=$" + resource.getResourceId() + ")."); }