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,10 +36,12 @@ 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) {

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 {
+            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,8 +30,9 @@ public class RecommendSearchManager implements AlphaFineSearchProcessor {
     }
     @Override
     public synchronized SearchResult getLessSearchResult(String searchText) {
-        String result;
         this.modelList = new SearchResult();
+        if (DesignerEnvManager.getEnvManager().getAlphafineConfigManager().isContainRecommend()) {
+            String result;
             HttpClient httpClient = new HttpClient(SEARCHAPI + CodeUtils.cjkEncode(searchText));
             httpClient.asGet();
             httpClient.setTimeout(5000);
@@ -53,11 +55,13 @@ public class RecommendSearchManager implements AlphaFineSearchProcessor {
                 }
 
             } catch (JSONException e) {
-            FRLogger.getLogger().error(e.getMessage());
+                FRLogger.getLogger().error("data transform error! :" + e.getMessage());
             }
             if (modelList.size() > 0) {
                 modelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_AlphaFine_Conclude"), false));
             }
+        }
+
         return modelList;
     }
 

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

@@ -1,22 +1,23 @@
 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 static final int DELAY = 32;
     private Grid grid;
     // Keypressed last time
     private long keyPressedLastTime = 0;
@@ -30,8 +31,7 @@ public class GridKeyListener implements KeyListener {
         if (!grid.isEnabled() || evt.isConsumed()) {// 如果用户在自己的KyeListener里面consume了.就不执行下面的代码了.
             return;
         }
-		KeyEvent newEvt = KeyEventWork.processKeyEvent(evt);
+        if (KeyEventWork.processKeyEvent(evt) == null) {
-		if (newEvt == null) {
             return;
         }
         long systemCurrentTime = System.currentTimeMillis();
@@ -46,17 +46,14 @@ public class GridKeyListener implements KeyListener {
                 keyPressedLastTime = systemCurrentTime;
             }
             dealWithFloatSelection(reportPane, code);
-
         } else {
-			if (systemCurrentTime - keyPressedLastTime <= 32) {
+            if (systemCurrentTime - keyPressedLastTime <= DELAY) {
                 return;
             } else {
                 keyPressedLastTime = systemCurrentTime;
             }
             dealWithCellSelection(evt, code);
-
         }
-
         switch (code) {
             case KeyEvent.VK_PAGE_UP: {// page up
                 reportPane.getVerticalScrollBar().setValue(Math.max(0, grid.getVerticalValue() - grid.getVerticalExtent()));
@@ -70,14 +67,12 @@ public class GridKeyListener implements KeyListener {
             }
             // Richie:Ctrl + A全选单元格
             case KeyEvent.VK_A:
-			if (code == KeyEvent.VK_A && evt.isControlDown()) {
+                if (InputEventBaseOnOS.isControlDown(evt)) {
                     reportPane.setSelection(new CellSelection(0, 0, report.getColumnCount(), report.getRowCount()));
-				isNeedRepaint = true;
                 }
                 isNeedRepaint = true;
                 break;
         }
-
         if (isNeedRepaint) {
             reportPane.repaint();
         }
@@ -166,7 +161,7 @@ public class GridKeyListener implements KeyListener {
             return;
         }
         KeyEvent newEvt = KeyEventWork.processKeyEvent(evt);
-		if (newEvt == null || evt.isControlDown()) {// uneditable.
+        if (newEvt == null || InputEventBaseOnOS.isControlDown(evt)) {// uneditable.
             return;
         }
         char ch = evt.getKeyChar();
@@ -187,8 +182,7 @@ public class GridKeyListener implements KeyListener {
 
                 if (grid.getCellEditor() != null && grid.editorComponent != null) {
                     if (IS_NUM_PAD_KEY(code)) {
-						// 103 - 55 = 48, 小键盘和大键盘数字的差值 48
+                        KeyEvent ke = new KeyEvent(grid, KeyEvent.KEY_PRESSED, 0, 0, code - DIFF, ch);
-						KeyEvent ke = new KeyEvent(grid, KeyEvent.KEY_PRESSED, 0, 0, code - 48, ch);
                         grid.editorComponent.dispatchEvent(ke);
                         ke.consume();
                     } else {
@@ -200,8 +194,10 @@ public class GridKeyListener implements KeyListener {
             }
         }
     }
+
     /**
      * 小键盘
+     *
      * @param code
      * @return
      */

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

@@ -1,26 +1,14 @@
 package com.fr.grid;
 
-import java.awt.Cursor;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionListener;
-import java.awt.event.MouseWheelEvent;
-import java.awt.event.MouseWheelListener;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.JPopupMenu;
-import javax.swing.SwingUtilities;
-
 import com.fr.base.BaseUtils;
 import com.fr.base.DynamicUnitList;
 import com.fr.base.ScreenResolution;
+import com.fr.common.inputevent.InputEventBaseOnOS;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.present.CellWriteAttrPane;
+import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.grid.selection.CellSelection;
 import com.fr.grid.selection.FloatSelection;
 import com.fr.grid.selection.Selection;
@@ -37,7 +25,12 @@ import com.fr.stable.ColumnRow;
 import com.fr.stable.StringUtils;
 import com.fr.stable.unit.FU;
 import com.fr.stable.unit.OLDPIX;
-import com.fr.design.utils.gui.GUICoreUtils;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.*;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * the MouseListener of the Grid
@@ -172,7 +165,7 @@ public class GridMouseAdapter implements MouseListener, MouseWheelListener, Mous
         ElementCasePane reportPane = grid.getElementCasePane();
         TemplateElementCase report = reportPane.getEditingElementCase();
         boolean isShiftDown = evt.isShiftDown();
-		boolean isControlDown = evt.isControlDown();
+        boolean isControlDown = InputEventBaseOnOS.isControlDown(evt);
         int clickCount = evt.getClickCount();
         // peter:需要判断是否在可移动CellSelection的区域
         grid.setDragType(isMoveCellSelection(this.oldEvtX, this.oldEvtY));
@@ -344,7 +337,7 @@ public class GridMouseAdapter implements MouseListener, MouseWheelListener, Mous
             return;
         }
 
-		boolean isControlDown = evt.isControlDown();
+        boolean isControlDown = InputEventBaseOnOS.isControlDown(evt);
 
         long systemCurrentTime = System.currentTimeMillis();
         if (systemCurrentTime - lastMouseMoveTime <= DRAG_REFRESH_TIME) {// alex:Drag

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,12 +5,10 @@ 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，匹配你需要的方法
@@ -32,28 +30,28 @@ 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);
 
     }
     //同上
     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/AutoCompletion.java

@@ -8,26 +8,28 @@
  */
 package com.fr.design.gui.autocomplete;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.List;
 import javax.swing.*;
 import javax.swing.event.CaretEvent;
 import javax.swing.event.CaretListener;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import javax.swing.text.*;
+import java.awt.*;
+import java.awt.event.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.List;
+
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
 
 
 /**
  * Adds auto-completion to a text component.  Provides a popup window with a
  * list of auto-complete choices on a given keystroke, such as Crtrl+Space.<p>
- *
+ * <p>
  * Depending on the {@link CompletionProvider} installed, the following
  * auto-completion features may be enabled:
- * 
+ * <p>
  * <ul>
  * <li>An auto-complete choices list made visible via e.g. Ctrl+Space</li>
  * <li>A "description" window displayed alongside the choices list that
@@ -212,7 +214,7 @@ public class AutoCompletion {
      * Stores how to render auto-completion-specific highlights in text
      * components.
      */
-	private static final AutoCompletionStyleContext styleContext =
+    private static final AutoCompletionStyleContext STYLE_CONTEXT =
             new AutoCompletionStyleContext();
 
     /**
@@ -275,7 +277,7 @@ public class AutoCompletion {
      * @return Whether to auto-complete single choices.
      * @see #setAutoCompleteSingleChoices(boolean)
      */
-	public boolean getAutoCompleteSingleChoices() {
+    public boolean isAutoCompleteSingleChoices() {
         return autoCompleteSingleChoices;
     }
 
@@ -295,7 +297,7 @@ public class AutoCompletion {
      *
      * @return Whether debug is enabled.
      */
-	static boolean getDebug() {
+    static boolean isDebug() {
         return DEBUG;
     }
 
@@ -308,8 +310,7 @@ public class AutoCompletion {
      */
     public static KeyStroke getDefaultTriggerKey() {
         // Default to CTRL, even on Mac, since Ctrl+Space activates Spotlight
-		int mask = InputEvent.CTRL_MASK;
+        return KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, DEFAULT_MODIFIER);
-		return KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, mask);
     }
 
 
@@ -397,7 +398,7 @@ public class AutoCompletion {
      * @return Whether the description window should be shown.
      * @see #setShowDescWindow(boolean)
      */
-	public boolean getShowDescWindow() {
+    public boolean isShowDescWindow() {
         return showDescWindow;
     }
 
@@ -409,7 +410,7 @@ public class AutoCompletion {
      * @return The style context.
      */
     public static AutoCompletionStyleContext getStyleContext() {
-		return styleContext;
+        return STYLE_CONTEXT;
     }
 
 
@@ -680,60 +681,32 @@ public class AutoCompletion {
      * @return The current line number of the caret.
      */
     protected int refreshPopupWindow() {
-
         // A return value of null => don't suggest completions
         String text = provider.getAlreadyEnteredText(textComponent);
         if (text == null && !isPopupVisible()) {
             return getLineOfCaret();
         }
-
         // If the popup is currently visible, and they type a space (or any
         // character that resets the completion list to "all completions"),
         // the popup window should be hidden instead of being reset to show
         // everything.
         int textLen = text == null ? 0 : text.length();
-		if (textLen==0) {
+        if (textLen == 0 && isPopupVisible()) {
-			if (isPopupVisible()) {
             hidePopupWindow();
             return getLineOfCaret();
         }
-		}
+        final List<Completion> completions = provider.getCompletions(textComponent);
-
-		final List<Completion> completions = provider.
-										getCompletions(textComponent);
         int count = completions.size();
-
+        if (needSetPopupWindow(count, textLen)) {
-		if (count>1 || (count==1 && (isPopupVisible() || textLen==0)) ||
-				(count==1 && !getAutoCompleteSingleChoices())) {
-
             if (popupWindow == null) {
-				popupWindow = new AutoCompletePopupWindow(parentWindow, this);
+                popupWindow = createAutoCompletePopupWindow();
-				// Completion is usually done for code, which is always done
-				// LTR, so make completion stuff RTL only if text component is
-				// also RTL.
-				popupWindow.applyComponentOrientation(
-											getTextComponentOrientation());
-				if (renderer!=null) {
-					popupWindow.setListCellRenderer(renderer);
-				}
-				if (preferredChoicesWindowSize!=null) {
-					popupWindow.setSize(preferredChoicesWindowSize);
-				}
-				if (preferredDescWindowSize!=null) {
-					popupWindow.setDescriptionWindowSize(
-												preferredDescWindowSize);
             }
-			}
-
             popupWindow.setCompletions(completions);
-
             if (!popupWindow.isVisible()) {
                 Rectangle r = null;
                 try {
-					r = textComponent.modelToView(textComponent.
+                    r = textComponent.modelToView(textComponent.getCaretPosition());
-														getCaretPosition());
                 } catch (BadLocationException ble) {
-
                     return -1;
                 }
                 Point p = new Point(r.x, r.y);
@@ -743,25 +716,43 @@ public class AutoCompletion {
                 popupWindow.setLocationRelativeTo(r);
                 popupWindow.setVisible(true);
             }
-
+        } else if (count == 1) { // !isPopupVisible && autoCompleteSingleChoices
-		}
-
-		else if (count==1) { // !isPopupVisible && autoCompleteSingleChoices
             SwingUtilities.invokeLater(new Runnable() {
                 public void run() {
                     insertCompletion(completions.get(0));
                 }
             });
-		}
+        } else {
-
-		else {
             hidePopupWindow();
         }
-
         return getLineOfCaret();
+    }
 
+    private boolean needSetPopupWindow(int count, int textLen) {
+        return (count == 1 && (isPopupVisible() || textLen == 0))
+                || (count == 1 && !isAutoCompleteSingleChoices())
+                || count > 1;
     }
 
+    private AutoCompletePopupWindow createAutoCompletePopupWindow() {
+        AutoCompletePopupWindow popupWindow = new AutoCompletePopupWindow(parentWindow, this);
+        // Completion is usually done for code, which is always done
+        // LTR, so make completion stuff RTL only if text component is
+        // also RTL.
+        popupWindow.applyComponentOrientation(
+                getTextComponentOrientation());
+        if (renderer != null) {
+            popupWindow.setListCellRenderer(renderer);
+        }
+        if (preferredChoicesWindowSize != null) {
+            popupWindow.setSize(preferredChoicesWindowSize);
+        }
+        if (preferredDescWindowSize != null) {
+            popupWindow.setDescriptionWindowSize(
+                    preferredDescWindowSize);
+        }
+        return popupWindow;
+    }
 
     /**
      * Sets the delay between when the user types a character and when the
@@ -791,8 +782,7 @@ public class AutoCompletion {
             if (textComponent != null) {
                 if (autoActivationEnabled) {
                     autoActivationListener.addTo(textComponent);
-				}
+                } else {
-				else {
                     autoActivationListener.removeFrom(textComponent);
                 }
             }
@@ -819,7 +809,7 @@ public class AutoCompletion {
      * be automatically inserted, without displaying the popup menu.
      *
      * @param autoComplete Whether to auto-complete single choices.
-	 * @see #getAutoCompleteSingleChoices()
+     * @see #isAutoCompleteSingleChoices()
      */
     public void setAutoCompleteSingleChoices(boolean autoComplete) {
         autoCompleteSingleChoices = autoComplete;
@@ -956,7 +946,7 @@ public class AutoCompletion {
      * completion window.
      *
      * @param show Whether to show the description window.
-	 * @see #getShowDescWindow()
+     * @see #isShowDescWindow()
      */
     public void setShowDescWindow(boolean show) {
         hidePopupWindow(); // Needed to force it to take effect
@@ -1012,8 +1002,7 @@ public class AutoCompletion {
                 textComponent.replaceSelection(Character.toString(p.getParameterListStart()));
                 TemplateCompletion tc = new TemplateCompletion(p, null, null, template);
                 pc = tc;
-			}
+            } else {
-			else {
                 text = p.getParameterListStart() + text;
                 textComponent.replaceSelection(text);
                 return;
@@ -1130,8 +1119,7 @@ public class AutoCompletion {
         public void caretUpdate(CaretEvent e) {
             if (justInserted) {
                 justInserted = false;
-			}
+            } else {
-			else {
                 timer.stop();
             }
         }
@@ -1153,12 +1141,10 @@ public class AutoCompletion {
                 if (provider.isAutoActivateOkay(textComponent)) {
                     timer.restart();
                     justInserted = true;
-				}
+                } else {
-				else {
                     timer.stop();
                 }
-			}
+            } else {
-			else {
                 timer.stop();
             }
         }
@@ -1187,8 +1173,7 @@ public class AutoCompletion {
         public void actionPerformed(ActionEvent e) {
             if (isAutoCompleteEnabled()) {
                 refreshPopupWindow();
-			}
+            } else if (oldTriggerAction != null) {
-			else if (oldTriggerAction!=null) {
                 oldTriggerAction.actionPerformed(e);
             }
         }

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;
@@ -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) {
 
@@ -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
                 }
-
                 // Listen for document events AFTER we insert
                 tc.getDocument().addDocumentListener(this);
-
             } catch (BadLocationException ble) {
                 // 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,34 +1,24 @@
 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;
+
     /**
      * 选择状态----全选和全不选
      *
@@ -54,10 +44,8 @@ public class CheckBoxList extends JComponent {
     /**
      * Class constructor.
      *
-	 * @param items
+     * @param items Items with which to populate the list.
-	 *            Items with which to populate the list.
+     * @param state default state, true or false
-	 * @param default_state
-	 *            default state, true or false
      */
     public CheckBoxList(Object[] items, SelectedState state, String name) {
         jlist = new BOXLIST(items);
@@ -175,8 +163,9 @@ public class CheckBoxList extends JComponent {
 
         @Override
         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();
+                if (anyMaskDown) {
                     int[] indices = getSelectedIndices();
                     if (indices.length == 0) {
                         super.processMouseEvent(e);
@@ -205,7 +194,7 @@ public class CheckBoxList extends JComponent {
 
         @Override
         protected void processMouseMotionEvent(MouseEvent e) {
-			if (e.getX() < 20) {
+            if (e.getX() < X_COORDINATE) {
                 return;
             }
 
@@ -246,13 +235,13 @@ public class CheckBoxList extends JComponent {
         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 {
 
         public CheckListCellRenderer() {
             this.setOpaque(true);
-			this.setBorder(noFocusBorder);
+            this.setBorder(NO_FOCUS_BORDER);
         }
 
         public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
@@ -271,7 +260,7 @@ public class CheckBoxList extends JComponent {
             if (cellHasFocus) {
                 this.setBorder(UIManager.getBorder("List.focusCellHighlightBorder"));
             } else {
-				this.setBorder(noFocusBorder);
+                this.setBorder(NO_FOCUS_BORDER);
             }
 
             return this;

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

@@ -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,16 +343,13 @@ public class TableSorter extends AbstractTableModel {
                 fireTableChanged(e);
                 return;
             }
-                
             // If the table structure has changed, cancel the sorting; the
-            // sorting columns may have been either moved or deleted from             
+            // sorting columns may have been either moved or deleted from the model.
-            // the model. 
             if (e.getFirstRow() == TableModelEvent.HEADER_ROW) {
                 cancelSorting();
                 fireTableChanged(e);
                 return;
             }
-
             // We can map a cell event through to the view without widening
             // when the following conditions apply: 
             // 
@@ -380,7 +379,6 @@ public class TableSorter extends AbstractTableModel {
                                                      column, e.getType()));
                 return;
             }
-
             // Something has happened to the data that may have invalidated the row order.
             clearSortingState();
             fireTableDataChanged();
@@ -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
@@ -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,9 +309,10 @@ 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);
                 }

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
@@ -2006,3 +2006,4 @@ FR-Designer_AlphaFine_ShowAll=show all
 FR-Designer_AlphaFine_Latest=Latest
 FR-Designer_AlphaFine_ShowLess=show less
 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
@@ -2004,3 +2004,4 @@ FR-Designer_AlphaFine_ShowAll=show all
 FR-Designer_AlphaFine_Latest=Recent
 FR-Designer_AlphaFine_ShowLess=show less
 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_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
@@ -2000,3 +2000,4 @@ 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_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文件夹下参与打包
-task copyFile(type:Copy,dependsOn:compileJava){
+
-	copy{
+//指明无法编译文件所在路径
-		from ("${srcDir}/src"){
+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'
 	}
 
@@ -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,6 +21,8 @@ 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;
@@ -155,6 +157,8 @@ public class DataTableConfigPane extends JComponent implements PropertyChangeLis
         }
 
         class MouseAdapterListener extends MouseAdapter {
+            private final static int DIS = 30;
+            private final static int SMALL_DIS = 3;
             private JTable table;
             int oldY = 0;
             int newY = 0;
@@ -183,7 +187,7 @@ public class DataTableConfigPane extends JComponent implements PropertyChangeLis
                     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
@@ -203,7 +207,7 @@ public class DataTableConfigPane extends JComponent implements PropertyChangeLis
                     height = height + table.getRowHeight(i);
                 }
 
-				if (height - e.getY() < 3) {
+                if (height - e.getY() < SMALL_DIS) {
                     drag = true;
                     table.setCursor(new Cursor(Cursor.N_RESIZE_CURSOR));
                 } else {
@@ -221,10 +225,11 @@ public class DataTableConfigPane extends JComponent implements PropertyChangeLis
             public void mouseDragged(MouseEvent e) {
                 if (drag) {
                     int value = oldHeight + e.getY() - oldY;
-					if (value < 30)
+                    if (value < DIS) {
-						table.setRowHeight(row, 30);
+                        table.setRowHeight(row, DIS);
-					else
+                    } else {
                         table.setRowHeight(row, oldHeight + e.getY() - oldY);
+                    }
                     DataTableConfigPane.this.propertyChange();
                 }
             }