Merge lp:~jonathan-r-beaumont/workcraft/trunk-bug-1537854 into lp:workcraft

[Jonny Beaumont]

Fixed bug 1537854. This includes a clear message when a user attempts to extract concurrency of a selected graph not grouped as a scenario, and some code refinements for when trimming whitespace from strings.

[Danil Sokolov (danilovesky)]

review: Approve

=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/CustomToolsProvider.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/CustomToolsProvider.java	2015-02-05 21:35:30 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/CustomToolsProvider.java	2016-01-26 16:51:52 +0000
@@ -17,7 +17,7 @@
 	{
 		ArrayList<GraphEditorTool> result = new ArrayList<GraphEditorTool>();
 
-		result.add(new CpogSelectionTool(true));
+		result.add(new CpogSelectionTool());
 		result.add(new CommentGeneratorTool());
 		result.add(new ConnectionTool());
 		

=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/VisualCPOG.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/VisualCPOG.java	2015-08-04 18:28:42 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/VisualCPOG.java	2016-01-26 16:51:52 +0000
@@ -31,6 +31,7 @@
 import org.workcraft.dom.Container;
 import org.workcraft.dom.Node;
 import org.workcraft.dom.math.MathConnection;
+import org.workcraft.dom.math.PageNode;
 import org.workcraft.dom.visual.AbstractVisualModel;
 import org.workcraft.dom.visual.SelectionHelper;
 import org.workcraft.dom.visual.TransformHelper;
@@ -289,5 +290,25 @@
 			((VisualGroup) node.getParent()).removeWithoutNotify(node);
 		}
 	}
+
+	public VisualScenarioPage groupScenarioPageSelection(String graphName) {
+		VisualScenarioPage scenario = null;
+		 PageNode pageNode = new PageNode();
+		Collection<Node> nodes = SelectionHelper.getGroupableCurrentLevelSelection(this);
+		if (nodes.size() >= 1) {
+			scenario = new VisualScenarioPage(pageNode);
+			if (graphName != null) {
+				scenario.setLabel(graphName);
+			}
+			getCurrentLevel().add(scenario);
+			getCurrentLevel().reparent(nodes, scenario);
+			Point2D centre = TransformHelper.getSnappedCentre(nodes);
+			VisualModelTransformer.translateNodes(nodes, -centre.getX(), -centre.getY());
+			scenario.setPosition(centre);
+			select(scenario);
+		}
+		return scenario;
+		
+	}
 	
 }

=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/tools/CpogParsingTool.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/tools/CpogParsingTool.java	2015-11-09 11:00:13 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/tools/CpogParsingTool.java	2016-01-26 16:51:52 +0000
@@ -365,7 +365,8 @@
 			 }
 		 }
 		 
-		 
+		 if (total.endsWith("+")) total = total.substring(0, total.length() - 1);  
+		 total = total.trim();
 		 
 		 
          return total;

=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/tools/CpogSelectionTool.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/tools/CpogSelectionTool.java	2016-01-18 13:36:55 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/tools/CpogSelectionTool.java	2016-01-26 16:51:52 +0000
@@ -2,6 +2,7 @@
 
 import java.awt.BorderLayout;
 import java.awt.Checkbox;
+import java.awt.Component;
 import java.awt.Font;
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
@@ -78,6 +79,7 @@
 import org.workcraft.plugins.cpog.optimisation.BooleanFormula;
 import org.workcraft.plugins.cpog.optimisation.booleanvisitors.FormulaToString;
 import org.workcraft.plugins.stg.VisualNamedTransition;
+import org.workcraft.util.GUI;
 import org.workcraft.workspace.WorkspaceEntry;
 
 
@@ -106,14 +108,13 @@
 	
 	private GraphEditor editor;
 	protected boolean cancelInPlaceEdit;
+	
+	int scenarioNo = 0;
 
 	public CpogSelectionTool() {
-		super();
+		super(false);
 	}
 
-	public CpogSelectionTool(boolean enablePages) {
-		super(enablePages);
-	}
 
 	@Override
 	public void createInterfacePanel(final GraphEditor editor) {
@@ -270,8 +271,53 @@
 		interfacePanel.add(expressionScroll, BorderLayout.CENTER);
 		interfacePanel.add(buttonPanel, BorderLayout.SOUTH);
 		
+		scenarioPageGroupButton(getGroupPanel());
+		
+		
 		renderTypeChangeHandler();
 	}
+	
+	public void scenarioPageGroupButton(JPanel groupPanel) {
+		JButton groupPageButton = GUI.createIconButton(GUI.createIconFromSVG(
+				"images/icons/svg/selection-page.svg"), "Combine selection as a scenario (Alt+G)");
+		groupPageButton.addActionListener(new ActionListener(){
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				VisualCPOG visualCpog = (VisualCPOG)editor.getWorkspaceEntry().getModelEntry().getVisualModel();
+				visualCpog.groupScenarioPageSelection("scenario" + scenarioNo);
+				scenarioNo++;
+				editor.requestFocus();
+			}
+		});
+		groupPanel.add(groupPageButton, 1);
+	}
+	
+	public JPanel getGroupPanel() {
+		Component[] comps = interfacePanel.getComponents();
+		JPanel groupPanel = null;
+		for (int i = 0; i < comps.length; i++) {
+			if (comps[i] instanceof JPanel) {
+				JPanel panel = (JPanel) comps[i];
+				Component[] cmp = panel.getComponents();
+				for (int j = 0; j < cmp.length; j++) {
+					if (cmp[j] instanceof JPanel) {
+						JPanel pan = (JPanel) cmp[j];
+						Component[] c = pan.getComponents();
+						for (int k = 0; k < c.length; k++) {
+							if (c[k] instanceof JButton) {
+								JButton b = (JButton) c[k];
+								System.out.println(b.getText());
+								if (b.getToolTipText() != null && b.getToolTipText() == "Group selection (Ctrl+G)") {
+									groupPanel = pan;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		return groupPanel;
+	}
 
 	public HashMap<String, VisualVertex> insertExpression(String text, final VisualCPOG visualCpog,
 			final boolean createDuplicates, boolean getVertList, boolean zoomFit, boolean blockTransitiveRemoval) {
@@ -289,9 +335,9 @@
 
         if (text.contains("=")) {
         	name = text.substring(0, text.indexOf("="));
-        	while (name.endsWith(" ")) name = name.substring(0, name.length() - 1);
+        	name = name.trim();
         	text = text.substring(text.indexOf("=") + 1);
-        	while (text.startsWith(" ")) text = text.substring(1);
+        	text = text.trim();
         }
         
         CpogFormula f = null;
@@ -914,13 +960,7 @@
 
             String newExpression = parsingTool.getExpressionFromGraph(visualCpog);
             newExpression = newExpression.replace("\n", "");
-            while (newExpression.startsWith(" ")) {
-                newExpression = newExpression.substring(1);
-            }
-            while (newExpression.endsWith(" ")) {
-                newExpression = newExpression.substring(0, newExpression.length() - 1);
-            }
-
+            newExpression = newExpression.trim();
             GraphReference g = referenceMap.get(page.getLabel());
 
             int eqLocation;

=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/tools/PGMinerImportTool.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/tools/PGMinerImportTool.java	2015-11-01 11:50:12 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/tools/PGMinerImportTool.java	2016-01-26 16:51:52 +0000
@@ -53,7 +53,6 @@
 		}
 		
 		try {
-		
 			File inputFile = File.createTempFile("input", ".tr");
 			int c = 0;
 			File originalFile = new File(dialog.getFilePath());
@@ -73,6 +72,7 @@
 				c++;
 			}
 			k.close();
+			
 			HashSet<String> visitedEvents;
 			int i = 0;
 			String[] newLines = new String[lines.length];
@@ -116,45 +116,44 @@
 	@Override
 	public void run(WorkspaceEntry we) {
 		
-			
 			File inputFile;
 			inputFile = getInputFile(we);
+			
+			final Framework framework = Framework.getInstance();
+			final GraphEditorPanel editor = framework.getMainWindow().getCurrentEditor();
+			final ToolboxPanel toolbox = editor.getToolBox();
+			final CpogSelectionTool tool = toolbox.getToolInstance(CpogSelectionTool.class);
+			
+			
 			try {
 				if (inputFile != null) {
 					
 					if (dialog.getExtractConcurrency()) {
 					PGMinerTask task = new PGMinerTask(inputFile, dialog.getSplit());
 					
-					final Framework framework = Framework.getInstance();
+					
 					PGMinerResultHandler result = new PGMinerResultHandler((VisualCPOG) we.getModelEntry().getVisualModel(), we, false);
 					framework.getTaskManager().queue(task, "PGMiner", result);
 					} else {
-					
-					final Framework framework = Framework.getInstance();
-					final GraphEditorPanel editor = framework.getMainWindow().getCurrentEditor();
-					final ToolboxPanel toolbox = editor.getToolBox();
-					final CpogSelectionTool tool = toolbox.getToolInstance(CpogSelectionTool.class);
-					
-					Scanner k;
-					
-					k = new Scanner(inputFile);
-					int i = 0;
-					double yPos = tool.getLowestVertex((VisualCPOG) editor.getWorkspaceEntry().getModelEntry().getVisualModel()).getY() + 3;
-					editor.getWorkspaceEntry().captureMemento();
-					while (k.hasNext()) {
-						String line = k.nextLine();
-						
-						tool.insertEventLog((VisualCPOG) editor.getWorkspaceEntry().getModelEntry().getVisualModel(), i++, line.split(" "), yPos);
-						
-						yPos = yPos + 5;
-						
-					}
-					k.close();
-					editor.getWorkspaceEntry().saveMemento();
+						Scanner k;
+						
+						k = new Scanner(inputFile);
+						int i = 0;
+						double yPos = tool.getLowestVertex((VisualCPOG) editor.getWorkspaceEntry().getModelEntry().getVisualModel()).getY() + 3;
+						editor.getWorkspaceEntry().captureMemento();
+						while (k.hasNext()) {
+							String line = k.nextLine();
+							
+							tool.insertEventLog((VisualCPOG) editor.getWorkspaceEntry().getModelEntry().getVisualModel(), i++, line.split(" "), yPos);
+							
+							yPos = yPos + 5;
+						}
+						k.close();
+						editor.getWorkspaceEntry().saveMemento();
 					}
 				}
 			} catch (Exception e) {
-				
+				editor.getWorkspaceEntry().cancelMemento();
 			}
 		}	
 

=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/tools/PGMinerSelectedGraphsExtractionTool.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/tools/PGMinerSelectedGraphsExtractionTool.java	2015-11-01 11:50:12 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/tools/PGMinerSelectedGraphsExtractionTool.java	2016-01-26 16:51:52 +0000
@@ -41,53 +41,51 @@
 			String allGraphs = CpogParsingTool.getExpressionFromGraph(visualCpog);
 			ArrayList<String> tempGraphs = new ArrayList<>();
 			ArrayList<String> graphs = new ArrayList<>();
-			String prefix = "input", suffix = ".tr";
 			inputFile = File.createTempFile("input", ".tr");
 			
-			PrintStream expressions = new PrintStream(inputFile);
+			
 			
 			int i = allGraphs.indexOf(" + ");
 			while (i > -1) {
 				allGraphs = allGraphs.substring(0, i) + "\n" + allGraphs.substring(i + 2);
 				i = allGraphs.indexOf(" + ");
 			}
+			allGraphs = allGraphs + "\n";
 			allGraphs = allGraphs.replaceAll(" -> ", " ");
 			
-			while (allGraphs.contains("\n")) {
-				int index = allGraphs.indexOf("\n");
-				String graph = (allGraphs.substring(0, index));
-				allGraphs = allGraphs.substring(index + 1);
-				tempGraphs.add(graph);
-			}
+			String[] graphList = allGraphs.split("\n");
 			
-			//tempGraphs.add(allGraphs);
+			for (String g : graphList) tempGraphs.add(g);
 			
 			for (String graph : tempGraphs) {
 				int index = graph.indexOf("= ");
 				if (index >= 0) {
 					graph = graph.substring(index + 2);
-				}
-				while (graph.startsWith(" ")) {
-					graph = graph.substring(1);
-				}
-				while (graph.endsWith(" ")) {
-					graph = graph.substring(0, graph.length() - 1);
-				}
+				} else {
+					JOptionPane.showMessageDialog(null,
+							"Error: A graph which is not a scenario has been selected.\n"
+							+ "Please remove this from the selection, or group this as a page to continue",
+							"Error",
+							JOptionPane.ERROR_MESSAGE);
+							return null;
+				}
+				graph = graph.trim();
 				graphs.add(graph);
 			}
 			
+			PrintStream expressions = new PrintStream(inputFile);
+			
 			for (String graph : graphs) {
 				expressions.println(graph);
 			}
 			
 			expressions.close();
 			
-			
 			} catch (IOException exception) {
 				exception.printStackTrace();
 			} catch (ArrayIndexOutOfBoundsException e2) {
 				JOptionPane.showMessageDialog(null,
-						"Error: No graphs have been selected",
+						"Error: No scenarios have been selected",
 						"Error",
 						JOptionPane.ERROR_MESSAGE);
 						throw e2;
@@ -102,6 +100,7 @@
 		try {
 		
 			File inputFile = getInputFile(we);
+			if (inputFile == null) return;
 			PGMinerTask task = new PGMinerTask(inputFile, false);
 	
 			final Framework framework = Framework.getInstance();