Merge lp:~tapaal-contributor/tapaal/undo-redo-not-available-when-drawing-arc-1848949 into lp:tapaal

[Peter Haahr Taankvist]

Pressing undo/redo when drawing an arc now removes the arc being drawn

[Jiri Srba (srba)]

Does not seem to fix the problem, I just draw place an started to draw an arc and pressed ctrl-Z and the place disappeared as well.

review: Needs Fixing

[lp:~tapaal-contributor/tapaal/undo-redo-not-available-when-drawing-arc-1848949]

1023. By Peter Taankvist <email address hidden> on 2019-10-31

change ctrlmask to shortcutkeymask so it works on mac too

[Peter Haahr Taankvist (ptaank)]

It should work for mac too now. Used shortcutkeymask instead of ctrlmask in the action map so it should work with macs cmd button too

review: Needs Resubmitting

[Jiri Srba (srba)]

Now it does not compile anymore on mac:

src/pipe/gui/graphicElements/Arc.java:473: error: cannot find symbol
  iMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_Z, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()), "deleteArc");
                                                                            ^
  symbol: method getMenuShortcutKeyMaskEx()
  location: class Toolkit
src/pipe/gui/graphicElements/Arc.java:474: error: cannot find symbol
  iMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_Y, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()), "deleteArc");
                                                                            ^
  symbol: method getMenuShortcutKeyMaskEx()
  location: class Toolkit

review: Needs Fixing

[lp:~tapaal-contributor/tapaal/undo-redo-not-available-when-drawing-arc-1848949]

1024. By Peter Taankvist <email address hidden> on 2019-11-01

Changed shortcutkeymaskex to shortcutkeymask as we use everywhere else

[Peter Haahr Taankvist (ptaank)]

changed .getMenuShortcutKeyMaskEx() to .getMenuShortcutKeyMask(). This is the function we use everywhere else as far as i can tell so hopefully this works on mac too.

review: Needs Resubmitting

[Jiri Srba (srba)]

Yes, it compiles and works nicely on mac as well, when I press ctrl-z then only the arc disappears.
However, if I press in the GUI on the back-arrow in the tool line (instead of ctrl-z), then also the place disappears, which is not the same behaviour as intended.

review: Needs Fixing

[lp:~tapaal-contributor/tapaal/undo-redo-not-available-when-drawing-arc-1848949]

1025. By Peter Taankvist <email address hidden> on 2019-11-01

arc being drawn is deleted on undo/redo button press

[Peter Haahr Taankvist (ptaank)]

Arc being drawn is deleted on undo/redo button press.

review: Needs Resubmitting

[Jiri Srba (srba)]

review: Approve

=== modified file 'src/pipe/gui/GuiFrame.java'
--- src/pipe/gui/GuiFrame.java	2019-10-31 12:23:10 +0000
+++ src/pipe/gui/GuiFrame.java	2019-11-01 10:31:26 +0000
@@ -466,8 +466,15 @@
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				if (CreateGui.getApp().isEditionAllowed()) {
-					appView.getUndoManager().undo();
-					CreateGui.getCurrentTab().network().buildConstraints();
+					//If arc is being drawn delete it
+					if(appView.createArc == null) {
+						appView.getUndoManager().undo();
+						CreateGui.getCurrentTab().network().buildConstraints();
+					} else {
+						appView.createArc.delete();
+						appView.createArc = null;
+						appView.repaint();
+					}
 				}
 			}
 		});
@@ -478,8 +485,15 @@
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				if (CreateGui.getApp().isEditionAllowed()) {
-					appView.getUndoManager().redo();
-					CreateGui.getCurrentTab().network().buildConstraints();
+					//If arc is being drawn delete it
+					if(appView.createArc == null) {
+						appView.getUndoManager().redo();
+						CreateGui.getCurrentTab().network().buildConstraints();
+					} else {
+						appView.createArc.delete();
+						appView.createArc = null;
+						appView.repaint();
+					}
 				}
 			}
 		});

=== modified file 'src/pipe/gui/graphicElements/Arc.java'
--- src/pipe/gui/graphicElements/Arc.java	2019-10-31 16:29:03 +0000
+++ src/pipe/gui/graphicElements/Arc.java	2019-11-01 10:31:26 +0000
@@ -2,6 +2,8 @@
 
 import java.awt.*;
 import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
 
@@ -469,8 +471,8 @@
 		// Bind keyboard keys to action names.
 		iMap.put(KeyStroke.getKeyStroke("ESCAPE"), "deleteArc");
 		iMap.put(KeyStroke.getKeyStroke("DELETE"), "deleteArc");
-
-		// Associate action names with actions.
+		iMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_Z, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "deleteArc");
+		iMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_Y, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "deleteArc");
 		aMap.put("deleteArc", new DeleteAction(this));
 	}