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

[Danil Sokolov]

[Danil Sokolov (danilovesky)]

review: Approve

=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/CircuitComponent.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/CircuitComponent.java	2014-11-12 12:46:02 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/CircuitComponent.java	2014-11-24 17:05:32 +0000
@@ -151,6 +151,16 @@
 		}
 		return result;
 	}
+	
+	public Collection<Contact> getOutputs() {
+		ArrayList<Contact> result = new ArrayList<Contact>(); 
+		for(Contact c : getContacts()) {
+			if(c.getIOType() == IOType.OUTPUT) {
+				result.add(c);
+			}
+		}
+		return result;
+	}
 
 	public void setName(String name) {
 		this.name = name;

=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/Contact.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/Contact.java	2014-09-05 14:09:00 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/Contact.java	2014-11-24 17:05:32 +0000
@@ -103,4 +103,24 @@
 		return getName();
 	}
 
+	public boolean isInput() {
+		return (getIOType() == IOType.INPUT);
+	}
+
+	public boolean isOutput() {
+		return (getIOType() == IOType.OUTPUT);
+	}
+
+	public boolean isPort() {
+		return !(getParent() instanceof CircuitComponent);
+	}
+	
+	public boolean isDriver() {
+		return (isOutput() != isPort()); 
+	}
+
+	public boolean isDriven() {
+		return (isOutput() == isPort()); 
+	}
+
 }

=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/Environment.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/Environment.java	2014-04-24 20:24:53 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/Environment.java	2014-11-24 17:05:32 +0000
@@ -6,6 +6,7 @@
 
 public class Environment extends MathNode {
 	private File file;
+	private File base;
 	
 	public Environment() {
 		
@@ -18,4 +19,13 @@
 	public void setFile(File file) {
 		this.file = file;
 	}
+
+	public File getBase() {
+		return base;
+	}
+
+	public void setBase(File base) {
+		this.base = base;
+	}
+	
 }

=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/VisualCircuit.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/VisualCircuit.java	2014-11-10 10:31:47 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/VisualCircuit.java	2014-11-24 17:05:32 +0000
@@ -24,11 +24,12 @@
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
 import java.io.File;
+import java.net.URI;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.ListIterator;
 
+import org.workcraft.Framework;
 import org.workcraft.annotations.CustomTools;
 import org.workcraft.annotations.DisplayName;
 import org.workcraft.annotations.ShortName;
@@ -49,12 +50,14 @@
 import org.workcraft.exceptions.InvalidConnectionException;
 import org.workcraft.exceptions.NodeCreationException;
 import org.workcraft.exceptions.VisualModelInstantiationException;
+import org.workcraft.gui.graph.GraphEditorPanel;
 import org.workcraft.gui.propertyeditor.ModelProperties;
 import org.workcraft.plugins.circuit.Contact.IOType;
 import org.workcraft.plugins.circuit.VisualContact.Direction;
 import org.workcraft.serialisation.xml.NoAutoSerialisation;
 import org.workcraft.util.Func;
 import org.workcraft.util.Hierarchy;
+import org.workcraft.workspace.WorkspaceEntry;
 
 @DisplayName("Digital Circuit")
 @ShortName("circuit")
@@ -217,12 +220,27 @@
 	public Collection<Environment> getEnvironments() {
 		return Hierarchy.getChildrenOfType(getRoot(), Environment.class);
 	}
+
+	private File getBase() {
+		Framework framework = Framework.INSTANCE;
+		GraphEditorPanel editor = framework.getMainWindow().getCurrentEditor();
+		WorkspaceEntry we = editor.getWorkspaceEntry();
+		return we.getFile().getParentFile();
+	}
 	 
 	@NoAutoSerialisation
 	public File getEnvironmentFile() {
 		File result = null;
 		for (Environment env: getEnvironments()) {
 			result = env.getFile();
+			File base = env.getBase();
+			if (base != null) {
+				URI relativeUri = base.toURI().relativize(result.toURI());
+				if (!relativeUri.equals(result.toURI())) {
+					result = new File(getBase(), relativeUri.getPath());
+				}
+			}
+			break;
 		}
 		return result;
 	}
@@ -234,6 +252,7 @@
 		}
 		Environment env = new Environment();
 		env.setFile(value);
+		env.setBase(getBase());
 		add(env);
 	}
 	
@@ -251,4 +270,8 @@
 		return properties;
 	}
 
+	public String getMathName(VisualComponent component) {
+		return getMathModel().getName(component.getReferencedComponent());
+	}
+
 }

=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/VisualContact.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/VisualContact.java	2014-10-10 10:35:07 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/VisualContact.java	2014-11-24 17:05:32 +0000
@@ -36,7 +36,6 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.workcraft.dom.Node;
 import org.workcraft.dom.visual.DrawRequest;
 import org.workcraft.dom.visual.VisualComponent;
 import org.workcraft.gui.Coloriser;
@@ -331,16 +330,25 @@
 	public Contact getReferencedContact() {
 		return (Contact)getReferencedComponent();
 	}
+	
+	public boolean isInput() {
+		return getReferencedContact().isInput();
+	}
+	
+	public boolean isOutput() {
+		return getReferencedContact().isOutput();
+	}
+	
+	public boolean isPort() {
+		return getReferencedContact().isPort();
+	}
+	
+	public boolean isDriver() {
+		return getReferencedContact().isDriver();
+	}
 
-	
-	public static boolean isDriver(Node node) {
-		if (node instanceof VisualContact) {
-			VisualContact contact = (VisualContact)node;
-			boolean ret =	(contact.getIOType() == IOType.OUTPUT) || 
-							!(contact.getParent() instanceof VisualCircuitComponent); 
-			return ret;
-		}
-		return false;
+	public boolean isDriven() {
+		return getReferencedContact().isDriven();
 	}
 
 	public HashSet<SignalTransition> getReferencedTransitions() {

=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/tasks/CheckCircuitTask.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/tasks/CheckCircuitTask.java	2014-09-05 16:36:36 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/tasks/CheckCircuitTask.java	2014-11-24 17:05:32 +0000
@@ -79,7 +79,8 @@
 			monitor.progressUpdate(0.10);
 
 			// Generating .g for the circuit
-			File circuitStgFile = File.createTempFile(title + "-circuit-", stgExporter.getExtenstion());
+			String circuitFilePrefix = title + "-circuit-";
+			File circuitStgFile = File.createTempFile(circuitFilePrefix.replaceAll("\\s",""), stgExporter.getExtenstion());
 			ExportTask circuitExportTask = new ExportTask(stgExporter, circuitStg, circuitStgFile.getCanonicalPath());
 			Result<? extends Object> circuitExportResult = framework.getTaskManager().execute(
 					circuitExportTask, "Exporting circuit .g", subtaskMonitor);
@@ -111,7 +112,8 @@
 					environmentStgFile = environmentFile;
 				} else {
 					STG environementStg = (STG)framework.loadFile(environmentFile).getMathModel();
-					environmentStgFile = File.createTempFile(title + "-environment-", stgExporter.getExtenstion());
+					String environmentFilePrefix = title + "-environment-";
+					environmentStgFile = File.createTempFile(environmentFilePrefix.replaceAll("\\s",""), stgExporter.getExtenstion());
 					ExportTask environmentExportTask = new ExportTask(stgExporter, environementStg, environmentStgFile.getCanonicalPath());
 					Result<? extends Object> environmentExportResult = framework.getTaskManager().execute(
 							environmentExportTask, "Exporting environment .g", subtaskMonitor);
@@ -128,7 +130,8 @@
 				monitor.progressUpdate(0.25);
 
 				// Generating .g for the whole system (circuit and environment)
-				stgFile = File.createTempFile(title + "-system-", stgExporter.getExtenstion());
+				String systemFilePrefix = title + "-system-";
+				stgFile = File.createTempFile(systemFilePrefix.replaceAll("\\s",""), stgExporter.getExtenstion());
 				PcompTask pcompTask = new PcompTask(new File[]{circuitStgFile, environmentStgFile}, PCompOutputMode.OUTPUT, true, false);
 				pcompResult = framework.getTaskManager().execute(
 						pcompTask, "Running pcomp", subtaskMonitor);
@@ -148,7 +151,8 @@
 			monitor.progressUpdate(0.30);
 
 			// Generate unfolding
-			File unfoldingFile = File.createTempFile(title+"-unfolding-", MpsatUtilitySettings.getUnfoldingExtension());
+			String unfoldingFilePrefix = title + "-unfolding-";
+			File unfoldingFile = File.createTempFile(unfoldingFilePrefix.replaceAll("\\s",""), MpsatUtilitySettings.getUnfoldingExtension());
 			PunfTask punfTask = new PunfTask(stgFile.getCanonicalPath(), unfoldingFile.getCanonicalPath());
 			Result<? extends ExternalProcessResult> punfResult = framework.getTaskManager().execute(
 					punfTask, "Unfolding .g", subtaskMonitor);

=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/tools/STGGenerator.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/tools/STGGenerator.java	2014-11-07 18:09:40 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/tools/STGGenerator.java	2014-11-24 17:05:32 +0000
@@ -11,6 +11,7 @@
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.Map;
+import java.util.Queue;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -68,22 +69,42 @@
 		TransformHelper.applyTransform(node, AffineTransform.getTranslateInstance(point.getX(), point.getY()));
 	}
 	
-	public static VisualContact findDriver(VisualCircuit circuit, VisualContact target) {
-		Set<Node> neighbours = new HashSet<Node>(circuit.getPreset(target));
-		
-		while (neighbours.size()>=1) {
-			if(neighbours.size() != 1) throw new RuntimeException("Found more than one potential driver for target "+getContactName(circuit, target)+"!");
-			
-			Node node = neighbours.iterator().next();
-			if (VisualContact.isDriver(node)) {
-				// if it is a driver, return it
-				return (VisualContact)node;
-			}
-			
-			// continue searching otherwise
-			neighbours = new HashSet<Node>(circuit.getPreset(node));
+	public static VisualContact findDriver(VisualCircuit circuit, VisualContact contact) {
+		VisualContact result = null;
+        Queue<Node> queue = new LinkedList<Node>(circuit.getPreset(contact));
+        while (!queue.isEmpty()) {
+			if (queue.size() != 1) {
+				throw new RuntimeException("Found more than one potential driver for target "
+						+ getContactName(circuit, contact) + "!");
+			}
+            Node node = queue.remove();
+			if (node instanceof VisualContact) {
+				VisualContact vc = (VisualContact)node;
+				if (vc.isDriver()) {
+					result = vc;
+				}
+			} else {
+				queue.addAll(circuit.getPreset(node));
+			}
 		}
-		return null;
+		return result;
+	}
+	
+	public static Collection<VisualContact> findDriven(VisualCircuit circuit, VisualContact contact) {
+		Set<VisualContact> result = new HashSet<VisualContact>();
+        Queue<Node> queue = new LinkedList<Node>(circuit.getPostset(contact));
+        while (!queue.isEmpty()) {
+            Node node = queue.remove();
+			if (node instanceof VisualContact) {
+				VisualContact vc = (VisualContact)node;
+				if (vc.isDriven()) {
+					result.add(vc);
+				}
+			} else {
+                queue.addAll(circuit.getPostset(node));
+            }
+        }
+		return result;
 	}
 	
 	private static ContactSTG generatePlaces(VisualCircuit circuit, VisualSTG stg, VisualContact contact) {
@@ -121,7 +142,7 @@
 		}
 		
 		for (Connection c: circuit.getConnections(component)) {
-			if (c.getFirst()==component&&c instanceof VisualCircuitConnection) {
+			if ((c.getFirst() == component) && (c instanceof VisualCircuitConnection)) {
 				
 				((VisualCircuitConnection)c).setReferencedOnePlace(cstg.p1.getReferencedPlace());
 				((VisualCircuitConnection)c).setReferencedZeroPlace(cstg.p0.getReferencedPlace());
@@ -141,8 +162,6 @@
 		}
 	}
 	
-	
-	
 	// store created containers in a separate map
 	private static HashMap<String, Node> createdContainers = null;
 	
@@ -160,7 +179,7 @@
 			for (VisualContact contact : Hierarchy.getDescendantsOfType(circuit.getRoot(), VisualContact.class)) {
 				ContactSTG cstg;
 				
-				if(VisualContact.isDriver(contact)) {
+				if(contact.isDriver()) {
 					// if it is a driver, add it to the list of drivers
 					cstg = generatePlaces(circuit, stg, contact);
 					drivers.put(contact, cstg);
@@ -191,9 +210,9 @@
 				if (driver instanceof VisualFunctionContact) {
 					// Determine signal type
 					VisualFunctionContact contact = (VisualFunctionContact)driver;
-					signalType = getSignalType(contact);
+					signalType = getSignalType(circuit, contact);
 					
-					if ((contact.getIOType() == IOType.OUTPUT) && !(contact.getParent() instanceof VisualCircuitComponent)) {
+					if (contact.isOutput() && contact.isPort()) {
 						// Driver of the primary output port
 						VisualContact outputDriver = findDriver(circuit, contact);
 						if (outputDriver != null) {
@@ -221,17 +240,30 @@
 		}
 	}
 
-	private static Type getSignalType(VisualFunctionContact contact) {
-		Type result = Type.INPUT;
-		if (contact.getIOType() == IOType.OUTPUT) {
-			if (contact.getParent() instanceof VisualCircuitComponent) {
-				VisualCircuitComponent component = (VisualCircuitComponent)contact.getParent();
-				if (!component.getIsEnvironment()) {
-					result = Type.INTERNAL;
-				}
-			} else {
+	private static Type getSignalType(VisualCircuit circuit, VisualFunctionContact contact) {
+		Type result = Type.INTERNAL;
+		if (contact.isPort()) {
+			// Primary port
+			if (contact.isInput()) {
+				result = Type.INPUT;
+			} else if (contact.isOutput()) {
 				result = Type.OUTPUT;
-			   }
+			}
+		} else {
+			VisualCircuitComponent component = (VisualCircuitComponent)contact.getParent();
+			if (component.getIsEnvironment()) {
+				// Contact of an environment component
+				if (contact.isInput()) {
+					result = Type.OUTPUT;
+				} else if (contact.isOutput()) {
+					result = Type.INPUT;
+				}
+			} else {
+				// Contact of an ordinary component
+				if (contact.isOutput() && (getDrivenOutputPort(circuit, contact) != null)) {
+					result = Type.OUTPUT;
+				}
+			}
 		  }
 		  return result;
 	}
@@ -401,32 +433,77 @@
 	}
 
 	private static String getContactName(VisualCircuit circuit, VisualContact contact) {
-		String result = "";
-		Node parent = contact.getParent();
-		if (parent instanceof VisualFunctionComponent) {
-			int output_cnt=0;
-			VisualFunctionComponent vc = (VisualFunctionComponent)parent;
-			for (Node n: vc.getChildren()) {
-				if ((n instanceof VisualContact)&&
-						((VisualContact)n).getIOType()!=IOType.INPUT) {
-					output_cnt++;
-				}
-			}
-			
-			result = NamespaceHelper.getFlatName(
-						circuit.getMathModel().getName(vc.getReferencedComponent())
-					);
-			
-//			result = HierarchicalNames.getFlatName(
-//					circuit.getMathModel().getNodeReference(vc.getReferencedComponent())
-//					);
-			
-			if (contact.getIOType() == IOType.INPUT || output_cnt > 1) {
-				result += "_" + circuit.getMathModel().getName(contact.getReferencedContact());
-			}
+		String result = null;
+		if (contact.isPort()) {
+			result = circuit.getMathName(contact);
 		} else {
-			result = circuit.getMathModel().getName(contact.getReferencedContact());
-		}
-		return result;
-	}
+			if (contact.isInput()) {
+				result = getInputContactName(circuit, contact);
+			} else if (contact.isOutput()) {
+				result = getOutputContactName(circuit, contact);
+			}
+		}
+		return result;
+	}
+			
+	private static String getInputContactName(VisualCircuit circuit, VisualContact contact) {
+		String result = null;
+		Node parent = contact.getParent();
+		if (parent instanceof VisualFunctionComponent) {
+			VisualFunctionComponent component = (VisualFunctionComponent)parent;
+			String componentName = NamespaceHelper.getFlatName(circuit.getMathName(component));
+			String contactName = circuit.getMathName(contact);
+			result = componentName + "_" + contactName;
+		}
+		return result;
+	}
+
+	private static String getOutputContactName(VisualCircuit circuit, VisualContact contact) {
+		String result = null;
+		Node parent = contact.getParent();
+		if (parent instanceof VisualFunctionComponent) {
+			VisualFunctionComponent component = (VisualFunctionComponent)parent;
+
+			VisualContact outputPort = getDrivenOutputPort(circuit, contact);
+			if (outputPort != null) {
+				// If a single output port is driven, then take its name.
+				result = circuit.getMathName(outputPort); 
+			} else {
+				// If the component has a single output, use the component name. Otherwise append the contact.
+				result = NamespaceHelper.getFlatName(circuit.getMathName(component));
+				int output_cnt = 0;
+				for (Node node: component.getChildren()) {
+					if (node instanceof VisualContact) {
+						VisualContact vc = (VisualContact)node;
+						if (vc.isOutput()) {
+							output_cnt++;
+						}
+					}
+				}
+				if (output_cnt > 1) {
+					String suffix = "_" + circuit.getMathName(contact);
+					result += suffix;
+				}
+			}
+		}
+		return result;
+	}
+
+	private static VisualContact getDrivenOutputPort(VisualCircuit circuit, VisualContact contact) {
+		VisualContact result = null;
+		boolean multipleOutputPorts = false;
+		for (VisualContact vc: findDriven(circuit, contact)) {
+			if (vc.isPort() && vc.isOutput()) {
+				if (result != null) {
+					multipleOutputPorts = true;
+				}
+				result = vc;
+			}
+		}
+		if (multipleOutputPorts) {
+			result = null;
+		}
+		return result;
+	}
+	
 }

=== modified file 'WorkcraftCore/src/org/workcraft/Framework.java'
--- WorkcraftCore/src/org/workcraft/Framework.java	2014-11-14 23:43:09 +0000
+++ WorkcraftCore/src/org/workcraft/Framework.java	2014-11-24 17:05:32 +0000
@@ -94,8 +94,7 @@
 
 
 public class Framework {
-	public static final String FRAMEWORK_VERSION_MAJOR = "2";
-	public static final String FRAMEWORK_VERSION_MINOR = "dev";
+	 public static Framework INSTANCE;
 	
 	class ExecuteScriptAction implements ContextAction {
 		private String script;
@@ -195,6 +194,8 @@
 	public Memento clipboard;
 
 	public Framework() {
+		Framework.INSTANCE = this;
+
 		pluginManager = new PluginManager(this);
 		taskManager = new DefaultTaskManager()
 		{

=== modified file 'WorkcraftCore/src/org/workcraft/Info.java'
--- WorkcraftCore/src/org/workcraft/Info.java	2014-11-12 16:27:29 +0000
+++ WorkcraftCore/src/org/workcraft/Info.java	2014-11-24 17:05:32 +0000
@@ -12,8 +12,8 @@
 	
 	private static final int majorVersion = 3;
 	private static final int minorVersion = 0;
-	private static final int revisionVersion = 2;
-	private static final String statusVersion = "";
+	private static final int revisionVersion = 3;
+	private static final String statusVersion = "alpha";
 
 	private static final int startYear = 2006;
 	private static final int currentYear = Calendar.getInstance().get(Calendar.YEAR);

=== modified file 'WorkcraftCore/src/org/workcraft/dom/DefaultMathNodeRemover.java'
--- WorkcraftCore/src/org/workcraft/dom/DefaultMathNodeRemover.java	2014-11-12 22:33:34 +0000
+++ WorkcraftCore/src/org/workcraft/dom/DefaultMathNodeRemover.java	2014-11-24 17:05:32 +0000
@@ -22,6 +22,7 @@
 package org.workcraft.dom;
 
 import java.util.HashMap;
+import java.util.HashSet;
 
 import org.workcraft.dom.math.MathNode;
 import org.workcraft.dom.visual.DependentNode;
@@ -32,33 +33,31 @@
 
 public class DefaultMathNodeRemover extends HierarchySupervisor {
 	
-	private HashMap<MathNode, Integer> refCount = new HashMap<MathNode, Integer>();
+	private HashMap<MathNode, HashSet<DependentNode>> referenceTracker = new HashMap<MathNode, HashSet<DependentNode>>();
 	
-	private void incRef(MathNode node) {
-		if (node != null) {
-			Integer count = refCount.get(node);
-			if (count == null) {
-				refCount.put(node, 1);
-			} else {
-				refCount.put(node, count + 1);
-				if (count > 1) {
-					System.out.println("Debug info: node " + node + "is referenced " + (count+1) + " times");
-				}
+	private void addReference(MathNode mathNode, DependentNode dependentNode) {
+		if (mathNode != null) {
+			HashSet<DependentNode> refs = referenceTracker.get(mathNode);
+			if (refs == null) {
+				refs = new HashSet<DependentNode>();
+				referenceTracker.put(mathNode ,refs);
 			}
+			refs.add(dependentNode);
 		}
 	}
 
-	private void decRef(MathNode node) {
-		if (node != null) {
-			Integer refs = refCount.get(node) - 1;
-			if (refs == 0) {
-				refCount.remove(node);
-				Node parent = node.getParent();
+	private void removeReference(MathNode mathNode, DependentNode dependentNode) {
+		if (mathNode != null) {
+			HashSet<DependentNode> refs = referenceTracker.get(mathNode);
+			if (refs != null) {
+				refs.remove(dependentNode);
+			}
+			if ((refs == null) || refs.isEmpty()) {
+				referenceTracker.remove(mathNode);
+				Node parent = mathNode.getParent();
 				if (parent instanceof Container) {
-					((Container)parent).remove(node);		
+					((Container)parent).remove(mathNode);		
 				}
-			} else {
-				refCount.put(node, refs);
 			}
 		}
 	}
@@ -78,27 +77,29 @@
 	}
 
 	private void nodeAdded(Node node) {
+		if (node instanceof DependentNode) {
+			DependentNode dependentNode = (DependentNode)node;
+			for (MathNode mathNode : dependentNode.getMathReferences()) {
+				addReference(mathNode, dependentNode);
+			}
+		}
 		if (node != null) {
-			if (node instanceof DependentNode) {
-				for (MathNode mn : ((DependentNode)node).getMathReferences()) {
-					incRef(mn);
-				}
-			}
-			for (Node n : node.getChildren()) {
-				nodeAdded(n);
+			for (Node childNode : node.getChildren()) {
+				nodeAdded(childNode);
 			}
 		}
 	}
 
 	private void nodeRemoved(Node node) {
+		if (node instanceof DependentNode) {
+			DependentNode dependentNode = (DependentNode)node;
+			for (MathNode mathNode : dependentNode.getMathReferences()) {
+				removeReference(mathNode, dependentNode);
+			}
+		}
 		if (node != null) {
-			if (node instanceof DependentNode) {
-				for (MathNode mn : ((DependentNode)node).getMathReferences()) {
-					decRef(mn);
-				}
-			}
-			for (Node n : node.getChildren()) {
-				nodeRemoved(n);
+			for (Node childNode : node.getChildren()) {
+				nodeRemoved(childNode);
 			}
 		}
 	}

=== modified file 'WorkcraftCore/src/org/workcraft/gui/MainWindow.java'
--- WorkcraftCore/src/org/workcraft/gui/MainWindow.java	2014-11-14 17:38:33 +0000
+++ WorkcraftCore/src/org/workcraft/gui/MainWindow.java	2014-11-24 17:05:32 +0000
@@ -621,13 +621,14 @@
 	}
 
 	public void toggleDockableWindow(DockableWindow window) {
-		if (window.isClosed())
+		if (window.isClosed()) {
 			displayDockableWindow(window);
-		else
+		} else {
 			try {
 				closeDockableWindow(window);
 			} catch (OperationCancelledException e) {
 			}
+		}
 	}
 
 	private void saveDockingLayout() {
@@ -642,10 +643,9 @@
 		try {
 			File file = new File(UILAYOUT_PATH);
 			File parentDir = file.getParentFile();
-			if (parentDir != null)
-				if (!parentDir.exists())
-					parentDir.mkdirs();
-
+			if ((parentDir != null) && !parentDir.exists()) {
+				parentDir.mkdirs();
+			}
 			FileOutputStream os = new FileOutputStream(file);
 			pers.store(os, pmodel);
 			os.close();
@@ -1133,7 +1133,7 @@
 			suffix = " - " + model.getDisplayName();
 			break;
 		case SHORT:	
-			suffix += " [" + model.getShortName() + "]";
+			suffix = " [" + model.getShortName() + "]";
 			break;
 		default: 
 			suffix = "";
@@ -1144,7 +1144,7 @@
 
 	public void refreshTitle(WorkspaceEntry we) {
 		for (DockableWindow w : editorWindows.get(we)) {
-			final GraphEditorPanel editor = new GraphEditorPanel(MainWindow.this, we);
+			final GraphEditorPanel editor = getCurrentEditor();
 			String title = getTitle(we, editor.getModel());
 			w.getContentPanel().setTitle(title);
 			w.setTabText(title);

=== modified file 'WorkcraftCore/src/org/workcraft/gui/propertyeditor/FileCellEditor.java'
--- WorkcraftCore/src/org/workcraft/gui/propertyeditor/FileCellEditor.java	2014-04-24 20:24:53 +0000
+++ WorkcraftCore/src/org/workcraft/gui/propertyeditor/FileCellEditor.java	2014-11-24 17:05:32 +0000
@@ -19,7 +19,7 @@
 	JButton button;
 	File file;
 
-	public  FileCellEditor() {
+	public FileCellEditor() {
 		button = new JButton();
 		button.setActionCommand(EDIT);
 		button.addActionListener(this);

=== modified file 'WorkcraftCore/src/org/workcraft/plugins/serialisation/xml/FileDeserialiser.java'
--- WorkcraftCore/src/org/workcraft/plugins/serialisation/xml/FileDeserialiser.java	2014-04-24 20:24:53 +0000
+++ WorkcraftCore/src/org/workcraft/plugins/serialisation/xml/FileDeserialiser.java	2014-11-24 17:05:32 +0000
@@ -13,7 +13,8 @@
 	}
 
 	public Object deserialise(Element element) throws DeserialisationException {
-		return new File(element.getAttribute("path"));
+		String path = element.getAttribute("path");
+		return new File(path);
 	}
 
 }

=== modified file 'WorkcraftCore/src/org/workcraft/plugins/serialisation/xml/FileSerialiser.java'
--- WorkcraftCore/src/org/workcraft/plugins/serialisation/xml/FileSerialiser.java	2014-04-24 20:24:53 +0000
+++ WorkcraftCore/src/org/workcraft/plugins/serialisation/xml/FileSerialiser.java	2014-11-24 17:05:32 +0000
@@ -15,7 +15,9 @@
 	public void serialise(Element element, Object object)
 			throws SerialisationException {
 		if (object != null) {
-			element.setAttribute("path", ((File)object).getPath());
+			File file = (File)object;
+			String path = file.getPath();
+			element.setAttribute("path", path);
 		}
 	}
 

=== modified file 'WorkcraftCore/src/org/workcraft/workspace/WorkspaceEntry.java'
--- WorkcraftCore/src/org/workcraft/workspace/WorkspaceEntry.java	2014-11-14 17:38:33 +0000
+++ WorkcraftCore/src/org/workcraft/workspace/WorkspaceEntry.java	2014-11-24 17:05:32 +0000
@@ -133,7 +133,7 @@
 			if (dot == -1) {
 				res = name;
 			} else {
-				res = name.substring(0,dot);
+				res = name.substring(0, dot);
 			}
 		} else { 
 			res = name;

=== modified file 'build_distr_linux.sh'
--- build_distr_linux.sh	2014-11-12 16:27:29 +0000
+++ build_distr_linux.sh	2014-11-24 17:05:32 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 src_dir="."
-distr_dir="../../workcraft_3.0.2"
+distr_dir="../../workcraft_3.0.3_alpha"
 template_dir="../../distr-template-linux"
 
 ./build_distr.sh -s $src_dir -d $distr_dir -t $template_dir

=== modified file 'build_distr_windows.sh'
--- build_distr_windows.sh	2014-11-12 16:27:29 +0000
+++ build_distr_windows.sh	2014-11-24 17:05:32 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 src_dir="."
-distr_dir="../../workcraft_3.0.2"
+distr_dir="../../workcraft_3.0.3_alpha"
 template_dir="../../distr-template-windows"
 
 ./build_distr.sh -s $src_dir -d $distr_dir -t $template_dir