REPORT-2773 mac中复制快捷键的修复

designer_base/src/com/fr/design/gui/ilist/UIList.java

@@ -6,14 +6,10 @@ import com.fr.design.mainframe.JTemplate;
 import com.fr.stable.StringUtils;
 
 import javax.swing.*;
-import javax.swing.text.DefaultEditorKit;
 import java.awt.*;
-import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.util.Vector;
 
-import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
-
 /**
  * Created with IntelliJ IDEA.
  * User: pony
@@ -21,20 +17,11 @@ import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_M
  * Time: 上午11:07
  * To change this template use File | Settings | File Templates.
  */
-public class UIList extends JList{
+public class UIList extends JList {
     private Icon icon;
 
     public UIList() {
         super();
-        InputMap inputMap = this.getInputMap();
-        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_A, DEFAULT_MODIFIER),
-                DefaultEditorKit.selectAllAction);
-        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER),
-                DefaultEditorKit.copyAction);
-        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER),
-                DefaultEditorKit.pasteAction);
-        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER),
-                DefaultEditorKit.cutAction);
     }
 
     public UIList(ListModel dataModel) {
@@ -59,12 +46,12 @@ public class UIList extends JList{
             if (rendererComp.getPreferredSize().width > getVisibleRect().width) {
                 String tips = (rendererComp instanceof JComponent) ? ((JComponent) rendererComp).getToolTipText() : null;
                 if (tips == null) {
-                    if(value instanceof JTemplate){
+                    if (value instanceof JTemplate) {
                         tips = ((JTemplate) value).getEditingFILE().getName();
                         icon = ((JTemplate) value).getEditingFILE().getIcon();
-                    } else if (value instanceof ListModelElement || value instanceof TableProcedure){
+                    } else if (value instanceof ListModelElement || value instanceof TableProcedure) {
-                        tips = ((JLabel)rendererComp).getText();
+                        tips = ((JLabel) rendererComp).getText();
-                        icon = ((JLabel)rendererComp).getIcon();
+                        icon = ((JLabel) rendererComp).getIcon();
                     }
                 }
                 return tips;
@@ -84,6 +71,7 @@ public class UIList extends JList{
         }
         return null;
     }
+
     public JToolTip createToolTip() {
         UIToolTip tip = new UIToolTip(icon);
         tip.setComponent(this);

designer_base/src/com/fr/design/gui/itextarea/UITextArea.java

@@ -19,13 +19,13 @@ public class UITextArea extends JTextArea implements UIObserver {
     public UITextArea(int i, int j) {
         super(i, j);
         InputMap inputMap = this.getInputMap();
-        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_A, DEFAULT_MODIFIER),
+        inputMap.getParent().put(KeyStroke.getKeyStroke(KeyEvent.VK_A, DEFAULT_MODIFIER),
                 DefaultEditorKit.selectAllAction);
-        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER),
+        inputMap.getParent().put(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER),
                 DefaultEditorKit.copyAction);
-        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER),
+        inputMap.getParent().put(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER),
                 DefaultEditorKit.pasteAction);
-        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER),
+        inputMap.getParent().put(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER),
                 DefaultEditorKit.cutAction);
         initComponents();
     }

designer_base/src/com/fr/design/gui/itextfield/UITextField.java

@@ -33,13 +33,13 @@ public class UITextField extends JTextField implements UIObserver, GlobalNameObs
     public UITextField() {
         super();
         InputMap inputMap = this.getInputMap();
-        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_A, DEFAULT_MODIFIER),
+        inputMap.getParent().put(KeyStroke.getKeyStroke(KeyEvent.VK_A, DEFAULT_MODIFIER),
                 DefaultEditorKit.selectAllAction);
-        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER),
+        inputMap.getParent().put(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER),
                 DefaultEditorKit.copyAction);
-        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER),
+        inputMap.getParent().put(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER),
                 DefaultEditorKit.pasteAction);
-        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER),
+        inputMap.getParent().put(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER),
                 DefaultEditorKit.cutAction);
         initListener();
     }

designer_base/src/com/fr/design/gui/itree/checkboxtree/CheckBoxTree.java

@@ -5,8 +5,14 @@
  */
 package com.fr.design.gui.itree.checkboxtree;
 
-import java.awt.Component;
+import com.fr.design.gui.icheckbox.UICheckBox;
-import java.awt.Rectangle;
+
+import javax.swing.*;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.text.Position;
+import javax.swing.tree.*;
+import java.awt.*;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.awt.event.MouseEvent;
@@ -16,19 +22,6 @@ import java.beans.PropertyChangeListener;
 import java.util.Hashtable;
 import java.util.Vector;
 
-import javax.swing.*;
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
-import javax.swing.text.DefaultEditorKit;
-import javax.swing.text.Position;
-import javax.swing.tree.DefaultTreeCellRenderer;
-import javax.swing.tree.TreeCellRenderer;
-import javax.swing.tree.TreeModel;
-import javax.swing.tree.TreeNode;
-import javax.swing.tree.TreePath;
-
-import com.fr.design.gui.icheckbox.UICheckBox;
-
 import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
 
 /**
@@ -90,8 +83,7 @@ public class CheckBoxTree extends JTree {
     public CheckBoxTree(TreeModel newModel) {
         super(newModel);
         InputMap inputMap = this.getInputMap();
-        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_A, DEFAULT_MODIFIER),
+        inputMap.getParent().put(KeyStroke.getKeyStroke(KeyEvent.VK_A, DEFAULT_MODIFIER), "selectAll");
-                "selectAll");
         init();
     }
 
@@ -182,8 +174,7 @@ public class CheckBoxTree extends JTree {
         }
         if (_treeCellRenderer == null) {
             _treeCellRenderer = createCellRenderer(cellRenderer);
-        }
+        } else {
-        else {
             _treeCellRenderer.setActualTreeRenderer(cellRenderer);
         }
         return _treeCellRenderer;
@@ -199,8 +190,7 @@ public class CheckBoxTree extends JTree {
     public TreeCellRenderer getActualCellRenderer() {
         if (_treeCellRenderer != null) {
             return _treeCellRenderer.getActualTreeRenderer();
-        }
+        } else {
-        else {
             return super.getCellRenderer();
         }
     }
@@ -255,8 +245,7 @@ public class CheckBoxTree extends JTree {
 
             if (clicksInCheckBox(e, path)) {
                 return path;
-            }
+            } else {
-            else {
                 return null;
             }
         }
@@ -264,13 +253,11 @@ public class CheckBoxTree extends JTree {
         protected boolean clicksInCheckBox(MouseEvent e, TreePath path) {
             if (!_tree.isCheckBoxVisible(path)) {
                 return false;
-            }
+            } else {
-            else {
                 Rectangle bounds = _tree.getPathBounds(path);
                 if (_tree.getComponentOrientation().isLeftToRight()) {
                     return e.getX() < bounds.x + _hotspot;
-                }
+                } else {
-                else {
                     return e.getX() > bounds.x + bounds.width - _hotspot;
                 }
             }
@@ -354,8 +341,7 @@ public class CheckBoxTree extends JTree {
                     selectionModel.removeSelectionPath(path);
                 else
                     selectionModel.addSelectionPath(path);
-            }
+            } finally {
-            finally {
                 if (!selectionModel.isSingleEventMode()) {
                     selectionModel.setBatchMode(false);
                 }