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

[Danil Sokolov]

[Danil Sokolov (danilovesky)]

review: Approve

=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/Circuit.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/Circuit.java	2015-04-23 12:19:54 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/Circuit.java	2015-05-27 12:15:56 +0000
@@ -21,6 +21,8 @@
 
 package org.workcraft.plugins.circuit;
 
+import java.util.Collection;
+
 import org.workcraft.dom.Container;
 import org.workcraft.dom.Node;
 import org.workcraft.dom.hierarchy.NamespaceProvider;
@@ -77,6 +79,10 @@
 		return con;
 	}
 
+	public Collection<FunctionContact> getFunctionContacts() {
+		return Hierarchy.getDescendantsOfType(getRoot(), FunctionContact.class);
+	}
+	
 	@Override
 	public ModelProperties getProperties(Node node) {
 		ModelProperties properties = super.getProperties(node);

=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/tools/CircuitSimulationTool.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/tools/CircuitSimulationTool.java	2015-05-20 22:01:06 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/tools/CircuitSimulationTool.java	2015-05-27 12:15:56 +0000
@@ -7,6 +7,7 @@
 import org.workcraft.dom.Node;
 import org.workcraft.dom.hierarchy.NamespaceHelper;
 import org.workcraft.dom.hierarchy.NamespaceProvider;
+import org.workcraft.dom.math.MathModel;
 import org.workcraft.dom.visual.HitMan;
 import org.workcraft.dom.visual.VisualGroup;
 import org.workcraft.dom.visual.VisualModel;
@@ -17,12 +18,13 @@
 import org.workcraft.gui.graph.tools.Decoration;
 import org.workcraft.gui.graph.tools.Decorator;
 import org.workcraft.gui.graph.tools.GraphEditor;
+import org.workcraft.plugins.circuit.Circuit;
 import org.workcraft.plugins.circuit.CircuitSettings;
 import org.workcraft.plugins.circuit.CircuitUtils;
+import org.workcraft.plugins.circuit.FunctionContact;
 import org.workcraft.plugins.circuit.VisualCircuit;
 import org.workcraft.plugins.circuit.VisualCircuitConnection;
 import org.workcraft.plugins.circuit.VisualContact;
-import org.workcraft.plugins.circuit.VisualFunctionContact;
 import org.workcraft.plugins.circuit.VisualJoint;
 import org.workcraft.plugins.circuit.stg.CircuitToStgConverter;
 import org.workcraft.plugins.circuit.stg.SignalStg;
@@ -107,14 +109,18 @@
 		if ((savedState == null) || savedState.isEmpty()) {
 			return;
 		}
-		VisualCircuit circuit = (VisualCircuit)editor.getModel();
-		for (VisualFunctionContact contact : circuit.getVisualFunctionContacts()) {
-			String contactName = CircuitUtils.getContactName(circuit, contact);
-			String ref = contactName + CircuitToStgConverter.NAME_SUFFIX_1;
-			Node node = net.getNodeByReference(ref);
-			if ((node instanceof Place) && savedState.containsKey(node)) {
-				boolean initToOne = (savedState.get(node) > 0); 
-				contact.getReferencedContact().setInitToOne(initToOne);
+		MathModel model = editor.getModel().getMathModel();
+		if (model instanceof Circuit) {
+			editor.getWorkspaceEntry().saveMemento();
+			Circuit circuit = (Circuit)model;
+			for (FunctionContact contact : circuit.getFunctionContacts()) {
+				String contactName = CircuitUtils.getContactName(circuit, contact);
+				String ref = contactName + CircuitToStgConverter.NAME_SUFFIX_1;
+				Node node = net.getNodeByReference(ref);
+				if ((node instanceof Place) && savedState.containsKey(node)) {
+					boolean initToOne = (savedState.get(node) > 0); 
+					contact.setInitToOne(initToOne);
+				}
 			}
 		}
 	}

=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/tools/CycleAnaliserTool.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/tools/CycleAnaliserTool.java	2015-03-02 12:18:03 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/tools/CycleAnaliserTool.java	2015-05-27 12:15:56 +0000
@@ -11,7 +11,6 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.text.DecimalFormat;
-import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -20,14 +19,14 @@
 import java.util.List;
 
 import javax.swing.Icon;
-import javax.swing.JFormattedTextField;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
+import javax.swing.JTextField;
 import javax.swing.ListSelectionModel;
 import javax.swing.table.AbstractTableModel;
-import javax.swing.text.NumberFormatter;
+import javax.swing.table.TableColumnModel;
 
 import org.workcraft.dom.Node;
 import org.workcraft.dom.visual.VisualComponent;
@@ -39,6 +38,7 @@
 import org.workcraft.plugins.dfs.VisualDfs;
 import org.workcraft.util.GUI;
 import org.workcraft.util.Hierarchy;
+import org.workcraft.util.IntDocument;
 import org.workcraft.util.graph.cycle.ElementaryCyclesSearch;
 
 public class CycleAnaliserTool extends AbstractTool {
@@ -61,22 +61,25 @@
 	protected JPanel controlPanel;
 	protected JScrollPane infoPanel;
 	protected JPanel statusPanel;
-	protected JTable cycleTable;
+	private JTable cycleTable;
+	private JLabel cycleCountLabel;
 
 	@Override
 	public void createInterfacePanel(final GraphEditor editor) {
 		controlPanel = new JPanel();
 		cycleTable = new JTable(new CycleTableModel());
 		cycleTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		cycleTable.getColumnModel().getColumn(COLUMN_THROUGHPUT).setPreferredWidth(50);
-		cycleTable.getColumnModel().getColumn(COLUMN_TOKEN).setPreferredWidth(30);
-		cycleTable.getColumnModel().getColumn(COLUMN_DELAY).setPreferredWidth(30);
-		cycleTable.getColumnModel().getColumn(COLUMN_CYCLE).setPreferredWidth(300);
+		TableColumnModel columnModel = cycleTable.getColumnModel();
+		columnModel.getColumn(COLUMN_THROUGHPUT).setPreferredWidth(50);
+		columnModel.getColumn(COLUMN_TOKEN).setPreferredWidth(30);
+		columnModel.getColumn(COLUMN_DELAY).setPreferredWidth(30);
+		columnModel.getColumn(COLUMN_CYCLE).setPreferredWidth(300);
 		cycleTable.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
+		cycleTable.setAutoCreateColumnsFromModel(false);
 		cycleTable.addMouseListener(new MouseListener() {
 			public void mouseClicked(MouseEvent e) {
 				int selectedRow = cycleTable.getSelectedRow();
-				if (cycles != null && selectedRow >= 0 && selectedRow < cycles.size()) {
+				if ((cycles != null) && (selectedRow >= 0) && (selectedRow < cycles.size())) {
 					Cycle curCycle = cycles.get(selectedRow);
 					if (selectedCycle != curCycle) {
 						selectedCycle = curCycle;
@@ -109,21 +112,24 @@
 		interfacePanel.add(controlPanel, BorderLayout.PAGE_START);
 		interfacePanel.add(infoPanel, BorderLayout.CENTER);
 		interfacePanel.add(statusPanel, BorderLayout.PAGE_END);
+		interfacePanel.setPreferredSize(new Dimension(0, 0));
 
-		NumberFormat format = NumberFormat.getIntegerInstance();
-		NumberFormatter formatter = new NumberFormatter(format);
-		formatter.setAllowsInvalid(false);
-		formatter.setMinimum(1);
-		formatter.setMaximum(1000);
-		final JFormattedTextField cycleCountText = new JFormattedTextField(formatter);
-		cycleCountText.setPreferredSize(new Dimension(100, 24));
+		final JTextField cycleCountText = new JTextField();
+		Dimension dimension = cycleCountText.getPreferredSize();
+		dimension.width = 40;
+		cycleCountText.setPreferredSize(dimension);
+		cycleCountText.setDocument(new IntDocument(3));
 		cycleCountText.setText(new Integer(cycleCount).toString());
 		cycleCountText.addKeyListener(new KeyListener() {
 			@Override
 			public void keyPressed(KeyEvent arg0) {
 				if (arg0.getKeyCode() == KeyEvent.VK_ENTER) {
-					cycleCount = Integer.parseInt(cycleCountText.getText());
-					resetSelectedCycle(editor);	
+					try {
+						cycleCount = Integer.parseInt(cycleCountText.getText());
+						resetSelectedCycle(editor);	
+					} catch (NumberFormatException e) {
+						cycleCountText.setText(new Integer(cycleCount).toString());
+					}
 				}
 				else if (arg0.getKeyCode() == KeyEvent.VK_ESCAPE) {
 					cycleCountText.setText(new Integer(cycleCount).toString());
@@ -150,7 +156,7 @@
 			}
 		});
 		
-		JLabel cycleCountLabel = new JLabel();
+		cycleCountLabel = new JLabel();
 		cycleCountLabel.setText("Cycle count:");
 		cycleCountLabel.setLabelFor(cycleCountText);
 
@@ -170,6 +176,9 @@
 		cycleTable.clearSelection();
 		selectedCycle = null;
 		cycles = findCycles();
+		if ((cycles != null) && (cycleCountLabel != null)) {
+			cycleCountLabel.setText("Cycle count (out of " + cycles.size() + "):");
+		}
 		super.activated(editor);
 		editor.getWorkspaceEntry().setCanModify(false);
 	}
@@ -247,7 +256,7 @@
 	
 	public ArrayList<Cycle> findCycles() {
 		ArrayList<Cycle> result = new ArrayList<Cycle>();
-		// update global min and max delay values
+		// Update global min and max delay values
 		Collection<VisualDelayComponent> allComponents = Hierarchy.getDescendantsOfType(dfs.getRoot(), VisualDelayComponent.class);
 		boolean first = true;
 		for (VisualDelayComponent c: allComponents) {
@@ -260,7 +269,7 @@
 			}
 			first = false;
 		}
-		// prepare temporary node array and adjacency matrix
+		// Prepare temporary node array and adjacency matrix
 	    int size = allComponents.size();
 	    VisualComponent tmpComponents[] = allComponents.toArray(new VisualComponent[size]);
 		boolean adjMatrix[][] = new boolean[size][size];
@@ -272,7 +281,7 @@
 				adjMatrix[j][i] = preset.contains(tmpComponents[j]);
 			}
 		}
-		// calculate simple cycles and process the results
+		// Calculate simple cycles and process the results
 		ElementaryCyclesSearch ecs = new ElementaryCyclesSearch(adjMatrix, tmpComponents);
 		List tmpCycles = ecs.getElementaryCycles();
 		for (int i = 0; i < tmpCycles.size(); i++) {

=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/tools/DfsSimulationTool.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/tools/DfsSimulationTool.java	2015-05-06 20:28:22 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/tools/DfsSimulationTool.java	2015-05-27 12:15:56 +0000
@@ -16,6 +16,7 @@
 import org.workcraft.gui.graph.tools.Decorator;
 import org.workcraft.gui.graph.tools.GraphEditor;
 import org.workcraft.plugins.dfs.BinaryRegister.Marking;
+import org.workcraft.plugins.dfs.VisualAbstractRegister;
 import org.workcraft.plugins.dfs.VisualBinaryRegister;
 import org.workcraft.plugins.dfs.VisualControlRegister;
 import org.workcraft.plugins.dfs.VisualCounterflowLogic;
@@ -38,6 +39,7 @@
 import org.workcraft.plugins.dfs.stg.StgGenerator;
 import org.workcraft.plugins.petri.Place;
 import org.workcraft.plugins.petri.Transition;
+import org.workcraft.plugins.petri.VisualPlace;
 import org.workcraft.plugins.shared.CommonSimulationSettings;
 import org.workcraft.plugins.stg.VisualSignalTransition;
 import org.workcraft.plugins.stg.tools.StgSimulationTool;
@@ -64,12 +66,31 @@
 		generator = new StgGenerator((VisualDfs)model);
 		return generator.getStg();
 	}
+	
+	private VisualPlace getVisualPlace(Place place) {
+		VisualPlace result = null;
+		for (VisualPlace vp: Hierarchy.getDescendantsOfType(visualNet.getRoot(), VisualPlace.class)) {
+			if (vp.getReferencedPlace() == place) {
+				result = vp;
+				break;
+			}
+		}
+		return result;
+	}
+
+	private void copyTokenColor(VisualAbstractRegister r, Node nodeM) {
+		VisualPlace vp = getVisualPlace((Place)nodeM);
+		if (vp != null) {
+			r.setTokenColor(vp.getTokenColor());
+		}
+	}
 
 	@Override
 	public void applyInitState(final GraphEditor editor) {
 		if ((savedState == null) || savedState.isEmpty()) {
 			return;
 		}
+		editor.getWorkspaceEntry().saveMemento();
 		VisualDfs dfs = (VisualDfs)editor.getModel();
 		for(VisualLogic l : Hierarchy.getDescendantsOfType(dfs.getRoot(), VisualLogic.class)) {
 			String refC = StgGenerator.nameC + dfs.getNodeMathReference(l) + StgGenerator.name1;
@@ -85,6 +106,7 @@
 			if ((nodeM instanceof Place) && savedState.containsKey(nodeM)) {
 				boolean marked = (savedState.get(nodeM) > 0);
 				r.getReferencedRegister().setMarked(marked);
+				copyTokenColor(r, nodeM);
 			}
 		}
 		for(VisualCounterflowLogic l : Hierarchy.getDescendantsOfType(dfs.getRoot(), VisualCounterflowLogic.class)) {
@@ -107,12 +129,14 @@
 			if ((nodeOrM instanceof Place) && savedState.containsKey(nodeOrM)) {
 				boolean orMarked = (savedState.get(nodeOrM) > 0);
 				r.getReferencedCounterflowRegister().setOrMarked(orMarked);
+				copyTokenColor(r, nodeOrM);
 			}
 			String refAndM = StgGenerator.nameAndM + dfs.getNodeMathReference(r) + StgGenerator.name1;
 			Node nodeAndM = net.getNodeByReference(refAndM);
 			if ((nodeAndM instanceof Place) && savedState.containsKey(nodeAndM)) {
 				boolean andMarked = (savedState.get(nodeAndM) > 0);
 				r.getReferencedCounterflowRegister().setAndMarked(andMarked);
+				copyTokenColor(r, nodeAndM);
 			}
 		}
 		for(VisualBinaryRegister r : Hierarchy.getDescendantsOfType(dfs.getRoot(), VisualBinaryRegister.class)) {
@@ -123,6 +147,7 @@
 				if (savedState.get(nodeTrueM) > 0) {
 					r.getReferencedBinaryRegister().setMarking(Marking.TRUE_TOKEN);
 				}
+				copyTokenColor(r, nodeTrueM);
 			}
 			String refFalseM = StgGenerator.nameFalseM + dfs.getNodeMathReference(r) + StgGenerator.name1;
 			Node nodeFalseM = net.getNodeByReference(refFalseM);
@@ -130,6 +155,7 @@
 				if (savedState.get(nodeFalseM) > 0) {
 					r.getReferencedBinaryRegister().setMarking(Marking.FALSE_TOKEN);
 				}
+				copyTokenColor(r, nodeFalseM);
 			}
 		}
 	}

=== modified file 'FsmPlugin/src/org/workcraft/plugins/fsm/Fsm.java'
--- FsmPlugin/src/org/workcraft/plugins/fsm/Fsm.java	2015-04-23 12:19:54 +0000
+++ FsmPlugin/src/org/workcraft/plugins/fsm/Fsm.java	2015-05-27 12:15:56 +0000
@@ -43,7 +43,6 @@
 		new SymbolConsistencySupervisor(this).attach(getRoot());
 	}
 
-
 	public State createState(String name) {
 		return createNode(name, null, State.class);
 	}

=== modified file 'FsmPlugin/src/org/workcraft/plugins/fsm/tools/FsmSimulationTool.java'
--- FsmPlugin/src/org/workcraft/plugins/fsm/tools/FsmSimulationTool.java	2015-05-06 20:28:22 +0000
+++ FsmPlugin/src/org/workcraft/plugins/fsm/tools/FsmSimulationTool.java	2015-05-27 12:15:56 +0000
@@ -5,6 +5,7 @@
 
 import org.workcraft.dom.Container;
 import org.workcraft.dom.Node;
+import org.workcraft.dom.math.MathModel;
 import org.workcraft.dom.visual.HitMan;
 import org.workcraft.dom.visual.VisualGroup;
 import org.workcraft.dom.visual.VisualModel;
@@ -15,6 +16,8 @@
 import org.workcraft.gui.graph.tools.Decoration;
 import org.workcraft.gui.graph.tools.Decorator;
 import org.workcraft.gui.graph.tools.GraphEditor;
+import org.workcraft.plugins.fsm.Fsm;
+import org.workcraft.plugins.fsm.State;
 import org.workcraft.plugins.fsm.VisualEvent;
 import org.workcraft.plugins.fsm.VisualFsm;
 import org.workcraft.plugins.fsm.VisualState;
@@ -66,13 +69,17 @@
 		if ((savedState == null) || savedState.isEmpty()) {
 			return;
 		}
-		VisualFsm fsm = (VisualFsm)editor.getModel();
-		for (VisualState state: fsm.getVisualStates()) {
-			String ref = fsm.getNodeMathReference(state);
-			Node node = net.getNodeByReference(ref);
-			if (node instanceof Place) {
-				boolean isInitial = ((Place)node).getTokens() > 0;
-				state.getReferencedState().setInitial(isInitial);
+		MathModel model = editor.getModel().getMathModel();
+		if (model instanceof Fsm) {
+			editor.getWorkspaceEntry().saveMemento();
+			Fsm fsm = (Fsm)model;
+			for (State state: fsm.getStates()) {
+				String ref = fsm.getNodeReference(state);
+				Node node = net.getNodeByReference(ref);
+				if (node instanceof Place) {
+					boolean isInitial = ((Place)node).getTokens() > 0;
+					state.setInitial(isInitial);
+				}
 			}
 		}
 	}

=== modified file 'FstPlugin/src/org/workcraft/plugins/fst/tools/FstSimulationTool.java'
--- FstPlugin/src/org/workcraft/plugins/fst/tools/FstSimulationTool.java	2015-05-06 20:28:22 +0000
+++ FstPlugin/src/org/workcraft/plugins/fst/tools/FstSimulationTool.java	2015-05-27 12:15:56 +0000
@@ -5,6 +5,7 @@
 
 import org.workcraft.dom.Container;
 import org.workcraft.dom.Node;
+import org.workcraft.dom.math.MathModel;
 import org.workcraft.dom.visual.HitMan;
 import org.workcraft.dom.visual.VisualGroup;
 import org.workcraft.dom.visual.VisualModel;
@@ -15,8 +16,10 @@
 import org.workcraft.gui.graph.tools.Decoration;
 import org.workcraft.gui.graph.tools.Decorator;
 import org.workcraft.gui.graph.tools.GraphEditor;
+import org.workcraft.plugins.fsm.State;
 import org.workcraft.plugins.fsm.VisualEvent;
 import org.workcraft.plugins.fsm.VisualState;
+import org.workcraft.plugins.fst.Fst;
 import org.workcraft.plugins.fst.VisualFst;
 import org.workcraft.plugins.petri.Place;
 import org.workcraft.plugins.petri.Transition;
@@ -63,13 +66,17 @@
 		if ((savedState == null) || savedState.isEmpty()) {
 			return;
 		}
-		VisualFst fst = (VisualFst)editor.getModel();
-		for (VisualState state: fst.getVisualStates()) {
-			String ref = fst.getNodeMathReference(state);
-			Node node = net.getNodeByReference(ref);
-			if (node instanceof Place) {
-				boolean isInitial = ((Place)node).getTokens() > 0;
-				state.getReferencedState().setInitial(isInitial);
+		MathModel model = editor.getModel().getMathModel();
+		if (model instanceof Fst) {
+			editor.getWorkspaceEntry().saveMemento();
+			Fst fst = (Fst)model;
+			for (State state: fst.getStates()) {
+				String ref = fst.getNodeReference(state);
+				Node node = net.getNodeByReference(ref);
+				if (node instanceof Place) {
+					boolean isInitial = ((Place)node).getTokens() > 0;
+					state.setInitial(isInitial);
+				}
 			}
 		}
 	}

=== modified file 'MpsatPlugin/src/org/workcraft/plugins/mpsat/gui/MpsatConfigurationDialog.java'
--- MpsatPlugin/src/org/workcraft/plugins/mpsat/gui/MpsatConfigurationDialog.java	2015-05-22 17:42:39 +0000
+++ MpsatPlugin/src/org/workcraft/plugins/mpsat/gui/MpsatConfigurationDialog.java	2015-05-27 12:15:56 +0000
@@ -26,9 +26,6 @@
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.KeyStroke;
-import javax.swing.text.AttributeSet;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.PlainDocument;
 
 import org.workcraft.dom.hierarchy.NamespaceHelper;
 import org.workcraft.gui.DesktopApi;
@@ -42,6 +39,7 @@
 import org.workcraft.plugins.shared.presets.PresetManager;
 import org.workcraft.plugins.shared.presets.SettingsToControlsMapper;
 import org.workcraft.util.GUI;
+import org.workcraft.util.IntDocument;
 
 @SuppressWarnings("serial")
 public class MpsatConfigurationDialog extends JDialog {
@@ -72,25 +70,6 @@
 			return description;
 		}
 	}
-	
-	class IntDocument extends PlainDocument {
-		private int limit;
-		
-		public IntDocument(int limit) {
-			super();
-			this.limit = limit;
-		}
-		
-		@Override
-		public void insertString(int offset, String str, AttributeSet attr) throws BadLocationException {
-			 if (str != null) {
-				 String s =  str.replaceAll("\\D++", "");    
-				 if (getLength() + s.length() <= limit) {
-					 super.insertString(offset, s, attr);
-				 }
-			 }
-		} 
-	}
 
 	public MpsatConfigurationDialog(Window owner, PresetManager<MpsatSettings> presetManager) {
 		super(owner, "Custom property definition", ModalityType.APPLICATION_MODAL);
@@ -226,14 +205,12 @@
 		solutionModePanel.add(allSolutionsRadioButton);
 
 		solutionLimitText = new JTextField();
-		solutionLimitText.setText("WWW");
-		
+		Dimension dimension = solutionLimitText.getPreferredSize();
+		dimension.width = 38;
+		solutionLimitText.setPreferredSize(dimension);
 		solutionLimitText.setToolTipText("Maximum number of solutions. Leave blank for no limit.");
-		Dimension soludioLimitDimention = solutionLimitText.getPreferredSize();
-		solutionLimitText.setText("");
-		solutionLimitText.setPreferredSize(soludioLimitDimention);
+		solutionLimitText.setDocument(new IntDocument(3));
 		solutionLimitText.setEnabled(false);
-		solutionLimitText.setDocument(new IntDocument(3)); 
 		solutionModePanel.add(solutionLimitText);
 		optionsPanel.add(solutionModePanel);
 		optionsPanel.add(new SimpleFlowLayout.LineBreak());

=== modified file 'PetriNetPlugin/src/org/workcraft/plugins/petri/tools/PetriNetSimulationTool.java'
--- PetriNetPlugin/src/org/workcraft/plugins/petri/tools/PetriNetSimulationTool.java	2015-05-22 17:42:39 +0000
+++ PetriNetPlugin/src/org/workcraft/plugins/petri/tools/PetriNetSimulationTool.java	2015-05-27 12:15:56 +0000
@@ -667,6 +667,7 @@
 		}
 		MathModel model = editor.getModel().getMathModel();
 		if (model instanceof PetriNetModel) {
+			editor.getWorkspaceEntry().saveMemento();
 			PetriNetModel pn = (PetriNetModel)model;
 			for (Place place: savedState.keySet()) {
 				String ref = net.getNodeReference(place);

=== modified file 'PolicyNetPlugin/src/org/workcraft/plugins/policy/PolicyNetToolProvider.java'
--- PolicyNetPlugin/src/org/workcraft/plugins/policy/PolicyNetToolProvider.java	2014-09-09 20:42:17 +0000
+++ PolicyNetPlugin/src/org/workcraft/plugins/policy/PolicyNetToolProvider.java	2015-05-27 12:15:56 +0000
@@ -10,7 +10,7 @@
 import org.workcraft.gui.graph.tools.NodeGeneratorTool;
 import org.workcraft.plugins.petri.Place;
 import org.workcraft.plugins.policy.tools.SelectionTool;
-import org.workcraft.plugins.policy.tools.SimulationTool;
+import org.workcraft.plugins.policy.tools.PolicySimulationTool;
 
 public class PolicyNetToolProvider implements CustomToolsProvider {
 
@@ -24,7 +24,7 @@
 		
 		result.add(new NodeGeneratorTool(new DefaultNodeGenerator(Place.class)));
 		result.add(new NodeGeneratorTool(new DefaultNodeGenerator(BundledTransition.class)));
-		result.add(new SimulationTool());
+		result.add(new PolicySimulationTool());
 		
 		return result;
 	}

=== renamed file 'PolicyNetPlugin/src/org/workcraft/plugins/policy/tools/SimulationTool.java' => 'PolicyNetPlugin/src/org/workcraft/plugins/policy/tools/PolicySimulationTool.java'
--- PolicyNetPlugin/src/org/workcraft/plugins/policy/tools/SimulationTool.java	2015-05-15 11:47:39 +0000
+++ PolicyNetPlugin/src/org/workcraft/plugins/policy/tools/PolicySimulationTool.java	2015-05-27 12:15:56 +0000
@@ -6,6 +6,7 @@
 
 import org.workcraft.dom.Container;
 import org.workcraft.dom.Node;
+import org.workcraft.dom.math.MathModel;
 import org.workcraft.dom.visual.HitMan;
 import org.workcraft.dom.visual.VisualGroup;
 import org.workcraft.dom.visual.VisualModel;
@@ -22,12 +23,13 @@
 import org.workcraft.plugins.petri.VisualTransition;
 import org.workcraft.plugins.petri.tools.PetriNetSimulationTool;
 import org.workcraft.plugins.petri.tools.PlaceDecoration;
+import org.workcraft.plugins.policy.PolicyNet;
 import org.workcraft.plugins.policy.VisualBundledTransition;
 import org.workcraft.plugins.policy.VisualPolicyNet;
 import org.workcraft.plugins.shared.CommonSimulationSettings;
 import org.workcraft.util.Func;
 
-public class SimulationTool extends PetriNetSimulationTool {
+public class PolicySimulationTool extends PetriNetSimulationTool {
 	private PetriNetGenerator generator;
 
 	@Override
@@ -47,13 +49,17 @@
 		if ((savedState == null) || savedState.isEmpty()) {
 			return;
 		}
-		VisualPolicyNet policy = (VisualPolicyNet)editor.getModel();
-		for (VisualPlace place: policy.getVisualPlaces()) {
-			String ref = policy.getNodeMathReference(place);
-			Node node = net.getNodeByReference(ref);
-			if (node instanceof Place) {
-				int tokens = ((Place)node).getTokens();
-				place.getReferencedPlace().setTokens(tokens);
+		MathModel model = editor.getModel().getMathModel();
+		if (model instanceof PolicyNet) {
+			editor.getWorkspaceEntry().saveMemento();
+			PolicyNet policy = (PolicyNet)model;
+			for (Place place: policy.getPlaces()) {
+				String ref = policy.getNodeReference(place);
+				Node node = net.getNodeByReference(ref);
+				if (node instanceof Place) {
+					int tokens = ((Place)node).getTokens();
+					place.setTokens(tokens);
+				}
 			}
 		}
 	}

=== modified file 'STGPlugin/src/org/workcraft/plugins/stg/tools/StgSimulationTool.java'
--- STGPlugin/src/org/workcraft/plugins/stg/tools/StgSimulationTool.java	2015-05-15 11:47:39 +0000
+++ STGPlugin/src/org/workcraft/plugins/stg/tools/StgSimulationTool.java	2015-05-27 12:15:56 +0000
@@ -31,7 +31,6 @@
 import org.workcraft.plugins.stg.VisualImplicitPlaceArc;
 import org.workcraft.plugins.stg.VisualSTG;
 import org.workcraft.util.ColorGenerator;
-import org.workcraft.util.Pair;
 
 public class StgSimulationTool extends PetriNetSimulationTool {
 	private static Color inputsColor = Color.RED.darker();

=== modified file 'WorkcraftCore/src/org/workcraft/dom/visual/VisualModel.java'
--- WorkcraftCore/src/org/workcraft/dom/visual/VisualModel.java	2015-05-19 18:01:37 +0000
+++ WorkcraftCore/src/org/workcraft/dom/visual/VisualModel.java	2015-05-27 12:15:56 +0000
@@ -74,4 +74,4 @@
 	public void setTemplateNode(VisualNode node);
 	public VisualNode getTemplateNode();
 	
-}
\ No newline at end of file
+}

=== modified file 'WorkcraftCore/src/org/workcraft/gui/propertyeditor/SettingsEditorDialog.java'
--- WorkcraftCore/src/org/workcraft/gui/propertyeditor/SettingsEditorDialog.java	2015-05-22 17:42:39 +0000
+++ WorkcraftCore/src/org/workcraft/gui/propertyeditor/SettingsEditorDialog.java	2015-05-27 12:15:56 +0000
@@ -33,6 +33,7 @@
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.JTable;
 import javax.swing.JTree;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
@@ -81,6 +82,7 @@
 		super(owner);
 
 		propertiesTable = new PropertyEditorTable();
+		propertiesTable.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
 
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 		setModal(true);
@@ -92,12 +94,15 @@
 			}
 		});
 		
+		Dimension minSize = new Dimension(640, 480);
+		setMinimumSize(minSize);
+		Dimension mySize = new Dimension(900, 600);
+		setSize(mySize);
+
 		Dimension parentSize = owner.getSize();
-		this.setSize(parentSize.width / 2, parentSize.height / 2);
-		Dimension mySize = getSize();
 		owner.getLocationOnScreen();
+		setLocation(((parentSize.width - mySize.width)/2) + 0, ((parentSize.height - mySize.height)/2) + 0);
 
-		this.setLocation(((parentSize.width - mySize.width)/2) + 0, ((parentSize.height - mySize.height)/2) + 0);
 		initComponents();
 		loadSections();
 	}
@@ -195,7 +200,7 @@
 				
 		sectionScroll.setViewportView(sectionTree);
 		sectionScroll.setMinimumSize(new Dimension (200,0));
-		sectionScroll.setPreferredSize(new Dimension (200,0));
+		sectionScroll.setPreferredSize(new Dimension (250,0));
 		sectionScroll.setBorder(BorderFactory.createTitledBorder("Section"));
 
 		propertiesPane = new JPanel();

=== added file 'WorkcraftCore/src/org/workcraft/util/IntDocument.java'
--- WorkcraftCore/src/org/workcraft/util/IntDocument.java	1970-01-01 00:00:00 +0000
+++ WorkcraftCore/src/org/workcraft/util/IntDocument.java	2015-05-27 12:15:56 +0000
@@ -0,0 +1,26 @@
+package org.workcraft.util;
+
+import javax.swing.text.AttributeSet;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.PlainDocument;
+
+@SuppressWarnings("serial")
+public class IntDocument extends PlainDocument {
+	private int limit;
+
+	public IntDocument(int limit) {
+		super();
+		this.limit = limit;
+	}
+
+	@Override
+	public void insertString(int offset, String str, AttributeSet attr) throws BadLocationException {
+		if (str != null) {
+			String s =  str.replaceAll("\\D++", "");
+			if (getLength() + s.length() <= limit) {
+				super.insertString(offset, s, attr);
+			}
+		}
+	}
+
+}