X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.db.layer0%2Fsrc%2Forg%2Fsimantics%2Fdb%2Flayer0%2Futil%2FLayer0Utils.java;h=c04ca3cd1e0b758d1d66a8a8628887dab576f5cc;hp=5ccfcf325f49df3f919f6ee54f34b3d0f2033960;hb=e19c37f84fd1ce2d946578f7c05f3e45444ba67a;hpb=3f5adda763f6281e9988277d067c1f71615e3da2

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Layer0Utils.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Layer0Utils.java
index 5ccfcf325..c04ca3cd1 100644
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Layer0Utils.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Layer0Utils.java
@@ -54,6 +54,7 @@ import org.simantics.databoard.type.StringType;
 import org.simantics.databoard.type.UnionType;
 import org.simantics.databoard.type.VariantType;
 import org.simantics.databoard.util.ObjectUtils;
+import org.simantics.datatypes.literal.GUID;
 import org.simantics.db.ChangeSetIdentifier;
 import org.simantics.db.Operation;
 import org.simantics.db.ReadGraph;
@@ -569,16 +570,16 @@ public class Layer0Utils {
 
 	}
 
-	public static void claimAdaptedValue(WriteGraph graph, Resource objectResource, Object value, Binding binding, Datatype datatype) throws DatabaseException {
+	public static void claimAdaptedValue(WriteGraph graph, Resource objectResource, Object value, Binding binding, Datatype targetDatatype) throws DatabaseException {
 
 		try {
 
-			Datatype source = binding.type();
-			if(source.equals(datatype)) {
+			Datatype sourceDatatype = binding.type();
+			if(sourceDatatype.equals(targetDatatype)) {
 				graph.claimValue(objectResource, value, binding);
 			} else {
-				Binding target = Bindings.getBinding(datatype);
-				Adapter adapter = Bindings.getAdapter(binding, target);
+				Binding target = Bindings.getBinding(targetDatatype);
+				Adapter adapter = Bindings.getTypeAdapter(binding, target);
 				graph.claimValue(objectResource, adapter.adapt(value), target);
 			}
 
@@ -1387,18 +1388,46 @@ public class Layer0Utils {
         return PrettyPrintTG.print(tg, ignoreIdentifiers);
     }
 
-    public static Resource getPossibleAssertedObject(ReadGraph graph, Resource resource, Resource predicate) throws DatabaseException {
-    	Resource result = null;
-    	for(Resource type : graph.getPrincipalTypes(resource)) {
-    		Collection<Resource> rs = graph.getAssertedObjects(type, predicate);
-    		if(rs.size() > 1) return null;
-    		if(rs.size() == 1) {
-    			Resource ass = rs.iterator().next();
-    			if (result != null && !result.equals(ass)) return null;
-    			result = ass;
-    		}
-    	}
-    	return result;
+    /**
+     * Adds a random {@link GUID} as a value for <code>L0.identifier</code>
+     * 
+     * @param graph
+     * @param component
+     *            for which the identifier is added
+     * @param add
+     *            <code>true</code> to invoke addLiteral, <code>false</code> to
+     *            invoke claimLiteral
+     * @throws DatabaseException
+     */
+    public static void claimNewIdentifier(WriteGraph graph, Resource component, boolean add) throws DatabaseException {
+        Layer0 L0 = Layer0.getInstance(graph);
+        GUID guid = GUID.random();
+        if (add)
+            graph.addLiteral(component, L0.identifier, L0.identifier_Inverse, L0.GUID, guid, GUID.BINDING);
+        else
+            graph.claimLiteral(component, L0.identifier, L0.identifier_Inverse, L0.GUID, guid, GUID.BINDING);
+    }
+
+    /**
+     * Sets a new random unique identifier for the specified entity if it already
+     * has an identifier. If the entity does not have a previous identifier, nothing
+     * is done.
+     * 
+     * @param graph
+     * @param entity
+     *            for which the identifier is added
+     * @return <code>true</code> if the identifier was renewed, <code>false</code>
+     *         otherwise
+     * @throws DatabaseException
+     * @see {@link #claimNewIdentifier(WriteGraph, Resource, boolean)}
+     */
+    public static boolean renewIdentifier(WriteGraph graph, Resource entity) throws DatabaseException {
+        Layer0 L0 = Layer0.getInstance(graph);
+        Statement stm = graph.getPossibleStatement(entity, L0.identifier);
+        if (stm != null) {
+            graph.claimValue(stm.getObject(), GUID.random(), GUID.BINDING);
+            return true;
+        }
+        return false;
     }
-    
 }