Browse Source

#59 finally fixed

Kevin Trometer 7 years ago
parent
commit
2ca311407c
1 changed files with 24 additions and 10 deletions
  1. 24 10
      src/ui/view/GUI.java

+ 24 - 10
src/ui/view/GUI.java

@@ -17,6 +17,7 @@ import java.awt.event.ComponentEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionAdapter;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
@@ -383,7 +384,7 @@ public class GUI<E> implements CategoryListener {
 
 		String cntrlADown = "controlA";
 		inputMap.put(KeyStroke.getKeyStroke("control A"), cntrlADown);
-		actionMap.put(cntrlADown, new AbstractAction() {
+		AbstractAction controlA = new AbstractAction() {
 
 			private static final long serialVersionUID = 1L;
 
@@ -415,7 +416,8 @@ public class GUI<E> implements CategoryListener {
 				}
 
 			}
-		});
+		};
+		actionMap.put(cntrlADown, controlA);
 
 		String delDown = "delete";
 		inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0, false), delDown);
@@ -522,7 +524,7 @@ public class GUI<E> implements CategoryListener {
 
 		String cntrlCDown = "controlC";
 		inputMap.put(KeyStroke.getKeyStroke("control C"), cntrlCDown);
-		actionMap.put(cntrlCDown, new AbstractAction() {
+		AbstractAction controlC = new AbstractAction() {
 
 			private static final long serialVersionUID = 1L;
 
@@ -545,11 +547,12 @@ public class GUI<E> implements CategoryListener {
 					}
 				}
 			}
-		});
+		};
+		actionMap.put(cntrlCDown, controlC);
 
 		String cntrlVDown = "controlV";
 		inputMap.put(KeyStroke.getKeyStroke("control V"), cntrlVDown);
-		actionMap.put(cntrlVDown, new AbstractAction() {
+		AbstractAction controlV = new AbstractAction() {
 
 			private static final long serialVersionUID = 1L;
 
@@ -583,12 +586,12 @@ public class GUI<E> implements CategoryListener {
 				}
 				canvas.repaint();
 			}
-		});
+		};
+		actionMap.put(cntrlVDown, controlV);
 
 		String cntrlXDown = "controlX";
 		inputMap.put(KeyStroke.getKeyStroke("control X"), cntrlXDown);
-		actionMap.put(cntrlXDown, new AbstractAction() {
-
+		AbstractAction controlX = new AbstractAction() {
 			private static final long serialVersionUID = 1L;
 
 			@Override
@@ -611,7 +614,8 @@ public class GUI<E> implements CategoryListener {
 					canvas.repaint();
 				}
 			}
-		});
+		};
+		actionMap.put(cntrlXDown, controlX);
 
 		frmCyberPhysical.setJMenuBar(menuBar);
 
@@ -1312,7 +1316,17 @@ public class GUI<E> implements CategoryListener {
 		 *****************************/
 
 		frmCyberPhysical.getContentPane().setLayout(new BorderLayout(0, 0));
-
+		/****************
+		 * Tree Stuff
+		 ****************/
+		
+		//Override Key Actions
+		inputMap = tree.getInputMap();
+		inputMap.put(KeyStroke.getKeyStroke("control C"), cntrlCDown);
+		inputMap.put(KeyStroke.getKeyStroke("control V"), cntrlVDown);
+		inputMap.put(KeyStroke.getKeyStroke("control X"), cntrlXDown);
+		inputMap.put(KeyStroke.getKeyStroke("control A"), cntrlADown);
+		
 		TreeCellRenderer customRenderer = new TreeCellRenderer() {
 			@Override
 			public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded,