Merge lp:~danilovesky/workcraft/trunk-bug-1350399 into lp:workcraft

[Danil Sokolov]

[Danil Sokolov (danilovesky)]

review: Approve

=== modified file 'PolicyNetPlugin/src/org/workcraft/plugins/policy/serialisation/VisualLocalityDeserialiser.java'
--- PolicyNetPlugin/src/org/workcraft/plugins/policy/serialisation/VisualLocalityDeserialiser.java	2013-10-31 11:44:01 +0000
+++ PolicyNetPlugin/src/org/workcraft/plugins/policy/serialisation/VisualLocalityDeserialiser.java	2014-07-30 16:20:36 +0000
@@ -22,14 +22,18 @@
 			ReferenceResolver externalReferenceResolver, NodeFinaliser nodeFinaliser) throws DeserialisationException
 	{
 		VisualLocality visualLocality = (VisualLocality)instance;
-		visualLocality.setLocality((Locality)externalReferenceResolver.getObject(element.getAttribute("ref")));
+		String ref = element.getAttribute("ref");
+		Locality locality = (Locality)externalReferenceResolver.getObject(ref);
+		visualLocality.setLocality(locality);
 	}
 	
 	@Override
 	public Object createInstance(Element element, ReferenceResolver externalReferenceResolver,
 			Object... constructorParameters)
 	{
-		return new VisualLocality((Locality)externalReferenceResolver.getObject(element.getAttribute("ref")));
+		String ref = element.getAttribute("ref");
+		Locality locality = (Locality)externalReferenceResolver.getObject(ref);
+		return new VisualLocality(locality);
 	}
 
 	@Override

=== modified file 'PolicyNetPlugin/src/org/workcraft/plugins/policy/serialisation/VisualLocalitySerialiser.java'
--- PolicyNetPlugin/src/org/workcraft/plugins/policy/serialisation/VisualLocalitySerialiser.java	2013-10-07 09:51:12 +0000
+++ PolicyNetPlugin/src/org/workcraft/plugins/policy/serialisation/VisualLocalitySerialiser.java	2014-07-30 16:20:36 +0000
@@ -2,6 +2,7 @@
 
 import org.w3c.dom.Element;
 import org.workcraft.exceptions.SerialisationException;
+import org.workcraft.plugins.policy.Locality;
 import org.workcraft.plugins.policy.VisualLocality;
 import org.workcraft.serialisation.ReferenceProducer;
 import org.workcraft.serialisation.xml.CustomXMLSerialiser;
@@ -19,8 +20,10 @@
 	public void serialise(Element element, Object object, ReferenceProducer internalReferences,
 			ReferenceProducer externalReferences, NodeSerialiser nodeSerialiser) throws SerialisationException
 	{
-		VisualLocality visualLocality = (VisualLocality) object;
-		element.setAttribute("ref", externalReferences.getReference(visualLocality.getLocality()));		
+		VisualLocality visualLocality = (VisualLocality)object;
+		Locality locality = visualLocality.getLocality();
+		String ref = externalReferences.getReference(locality);
+		element.setAttribute("ref", ref);		
 	}
 
 }
\ No newline at end of file

=== modified file 'WorkcraftCore/src/org/workcraft/dom/AbstractModel.java'
--- WorkcraftCore/src/org/workcraft/dom/AbstractModel.java	2014-07-28 13:32:42 +0000
+++ WorkcraftCore/src/org/workcraft/dom/AbstractModel.java	2014-07-30 16:20:36 +0000
@@ -155,7 +155,6 @@
 	
 	@Override
 	public String getNodeReference(Node node) {
-		
 		return getNodeReference(null, node);
 	}
 	
@@ -166,7 +165,6 @@
 	
 	@Override
 	public String getNodeReference(NamespaceProvider provider, Node node) {
-		
 		return referenceManager.getNodeReference(provider, node);
 	}
 

=== modified file 'WorkcraftCore/src/org/workcraft/dom/hierarchy/NamespaceHelper.java'
--- WorkcraftCore/src/org/workcraft/dom/hierarchy/NamespaceHelper.java	2014-07-28 13:32:42 +0000
+++ WorkcraftCore/src/org/workcraft/dom/hierarchy/NamespaceHelper.java	2014-07-30 16:20:36 +0000
@@ -17,6 +17,7 @@
 public class NamespaceHelper {
 	final static String quoteType = "'";
 	final public static String hierarchySeparator = "/";
+	final public static String hierarchyRoot = hierarchySeparator;
 	final public static String flatNameSeparator = "__";
 
 	// TODO: make it work with the embedded ' characters

=== modified file 'WorkcraftCore/src/org/workcraft/dom/references/HierarchicalUniqueNameReferenceManager.java'
--- WorkcraftCore/src/org/workcraft/dom/references/HierarchicalUniqueNameReferenceManager.java	2014-07-28 13:32:42 +0000
+++ WorkcraftCore/src/org/workcraft/dom/references/HierarchicalUniqueNameReferenceManager.java	2014-07-30 16:20:36 +0000
@@ -21,37 +21,23 @@
 	// every node belongs to some name space provider (except the main root node of the model)
 	final private HashMap<Node, NamespaceProvider> node2namespace = new HashMap<Node, NamespaceProvider>();
 	private NamespaceProvider topProvider; // namespace provided by root
-	
 	protected Func<Node, String> defaultName;
 	private References existing;
 
 	public HierarchicalUniqueNameReferenceManager(References existing, Func<Node, String> defaultName) {
-
 		this.existing = existing;
 		this.defaultName = defaultName;
-		
 	}
-	
-
 
 	public NamespaceProvider getNamespaceProvider(Node node) {
-		
 		NamespaceProvider provider = node2namespace.get(node);
-		
-		if (provider!=null) return provider;
-		
-		Node container = node.getParent();
-		if (container != null)
-			provider = Hierarchy.getNearestAncestor(container, NamespaceProvider.class);
-		else
-			// the root node does not have a provider
-			return null;
-			//provider = topProvider;
-		
-
-		if (provider!=null) 
-			node2namespace.put(node, provider);
-		
+		if (provider == null) {		
+			Node container = node.getParent();
+			if (container != null) {
+				provider = Hierarchy.getNearestAncestor(container, NamespaceProvider.class);
+			}
+		}
+		node2namespace.put(node, provider);
 		return provider;
 	}
 	
@@ -61,34 +47,32 @@
 	}
 	
 	public void setNamespaceProvider(Node node, HierarchicalUniqueNameReferenceManager sourceReferenceManager, NamespaceProvider provider) {
-		
-		if (provider==null) provider = topProvider;
-		
+		if (provider==null) {
+			provider = topProvider;
+		}
 		NamespaceProvider oldProvider = sourceReferenceManager.getNamespaceProvider(node);
-		if (oldProvider==null) return;
-		
-		String name = sourceReferenceManager.getName(node); 
-		
-		// clear cached data in the local and the foreign reference manager
-		node2namespace.remove(node);
-		sourceReferenceManager.node2namespace.remove(node);
-		
-		// do not assign name if it wasn't assigned in the first place (eg. the implicit place)
-		if (name!=null&&(provider!=oldProvider||node2namespace!=sourceReferenceManager.node2namespace)) {
-			NameManager<Node> oldMan = sourceReferenceManager.getNameManager(oldProvider);
-			NameManager<Node> newMan = getNameManager(provider);
-			
-			oldMan.remove(node);
-			
-			Node checkNode = newMan.get(name);
-			// we must assign some name in any case, be it an old or a new one
-			if (checkNode == null)
-				newMan.setName(node, name);
-			else {
-				newMan.setDefaultNameIfUnnamed(node, name);
-				// the node was not added yet as a child of the target container, so using setName from the reference manager is not possible yet
+		if (oldProvider != null) {
+			String name = sourceReferenceManager.getName(node); 
+		
+			// Clear cached data in the local and the foreign reference manager
+			node2namespace.remove(node);
+			sourceReferenceManager.node2namespace.remove(node);
+		
+			// Do not assign name if it wasn't assigned in the first place (eg. the implicit place)
+			if (name!=null&&(provider!=oldProvider||node2namespace!=sourceReferenceManager.node2namespace)) {
+				NameManager<Node> oldMan = sourceReferenceManager.getNameManager(oldProvider);
+				NameManager<Node> newMan = getNameManager(provider);
+				oldMan.remove(node);
+				Node checkNode = newMan.get(name);
+				// We must assign some name in any case, be it an old or a new one
+				if (checkNode == null) {
+					newMan.setName(node, name);
+				} else {
+					newMan.setDefaultNameIfUnnamed(node, name);
+					// The node was not added yet as a child of the target container, 
+					// so using setName from the reference manager is not possible yet
+				}
 			}
-			
 		}
 	}
 	
@@ -96,17 +80,12 @@
 	public void attach(Node root) {
 		// root must be a namespace provider
 		topProvider = (NamespaceProvider)root;
-
-		
 		if (existing != null) {
-			//setExistingReference(root);
-			
 			for(Node n : Hierarchy.getDescendantsOfType(root, Node.class)) {
 				setExistingReference(n);
 			}
 			existing = null;
 		}
-		
 		super.attach(root);
 	}
 	
@@ -115,7 +94,9 @@
 	}
 	
 	protected NameManager<Node> getNameManager(NamespaceProvider provider) {
-		if (provider==null) provider = topProvider;
+		if (provider==null) {
+			provider = topProvider;
+		}
 		NameManager<Node> man = managers.get(provider);
 		if (man==null) {
 			man = createNameManager();
@@ -145,8 +126,8 @@
 		if (provider==null) {
 			provider = topProvider;
 		}
-		if (reference.equals("")||reference.equals(NamespaceHelper.hierarchySeparator)) { 
-			return (Node)provider;
+		if (reference.equals("") || reference.equals(NamespaceHelper.hierarchySeparator)) { 
+			return provider;
 		}
 		String head =  NamespaceHelper.getReferenceHead(reference);
 		String tail =  NamespaceHelper.getReferenceTail(reference);
@@ -161,44 +142,34 @@
 	
 	@Override
 	public String getNodeReference(NamespaceProvider provider, Node node) {
-		if (provider==null) {
+		if (node == topProvider) {
+			return NamespaceHelper.hierarchyRoot;
+		}
+		if (provider == null) {
 			provider = topProvider;
 		}
-		
-		NamespaceProvider prov = null;
-		String ret= "";
-		
+		NamespaceProvider component = null;
+		String result = "";
 		do {
-			prov = getNamespaceProvider(node);
-			
-			if (prov==null) break; // we've just reached the root, do not add it's name
-			
-			if (!ret.equals(""))
-				ret= NamespaceHelper.hierarchySeparator+ret;
-			
-			
-			String name = getNameManager(prov).getName(node);
-			// the unnamed component just returns null
-			if (name==null) return null;
-			
-			// for now don't use quotes
-			ret= name+ret;
-			node = node.getParent();
-			
-		} while (prov!=null&&provider!=prov);
-		
-		return ret;
-		// uncomment if the absolute path begins with the separator  
-		// return (provider==topProvider&&isAbsolutePath? HierarchicalNames.hierarchySeparator:"")+ret;
+			component = getNamespaceProvider(node);
+			if (component != null) {
+				if (!result.equals("")) {
+					result = NamespaceHelper.hierarchySeparator + result;
+				}
+				String name = getNameManager(component).getName(node);
+				// The unnamed component just returns null
+				if (name == null) return null;
+				result = name + result;
+				node = node.getParent();
+			}
+		} while ((node != null) && (component != null) && (component != provider));
+		return result;
 	}
 	
-	
 	@Override
 	public void handleEvent(HierarchyEvent e) {
-		
 		if (e instanceof NodesAddedEvent) {
-			for(Node node : e.getAffectedNodes()) {
-				
+			for (Node node : e.getAffectedNodes()) {
 				if (node.getParent()!=null) {
 					// if it is not a root node
 					NamespaceProvider provider = getNamespaceProvider(node);
@@ -208,21 +179,18 @@
 					// additional call to propagate the name data after calling setDefaultNameIfUnnamed 
 					setName(node, name);
 				}
-				
 				for (Node node2 : Hierarchy.getDescendantsOfType(node, Node.class)) {
 					getNameManager(getNamespaceProvider(node2)).setDefaultNameIfUnnamed(node2, null);
 					// additional call to propagate the name data after calling setDefaultNameIfUnnamed 
 					setName(node2, getNameManager(getNamespaceProvider(node2)).getName(node2));
 				}
-				
 			}
 		}
 		
-		if(e instanceof NodesDeletedEvent) {
+		if (e instanceof NodesDeletedEvent) {
 			for(Node node : e.getAffectedNodes()) {
 				getNameManager(getNamespaceProvider(node)).remove(node);
 				node2namespace.remove(node);
-				
 				for (Node node2 : Hierarchy.getDescendantsOfType(node, Node.class)) {
 					getNameManager(getNamespaceProvider(node2)).remove(node2);
 					node2namespace.remove(node2);
@@ -247,5 +215,4 @@
 		return man.getName(node);
 	}
 
-
 }