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

[Danil Sokolov]

[Danil Sokolov (danilovesky)]

review: Approve

=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/VisualCircuit.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/VisualCircuit.java	2015-02-09 10:46:28 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/VisualCircuit.java	2015-02-27 18:34:42 +0000
@@ -218,6 +218,7 @@
 		if (container instanceof VisualFunctionComponent) {
 			VisualFunctionComponent component = (VisualFunctionComponent)container;
 			component.addContact(this, vc);
+			component.setContactsDefaultPosition();
 		} else {
 			Container mathContainer = NamespaceHelper.getMathContainer(this, getRoot());
 			mathContainer.add(vc.getReferencedComponent());

=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/VisualCircuitComponent.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/VisualCircuitComponent.java	2015-02-26 11:19:42 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/VisualCircuitComponent.java	2015-02-27 18:34:42 +0000
@@ -163,7 +163,6 @@
 	public void setRenderType(RenderType renderType) {
 		if (this.renderType != renderType) {
 			this.renderType = renderType;
-			//spreadContactsEvenly();
 			setContactsDefaultPosition();
 			invalidateBoundingBox();
 			sendNotification(new PropertyChangedEvent(this, "render type"));
@@ -278,6 +277,18 @@
 		invalidateBoundingBox();
 	}
 
+	public void centerPivotPoint() {
+		Rectangle2D bb = getInternalBoundingBoxInLocalSpace();
+		setX(getX() + bb.getCenterX());
+		setY(getY() + bb.getCenterY());
+		Collection<VisualContact> contacts = getContacts();
+		for (VisualContact vc: contacts) {
+			vc.setX(vc.getX() - bb.getCenterX());
+			vc.setY(vc.getY() - bb.getCenterY());
+		}
+		invalidateBoundingBox();
+	}
+
 	public static double snapP5(double x) {
 		return (double) (Math.round(x * 2)) / 2;
 	}
@@ -329,7 +340,6 @@
 		double y1 = -size/2;
 		double x2 = size/2;
 		double y2 = size/2;
-
 		for (VisualContact vc: Hierarchy.getChildrenOfType(this, VisualContact.class)) { 
 			switch (vc.getDirection()) {
 			case WEST: 
@@ -358,38 +368,54 @@
 				break;
 			}
 		}
-
-		for (VisualContact vc: Hierarchy.getChildrenOfType(this, VisualContact.class)) { 
-			double x = vc.getX();
-			double y = vc.getY();
-			switch (vc.getDirection()) {
-			case WEST: 
-				y1 = Math.min(y1, y - contactStep / 2); 
-				y2 = Math.max(y2, y + contactStep / 2);
-				break;
-			case NORTH:	
-				x1 = Math.min(x1, x - contactStep / 2); 
-				x2 = Math.max(x2, x + contactStep / 2);
-				break;
-			case EAST: 
-				y1 = Math.min(y1, y - contactStep / 2); 
-				y2 = Math.max(y2, y + contactStep / 2);
-				break;
-			case SOUTH:	
-				x1 = Math.min(x1, x - contactStep / 2); 
-				x2 = Math.max(x2, x + contactStep / 2);
-				break;
-			}
-		}
 		return new Rectangle2D.Double(x1, y1, x2 - x1, y2 - y1);
 	}
-	
-	private Rectangle2D getContactBestBox() {
+
+	private Rectangle2D getContactExpandedBox() {
 		Rectangle2D minBox = getContactMinimalBox();
 		double x1 = minBox.getMinX();
 		double y1 = minBox.getMinY();
 		double x2 = minBox.getMaxX();
 		double y2 = minBox.getMaxY();
+		for (VisualContact vc: Hierarchy.getChildrenOfType(this, VisualContact.class)) {
+			double x = vc.getX();
+			double y = vc.getY();
+			switch (vc.getDirection()) {
+			case WEST: 
+				if (vc.getX() < minBox.getMinX()) {
+					y1 = Math.min(y1, y - contactStep / 2); 
+					y2 = Math.max(y2, y + contactStep / 2);
+				}
+				break;
+			case NORTH:	
+				if (vc.getY() < minBox.getMinY()) {
+					x1 = Math.min(x1, x - contactStep / 2); 
+					x2 = Math.max(x2, x + contactStep / 2);
+				}
+				break;
+			case EAST: 
+				if (vc.getX() > minBox.getMaxX()) {
+					y1 = Math.min(y1, y - contactStep / 2); 
+					y2 = Math.max(y2, y + contactStep / 2);
+				}
+				break;
+			case SOUTH:	
+				if (vc.getY() > minBox.getMaxY()) {
+					x1 = Math.min(x1, x - contactStep / 2); 
+					x2 = Math.max(x2, x + contactStep / 2);
+				}
+				break;
+			}
+		}
+		return new Rectangle2D.Double(x1, y1, x2 - x1, y2 - y1);
+	}
+
+	private Rectangle2D getContactBestBox() {
+		Rectangle2D expBox = getContactExpandedBox();
+		double x1 = expBox.getMinX();
+		double y1 = expBox.getMinY();
+		double x2 = expBox.getMaxX();
+		double y2 = expBox.getMaxY();
 
 		boolean westFirst = true;
 		boolean northFirst = true;
@@ -442,9 +468,9 @@
 			y1 = y2 = (y1 + y2) / 2;
 		}
 		Rectangle2D maxBox = new Rectangle2D.Double(x1, y1, x2 - x1, y2 - y1);
-		return BoundingBoxHelper.union(minBox, maxBox);
+		return BoundingBoxHelper.union(expBox, maxBox);
 	}
-
+	
 	private void drawContactLines(DrawRequest r) {
 		Rectangle2D bb = getInternalBoundingBoxInLocalSpace();
 		for (VisualContact vc: Hierarchy.getChildrenOfType(this, VisualContact.class)) { 
@@ -688,17 +714,17 @@
 			AffineTransform at = t.sender.getTransform();
 			double x = at.getTranslateX();
 			double y = at.getTranslateY();
-			Rectangle2D bb = getInternalBoundingBoxInLocalSpace();
-			if ((x < bb.getMinX()) && (y > bb.getMinY()) && (y < bb.getMaxY())) {
+			Rectangle2D bb = getContactExpandedBox(); //getContactMinimalBox();//getInternalBoundingBoxInLocalSpace();
+			if ((x <= bb.getMinX()) && (y > bb.getMinY()) && (y < bb.getMaxY())) {
 				vc.setDirection(Direction.WEST);
 			}
-			if ((x > bb.getMaxX()) && (y > bb.getMinY()) && (y < bb.getMaxY())) {
+			if ((x >= bb.getMaxX()) && (y > bb.getMinY()) && (y < bb.getMaxY())) {
 				vc.setDirection(Direction.EAST);
 			}
-			if ((y < bb.getMinY()) && (x > bb.getMinX()) && (x < bb.getMaxX())) {
+			if ((y <= bb.getMinY()) && (x > bb.getMinX()) && (x < bb.getMaxX())) {
 				vc.setDirection(Direction.NORTH);
 			}
-			if ((y > bb.getMaxY()) && (x > bb.getMinX()) && (x < bb.getMaxX())) {
+			if ((y >= bb.getMaxY()) && (x > bb.getMinX()) && (x < bb.getMaxX())) {
 				vc.setDirection(Direction.SOUTH);
 			}
 			invalidateBoundingBox();
@@ -739,29 +765,5 @@
 	public void removeAllObservers() {
 		groupImpl.removeAllObservers();
 	}
-	
-	@Override
-	public void rotateClockwise() {
-		super.rotateClockwise();
-		setContactsDefaultPosition();
-	}
-	
-	@Override
-	public void rotateCounterclockwise() {
-		super.rotateCounterclockwise();
-		setContactsDefaultPosition();
-	}
-
-	@Override
-	public void flipHorizontal() {
-		super.flipHorizontal();
-		setContactsDefaultPosition();
-	}
-
-	@Override
-	public void flipVertical() {
-		super.flipVertical();
-		setContactsDefaultPosition();
-	}
 
 }

=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/VisualContact.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/VisualContact.java	2015-02-26 11:19:42 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/VisualContact.java	2015-02-27 18:34:42 +0000
@@ -155,25 +155,6 @@
 		addPropertyDeclarations();
 	}
 	
-	private Shape getShape() {
-		if (getParent() instanceof VisualCircuitComponent) {
-			return new Rectangle2D.Double(
-					-size / 2 + CircuitSettings.getWireWidth(),
-					-size / 2 + CircuitSettings.getWireWidth(),
-					size - CircuitSettings.getWireWidth() * 2,
-					size - CircuitSettings.getWireWidth() * 2);
-		} else {
-			Path2D path = new Path2D.Double();
-			path.moveTo(-size / 2, -size / 2);
-			path.lineTo(0, -size / 2);
-			path.lineTo(size / 2, 0);
-			path.lineTo(0, size / 2);
-			path.lineTo(-size / 2, size / 2);
-			path.closePath();
-			return path;
-		}
-	}
-	
 	private void addPropertyDeclarations() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualContact, Direction>(
 				this, "Direction", Direction.class) {
@@ -205,6 +186,25 @@
 			}
 		});
 	}
+	
+	private Shape getShape() {
+		if (getParent() instanceof VisualCircuitComponent) {
+			return new Rectangle2D.Double(
+					-size / 2 + CircuitSettings.getWireWidth(),
+					-size / 2 + CircuitSettings.getWireWidth(),
+					size - CircuitSettings.getWireWidth() * 2,
+					size - CircuitSettings.getWireWidth() * 2);
+		} else {
+			Path2D path = new Path2D.Double();
+			path.moveTo(-size / 2, -size / 2);
+			path.lineTo(0, -size / 2);
+			path.lineTo(size / 2, 0);
+			path.lineTo(0, size / 2);
+			path.lineTo(-size / 2, size / 2);
+			path.closePath();
+			return path;
+		}
+	}
 
 	@Override
 	public void draw(DrawRequest r) {
@@ -392,38 +392,56 @@
 
 	@Override
 	public void rotateClockwise() {
+		if (getParent() instanceof VisualCircuitComponent) {
+			VisualCircuitComponent component = (VisualCircuitComponent)getParent();
+			if (component.getRenderType() == RenderType.BOX) {
+				AffineTransform at = new AffineTransform();
+				at.quadrantRotate(1);
+				Point2D pos = at.transform(getPosition(), null);
+				setPosition(pos);
+			}
+		}
+		setDirection(getDirection().rotateClockwise());
 		super.rotateClockwise();
-		setDirection(getDirection().rotateClockwise());
 	}
 	
 	@Override
 	public void rotateCounterclockwise() {
+		if (getParent() instanceof VisualCircuitComponent) {
+			VisualCircuitComponent component = (VisualCircuitComponent)getParent();
+			if (component.getRenderType() == RenderType.BOX) {
+				AffineTransform at = new AffineTransform();
+				at.quadrantRotate(-1);
+				Point2D pos = at.transform(getPosition(), null);
+				setPosition(pos);
+			}
+		}
+		setDirection(getDirection().rotateCounterclockwise());
 		super.rotateCounterclockwise();
-		setDirection(getDirection().rotateCounterclockwise());
 	}
 
 	@Override
 	public void flipHorizontal() {
+		if (getParent() instanceof VisualCircuitComponent) {
+			VisualCircuitComponent component = (VisualCircuitComponent)getParent();
+			if (component.getRenderType() == RenderType.BOX) {
+				setX(-getX());
+			}
+		}
+		setDirection(getDirection().flipHorizontal());
 		super.flipHorizontal();
-		setDirection(getDirection().flipHorizontal());
-		if (getParent() instanceof VisualCircuitComponent) {
-			VisualCircuitComponent component = (VisualCircuitComponent)getParent();
-			if (component.getRenderType() == RenderType.BOX) {
-				setX(-getX());
-			}
-		}
 	}
 
 	@Override
 	public void flipVertical() {
+		if (getParent() instanceof VisualCircuitComponent) {
+			VisualCircuitComponent component = (VisualCircuitComponent)getParent();
+			if (component.getRenderType() == RenderType.BOX) {
+				setY(-getY());
+			}
+		}
+		setDirection(getDirection().flipVertical());
 		super.flipVertical();
-		setDirection(getDirection().flipVertical());
-		if (getParent() instanceof VisualCircuitComponent) {
-			VisualCircuitComponent component = (VisualCircuitComponent)getParent();
-			if (component.getRenderType() == RenderType.BOX) {
-				setY(-getY());
-			}
-		}
 	}
 
 }

=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/tools/CircuitSelectionTool.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/tools/CircuitSelectionTool.java	2014-10-10 10:35:07 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/tools/CircuitSelectionTool.java	2015-02-27 18:34:42 +0000
@@ -50,41 +50,55 @@
 			popup.setFocusable(false);
 			popup.add(new JLabel("Function component"));
 			popup.addSeparator();
-			
-			JMenuItem addOutput = new JMenuItem("Add output (EAST)");
-			addOutput.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					editor.getWorkspaceEntry().saveMemento();
-					VisualCircuit vcircuit = (VisualCircuit)editor.getModel();
-					vcircuit.getOrCreateContact(component, null, IOType.OUTPUT);
-				}
-			});
-			popup.add(addOutput);
-
-			JMenuItem addInput = new JMenuItem("Add input (WEST)");
-			addInput.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					editor.getWorkspaceEntry().saveMemento();
-					VisualCircuit vcircuit = (VisualCircuit)editor.getModel();
-					vcircuit.getOrCreateContact(component, null, IOType.INPUT);
-				}
-			});
-			popup.add(addInput);
-
+			{
+				JMenuItem addOutput = new JMenuItem("Add output (EAST)");
+				addOutput.addActionListener(new ActionListener() {
+					@Override
+					public void actionPerformed(ActionEvent e) {
+						editor.getWorkspaceEntry().saveMemento();
+						VisualCircuit vcircuit = (VisualCircuit)editor.getModel();
+						vcircuit.getOrCreateContact(component, null, IOType.OUTPUT);
+						component.setContactsDefaultPosition();
+					}
+				});
+				popup.add(addOutput);
+			}
+			{
+				JMenuItem addInput = new JMenuItem("Add input (WEST)");
+				addInput.addActionListener(new ActionListener() {
+					@Override
+					public void actionPerformed(ActionEvent e) {
+						editor.getWorkspaceEntry().saveMemento();
+						VisualCircuit vcircuit = (VisualCircuit)editor.getModel();
+						vcircuit.getOrCreateContact(component, null, IOType.INPUT);
+						component.setContactsDefaultPosition();
+					}
+				});
+				popup.add(addInput);
+			}
 			popup.addSeparator();
-			
-			JMenuItem defaultPosition = new JMenuItem("Set contacts in default position");
-			defaultPosition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					editor.getWorkspaceEntry().saveMemento();
-					component.setContactsDefaultPosition();
-				}
-			});
-			popup.add(defaultPosition);
-
+			{
+				JMenuItem defaultContactPosition = new JMenuItem("Set contacts in default position");
+				defaultContactPosition.addActionListener(new ActionListener() {
+					@Override
+					public void actionPerformed(ActionEvent e) {
+						editor.getWorkspaceEntry().saveMemento();
+						component.setContactsDefaultPosition();
+					}
+				});
+				popup.add(defaultContactPosition);
+			}
+			{
+				JMenuItem centerPivotPoint = new JMenuItem("Center pivot point");
+				centerPivotPoint.addActionListener(new ActionListener() {
+					@Override
+					public void actionPerformed(ActionEvent e) {
+						editor.getWorkspaceEntry().saveMemento();
+						component.centerPivotPoint();
+					}
+				});
+				popup.add(centerPivotPoint);
+			}
 			return popup;
 		}
 		

=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/tools/CircuitSimulationTool.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/tools/CircuitSimulationTool.java	2015-01-14 18:10:46 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/tools/CircuitSimulationTool.java	2015-02-27 18:34:42 +0000
@@ -23,6 +23,7 @@
 import org.workcraft.plugins.circuit.VisualCircuitConnection;
 import org.workcraft.plugins.circuit.VisualContact;
 import org.workcraft.plugins.circuit.VisualJoint;
+import org.workcraft.plugins.petri.Place;
 import org.workcraft.plugins.shared.CommonSimulationSettings;
 import org.workcraft.plugins.stg.SignalTransition;
 import org.workcraft.plugins.stg.SignalTransition.Direction;
@@ -55,31 +56,51 @@
 		});
 		controlPanel.add(copyInitButton);
 	}
+	
+	@Override
+	public void initialiseSignalState() {
+		super.initialiseSignalState();
+		for (String signalName: stateMap.keySet()) {
+			SignalState signalState = stateMap.get(signalName);
+			Node zeroNode = net.getNodeByReference(signalName + "_0");
+			if (zeroNode instanceof Place) {
+				Place zeroPlace = (Place)zeroNode;
+				signalState.value = ((zeroPlace.getTokens() > 0) ? 0 : 1);
+			}
+			Node oneNode= net.getNodeByReference(signalName + "_1");
+			if (oneNode instanceof Place) {
+				Place onePlace = (Place)oneNode;
+				signalState.value = ((onePlace.getTokens() > 0) ? 1 : 0);
+			}
+		}
+	}
 
 	// return first enabled transition
 	public SignalTransition isContactExcited(VisualContact c) {
 		boolean up = false;
 		boolean down = false;
-
 		SignalTransition st = null;
-		if (c == null)
-			return null;
-
-		for (SignalTransition tr : c.getReferencedTransitions()) {
-			if (net.isEnabled(tr)) {
-				if (st == null)
-					st = tr;
-				if (tr.getDirection() == Direction.MINUS)
-					down = true;
-				if (tr.getDirection() == Direction.PLUS)
-					up = true;
-				if (up && down)
-					break;
+		if (c != null) { 
+			for (SignalTransition tr : c.getReferencedTransitions()) {
+				if (net.isEnabled(tr)) {
+					if (st == null) {
+						st = tr;
+					}
+					if (tr.getDirection() == Direction.MINUS) {
+						down = true;
+					}
+					if (tr.getDirection() == Direction.PLUS) {
+						up = true;
+					}
+					if (up && down) {
+						break;
+					}
+				}
+			}
+			if (up && down) {
+				st = null;
 			}
 		}
-
-		if (up && down)
-			return null;
 		return st;
 	}
 
@@ -93,11 +114,11 @@
 				}
 			});
 
-		if (node == null)
-			return;
-		SignalTransition st = isContactExcited((VisualContact) node);
-		if (st != null) {
-			executeTransition(e.getEditor(), st);
+		if (node != null) {
+			SignalTransition st = isContactExcited((VisualContact) node);
+			if (st != null) {
+				executeTransition(e.getEditor(), st);
+			}
 		}
 	}
 
@@ -229,11 +250,8 @@
 						}
 					};
 				} else if (node instanceof VisualPage || node instanceof VisualGroup) {
-					
 					final boolean ret = isContainerExcited((Container)node);
-					
 					return new ContainerDecoration() {
-
 						@Override
 						public Color getColorisation() {
 							return null;
@@ -251,8 +269,6 @@
 					};
 					
 				}
-
-				
 				
 				return null;
 			}

=== modified file 'STGPlugin/src/org/workcraft/plugins/stg/tools/StgSimulationTool.java'
--- STGPlugin/src/org/workcraft/plugins/stg/tools/StgSimulationTool.java	2015-02-09 18:34:32 +0000
+++ STGPlugin/src/org/workcraft/plugins/stg/tools/StgSimulationTool.java	2015-02-27 18:34:42 +0000
@@ -39,7 +39,7 @@
 	protected Map<String, SignalState> stateMap;
 	protected JTable stateTable;
 
-	private final class SignalState {
+	public final class SignalState {
 		public String name = "";
 		public Color color = Color.BLACK;
 		public boolean excited = false;
@@ -191,6 +191,12 @@
 	@Override
 	public void updateState(final GraphEditor editor) {
 		super.updateState(editor);
+		updateSignalState();
+		stateTable.tableChanged(new TableModelEvent(traceTable.getModel()));
+	}
+
+	public void updateSignalState() {
+		initialiseSignalState();
 		ArrayList<String> combinedTrace = new ArrayList<String>();
 		if (!mainTrace.isEmpty()) {
 			combinedTrace.addAll(mainTrace.subList(0, mainTrace.getPosition()));
@@ -199,12 +205,6 @@
 			combinedTrace.addAll(branchTrace.subList(0, branchTrace.getPosition()));
 		}
 		
-		for (String signalName: stateMap.keySet()) {
-			SignalState signalState = stateMap.get(signalName); 
-			signalState.value = -1;
-			signalState.excited = false;
-		}
-
 		for (String ref : combinedTrace) {
 			Node node = net.getNodeByReference(ref);
 			if (node instanceof SignalTransition) {
@@ -243,7 +243,14 @@
 				}
 			}
 		}
-		stateTable.tableChanged(new TableModelEvent(traceTable.getModel()));
+	}
+
+	public void initialiseSignalState() {
+		for (String signalName: stateMap.keySet()) {
+			SignalState signalState = stateMap.get(signalName); 
+			signalState.value = -1;
+			signalState.excited = false;
+		}
 	}
 	
 	@Override
@@ -276,6 +283,7 @@
 				}
 			}
 		}
+		updateSignalState();
 	}
 	
 

=== modified file 'WorkcraftCore/models/simulation.ucls'
--- WorkcraftCore/models/simulation.ucls	2014-10-17 14:13:06 +0000
+++ WorkcraftCore/models/simulation.ucls	2015-02-27 18:34:42 +0000
@@ -1,203 +1,203 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<class-diagram version="1.1.5" icons="true" always-add-relationships="false" generalizations="true" realizations="true" 
-  associations="true" dependencies="false" nesting-relationships="true">  
-  <class id="1" language="java" name="org.workcraft.plugins.circuit.tools.CircuitSimulationTool" project="CircuitPlugin" 
-    file="/CircuitPlugin/src/org/workcraft/plugins/circuit/tools/CircuitSimulationTool.java" binary="false" 
-    corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="1030" y="368"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
-      visibility="true">      
-      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
-      <operations public="true" package="true" protected="false" private="false" static="true"/>    
-    </display>  
-  </class>  
-  <class id="2" language="java" name="org.workcraft.plugins.dfs.tools.SimulationTool" project="DfsPlugin" 
-    file="/DfsPlugin/src/org/workcraft/plugins/dfs/tools/SimulationTool.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="752" y="372"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
-      visibility="true">      
-      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
-      <operations public="true" package="true" protected="false" private="false" static="true"/>    
-    </display>  
-  </class>  
-  <class id="3" language="java" name="org.workcraft.plugins.son.tools.SONSimulationTool" project="SONPlugin" 
-    file="/SONPlugin/src/org/workcraft/plugins/son/tools/SONSimulationTool.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="180" y="742"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
-      visibility="true">      
-      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
-      <operations public="true" package="true" protected="false" private="false" static="true"/>    
-    </display>  
-  </class>  
-  <interface id="4" language="java" name="org.workcraft.gui.graph.tools.Decorator" project="WorkcraftCore" 
-    file="/WorkcraftCore/src/org/workcraft/gui/graph/tools/Decorator.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="955" y="592"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
-      visibility="true">      
-      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
-      <operations public="true" package="true" protected="false" private="false" static="true"/>    
-    </display>  
-  </interface>  
-  <class id="5" language="java" name="org.workcraft.gui.graph.tools.Decorator.Empty" project="WorkcraftCore" 
-    file="/WorkcraftCore/src/org/workcraft/gui/graph/tools/Decorator.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="955" y="732"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
-      visibility="true">      
-      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
-      <operations public="true" package="true" protected="false" private="false" static="true"/>    
-    </display>  
-  </class>  
-  <class id="6" language="java" name="org.workcraft.gui.graph.tools.Decoration.Empty" project="WorkcraftCore" 
-    file="/WorkcraftCore/src/org/workcraft/gui/graph/tools/Decoration.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="440" y="757"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
-      visibility="true">      
-      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
-      <operations public="true" package="true" protected="false" private="false" static="true"/>    
-    </display>  
-  </class>  
-  <interface id="7" language="java" name="org.workcraft.gui.graph.tools.Decoration" project="WorkcraftCore" 
-    file="/WorkcraftCore/src/org/workcraft/gui/graph/tools/Decoration.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="440" y="609"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
-      visibility="true">      
-      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
-      <operations public="true" package="true" protected="false" private="false" static="true"/>    
-    </display>  
-  </interface>  
-  <interface id="8" language="java" name="org.workcraft.plugins.son.tools.PlaceNodeDecoration" project="SONPlugin" 
-    file="/SONPlugin/src/org/workcraft/plugins/son/tools/PlaceNodeDecoration.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="709" y="525"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
-      visibility="true">      
-      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
-      <operations public="true" package="true" protected="false" private="false" static="true"/>    
-    </display>  
-  </interface>  
-  <interface id="9" language="java" name="org.workcraft.plugins.petri.tools.PlaceDecoration" project="PetriNetPlugin" 
-    file="/PetriNetPlugin/src/org/workcraft/plugins/petri/tools/PlaceDecoration.java" binary="false" 
-    corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="708" y="656"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
-      visibility="true">      
-      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
-      <operations public="true" package="true" protected="false" private="false" static="true"/>    
-    </display>  
-  </interface>  
-  <interface id="10" language="java" name="org.workcraft.plugins.dfs.decorations.BinaryRegisterDecoration" 
-    project="DfsPlugin" file="/DfsPlugin/src/org/workcraft/plugins/dfs/decorations/BinaryRegisterDecoration.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="691" y="880"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
-      visibility="true">      
-      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
-      <operations public="true" package="true" protected="false" private="false" static="true"/>    
-    </display>  
-  </interface>  
-  <interface id="11" language="java" name="org.workcraft.plugins.dfs.decorations.CounterflowLogicDecoration" 
-    project="DfsPlugin" file="/DfsPlugin/src/org/workcraft/plugins/dfs/decorations/CounterflowLogicDecoration.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="940" y="883"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
-      visibility="true">      
-      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
-      <operations public="true" package="true" protected="false" private="false" static="true"/>    
-    </display>  
-  </interface>  
-  <interface id="12" language="java" name="org.workcraft.plugins.dfs.decorations.CounterflowRegisterDecoration" 
-    project="DfsPlugin" file="/DfsPlugin/src/org/workcraft/plugins/dfs/decorations/CounterflowRegisterDecoration.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="935" y="1065"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
-      visibility="true">      
-      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
-      <operations public="true" package="true" protected="false" private="false" static="true"/>    
-    </display>  
-  </interface>  
-  <interface id="13" language="java" name="org.workcraft.plugins.dfs.decorations.LogicDecoration" project="DfsPlugin" 
-    file="/DfsPlugin/src/org/workcraft/plugins/dfs/decorations/LogicDecoration.java" binary="false" 
-    corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="471" y="993"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
-      visibility="true">      
-      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
-      <operations public="true" package="true" protected="false" private="false" static="true"/>    
-    </display>  
-  </interface>  
-  <interface id="14" language="java" name="org.workcraft.plugins.dfs.decorations.RegisterDecoration" project="DfsPlugin" 
-    file="/DfsPlugin/src/org/workcraft/plugins/dfs/decorations/RegisterDecoration.java" binary="false" 
-    corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="696" y="1037"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
-      visibility="true">      
-      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
-      <operations public="true" package="true" protected="false" private="false" static="true"/>    
-    </display>  
-  </interface>  
-  <generalization id="15">    
-    <end type="SOURCE" refId="11"/>    
-    <end type="TARGET" refId="7"/>  
-  </generalization>  
-  <association id="16">    
-    <end type="SOURCE" refId="5" navigable="false">      
-      <attribute id="17" name="INSTANCE"/>      
-      <multiplicity id="18" minimum="0" maximum="1"/>    
-    </end>    
-    <end type="TARGET" refId="5" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <association id="19">    
-    <end type="SOURCE" refId="6" navigable="false">      
-      <attribute id="20" name="INSTANCE"/>      
-      <multiplicity id="21" minimum="0" maximum="1"/>    
-    </end>    
-    <end type="TARGET" refId="6" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <nesting id="22">    
-    <end type="SOURCE" refId="7"/>    
-    <end type="TARGET" refId="6"/>  
-  </nesting>  
-  <nesting id="23">    
-    <end type="SOURCE" refId="4"/>    
-    <end type="TARGET" refId="5"/>  
-  </nesting>  
-  <generalization id="24">    
-    <end type="SOURCE" refId="9"/>    
-    <end type="TARGET" refId="7"/>  
-  </generalization>  
-  <realization id="25">    
-    <end type="SOURCE" refId="6"/>    
-    <end type="TARGET" refId="7"/>  
-  </realization>  
-  <generalization id="26">    
-    <end type="SOURCE" refId="12"/>    
-    <end type="TARGET" refId="7"/>  
-  </generalization>  
-  <realization id="27">    
-    <end type="SOURCE" refId="5"/>    
-    <end type="TARGET" refId="4"/>  
-  </realization>  
-  <generalization id="28">    
-    <end type="SOURCE" refId="13"/>    
-    <end type="TARGET" refId="7"/>  
-  </generalization>  
-  <generalization id="29">    
-    <end type="SOURCE" refId="8"/>    
-    <end type="TARGET" refId="7"/>  
-  </generalization>  
-  <generalization id="30">    
-    <end type="SOURCE" refId="14"/>    
-    <end type="TARGET" refId="7"/>  
-  </generalization>  
-  <generalization id="31">    
-    <end type="SOURCE" refId="10"/>    
-    <end type="TARGET" refId="7"/>  
-  </generalization>  
-  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-    accessors="true" visibility="true">    
-    <attributes public="true" package="true" protected="false" private="false" static="true"/>    
-    <operations public="true" package="true" protected="false" private="false" static="true"/>  
-  </classifier-display>  
-  <association-display labels="true" multiplicity="true"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<class-diagram version="1.1.6" icons="true" always-add-relationships="false" generalizations="true" realizations="true" 
+  associations="true" dependencies="false" nesting-relationships="true">  
+  <class id="1" language="java" name="org.workcraft.plugins.circuit.tools.CircuitSimulationTool" project="CircuitPlugin" 
+    file="/CircuitPlugin/src/org/workcraft/plugins/circuit/tools/CircuitSimulationTool.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1030" y="368"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
+      visibility="true">      
+      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
+      <operations public="true" package="true" protected="false" private="false" static="true"/>    
+    </display>  
+  </class>  
+  <class id="2" language="java" name="org.workcraft.plugins.dfs.tools.SimulationTool" project="DfsPlugin" 
+    file="/DfsPlugin/src/org/workcraft/plugins/dfs/tools/SimulationTool.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="752" y="372"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
+      visibility="true">      
+      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
+      <operations public="true" package="true" protected="false" private="false" static="true"/>    
+    </display>  
+  </class>  
+  <class id="3" language="java" name="org.workcraft.plugins.son.tools.SONSimulationTool" project="SONPlugin" 
+    file="/SONPlugin/src/org/workcraft/plugins/son/tools/SONSimulationTool.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="180" y="742"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
+      visibility="true">      
+      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
+      <operations public="true" package="true" protected="false" private="false" static="true"/>    
+    </display>  
+  </class>  
+  <interface id="4" language="java" name="org.workcraft.gui.graph.tools.Decorator" project="WorkcraftCore" 
+    file="/WorkcraftCore/src/org/workcraft/gui/graph/tools/Decorator.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="955" y="592"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
+      visibility="true">      
+      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
+      <operations public="true" package="true" protected="false" private="false" static="true"/>    
+    </display>  
+  </interface>  
+  <class id="5" language="java" name="org.workcraft.gui.graph.tools.Decorator.Empty" project="WorkcraftCore" 
+    file="/WorkcraftCore/src/org/workcraft/gui/graph/tools/Decorator.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="955" y="732"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
+      visibility="true">      
+      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
+      <operations public="true" package="true" protected="false" private="false" static="true"/>    
+    </display>  
+  </class>  
+  <class id="6" language="java" name="org.workcraft.gui.graph.tools.Decoration.Empty" project="WorkcraftCore" 
+    file="/WorkcraftCore/src/org/workcraft/gui/graph/tools/Decoration.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="440" y="757"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
+      visibility="true">      
+      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
+      <operations public="true" package="true" protected="false" private="false" static="true"/>    
+    </display>  
+  </class>  
+  <interface id="7" language="java" name="org.workcraft.gui.graph.tools.Decoration" project="WorkcraftCore" 
+    file="/WorkcraftCore/src/org/workcraft/gui/graph/tools/Decoration.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="440" y="609"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
+      visibility="true">      
+      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
+      <operations public="true" package="true" protected="false" private="false" static="true"/>    
+    </display>  
+  </interface>  
+  <interface id="8" language="java" name="org.workcraft.plugins.son.tools.PlaceNodeDecoration" project="SONPlugin" 
+    file="/SONPlugin/src/org/workcraft/plugins/son/tools/PlaceNodeDecoration.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="709" y="525"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
+      visibility="true">      
+      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
+      <operations public="true" package="true" protected="false" private="false" static="true"/>    
+    </display>  
+  </interface>  
+  <interface id="9" language="java" name="org.workcraft.plugins.petri.tools.PlaceDecoration" project="PetriNetPlugin" 
+    file="/PetriNetPlugin/src/org/workcraft/plugins/petri/tools/PlaceDecoration.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="708" y="656"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
+      visibility="true">      
+      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
+      <operations public="true" package="true" protected="false" private="false" static="true"/>    
+    </display>  
+  </interface>  
+  <interface id="10" language="java" name="org.workcraft.plugins.dfs.decorations.BinaryRegisterDecoration" 
+    project="DfsPlugin" file="/DfsPlugin/src/org/workcraft/plugins/dfs/decorations/BinaryRegisterDecoration.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="691" y="880"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
+      visibility="true">      
+      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
+      <operations public="true" package="true" protected="false" private="false" static="true"/>    
+    </display>  
+  </interface>  
+  <interface id="11" language="java" name="org.workcraft.plugins.dfs.decorations.CounterflowLogicDecoration" 
+    project="DfsPlugin" file="/DfsPlugin/src/org/workcraft/plugins/dfs/decorations/CounterflowLogicDecoration.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="940" y="883"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
+      visibility="true">      
+      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
+      <operations public="true" package="true" protected="false" private="false" static="true"/>    
+    </display>  
+  </interface>  
+  <interface id="12" language="java" name="org.workcraft.plugins.dfs.decorations.CounterflowRegisterDecoration" 
+    project="DfsPlugin" file="/DfsPlugin/src/org/workcraft/plugins/dfs/decorations/CounterflowRegisterDecoration.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="935" y="1065"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
+      visibility="true">      
+      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
+      <operations public="true" package="true" protected="false" private="false" static="true"/>    
+    </display>  
+  </interface>  
+  <interface id="13" language="java" name="org.workcraft.plugins.dfs.decorations.LogicDecoration" project="DfsPlugin" 
+    file="/DfsPlugin/src/org/workcraft/plugins/dfs/decorations/LogicDecoration.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="471" y="993"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
+      visibility="true">      
+      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
+      <operations public="true" package="true" protected="false" private="false" static="true"/>    
+    </display>  
+  </interface>  
+  <interface id="14" language="java" name="org.workcraft.plugins.dfs.decorations.RegisterDecoration" project="DfsPlugin" 
+    file="/DfsPlugin/src/org/workcraft/plugins/dfs/decorations/RegisterDecoration.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="696" y="1037"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" accessors="true" 
+      visibility="true">      
+      <attributes public="true" package="true" protected="false" private="false" static="true"/>      
+      <operations public="true" package="true" protected="false" private="false" static="true"/>    
+    </display>  
+  </interface>  
+  <generalization id="15">    
+    <end type="SOURCE" refId="8"/>    
+    <end type="TARGET" refId="7"/>  
+  </generalization>  
+  <generalization id="16">    
+    <end type="SOURCE" refId="12"/>    
+    <end type="TARGET" refId="7"/>  
+  </generalization>  
+  <generalization id="17">    
+    <end type="SOURCE" refId="10"/>    
+    <end type="TARGET" refId="7"/>  
+  </generalization>  
+  <association id="18">    
+    <end type="SOURCE" refId="6" navigable="false">      
+      <attribute id="19" name="INSTANCE"/>      
+      <multiplicity id="20" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="6" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="21">    
+    <end type="SOURCE" refId="9"/>    
+    <end type="TARGET" refId="7"/>  
+  </generalization>  
+  <generalization id="22">    
+    <end type="SOURCE" refId="14"/>    
+    <end type="TARGET" refId="7"/>  
+  </generalization>  
+  <nesting id="23">    
+    <end type="SOURCE" refId="4"/>    
+    <end type="TARGET" refId="5"/>  
+  </nesting>  
+  <nesting id="24">    
+    <end type="SOURCE" refId="7"/>    
+    <end type="TARGET" refId="6"/>  
+  </nesting>  
+  <realization id="25">    
+    <end type="SOURCE" refId="5"/>    
+    <end type="TARGET" refId="4"/>  
+  </realization>  
+  <association id="26">    
+    <end type="SOURCE" refId="5" navigable="false">      
+      <attribute id="27" name="INSTANCE"/>      
+      <multiplicity id="28" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="5" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="29">    
+    <end type="SOURCE" refId="11"/>    
+    <end type="TARGET" refId="7"/>  
+  </generalization>  
+  <realization id="30">    
+    <end type="SOURCE" refId="6"/>    
+    <end type="TARGET" refId="7"/>  
+  </realization>  
+  <generalization id="31">    
+    <end type="SOURCE" refId="13"/>    
+    <end type="TARGET" refId="7"/>  
+  </generalization>  
+  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+    accessors="true" visibility="true">    
+    <attributes public="true" package="true" protected="false" private="false" static="true"/>    
+    <operations public="true" package="true" protected="false" private="false" static="true"/>  
+  </classifier-display>  
+  <association-display labels="true" multiplicity="true"/>
 </class-diagram>
\ No newline at end of file

=== modified file 'WorkcraftCore/src/org/workcraft/dom/visual/VisualComponent.java'
--- WorkcraftCore/src/org/workcraft/dom/visual/VisualComponent.java	2015-02-18 16:25:29 +0000
+++ WorkcraftCore/src/org/workcraft/dom/visual/VisualComponent.java	2015-02-27 18:34:42 +0000
@@ -388,30 +388,30 @@
 	
 	@Override
 	public void rotateClockwise() {
-		super.rotateClockwise();
 		setNamePositioning(getNamePositioning().rotateClockwise());
 		setLabelPositioning(getLabelPositioning().rotateClockwise());
+		super.rotateClockwise();
 	}
 	
 	@Override
 	public void rotateCounterclockwise() {
-		super.rotateCounterclockwise();
 		setNamePositioning(getNamePositioning().rotateCounterclockwise());
 		setLabelPositioning(getLabelPositioning().rotateCounterclockwise());
+		super.rotateCounterclockwise();
 	}
 
 	@Override
 	public void flipHorizontal() {
-		super.flipHorizontal();
 		setNamePositioning(getNamePositioning().flipHorizontal());
 		setLabelPositioning(getLabelPositioning().flipHorizontal());
+		super.flipHorizontal();
 	}
 
 	@Override
 	public void flipVertical() {
-		super.flipVertical();
 		setNamePositioning(getNamePositioning().flipVertical());
 		setLabelPositioning(getLabelPositioning().flipVertical());
+		super.flipVertical();
 	}
 
 }