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

[Danil Sokolov]

[Danil Sokolov (danilovesky)]

review: Approve

=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/VisualCircuitComponent.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/VisualCircuitComponent.java	2014-07-08 11:51:21 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/VisualCircuitComponent.java	2014-07-16 10:33:39 +0000
@@ -631,5 +631,11 @@
 	public void removeObserver(HierarchyObserver obs) {
 		groupImpl.removeObserver(obs);
 	}
+	
+	@Override
+	public void removeAllObservers() {
+		groupImpl.removeAllObservers();
+	}
+	
 
 }
 
=== modified file 'GraphPlugin/src/org/workcraft/plugins/graph/ToolsProvider.java'
--- GraphPlugin/src/org/workcraft/plugins/graph/ToolsProvider.java	2014-02-27 09:22:57 +0000
+++ GraphPlugin/src/org/workcraft/plugins/graph/ToolsProvider.java	2014-07-16 10:33:39 +0000
@@ -2,14 +2,12 @@
 
 import java.util.ArrayList;
 
-import org.workcraft.dom.math.PageNode;
 import org.workcraft.gui.graph.tools.CommentGeneratorTool;
 import org.workcraft.gui.graph.tools.ConnectionTool;
 import org.workcraft.gui.graph.tools.CustomToolsProvider;
 import org.workcraft.gui.graph.tools.DefaultNodeGenerator;
 import org.workcraft.gui.graph.tools.GraphEditorTool;
 import org.workcraft.gui.graph.tools.NodeGeneratorTool;
-import org.workcraft.gui.graph.tools.PageGeneratorTool;
 import org.workcraft.gui.graph.tools.SelectionTool;
 
 public class ToolsProvider implements CustomToolsProvider {
@@ -20,7 +18,6 @@
 		
 		result.add(new SelectionTool());
 		result.add(new CommentGeneratorTool());
-		result.add(new PageGeneratorTool(new DefaultNodeGenerator(PageNode.class)));
 		result.add(new ConnectionTool(true, false));
 		result.add(new NodeGeneratorTool(new DefaultNodeGenerator(Vertex.class)));
 		return result;
 
=== modified file 'SONPlugin/src/org/workcraft/plugins/son/SONToolProvider.java'
--- SONPlugin/src/org/workcraft/plugins/son/SONToolProvider.java	2014-04-30 08:14:53 +0000
+++ SONPlugin/src/org/workcraft/plugins/son/SONToolProvider.java	2014-07-16 10:33:39 +0000
@@ -2,13 +2,11 @@
 
 import java.util.ArrayList;
 
-import org.workcraft.dom.math.PageNode;
 import org.workcraft.gui.graph.tools.CommentGeneratorTool;
 import org.workcraft.gui.graph.tools.CustomToolsProvider;
 import org.workcraft.gui.graph.tools.DefaultNodeGenerator;
 import org.workcraft.gui.graph.tools.GraphEditorTool;
 import org.workcraft.gui.graph.tools.NodeGeneratorTool;
-import org.workcraft.gui.graph.tools.PageGeneratorTool;
 import org.workcraft.plugins.son.elements.ChannelPlace;
 import org.workcraft.plugins.son.elements.Condition;
 import org.workcraft.plugins.son.elements.Event;
@@ -23,7 +21,6 @@
 		ArrayList<GraphEditorTool> result = new ArrayList<GraphEditorTool>();
 		GraphEditorTool channelPlaceTool = new NodeGeneratorTool(new DefaultNodeGenerator(ChannelPlace.class));
 		result.add(new SelectionTool(channelPlaceTool));
-		result.add(new PageGeneratorTool(new DefaultNodeGenerator(PageNode.class)));
 		result.add(new CommentGeneratorTool());
 		result.add(new SONConnectionTool());
 		result.add(new NodeGeneratorTool(new DefaultNodeGenerator(Condition.class)));
 
=== modified file 'WorkcraftCore/src/org/workcraft/Framework.java'
--- WorkcraftCore/src/org/workcraft/Framework.java	2014-06-25 19:35:02 +0000
+++ WorkcraftCore/src/org/workcraft/Framework.java	2014-07-16 10:33:39 +0000
@@ -69,11 +69,9 @@
 import org.workcraft.gui.propertyeditor.SettingsPage;
 import org.workcraft.interop.Importer;
 import org.workcraft.plugins.PluginInfo;
-import org.workcraft.plugins.serialisation.XMLDualModelDeserialiser;
 import org.workcraft.plugins.serialisation.XMLModelDeserialiser;
 import org.workcraft.plugins.serialisation.XMLModelSerialiser;
 import org.workcraft.serialisation.DeserialisationResult;
-import org.workcraft.serialisation.DualDeserialisationResult;
 import org.workcraft.serialisation.ModelSerialiser;
 import org.workcraft.serialisation.ReferenceProducer;
 import org.workcraft.serialisation.References;
@@ -663,28 +661,26 @@
 	}
 
 	public ModelEntry load(InputStream is1, InputStream is2) throws DeserialisationException {
-		
 			ModelEntry me1 = load(is1);
 			ModelEntry me2 = load(is2);
 			
 			VisualModel vmodel1 = me1.getVisualModel();
 			VisualModel vmodel2 = me2.getVisualModel();
 			
-			if (!me1.getDescriptor().getDisplayName().equals(
-					me2.getDescriptor().getDisplayName())) {
-				throw new DeserialisationException("incompatible models cannot be merged");
+			if (!me1.getDescriptor().getDisplayName().equals(me2.getDescriptor().getDisplayName())) {
+				throw new DeserialisationException("Incompatible models cannot be merged");
 			}
 			
-			
 			Collection<Node> children = new HashSet<Node>(vmodel2.getRoot().getChildren());
 			
 			vmodel1.selectNone();
 			vmodel1.reparent(vmodel1.getCurrentLevel(), vmodel2, vmodel2.getRoot(), null);
 			vmodel1.select(children);
 			
-			return me1;
-
-		
+			// FIXME: dirty hack to avoid any hanging observers (serialise and deserialise the model) 
+			Memento memo = save(me1);
+			ModelEntry me3 = load(memo);
+			return me3;
 	}
 	
 //  old implementation for reference
 
=== modified file 'WorkcraftCore/src/org/workcraft/dom/AbstractGroup.java'
--- WorkcraftCore/src/org/workcraft/dom/AbstractGroup.java	2014-06-29 17:47:02 +0000
+++ WorkcraftCore/src/org/workcraft/dom/AbstractGroup.java	2014-07-16 10:33:39 +0000
@@ -65,35 +65,38 @@
 
 	protected void postAdd(Node node, boolean notify) {
 		node.setParent(groupRef);
-		
-		if (notify)
+		if (notify) {
 			observableHierarchyImpl.sendNotification (new NodesAddedEvent(groupRef, node));
+		}
 	}
 
 	protected void preAdd(Node node, boolean notify) {
-		if (node.getParent() == this)
+		if (node.getParent() == this) {
 			return;
-
-		if (node.getParent() != null && node.getParent() != groupRef)
+		}
+		if ((node.getParent() != null) && (node.getParent() != groupRef)) {
 			throw new RuntimeException("Cannot attach someone else's node. Please detach from the old parent first.");
-
-		if (notify)
+		}
+		if (notify) {
 			observableHierarchyImpl.sendNotification (new NodesAddingEvent(groupRef, node));
+		}
 	}
 
 	protected void removeInternal(Node node, boolean notify) {
-		if (notify)
+		if (notify) {
 			observableHierarchyImpl.sendNotification(new NodesDeletingEvent(groupRef, node));
-
-		if (node.getParent() != groupRef)
-			throw new RuntimeException 
-			("Failed to remove a node frome a group because it is not a child of that group ("+node+", parent is " + node.getParent() +", expected " + groupRef + ")");
-
+		}
+		if (node.getParent() != groupRef) {
+			throw new RuntimeException(
+					"Failed to remove a node frome a group because it is not a child of that group ("
+					+ node + ", parent is " + node.getParent() + ", expected " + groupRef + ")");
+		}
 		removeInternal(node);
 		node.setParent(null);
 
-		if (notify)
+		if (notify) {
 			observableHierarchyImpl.sendNotification (new NodesDeletedEvent(groupRef, node));
+		}
 	}
 
 	public void addObserver(HierarchyObserver obs) {
@@ -103,6 +106,10 @@
 	public void removeObserver(HierarchyObserver obs) {
 		observableHierarchyImpl.removeObserver(obs);
 	}
+	
+	public void removeAllObservers() {
+		observableHierarchyImpl.removeAllObservers();
+	}
 
 	@Override
 	public void add(Node node) {
@@ -112,10 +119,9 @@
 	@Override
 	public void add(Collection<Node> nodes) {
 		observableHierarchyImpl.sendNotification (new NodesAddingEvent(groupRef, nodes));
-
-		for (Node node : nodes)
+		for (Node node : nodes) {
 			addInternal(node, false);
-
+		}
 		observableHierarchyImpl.sendNotification (new NodesAddedEvent(groupRef, nodes));
 	}
 
@@ -127,40 +133,42 @@
 	@Override
 	public void remove(Collection<Node> nodes) {
 		LinkedList<Node> nodesToRemove = new LinkedList<Node>(nodes);
-
 		observableHierarchyImpl.sendNotification(new NodesDeletingEvent(groupRef, nodesToRemove));
-
-		for (Node node : nodesToRemove)
+		for (Node node : nodesToRemove) {
 			removeInternal(node, false);
-
+		}
 		observableHierarchyImpl.sendNotification (new NodesDeletedEvent(groupRef, nodesToRemove));
 	}
-
-	
-	
 	
 	@Override
 	public void reparent(Collection<Node> nodes, Container newParent) {
 		observableHierarchyImpl.sendNotification(new NodesReparentingEvent(groupRef, newParent, nodes));
-		
-		//HashSet<Node> newModelNodes= new HashSet<Node>();
-		boolean differentModels = false;
-		
-		for (Node node : nodes) {
-			
-			if (Hierarchy.getTopParent(newParent)!=Hierarchy.getTopParent(node)) differentModels = true;
-			
+		for (Node node: nodes) {
 			removeInternal(node, false);
-			
-		}
-		
-		if (differentModels)
-			newParent.add(nodes);
-		else
-			newParent.reparent(nodes);
-
+		}
+		if (!isSameModel(nodes, newParent)) {
+			// If the model is not the same, then remove all node listeners
+			for (Node node: nodes) {
+				if (node instanceof ObservableHierarchy) {
+					((ObservableHierarchy) node).removeAllObservers();
+				}
+			}
+		}
+		newParent.add(nodes);
 		observableHierarchyImpl.sendNotification(new NodesReparentedEvent(groupRef, newParent, nodes));
 	}
+
+	private boolean isSameModel(Collection<Node> nodes, Container newParent) {
+		Node newRoot = Hierarchy.getTopParent(newParent);
+		boolean sameModel = true;
+		for (Node node : nodes) {
+			if (newRoot != Hierarchy.getTopParent(node)) {
+				sameModel = false;
+				break;
+			}
+		}
+		return sameModel;
+	}
 	
 	@Override
 	public void reparent (Collection<Node> nodes) {
@@ -173,5 +181,6 @@
 	public abstract Collection<Node> getChildren();
 
 	protected abstract void addInternal(Node node);
+
 	protected abstract void removeInternal (Node node);
-}
 \ No newline at end of file
+}
 
=== modified file 'WorkcraftCore/src/org/workcraft/dom/DefaultHangingConnectionRemover.java'
--- WorkcraftCore/src/org/workcraft/dom/DefaultHangingConnectionRemover.java	2013-10-31 11:44:01 +0000
+++ WorkcraftCore/src/org/workcraft/dom/DefaultHangingConnectionRemover.java	2014-07-16 10:33:39 +0000
@@ -53,7 +53,7 @@
 		
 			for (Node node : e.getAffectedNodes())
 				findHangingConnections(node, hangingConnections, hanging);
-		
+			
 			for (Connection con : hangingConnections)
 				if (con.getParent() instanceof Container)
 					((Container)con.getParent()).remove(con);
 
=== modified file 'WorkcraftCore/src/org/workcraft/dom/math/MathConnection.java'
--- WorkcraftCore/src/org/workcraft/dom/math/MathConnection.java	2013-09-10 09:54:55 +0000
+++ WorkcraftCore/src/org/workcraft/dom/math/MathConnection.java	2014-07-16 10:33:39 +0000
@@ -23,6 +23,7 @@
 
 import org.workcraft.annotations.VisualClass;
 import org.workcraft.dom.Connection;
+import org.workcraft.dom.Node;
 
 @VisualClass(org.workcraft.dom.visual.connections.VisualConnection.class)
 public class MathConnection extends MathNode implements Connection {
@@ -36,7 +37,7 @@
 		super();
 		setDependencies(first, second);
 	}
-	
+	
 	final public MathNode getFirst() {
 		return first;
 	}
 
=== modified file 'WorkcraftCore/src/org/workcraft/dom/math/MathGroup.java'
--- WorkcraftCore/src/org/workcraft/dom/math/MathGroup.java	2014-04-28 18:05:39 +0000
+++ WorkcraftCore/src/org/workcraft/dom/math/MathGroup.java	2014-07-16 10:33:39 +0000
@@ -22,17 +22,16 @@
 package org.workcraft.dom.math;
 
 import java.util.ArrayList;
-import java.util.Collection;
-
-import org.workcraft.dom.Container;
-import org.workcraft.dom.DefaultGroupImpl;
-import org.workcraft.dom.Node;
+import java.util.Collection;
+
+import org.workcraft.dom.Container;
+import org.workcraft.dom.DefaultGroupImpl;
+import org.workcraft.dom.Node;
 import org.workcraft.dom.hierarchy.NamespaceProvider;
 import org.workcraft.dom.references.HierarchicalUniqueNameReferenceManager;
 import org.workcraft.dom.references.ReferenceManager;
-import org.workcraft.dom.visual.TransformHelper;
-import org.workcraft.observation.HierarchyObserver;
-import org.workcraft.observation.ObservableHierarchy;
+import org.workcraft.observation.HierarchyObserver;
+import org.workcraft.observation.ObservableHierarchy;
 import org.workcraft.util.Hierarchy;
 
 public class MathGroup extends MathNode implements NamespaceProvider, ObservableHierarchy, Container {
@@ -66,7 +65,12 @@
 	@Override
 	public void removeObserver(HierarchyObserver obs) {
 		groupImpl.removeObserver(obs);
-	}
+	}
+	
+	@Override
+	public void removeAllObservers() {
+		groupImpl.removeAllObservers();
+	}
 
 	@Override
 	public void setParent(Node parent) {
 
=== modified file 'WorkcraftCore/src/org/workcraft/dom/visual/AbstractVisualModel.java'
--- WorkcraftCore/src/org/workcraft/dom/visual/AbstractVisualModel.java	2014-07-11 09:28:08 +0000
+++ WorkcraftCore/src/org/workcraft/dom/visual/AbstractVisualModel.java	2014-07-16 10:33:39 +0000
@@ -627,11 +627,7 @@
 		
 		Collection<Node> children = new HashSet<Node>();
 		
-		if (sourceChildren==null) {
-			children.addAll(sourceRoot.getChildren());
-		} else {
-			children.addAll(sourceChildren);
-		}
+		children.addAll(sourceChildren);
 		
 		sourceRoot.reparent(children, targetContainer);
 		
 
=== modified file 'WorkcraftCore/src/org/workcraft/dom/visual/VisualGroup.java'
--- WorkcraftCore/src/org/workcraft/dom/visual/VisualGroup.java	2014-06-29 17:47:02 +0000
+++ WorkcraftCore/src/org/workcraft/dom/visual/VisualGroup.java	2014-07-16 10:33:39 +0000
@@ -223,6 +223,10 @@
 		groupImpl.removeObserver(obs);
 	}
 
+	@Override
+	public void removeAllObservers() {
+		groupImpl.removeAllObservers();
+	}
 
 	@Override
 	public void setParent(Node parent) {
 
=== modified file 'WorkcraftCore/src/org/workcraft/dom/visual/VisualPage.java'
--- WorkcraftCore/src/org/workcraft/dom/visual/VisualPage.java	2014-06-26 08:11:52 +0000
+++ WorkcraftCore/src/org/workcraft/dom/visual/VisualPage.java	2014-07-16 10:33:39 +0000
@@ -170,6 +170,10 @@
 		groupImpl.removeObserver(obs);
 	}
 
+	@Override
+	public void removeAllObservers() {
+		groupImpl.removeAllObservers();
+	}
 
 	@Override
 	public void setParent(Node parent) {
 
=== modified file 'WorkcraftCore/src/org/workcraft/dom/visual/connections/Polyline.java'
--- WorkcraftCore/src/org/workcraft/dom/visual/connections/Polyline.java	2013-10-21 17:36:57 +0000
+++ WorkcraftCore/src/org/workcraft/dom/visual/connections/Polyline.java	2014-07-16 10:33:39 +0000
@@ -276,7 +276,11 @@
 
 	public void removeObserver(HierarchyObserver obs) {
 		groupImpl.removeObserver(obs);
-	}
+	}
+	
+	public void removeAllObservers() {
+		groupImpl.removeAllObservers();
+	}
 
 	public void reparent(Collection<Node> nodes, Container newParent) {
 		groupImpl.reparent(nodes, newParent);
 
=== modified file 'WorkcraftCore/src/org/workcraft/dom/visual/connections/VisualConnection.java'
--- WorkcraftCore/src/org/workcraft/dom/visual/connections/VisualConnection.java	2014-06-05 11:46:41 +0000
+++ WorkcraftCore/src/org/workcraft/dom/visual/connections/VisualConnection.java	2014-07-16 10:33:39 +0000
@@ -457,6 +457,12 @@
 	public void removeObserver(HierarchyObserver obs) {
 		observableHierarchyImpl.removeObserver(obs);
 	}
+	
+	public void removeAllObservers() {
+		observableHierarchyImpl.removeAllObservers();
+	}
+
+	
 	@Override
 	public Point2D getFirstCenter() {
 		return componentsTransformObserver.getFirstCenter();
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/graph/tools/PageGeneratorTool.java'
--- WorkcraftCore/src/org/workcraft/gui/graph/tools/PageGeneratorTool.java	2014-02-27 09:22:57 +0000
+++ WorkcraftCore/src/org/workcraft/gui/graph/tools/PageGeneratorTool.java	2014-07-16 10:33:39 +0000
@@ -1,6 +1,5 @@
 package org.workcraft.gui.graph.tools;
 
-import org.workcraft.dom.math.CommentNode;
 import org.workcraft.dom.math.MathNode;
 import org.workcraft.dom.math.PageNode;
 import org.workcraft.exceptions.NodeCreationException;
@@ -11,8 +10,7 @@
 		super(new DefaultNodeGenerator(PageNode.class)
 		{
 			@Override
-			protected MathNode createMathNode()
-					throws NodeCreationException {
+			protected MathNode createMathNode()	throws NodeCreationException {
 				MathNode node = super.createMathNode();
 				return node;
 			}
 
=== modified file 'WorkcraftCore/src/org/workcraft/observation/ObservableHierarchy.java'
--- WorkcraftCore/src/org/workcraft/observation/ObservableHierarchy.java	2009-09-22 21:01:45 +0000
+++ WorkcraftCore/src/org/workcraft/observation/ObservableHierarchy.java	2014-07-16 10:33:39 +0000
@@ -24,4 +24,5 @@
 public interface ObservableHierarchy {
 	public void addObserver (HierarchyObserver obs);
 	public void removeObserver (HierarchyObserver obs);
+	public void removeAllObservers();
 }
 
=== modified file 'WorkcraftCore/src/org/workcraft/observation/ObservableHierarchyImpl.java'
--- WorkcraftCore/src/org/workcraft/observation/ObservableHierarchyImpl.java	2009-09-22 21:01:45 +0000
+++ WorkcraftCore/src/org/workcraft/observation/ObservableHierarchyImpl.java	2014-07-16 10:33:39 +0000
@@ -34,6 +34,10 @@
 		observers.remove(obs);
 	}
 	
+	public void removeAllObservers() {
+		observers.clear();
+	}
+	
 	public void sendNotification (HierarchyEvent e) {
 		for (HierarchyObserver obs : observers)
 			obs.notify(e);
 
=== modified file 'WorkcraftCore/src/org/workcraft/workspace/WorkspaceEntry.java'
--- WorkcraftCore/src/org/workcraft/workspace/WorkspaceEntry.java	2014-06-17 18:47:40 +0000
+++ WorkcraftCore/src/org/workcraft/workspace/WorkspaceEntry.java	2014-07-16 10:33:39 +0000
@@ -29,11 +29,12 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
+import javax.swing.JOptionPane;
+
 import org.workcraft.Framework;
 import org.workcraft.dom.Container;
 import org.workcraft.dom.Node;
@@ -48,7 +49,6 @@
 import org.workcraft.observation.StateEvent;
 import org.workcraft.observation.StateObserver;
 import org.workcraft.plugins.shared.CommonEditorSettings;
-import org.workcraft.plugins.shared.CommonVisualSettings;
 import org.workcraft.util.Hierarchy;
 
 public class WorkspaceEntry implements ObservableState {
@@ -211,9 +211,7 @@
 			Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
 			String str = unzipInputStream(new ZipInputStream(capturedMemento.getStream()));
 			clipboard.setContents(new StringSelection(str), null);
-			
 		}
-
 	}
 
 	public void cancelMemento() {
@@ -278,7 +276,8 @@
 			setModelEntry(result);
 			setChanged(true);
 		} catch (DeserialisationException e) {
-			e.printStackTrace();
+			JOptionPane.showMessageDialog(framework.getMainWindow(), e.getMessage(), 
+					"Model insertion failed", JOptionPane.ERROR_MESSAGE);
 		}
 	}
 	
@@ -356,7 +355,8 @@
 				setChanged(true);
 				VisualModelTransformer.translateSelection(result.getVisualModel(), 1.0, 1.0);
 			} catch (DeserialisationException e) {
-				e.printStackTrace();
+				JOptionPane.showMessageDialog(framework.getMainWindow(), e.getMessage(), 
+						"Clipboard paste failed", JOptionPane.ERROR_MESSAGE);
 			}
 		}
 	}
 
=== modified file 'XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualXmasComponent.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualXmasComponent.java	2014-01-07 16:03:24 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualXmasComponent.java	2014-07-16 10:33:39 +0000
@@ -213,6 +213,12 @@
 		groupImpl.removeObserver(obs);
 	}
 	
+	@Override
+	public void removeAllObservers() {
+		groupImpl.removeAllObservers();
+	}
+	
+	
 	abstract public Shape getShape();
 
 	@Override
 
=== modified file 'XmasPlugin/src/org/workcraft/plugins/xmas/components/XmasComponent.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/components/XmasComponent.java	2013-11-05 18:01:19 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/components/XmasComponent.java	2014-07-16 10:33:39 +0000
@@ -52,6 +52,11 @@
 	public void removeObserver(HierarchyObserver obs) {
 		groupImpl.removeObserver(obs);
 	}
+	
+	public void removeAllObservers() {
+		groupImpl.removeAllObservers();
+	}
+	
 
 	@Override
 	public void add(Node node) {