Merge lp:~tapaal-contributor/tapaal/select-all-1763193 into lp:tapaal

[Jacob Hjort Bundgaard]

Add menu action for selecting all components.

[lp:~tapaal-contributor/tapaal/select-all-1763193]

954. By Jiri Srba <email address hidden> on 2018-04-16

merged in trunk

[Jiri Srba (srba)]

Really great that ctrl-A works now. Thanks for the fix.

review: Approve

=== modified file 'src/pipe/gui/GuiFrame.java'
--- src/pipe/gui/GuiFrame.java	2018-04-16 11:54:09 +0000
+++ src/pipe/gui/GuiFrame.java	2018-04-16 12:16:41 +0000
@@ -132,6 +132,7 @@
 	private ZoomAction zoomOutAction, zoomInAction;
 	private SpacingAction incSpacingAction, decSpacingAction;
 	private DeleteAction deleteAction;
+	private SelectAllAction selectAllAction;
 	private TypeAction annotationAction, arcAction, inhibarcAction,
 	placeAction, transAction, timedtransAction, tokenAction,
 	selectAction, deleteTokenAction, timedPlaceAction;
@@ -521,6 +522,15 @@
 		editMenu.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
 				KeyStroke.getKeyStroke("BACK_SPACE"), "Delete");
 		editMenu.getActionMap().put("Delete", deleteAction);
+		
+		editMenu.addSeparator();
+
+		addMenuItem(editMenu, selectAllAction = new SelectAllAction("Select all",
+			"Select all components", "ctrl A"));
+
+		editMenu.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
+				KeyStroke.getKeyStroke('A', shortcutkey), "SelectAll");
+		editMenu.getActionMap().put("SelectAll", selectAllAction);
 
 		/* Draw menu */
 		JMenu drawMenu = new JMenu("Draw");
@@ -1032,6 +1042,7 @@
 			transAction.setEnabled(true);
 			tokenAction.setEnabled(true);
 			deleteAction.setEnabled(true);
+			selectAllAction.setEnabled(true);
 			selectAction.setEnabled(true);
 			deleteTokenAction.setEnabled(true);
 
@@ -1074,6 +1085,7 @@
 			transAction.setEnabled(false);
 			tokenAction.setEnabled(false);
 			deleteAction.setEnabled(false);
+			selectAllAction.setEnabled(false);
 			selectAction.setEnabled(false);
 			deleteTokenAction.setEnabled(false);
 
@@ -1127,6 +1139,7 @@
 			transAction.setEnabled(false);
 			tokenAction.setEnabled(false);
 			deleteAction.setEnabled(false);
+			selectAllAction.setEnabled(false);
 			selectAction.setEnabled(false);
 			deleteTokenAction.setEnabled(false);
 
@@ -2197,6 +2210,19 @@
 
 	}
 
+	class SelectAllAction extends GuiAction {
+
+		private static final long serialVersionUID = -9223372036854775808L;
+
+		SelectAllAction(String name, String tooltip, String keystroke) {
+			super(name, tooltip, keystroke);
+		}
+
+		public void actionPerformed(ActionEvent e) {
+			CreateGui.getView().getSelectionObject().selectAll();
+		}
+	}
+
 	class TypeAction extends GuiAction {
 
 		/**

=== modified file 'src/pipe/gui/SelectionManager.java'
--- src/pipe/gui/SelectionManager.java	2016-02-05 09:19:04 +0000
+++ src/pipe/gui/SelectionManager.java	2018-04-16 12:16:41 +0000
@@ -179,7 +179,7 @@
 	 * 
 	 * @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent)
 	 */
-	public void mousePressed(MouseEvent e) {	
+	public void mousePressed(MouseEvent e) {
 		CreateGui.getCurrentTab().removeConstantHighlights();
 		if (e.getButton() == MouseEvent.BUTTON1 && !(e.isControlDown())) {
 			isSelecting = true;
@@ -264,6 +264,14 @@
 	public void mouseMoved(MouseEvent e) {
 	}
 
+	public void selectAll() {
+		ArrayList<PetriNetObject> pnObjects = drawingSurface.getPNObjects();
+		for (PetriNetObject pnObject : pnObjects) {
+			pnObject.select(false);
+		}
+		drawingSurface.repaint();
+	}
+
 	public int getSelectionCount() {
 		Component[] netObj = drawingSurface.getComponents();
 		int selectionCount = 0;

=== modified file 'src/pipe/gui/graphicElements/PetriNetObject.java'
--- src/pipe/gui/graphicElements/PetriNetObject.java	2012-03-02 13:39:05 +0000
+++ src/pipe/gui/graphicElements/PetriNetObject.java	2018-04-16 12:16:41 +0000
@@ -100,6 +100,15 @@
 		}
 	}
 
+	public void select(boolean shouldRepaint) {
+	if (selectable && !selected) {
+			selected = true;
+			if (shouldRepaint) {
+				repaint();
+			}
+		}
+	}
+
 	public void deselect() {
 		if (selected) {
 			selected = false;