X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.db.common%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fcommon%2Furi%2FUnescapedChildMapOfResource.java;h=7713535b50ddcf5b4366070ed644ddc5185875c6;hp=a3743f6377a46274d170cc473f28a2c50c943468;hb=0d9b90834ce56b292c00b1a39850ed842c3e4d42;hpb=2a8d452434358e28cb826744bc01755a46455afd

diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/uri/UnescapedChildMapOfResource.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/uri/UnescapedChildMapOfResource.java
index a3743f637..7713535b5 100644
--- a/bundles/org.simantics.db.common/src/org/simantics/db/common/uri/UnescapedChildMapOfResource.java
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/uri/UnescapedChildMapOfResource.java
@@ -1,56 +1,32 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management
- * in Industry THTH ry.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.db.common.uri;
-
-import java.util.Collection;
-import java.util.Map;
-
-import org.simantics.databoard.Bindings;
-import org.simantics.db.ReadGraph;
-import org.simantics.db.Resource;
-import org.simantics.db.common.request.ResourceRead;
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.service.CollectionSupport;
-import org.simantics.layer0.Layer0;
-import org.simantics.utils.Development;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class UnescapedChildMapOfResource extends ResourceRead<Map<String, Resource>> {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(UnescapedChildMapOfResource.class);
-
-	public UnescapedChildMapOfResource(Resource resource) {
-	    super(resource);
-	}
-	
-	@Override
-	public Map<String, Resource> perform(ReadGraph graph) throws DatabaseException {
-	    Layer0 L0 = Layer0.getInstance(graph);
-	    Collection<Resource> objects = graph.getObjects(resource, L0.ConsistsOf);
-	    CollectionSupport cs = graph.getService(CollectionSupport.class);
-	    Map<String,Resource> result = cs.createObjectResourceMap(String.class, objects.size());
-	    for(Resource r : objects) {
-	        String name = graph.getPossibleRelatedValue(r, L0.HasName, Bindings.STRING);
-	        if(name != null) {
-	            Resource old = result.put(name, r);
-	            if (old != null)
-	                LOGGER.error("The database contains siblings with the same name " + name + " (resource=$" + resource.getResourceId() + ", child=$" + r.getResourceId() + ", previous child=$" + old.getResourceId() + ").");
-	        } else {
-	        	if(Development.DEVELOPMENT)
-	        	    LOGGER.error("The database contains a child with no unique name (resource=$" + resource.getResourceId() + ", child=$" + r.getResourceId() + ").");
-	        }
-	    }
-	    return result;
-	}	
-	
-}
+/*******************************************************************************
+ * Copyright (c) 2007, 2018 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.db.common.uri;
+
+import java.util.Map;
+
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.common.request.ResourceRead;
+import org.simantics.db.exception.DatabaseException;
+
+public class UnescapedChildMapOfResource extends ResourceRead<Map<String, Resource>> {
+
+	public UnescapedChildMapOfResource(Resource resource) {
+		super(resource);
+	}
+
+	@Override
+	public Map<String, Resource> perform(ReadGraph graph) throws DatabaseException {
+		return graph.getChildren(resource);
+	}
+
+}