Merge branch '9.0' of http://www.finedevelop.com:2015/scm/~kerry/design-pf into 9.0

designer/src/com/fr/aspectj/designer/TemplateProcessTracker.aj

@@ -35,19 +35,19 @@ public aspect TemplateProcessTracker {
 
 //        String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
     }
     //同上
     before(ActionEvent e) : onActionPerformed(e) {
         SourceLocation sl = thisJoinPoint.getSourceLocation();
         // !within(LogHandlerBar) 没用, 手动过滤
-        if (e.getSource().toString().contains("javax.swing.Timer")) {
+        if (e != null && e.getSource().toString().contains("javax.swing.Timer")) {
             return;
         }
 
         //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
 
     }
     //同上
@@ -56,7 +56,7 @@ public aspect TemplateProcessTracker {
 
         //String log = String.format("%s:\n%s\nset value: %s at (%d, %d)\n\n", new Date(), sl, v, r, c);
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
 
     }
     //同上
@@ -66,7 +66,7 @@ public aspect TemplateProcessTracker {
 //        String v = "test";
         //String log = String.format("%s:\n%s\nset value: %s at %s\n\n", new Date(), sl, v, g.getEditingCellElement());
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
     }
 
 

designer/src/com/fr/design/actions/file/newReport/NewPolyReportAction.java

@@ -11,13 +11,15 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JPolyWorkBook;
 import com.fr.general.Inter;
 
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
+
 public class NewPolyReportAction extends UpdateAction {
 
     public NewPolyReportAction() {
         this.setName(Inter.getLocText("M-New_Multi_Report"));
         this.setMnemonic('F');
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/formExport.png"));
-        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_M, KeyEvent.CTRL_MASK));
+        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_M, DEFAULT_MODIFIER));
     }
 
     /**

designer/src/com/fr/design/actions/file/newReport/NewWorkBookAction.java

@@ -12,6 +12,8 @@ import java.awt.event.ActionEvent;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
+
 public class NewWorkBookAction extends UpdateAction {
 
     public NewWorkBookAction() {
@@ -47,7 +49,7 @@ public class NewWorkBookAction extends UpdateAction {
 
         @Override
         public KeyStroke getKeyStroke() {
-            return KeyStroke.getKeyStroke(KeyEvent.VK_N, InputEvent.CTRL_MASK);
+            return KeyStroke.getKeyStroke(KeyEvent.VK_N, DEFAULT_MODIFIER);
         }
     };
 

designer/src/com/fr/design/mainframe/ElementCasePane.java

@@ -127,6 +127,8 @@ import com.fr.stable.ColumnRow;
 import com.fr.stable.Constants;
 import com.fr.stable.unit.FU;
 
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
+
 /**
  * This class used to edit Report.
  */
@@ -280,7 +282,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
                 }
             }
         });
-        formatBrush.registerKeyboardAction(keyListener, KeyStroke.getKeyStroke(KeyEvent.VK_B, InputEvent.CTRL_MASK), JComponent.WHEN_IN_FOCUSED_WINDOW);
+        formatBrush.registerKeyboardAction(keyListener, KeyStroke.getKeyStroke(KeyEvent.VK_B, DEFAULT_MODIFIER), JComponent.WHEN_IN_FOCUSED_WINDOW);
         formatBrush.registerKeyboardAction(escKey, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_IN_FOCUSED_WINDOW);
     }
 
@@ -855,7 +857,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
         // clearReportPage old values.
         inputMapAncestor.clear();
         actionMap.clear();
-        inputMapAncestor.put(KeyStroke.getKeyStroke(KeyEvent.VK_X, InputEvent.CTRL_MASK), "cut");
+        inputMapAncestor.put(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER), "cut");
         actionMap.put("cut", new AbstractAction() {
             public void actionPerformed(ActionEvent evt) {
                 if (cut()) {
@@ -863,13 +865,13 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
                 }
             }
         });
-        inputMapAncestor.put(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK), "copy");
+        inputMapAncestor.put(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER), "copy");
         actionMap.put("copy", new AbstractAction() {
             public void actionPerformed(ActionEvent evt) {
                 copy();
             }
         });
-        inputMapAncestor.put(KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_MASK), "paste");
+        inputMapAncestor.put(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER), "paste");
         actionMap.put("paste", new AbstractAction() {
             public void actionPerformed(ActionEvent evt) {
                 if (paste()) {
@@ -887,7 +889,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
                 }
             }
         });
-        inputMapAncestor.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, InputEvent.CTRL_MASK), "delete_all");
+        inputMapAncestor.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, DEFAULT_MODIFIER), "delete_all");
         actionMap.put("delete_all", new AbstractAction() {
             public void actionPerformed(ActionEvent evt) {
                 if (clearAll()) {

designer/src/com/fr/design/mainframe/alphafine/AlphaFineHelper.java

@@ -8,12 +8,15 @@ import com.fr.stable.StringUtils;
  * Created by XiaXiang on 2017/5/8.
  */
 public class AlphaFineHelper {
+    private static AlphaFineDialog dialog;
 
     /**
      * 弹出alphafine搜索面板
      */
-    public static void showAlphaFineDialog() {
+    public static void showAlphaFineDialog(boolean forceOpen) {
-        AlphaFineDialog dialog = new AlphaFineDialog(DesignerContext.getDesignerFrame());
+        if (dialog == null) {
+            dialog = new AlphaFineDialog(DesignerContext.getDesignerFrame(), forceOpen);
+        }
         dialog.setVisible(true);
     }
 

designer/src/com/fr/design/mainframe/alphafine/cell/model/ActionModel.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
 /**
  * Created by XiaXiang on 2017/4/20.
  */
-public class ActionModel extends AlphaCellModel implements Serializable {
+public class ActionModel extends AlphaCellModel {
     private Action action;
 
     private String actionName;
@@ -38,6 +38,12 @@ public class ActionModel extends AlphaCellModel implements Serializable {
         return action != null ? action.hashCode() : 0;
     }
 
+    public ActionModel(String name, String description, Action action) {
+        super(name, null, CellType.ACTION);
+        this.action = action;
+        this.setDescription(description);
+    }
+
     public ActionModel(String name, Action action) {
         super(name, null, CellType.ACTION);
         this.action = action;

designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java

@@ -68,8 +68,10 @@ public class AlphaFineDialog extends UIDialog {
     private JList searchResultList;
     private SearchListModel searchListModel;
     private SwingWorker searchWorker;
+    //是否强制打开，因为面板是否关闭绑定了全局鼠标事件，这里需要处理一下
+    private boolean foreOpen;
 
-    public AlphaFineDialog(Frame parent) {
+    public AlphaFineDialog(Frame parent, boolean foreOpen) {
         super(parent);
         initProperties();
         initListener();
@@ -249,11 +251,9 @@ public class AlphaFineDialog extends UIDialog {
                 int selectedIndex = searchResultList.getSelectedIndex();
                 Object selectedValue = searchResultList.getSelectedValue();
                 if (e.getClickCount() == 2) {
-                    final int i = searchResultList.locationToIndex(e.getPoint());
-                    searchResultList.setSelectedIndex(i);
                     doNavigate(selectedIndex);
                     if (selectedValue instanceof AlphaCellModel) {
-                        saveHistory(searchText, (AlphaCellModel) selectedValue);
+                        saveHistory((AlphaCellModel) selectedValue);
                     }
                 } else if (e.getClickCount() == 1) {
                     if (selectedValue instanceof MoreModel && ((MoreModel) selectedValue).isNeedMore()) {
@@ -278,7 +278,11 @@ public class AlphaFineDialog extends UIDialog {
             @Override
             public void keyPressed(KeyEvent e) {
                 if (e.getKeyCode() == KeyEvent.VK_ENTER) {
+                    Object selectedValue = searchResultList.getSelectedValue();
                     doNavigate(searchResultList.getSelectedIndex());
+                    if (searchResultList.getSelectedValue() instanceof AlphaCellModel) {
+                        saveHistory((AlphaCellModel) selectedValue);
+                    }
                 }
             }
         });
@@ -480,8 +484,9 @@ public class AlphaFineDialog extends UIDialog {
                         Point p = k.getLocationOnScreen();
                         Rectangle dialogRectangle = AlphaFineDialog.this.getBounds();
                         Rectangle paneRectangle = new Rectangle(AlphaFinePane.createAlphaFinePane().getLocationOnScreen(), AlphaFinePane.createAlphaFinePane().getSize());
-                        if (!dialogRectangle.contains(p) && !paneRectangle.contains(p)) {
+                        if (!dialogRectangle.contains(p) && !paneRectangle.contains(p) && !foreOpen) {
                             AlphaFineDialog.this.dispose();
+                            foreOpen = false;
                         }
                     }
                 }
@@ -512,7 +517,7 @@ public class AlphaFineDialog extends UIDialog {
     }
 
     private static void doClickAction() {
-        AlphaFineHelper.showAlphaFineDialog();
+        AlphaFineHelper.showAlphaFineDialog(false);
     }
 
 
@@ -553,10 +558,10 @@ public class AlphaFineDialog extends UIDialog {
 
     /**
      * 保存本地（本地常用）
-     * @param searchText
      * @param cellModel
      */
-    private void saveHistory(String searchText, AlphaCellModel cellModel) {
+    private void saveHistory(AlphaCellModel cellModel) {
+        String searchText = searchTextField.getText();
         RecentSearchManager recentSearchManager = RecentSearchManager.getRecentSearchManger();
         recentSearchManager.addRecentModel(searchText, cellModel);
         recentSearchManager.saveXMLFile();
@@ -661,4 +666,11 @@ public class AlphaFineDialog extends UIDialog {
     }
 
 
+    public boolean isForeOpen() {
+        return foreOpen;
+    }
+
+    public void setForeOpen(boolean foreOpen) {
+        this.foreOpen = foreOpen;
+    }
 }

designer/src/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java

@@ -2,6 +2,8 @@ package com.fr.design.mainframe.alphafine.component;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.actions.help.alphafine.AlphafineContext;
+import com.fr.design.actions.help.alphafine.AlphafineListener;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.mainframe.alphafine.AlphaFineHelper;
@@ -37,7 +39,13 @@ public class AlphaFinePane extends BasicPane {
         refreshButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                AlphaFineHelper.showAlphaFineDialog();
+                AlphaFineHelper.showAlphaFineDialog(false);
+            }
+        });
+        AlphafineContext.addAlphafineContextListener(new AlphafineListener() {
+            @Override
+            public void showDialog() {
+                AlphaFineHelper.showAlphaFineDialog(true);
             }
         });
     }

designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java

@@ -8,6 +8,7 @@ import com.fr.design.mainframe.alphafine.cell.model.MoreModel;
 import com.fr.design.mainframe.alphafine.cell.model.ActionModel;
 import com.fr.design.mainframe.alphafine.model.SearchResult;
 import com.fr.design.mainframe.toolbar.UpdateActionManager;
+import com.fr.design.mainframe.toolbar.UpdateActionModel;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
 
@@ -35,13 +36,15 @@ public class ActionSearchManager implements AlphaFineSearchProcessor {
         lessModelList = new SearchResult();
         moreModelList = new SearchResult();
         if (DesignerEnvManager.getEnvManager().getAlphafineConfigManager().isContainAction()) {
-            List<UpdateAction> updateActions = UpdateActionManager.getUpdateActionManager().getUpdateActions();
+            List<UpdateActionModel> updateActions = UpdateActionManager.getUpdateActionManager().getUpdateActions();
-            for (UpdateAction updateAction : updateActions) {
+            for (UpdateActionModel updateActionModel : updateActions) {
-                if (updateAction.getName() != null && updateAction.getName().toLowerCase().contains(searchText.toLowerCase())) {
+                if (updateActionModel.getActionName() != null) {
-                    filterModelList.add(new ActionModel(updateAction.getName() ,updateAction));
+                    if (updateActionModel.getActionName().toLowerCase().contains(searchText.toLowerCase()) || updateActionModel.getParentName().toLowerCase().contains(searchText.toLowerCase())) {
+                        filterModelList.add(new ActionModel(updateActionModel.getActionName(), updateActionModel.getParentName(), updateActionModel.getAction()));
+                    }
                 }
             }
-            if (filterModelList != null && filterModelList.size() >0) {
+            if (filterModelList != null && filterModelList.size() > 0) {
                 final int length = Math.min(AlphaFineConstants.SHOW_SIZE, filterModelList.size());
                 for (int i = 0; i < length; i++) {
                     lessModelList.add(filterModelList.get(i));

designer/src/com/fr/design/mainframe/alphafine/search/manager/AlphaSearchManager.java

@@ -37,12 +37,12 @@ public class AlphaSearchManager implements AlphaFineSearchProcessor {
     @Override
     public synchronized SearchResult getLessSearchResult(String searchText) {
         SearchResult recentModelList = recentSearchManager.getLessSearchResult(searchText);
-        SearchResult concludeModelList = recommendSearchManager.getLessSearchResult(searchText);
+        SearchResult recommendModelList = recommendSearchManager.getLessSearchResult(searchText);
         SearchResult actionModelList = actionSearchManager.getLessSearchResult(searchText);
         SearchResult fileModelList = fileSearchManager.getLessSearchResult(searchText);
         SearchResult documentModelList = documentSearchManager.getLessSearchResult(searchText);
         SearchResult pluginModelList = pluginSearchManager.getLessSearchResult(searchText);
-        recentModelList.addAll(concludeModelList);
+        recentModelList.addAll(recommendModelList);
         recentModelList.addAll(actionModelList);
         recentModelList.addAll(fileModelList);
         recentModelList.addAll(documentModelList);

designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java

@@ -97,7 +97,10 @@ public class RecentSearchManager extends XMLFileManager implements AlphaFineSear
 
     private void addModelToList(List<AlphaCellModel> list, String name) {
         try {
-            list.add(CellModelHelper.getModelFromJson(new JSONObject(name)));
+            AlphaCellModel model = CellModelHelper.getModelFromJson(new JSONObject(name));
+            if (model != null) {
+                list.add(CellModelHelper.getModelFromJson(new JSONObject(name)));
+            }
         } catch (JSONException e) {
             FRLogger.getLogger().error(e.getMessage());
         }

designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.alphafine.search.manager;
 
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.mainframe.alphafine.cell.CellModelHelper;
 import com.fr.design.mainframe.alphafine.cell.model.AlphaCellModel;
 import com.fr.design.mainframe.alphafine.cell.model.MoreModel;
@@ -29,35 +30,38 @@ public class RecommendSearchManager implements AlphaFineSearchProcessor {
     }
     @Override
     public synchronized SearchResult getLessSearchResult(String searchText) {
-        String result;
         this.modelList = new SearchResult();
-        HttpClient httpClient = new HttpClient(SEARCHAPI + CodeUtils.cjkEncode(searchText));
+        if (DesignerEnvManager.getEnvManager().getAlphafineConfigManager().isContainRecommend()) {
-        httpClient.asGet();
+            String result;
-        httpClient.setTimeout(5000);
+            HttpClient httpClient = new HttpClient(SEARCHAPI + CodeUtils.cjkEncode(searchText));
-        if (!httpClient.isServerAlive()) {
+            httpClient.asGet();
-            return modelList;
+            httpClient.setTimeout(5000);
-        }
+            if (!httpClient.isServerAlive()) {
-        result = httpClient.getResponseText();
+                return modelList;
-        try {
+            }
-            JSONObject jsonObject = new JSONObject(result);
+            result = httpClient.getResponseText();
-            if (jsonObject.optString("status").equals("success")) {
+            try {
-                JSONArray jsonArray = jsonObject.optJSONArray("result");
+                JSONObject jsonObject = new JSONObject(result);
-                if (jsonArray != null && jsonArray.length() > 0) {
+                if (jsonObject.optString("status").equals("success")) {
-                    for (int i = 0; i < jsonArray.length(); i++) {
+                    JSONArray jsonArray = jsonObject.optJSONArray("result");
-                        AlphaCellModel alphaCellModel = CellModelHelper.getModelFromJson((JSONObject) jsonArray.get(i));
+                    if (jsonArray != null && jsonArray.length() > 0) {
-                        if (!RecentSearchManager.getRecentSearchManger().getRecentModelList().contains(alphaCellModel)) {
+                        for (int i = 0; i < jsonArray.length(); i++) {
-                            this.modelList.add(alphaCellModel);
+                            AlphaCellModel alphaCellModel = CellModelHelper.getModelFromJson((JSONObject) jsonArray.get(i));
+                            if (!RecentSearchManager.getRecentSearchManger().getRecentModelList().contains(alphaCellModel)) {
+                                this.modelList.add(alphaCellModel);
+                            }
                         }
                     }
                 }
-            }
 
-        } catch (JSONException e) {
+            } catch (JSONException e) {
-            FRLogger.getLogger().error(e.getMessage());
+                FRLogger.getLogger().error("data transform error! :" + e.getMessage());
-        }
+            }
-        if (modelList.size() > 0) {
+            if (modelList.size() > 0) {
-            modelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_AlphaFine_Conclude"), false));
+                modelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_AlphaFine_Conclude"), false));
+            }
         }
+
         return modelList;
     }
 

designer/src/com/fr/grid/GridKeyListener.java

@@ -1,212 +1,208 @@
 package com.fr.grid;
 
-import java.awt.Toolkit;
+import com.fr.common.inputevent.InputEventBaseOnOS;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.grid.selection.CellSelection;
 import com.fr.grid.selection.FloatSelection;
 import com.fr.grid.selection.Selection;
 import com.fr.report.elementcase.ElementCase;
 
+import java.awt.*;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+
 /**
- * 
  * @editor zhou
  * @since 2012-3-23上午10:55:36
  */
 public class GridKeyListener implements KeyListener {
-
+    private static final int DIFF = 48; // 103 - 55 = 48, 小键盘和大键盘数字的差值 48
-	private Grid grid;
+    private static final int DELAY = 32;
-	// Keypressed last time
+    private Grid grid;
-	private long keyPressedLastTime = 0;
+    // Keypressed last time
-	private boolean isKeyPressedContentChanged = false;
+    private long keyPressedLastTime = 0;
-
+    private boolean isKeyPressedContentChanged = false;
-	public GridKeyListener(Grid grid) {
+
-		this.grid = grid;
+    public GridKeyListener(Grid grid) {
-	}
+        this.grid = grid;
-
+    }
-	public void keyPressed(KeyEvent evt) {
+
-		if (!grid.isEnabled() || evt.isConsumed()) {// 如果用户在自己的KyeListener里面consume了.就不执行下面的代码了.
+    public void keyPressed(KeyEvent evt) {
-			return;
+        if (!grid.isEnabled() || evt.isConsumed()) {// 如果用户在自己的KyeListener里面consume了.就不执行下面的代码了.
-		}
+            return;
-		KeyEvent newEvt = KeyEventWork.processKeyEvent(evt);
+        }
-		if (newEvt == null) {
+        if (KeyEventWork.processKeyEvent(evt) == null) {
-			return;
+            return;
-		}
+        }
-		long systemCurrentTime = System.currentTimeMillis();
+        long systemCurrentTime = System.currentTimeMillis();
-		int code = evt.getKeyCode();
+        int code = evt.getKeyCode();
-		boolean isNeedRepaint = false;
+        boolean isNeedRepaint = false;
-		ElementCasePane reportPane = grid.getElementCasePane();
+        ElementCasePane reportPane = grid.getElementCasePane();
-		ElementCase report = reportPane.getEditingElementCase();
+        ElementCase report = reportPane.getEditingElementCase();
-		if (reportPane.getSelection() instanceof FloatSelection) {
+        if (reportPane.getSelection() instanceof FloatSelection) {
-			if (systemCurrentTime - keyPressedLastTime <= 2) {
+            if (systemCurrentTime - keyPressedLastTime <= 2) {
-				return;
+                return;
-			} else {
+            } else {
-				keyPressedLastTime = systemCurrentTime;
+                keyPressedLastTime = systemCurrentTime;
-			}
+            }
-			dealWithFloatSelection(reportPane, code);
+            dealWithFloatSelection(reportPane, code);
-
+        } else {
-		} else {
+            if (systemCurrentTime - keyPressedLastTime <= DELAY) {
-			if (systemCurrentTime - keyPressedLastTime <= 32) {
+                return;
-				return;
+            } else {
-			} else {
+                keyPressedLastTime = systemCurrentTime;
-				keyPressedLastTime = systemCurrentTime;
+            }
-			}
+            dealWithCellSelection(evt, code);
-			dealWithCellSelection(evt, code);
+        }
-
+        switch (code) {
-		}
+            case KeyEvent.VK_PAGE_UP: {// page up
-
+                reportPane.getVerticalScrollBar().setValue(Math.max(0, grid.getVerticalValue() - grid.getVerticalExtent()));
-		switch (code) {
+                isNeedRepaint = true;
-		case KeyEvent.VK_PAGE_UP: {// page up
+                break;
-			reportPane.getVerticalScrollBar().setValue(Math.max(0, grid.getVerticalValue() - grid.getVerticalExtent()));
+            }
-			isNeedRepaint = true;
+            case KeyEvent.VK_PAGE_DOWN: {// page down
-			break;
+                reportPane.getVerticalScrollBar().setValue(grid.getVerticalValue() + grid.getVerticalExtent());
-		}
+                isNeedRepaint = true;
-		case KeyEvent.VK_PAGE_DOWN: {// page down
+                break;
-			reportPane.getVerticalScrollBar().setValue(grid.getVerticalValue() + grid.getVerticalExtent());
+            }
-			isNeedRepaint = true;
+            // Richie:Ctrl + A全选单元格
-			break;
+            case KeyEvent.VK_A:
-		}
+                if (InputEventBaseOnOS.isControlDown(evt)) {
-		// Richie:Ctrl + A全选单元格
+                    reportPane.setSelection(new CellSelection(0, 0, report.getColumnCount(), report.getRowCount()));
-		case KeyEvent.VK_A:
+                }
-			if (code == KeyEvent.VK_A && evt.isControlDown()) {
+                isNeedRepaint = true;
-				reportPane.setSelection(new CellSelection(0, 0, report.getColumnCount(), report.getRowCount()));
+                break;
-				isNeedRepaint = true;
+        }
-			}
+        if (isNeedRepaint) {
-			isNeedRepaint = true;
+            reportPane.repaint();
-			break;
+        }
-		}
+    }
-
+
-		if (isNeedRepaint) {
+    /**
-			reportPane.repaint();
+     * 单选中悬浮元素时，只处理4个方向键
-		}
+     *
-	}
+     * @param reportPane
-
+     * @param code
-	/**
+     */
-	 * 单选中悬浮元素时，只处理4个方向键
+    private void dealWithFloatSelection(ElementCasePane reportPane, int code) {
-	 * 
+        boolean isContentChanged = false;
-	 * @param reportPane
+        FloatSelection floatselection = (FloatSelection) reportPane.getSelection();
-	 * @param code
+
-	 */
+        switch (code) {
-	private void dealWithFloatSelection(ElementCasePane reportPane, int code) {
+            case KeyEvent.VK_LEFT: {// left
-		boolean isContentChanged = false;
+                floatselection.moveLeft(reportPane);
-		FloatSelection floatselection = (FloatSelection)reportPane.getSelection();
+                isContentChanged = true;
-
+                break;
-		switch (code) {
+            }
-		case KeyEvent.VK_LEFT: {// left
+            case KeyEvent.VK_RIGHT: {// right
-			floatselection.moveLeft(reportPane);
+                floatselection.moveRight(reportPane);
-			isContentChanged = true;
+                isContentChanged = true;
-			break;
+                break;
-		}
+            }
-		case KeyEvent.VK_RIGHT: {// right
+            case KeyEvent.VK_UP: {// up
-			floatselection.moveRight(reportPane);
+                floatselection.moveUp(reportPane);
-			isContentChanged = true;
+                isContentChanged = true;
-			break;
+                break;
-		}
+            }
-		case KeyEvent.VK_UP: {// up
+            case KeyEvent.VK_DOWN: {// down
-			floatselection.moveUp(reportPane);
+                floatselection.moveDown(reportPane);
-			isContentChanged = true;
+                isContentChanged = true;
-			break;
+                break;
-		}
+            }
-		case KeyEvent.VK_DOWN: {// down
+        }
-			floatselection.moveDown(reportPane);
+
-			isContentChanged = true;
+        if (isContentChanged) {
-			break;
+            grid.getElementCasePane().repaint();
-		}
+            this.isKeyPressedContentChanged = true;
-		}
+        }
-
+    }
-		if (isContentChanged) {
+
-			grid.getElementCasePane().repaint();
+    private void dealWithCellSelection(KeyEvent evt, int code) {
-			this.isKeyPressedContentChanged = true;
+        switch (code) {
-		}
+            case KeyEvent.VK_ESCAPE: {
-	}
+                if (grid.isCellEditing()) {
-
+                    grid.cancelEditing();
-	private void dealWithCellSelection(KeyEvent evt, int code) {
+                }
-		switch (code) {
+                break;
-		case KeyEvent.VK_ESCAPE: {
+            }
-			if (grid.isCellEditing()) {
+            case KeyEvent.VK_F2: {
-				grid.cancelEditing();
+                if (!grid.isCellEditing()) {
-			}
+                    grid.startEditing();
-			break;
+                }
-		}
+
-		case KeyEvent.VK_F2: {
+                break;
-			if (!grid.isCellEditing()) {
+            }
-				grid.startEditing();
+        }
-			}
+
-
+        // 支持小键盘
-			break;
+        if (IS_NUM_PAD_KEY(code)) {
-		}
+            keyTyped(evt);
-		}
+        }
-
+    }
-		// 支持小键盘
+
-		if (IS_NUM_PAD_KEY(code)) {
+    public void keyReleased(KeyEvent evt) {
-			keyTyped(evt);
+        if (!grid.isEnabled() || evt.isConsumed()) {
-		}
+            return;
-	}
+        }
-
+        KeyEvent newEvt = KeyEventWork.processKeyEvent(evt);
-	public void keyReleased(KeyEvent evt) {
+        if (newEvt == null) {
-		if (!grid.isEnabled() || evt.isConsumed()) {
+            return;
-			return;
+        }
-		}
+
-		KeyEvent newEvt = KeyEventWork.processKeyEvent(evt);
+        if (this.isKeyPressedContentChanged) {
-		if (newEvt == null) {
+            grid.getElementCasePane().fireTargetModified();
-			return;
+
-		}
+            this.isKeyPressedContentChanged = false;
-
+        }
-		if (this.isKeyPressedContentChanged) {
+    }
-			grid.getElementCasePane().fireTargetModified();
+
-
+    public void keyTyped(KeyEvent evt) {
-			this.isKeyPressedContentChanged = false;
+        if (!grid.isEnabled() || evt.isConsumed()) {
-		}
+            return;
-	}
+        }
-
+        KeyEvent newEvt = KeyEventWork.processKeyEvent(evt);
-	public void keyTyped(KeyEvent evt) {
+        if (newEvt == null || InputEventBaseOnOS.isControlDown(evt)) {// uneditable.
-		if (!grid.isEnabled() || evt.isConsumed()) {
+            return;
-			return;
+        }
-		}
+        char ch = evt.getKeyChar();
-		KeyEvent newEvt = KeyEventWork.processKeyEvent(evt);
+        if (ch == KeyEvent.VK_TAB) {// 禁止Tab键.
-		if (newEvt == null || evt.isControlDown()) {// uneditable.
+            return;
-			return;
+        }
-		}
+        int code = evt.getKeyCode();
-		char ch = evt.getKeyChar();
+        if (Character.isDefined(ch)) {// VK_SUBTRACT小键盘的减号
-		if (ch == KeyEvent.VK_TAB) {// 禁止Tab键.
+            Selection s = grid.getElementCasePane().getSelection();
-			return;
+            if (s instanceof CellSelection) {
-		}
+                if (!grid.getElementCasePane().isSelectedOneCell()) {
-		int code = evt.getKeyCode();
+                    Toolkit.getDefaultToolkit().beep();
-		if (Character.isDefined(ch)) {// VK_SUBTRACT小键盘的减号
+                    return;
-			Selection s = grid.getElementCasePane().getSelection();
+                }
-			if (s instanceof CellSelection) {
+                if (!grid.isCellEditing()) {
-				if (!grid.getElementCasePane().isSelectedOneCell()) {
+                    grid.startEditing(true);
-					Toolkit.getDefaultToolkit().beep();
+                }
-					return;
+
-				}
+                if (grid.getCellEditor() != null && grid.editorComponent != null) {
-				if (!grid.isCellEditing()) {
+                    if (IS_NUM_PAD_KEY(code)) {
-					grid.startEditing(true);
+                        KeyEvent ke = new KeyEvent(grid, KeyEvent.KEY_PRESSED, 0, 0, code - DIFF, ch);
-				}
+                        grid.editorComponent.dispatchEvent(ke);
-
+                        ke.consume();
-				if (grid.getCellEditor() != null && grid.editorComponent != null) {
+                    } else {
-					if (IS_NUM_PAD_KEY(code)) {
+                        if (!evt.isConsumed()) {
-						// 103 - 55 = 48, 小键盘和大键盘数字的差值 48
+                            grid.editorComponent.dispatchEvent(evt);
-						KeyEvent ke = new KeyEvent(grid, KeyEvent.KEY_PRESSED, 0, 0, code - 48, ch);
+                        }
-						grid.editorComponent.dispatchEvent(ke);
+                    }
-						ke.consume();
+                }
-					} else {
+            }
-						if (!evt.isConsumed()) {
+        }
-							grid.editorComponent.dispatchEvent(evt);
+    }
-						}
+
-					}
+    /**
-				}
+     * 小键盘
-			}
+     *
-		}
+     * @param code
-	}
+     * @return
-	/**
+     */
-	 * 小键盘
+    private static boolean IS_NUM_PAD_KEY(int code) {
-	 * @param code
+        return code == KeyEvent.VK_NUMPAD0 || code == KeyEvent.VK_NUMPAD1
-	 * @return
-	 */
-	private static boolean IS_NUM_PAD_KEY(int code){
-		return code == KeyEvent.VK_NUMPAD0 || code == KeyEvent.VK_NUMPAD1
                 || code == KeyEvent.VK_NUMPAD2
                 || code == KeyEvent.VK_NUMPAD3
                 || code == KeyEvent.VK_NUMPAD4
@@ -215,10 +211,10 @@ public class GridKeyListener implements KeyListener {
                 || code == KeyEvent.VK_NUMPAD7
                 || code == KeyEvent.VK_NUMPAD8
                 || code == KeyEvent.VK_NUMPAD9
-                || code == KeyEvent.VK_MULTIPLY 
+                || code == KeyEvent.VK_MULTIPLY
                 || code == KeyEvent.VK_ADD
                 || code == KeyEvent.VK_SUBTRACT
                 || code == KeyEvent.VK_DECIMAL
                 || code == KeyEvent.VK_DIVIDE;
-	}
+    }
 }

designer_base/build.9.0.gradle

@@ -1,8 +1,28 @@
-
-apply plugin: 'java'
 tasks.withType(JavaCompile){
 	options.encoding = 'UTF-8'
 }
+buildscript {
+    repositories {
+        maven {
+            url "https://maven.eveoh.nl/content/repositories/releases"
+        }
+    }
+
+    dependencies {
+        classpath "nl.eveoh:gradle-aspectj:1.6"
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
+project.ext {
+    aspectjVersion = '1.8.4'
+}
+
+apply plugin: 'aspectj'
+
 //指定构建的jdk版本
 sourceCompatibility=1.7
 //指定生成jar包版本

designer_base/build.9.0.gradle.bak

@@ -0,0 +1,69 @@
+
+apply plugin: 'java'
+tasks.withType(JavaCompile){
+	options.encoding = 'UTF-8'
+}
+//指定构建的jdk版本
+sourceCompatibility=1.7
+//指定生成jar包版本
+version='8.0'
+//生成jar包重命名
+jar{
+	baseName='fr-designer-core'
+}
+
+
+def srcDir="."
+def baseDir=".."
+
+//指定源码路径
+sourceSets{
+	main{
+		java{
+			srcDirs=["${srcDir}/src"]
+		}
+	}
+}
+//获取什么分支名
+FileTree files =fileTree(dir:'./',include:'build.*.gradle')
+def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
+buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\'))
+def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
+
+//声明外部依赖
+dependencies{
+	compile fileTree(dir:"../${baseDir}/lib",include:'**/*.jar')
+	compile fileTree(dir:"../${baseDir}",include:"**/build/libs/*.jar",exclude:"bi/**/*.jar")
+ 	testCompile 'junit:junit:4.12'
+}
+//复制非.java文件到classes文件夹下参与打包
+task copyFile(type:Copy,dependsOn:compileJava){
+	copy{
+		from ("${srcDir}/src"){
+			exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
+		}
+		into 'build/classes/main'
+	}
+
+}
+
+
+//压缩项目中的js文件
+task compressJS{
+	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
+		classpath {
+			fileset(dir:"../${baseDir}/lib4build",includes:'**/*.jar')
+		}
+	}
+	ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
+		fileset (dir:"${srcDir}/src"){
+			include (name:'**/*.js')
+			include (name:'**/*.css')
+		}
+
+	}
+}
+jar.dependsOn compressJS
+
+
+

designer_base/src/com/fr/aspectj/designerbase/AlphaFineReminder.aj

@@ -0,0 +1,53 @@
+package com.fr.aspectj.designerbase;
+
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.actions.help.alphafine.AlphafineConfigManager;
+import com.fr.design.actions.help.alphafine.RemindDialog;
+import com.fr.design.mainframe.DesignerContext;
+
+import java.awt.event.ActionEvent;
+
+/**
+ * Created by XiaXiang on 2017/5/25.
+ */
+public aspect AlphaFineReminder {
+    pointcut onActionPerformed(ActionEvent e) :
+            execution(* actionPerformed(ActionEvent)) && args(e);
+
+    before(ActionEvent e) : onActionPerformed(e) {
+        String point = thisJoinPoint.toString();
+        if (e != null && e.getSource().toString().contains("javax.swing.Timer")) {
+            return;
+        }
+        if (e != null && e.getSource().getClass().getName().equals("com.fr.design.gui.imenu.UIMenuItem") && point.contains("com.fr.design.actions")) {
+            remind();
+        }
+
+
+    }
+
+    /**
+     * 判断是否弹出广告框
+     */
+    private static void remind() {
+        AlphafineConfigManager manager = DesignerEnvManager.getEnvManager().getAlphafineConfigManager();
+
+        if (manager.isNeedRemind()) {
+            if (manager.getOperateCount() > 4) {
+                showReminderDialog();
+            } else {
+                manager.setOperateCount(manager.getOperateCount() + 1);
+            }
+        }
+    }
+
+    /**
+     * 弹框提醒使用AlphaFine
+     */
+    private static void showReminderDialog() {
+        RemindDialog remindDialog = new RemindDialog(DesignerContext.getDesignerFrame());
+        remindDialog.setVisible(true);
+    }
+
+
+}

designer_base/src/com/fr/aspectj/designerbase/TemplateProcessTracker.aj

@@ -5,55 +5,53 @@ package com.fr.aspectj.designerbase;
  * Created by plough on 2017/3/3.
  */
 
-import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
 import org.aspectj.lang.reflect.SourceLocation;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseEvent;
-import java.util.Date;
 
 public aspect TemplateProcessTracker {
     //声明一个pointcut，匹配你需要的方法
-    pointcut onMouseClicked(MouseEvent e) :
+    pointcut onMouseClicked(MouseEvent e):
             execution(* mouseClicked(MouseEvent)) && args(e);
-    pointcut onMousePressed(MouseEvent e) :
+    pointcut onMousePressed(MouseEvent e):
             execution(* mousePressed(MouseEvent)) && args(e);
-    pointcut onMouseReleased(MouseEvent e) :
+    pointcut onMouseReleased(MouseEvent e):
             execution(* mouseReleased(MouseEvent)) && args(e);
-    pointcut onActionPerformed(ActionEvent e) :
+    pointcut onActionPerformed(ActionEvent e):
             execution(* actionPerformed(ActionEvent)) && args(e);
-    pointcut onSetValueAt(Object v, int r, int c) :
+    pointcut onSetValueAt(Object v, int r, int c):
             execution(* setValueAt(java.lang.Object, int, int)) && args(v, r, c);
 
     //before表示之前的意思
     //这整个表示在MouseAdapter的public void mouseXXX(MouseEvent)方法调用之前，你想要执行的代码
-    before(MouseEvent e) : onMouseClicked(e) || onMousePressed(e) || onMouseReleased(e) {
+    before(MouseEvent e): onMouseClicked(e) || onMousePressed(e) || onMouseReleased(e) {
         SourceLocation sl = thisJoinPoint.getSourceLocation();//切面对应的代码位置
 
         //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
     }
     //同上
-    before(ActionEvent e) : onActionPerformed(e) {
+    before(ActionEvent e): onActionPerformed(e) {
         SourceLocation sl = thisJoinPoint.getSourceLocation();
         // !within(LogHandlerBar) 没用, 手动过滤
-        if (e.getSource().toString().contains("javax.swing.Timer")) {
+        if (e != null && e.getSource().toString().contains("javax.swing.Timer")) {
             return;
         }
 
         //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
 
     }
     //同上
-    before(Object v, int r, int c) : onSetValueAt(v, r, c) {
+    before(Object v, int r, int c): onSetValueAt(v, r, c) {
         SourceLocation sl = thisJoinPoint.getSourceLocation();
 
-        //String log = String.format("%s:\n%s\nset value: %s at (%d, %d)\n\n", new Date(), sl, v, r, c);
+        //String log getSourceLocation= String.format("%s:\n%s\nset value: %s at (%d, %d)\n\n", new Date(), sl, v, r, c);
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        // TemplateInfoCollector.appendProcess(log);
     }
 
 

designer_base/src/com/fr/common/inputevent/InputEventBaseOnOS.java

@@ -0,0 +1,21 @@
+package com.fr.common.inputevent;
+
+import com.fr.stable.OperatingSystem;
+
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+
+/**
+ * Created by hzzz on 2017/5/26.
+ */
+public class InputEventBaseOnOS {
+    private static final boolean IS_MACOS = OperatingSystem.isMacOS();
+
+    public static boolean isControlDown(MouseEvent e) {
+        return IS_MACOS ? e.isMetaDown() : e.isControlDown();
+    }
+
+    public static boolean isControlDown(KeyEvent e) {
+        return IS_MACOS ? e.isMetaDown() : e.isControlDown();
+    }
+}

designer_base/src/com/fr/design/DesignerEnvManager.java

@@ -5,7 +5,7 @@ package com.fr.design;
 
 import com.fr.base.*;
 import com.fr.dav.LocalEnv;
-import com.fr.design.actions.help.AlphaFine.AlphafineConfigManager;
+import com.fr.design.actions.help.alphafine.AlphafineConfigManager;
 import com.fr.design.constants.UIConstants;
 import com.fr.env.RemoteEnv;
 import com.fr.env.SignIn;

designer_base/src/com/fr/design/actions/edit/CopyAction.java

@@ -11,6 +11,8 @@ import com.fr.general.Inter;
 import javax.swing.*;
 import java.awt.event.KeyEvent;
 
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
+
 /**
  * Copy.
  */
@@ -21,7 +23,7 @@ public class CopyAction extends TemplateComponentAction {
         this.setName(Inter.getLocText("M_Edit-Copy"));
         this.setMnemonic('C');
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/copy.png"));
-        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, KeyEvent.CTRL_MASK));
+        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER));
     }
 
     @Override

designer_base/src/com/fr/design/actions/edit/CutAction.java

@@ -12,6 +12,8 @@ import com.fr.design.actions.TemplateComponentAction;
 import com.fr.design.designer.TargetComponent;
 import com.fr.general.Inter;
 
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
+
 /**
  * Cut.
  */
@@ -25,7 +27,7 @@ public class CutAction extends TemplateComponentAction {
         this.setName(Inter.getLocText("M_Edit-Cut"));
         this.setMnemonic('T');
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/cut.png"));
-        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, KeyEvent.CTRL_MASK));
+        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER));
     }
 
     @Override

designer_base/src/com/fr/design/actions/edit/PasteAction.java

@@ -12,6 +12,8 @@ import com.fr.design.actions.TemplateComponentAction;
 import com.fr.design.designer.TargetComponent;
 import com.fr.general.Inter;
 
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
+
 /**
  * Paste.
  */
@@ -25,7 +27,7 @@ public class PasteAction extends TemplateComponentAction {
         this.setName(Inter.getLocText("M_Edit-Paste"));
         this.setMnemonic('P');
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/paste.png"));
-        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, KeyEvent.CTRL_MASK));
+        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER));
     }
 
     @Override

designer_base/src/com/fr/design/actions/help/alphafine/AlphafineAction.java

@@ -1,4 +1,4 @@
-package com.fr.design.actions.help.AlphaFine;
+package com.fr.design.actions.help.alphafine;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.DesignerEnvManager;
@@ -9,7 +9,6 @@ import com.fr.design.dialog.DialogActionListener;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.menu.MenuKeySet;
-import com.fr.general.Inter;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;

designer_base/src/com/fr/design/actions/help/alphafine/AlphafineConfigManager.java

@@ -1,4 +1,4 @@
-package com.fr.design.actions.help.AlphaFine;
+package com.fr.design.actions.help.alphafine;
 
 import com.fr.stable.OperatingSystem;
 import com.fr.stable.StringUtils;
@@ -35,7 +35,7 @@ public class AlphafineConfigManager implements XMLable {
     /**
      * 猜您需要
      */
-    private boolean isContainConclude;
+    private boolean isContainRecommend;
 
     /**
      * 设置
@@ -67,6 +67,15 @@ public class AlphafineConfigManager implements XMLable {
      */
     private KeyStroke shortCutKeyStore;
 
+    /**
+     * 是否提醒
+     */
+    private boolean isNeedRemind = true;
+
+    /**
+     * 直接操作菜单次数
+     */
+    private int operateCount;
 
 
 
@@ -88,11 +97,13 @@ public class AlphafineConfigManager implements XMLable {
             this.setEnabled(reader.getAttrAsBoolean("isEnabled", true));
             this.setContainPlugin(reader.getAttrAsBoolean("isContainDocument", true));
             this.setContainDocument(reader.getAttrAsBoolean("isContainDocument", true));
-            this.setContainConclude(reader.getAttrAsBoolean("isContainConclude", true));
+            this.setContainRecommend(reader.getAttrAsBoolean("isContainRecommend", true));
             this.setContainAction(reader.getAttrAsBoolean("isContainAction", true));
             this.setContainTemplate(reader.getAttrAsBoolean("isContainTemplate", true));
             this.setContainFileContent(reader.getAttrAsBoolean("isContainFileContent", false));
-            this.setShortcuts(reader.getAttrAsString("shortcuts", "meta + f"));
+            this.setShortcuts(reader.getAttrAsString("shortcuts", getDefaultShortCuts()));
+            this.setNeedRemind(reader.getAttrAsBoolean("isNeedRemind", true));
+            this.setOperateCount(reader.getAttrAsInt("operateCount", 0));
 
         }
 
@@ -104,12 +115,14 @@ public class AlphafineConfigManager implements XMLable {
         writer.attr("isEnabled", this.isEnabled())
                 .attr("isSearchOnline", this.isSearchOnLine())
                 .attr("shortcuts", this.getShortcuts())
-                .attr("isContainConclude", this.isContainConclude())
+                .attr("isContainRecommend", this.isContainRecommend())
                 .attr("isContainAction", this.isContainAction())
                 .attr("isContainDocument", this.isContainDocument())
                 .attr("isContainTemplate", this.isContainTemplate())
                 .attr("isContainPlugin", this.isContainPlugin())
-                .attr("isContainFileContent", this.isContainFileContent());
+                .attr("isContainFileContent", this.isContainFileContent())
+                .attr("isNeedRemind", this.isNeedRemind())
+                .attr("operateCount", this.getOperateCount());
         writer.end();
     }
 
@@ -176,12 +189,12 @@ public class AlphafineConfigManager implements XMLable {
         this.isContainPlugin = containPlugin;
     }
 
-    public boolean isContainConclude() {
+    public boolean isContainRecommend() {
-        return isContainConclude;
+        return isContainRecommend;
     }
 
-    public void setContainConclude(boolean containConclude) {
+    public void setContainRecommend(boolean containConclude) {
-        isContainConclude = containConclude;
+        isContainRecommend = containConclude;
     }
 
     public boolean isEnabled() {
@@ -214,4 +227,20 @@ public class AlphafineConfigManager implements XMLable {
     public void setContainFileContent(boolean containFileContent) {
         isContainFileContent = containFileContent;
     }
+
+    public boolean isNeedRemind() {
+        return isNeedRemind;
+    }
+
+    public void setNeedRemind(boolean needRemind) {
+        isNeedRemind = needRemind;
+    }
+
+    public int getOperateCount() {
+        return operateCount;
+    }
+
+    public void setOperateCount(int operateCount) {
+        this.operateCount = operateCount;
+    }
 }

designer_base/src/com/fr/design/actions/help/alphafine/AlphafineConfigPane.java

@@ -1,4 +1,4 @@
-package com.fr.design.actions.help.AlphaFine;
+package com.fr.design.actions.help.alphafine;
 
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.dialog.BasicPane;
@@ -53,7 +53,7 @@ public class AlphafineConfigPane extends BasicPane {
     private static final double COLUMN_GAP = 180;
     private static final double ROW_GAP = 25;
     private KeyStroke shortCutKeyStore = null;
-    private UICheckBox isEnabledCheckbox, isSearchOnlineCheckbox, isContainConcludeCheckbox, isContainActionCheckbox, isContainDocumentCheckbox, isContainTemplateCheckbox, isContainPluginCheckbox, isContainFileContentCheckbox;
+    private UICheckBox isEnabledCheckbox, isSearchOnlineCheckbox, isContainRecommendCheckbox, isContainActionCheckbox, isContainDocumentCheckbox, isContainTemplateCheckbox, isContainPluginCheckbox, isContainFileContentCheckbox;
     private UITextField shortcutsField;
 
     public AlphafineConfigPane() {
@@ -73,7 +73,7 @@ public class AlphafineConfigPane extends BasicPane {
 
     private Component[][] initsearchRangeComponents() {
         Component[][] components = new Component[][]{
-                new Component[]{isContainConcludeCheckbox, isContainActionCheckbox, isContainDocumentCheckbox},
+                new Component[]{isContainRecommendCheckbox, isContainActionCheckbox, isContainDocumentCheckbox},
                 new Component[]{isContainTemplateCheckbox, isContainPluginCheckbox, isContainFileContentCheckbox}
         };
         return components;
@@ -85,7 +85,7 @@ public class AlphafineConfigPane extends BasicPane {
         double[] columnSize = {COLUMN_GAP, COLUMN_GAP, COLUMN_GAP};
 
         JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_AlphaFine_SearchRange"));
-        isContainConcludeCheckbox = new UICheckBox(Inter.getLocText("FR-Designer_AlphaFine_Conclude"));
+        isContainRecommendCheckbox = new UICheckBox(Inter.getLocText("FR-Designer_AlphaFine_Conclude"));
         isContainActionCheckbox = new UICheckBox(Inter.getLocText("FR-Designer_Set"));
         isContainPluginCheckbox = new UICheckBox(Inter.getLocText("FR-Designer-Plugin_Addon"));
         isContainDocumentCheckbox = new UICheckBox(Inter.getLocText("FR-Designer_COMMUNITY_HELP"));
@@ -125,14 +125,14 @@ public class AlphafineConfigPane extends BasicPane {
             @Override
             public void actionPerformed(ActionEvent e) {
                 if (!isSearchOnlineCheckbox.isSelected()) {
-                    isContainConcludeCheckbox.setEnabled(false);
+                    isContainRecommendCheckbox.setEnabled(false);
                     isContainPluginCheckbox.setEnabled(false);
                     isContainDocumentCheckbox.setEnabled(false);
-                    isContainConcludeCheckbox.setSelected(false);
+                    isContainRecommendCheckbox.setSelected(false);
                     isContainPluginCheckbox.setSelected(false);
                     isContainDocumentCheckbox.setSelected(false);
                 } else {
-                    isContainConcludeCheckbox.setEnabled(true);
+                    isContainRecommendCheckbox.setEnabled(true);
                     isContainPluginCheckbox.setEnabled(true);
                     isContainDocumentCheckbox.setEnabled(true);
                 }
@@ -163,8 +163,8 @@ public class AlphafineConfigPane extends BasicPane {
         this.isContainDocumentCheckbox.setEnabled(alphafineConfigManager.isSearchOnLine());
         this.isContainPluginCheckbox.setSelected(alphafineConfigManager.isContainPlugin() && alphafineConfigManager.isSearchOnLine());
         this.isContainPluginCheckbox.setEnabled(alphafineConfigManager.isSearchOnLine());
-        this.isContainConcludeCheckbox.setSelected(alphafineConfigManager.isContainConclude() && alphafineConfigManager.isSearchOnLine());
+        this.isContainRecommendCheckbox.setSelected(alphafineConfigManager.isContainRecommend() && alphafineConfigManager.isSearchOnLine());
-        this.isContainConcludeCheckbox.setEnabled(alphafineConfigManager.isSearchOnLine());
+        this.isContainRecommendCheckbox.setEnabled(alphafineConfigManager.isSearchOnLine());
         this.shortcutsField.setText(getDisplayShortCut(alphafineConfigManager.getShortcuts()));
         shortCutKeyStore = convert2KeyStroke(alphafineConfigManager.getShortcuts());
     }
@@ -175,7 +175,7 @@ public class AlphafineConfigPane extends BasicPane {
         alphafineConfigManager.setContainPlugin(this.isContainPluginCheckbox.isSelected());
         alphafineConfigManager.setContainAction(this.isContainActionCheckbox.isSelected());
         alphafineConfigManager.setContainDocument(this.isContainDocumentCheckbox.isSelected());
-        alphafineConfigManager.setContainConclude(this.isContainConcludeCheckbox.isSelected());
+        alphafineConfigManager.setContainRecommend(this.isContainRecommendCheckbox.isSelected());
         alphafineConfigManager.setEnabled(this.isEnabledCheckbox.isSelected());
         alphafineConfigManager.setSearchOnLine(this.isSearchOnlineCheckbox.isSelected());
         alphafineConfigManager.setContainTemplate(this.isContainTemplateCheckbox.isSelected());

designer_base/src/com/fr/design/actions/help/alphafine/AlphafineContext.java

@@ -0,0 +1,29 @@
+package com.fr.design.actions.help.alphafine;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by XiaXiang on 2017/5/27.
+ */
+public class AlphafineContext {
+    private static List<AlphafineListener> fireLoginContextListener = new ArrayList<AlphafineListener>();
+
+    /**
+     * 触发AlphaFine弹窗
+     */
+    public static void fireAlphaFineContextListener() {
+        for (AlphafineListener l : fireLoginContextListener) {
+            l.showDialog();
+        }
+    }
+
+    /**
+     * 添加一个弹出AlphaFine的监听事件
+     *
+     * @param l AlphaFine框弹出监听事件
+     */
+    public static void addAlphafineContextListener(AlphafineListener l) {
+        fireLoginContextListener.add(l);
+    }
+}

designer_base/src/com/fr/design/actions/help/alphafine/AlphafineListener.java

@@ -0,0 +1,8 @@
+package com.fr.design.actions.help.alphafine;
+
+/**
+ * Created by XiaXiang on 2017/5/27.
+ */
+public interface AlphafineListener {
+    void showDialog();
+}

designer_base/src/com/fr/design/actions/help/alphafine/RemindDialog.java

@@ -0,0 +1,43 @@
+package com.fr.design.actions.help.alphafine;
+
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.dialog.UIDialog;
+import com.fr.design.utils.gui.GUICoreUtils;
+
+import java.awt.*;
+
+/**
+ * Created by XiaXiang on 2017/5/26.
+ */
+public class RemindDialog extends UIDialog {
+    private RemindPane remindPane;
+    private static final int WIDTH = 600;
+    private static final int HEIGHT = 400;
+    public RemindDialog(Frame parent) {
+        super(parent);
+        setUndecorated(true);
+        setSize(WIDTH, HEIGHT);
+        initComponent();
+        GUICoreUtils.centerWindow(this);
+    }
+
+    private void initComponent() {
+        final AlphafineConfigManager manager = DesignerEnvManager.getEnvManager().getAlphafineConfigManager();
+        remindPane = new RemindPane(manager, this);
+        this.add(remindPane);
+
+    }
+
+    @Override
+    public void checkValid() throws Exception {
+
+    }
+
+    public RemindPane getRemindPane() {
+        return remindPane;
+    }
+
+    public void setRemindPane(RemindPane remindPane) {
+        this.remindPane = remindPane;
+    }
+}

designer_base/src/com/fr/design/actions/help/alphafine/RemindPane.java

@@ -0,0 +1,146 @@
+package com.fr.design.actions.help.alphafine;
+
+import com.fr.design.dialog.UIDialog;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.general.IOUtils;
+import com.fr.general.Inter;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+/**
+ * Created by XiaXiang on 2017/5/26.
+ */
+public class RemindPane extends JPanel {
+
+    private UIButton openButton;
+    private JPanel backgroundPane;
+    private UILabel noRemindLabel;
+    private UILabel checkLabel;
+    private Icon checkIcon = IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/check.png");
+    private Icon unCheckIcon = IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/uncheck.png");
+    private Icon closeIcon = IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/remind_close.png");
+    private Icon labelIcon = IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/remind.png");
+    private Icon openIcon = IOUtils.readIcon("com/fr/design/mainframe/alphafine/images/open.png");
+
+    private static final int WIDTH = 600;
+    private static final int HEIGHT = 400;
+    private static final int CLOSE = 30;
+
+    private static final Rectangle OPEN = new Rectangle(30, 300, 150, 40);
+    private static final Rectangle REMIND = new Rectangle(95, 350, 100, 20);
+    private static final Rectangle CHECK = new Rectangle(70, 350, 20, 20);
+    public static final Font MEDIUM_FONT = new Font("Song_TypeFace", 0, 12);
+    public static final Font LARGE_FONT = new Font("Song_TypeFace", 0, 18);
+
+    public JComponent closeButton = new JComponent() {
+        protected void paintComponent(Graphics g) {
+            closeIcon.paintIcon(this, g, 0, 0);
+        }
+    };
+
+    public RemindPane(AlphafineConfigManager manager, UIDialog remindDialog) {
+        this.setPreferredSize(new Dimension(WIDTH, HEIGHT));
+        initUI(manager, remindDialog);
+        this.setLayout(getAbsoluteLayout());
+    }
+
+    /**
+     * 初始化面板
+     * @param manager
+     * @param dialog
+     */
+    private void initUI(final AlphafineConfigManager manager, final UIDialog dialog) {
+
+        openButton = new UIButton();
+        openButton.setIcon(openIcon);
+        openButton.set4ToolbarButton();
+        openButton.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mousePressed(MouseEvent e) {
+                manager.setOperateCount(0);
+                dialog.dispose();
+                AlphafineContext.fireAlphaFineContextListener();
+
+            }
+        });
+        noRemindLabel = new UILabel(Inter.getLocText("FR-Designer-Alphafine_No_Remind"));
+        noRemindLabel.setFont(MEDIUM_FONT);
+        noRemindLabel.setForeground(Color.white);
+        checkLabel = new UILabel();
+        checkLabel.setIcon(unCheckIcon);
+        checkLabel.addMouseListener(new MouseAdapter() {
+            private boolean isCheck = false;
+
+            @Override
+            public void mousePressed(MouseEvent e) {
+                if (isCheck) {
+                    checkLabel.setIcon(unCheckIcon);
+                    manager.setNeedRemind(true);
+                    isCheck = false;
+                } else {
+                    checkLabel.setIcon(checkIcon);
+                    manager.setNeedRemind(false);
+                    isCheck = true;
+                }
+            }
+        });
+        backgroundPane = new JPanel(new BorderLayout());
+        backgroundPane.add(new UILabel(labelIcon), BorderLayout.CENTER);
+        closeButton.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mousePressed(MouseEvent e) {
+                manager.setOperateCount(0);
+                dialog.dispose();
+
+            }
+        });
+        add(closeButton, 0);
+        add(checkLabel, 1);
+        add(openButton, 2);
+        add(noRemindLabel, 3);
+        add(backgroundPane, 4);
+    }
+
+    /**
+     * 控件排列用绝对布局
+     * @return
+     */
+    protected LayoutManager getAbsoluteLayout() {
+        return new LayoutManager() {
+
+            @Override
+            public void removeLayoutComponent(Component comp) {
+            }
+
+            @Override
+            public Dimension preferredLayoutSize(Container parent) {
+                return parent.getPreferredSize();
+            }
+
+            @Override
+            public Dimension minimumLayoutSize(Container parent) {
+                return null;
+            }
+
+            @Override
+            public void layoutContainer(Container parent) {
+                int width = parent.getWidth();
+                int height = parent.getHeight();
+                closeButton.setBounds((width - CLOSE), 0, CLOSE, CLOSE);
+                openButton.setBounds(OPEN);
+                noRemindLabel.setBounds(REMIND);
+                checkLabel.setBounds(CHECK);
+                backgroundPane.setBounds(0, 0, width, height);
+            }
+
+            @Override
+            public void addLayoutComponent(String name, Component comp) {
+            }
+        };
+    }
+
+}

designer_base/src/com/fr/design/extra/LoginWebBridge.java

@@ -146,7 +146,7 @@ public class LoginWebBridge {
                             if (res.equals(FAILED_MESSAGE_STATUS)) {
                             } else {
                                 JSONObject jo = new JSONObject(res);
-                                if (jo.getString("status").equals(SUCCESS_MESSAGE_STATUS)) {
+                                if (jo.optString("status").equals(SUCCESS_MESSAGE_STATUS)) {
                                     setMessageCount(Integer.parseInt(jo.getString("message")));
                                 }
                             }

designer_base/src/com/fr/design/gui/autocomplete/AutoCompletePopupWindow.java

@@ -10,6 +10,7 @@
 package com.fr.design.gui.autocomplete;
 
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.PopupWindowDecorator;
+import com.fr.general.FRLogger;
 
 import javax.swing.*;
 import javax.swing.event.CaretEvent;
@@ -40,6 +41,7 @@ import java.util.List;
 class AutoCompletePopupWindow extends JWindow implements CaretListener,
         ListSelectionListener, MouseListener {
 
+    private final static int DIS = 5;
     /**
      * The parent AutoCompletion instance.
      */
@@ -179,7 +181,7 @@ class AutoCompletePopupWindow extends JWindow implements CaretListener,
             } else {
                 doAutocomplete();
             }
-        } else if (AutoCompletion.getDebug()) {
+        } else if (AutoCompletion.isDebug()) {
             Thread.dumpStack();
         }
     }
@@ -300,8 +302,8 @@ class AutoCompletePopupWindow extends JWindow implements CaretListener,
      */
     private void installKeyBindings() {
 
-        if (AutoCompletion.getDebug()) {
+        if (AutoCompletion.isDebug()) {
-            System.out.println("PopupWindow: Installing keybindings");
+            FRLogger.getLogger().debug("PopupWindow: Installing keybindings");
         }
 
         if (escapeKap == null) { // Lazily create actions.
@@ -313,7 +315,7 @@ class AutoCompletePopupWindow extends JWindow implements CaretListener,
         ActionMap am = comp.getActionMap();
 
         replaceAction(im, am, KeyEvent.VK_ESCAPE, escapeKap, oldEscape);
-        if (AutoCompletion.getDebug() && oldEscape.action == escapeKap.action) {
+        if (AutoCompletion.isDebug() && oldEscape.action == escapeKap.action) {
             Thread.dumpStack();
         }
         replaceAction(im, am, KeyEvent.VK_UP, upKap, oldUp);
@@ -371,7 +373,7 @@ class AutoCompletePopupWindow extends JWindow implements CaretListener,
      */
     private void positionDescWindow() {
 
-        boolean showDescWindow = descWindow != null && ac.getShowDescWindow();
+        boolean showDescWindow = descWindow != null && ac.isShowDescWindow();
         if (!showDescWindow) {
             return;
         }
@@ -387,14 +389,14 @@ class AutoCompletePopupWindow extends JWindow implements CaretListener,
         // Try to position to the right first (LTR)
         int x;
         if (ac.getTextComponentOrientation().isLeftToRight()) {
-            x = getX() + getWidth() + 5;
+            x = getX() + getWidth() + DIS;
             if (x + descWindow.getWidth() > screenBounds.x + screenBounds.width) { // doesn't fit
-                x = getX() - 5 - descWindow.getWidth();
+                x = getX() - DIS - descWindow.getWidth();
             }
         } else { // RTL
-            x = getX() - 5 - descWindow.getWidth();
+            x = getX() - DIS - descWindow.getWidth();
             if (x < screenBounds.x) { // Doesn't fit
-                x = getX() + getWidth() + 5;
+                x = getX() + getWidth() + DIS;
             }
         }
 
@@ -604,7 +606,7 @@ class AutoCompletePopupWindow extends JWindow implements CaretListener,
         Rectangle screenBounds = Util.getScreenBoundsForPoint(r.x, r.y);
         //Dimension screenSize = getToolkit().getScreenSize();
 
-        boolean showDescWindow = descWindow != null && ac.getShowDescWindow();
+        boolean showDescWindow = descWindow != null && ac.isShowDescWindow();
         int totalH = getHeight();
         if (showDescWindow) {
             totalH = Math.max(totalH, descWindow.getHeight());
@@ -655,7 +657,7 @@ class AutoCompletePopupWindow extends JWindow implements CaretListener,
                 installKeyBindings();
                 lastLine = ac.getLineOfCaret();
                 selectFirstItem();
-                if (descWindow == null && ac.getShowDescWindow()) {
+                if (descWindow == null && ac.isShowDescWindow()) {
                     descWindow = createDescriptionWindow();
                     positionDescWindow();
                 }
@@ -693,7 +695,7 @@ class AutoCompletePopupWindow extends JWindow implements CaretListener,
             // because of the way child JWindows' visibility is handled - in
             // some ways it's dependent on the parent, in other ways it's not.
             if (descWindow != null) {
-                descWindow.setVisible(visible && ac.getShowDescWindow());
+                descWindow.setVisible(visible && ac.isShowDescWindow());
             }
 
         }
@@ -708,8 +710,8 @@ class AutoCompletePopupWindow extends JWindow implements CaretListener,
      */
     private void uninstallKeyBindings() {
 
-        if (AutoCompletion.getDebug()) {
+        if (AutoCompletion.isDebug()) {
-            System.out.println("PopupWindow: Removing keybindings");
+            FRLogger.getLogger().debug("PopupWindow: Removing keybindings");
         }
 
         JTextComponent comp = ac.getTextComponent();

designer_base/src/com/fr/design/gui/autocomplete/ParameterizedCompletionContext.java

@@ -14,6 +14,7 @@ import com.fr.design.gui.autocomplete.ParameterizedCompletionInsertionInfo.Repla
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.DocumentRange;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.RSyntaxTextArea;
 import com.fr.design.gui.syntax.ui.rtextarea.ChangeableHighlightPainter;
+import com.fr.general.FRLogger;
 
 import javax.swing.*;
 import javax.swing.event.CaretEvent;
@@ -254,7 +255,7 @@ class ParameterizedCompletionContext {
      *
      * @param offs The offset into the document.
      * @return The text of the parameter containing the offset, or
-     *         <code>null</code> if the offset is not in a parameter.
+     * <code>null</code> if the offset is not in a parameter.
      */
     public String getArgumentText(int offs) {
         List<Highlight> paramHighlights = getParameterHighlights();
@@ -284,7 +285,7 @@ class ParameterizedCompletionContext {
      * Returns the highlight of the current parameter.
      *
      * @return The current parameter's highlight, or <code>null</code> if
-     *         the caret is not in a parameter's bounds.
+     * the caret is not in a parameter's bounds.
      * @see #getCurrentParameterStartOffset()
      */
     private Highlight getCurrentParameterHighlight() {
@@ -332,7 +333,7 @@ class ParameterizedCompletionContext {
      * Returns the starting offset of the current parameter.
      *
      * @return The current parameter's starting offset, or <code>-1</code> if
-     *         the caret is not in a parameter's bounds.
+     * the caret is not in a parameter's bounds.
      * @see #getCurrentParameterHighlight()
      */
     private int getCurrentParameterStartOffset() {
@@ -407,7 +408,7 @@ class ParameterizedCompletionContext {
      * Inserts the choice selected in the parameter choices window.
      *
      * @return Whether the choice was inserted.  This will be <code>false</code>
-     *         if the window is not visible, or no choice is selected.
+     * if the window is not visible, or no choice is selected.
      */
     boolean insertSelectedChoice() {
         if (paramChoicesWindow != null && paramChoicesWindow.isVisible()) {
@@ -438,11 +439,9 @@ class ParameterizedCompletionContext {
      * @see #uninstallKeyBindings()
      */
     private void installKeyBindings() {
-
+        if (AutoCompletion.isDebug()) {
-        if (AutoCompletion.getDebug()) {
+            FRLogger.getLogger().debug("CompletionContext: Installing keybindings");
-            System.out.println("CompletionContext: Installing keybindings");
         }
-
         JTextComponent tc = ac.getTextComponent();
         InputMap im = tc.getInputMap();
         ActionMap am = tc.getActionMap();
@@ -489,7 +488,6 @@ class ParameterizedCompletionContext {
         im.put(ks, IM_KEY_CLOSING);
         oldClosingAction = am.get(IM_KEY_CLOSING);
         am.put(IM_KEY_CLOSING, new ClosingAction());
-
     }
 
 
@@ -513,12 +511,7 @@ class ParameterizedCompletionContext {
         List<Highlight> highlights = getParameterHighlights();
         for (int i = 0; i < highlights.size(); i++) {
             Highlight hl = highlights.get(i);
-            // Check "< dot", not "<= dot" as OutlineHighlightPainter paints
+            if (needUpdate(currentNext, hl, dot)) {
-            // starting at one char AFTER the highlight starts, to work around
-            // Java issue.  Thanks to Matthew Adereth!
-            if (currentNext == null || currentNext.getStartOffset() </*=*/dot ||
-                    (hl.getStartOffset() > dot &&
-                            hl.getStartOffset() <= currentNext.getStartOffset())) {
                 currentNext = hl;
                 pos = i;
             }
@@ -538,6 +531,15 @@ class ParameterizedCompletionContext {
 
     }
 
+    private boolean needUpdate(Highlight currentNext, Highlight hl, int dot) {
+        // Check "< dot", not "<= dot" as OutlineHighlightPainter paints
+        // starting at one char AFTER the highlight starts, to work around
+        // Java issue.  Thanks to Matthew Adereth!
+        return currentNext == null || currentNext.getStartOffset() </*=*/dot ||
+                (hl.getStartOffset() > dot &&
+                        hl.getStartOffset() <= currentNext.getStartOffset());
+    }
+
 
     /**
      * Moves to and selects the previous parameter.
@@ -562,10 +564,7 @@ class ParameterizedCompletionContext {
 
         for (int i = 0; i < highlights.size(); i++) {
             Highlight h = highlights.get(i);
-            if (currentPrev == null || currentPrev.getStartOffset() >= dot ||
+            if (pos == lastSelectedParam || needUpdate(currentPrev, dot, h, selStart)) {
-                    (h.getStartOffset() < selStart &&
-                            (h.getStartOffset() > currentPrev.getStartOffset() ||
-                                    pos == lastSelectedParam))) {
                 currentPrev = h;
                 pos = i;
             }
@@ -593,6 +592,12 @@ class ParameterizedCompletionContext {
 
     }
 
+    private boolean needUpdate(Highlight currentPrev, int dot, Highlight h, int selStart) {
+        return currentPrev == null
+                || currentPrev.getStartOffset() >= dot
+                || (currentPrev.getStartOffset() < h.getStartOffset() && h.getStartOffset() < selStart);
+    }
+
 
     private void possiblyUpdateParamCopies(Document doc) {
 
@@ -616,7 +621,7 @@ class ParameterizedCompletionContext {
             try {
                 replacement = doc.getText(start, len);
             } catch (BadLocationException ble) {
-                 // Never happens
+                // Never happens
             }
 
             // Replace any param copies tracking this parameter with the
@@ -718,7 +723,7 @@ class ParameterizedCompletionContext {
             return h;
 
         } catch (BadLocationException ble) {
-             // Never happens
+            // Never happens
         }
 
         return null;
@@ -733,8 +738,8 @@ class ParameterizedCompletionContext {
      */
     private void uninstallKeyBindings() {
 
-        if (AutoCompletion.getDebug()) {
+        if (AutoCompletion.isDebug()) {
-            System.out.println("CompletionContext Uninstalling keybindings");
+            FRLogger.getLogger().debug("CompletionContext Uninstalling keybindings");
         }
 
         JTextComponent tc = ac.getTextComponent();
@@ -1037,7 +1042,6 @@ class ParameterizedCompletionContext {
          * @see #uninstall()
          */
         public void install(JTextComponent tc) {
-
             boolean replaceTabs = false;
             if (tc instanceof RSyntaxTextArea) {
                 RSyntaxTextArea textArea = (RSyntaxTextArea) tc;
@@ -1047,14 +1051,10 @@ class ParameterizedCompletionContext {
             }
 
             Highlighter h = tc.getHighlighter();
-
             try {
-
                 // Insert the parameter text
-                ParameterizedCompletionInsertionInfo info =
+                ParameterizedCompletionInsertionInfo info = pc.getInsertionInfo(tc, replaceTabs);
-                        pc.getInsertionInfo(tc, replaceTabs);
                 tc.replaceSelection(info.getTextToInsert());
-
                 // Add highlights around the parameters.
                 final int replacementCount = info.getReplacementCount();
                 for (int i = 0; i < replacementCount; i++) {
@@ -1067,40 +1067,31 @@ class ParameterizedCompletionContext {
                 for (int i = 0; i < info.getReplacementCopyCount(); i++) {
                     ReplacementCopy rc = info.getReplacementCopy(i);
                     paramCopyInfos.add(new ParamCopyInfo(rc.getId(),
-                            (Highlight) h.addHighlight(rc.getStart(), rc.getEnd(),
+                            (Highlight) h.addHighlight(rc.getStart(), rc.getEnd(), paramCopyP)));
-                                    paramCopyP)));
                 }
-
                 // Go back and start at the first parameter.
                 tc.setCaretPosition(info.getSelectionStart());
                 if (info.hasSelection()) {
                     tc.moveCaretPosition(info.getSelectionEnd());
                 }
-
                 minPos = info.getMinOffset();
                 maxPos = info.getMaxOffset();
                 try {
-                    defaultEndOffs = tc.getDocument().createPosition(
+                    defaultEndOffs = tc.getDocument().createPosition(info.getDefaultEndOffs());
-                            info.getDefaultEndOffs());
                 } catch (BadLocationException ble) {
-                     // Never happens
+                    // Never happens
                 }
-
                 // Listen for document events AFTER we insert
                 tc.getDocument().addDocumentListener(this);
-
             } catch (BadLocationException ble) {
-                 // Never happens
+                // Never happens
             }
-
             // Add listeners to the text component, AFTER text insertion.
             tc.addCaretListener(this);
             tc.addFocusListener(this);
             installKeyBindings();
-
         }
 
-
         public void removeUpdate(DocumentEvent e) {
             handleDocumentEvent(e);
         }

designer_base/src/com/fr/design/gui/frpane/UIAdvancedTextPane.java

@@ -20,6 +20,8 @@ import com.fr.design.actions.UpdateAction;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.general.Inter;
 
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
+
 /**
  * p:这是一个增强的JTextPane,支持很多Action 
  */
@@ -143,7 +145,7 @@ public class UIAdvancedTextPane extends UITextPane {
 	        setName(Inter.getLocText("M_Edit-Cut"));
 	        setMnemonic('T');
 	        setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/cut.png"));
-	        setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, KeyEvent.CTRL_MASK));			
+	        setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER));
 		}
 		
 		public void actionPerformed(ActionEvent evt) {
@@ -162,7 +164,7 @@ public class UIAdvancedTextPane extends UITextPane {
 	        this.setName(Inter.getLocText("M_Edit-Copy"));
 	        this.setMnemonic('C');
 	        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/copy.png"));
-	        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, KeyEvent.CTRL_MASK));
+	        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER));
 		}
 		
 		public void actionPerformed(ActionEvent evt) {
@@ -181,7 +183,7 @@ public class UIAdvancedTextPane extends UITextPane {
 	        this.setName(Inter.getLocText("M_Edit-Paste"));
 	        this.setMnemonic('P');
 	        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/paste.png"));
-	        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, KeyEvent.CTRL_MASK));
+	        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER));
 		}
 		
 		public void actionPerformed(ActionEvent evt) {

designer_base/src/com/fr/design/gui/icombobox/ExtendedComboBox.java

@@ -1,5 +1,7 @@
 package com.fr.design.gui.icombobox;
 
+import com.fr.common.inputevent.InputEventBaseOnOS;
+
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Point;
@@ -17,6 +19,8 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicComboPopup;
 import javax.swing.plaf.basic.ComboPopup;
 
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
+
 
 public class ExtendedComboBox extends UIComboBox {
     private static final int VALUE120 = 120;
@@ -74,12 +78,12 @@ public class ExtendedComboBox extends UIComboBox {
         protected JList createList() {
             return new JList(comboBox.getModel()) {
                 public void processMouseEvent(MouseEvent e) {
-                    if (e.isControlDown()) {
+                    if (InputEventBaseOnOS.isControlDown(e)) {
                         //   Fix   for   4234053.   Filter   out   the   Control
                         //   Key   from   the   list.
                         //   ie.,   don't   allow   CTRL   key   deselection.
                         e = new MouseEvent((Component) e.getSource(), e.getID(), e.getWhen(), e.getModifiers()
-                                ^ InputEvent.CTRL_MASK, e.getX(), e.getY(), e.getClickCount(), e.isPopupTrigger());
+                                ^ DEFAULT_MODIFIER, e.getX(), e.getY(), e.getClickCount(), e.isPopupTrigger());
                     }
                     super.processMouseEvent(e);
                 }

designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java

@@ -16,6 +16,7 @@ import javax.swing.plaf.basic.BasicComboBoxUI;
 import javax.swing.plaf.basic.BasicComboPopup;
 import javax.swing.plaf.basic.ComboPopup;
 
+import com.fr.common.inputevent.InputEventBaseOnOS;
 import com.fr.design.constants.UIConstants;
 import sun.swing.DefaultLookup;
 
@@ -24,6 +25,8 @@ import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
 
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
+
 /**
  * @author zhou                                                                                                                       F
  * @since 2012-5-9下午4:33:07
@@ -207,8 +210,8 @@ public class UIComboBoxUI extends BasicComboBoxUI implements MouseListener {
 
                 @Override
                 public void processMouseEvent(MouseEvent e) {
-                    if (e.isControlDown()) {
+                    if (InputEventBaseOnOS.isControlDown(e)) {
-                        e = new MouseEvent((Component) e.getSource(), e.getID(), e.getWhen(), e.getModifiers() ^ InputEvent.CTRL_MASK, e.getX(), e.getY(), e.getClickCount(),
+                        e = new MouseEvent((Component) e.getSource(), e.getID(), e.getWhen(), e.getModifiers() ^ DEFAULT_MODIFIER, e.getX(), e.getY(), e.getClickCount(),
                                 e.isPopupTrigger());
                     }
                     super.processMouseEvent(e);

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

@@ -1,311 +1,300 @@
 package com.fr.design.gui.ilist;
 
-import java.awt.BorderLayout;
+import com.fr.design.gui.icheckbox.UICheckBox;
-import java.awt.Component;
+import com.fr.stable.StringUtils;
-import java.awt.event.ActionEvent;
+
-import java.awt.event.ActionListener;
+import javax.swing.*;
-import java.awt.event.KeyAdapter;
+import javax.swing.border.Border;
-import java.awt.event.KeyEvent;
+import javax.swing.border.EmptyBorder;
-import java.awt.event.MouseAdapter;
+import java.awt.*;
-import java.awt.event.MouseEvent;
+import java.awt.event.*;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EventListener;
 import java.util.List;
 
-import javax.swing.JComponent;
-import javax.swing.JList;
-import javax.swing.ListCellRenderer;
-import javax.swing.ListModel;
-import javax.swing.ListSelectionModel;
-import javax.swing.UIManager;
-import javax.swing.border.Border;
-import javax.swing.border.EmptyBorder;
-
-import com.fr.design.gui.icheckbox.UICheckBox;
-import com.fr.stable.StringUtils;
-
 /**
  * CheckBoxs + JList.
  */
 public class CheckBoxList extends JComponent {
-	/**
+    private final static int X_COORDINATE = 20;
-	 * 选择状态----全选和全不选
+
-	 * 
+    /**
-	 * @editor zhou
+     * 选择状态----全选和全不选
-	 * @since 2012-4-1下午2:39:10
+     *
-	 */
+     * @editor zhou
-	public static enum SelectedState {
+     * @since 2012-4-1下午2:39:10
-		ALL, NONE
+     */
-	}
+    public static enum SelectedState {
-
+        ALL, NONE
-	private boolean[] selects;
+    }
-	private JList jlist;
+
-	private UICheckBox chooseAll;
+    private boolean[] selects;
-
+    private JList jlist;
-	public CheckBoxList(Object[] items) {
+    private UICheckBox chooseAll;
-		this(items, SelectedState.NONE, StringUtils.EMPTY);
+
-	}
+    public CheckBoxList(Object[] items) {
-
+        this(items, SelectedState.NONE, StringUtils.EMPTY);
-	public CheckBoxList(Object[] items, String name) {
+    }
-		this(items, SelectedState.NONE, name);
+
-	}
+    public CheckBoxList(Object[] items, String name) {
-
+        this(items, SelectedState.NONE, name);
-	/**
+    }
-	 * Class constructor.
+
-	 * 
+    /**
-	 * @param items
+     * Class constructor.
-	 *            Items with which to populate the list.
+     *
-	 * @param default_state
+     * @param items Items with which to populate the list.
-	 *            default state, true or false
+     * @param state default state, true or false
-	 */
+     */
-	public CheckBoxList(Object[] items, SelectedState state, String name) {
+    public CheckBoxList(Object[] items, SelectedState state, String name) {
-		jlist = new BOXLIST(items);
+        jlist = new BOXLIST(items);
-		jlist.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+        jlist.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
-		this.selects = new boolean[items.length];
+        this.selects = new boolean[items.length];
-		boolean default_state = (state == SelectedState.ALL);
+        boolean default_state = (state == SelectedState.ALL);
-		Arrays.fill(this.selects, default_state);
+        Arrays.fill(this.selects, default_state);
-
+
-		jlist.setCellRenderer(new CheckListCellRenderer());
+        jlist.setCellRenderer(new CheckListCellRenderer());
-		jlist.addMouseListener(new MouseAdapter() {
+        jlist.addMouseListener(new MouseAdapter() {
-			public void mousePressed(MouseEvent e) {
+            public void mousePressed(MouseEvent e) {
-				doCheck();
+                doCheck();
-			}
+            }
-
+
-			public void mouseReleased(MouseEvent e) {
+            public void mouseReleased(MouseEvent e) {
-				doCheck();
+                doCheck();
-			}
+            }
-		});
+        });
-		jlist.addKeyListener(new KeyAdapter() {
+        jlist.addKeyListener(new KeyAdapter() {
-
+
-			@Override
+            @Override
-			public void keyTyped(KeyEvent e) {
+            public void keyTyped(KeyEvent e) {
-				if (e.getKeyChar() == ' ') {
+                if (e.getKeyChar() == ' ') {
-					doCheck();
+                    doCheck();
-				}
+                }
-			}
+            }
-
+
-		});
+        });
-		this.setLayout(new BorderLayout());
+        this.setLayout(new BorderLayout());
-		chooseAll = new UICheckBox(name, default_state);
+        chooseAll = new UICheckBox(name, default_state);
-		chooseAll.addActionListener(new ActionListener() {
+        chooseAll.addActionListener(new ActionListener() {
-
+
-			@Override
+            @Override
-			public void actionPerformed(ActionEvent e) {
+            public void actionPerformed(ActionEvent e) {
-				if (chooseAll.isSelected()) {
+                if (chooseAll.isSelected()) {
-					setSelected(true);
+                    setSelected(true);
-				} else {
+                } else {
-					setSelected(false);
+                    setSelected(false);
-				}
+                }
-			}
+            }
-		});
+        });
-		this.add(chooseAll, BorderLayout.NORTH);
+        this.add(chooseAll, BorderLayout.NORTH);
-		this.add(jlist, BorderLayout.CENTER);
+        this.add(jlist, BorderLayout.CENTER);
-	}
+    }
-
+
-	/*
+    /*
-	 * 用于CellRenderer显示value为text
+     * 用于CellRenderer显示value为text
-	 */
+     */
-	protected String value2Text(Object value) {
+    protected String value2Text(Object value) {
-		return value != null ? value.toString() : StringUtils.EMPTY;
+        return value != null ? value.toString() : StringUtils.EMPTY;
-	}
+    }
-
+
-	public void setItems(Object[] os) {
+    public void setItems(Object[] os) {
-		if (os == null) {
+        if (os == null) {
-			this.setSelected(false);
+            this.setSelected(false);
-		} else {
+        } else {
-			for (int i = 0, len = os.length; i < len; i++) {
+            for (int i = 0, len = os.length; i < len; i++) {
-				Object o = os[i];
+                Object o = os[i];
-				for (int j = 0, jen = jlist.getModel().getSize(); j < jen; j++) {
+                for (int j = 0, jen = jlist.getModel().getSize(); j < jen; j++) {
-					if (o.equals(jlist.getModel().getElementAt(j))) {
+                    if (o.equals(jlist.getModel().getElementAt(j))) {
-						this.setSelected(j, true);
+                        this.setSelected(j, true);
-					}
+                    }
-				}
+                }
-			}
+            }
-		}
+        }
-		this.repaint();
+        this.repaint();
-	}
+    }
-
+
-	/**
+    /**
-	 * Is selected
+     * Is selected
-	 */
+     */
-	public boolean isSelected(int index) {
+    public boolean isSelected(int index) {
-		if (selects == null || index >= selects.length) {
+        if (selects == null || index >= selects.length) {
-			return false;
+            return false;
-		}
+        }
-
+
-		return selects[index];
+        return selects[index];
-	}
+    }
-
+
-	public void setSelected(int index, boolean isSelected) {
+    public void setSelected(int index, boolean isSelected) {
-		if (selects == null || index >= selects.length) {
+        if (selects == null || index >= selects.length) {
-			return;
+            return;
-		}
+        }
-
+
-		selects[index] = isSelected;
+        selects[index] = isSelected;
-		this.repaint(this.getBounds());
+        this.repaint(this.getBounds());
-
+
-		this.fireCheckBoxListSelectionChangeListener();
+        this.fireCheckBoxListSelectionChangeListener();
-	}
+    }
-
+
-	private void setSelected(boolean isSelected) {
+    private void setSelected(boolean isSelected) {
-		if (selects == null) {
+        if (selects == null) {
-			return;
+            return;
-		}
+        }
-		for (int i = 0; i < selects.length; i++) {
+        for (int i = 0; i < selects.length; i++) {
-			selects[i] = isSelected;
+            selects[i] = isSelected;
-		}
+        }
-		this.repaint(this.getBounds());
+        this.repaint(this.getBounds());
-
+
-		this.fireCheckBoxListSelectionChangeListener();
+        this.fireCheckBoxListSelectionChangeListener();
-	}
+    }
-
+
-	/**
+    /**
-	 * Returns an array of the objects that have been selected. Overrides the
+     * Returns an array of the objects that have been selected. Overrides the
-	 * JList method.
+     * JList method.
-	 */
+     */
-	public Object[] getSelectedValues() {
+    public Object[] getSelectedValues() {
-		return this.jlist.getSelectedValues();
+        return this.jlist.getSelectedValues();
-	}
+    }
-
+
-	private class BOXLIST extends JList {
+    private class BOXLIST extends JList {
-		public BOXLIST(Object[] items) {
+        public BOXLIST(Object[] items) {
-			super(items);
+            super(items);
-		}
+        }
-
+
-		@Override
+        @Override
-		protected void processMouseEvent(MouseEvent e) {
+        protected void processMouseEvent(MouseEvent e) {
-			if (e.getX() < 20) {
+            if (e.getX() < X_COORDINATE) {
-				if (e.isControlDown() || e.isAltDown() || e.isShiftDown() || e.isMetaDown()) {
+                boolean anyMaskDown = e.isControlDown() || e.isAltDown() || e.isShiftDown() || e.isMetaDown();
-					int[] indices = getSelectedIndices();
+                if (anyMaskDown) {
-					if (indices.length == 0) {
+                    int[] indices = getSelectedIndices();
-						super.processMouseEvent(e);
+                    if (indices.length == 0) {
-					}
+                        super.processMouseEvent(e);
-				} else {
+                    }
-					super.processMouseEvent(e);
+                } else {
-				}
+                    super.processMouseEvent(e);
-			} else {
+                }
-				super.processMouseEvent(e);
+            } else {
-			}
+                super.processMouseEvent(e);
-			int id = e.getID();
+            }
-			switch (id) {
+            int id = e.getID();
-			case MouseEvent.MOUSE_PRESSED:
+            switch (id) {
-				break;
+                case MouseEvent.MOUSE_PRESSED:
-			case MouseEvent.MOUSE_RELEASED:
+                    break;
-				break;
+                case MouseEvent.MOUSE_RELEASED:
-			case MouseEvent.MOUSE_CLICKED:
+                    break;
-				doCheck();
+                case MouseEvent.MOUSE_CLICKED:
-				break;
+                    doCheck();
-			case MouseEvent.MOUSE_EXITED:
+                    break;
-				break;
+                case MouseEvent.MOUSE_EXITED:
-			case MouseEvent.MOUSE_ENTERED:
+                    break;
-				break;
+                case MouseEvent.MOUSE_ENTERED:
-			}
+                    break;
-		}
+            }
-
+        }
-		@Override
+
-		protected void processMouseMotionEvent(MouseEvent e) {
+        @Override
-			if (e.getX() < 20) {
+        protected void processMouseMotionEvent(MouseEvent e) {
-				return;
+            if (e.getX() < X_COORDINATE) {
-			}
+                return;
-
+            }
-			super.processMouseEvent(e);
+
-		}
+            super.processMouseEvent(e);
-
+        }
-		@Override
+
-		public Object[] getSelectedValues() {
+        @Override
-			List<Object> list = new ArrayList<Object>(selects.length);
+        public Object[] getSelectedValues() {
-			for (int i = 0; i < selects.length; i++) {
+            List<Object> list = new ArrayList<Object>(selects.length);
-				if (selects[i]) {
+            for (int i = 0; i < selects.length; i++) {
-					list.add(this.getModel().getElementAt(i));
+                if (selects[i]) {
-				}
+                    list.add(this.getModel().getElementAt(i));
-			}
+                }
-
+            }
-			return list.toArray();
+
-		}
+            return list.toArray();
-
+        }
-	}
+
-
+    }
-	private void doCheck() {
+
-		// p:这里必须改变所有选择checkbox.
+    private void doCheck() {
-		int index = jlist.getSelectedIndex();
+        // p:这里必须改变所有选择checkbox.
-		boolean sValue = !selects[index];
+        int index = jlist.getSelectedIndex();
-
+        boolean sValue = !selects[index];
-		// p:开始设置所有选择的checkbox.
+
-		int[] indices = jlist.getSelectedIndices();
+        // p:开始设置所有选择的checkbox.
-		for (int i = 0; i < indices.length; i++) {
+        int[] indices = jlist.getSelectedIndices();
-			setSelected(indices[i], sValue);
+        for (int i = 0; i < indices.length; i++) {
-		}
+            setSelected(indices[i], sValue);
-		for (boolean selected : selects) {
+        }
-			if (!selected) {
+        for (boolean selected : selects) {
-				chooseAll.setSelected(false);
+            if (!selected) {
-				return;
+                chooseAll.setSelected(false);
-			}
+                return;
-		}
+            }
-		chooseAll.setSelected(true);
+        }
-		repaint();
+        chooseAll.setSelected(true);
-	}
+        repaint();
-
+    }
-	private static final Border noFocusBorder = new EmptyBorder(1, 1, 1, 1);
+
-
+    private static final Border NO_FOCUS_BORDER = new EmptyBorder(1, 1, 1, 1);
-	private class CheckListCellRenderer extends UICheckBox implements ListCellRenderer {
+
-
+    private class CheckListCellRenderer extends UICheckBox implements ListCellRenderer {
-		public CheckListCellRenderer() {
+
-			this.setOpaque(true);
+        public CheckListCellRenderer() {
-			this.setBorder(noFocusBorder);
+            this.setOpaque(true);
-		}
+            this.setBorder(NO_FOCUS_BORDER);
-
+        }
-		public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+
-			this.setText(value2Text(value));
+        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
-			this.setSelected(selects[index]);
+            this.setText(value2Text(value));
-			this.setFont(list.getFont());
+            this.setSelected(selects[index]);
-
+            this.setFont(list.getFont());
-			if (isSelected) {
+
-				this.setBackground(list.getSelectionBackground());
+            if (isSelected) {
-				this.setForeground(list.getSelectionForeground());
+                this.setBackground(list.getSelectionBackground());
-			} else {
+                this.setForeground(list.getSelectionForeground());
-				this.setBackground(list.getBackground());
+            } else {
-				this.setForeground(list.getForeground());
+                this.setBackground(list.getBackground());
-			}
+                this.setForeground(list.getForeground());
-
+            }
-			if (cellHasFocus) {
+
-				this.setBorder(UIManager.getBorder("List.focusCellHighlightBorder"));
+            if (cellHasFocus) {
-			} else {
+                this.setBorder(UIManager.getBorder("List.focusCellHighlightBorder"));
-				this.setBorder(noFocusBorder);
+            } else {
-			}
+                this.setBorder(NO_FOCUS_BORDER);
-
+            }
-			return this;
+
-		}
+            return this;
-	}
+        }
-
+    }
-	public void addCheckBoxListSelectionChangeListener(CheckBoxListSelectionChangeListener l) {
+
-		this.listenerList.add(CheckBoxListSelectionChangeListener.class, l);
+    public void addCheckBoxListSelectionChangeListener(CheckBoxListSelectionChangeListener l) {
-	}
+        this.listenerList.add(CheckBoxListSelectionChangeListener.class, l);
-
+    }
-	public void removeCheckBoxListSelectionChangeListener(CheckBoxListSelectionChangeListener l) {
+
-		this.listenerList.remove(CheckBoxListSelectionChangeListener.class, l);
+    public void removeCheckBoxListSelectionChangeListener(CheckBoxListSelectionChangeListener l) {
-	}
+        this.listenerList.remove(CheckBoxListSelectionChangeListener.class, l);
-
+    }
-	public void fireCheckBoxListSelectionChangeListener() {
+
-		// Guaranteed to return a non-null array
+    public void fireCheckBoxListSelectionChangeListener() {
-		Object[] listeners = listenerList.getListenerList();
+        // Guaranteed to return a non-null array
-
+        Object[] listeners = listenerList.getListenerList();
-		// Process the listeners last to first, notifying
+
-		// those that are interested in this event
+        // Process the listeners last to first, notifying
-		for (int i = listeners.length - 2; i >= 0; i -= 2) {
+        // those that are interested in this event
-			if (listeners[i] == CheckBoxListSelectionChangeListener.class) {
+        for (int i = listeners.length - 2; i >= 0; i -= 2) {
-				((CheckBoxListSelectionChangeListener)listeners[i + 1]).selectionChanged(this);
+            if (listeners[i] == CheckBoxListSelectionChangeListener.class) {
-			}
+                ((CheckBoxListSelectionChangeListener) listeners[i + 1]).selectionChanged(this);
-		}
+            }
-
+        }
-	}
+
-
+    }
-	public static interface CheckBoxListSelectionChangeListener extends EventListener {
+
-		public void selectionChanged(CheckBoxList target);
+    public static interface CheckBoxListSelectionChangeListener extends EventListener {
-	}
+        public void selectionChanged(CheckBoxList target);
-
+    }
-	public ListModel getModel() {
+
-		return jlist.getModel();
+    public ListModel getModel() {
-	}
+        return jlist.getModel();
+    }
 
 }

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

@@ -17,7 +17,7 @@ import java.util.Vector;
  * 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() {
@@ -46,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;
@@ -71,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/itable/TableSorter.java

@@ -15,6 +15,8 @@ import java.util.List;
 import java.util.Map;
 
 import javax.swing.Icon;
+
+import com.fr.common.inputevent.InputEventBaseOnOS;
 import com.fr.design.gui.ilable.UILabel;
 import javax.swing.JTable;
 import javax.swing.event.TableModelEvent;
@@ -79,7 +81,7 @@ import javax.swing.table.TableModel;
 
 public class TableSorter extends AbstractTableModel {
     protected TableModel tableModel;
-
+    private static final int ADD = 4;
     public static final int DESCENDING = -1;
     public static final int NOT_SORTED = 0;
     public static final int ASCENDING = 1;
@@ -341,17 +343,14 @@ public class TableSorter extends AbstractTableModel {
                 fireTableChanged(e);
                 return;
             }
-                
+            // If the table structure has changed, cancel the sorting; the
-            // If the table structure has changed, cancel the sorting; the             
+            // sorting columns may have been either moved or deleted from the model.
-            // sorting columns may have been either moved or deleted from             
-            // the model. 
             if (e.getFirstRow() == TableModelEvent.HEADER_ROW) {
                 cancelSorting();
                 fireTableChanged(e);
                 return;
             }
-
+            // We can map a cell event through to the view without widening
-            // We can map a cell event through to the view without widening             
             // when the following conditions apply: 
             // 
             // a) all the changes are on one row (e.getFirstRow() == e.getLastRow()) and, 
@@ -380,8 +379,7 @@ public class TableSorter extends AbstractTableModel {
                                                      column, e.getType()));
                 return;
             }
-
+            // Something has happened to the data that may have invalidated the row order.
-            // Something has happened to the data that may have invalidated the row order. 
             clearSortingState();
             fireTableDataChanged();
             return;
@@ -396,13 +394,13 @@ public class TableSorter extends AbstractTableModel {
             int column = columnModel.getColumn(viewColumn).getModelIndex();
             if (column != -1) {
                 int status = getSortingStatus(column);
-                if (!e.isControlDown()) {
+                if (!InputEventBaseOnOS.isControlDown(e)) {
                     cancelSorting();
                 }
                 // Cycle the sorting states through {NOT_SORTED, ASCENDING, DESCENDING} or 
                 // {NOT_SORTED, DESCENDING, ASCENDING} depending on whether shift is pressed. 
                 status = status + (e.isShiftDown() ? -1 : 1);
-                status = (status + 4) % 3 - 1; // signed mod, returning {-1, 0, 1}
+                status = (status + ADD) % 3 - 1; // signed mod, returning {-1, 0, 1}
                 setSortingStatus(column, status);
             }
         }

designer_base/src/com/fr/design/gui/itabpane/UITabsHeaderIconPane.java

@@ -1,36 +1,23 @@
 package com.fr.design.gui.itabpane;
 
-import java.awt.BorderLayout;
+import com.fr.base.BaseUtils;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.GradientPaint;
-import java.awt.Graphics2D;
-import java.awt.GridLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.AbstractAction;
-import javax.swing.ActionMap;
-import javax.swing.BorderFactory;
-import javax.swing.Icon;
-import javax.swing.InputMap;
-import javax.swing.JComponent;
-
 import com.fr.design.constants.UIConstants;
+import com.fr.design.gui.core.UITabComponent;
+import com.fr.design.gui.ibutton.UITabButton;
 import com.fr.design.gui.ilable.UILabel;
-import javax.swing.JPanel;
+import com.fr.stable.StringUtils;
-import javax.swing.KeyStroke;
+
-import javax.swing.SwingConstants;
+import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
-import com.fr.base.BaseUtils;
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
-import com.fr.design.gui.core.UITabComponent;
-import com.fr.design.gui.ibutton.UITabButton;
-import com.fr.stable.StringUtils;
 
 /**
  * 本来想弄个延迟加载的，发现在单元格属性表那边没有意义，就算了.这个面板是纯粹的，没有与模板的任何交互操作(比如说populate() update())
@@ -40,6 +27,7 @@ import com.fr.stable.StringUtils;
  */
 public class UITabsHeaderIconPane extends JPanel implements UITabComponent {
 	private static final long serialVersionUID = 1L;
+	private static final int DIS = 30;
 
 	private UILabel nameLabel;
 
@@ -125,7 +113,7 @@ public class UITabsHeaderIconPane extends JPanel implements UITabComponent {
 		inputMapAncestor.clear();
 		actionMap.clear();
 
-		inputMapAncestor.put(KeyStroke.getKeyStroke(KeyEvent.VK_TAB, KeyEvent.CTRL_MASK), "switch");
+		inputMapAncestor.put(KeyStroke.getKeyStroke(KeyEvent.VK_TAB, DEFAULT_MODIFIER), "switch");
 		actionMap.put("switch", new AbstractAction() {
 
 			/**
@@ -143,9 +131,7 @@ public class UITabsHeaderIconPane extends JPanel implements UITabComponent {
 	private void show(final JPanel panel) {
 		int count = centerPane.getComponentCount();// 获取centerPanel中控件数
 		List<Component> list = new ArrayList<Component>();//
-		for (Component comp : centerPane.getComponents()) {
+		list.addAll(Arrays.asList(centerPane.getComponents()));
-			list.add(comp);
-		}
 		if (count > 0) {// 如果centerPanel中控件数大于0就执行效果
 			for (int i = 0; i < count; i++) {
 				Component comp = centerPane.getComponent(i);// 获得该位置的控件
@@ -159,11 +145,11 @@ public class UITabsHeaderIconPane extends JPanel implements UITabComponent {
 							int height = centerPane.getHeight();
 							int width = centerPane.getWidth();
 							int y = -height;
-							for (int i = 0; i <= height; i += 30) {
+							for (int i = 0; i <= height; i += DIS) {
 								// 设置面板位置
 								currentPanel.setBounds(0, i, width, height);
 								panel.setBounds(0, y, width, height);
-								y += 30;
+								y += DIS;
 								try {
 									Thread.sleep(3);
 								} catch (InterruptedException e) {
@@ -173,7 +159,6 @@ public class UITabsHeaderIconPane extends JPanel implements UITabComponent {
 								centerPane.remove(currentPanel);// 移除当前面板
 							}
 							panel.setBounds(0, 0, width, height);
-
 						}
 					}.start();
 					break;

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

@@ -7,13 +7,33 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
+import javax.swing.text.DefaultEditorKit;
 import java.awt.*;
+import java.awt.event.KeyEvent;
+
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
 
 public class UITextArea extends JTextArea implements UIObserver {
     private UIObserverListener uiObserverListener;
 
     public UITextArea(int i, int j) {
         super(i, j);
+        InputMap inputMap = this.getInputMap();
+        while (inputMap.getParent() != null) {
+            inputMap = inputMap.getParent();
+        }
+        if (inputMap.get(KeyStroke.getKeyStroke(KeyEvent.VK_A, DEFAULT_MODIFIER)) == null) {
+            inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_A, DEFAULT_MODIFIER), DefaultEditorKit.selectAllAction);
+        }
+        if (inputMap.get(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER)) == null) {
+            inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER), DefaultEditorKit.copyAction);
+        }
+        if (inputMap.get(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER)) == null) {
+            inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER), DefaultEditorKit.pasteAction);
+        }
+        if (inputMap.get(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER)) == null) {
+            inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER), DefaultEditorKit.cutAction);
+        }
         initComponents();
     }
 

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

@@ -1,20 +1,21 @@
 package com.fr.design.gui.itextfield;
 
-import java.awt.*;
-
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import javax.swing.text.Document;
-
 import com.fr.design.event.GlobalNameListener;
 import com.fr.design.event.GlobalNameObserver;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
-import com.fr.stable.Constants;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.stable.Constants;
+
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.text.DefaultEditorKit;
+import javax.swing.text.Document;
+import java.awt.*;
+import java.awt.event.KeyEvent;
+
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
 
 /**
  * @author Jerry
@@ -30,6 +31,22 @@ public class UITextField extends JTextField implements UIObserver, GlobalNameObs
 
     public UITextField() {
         super();
+        InputMap inputMap = this.getInputMap();
+        while (inputMap.getParent() != null) {
+            inputMap = inputMap.getParent();
+        }
+        if (inputMap.get(KeyStroke.getKeyStroke(KeyEvent.VK_A, DEFAULT_MODIFIER)) == null) {
+            inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_A, DEFAULT_MODIFIER), DefaultEditorKit.selectAllAction);
+        }
+        if (inputMap.get(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER)) == null) {
+            inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER), DefaultEditorKit.copyAction);
+        }
+        if (inputMap.get(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER)) == null) {
+            inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER), DefaultEditorKit.pasteAction);
+        }
+        if (inputMap.get(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER)) == null) {
+            inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER), DefaultEditorKit.cutAction);
+        }
         initListener();
     }
 
@@ -186,6 +203,7 @@ public class UITextField extends JTextField implements UIObserver, GlobalNameObs
 
     /**
      * 主函数
+     *
      * @param args 参数
      */
     public static void main(String... args) {

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.JTree;
-import javax.swing.SwingUtilities;
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
-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;
-
 /**
  * CheckBoxTree is a special JTree which uses UICheckBox as the tree renderer.
  * In addition to regular JTree's features, it also allows you select any number
@@ -37,11 +30,11 @@ import com.fr.design.gui.icheckbox.UICheckBox;
  * select one or several tree nodes and press SPACE key to toggle the
  * check box selection for all selected tree nodes.
  * <p/>
- * In order to retrieve which tree paths are selected, you need to call 
+ * In order to retrieve which tree paths are selected, you need to call
  * {@link #getCheckBoxTreeSelectionModel()}.
- * It will return the selection model that keeps track of which tree 
+ * It will return the selection model that keeps track of which tree
  * paths have been checked. For example
- * {@link CheckBoxTreeSelectionModel#getSelectionPaths()} 
+ * {@link CheckBoxTreeSelectionModel#getSelectionPaths()}
  * will give the list of paths which have
  * been checked.
  */
@@ -111,7 +104,7 @@ public class CheckBoxTree extends JTree {
         addPropertyChangeListener(JTree.SELECTION_MODEL_PROPERTY, _modelChangeListener);
         updateRowMapper();
     }
-    
+
     /**
      * Inserts the mouse listener at the particular index in the listeners' chain.
      *
@@ -122,7 +115,7 @@ public class CheckBoxTree extends JTree {
     private void insertMouseListener(Component component, MouseListener l, int index) {
         MouseListener[] listeners = component.getMouseListeners();
         for (int i = 0, length = listeners.length; i < length; i++) {
-        	component.removeMouseListener(listeners[i]);
+            component.removeMouseListener(listeners[i]);
         }
 //        for (MouseListener listener : listeners) {
 //            component.removeMouseListener(listener);
@@ -168,7 +161,7 @@ public class CheckBoxTree extends JTree {
      * Gets the cell renderer with check box.
      *
      * @return CheckBoxTree's own cell renderer which has the check box. The actual cell renderer
-     *         you set by setCellRenderer() can be accessed by using {@link #getActualCellRenderer()}.
+     * you set by setCellRenderer() can be accessed by using {@link #getActualCellRenderer()}.
      */
     public TreeCellRenderer getCellRenderer() {
         TreeCellRenderer cellRenderer = super.getCellRenderer();
@@ -177,8 +170,7 @@ public class CheckBoxTree extends JTree {
         }
         if (_treeCellRenderer == null) {
             _treeCellRenderer = createCellRenderer(cellRenderer);
-        }
+        } else {
-        else {
             _treeCellRenderer.setActualTreeRenderer(cellRenderer);
         }
         return _treeCellRenderer;
@@ -194,8 +186,7 @@ public class CheckBoxTree extends JTree {
     public TreeCellRenderer getActualCellRenderer() {
         if (_treeCellRenderer != null) {
             return _treeCellRenderer.getActualTreeRenderer();
-        }
+        } else {
-        else {
             return super.getCellRenderer();
         }
     }
@@ -245,13 +236,13 @@ public class CheckBoxTree extends JTree {
             }
 
             TreePath path = _tree.getPathForLocation(e.getX(), e.getY());
-            if (path == null)
+            if (path == null) {
                 return null;
+            }
 
             if (clicksInCheckBox(e, path)) {
                 return path;
-            }
+            } else {
-            else {
                 return null;
             }
         }
@@ -259,13 +250,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;
                 }
             }
@@ -320,8 +309,9 @@ public class CheckBoxTree extends JTree {
                 return;
             }
 
-            if (e.getModifiers() == 0 && e.getKeyChar() == KeyEvent.VK_SPACE)
+            if (e.getModifiers() == 0 && e.getKeyChar() == KeyEvent.VK_SPACE) {
                 toggleSelections();
+            }
         }
 
         public void keyTyped(KeyEvent e) {
@@ -349,8 +339,7 @@ public class CheckBoxTree extends JTree {
                     selectionModel.removeSelectionPath(path);
                 else
                     selectionModel.addSelectionPath(path);
-            }
+            } finally {
-            finally {
                 if (!selectionModel.isSingleEventMode()) {
                     selectionModel.setBatchMode(false);
                 }
@@ -365,8 +354,8 @@ public class CheckBoxTree extends JTree {
                 return;
             }
             for (int i = 0, length = treePaths.length; i < length; i++) {
-            	TreePath tmpTreePath = treePaths[i];
+                TreePath tmpTreePath = treePaths[i];
-            	toggleSelection(tmpTreePath);
+                toggleSelection(tmpTreePath);
             }
 //            for (TreePath treePath : treePaths) {
 //                toggleSelection(treePath);

designer_base/src/com/fr/design/gui/itree/refreshabletree/UserObjectRefreshJTree.java

@@ -1,5 +1,6 @@
 package com.fr.design.gui.itree.refreshabletree;
 
+import com.fr.common.inputevent.InputEventBaseOnOS;
 import com.fr.general.NameObject;
 import com.fr.design.gui.itree.refreshabletree.loader.ChildrenLoaderFactory;
 import com.fr.general.ComparatorUtils;
@@ -147,7 +148,7 @@ public abstract class UserObjectRefreshJTree<T extends UserObjectOP<?>> extends
 					}
 				}
 				// marks:鼠标在上次选中的paths上，则将上次的paths设为的树的路径,否则将鼠标所在的节点设为选中的节点
-				if (!(e.isShiftDown() || e.isControlDown())) {
+				if (!(e.isShiftDown() || InputEventBaseOnOS.isControlDown(e))) {
 					if (isFind) {
 						setSelectionPaths(oldPaths);
 					} else {

designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxTextAreaDefaultInputMap.java

@@ -34,7 +34,7 @@ public class RSyntaxTextAreaDefaultInputMap extends RTADefaultInputMap {
 	 */
 	public RSyntaxTextAreaDefaultInputMap() {
 
-		int defaultMod = getDefaultModifier();
+		int defaultMod = DEFAULT_MODIFIER;
 		//int ctrl = InputEvent.CTRL_MASK;
 		int shift = InputEvent.SHIFT_MASK;
 		//int alt = InputEvent.ALT_MASK;

designer_base/src/com/fr/design/gui/syntax/ui/rtextarea/RTADefaultInputMap.java

@@ -41,6 +41,14 @@ import javax.swing.text.DefaultEditorKit;
 public class RTADefaultInputMap extends InputMap {
 
 
+	/**
+	 * Returns the default modifier key for a system.  For example, on Windows
+	 * this would be the CTRL key (<code>InputEvent.CTRL_MASK</code>).
+	 *
+	 * @return The default modifier key.
+	 */
+	public static final int DEFAULT_MODIFIER = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
+
 	/**
 	 * Constructs the default input map for an <code>RTextArea</code>.
 	 */
@@ -48,7 +56,7 @@ public class RTADefaultInputMap extends InputMap {
 
 		super();
 
-		int defaultModifier = getDefaultModifier();
+		int defaultModifier = DEFAULT_MODIFIER;
 		//int ctrl = InputEvent.CTRL_MASK;
 		int alt = InputEvent.ALT_MASK;
 		int shift = InputEvent.SHIFT_MASK;
@@ -134,18 +142,4 @@ public class RTADefaultInputMap extends InputMap {
 		*/
 
 	}
-
-
-	/**
-	 * Returns the default modifier key for a system.  For example, on Windows
-	 * this would be the CTRL key (<code>InputEvent.CTRL_MASK</code>).
-	 *
-	 * @return The default modifier key.
-	 */
-	protected static final int getDefaultModifier() {
-		return Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
-	}
-
-
-
 }

designer_base/src/com/fr/design/locale/designer.properties

@@ -1137,7 +1137,7 @@ FRFont-bold=bold
 FR-Designer_Set_Submit_Condition=
 Form-Change_Widget_Name=Change Widget Name
 ReportColumns-Report_Columns=Report Columns
-Can_not_use_FormatBursh=
+FR-Designer_Can_not_use_FormatBursh=
 CellElement-Property_Table=CellElement Property Table
 Dictionary-Dynamic_SQL=Dynamic SQL
 FR-Designer_Form-CheckBoxGroup=CheckBoxGroup
@@ -2005,4 +2005,5 @@ FR-Designer_Templates_Content=Templates Contents
 FR-Designer_AlphaFine_ShowAll=show all
 FR-Designer_AlphaFine_Latest=Latest
 FR-Designer_AlphaFine_ShowLess=show less
-FR-Designer_Alphafine=AlphaFine
+FR-Designer_Alphafine=AlphaFine
+FR-Designer-Alphafine_No_Remind=

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -1138,7 +1138,7 @@ FRFont-bold=Bold
 FR-Designer_Set_Submit_Condition=Submit Condition
 Form-Change_Widget_Name=Change Control Name
 ReportColumns-Report_Columns=Multi-columns/lines display
-Can_not_use_FormatBursh=Can't use format painter in multiple selections
+FR-Designer_Can_not_use_FormatBursh=Can't use format painter in multiple selections
 CellElement-Property_Table=Cell Attribute Table
 Dictionary-Dynamic_SQL=Dynamic SQL
 FR-Designer_Form-CheckBoxGroup=CheckBoxGroup
@@ -2003,4 +2003,5 @@ FR-Designer_Templates_Content=Template'Contents
 FR-Designer_AlphaFine_ShowAll=show all
 FR-Designer_AlphaFine_Latest=Recent
 FR-Designer_AlphaFine_ShowLess=show less
-FR-Designer_Alphafine=AlphaFine
+FR-Designer_Alphafine=AlphaFine
+FR-Designer-Alphafine_No_Remind=don't remind

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -1133,7 +1133,7 @@ FRFont-bold=\u592A\u5B57
 FR-Designer_Set_Submit_Condition=\u63D0\u51FA\u6761\u4EF6\u3092\u8A2D\u5B9A
 Form-Change_Widget_Name=\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u540D\u5909\u66F4
 ReportColumns-Report_Columns=\u5E33\u7968\u30B3\u30E9\u30E0
-Can_not_use_FormatBursh=\u8907\u6570\u9078\u629E\u3057\u305F\u30A8\u30EA\u30A2\u3067\u306F\u66F8\u5F0F\u30D6\u30E9\u30B7\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\!
+FR-Designer_Can_not_use_FormatBursh=\u8907\u6570\u9078\u629E\u3057\u305F\u30A8\u30EA\u30A2\u3067\u306F\u66F8\u5F0F\u30D6\u30E9\u30B7\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\!
 CellElement-Property_Table=\u30BB\u30EB\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u00B7\u30B7\u30FC\u30C8
 Dictionary-Dynamic_SQL=\u52D5\u614BSQL
 FR-Designer_Form-CheckBoxGroup=\u30D5\u30EC\u30FC\u30E0\u30BB\u30C3\u30C8\u3092\u8907\u6570\u9078\u629E

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -1134,7 +1134,7 @@ FRFont-bold=\uAD75\uAC8C
 FR-Designer_Set_Submit_Condition=\uC81C\uCD9C\uC870\uAC74\uC124\uC815
 Form-Change_Widget_Name=\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4\uC774\uB984\uBCC0\uACBD
 ReportColumns-Report_Columns=\uBB38\uC11C\uC140\uB098\uB204\uAE30
-Can_not_use_FormatBursh=\uC911\uBCF5\uC120\uD0DD\uB41C\uC601\uC5ED\uC5D0\uC11C\uC2DD\uC744\uC774\uC6A9\uD558\uC5EC\uC778\uC1C4\uD560\uC218\uC5C6\uC2B5\uB2C8\uB2E4.\!
+FR-Designer_Can_not_use_FormatBursh=\uC911\uBCF5\uC120\uD0DD\uB41C\uC601\uC5ED\uC5D0\uC11C\uC2DD\uC744\uC774\uC6A9\uD558\uC5EC\uC778\uC1C4\uD560\uC218\uC5C6\uC2B5\uB2C8\uB2E4.\!
 CellElement-Property_Table=\uC140\uC18D\uC131\uD45C
 Dictionary-Dynamic_SQL=\uB3D9\uC801 SQL
 FR-Designer_Form-CheckBoxGroup=\uCCB4\uD06C\uBC15\uC2A4\uADF8\uB8F9

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -1133,7 +1133,7 @@ FRFont-bold=\u52A0\u7C97
 FR-Designer_Set_Submit_Condition=\u8BBE\u7F6E\u63D0\u4EA4\u6761\u4EF6
 Form-Change_Widget_Name=\u66F4\u6539\u63A7\u4EF6\u540D
 ReportColumns-Report_Columns=\u62A5\u8868\u5206\u680F
-Can_not_use_FormatBursh=\u4E0D\u80FD\u5BF9\u591A\u91CD\u9009\u5B9A\u533A\u57DF\u4F7F\u7528\u683C\u5F0F\u5237\!
+FR-Designer_Can_not_use_FormatBursh=\u4E0D\u80FD\u5BF9\u591A\u91CD\u9009\u5B9A\u533A\u57DF\u4F7F\u7528\u683C\u5F0F\u5237\!
 CellElement-Property_Table=\u5355\u5143\u683C\u5C5E\u6027\u8868
 Dictionary-Dynamic_SQL=\u52A8\u6001SQL
 FR-Designer_Form-CheckBoxGroup=\u590D\u9009\u6846\u7EC4
@@ -1999,6 +1999,7 @@ FR-Designer_Templates=\u6A21\u677F
 FR-Designer_Templates_Content=\u6A21\u677F\u5185\u5BB9
 FR-Designer_AlphaFine_ShowAll=\u663E\u793A\u5168\u90E8
 FR-Designer_AlphaFine_Conclude=\u731C\u60A8\u9700\u8981
-FR-Designer_AlphaFine_Latest=\u6700\u8FD1\u5E38\u7528
+FR-Designer_AlphaFine_Latest=\u672C\u5730\u5E38\u7528
 FR-Designer_AlphaFine_ShowLess=\u6536\u8D77
-FR-Designer_Alphafine=AlphaFine\u667A\u80FD\u641C\u7D22
+FR-Designer_Alphafine=AlphaFine\u667A\u80FD\u641C\u7D22
+FR-Designer-Alphafine_No_Remind=\u4E0D\u518D\u63D0\u793A

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -1133,7 +1133,7 @@ FRFont-bold=\u7C97\u9AD4
 FR-Designer_Set_Submit_Condition=\u8A2D\u5B9A\u63D0\u4EA4\u689D\u4EF6
 Form-Change_Widget_Name=\u66F4\u6539\u63A7\u5236\u9805\u540D
 ReportColumns-Report_Columns=\u5831\u8868\u5206\u6B04
-Can_not_use_FormatBursh=\u7121\u6CD5\u4F7F\u7528\u8907\u88FD\u683C\u5F0F
+FR-Designer_Can_not_use_FormatBursh=\u7121\u6CD5\u4F7F\u7528\u8907\u88FD\u683C\u5F0F
 CellElement-Property_Table=\u5132\u5B58\u683C\u5C6C\u6027\u8868
 Dictionary-Dynamic_SQL=\u52D5\u614BSQL
 FR-Designer_Form-CheckBoxGroup=\u5FA9\u9078\u6846\u7D44
@@ -1999,4 +1999,5 @@ FR-Designer_Templates_Content=\u6A21\u677F\u5167\u5BB9
 FR-Designer_AlphaFine_Latest=\u6700\u8FD1\u5E38\u7528
 FR-Designer_AlphaFine_ShowLess=\u6536\u8D77
 FR-Designer_Alphafine=AlphaFine\u667A\u80FD\u641C\u7D22
-FR-Designer_AlphaFine_ShowAll=\u986F\u793A\u5168\u90E8
+FR-Designer_AlphaFine_ShowAll=\u986F\u793A\u5168\u90E8
+FR-Designer-Alphafine_No_Remind=\u4E0D\u518D\u63D0\u793A

designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java

@@ -13,10 +13,7 @@ import com.fr.general.LogRecordTime;
 import com.fr.stable.xml.LogRecordTimeProvider;
 
 import javax.swing.*;
-import javax.swing.text.BadLocationException;
+import javax.swing.text.*;
-import javax.swing.text.Document;
-import javax.swing.text.SimpleAttributeSet;
-import javax.swing.text.StyleConstants;
 import java.awt.*;
 import java.awt.event.*;
 import java.text.SimpleDateFormat;
@@ -24,6 +21,8 @@ import java.util.Date;
 import java.util.logging.Handler;
 import java.util.logging.LogRecord;
 
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
+
 public class DesignerLogHandler {
     protected static final int INFO_INT = FRLogLevel.INFO.intValue();
     protected static final int ERRO_INT = FRLogLevel.ERROR.intValue();
@@ -132,8 +131,7 @@ public class DesignerLogHandler {
         private UIMenuItem clear;
 
         private LogHandlerArea() {
-            jTextArea = new JTextPane();
+            jTextArea = initLogJTextArea();
-
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
             UIScrollPane js = new UIScrollPane(jTextArea);
             this.add(js, BorderLayout.CENTER);
@@ -158,9 +156,9 @@ public class DesignerLogHandler {
             clear.setIcon(BaseUtils.readIcon("/com/fr/design/images/log/clear.png"));
             popup.add(clear);
 
-            selectAll.setAccelerator(KeyStroke.getKeyStroke('A', InputEvent.CTRL_MASK));
+            selectAll.setAccelerator(KeyStroke.getKeyStroke('A', DEFAULT_MODIFIER));
-            copy.setAccelerator(KeyStroke.getKeyStroke('C', InputEvent.CTRL_MASK));
+            copy.setAccelerator(KeyStroke.getKeyStroke('C', DEFAULT_MODIFIER));
-            clear.setAccelerator(KeyStroke.getKeyStroke('L', InputEvent.CTRL_MASK));
+            clear.setAccelerator(KeyStroke.getKeyStroke('L', DEFAULT_MODIFIER));
 
             jTextArea.addMouseListener(new MouseAdapter() {
                 // check for right click
@@ -188,6 +186,23 @@ public class DesignerLogHandler {
             });
         }
 
+        private JTextPane initLogJTextArea() {
+            final JTextPane resultPane = new JTextPane();
+            InputMap inputMap = resultPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+            inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER), DefaultEditorKit.copyAction);
+            inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_A, DEFAULT_MODIFIER), DefaultEditorKit.selectAllAction);
+            inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_L, DEFAULT_MODIFIER), "clear");
+            ActionMap actionMap = resultPane.getActionMap();
+            actionMap.put("clear", new AbstractAction() {
+                public void actionPerformed(ActionEvent evt) {
+                    resultPane.setText("");
+                    caption.clearMessage();
+                    DesignerLogImpl.getInstance().clear();
+                }
+            });
+            return resultPane;
+        }
+
         public void printStackTrace(LogRecordTimeProvider logRecordTime) {
             LogRecord logRecord = logRecordTime.getLogRecord();
             Date date = logRecordTime.getDate();
@@ -297,6 +312,4 @@ public class DesignerLogHandler {
         };
 
     }
-
-
 }

designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

@@ -11,7 +11,7 @@ import com.fr.design.actions.UpdateAction;
 import com.fr.design.actions.community.*;
 import com.fr.design.actions.file.*;
 import com.fr.design.actions.help.AboutAction;
-import com.fr.design.actions.help.AlphaFine.AlphafineAction;
+import com.fr.design.actions.help.alphafine.AlphafineAction;
 import com.fr.design.actions.help.TutorialAction;
 import com.fr.design.actions.help.WebDemoAction;
 import com.fr.design.actions.server.*;
@@ -55,8 +55,7 @@ public abstract class ToolBarMenuDock {
     public static final int PANLE_HEIGNT = 26;
     private MenuDef[] menus;
     private ToolBarDef toolBarDef;
-    private ArrayList<UpdateAction> shortCuts;
+    private List<UpdateActionModel> shortCutsList;
-
     /**
      * 更新菜单
      */
@@ -145,27 +144,36 @@ public abstract class ToolBarMenuDock {
         addCommunityMenuDef(menuList);
 
         // 添加全部UpdateAction到actionmanager中
-        getAllUpdateActions(menuList);
+        addAllUpdateActionsToList(menuList);
-        UpdateActionManager.getUpdateActionManager().setUpdateActions(shortCuts);
+        UpdateActionManager.getUpdateActionManager().setUpdateActions(shortCutsList);
 
         return menuList.toArray(new MenuDef[menuList.size()]);
     }
 
-    private List<UpdateAction> getAllUpdateActions(List<MenuDef> menuList) {
+    /**
-        shortCuts = new ArrayList<>();
+     * 获取所有actionmodel
+     * @param menuList
+     */
+    private void addAllUpdateActionsToList(List<MenuDef> menuList) {
+        shortCutsList = new ArrayList<>();
         for (MenuDef menuDef : menuList) {
             addUpdateActionToList(menuDef);
         }
-        return shortCuts;
     }
 
+    /**
+     * 递归获取所有UpdateAction
+     * @param menuDef
+     */
     private void addUpdateActionToList(MenuDef menuDef) {
+
+        String ParentName = menuDef.getName();
         if (menuDef instanceof OpenRecentReportMenuDef) {
             return;
         }
         for (ShortCut shortCut : menuDef.getShortcutList()) {
             if (shortCut instanceof UpdateAction) {
-                shortCuts.add((UpdateAction) shortCut);
+                shortCutsList.add(new UpdateActionModel(ParentName, (UpdateAction) shortCut));
             } else if (shortCut instanceof MenuDef) {
                 addUpdateActionToList((MenuDef) shortCut);
             }

designer_base/src/com/fr/design/mainframe/toolbar/UpdateActionManager.java

@@ -1,7 +1,5 @@
 package com.fr.design.mainframe.toolbar;
 
-import com.fr.design.actions.UpdateAction;
-
 import java.util.List;
 
 /**
@@ -9,7 +7,7 @@ import java.util.List;
  */
 public class UpdateActionManager {
     private static UpdateActionManager updateActionManager = null;
-    private List<UpdateAction> updateActions;
+    private List<UpdateActionModel> updateActions;
 
     public synchronized static UpdateActionManager getUpdateActionManager() {
         if (updateActionManager == null) {
@@ -18,11 +16,11 @@ public class UpdateActionManager {
         return updateActionManager;
     }
 
-    public List<UpdateAction> getUpdateActions() {
+    public List<UpdateActionModel> getUpdateActions() {
         return updateActions;
     }
 
-    public void setUpdateActions(List<UpdateAction> updateActions) {
+    public void setUpdateActions(List<UpdateActionModel> updateActions) {
         this.updateActions = updateActions;
     }
 }

designer_base/src/com/fr/design/mainframe/toolbar/UpdateActionModel.java

@@ -0,0 +1,58 @@
+package com.fr.design.mainframe.toolbar;
+
+import com.fr.design.actions.UpdateAction;
+
+/**
+ * Created by XiaXiang on 2017/5/24.
+ */
+
+/**
+ * action对象
+ */
+public class UpdateActionModel {
+    private String parentName;
+    private String actionName;
+    private UpdateAction action;
+
+    public UpdateActionModel(String parentName, UpdateAction action) {
+        this.parentName = parentName;
+        this.action = action;
+        this.actionName = action.getName();
+    }
+
+    /**
+     * 获取上一层级菜单name
+     * @return
+     */
+    public String getParentName() {
+        return parentName;
+    }
+
+    public void setParentName(String parentName) {
+        this.parentName = parentName;
+    }
+
+    /**
+     * 获取action
+     * @return
+     */
+    public UpdateAction getAction() {
+        return action;
+    }
+
+    public void setAction(UpdateAction action) {
+        this.action = action;
+    }
+
+    /**
+     * 获取actionName
+     * @return
+     */
+    public String getActionName() {
+        return actionName;
+    }
+
+    public void setActionName(String actionName) {
+        this.actionName = actionName;
+    }
+}

designer_base/src/com/fr/design/menu/KeySetUtils.java

@@ -12,6 +12,8 @@ import javax.swing.*;
 import java.awt.event.KeyEvent;
 import java.util.Locale;
 
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
+
 /**
  * Created by IntelliJ IDEA.
  * Author : daisy
@@ -36,7 +38,7 @@ public class KeySetUtils {
 
         @Override
         public KeyStroke getKeyStroke() {
-            return KeyStroke.getKeyStroke(KeyEvent.VK_O, KeyEvent.CTRL_MASK);
+            return KeyStroke.getKeyStroke(KeyEvent.VK_O, DEFAULT_MODIFIER);
         }
     };
 
@@ -71,7 +73,7 @@ public class KeySetUtils {
 
         @Override
         public KeyStroke getKeyStroke() {
-            return KeyStroke.getKeyStroke(KeyEvent.VK_W, KeyEvent.CTRL_MASK);
+            return KeyStroke.getKeyStroke(KeyEvent.VK_W, DEFAULT_MODIFIER);
         }
     };
 
@@ -88,7 +90,7 @@ public class KeySetUtils {
 
         @Override
         public KeyStroke getKeyStroke() {
-            return KeyStroke.getKeyStroke(KeyEvent.VK_S, KeyEvent.CTRL_MASK);
+            return KeyStroke.getKeyStroke(KeyEvent.VK_S, DEFAULT_MODIFIER);
         }
     };
 
@@ -122,7 +124,7 @@ public class KeySetUtils {
 
         @Override
         public KeyStroke getKeyStroke() {
-            return KeyStroke.getKeyStroke(KeyEvent.VK_Z, KeyEvent.CTRL_MASK);
+            return KeyStroke.getKeyStroke(KeyEvent.VK_Z, DEFAULT_MODIFIER);
         }
     };
 
@@ -139,7 +141,7 @@ public class KeySetUtils {
 
         @Override
         public KeyStroke getKeyStroke() {
-            return KeyStroke.getKeyStroke(KeyEvent.VK_Y, KeyEvent.CTRL_MASK);
+            return KeyStroke.getKeyStroke(KeyEvent.VK_Y, DEFAULT_MODIFIER);
         }
     };
 
@@ -156,7 +158,7 @@ public class KeySetUtils {
 
         @Override
         public KeyStroke getKeyStroke() {
-            return KeyStroke.getKeyStroke(KeyEvent.VK_E, KeyEvent.CTRL_MASK);
+            return KeyStroke.getKeyStroke(KeyEvent.VK_E, DEFAULT_MODIFIER);
         }
     };
 
@@ -353,7 +355,7 @@ public class KeySetUtils {
 
         @Override
         public KeyStroke getKeyStroke() {
-            return KeyStroke.getKeyStroke(KeyEvent.VK_M, KeyEvent.CTRL_MASK);
+            return KeyStroke.getKeyStroke(KeyEvent.VK_M, DEFAULT_MODIFIER);
         }
     };
 
@@ -370,7 +372,7 @@ public class KeySetUtils {
 
         @Override
         public KeyStroke getKeyStroke() {
-            return KeyStroke.getKeyStroke(KeyEvent.VK_E, KeyEvent.CTRL_MASK);
+            return KeyStroke.getKeyStroke(KeyEvent.VK_E, DEFAULT_MODIFIER);
         }
     };
 
@@ -387,7 +389,7 @@ public class KeySetUtils {
 
         @Override
         public KeyStroke getKeyStroke() {
-            return KeyStroke.getKeyStroke(KeyEvent.VK_E, KeyEvent.CTRL_MASK);
+            return KeyStroke.getKeyStroke(KeyEvent.VK_E, DEFAULT_MODIFIER);
         }
     };
 

designer_base/src/com/fr/design/roleAuthority/UIRoleTreeUI.java

@@ -1,5 +1,6 @@
 package com.fr.design.roleAuthority;
 
+import com.fr.common.inputevent.InputEventBaseOnOS;
 import com.fr.design.gui.itree.UITreeUI;
 
 import javax.swing.tree.TreePath;
@@ -15,7 +16,7 @@ import java.awt.event.MouseEvent;
 public class UIRoleTreeUI extends UITreeUI {
 
     protected void selectPathForEvent(TreePath path, MouseEvent event) {    /* Adjust from the anchor point. */
-        if (event.isControlDown() && tree.isPathSelected(path)) {
+        if (InputEventBaseOnOS.isControlDown(event) && tree.isPathSelected(path)) {
             tree.removeSelectionPath(path);
         } else if (event.isShiftDown()) {
             tree.setAnchorSelectionPath(null);

designer_chart/build.9.0.gradle

@@ -1,8 +1,28 @@
-
-apply plugin: 'java'
 tasks.withType(JavaCompile){
 	options.encoding = 'UTF-8'
 }
+buildscript {
+    repositories {
+        maven {
+            url "https://maven.eveoh.nl/content/repositories/releases"
+        }
+    }
+
+    dependencies {
+        classpath "nl.eveoh:gradle-aspectj:1.6"
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
+project.ext {
+    aspectjVersion = '1.8.4'
+}
+
+apply plugin: 'aspectj'
+
 //指定构建的jdk版本
 sourceCompatibility=1.7
 //指定生成jar包版本

designer_chart/build.9.0.gradle.bak

@@ -0,0 +1,69 @@
+
+apply plugin: 'java'
+tasks.withType(JavaCompile){
+	options.encoding = 'UTF-8'
+}
+//指定构建的jdk版本
+sourceCompatibility=1.7
+//指定生成jar包版本
+version='8.0'
+//生成jar包重命名
+jar{
+	baseName='fr-designer-chart'
+}
+
+
+def srcDir="."
+def baseDir=".."
+
+//指定源码路径
+sourceSets{
+	main{
+		java{
+			srcDirs=["${srcDir}/src"]
+		}
+	}
+}
+//获取什么分支名
+FileTree files =fileTree(dir:'./',include:'build.*.gradle')
+def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
+buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\'))
+def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
+
+//声明外部依赖
+dependencies{
+	compile fileTree(dir:"../${baseDir}/lib",include:'**/*.jar')
+	compile fileTree(dir:"../${baseDir}",include:"**/build/libs/*.jar",exclude:"bi/**/*.jar")
+ 	testCompile 'junit:junit:4.12'
+}
+//复制非.java文件到classes文件夹下参与打包
+task copyFile(type:Copy,dependsOn:compileJava){
+	copy{
+		from ("${srcDir}/src"){
+			exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
+		}
+		into 'build/classes/main'
+	}
+
+}
+
+
+//压缩项目中的js文件
+task compressJS{
+	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
+		classpath {
+			fileset(dir:"../${baseDir}/lib4build",includes:'**/*.jar')
+		}
+	}
+	ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
+		fileset (dir:"${srcDir}/src"){
+			include (name:'**/*.js')
+			include (name:'**/*.css')
+		}
+
+	}
+}
+jar.dependsOn compressJS
+
+
+

designer_chart/src/com/fr/aspectj/designerchart/TemplateProcessTracker.aj

@@ -32,19 +32,19 @@ public aspect TemplateProcessTracker {
 
         //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
     }
     //同上
     before(ActionEvent e) : onActionPerformed(e) {
         SourceLocation sl = thisJoinPoint.getSourceLocation();
         // !within(LogHandlerBar) 没用, 手动过滤
-        if (e.getSource().toString().contains("javax.swing.Timer")) {
+        if (e != null && e.getSource().toString().contains("javax.swing.Timer")) {
             return;
         }
 
         //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
 
     }
     //同上
@@ -52,7 +52,7 @@ public aspect TemplateProcessTracker {
         SourceLocation sl = thisJoinPoint.getSourceLocation();
         //String log = String.format("%s:\n%s\n插入新图表：%s\n\n", new Date(), sl, c.getChartName());
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
 
     }
 

designer_form/build.9.0.gradle

@@ -1,8 +1,29 @@
 
-apply plugin: 'java'
 tasks.withType(JavaCompile){
 	options.encoding = 'UTF-8'
 }
+buildscript {
+    repositories {
+        maven {
+            url "https://maven.eveoh.nl/content/repositories/releases"
+        }
+    }
+
+    dependencies {
+        classpath "nl.eveoh:gradle-aspectj:1.6"
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
+project.ext {
+    aspectjVersion = '1.8.4'
+}
+
+apply plugin: 'aspectj'
+
 //指定构建的jdk版本
 sourceCompatibility=1.7
 //指定生成jar包版本
@@ -38,11 +59,20 @@ dependencies{
  	testCompile 'junit:junit:4.12'
 }
 //复制非.java文件到classes文件夹下参与打包
+
+//指明无法编译文件所在路径
+def dataContent ={def dir ->
+		copySpec{
+			from ("${dir}"){
+				exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
+			}
+		}
+}
+
 task copyFile(type:Copy,dependsOn:compileJava){
 	copy{
-		from ("${srcDir}/src"){
+		with dataContent.call("${srcDir}/src") 
-			exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
+		with dataContent.call("${srcDir}/../designer/src") 
-		}
 		into 'build/classes/main'
 	}
 
@@ -61,6 +91,10 @@ task compressJS{
 			include (name:'**/*.js')
 			include (name:'**/*.css')
 		}
+		fileset (dir:"${srcDir}/../designer/src"){
+			include (name:'**/*.js')
+			include (name:'**/*.css')
+		}
 
 	}
 }

designer_form/build.9.0.gradle.bak

@@ -0,0 +1,83 @@
+
+apply plugin: 'java'
+tasks.withType(JavaCompile){
+	options.encoding = 'UTF-8'
+}
+//指定构建的jdk版本
+sourceCompatibility=1.7
+//指定生成jar包版本
+version='8.0'
+//生成jar包重命名
+jar{
+	baseName='fr-designer-report'
+}
+
+
+def srcDir="."
+def baseDir=".."
+
+//指定源码路径
+sourceSets{
+	main{
+		java{
+			srcDirs=["${srcDir}/src",
+				"${srcDir}/../designer/src"]
+		}
+	}
+}
+//获取什么分支名
+FileTree files =fileTree(dir:'./',include:'build.*.gradle')
+def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
+buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\'))
+def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
+
+//声明外部依赖
+dependencies{
+	compile fileTree(dir:"../${baseDir}/lib",include:'**/*.jar')
+	compile fileTree(dir:"../${baseDir}",include:"**/build/libs/*.jar",exclude:"bi/**/*.jar")
+ 	testCompile 'junit:junit:4.12'
+}
+//复制非.java文件到classes文件夹下参与打包
+
+//指明无法编译文件所在路径
+def dataContent ={def dir ->
+		copySpec{
+			from ("${dir}"){
+				exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
+			}
+		}
+}
+
+task copyFile(type:Copy,dependsOn:compileJava){
+	copy{
+		with dataContent.call("${srcDir}/src") 
+		with dataContent.call("${srcDir}/../designer/src") 
+		into 'build/classes/main'
+	}
+
+}
+
+
+//压缩项目中的js文件
+task compressJS{
+	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
+		classpath {
+			fileset(dir:"../${baseDir}/lib4build",includes:'**/*.jar')
+		}
+	}
+	ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
+		fileset (dir:"${srcDir}/src"){
+			include (name:'**/*.js')
+			include (name:'**/*.css')
+		}
+		fileset (dir:"${srcDir}/../designer/src"){
+			include (name:'**/*.js')
+			include (name:'**/*.css')
+		}
+
+	}
+}
+jar.dependsOn compressJS
+
+
+

designer_form/src/com/fr/aspectj/designerform/TemplateProcessTracker.aj

@@ -30,19 +30,19 @@ public aspect TemplateProcessTracker {
 
         //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
     }
     //同上
     before(ActionEvent e) : onActionPerformed(e) {
         SourceLocation sl = thisJoinPoint.getSourceLocation();
         // !within(LogHandlerBar) 没用, 手动过滤
-        if (e.getSource().toString().contains("javax.swing.Timer")) {
+        if (e != null && e.getSource().toString().contains("javax.swing.Timer")) {
             return;
         }
 
         //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
 
     }
     //同上
@@ -51,7 +51,7 @@ public aspect TemplateProcessTracker {
 
         //String log = String.format("%s:\n%s\nset value: %s at (%d, %d)\n\n", new Date(), sl, v, r, c);
         String log = "";
-        TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
 
     }
 

designer_form/src/com/fr/design/designer/beans/actions/CopyAction.java

@@ -8,6 +8,8 @@ import javax.swing.*;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
+
 public class CopyAction extends FormEditAction {
 
     public CopyAction(FormDesigner t) {
@@ -15,7 +17,7 @@ public class CopyAction extends FormEditAction {
         this.setName(Inter.getLocText("M_Edit-Copy"));
         this.setMnemonic('C');
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/copy.png"));
-        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK));
+        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER));
     }
 
     @Override

designer_form/src/com/fr/design/designer/beans/actions/CutAction.java

@@ -9,6 +9,8 @@ import com.fr.base.BaseUtils;
 import com.fr.general.Inter;
 import com.fr.design.mainframe.FormDesigner;
 
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
+
 public class CutAction extends FormEditAction {
 
 	public CutAction(FormDesigner t) {
@@ -16,7 +18,7 @@ public class CutAction extends FormEditAction {
 		this.setName(Inter.getLocText("M_Edit-Cut"));
 		this.setMnemonic('T');
 		this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/cut.png"));
-		this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, InputEvent.CTRL_MASK));
+		this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER));
 	}
 
 	@Override

designer_form/src/com/fr/design/designer/beans/actions/PasteAction.java

@@ -9,6 +9,8 @@ import com.fr.base.BaseUtils;
 import com.fr.general.Inter;
 import com.fr.design.mainframe.FormDesigner;
 
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
+
 public class PasteAction extends FormEditAction {
 
 	public PasteAction(FormDesigner t) {
@@ -16,7 +18,7 @@ public class PasteAction extends FormEditAction {
 		this.setName(Inter.getLocText("M_Edit-Paste"));
 		this.setMnemonic('P');
 		this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/paste.png"));
-		this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_MASK));
+		this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER));
 	}
 
 	@Override

designer_form/src/com/fr/design/designer/beans/models/SelectionModel.java

@@ -1,5 +1,6 @@
 package com.fr.design.designer.beans.models;
 
+import com.fr.common.inputevent.InputEventBaseOnOS;
 import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.beans.events.DesignerEvent;
@@ -61,7 +62,7 @@ public class SelectionModel {
      * @param e 鼠标事件
      */
     public void selectACreatorAtMouseEvent(MouseEvent e) {
-        if (!e.isControlDown() && !e.isShiftDown()) {
+        if (!InputEventBaseOnOS.isControlDown(e) && !e.isShiftDown()) {
             // 如果Ctrl或者Shift键盘没有按下，则清除已经选择的组件
             selection.reset();
         }
@@ -372,7 +373,7 @@ public class SelectionModel {
 
     public Direction getDirectionAt(MouseEvent e) {
         Direction dir;
-        if (e.isControlDown() || e.isShiftDown()) {
+        if (InputEventBaseOnOS.isControlDown(e) || e.isShiftDown()) {
             XCreator creator = designer.getComponentAt(e.getX(), e.getY(), selection.getSelectedCreators());
             if (creator != designer.getRootComponent() && selection.addedable(creator)) {
                 return Location.add;

designer_form/src/com/fr/design/mainframe/actions/NewFormAction.java

@@ -14,6 +14,8 @@ import java.awt.event.ActionEvent;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
+
 public class NewFormAction extends UpdateAction {
 
     public NewFormAction() {
@@ -48,7 +50,7 @@ public class NewFormAction extends UpdateAction {
 
         @Override
         public KeyStroke getKeyStroke() {
-            return KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_MASK);
+            return KeyStroke.getKeyStroke(KeyEvent.VK_F, DEFAULT_MODIFIER);
         }
     };
 }

designer_form/src/com/fr/design/mainframe/widget/editors/DataTableConfigPane.java

@@ -21,250 +21,255 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
+
 public class DataTableConfigPane extends JComponent implements PropertyChangeListener {
 
-	private DataEditingTable table;
+    private DataEditingTable table;
-
+
-	public DataTableConfigPane() {
+    public DataTableConfigPane() {
-		table = new DataEditingTable();
+        table = new DataEditingTable();
-		JScrollPane scrollPane = new JScrollPane(table);
+        JScrollPane scrollPane = new JScrollPane(table);
-		this.setLayout(new DataTableLayout());
+        this.setLayout(new DataTableLayout());
-		this.add(scrollPane, BorderLayout.CENTER);
+        this.add(scrollPane, BorderLayout.CENTER);
-	}
+    }
-
+
-	public void populate(DataTableConfig config) {
+    public void populate(DataTableConfig config) {
-		table.populate(config);
+        table.populate(config);
-	}
+    }
-
+
-	public DataTableConfig update() {
+    public DataTableConfig update() {
-		return table.update();
+        return table.update();
-	}
+    }
-
+
-	class DataTableLayout extends BorderLayout {
+    class DataTableLayout extends BorderLayout {
-		public void layoutContainer(Container target) {
+        public void layoutContainer(Container target) {
-			super.layoutContainer(target);
+            super.layoutContainer(target);
-			table.doLayout();
+            table.doLayout();
-		}
+        }
-	}
+    }
-
+
-	class DataEditingTable extends JTable {
+    class DataEditingTable extends JTable {
-
+
-		private DataTableConfig config;
+        private DataTableConfig config;
-		private BeanTableModel model;
+        private BeanTableModel model;
-		private TableColumnModelListener modeListener;
+        private TableColumnModelListener modeListener;
-
+
-		public DataEditingTable() {
+        public DataEditingTable() {
-			this.setBorder(BorderFactory.createLineBorder(new Color(210, 210, 210), 1));
+            this.setBorder(BorderFactory.createLineBorder(new Color(210, 210, 210), 1));
-			this.setColumnSelectionAllowed(true);
+            this.setColumnSelectionAllowed(true);
-			this.setRowSelectionAllowed(true);
+            this.setRowSelectionAllowed(true);
-			MouseAdapterListener l = new MouseAdapterListener(this);
+            MouseAdapterListener l = new MouseAdapterListener(this);
-			this.addMouseListener(l);
+            this.addMouseListener(l);
-			this.addMouseMotionListener(l);
+            this.addMouseMotionListener(l);
-			model = new BeanTableModel();
+            model = new BeanTableModel();
-			modeListener = new TableColumnModelListener() {
+            modeListener = new TableColumnModelListener() {
-
+
-				@Override
+                @Override
-				public void columnAdded(TableColumnModelEvent e) {
+                public void columnAdded(TableColumnModelEvent e) {
-
+
-				}
+                }
-
+
-				@Override
+                @Override
-				public void columnMarginChanged(ChangeEvent e) {
+                public void columnMarginChanged(ChangeEvent e) {
-					DataTableConfigPane.this.propertyChange();
+                    DataTableConfigPane.this.propertyChange();
-				}
+                }
-
+
-				@Override
+                @Override
-				public void columnMoved(TableColumnModelEvent e) {
+                public void columnMoved(TableColumnModelEvent e) {
-					DataTableConfigPane.this.propertyChange();
+                    DataTableConfigPane.this.propertyChange();
-				}
+                }
-
+
-				@Override
+                @Override
-				public void columnRemoved(TableColumnModelEvent e) {
+                public void columnRemoved(TableColumnModelEvent e) {
-
+
-				}
+                }
-
+
-				@Override
+                @Override
-				public void columnSelectionChanged(ListSelectionEvent e) {
+                public void columnSelectionChanged(ListSelectionEvent e) {
-
+
-				}
+                }
-
+
-			};
+            };
-		}
+        }
-
+
-		public TableCellRenderer getCellRenderer(int row, int column) {
+        public TableCellRenderer getCellRenderer(int row, int column) {
-			TableCellRenderer renderer = super.getCellRenderer(row, column);
+            TableCellRenderer renderer = super.getCellRenderer(row, column);
-			if (renderer instanceof UILabel) {
+            if (renderer instanceof UILabel) {
-				((UILabel) renderer).setHorizontalAlignment(UILabel.CENTER);
+                ((UILabel) renderer).setHorizontalAlignment(UILabel.CENTER);
-			}
+            }
-			return renderer;
+            return renderer;
-		}
+        }
-
+
-		public void populate(DataTableConfig config) {
+        public void populate(DataTableConfig config) {
-			this.getTableHeader().getColumnModel().removeColumnModelListener(modeListener);
+            this.getTableHeader().getColumnModel().removeColumnModelListener(modeListener);
-			if (config == null) {
+            if (config == null) {
-				config = DataTableConfig.DEFAULT_TABLE_DATA_CONFIG;
+                config = DataTableConfig.DEFAULT_TABLE_DATA_CONFIG;
-			}
+            }
-			this.config = config;
+            this.config = config;
-
+
-			model = new BeanTableModel();
+            model = new BeanTableModel();
-			this.setModel(model);
+            this.setModel(model);
-			this.setRowHeight(0, config.getRowHeight());
+            this.setRowHeight(0, config.getRowHeight());
-			for (int i = 0; i < config.getColumnCount(); i++) {
+            for (int i = 0; i < config.getColumnCount(); i++) {
-				this.getColumn(this.getColumnName(i)).setPreferredWidth(config.getColumnWidth(i));
+                this.getColumn(this.getColumnName(i)).setPreferredWidth(config.getColumnWidth(i));
-			}
+            }
-			this.getTableHeader().getColumnModel().addColumnModelListener(modeListener);
+            this.getTableHeader().getColumnModel().addColumnModelListener(modeListener);
-			this.doLayout();
+            this.doLayout();
-			this.repaint();
+            this.repaint();
-		}
+        }
-
+
-		public DataTableConfig update() {
+        public DataTableConfig update() {
-			config.setRowHeight(this.getRowHeight(0));
+            config.setRowHeight(this.getRowHeight(0));
-			model = new BeanTableModel();
+            model = new BeanTableModel();
-			String[] columns = new String[this.getColumnCount()];
+            String[] columns = new String[this.getColumnCount()];
-			for (int i = 0; i < this.getColumnCount(); i++) {
+            for (int i = 0; i < this.getColumnCount(); i++) {
-				config.setColumnWidth(i, this.getColumn(this.getColumnName(i)).getWidth());
+                config.setColumnWidth(i, this.getColumn(this.getColumnName(i)).getWidth());
-				columns[i] = this.getColumnName(i);
+                columns[i] = this.getColumnName(i);
-			}
+            }
-
+
-			config.setColumns(columns);
+            config.setColumns(columns);
-			return config;
+            return config;
-		}
+        }
-
+
-		public class BeanTableModel extends AbstractTableModel {
+        public class BeanTableModel extends AbstractTableModel {
-
+
-			@Override
+            @Override
-			public int getColumnCount() {
+            public int getColumnCount() {
-				return config.getColumnCount();
+                return config.getColumnCount();
-			}
+            }
-
+
-			@Override
+            @Override
-			public int getRowCount() {
+            public int getRowCount() {
-				return 1;
+                return 1;
-			}
+            }
-
+
-			@Override
+            @Override
-			public String getColumnName(int column) {
+            public String getColumnName(int column) {
-				return config.getColumnName(column);
+                return config.getColumnName(column);
-			}
+            }
-
+
-			@Override
+            @Override
-			public Object getValueAt(int rowIndex, int columnIndex) {
+            public Object getValueAt(int rowIndex, int columnIndex) {
-				return config.getTableDataName() + "." + config.getColumnName(columnIndex);
+                return config.getTableDataName() + "." + config.getColumnName(columnIndex);
-			}
+            }
-
+
-		}
+        }
-
+
-		class MouseAdapterListener extends MouseAdapter {
+        class MouseAdapterListener extends MouseAdapter {
-			private JTable table;
+            private final static int DIS = 30;
-			int oldY = 0;
+            private final static int SMALL_DIS = 3;
-			int newY = 0;
+            private JTable table;
-			int row = 0;
+            int oldY = 0;
-			int oldHeight = 0;
+            int newY = 0;
-			boolean drag = false;
+            int row = 0;
-			int increase = 0;
+            int oldHeight = 0;
-			JPopupMenu popupMenu;
+            boolean drag = false;
-
+            int increase = 0;
-			public MouseAdapterListener(JTable table) {
+            JPopupMenu popupMenu;
-				this.table = table;
+
-				popupMenu = new JPopupMenu();
+            public MouseAdapterListener(JTable table) {
-
+                this.table = table;
-				popupMenu.add(new CutAction());
+                popupMenu = new JPopupMenu();
-				popupMenu.add(new CutAction());
+
-				popupMenu.add(new CutAction());
+                popupMenu.add(new CutAction());
-				popupMenu.add(new CutAction());
+                popupMenu.add(new CutAction());
-			}
+                popupMenu.add(new CutAction());
-
+                popupMenu.add(new CutAction());
-			class CutAction extends UpdateAction {
+            }
-
+
-				/**
+            class CutAction extends UpdateAction {
-				 * Constructor
+
-				 */
+                /**
-				public CutAction() {
+                 * Constructor
-					this.setName(Inter.getLocText("M_Edit-Cut"));
+                 */
-					this.setMnemonic('T');
+                public CutAction() {
-					this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/cut.png"));
+                    this.setName(Inter.getLocText("M_Edit-Cut"));
-					this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, KeyEvent.CTRL_MASK));
+                    this.setMnemonic('T');
-				}
+                    this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/cut.png"));
-
+                    this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER));
-				@Override
+                }
-				public void actionPerformed(ActionEvent e) {
+
-					int row = table.getSelectedRow();
+                @Override
-					int column = table.getSelectedColumn();
+                public void actionPerformed(ActionEvent e) {
-					table.getColumnModel().removeColumn(table.getColumn(table.getColumnName(column)));
+                    int row = table.getSelectedRow();
-					DataTableConfigPane.this.propertyChange();
+                    int column = table.getSelectedColumn();
-				}
+                    table.getColumnModel().removeColumn(table.getColumn(table.getColumnName(column)));
-			}
+                    DataTableConfigPane.this.propertyChange();
-
+                }
-			public void mouseMoved(MouseEvent e) {
+            }
-				int onRow = table.rowAtPoint(e.getPoint());
+
-
+            public void mouseMoved(MouseEvent e) {
-				int height = 0;
+                int onRow = table.rowAtPoint(e.getPoint());
-				for (int i = 0; i <= onRow; i++) {
+
-					height = height + table.getRowHeight(i);
+                int height = 0;
-				}
+                for (int i = 0; i <= onRow; i++) {
-
+                    height = height + table.getRowHeight(i);
-				if (height - e.getY() < 3) {
+                }
-					drag = true;
+
-					table.setCursor(new Cursor(Cursor.N_RESIZE_CURSOR));
+                if (height - e.getY() < SMALL_DIS) {
-				} else {
+                    drag = true;
-					drag = false;
+                    table.setCursor(new Cursor(Cursor.N_RESIZE_CURSOR));
-					table.setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
+                } else {
-				}
+                    drag = false;
-
+                    table.setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
-			}
+                }
-
+
-			private void trigger_popup(MouseEvent e) {
+            }
-
+
-				popupMenu.show(table, e.getX(), e.getY());
+            private void trigger_popup(MouseEvent e) {
-			}
+
-
+                popupMenu.show(table, e.getX(), e.getY());
-			public void mouseDragged(MouseEvent e) {
+            }
-				if (drag) {
+
-					int value = oldHeight + e.getY() - oldY;
+            public void mouseDragged(MouseEvent e) {
-					if (value < 30)
+                if (drag) {
-						table.setRowHeight(row, 30);
+                    int value = oldHeight + e.getY() - oldY;
-					else
+                    if (value < DIS) {
-						table.setRowHeight(row, oldHeight + e.getY() - oldY);
+                        table.setRowHeight(row, DIS);
-					DataTableConfigPane.this.propertyChange();
+                    } else {
-				}
+                        table.setRowHeight(row, oldHeight + e.getY() - oldY);
-			}
+                    }
-
+                    DataTableConfigPane.this.propertyChange();
-			public void mousePressed(MouseEvent e) {
+                }
-				oldY = e.getY();
+            }
-				row = table.rowAtPoint(e.getPoint());
+
-				oldHeight = table.getRowHeight(row);
+            public void mousePressed(MouseEvent e) {
-				if (e.getButton() == MouseEvent.BUTTON3) {
+                oldY = e.getY();
-					trigger_popup(e);
+                row = table.rowAtPoint(e.getPoint());
-				}
+                oldHeight = table.getRowHeight(row);
-			}
+                if (e.getButton() == MouseEvent.BUTTON3) {
-
+                    trigger_popup(e);
-			public void mouseReleased(MouseEvent e) {
+                }
-				newY = e.getY();
+            }
-				table.setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
+
-			}
+            public void mouseReleased(MouseEvent e) {
-		}
+                newY = e.getY();
-	}
+                table.setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
-
+            }
-	private ArrayList<PropertyChangeListener> changetList = new ArrayList<PropertyChangeListener>();
+        }
-
+    }
-	public void addpropertyChangeListener(PropertyChangeListener l) {
+
-		changetList.add(l);
+    private ArrayList<PropertyChangeListener> changetList = new ArrayList<PropertyChangeListener>();
-	}
+
-
+    public void addpropertyChangeListener(PropertyChangeListener l) {
-	@Override
+        changetList.add(l);
-	public void propertyChange() {
+    }
-		for (PropertyChangeListener l : changetList) {
+
-			l.propertyChange();
+    @Override
-		}
+    public void propertyChange() {
-	}
+        for (PropertyChangeListener l : changetList) {
+            l.propertyChange();
+        }
+    }
 
     @Override
     public void propertyChange(Object mark) {
 
     }
 
-	@Override
+    @Override
-	public void propertyChange(Object[] marks) {
+    public void propertyChange(Object[] marks) {
 
-	}
+    }
 }