Merge pull request TeachingTechnologistBeth#27 from EdNutting/master

Bug fixes and consistent support for deletion keys

Author: samtherussell

src/com/modsim/gui/view/ViewUtil.java

@@ -277,6 +277,8 @@ public void mousePressed(MouseEvent e) {
                 else {
                     Port p = screenSpace_portAt(e.getX(), e.getY());
 
+                    Main.selection.clear();
+
                     //Link behaviour
                     if (p != null) {
                         tool = new MakeLinkTool();
@@ -401,14 +403,17 @@ public void keyPressed(KeyEvent e) {
         View v = Main.ui.view;
 
         // Cancel tool usage on escape press
-        if (e.getKeyChar() == KeyEvent.VK_ESCAPE) {
+        if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
             if (v.curTool != null) {
                 v.curTool.cancel();
                 v.curTool = null;
             }
         }
         // Delete selection
-        else if (e.getKeyChar() == KeyEvent.VK_DELETE) {
+        else if ((   e.getKeyCode() == KeyEvent.VK_DELETE
+                  || e.getKeyCode() == KeyEvent.VK_BACK_SPACE
+                  || e.getKeyCode() == KeyEvent.VK_X)
+                 && !Main.selection.isEmpty()) {
             Main.selection.deleteAll();
         }
         // Pass to tool

src/com/modsim/tools/EditLinkTool.java

@@ -136,6 +136,8 @@ public BaseTool lbUp(int x, int y) {
     public BaseTool keyDown(int key) {
         switch (key) {
             case KeyEvent.VK_X:
+            case KeyEvent.VK_DELETE:
+            case KeyEvent.VK_BACK_SPACE:
                 Main.opStack.cancelCompoundOp();
                 link.highlight = false;
                 link.delete();

src/com/modsim/tools/MakeLinkTool.java

@@ -68,7 +68,9 @@ public BaseTool mouseDrag(int x, int y) {
 
 	@Override
 	public BaseTool keyDown(int key) {
-		if (key == KeyEvent.VK_BACK_SPACE) {
+		if (   key == KeyEvent.VK_BACK_SPACE
+            || key == KeyEvent.VK_DELETE
+            || key == KeyEvent.VK_X) {
 			if (curve.removePt()) 	return this;
 			else 					return null;
 		}
@@ -94,7 +96,9 @@ public void paintWorld(Graphics2D g) {
 	public boolean startLink(int x, int y) {
 		source = ViewUtil.screenSpace_portAt(x, y);
 		if (source != null) {
-			working = true;
+            Main.selection.clear();
+
+            working = true;
 			start = new Vec2(x, y);
 			curve = new BezierPath();