X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.graph%2Fsrc%2Forg%2Fsimantics%2Fgraph%2Frepresentation%2FTransferableGraphUtils.java;h=10637ad65caf0d861d52e3d1adfffdee66d5f2ca;hp=4b113fa499b6bc1208d64b62e2be5be66713cc10;hb=c3adc8c88589a2b987ea524dd7139bc7da5c7178;hpb=e3f78a075fb589c0c940f6e13d92a45a39a3ac0f

diff --git a/bundles/org.simantics.graph/src/org/simantics/graph/representation/TransferableGraphUtils.java b/bundles/org.simantics.graph/src/org/simantics/graph/representation/TransferableGraphUtils.java
index 4b113fa49..10637ad65 100644
--- a/bundles/org.simantics.graph/src/org/simantics/graph/representation/TransferableGraphUtils.java
+++ b/bundles/org.simantics.graph/src/org/simantics/graph/representation/TransferableGraphUtils.java
@@ -16,278 +16,339 @@ import gnu.trove.map.hash.TIntObjectHashMap;
 
 public class TransferableGraphUtils {
 
-	public static Collection<Identity> getRoots(TransferableGraph1 tg) {
-		
-		ArrayList<Identity> result = new ArrayList<Identity>();
-		for(Identity id : tg.identities) {
-			if(id.definition instanceof Root) result.add(id);
-		}
-		return result;
-		
-	}
-	
-	public static Identity findRootWithName(TransferableGraph1 tg, String name) {
-		
-		for(Identity id : tg.identities) {
-			if(id.definition instanceof Root) {
-				Root ext = (Root)id.definition;
-				if(ext.name.equals(name)) return id;
-			}
-		}
-		return null;
-		
-	}
+    public static Collection<Identity> getRoots(TransferableGraph1 tg) {
+        
+        ArrayList<Identity> result = new ArrayList<Identity>();
+        for(Identity id : tg.identities) {
+            if(id.definition instanceof Root) result.add(id);
+        }
+        return result;
+        
+    }
+    
+    public static Identity findRootWithName(TransferableGraph1 tg, String name) {
+        
+        for(Identity id : tg.identities) {
+            if(id.definition instanceof Root) {
+                Root ext = (Root)id.definition;
+                if(ext.name.equals(name)) return id;
+            }
+        }
+        return null;
+        
+    }
 
-	public static Identity findExternalWithName(TransferableGraph1 tg, String name) {
-		
-		for(Identity id : tg.identities) {
-			if(id.definition instanceof External) {
-				External ext = (External)id.definition;
-				if(ext.name.equals(name)) return id;
-			}
-		}
-		return null;
-		
-	}
+    public static Identity findExternalWithName(TransferableGraph1 tg, String name) {
+        
+        for(Identity id : tg.identities) {
+            if(id.definition instanceof External) {
+                External ext = (External)id.definition;
+                if(ext.name.equals(name)) return id;
+            }
+        }
+        return null;
+        
+    }
 
-	public static Identity findExternalWithNameAndParent(TransferableGraph1 tg, int parent, String name) {
-		
-		for(Identity id : tg.identities) {
-			if(id.definition instanceof External) {
-				External ext = (External)id.definition;
-				if(ext.name.equals(name) && ext.parent == parent) return id;
-			}
-		}
-		return null;
-		
-	}
-	
-	public static Identity findExternal(TransferableGraph1 tg, String uri) {
-		
-		Identity identity = findExternalWithName(tg, "http:/");
-		if(identity == null) identity = findExternalWithName(tg, "");
-		if(identity == null) identity = findRootWithName(tg, "");
-		if("http:/".equals(uri)) return identity;
-		String[] tokens = uri.substring("http://".length()).split("/");
-		for(String token : tokens) {
-			identity = findExternalWithNameAndParent(tg, identity.resource, token);
-		}
-		return identity;
-		
-	}
-	
-	public static Identity getIdentity(TransferableGraph1 tg, int resource) {
-		for(Identity id : tg.identities) {
-			if(id.resource == resource) return id;
-		}
-		return null;
-	}
-	
-	public static TIntArrayList getStatements(TransferableGraph1 tg, int resource) {
-		TIntArrayList result = new TIntArrayList();
-		for(int i=0;i<tg.statements.length;i+=4) {
-			if(tg.statements[i] == resource) {
-				result.add(tg.statements[i+1]);
-				result.add(tg.statements[i+3]);
-			}
-		}
-		return result;
-	}
-	
-	public static Collection<Identity> getChildren(TransferableGraph1 tg, Identity parent) {
-		TreeMap<String,Identity> result = new TreeMap<>();
-		for(Identity id : tg.identities) {
-			if(id.definition instanceof Internal) {
-				Internal internal = (Internal)id.definition;
-				if(internal.parent == parent.resource) result.put(internal.name, id);
-			}
-		}
-		Identity consistsOf = findExternal(tg, "http://www.simantics.org/Layer0-1.1/ConsistsOf");
-		Identity hasName = findExternal(tg, "http://www.simantics.org/Layer0-1.1/HasName");
-		for(int i=0;i<tg.statements.length;i+=4) {
-			if(tg.statements[i] == parent.resource) {
-				if(tg.statements[i+1] == consistsOf.resource) {
-					Identity identity = getIdentity(tg, tg.statements[i+3]);
-					if(identity != null) {
-						if(identity.definition instanceof Internal) {
-							Internal internal = (Internal)identity.definition;
-							result.put(internal.name, identity);
-						}
-					} else {
-						int possibleNameResource = getPossibleObject(tg, tg.statements[i+3], hasName);
-						if(possibleNameResource != 0) {
-							Value value = findValue(tg, possibleNameResource);
-							if(value != null) {
-								try {
-									String name = (String)value.value.getValue(Bindings.STRING);
-									result.put(name, new Identity(tg.statements[i+3], new Internal(tg.statements[i], name)));
-								} catch (AdaptException e) {
-									e.printStackTrace();
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		return result.values();
-	}
-	
-	public static TIntArrayList getObjects(TransferableGraph1 tg, int subject, Identity predicate) {
-		TIntArrayList result = new TIntArrayList();
-		for(int i=0;i<tg.statements.length;i+=4) {
-			if(tg.statements[i] == subject && tg.statements[i+1] == predicate.resource) {
-				result.add(tg.statements[i+3]);
-			}
-		}
-		return result;
-	}
-	
-	public static int getPossibleObject(TransferableGraph1 tg, int subject, Identity predicate) {
-		int result = 0;
-		for(int i=0;i<tg.statements.length;i+=4) {
-			if(tg.statements[i] == subject && tg.statements[i+1] == predicate.resource) {
-				if(result != 0) return 0;
-				result = tg.statements[i+3];
-			}
-		}
-		return result;
-	}
-	
-	public static int getPossibleObject(TransferableGraph1 tg, Identity subject, String predicate) {
-		Identity p = findExternal(tg, predicate);
-		if(p == null) return 0;
-		return getPossibleObject(tg, subject.resource, p);
-	}
+    public static Identity findExternalWithNameAndParent(TransferableGraph1 tg, int parent, String name) {
+        
+        for(Identity id : tg.identities) {
+            if(id.definition instanceof External) {
+                External ext = (External)id.definition;
+                if(ext.name.equals(name) && ext.parent == parent) return id;
+            }
+        }
+        return null;
+        
+    }
+    
+    public static Identity findExternal(TransferableGraph1 tg, String uri) {
+        
+        Identity identity = findExternalWithName(tg, "http:/");
+        if(identity == null) identity = findExternalWithName(tg, "");
+        if(identity == null) identity = findRootWithName(tg, "");
+        if("http:/".equals(uri)) return identity;
+        String[] tokens = uri.substring("http://".length()).split("/");
+        for(String token : tokens) {
+            identity = findExternalWithNameAndParent(tg, identity.resource, token);
+            if (identity == null) {
+                return null;
+            }
+        }
+        return identity;
+        
+    }
+    
+    public static Identity getIdentity(TransferableGraph1 tg, int resource) {
+        for(Identity id : tg.identities) {
+            if(id.resource == resource) return id;
+        }
+        return null;
+    }
+    
+    public static TIntArrayList getStatements(TransferableGraph1 tg, int resource) {
+        TIntArrayList result = new TIntArrayList();
+        for(int i=0;i<tg.statements.length;i+=4) {
+            if(tg.statements[i] == resource) {
+                result.add(tg.statements[i+1]);
+                result.add(tg.statements[i+3]);
+            }
+        }
+        return result;
+    }
 
-	public static Map<Identity, String> getNames(TransferableGraph1 tg, Collection<Identity> ids) {
-		Map<Identity, String> result = new HashMap<Identity, String>();
-		for(Identity id : ids) {
-			if(id.definition instanceof Internal) {
-				Internal internal = (Internal)id.definition;
-				result.put(id, internal.name);
-			}
-		}
-		return result;
-	}
+    public static Collection<Identity> getChildren2(TransferableGraph1 tg, Identity parent) {
+        return getChildren2(tg, parent.resource);
+    }
+    
+    public static Collection<Identity> getChildren2(TransferableGraph1 tg, int parentResource) {
+        TreeMap<String, Identity> result = new TreeMap<>();
+        for (Identity id : tg.identities) {
+            if (id.definition instanceof Internal) {
+                Internal internal = (Internal) id.definition;
+                if (internal.parent == parentResource)
+                    result.put(internal.name, id);
+            }
+        }
+        Identity consistsOf = findExternal(tg, "http://www.simantics.org/Layer0-1.1/ConsistsOf");
+        Identity hasName = findExternal(tg, "http://www.simantics.org/Layer0-1.1/HasName");
+        for (int i = 0; i < tg.statements.length; i += 4) {
+            if (tg.statements[i] == parentResource) {
+                if (tg.statements[i + 1] == consistsOf.resource) {
+                    Identity identity = getIdentity(tg, tg.statements[i + 3]);
+                    if (identity != null) {
+                        if (identity.definition instanceof Internal) {
+                            Internal internal = (Internal) identity.definition;
+                            result.put(internal.name, identity);
+                        }
+                    } else {
+                        int possibleNameResource = getPossibleObject2(tg, tg.statements[i + 3], hasName);
+                        if (possibleNameResource != NOT_FOUND) {
+                            Value value = findValue(tg, possibleNameResource);
+                            if (value != null) {
+                                try {
+                                    String name = (String) value.value.getValue(Bindings.STRING);
+                                    result.put(name, new Identity(tg.statements[i + 3], new Internal(tg.statements[i], name)));
+                                } catch (AdaptException e) {
+                                    e.printStackTrace();
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return result.values();
+    }
 
-	public static String getName(TransferableGraph1 tg, Identity id) {
-		return getName(id);
-	}
+    /**
+     * This implementation is no longer advised to use because it returns 0 as
+     * NOT_FOUND which is in fact a valid ID for resource in graph
+     */
+    @Deprecated
+    public static Collection<Identity> getChildren(TransferableGraph1 tg, Identity parent) {
+        TreeMap<String,Identity> result = new TreeMap<>();
+        for(Identity id : tg.identities) {
+            if(id.definition instanceof Internal) {
+                Internal internal = (Internal)id.definition;
+                if(internal.parent == parent.resource) result.put(internal.name, id);
+            }
+        }
+        Identity consistsOf = findExternal(tg, "http://www.simantics.org/Layer0-1.1/ConsistsOf");
+        Identity hasName = findExternal(tg, "http://www.simantics.org/Layer0-1.1/HasName");
+        for(int i=0;i<tg.statements.length;i+=4) {
+            if(tg.statements[i] == parent.resource) {
+                if(tg.statements[i+1] == consistsOf.resource) {
+                    Identity identity = getIdentity(tg, tg.statements[i+3]);
+                    if(identity != null) {
+                        if(identity.definition instanceof Internal) {
+                            Internal internal = (Internal)identity.definition;
+                            result.put(internal.name, identity);
+                        }
+                    } else {
+                        int possibleNameResource = getPossibleObject(tg, tg.statements[i+3], hasName);
+                        if(possibleNameResource != 0) {
+                            Value value = findValue(tg, possibleNameResource);
+                            if(value != null) {
+                                try {
+                                    String name = (String)value.value.getValue(Bindings.STRING);
+                                    result.put(name, new Identity(tg.statements[i+3], new Internal(tg.statements[i], name)));
+                                } catch (AdaptException e) {
+                                    e.printStackTrace();
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return result.values();
+    }
+    
+    public static TIntArrayList getObjects(TransferableGraph1 tg, int subject, Identity predicate) {
+        TIntArrayList result = new TIntArrayList();
+        for(int i=0;i<tg.statements.length;i+=4) {
+            if(tg.statements[i] == subject && tg.statements[i+1] == predicate.resource) {
+                result.add(tg.statements[i+3]);
+            }
+        }
+        return result;
+    }
+    
+    /**
+     * This implementation is no longer advised to use because it returns 0 as
+     * NOT_FOUND which is in fact a valid ID for resource in graph
+     */
+    @Deprecated
+    public static int getPossibleObject(TransferableGraph1 tg, int subject, Identity predicate) {
+        int result = 0;
+        for(int i=0;i<tg.statements.length;i+=4) {
+            if(tg.statements[i] == subject && tg.statements[i+1] == predicate.resource) {
+                if(result != 0 && tg.statements[i+3] != result) return 0;
+                result = tg.statements[i+3];
+            }
+        }
+        return result;
+    }
 
-	public static String getName(Identity id) {
-		if(id.definition instanceof Internal) {
-			Internal internal = (Internal)id.definition;
-			return internal.name;
-		} else if(id.definition instanceof External) {
-			External external = (External)id.definition;
-			return external.name;
-		} else if(id.definition instanceof Root) {
-			Root root = (Root)id.definition;
-			return root.name;
-		} else  {
-			Optional optional = (Optional)id.definition;
-			return optional.name;
-		}
-	}
+    public static final int NOT_FOUND = -2;
 
-	public static String getRootType(Identity id) {
-		if(id.definition instanceof Root) {
-			Root root = (Root)id.definition;
-			return root.type;
-		} else  {
-			throw new IllegalArgumentException("Expected root, got " + id);
-		}
-	}
+    public static int getPossibleObject2(TransferableGraph1 tg, int subject, Identity predicate) {
+        int result = NOT_FOUND;
+        for(int i=0;i<tg.statements.length;i+=4) {
+            if(tg.statements[i] == subject && tg.statements[i+1] == predicate.resource) {
+                if(result != NOT_FOUND && tg.statements[i+3] != result)
+                    return NOT_FOUND;
+                result = tg.statements[i+3];
+            }
+        }
+        return result;
+    }
+    
+    /**
+     * @return 0 for presenting not found which is BAD
+     * @see getPossibleObject2
+     */
+    @Deprecated
+    public static int getPossibleObject(TransferableGraph1 tg, Identity subject, String predicate) {
+        Identity p = findExternal(tg, predicate);
+        if(p == null) return 0;
+        return getPossibleObject(tg, subject.resource, p);
+    }
+    
+    public static int getPossibleObject2(TransferableGraph1 tg, Identity subject, String predicate) {
+        Identity p = findExternal(tg, predicate);
+        if (p == null)
+            return NOT_FOUND;
+        return getPossibleObject2(tg, subject.resource, p);
+    }
 
-	public static Value findValue(TransferableGraph1 tg, int subject) {
-		for(Value v : tg.values) {
-			if(v.resource == subject) return v;
-		}
-		return null;
-	}
-	
-	public static String getURI(TransferableGraph1 tg, int id) {
-	    return getURI(tg.resourceCount, tg.identities, id);
-	}
-	
-	public static String getURI(int resourceCount, Identity[] identities, int id) {
-	    for(Identity identity : identities) {
-	        if(identity.resource == id) {
-	            IdentityDefinition definition = identity.definition;
-	            if(definition instanceof External) {
-	                External def = (External)definition;
-	                if(def.parent == -1) return "http:/";
-	                else return getURI(resourceCount, identities, def.parent) + "/" + def.name;
-	            } else if(definition instanceof Root) {
-	            	Root def = (Root)definition;
-	            	if(def.name.isEmpty()) return "http:/";
-	            	return def.name;
-	            } else if (definition instanceof Internal) {
-	                Internal def = (Internal)definition;
-	                return getURI(resourceCount, identities, def.parent) + "/" + def.name;
-	            } else {
-	                return "";
-	            }
-	        }
-	    }	    
-	    return "<internal reference " + id + ">:";
-	}
+    public static Map<Identity, String> getNames(TransferableGraph1 tg, Collection<Identity> ids) {
+        Map<Identity, String> result = new HashMap<Identity, String>();
+        for(Identity id : ids) {
+            if(id.definition instanceof Internal) {
+                Internal internal = (Internal)id.definition;
+                result.put(id, internal.name);
+            }
+        }
+        return result;
+    }
 
-	public static TIntObjectMap<Identity> mapIdentities(TransferableGraph1 tg) {
-		return mapIdentities(tg.identities);
-	}
+    public static String getName(TransferableGraph1 tg, Identity id) {
+        return getName(id);
+    }
 
-	public static TIntObjectMap<Identity> mapIdentities(Identity[] identities) {
-		// Integer.MIN_VALUE cannot be the value of Identity.resource
-		TIntObjectMap<Identity> map = new TIntObjectHashMap<>(identities.length, 0.5f, Integer.MIN_VALUE);
-		for (Identity id : identities)
-			map.put(id.resource, id);
-		return map;
-	}
+    public static String getName(Identity id) {
+        if(id.definition instanceof Internal) {
+            Internal internal = (Internal)id.definition;
+            return internal.name;
+        } else if(id.definition instanceof External) {
+            External external = (External)id.definition;
+            return external.name;
+        } else if(id.definition instanceof Root) {
+            Root root = (Root)id.definition;
+            return root.name;
+        } else  {
+            Optional optional = (Optional)id.definition;
+            return optional.name;
+        }
+    }
 
-	public static String getURI(int resourceCount, TIntObjectMap<Identity> identities, int id) {
-		Identity identity = identities.get(id);
-		if(identity != null) {
-			IdentityDefinition definition = identity.definition;
-			if(definition instanceof External) {
-				External def = (External)definition;
-				if(def.parent == -1) return "http:/";
-				else return getURI(resourceCount, identities, def.parent) + "/" + def.name;
-			} else if(definition instanceof Root) {
-				Root def = (Root)definition;
-				if(def.name.isEmpty()) return "http:/";
-				return def.name;
-			} else if (definition instanceof Internal) {
-				Internal def = (Internal)definition;
-				return getURI(resourceCount, identities, def.parent) + "/" + def.name;
-			} else {
-				return "";
-			}
-		}
-		return "<internal reference " + id + ">:";
-	}
-	
-	public static String getTrueURI(int resourceCount, TIntObjectMap<Identity> identities, int id) {
-		Identity identity = identities.get(id);
-		if(identity != null) {
-			IdentityDefinition definition = identity.definition;
-			if(definition instanceof External) {
-				External def = (External)definition;
-				if(def.parent == -1) return "http:/";
-				else return getTrueURI(resourceCount, identities, def.parent) + "/" + URIStringUtils.escape(def.name);
-			} else if(definition instanceof Root) {
-				Root def = (Root)definition;
-				if(def.name.isEmpty()) return "http:/";
-				return def.name;
-			} else if (definition instanceof Internal) {
-				Internal def = (Internal)definition;
-				return getTrueURI(resourceCount, identities, def.parent) + "/" + URIStringUtils.escape(def.name);
-			} else {
-				return "";
-			}
-		}
-		return "<internal reference " + id + ">:";
-	}
+    public static String getRootType(Identity id) {
+        if(id.definition instanceof Root) {
+            Root root = (Root)id.definition;
+            return root.type;
+        } else  {
+            throw new IllegalArgumentException("Expected root, got " + id);
+        }
+    }
+
+    public static Value findValue(TransferableGraph1 tg, int subject) {
+        for(Value v : tg.values) {
+            if(v.resource == subject) return v;
+        }
+        return null;
+    }
+    
+    public static String getURI(TransferableGraph1 tg, int id) {
+        return getURI(tg.identities, id);
+    }
+    
+    public static String getURI(Identity[] identities, int id) {
+        for(Identity identity : identities) {
+            if(identity.resource == id) {
+                IdentityDefinition definition = identity.definition;
+                if(definition instanceof External) {
+                    External def = (External)definition;
+                    if(def.parent == -1) return "http:/";
+                    else return getURI(identities, def.parent) + "/" + def.name;
+                } else if(definition instanceof Root) {
+                    Root def = (Root)definition;
+                    if(def.name.isEmpty()) return "http:/";
+                    return def.name;
+                } else if (definition instanceof Internal) {
+                    Internal def = (Internal)definition;
+                    return getURI(identities, def.parent) + "/" + def.name;
+                } else {
+                    return "";
+                }
+            }
+        }       
+        return "<internal reference " + id + ">:";
+    }
+
+    public static TIntObjectMap<Identity> mapIdentities(TransferableGraph1 tg) {
+        return mapIdentities(tg.identities);
+    }
+
+    public static TIntObjectMap<Identity> mapIdentities(Identity[] identities) {
+        // Integer.MIN_VALUE cannot be the value of Identity.resource
+        TIntObjectMap<Identity> map = new TIntObjectHashMap<>(identities.length, 0.5f, Integer.MIN_VALUE);
+        for (Identity id : identities)
+            map.put(id.resource, id);
+        return map;
+    }
+
+    public static String getURI(int resourceCount, TIntObjectMap<Identity> identities, int id) {
+        Identity identity = identities.get(id);
+        if(identity != null) {
+            IdentityDefinition definition = identity.definition;
+            if(definition instanceof External) {
+                External def = (External)definition;
+                if(def.parent == -1) return "http:/";
+                else return getURI(resourceCount, identities, def.parent) + "/" + URIStringUtils.escape(def.name);
+            } else if(definition instanceof Root) {
+                Root def = (Root)definition;
+                if(def.name.isEmpty()) return "http:/";
+                return def.name;
+            } else if (definition instanceof Internal) {
+                Internal def = (Internal)definition;
+                return getURI(resourceCount, identities, def.parent) + "/" + URIStringUtils.escape(def.name);
+            } else {
+                return "";
+            }
+        }
+        return "<internal reference " + id + ">:";
+    }
 
 }