Merge pull request #1277 in BA/design from ~XIAOXIA/design:release/9.0 to release/9.0

* commit 'ed26cbcec1dc05ca68f923b5a84f4bfe8ca3a720':
  代码质量，格式化代码
  代码质量
  rt
  格式化代码
  rt
  rt
  alphafine加功能点

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

@@ -19,7 +19,6 @@ import java.util.List;
  * Created by XiaXiang on 2017/5/8.
  */
 public class AlphaFineHelper {
-    public static final NoResultModel NO_RESULT_MODEL = new NoResultModel(Inter.getLocText("FR-Designer_AlphaFine_NoResult"));
     public static final NoResultModel NO_CONNECTION_MODEL = new NoResultModel(Inter.getLocText("FR-Designer_ConnectionFailed"));
     private static AlphaFineDialog alphaFineDialog;
 

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

@@ -1,25 +1,24 @@
 package com.fr.design.mainframe.alphafine.cell.model;
 
+import com.fr.design.actions.UpdateAction;
 import com.fr.design.mainframe.alphafine.CellType;
 import com.fr.general.FRLogger;
 import com.fr.json.JSONException;
 import com.fr.json.JSONObject;
 
-import javax.swing.*;
-
 /**
  * Created by XiaXiang on 2017/4/20.
  */
 public class ActionModel extends AlphaCellModel {
-    private Action action;
+    private UpdateAction action;
 
 
-    public ActionModel(String name, String description, Action action, int searchCount) {
+    public ActionModel(String name, String description, UpdateAction action, int searchCount) {
         this(name, description, action);
         setSearchCount(searchCount);
     }
 
-    public ActionModel(String name, String description, Action action) {
+    public ActionModel(String name, String description, UpdateAction action) {
         super(name, null, CellType.ACTION);
         this.action = action;
         this.setDescription(description);
@@ -43,11 +42,11 @@ public class ActionModel extends AlphaCellModel {
         return action != null ? action.hashCode() : 0;
     }
 
-    public Action getAction() {
+    public UpdateAction getAction() {
         return action;
     }
 
-    public void setAction(Action action) {
+    public void setAction(UpdateAction action) {
         this.action = action;
     }
 

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

@@ -27,7 +27,7 @@ public abstract class AlphaCellModel implements Comparable {
         this.content = content;
 
     }
-    
+
     public CellType getType() {
         return type;
     }
@@ -68,6 +68,7 @@ public abstract class AlphaCellModel implements Comparable {
     public boolean isNeedToSendToServer() {
         return true;
     }
+
     /**
      * model转json
      *
@@ -102,7 +103,7 @@ public abstract class AlphaCellModel implements Comparable {
 
     @Override
     public int compareTo(Object o) {
-        AlphaCellModel cellModel = (AlphaCellModel)o;
+        AlphaCellModel cellModel = (AlphaCellModel) o;
         int difference = cellModel.getSearchCount() - this.getSearchCount();
         if (difference != 0) {
             return difference;

designer/src/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java

@@ -5,7 +5,6 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.mainframe.alphafine.AlphaFineConstants;
 import com.fr.design.mainframe.alphafine.cell.model.AlphaCellModel;
 import com.fr.design.mainframe.alphafine.cell.model.MoreModel;
-import com.fr.general.IOUtils;
 import com.fr.stable.StringUtils;
 
 import javax.swing.*;
@@ -55,7 +54,7 @@ public class ContentCellRender implements ListCellRenderer<Object> {
             detailLabel.setForeground(AlphaFineConstants.LIGHT_GRAY);
             panel.add(detailLabel, BorderLayout.CENTER);
             int width = (int) (titleLabel.getPreferredSize().getWidth() + detailLabel.getPreferredSize().getWidth());
-            if ( width > AlphaFineConstants.LEFT_WIDTH - OFFSET) {
+            if (width > AlphaFineConstants.LEFT_WIDTH - OFFSET) {
                 int nameWidth = (int) (AlphaFineConstants.LEFT_WIDTH - detailLabel.getPreferredSize().getWidth() - OFFSET);
                 titleLabel.setPreferredSize(new Dimension(nameWidth, AlphaFineConstants.CELL_HEIGHT));
             }

designer/src/com/fr/design/mainframe/alphafine/cell/render/TitleCellRender.java

@@ -3,7 +3,6 @@ package com.fr.design.mainframe.alphafine.cell.render;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.mainframe.alphafine.AlphaFineConstants;
 import com.fr.design.mainframe.alphafine.cell.model.MoreModel;
-import com.fr.general.IOUtils;
 
 import javax.swing.*;
 import java.awt.*;

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

@@ -367,7 +367,6 @@ public class AlphaFineDialog extends UIDialog {
      * 停止加载状态
      */
     private void fireStopLoading() {
-        searchListModel.resetState();
         if (searchResultPane != null) {
             removeLeftPane();
         }
@@ -665,25 +664,18 @@ public class AlphaFineDialog extends UIDialog {
         searchTextField.addKeyListener(new KeyAdapter() {
             @Override
             public void keyPressed(KeyEvent e) {
-                if (e.getKeyCode() == KeyEvent.VK_DOWN) {
-                    searchResultList.requestFocus();
-                    searchResultList.setSelectedIndex(searchResultList.getSelectedIndex() + 1);
-                }
-            }
-
-            @Override
-            public void keyReleased(KeyEvent e) {
-                int keyCode = e.getKeyCode();
-                if (keyCode == KeyEvent.VK_ESCAPE) {
-                    if (StringUtils.isBlank(searchTextField.getText()) || ComparatorUtils.equals(searchTextField.getText(), searchTextField.getPlaceHolder())) {
-                        AlphaFineDialog.this.setVisible(false);
-                    } else {
-                        searchTextField.setText(null);
-                        removeSearchResult();
+                if (e.getKeyCode() == KeyEvent.VK_ENTER) {
+                    if (searchResultList.getModel().getSize() > 1) {
+                        dealWithSearchResult(searchResultList.getSelectedValue());
                     }
-                } else if (e.getKeyCode() == KeyEvent.VK_ENTER) {
-                    dealWithSearchResult(searchResultList.getSelectedValue());
-                }
+                } else if (e.getKeyCode() == KeyEvent.VK_DOWN) {
+                    if (searchResultList.getSelectedIndex() == searchResultList.getModel().getSize() - 1) {
+                        searchResultList.setSelectedIndex(0);
+                    }
+                    searchResultList.setSelectedIndex(searchResultList.getSelectedIndex() + 1);
+                } else if (e.getKeyCode() == KeyEvent.VK_UP) {
+                    searchResultList.setSelectedIndex(searchResultList.getSelectedIndex() - 1);
+                } else escAlphaFine(e);
             }
         });
 
@@ -754,7 +746,9 @@ public class AlphaFineDialog extends UIDialog {
     private void doNavigate() {
         AlphaFineDialog.this.dispose();
         final AlphaCellModel model = searchResultList.getSelectedValue();
-        model.doAction();
+        if (model != null) {
+            model.doAction();
+        }
     }
 
     /**
@@ -888,6 +882,21 @@ public class AlphaFineDialog extends UIDialog {
         this.splitLabel = splitLabel;
     }
 
+    /**
+     * 键盘退出AlphaFine
+     *
+     * @param e
+     */
+    private void escAlphaFine(KeyEvent e) {
+        if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
+            if (StringUtils.isBlank(searchTextField.getText()) || ComparatorUtils.equals(searchTextField.getText(), searchTextField.getPlaceHolder())) {
+                AlphaFineDialog.this.setVisible(false);
+            } else {
+                searchTextField.setText(null);
+                removeSearchResult();
+            }
+        }
+    }
 
     /**
      * +-------------------------------------+
@@ -907,7 +916,9 @@ public class AlphaFineDialog extends UIDialog {
          */
         @Override
         public void setSelectedIndex(int index) {
-            if (index > 0 && checkSelectedIndex(index)) {
+            if (index == 0 && getModel().getSize() > 1) {
+                super.setSelectedIndex(1);
+            } else if (index > 0 && checkSelectedIndex(index)) {
                 int previousIndex = getSelectedIndex();
                 super.setSelectedIndex(index);
                 AlphaCellModel cellModel = getSelectedValue();
@@ -930,21 +941,6 @@ public class AlphaFineDialog extends UIDialog {
         }
 
         private void initListListener() {
-            addKeyListener(new KeyAdapter() {
-                @Override
-                public void keyPressed(KeyEvent e) {
-                    if (e.getKeyCode() == KeyEvent.VK_ENTER) {
-                        dealWithSearchResult(getSelectedValue());
-                    } else if (e.getKeyCode() == KeyEvent.VK_UP) {
-                        if (getSelectedIndex() == 1) {
-                            searchTextField.requestFocus();
-                        }
-                    } else if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
-                        searchTextField.requestFocus();
-                    }
-                }
-            });
-
             addMouseListener(new MouseAdapter() {
                 @Override
                 public void mouseClicked(MouseEvent e) {
@@ -968,6 +964,14 @@ public class AlphaFineDialog extends UIDialog {
                     }
                 }
             });
+
+            addKeyListener(new KeyAdapter() {
+                @Override
+                public void keyPressed(KeyEvent e) {
+                    escAlphaFine(e);
+
+                }
+            });
         }
     }
 

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

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.alphafine.component;
 
+import com.bulenkov.iconloader.IconLoader;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.help.alphafine.AlphaFineContext;
 import com.fr.design.actions.help.alphafine.AlphaFineListener;
@@ -7,10 +8,8 @@ import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.mainframe.alphafine.AlphaFineHelper;
 import com.fr.design.utils.ThemeUtils;
-import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 
-import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -22,12 +21,12 @@ public class AlphaFinePane extends BasicPane {
     private static AlphaFinePane alphaFinePane;
 
     public AlphaFinePane() {
-        setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 14));
+        setLayout(new BorderLayout());
         if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isEnabled()) {
             Toolkit.getDefaultToolkit().addAWTEventListener(AlphaFineDialog.listener(), AWTEvent.KEY_EVENT_MASK);
         }
         UIButton refreshButton = new UIButton();
-        refreshButton.setIcon(IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/smallsearch.png"));
+        refreshButton.setIcon(IconLoader.getIcon("/com/fr/design/mainframe/alphafine/images/smallsearch.png"));
         refreshButton.setToolTipText(Inter.getLocText("FR-Designer_AlphaFine"));
         refreshButton.set4ToolbarButton();
         refreshButton.setRolloverEnabled(false);

designer/src/com/fr/design/mainframe/alphafine/preview/FilePreviewPane.java

@@ -18,7 +18,7 @@ public class FilePreviewPane extends JPanel {
         float widthScale = (AlphaFineConstants.RIGHT_WIDTH) / (float) image.getWidth();
         float heightScale = (AlphaFineConstants.CONTENT_HEIGHT) / (float) image.getHeight();
         Image showImage;
-        showImage = widthScale > heightScale? image.getScaledInstance((int) (image.getWidth() * heightScale), AlphaFineConstants.CONTENT_HEIGHT, Image.SCALE_SMOOTH) : image.getScaledInstance(AlphaFineConstants.RIGHT_WIDTH, (int) (image.getWidth() * widthScale), Image.SCALE_SMOOTH);
+        showImage = widthScale > heightScale ? image.getScaledInstance((int) (image.getWidth() * heightScale), AlphaFineConstants.CONTENT_HEIGHT, Image.SCALE_SMOOTH) : image.getScaledInstance(AlphaFineConstants.RIGHT_WIDTH, (int) (image.getWidth() * widthScale), Image.SCALE_SMOOTH);
         label.setIcon(new ImageIcon(showImage));
         add(label);
     }

designer/src/com/fr/design/mainframe/alphafine/preview/NoResultPane.java

@@ -20,7 +20,7 @@ public class NoResultPane extends JPanel {
         image.setPreferredSize(new Dimension(150, 111));
         image.setHorizontalAlignment(SwingConstants.CENTER);
         image.setIcon(IconLoader.getIcon(iconUrl));
-        image.setBorder(BorderFactory.createEmptyBorder(100,0,0,0));
+        image.setBorder(BorderFactory.createEmptyBorder(100, 0, 0, 0));
         UILabel description = new UILabel(title);
         description.setForeground(AlphaFineConstants.MEDIUM_GRAY);
         description.setFont(FRFont.getInstance("SimSun", Font.PLAIN, 14));

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

@@ -19,7 +19,12 @@ import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.project.ProjectConstants;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
 

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

@@ -103,6 +103,7 @@ public class PluginSearchManager implements AlphaFineSearchProcessor {
                 if (jsonArray != null) {
                     SearchResult searchResult = new SearchResult();
                     for (int i = 0; i < jsonArray.length(); i++) {
+                        AlphaFineHelper.checkCancel();
                         PluginModel cellModel = getPluginModel(jsonArray.optJSONObject(i), false);
                         if (!AlphaFineHelper.getFilterResult().contains(cellModel)) {
                             searchResult.add(cellModel);

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

@@ -10,6 +10,7 @@ import com.fr.design.mainframe.alphafine.cell.model.ActionModel;
 import com.fr.design.mainframe.alphafine.cell.model.AlphaCellModel;
 import com.fr.design.mainframe.alphafine.cell.model.MoreModel;
 import com.fr.design.mainframe.alphafine.model.SearchResult;
+import com.fr.design.mainframe.toolbar.UpdateActionManager;
 import com.fr.file.XMLFileManager;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogger;
@@ -26,8 +27,17 @@ import com.fr.stable.xml.XMLReadable;
 import com.fr.stable.xml.XMLTools;
 import com.fr.stable.xml.XMLableReader;
 
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.StringReader;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Created by XiaXiang on 2017/5/15.
@@ -220,21 +230,24 @@ public class RecentSearchManager extends XMLFileManager implements AlphaFineSear
                 recentModelList = recentKVModelMap.get(searchText);
                 SearchResult resultModelList = recentModelList;
                 Iterator<AlphaCellModel> modelIterator = resultModelList.iterator();
+                SearchResult searchResult = new SearchResult();
                 while (modelIterator.hasNext()) {
                     AlphaCellModel model = modelIterator.next();
-                    if (model.getType() == CellType.ACTION && !((ActionModel) model).getAction().isEnabled()) {
-                        modelIterator.remove();
+                    if (model.getType() == CellType.ACTION && !UpdateActionManager.getUpdateActionManager().isEnable(((ActionModel) model).getAction())) {
+                        continue;
+                    } else {
+                        searchResult.add(model);
                     }
 
                 }
-                Collections.sort(resultModelList);
-                int size = resultModelList.size();
+                Collections.sort(searchResult);
+                int size = searchResult.size();
                 if (size > MAX_SIZE) {
                     SearchResult result = new SearchResult();
-                    result.addAll(resultModelList.subList(0, MAX_SIZE));
+                    result.addAll(searchResult.subList(0, MAX_SIZE));
                     return result;
                 }
-                return resultModelList;
+                return searchResult;
             }
         }
         return recentModelList;

designer/src/com/fr/start/Designer.java

@@ -350,7 +350,7 @@ public class Designer extends BaseDesigner {
      *
      * @return 面板组件
      */
-    public Component createAlphafinePane() {
+    public Component createAlphaFinePane() {
         return AlphaFinePane.getAlphaFinePane();
     }
 

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

@@ -1,5 +1,6 @@
 package com.fr.design.actions.help.alphafine;
 
+import com.fr.base.FRContext;
 import com.fr.base.FRCoreContext;
 import com.fr.general.VT4FR;
 import com.fr.stable.OperatingSystem;
@@ -15,79 +16,68 @@ import javax.swing.*;
  */
 public class AlphaFineConfigManager implements XMLable {
 
+    private static AlphaFineConfigManager alphaFineConfigManager = new AlphaFineConfigManager();
     /**
      * 是否开启alphafine
      */
     private boolean isEnabled = true;
-
     /**
      * 是否联网搜索
      */
     private boolean isSearchOnLine = true;
 
     /**
-     * 快捷键设置
+     * 搜索范围
      */
-    private String shortcuts;
-
     /**
-     * 搜索范围
+     * 快捷键设置
      */
-
+    private String shortcuts;
     /**
      * 猜您需要
      */
     private boolean isContainRecommend = true;
-
     /**
      * 设置
      */
     private boolean isContainAction = true;
-
     /**
      * 帮助文档
      */
     private boolean isContainDocument = true;
-
     /**
      * 模板
      */
     private boolean isContainTemplate = true;
-
     /**
      * 模板内容
      */
     private boolean isContainFileContent;
-
     /**
      * 应用中心
      */
     private boolean isContainPlugin = true;
-
     /**
      * 快捷键
      */
     private KeyStroke shortCutKeyStore;
-
     /**
      * 是否提醒
      */
     private boolean isNeedRemind = true;
-
     /**
      * 直接操作菜单次数
      */
     private int operateCount;
 
-
-
-
-    private static AlphaFineConfigManager alphaFineConfigManager = new AlphaFineConfigManager();
-
     public static AlphaFineConfigManager getInstance() {
         return alphaFineConfigManager;
     }
 
+    public static boolean isALPHALicAvailable() {
+        return FRContext.getCurrentEnv() != null && VT4FR.isLicAvailable(FRCoreContext.getBytes()) && VT4FR.ALPHA_FINE.support();
+    }
+
     @Override
     public Object clone() throws CloneNotSupportedException {
         AlphaFineConfigManager manager = (AlphaFineConfigManager) super.clone();
@@ -130,8 +120,6 @@ public class AlphaFineConfigManager implements XMLable {
         writer.end();
     }
 
-
-
     public boolean isSearchOnLine() {
         return isSearchOnLine;
     }
@@ -147,20 +135,20 @@ public class AlphaFineConfigManager implements XMLable {
         return shortcuts;
     }
 
+    public void setShortcuts(String shortcuts) {
+        this.shortcuts = shortcuts;
+        this.shortCutKeyStore = convert2KeyStroke(this.shortcuts);
+    }
+
     /**
      * 返回默认快捷键
+     *
      * @return
      */
     private String getDefaultShortCuts() {
-        return OperatingSystem.isMacOS()? "meta + D" : "ctrl + D";
+        return OperatingSystem.isMacOS() ? "meta + D" : "ctrl + D";
     }
 
-    public void setShortcuts(String shortcuts) {
-        this.shortcuts = shortcuts;
-        this.shortCutKeyStore = convert2KeyStroke(this.shortcuts);
-    }
-
-
     public boolean isContainAction() {
         return isContainAction;
     }

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

@@ -5,17 +5,33 @@ package com.fr.design.mainframe.toolbar;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.FRContext;
-import com.fr.base.FRCoreContext;
 import com.fr.design.DesignState;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.UpdateAction;
-import com.fr.design.actions.community.*;
-import com.fr.design.actions.file.*;
+import com.fr.design.actions.community.BBSAction;
+import com.fr.design.actions.community.BugAction;
+import com.fr.design.actions.community.NeedAction;
+import com.fr.design.actions.community.QuestionAction;
+import com.fr.design.actions.community.SignAction;
+import com.fr.design.actions.community.UpAction;
+import com.fr.design.actions.community.VideoAction;
+import com.fr.design.actions.file.CloseCurrentTemplateAction;
+import com.fr.design.actions.file.ExitDesignerAction;
+import com.fr.design.actions.file.OpenRecentReportMenuDef;
+import com.fr.design.actions.file.OpenTemplateAction;
+import com.fr.design.actions.file.PreferenceAction;
+import com.fr.design.actions.file.SwitchExistEnv;
 import com.fr.design.actions.help.AboutAction;
 import com.fr.design.actions.help.TutorialAction;
 import com.fr.design.actions.help.WebDemoAction;
 import com.fr.design.actions.help.alphafine.AlphaFineAction;
-import com.fr.design.actions.server.*;
+import com.fr.design.actions.help.alphafine.AlphaFineConfigManager;
+import com.fr.design.actions.server.ConnectionListAction;
+import com.fr.design.actions.server.FunctionManagerAction;
+import com.fr.design.actions.server.GlobalParameterAction;
+import com.fr.design.actions.server.GlobalTableDataAction;
+import com.fr.design.actions.server.PlatformManagerAction;
+import com.fr.design.actions.server.PluginManagerAction;
 import com.fr.design.file.NewTemplatePane;
 import com.fr.design.fun.MenuHandler;
 import com.fr.design.fun.TableDataPaneProcessor;
@@ -35,7 +51,6 @@ import com.fr.env.RemoteEnv;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
-import com.fr.general.VT4FR;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.context.PluginRuntime;
 import com.fr.plugin.manage.PluginFilter;
@@ -48,8 +63,11 @@ import com.fr.stable.StringUtils;
 
 import javax.swing.*;
 import java.awt.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
+import java.util.Set;
 
 /**
  * @author richer
@@ -61,12 +79,63 @@ import java.util.List;
  * 还有docking的状态的保存,下次打开设计器,也应该是这样的
  */
 public abstract class ToolBarMenuDock {
+    public static final int PANLE_HEIGNT = 26;
+    public static final ToolBarMenuDockPlus NULLAVOID = new ToolBarMenuDockPlus() {
+
+        @Override
+        public ToolBarDef[] toolbars4Target() {
+            return new ToolBarDef[0];
+        }
+
+
+        @Override
+        public ShortCut[] shortcut4FileMenu() {
+            return new ShortCut[0];
+        }
+
+        @Override
+        public MenuDef[] menus4Target() {
+            return new MenuDef[0];
+        }
+
+        @Override
+        public JPanel[] toolbarPanes4Form() {
+            return new JPanel[0];
+        }
+
+        public JComponent[] toolBarButton4Form() {
+            return new JComponent[0];
+        }
+
+        public JComponent toolBar4Authority() {
+            return new JPanel();
+        }
+
+        @Override
+        public int getMenuState() {
+            return DesignState.WORK_SHEET;
+        }
+
+        public int getToolBarHeight() {
+            return PANLE_HEIGNT;
+        }
+
+        /**
+         * 导出菜单的子菜单 ，目前用于图表设计器
+         *
+         * @return 子菜单
+         */
+        public ShortCut[] shortcut4ExportMenu() {
+            return new ShortCut[0];
+        }
+
+    };
     private static final String FINEREPORT = "FineReport";
     private static final int MENUBAR_HEIGHT = 22;
-    public static final int PANLE_HEIGNT = 26;
     private MenuDef[] menus;
     private ToolBarDef toolBarDef;
     private List<UpdateActionModel> shortCutsList;
+
     /**
      * 更新菜单
      */
@@ -118,6 +187,10 @@ public abstract class ToolBarMenuDock {
         return jMenuBar;
     }
 
+    //////////////////////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////menu below/////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////////////////
+
     /**
      * 生成报表设计和表单设计的编辑区域
      *
@@ -127,10 +200,6 @@ public abstract class ToolBarMenuDock {
         return null;
     }
 
-    //////////////////////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////menu below/////////////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////////////////////
-
     public MenuDef[] menus(final ToolBarMenuDockPlus plus) {
         java.util.List<MenuDef> menuList = new java.util.ArrayList<MenuDef>();
         // 添加文件菜单
@@ -164,6 +233,7 @@ public abstract class ToolBarMenuDock {
 
     /**
      * 获取所有actionmodel
+     *
      * @param menuList
      */
     private void addAllUpdateActionsToList(List<MenuDef> menuList) {
@@ -175,6 +245,7 @@ public abstract class ToolBarMenuDock {
 
     /**
      * 递归获取所有UpdateAction
+     *
      * @param menuDef
      */
     private void addUpdateActionToList(MenuDef menuDef, int level) {
@@ -195,11 +266,11 @@ public abstract class ToolBarMenuDock {
         }
     }
 
-    public  void addCommunityMenuDef(java.util.List<MenuDef> menuList){
+    public void addCommunityMenuDef(java.util.List<MenuDef> menuList) {
         Locale locale = FRContext.getLocale();
-        Locale [] locales =supportCommunityLocales();
-        for(int i = 0; i < locales.length; i++) {
-            if(locale.equals(locales[i])){
+        Locale[] locales = supportCommunityLocales();
+        for (int i = 0; i < locales.length; i++) {
+            if (locale.equals(locales[i])) {
                 menuList.add(createCommunityMenuDef());
                 break;
             }
@@ -218,13 +289,13 @@ public abstract class ToolBarMenuDock {
         // 给菜单加插件入口
         for (MenuDef m : menuDefs) {
             switch (m.getAnchor()) {
-                case MenuHandler.TEMPLATE :
+                case MenuHandler.TEMPLATE:
                     insertMenu(m, MenuHandler.TEMPLATE, new TemplateTargetAction(plus));
                     break;
-                case MenuHandler.INSERT :
+                case MenuHandler.INSERT:
                     insertMenu(m, MenuHandler.INSERT);
                     break;
-                case MenuHandler.CELL :
+                case MenuHandler.CELL:
                     insertMenu(m, MenuHandler.CELL);
                     break;
                 default:
@@ -271,7 +342,7 @@ public abstract class ToolBarMenuDock {
 
         addSwitchExistEnvAction(menuDef);
 
-        menuDef.addShortCut( new ExitDesignerAction());
+        menuDef.addShortCut(new ExitDesignerAction());
 
         insertMenu(menuDef, MenuHandler.FILE);
         return menuDef;
@@ -293,7 +364,7 @@ public abstract class ToolBarMenuDock {
         menuDef.addShortCut(new SwitchExistEnv());
     }
 
-    protected ShortCut openTemplateAction(){
+    protected ShortCut openTemplateAction() {
         return new OpenTemplateAction();
     }
 
@@ -308,17 +379,15 @@ public abstract class ToolBarMenuDock {
      * 创建论坛登录面板, chart那边不需要
      *
      * @return 面板组件
-     *
      */
-    public Component createBBSLoginPane(){
+    public Component createBBSLoginPane() {
         return new UILabel();
     }
 
-    public Component createAlphafinePane(){
+    public Component createAlphaFinePane() {
         return new UILabel();
     }
 
-
     protected MenuDef createServerMenuDef(ToolBarMenuDockPlus plus) {
         MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_M-Server"), 'S');
 
@@ -361,6 +430,7 @@ public abstract class ToolBarMenuDock {
 
     /**
      * 创建帮助子菜单
+     *
      * @return 帮组菜单的子菜单
      */
     public ShortCut[] createHelpShortCuts() {
@@ -372,25 +442,22 @@ public abstract class ToolBarMenuDock {
             shortCuts.add(new TutorialAction());
         }
         shortCuts.add(SeparatorDef.DEFAULT);
-        //shortCuts.add(new TutorialAction());
         shortCuts.add(SeparatorDef.DEFAULT);
-        if (ComparatorUtils.equals(ProductConstants.APP_NAME,FINEREPORT)) {
-
-            // mod by anchore 16/11/17 去掉反馈
-            //shortCuts.add(new FeedBackAction());
+        if (ComparatorUtils.equals(ProductConstants.APP_NAME, FINEREPORT)) {
             shortCuts.add(SeparatorDef.DEFAULT);
+        }
+        if (AlphaFineConfigManager.isALPHALicAvailable()) {
+            shortCuts.add(new AlphaFineAction());
             shortCuts.add(SeparatorDef.DEFAULT);
-            //  shortCuts.add(new ForumAction());
         }
         shortCuts.add(SeparatorDef.DEFAULT);
-        shortCuts.add(new AlphaFineAction());
-        shortCuts.add(SeparatorDef.DEFAULT);
         shortCuts.add(new AboutAction());
         return shortCuts.toArray(new ShortCut[shortCuts.size()]);
     }
 
     /**
      * 创建社区子菜单
+     *
      * @return 社区菜单的子菜单
      */
     public ShortCut[] createCommunityShortCuts() {
@@ -405,6 +472,7 @@ public abstract class ToolBarMenuDock {
         shortCuts.add(new SignAction());
         return shortCuts.toArray(new ShortCut[shortCuts.size()]);
     }
+
     public MenuDef createHelpMenuDef() {
         MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_Help"), 'H');
         ShortCut[] otherHelpShortCuts = createHelpShortCuts();
@@ -414,6 +482,7 @@ public abstract class ToolBarMenuDock {
         insertMenu(menuDef, MenuHandler.HELP);
         return menuDef;
     }
+
     public MenuDef createCommunityMenuDef() {
         MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_COMMUNITY"), 'C');
         ShortCut[] otherCommunityShortCuts = createCommunityShortCuts();
@@ -423,6 +492,7 @@ public abstract class ToolBarMenuDock {
         insertMenu(menuDef, MenuHandler.BBS);
         return menuDef;
     }
+
     /**
      * 生成工具栏
      *
@@ -460,7 +530,6 @@ public abstract class ToolBarMenuDock {
         }
     }
 
-
     protected JPanel polyToolBar(String text) {
         JPanel panel = new JPanel(new BorderLayout()) {
             public Dimension getPreferredSize() {
@@ -477,7 +546,6 @@ public abstract class ToolBarMenuDock {
         return panel;
     }
 
-
     /**
      * 重置上面的工具栏
      *
@@ -488,7 +556,6 @@ public abstract class ToolBarMenuDock {
         return plus.toolBarButton4Form();
     }
 
-
     /**
      * 创建大的工具按钮
      *
@@ -507,62 +574,11 @@ public abstract class ToolBarMenuDock {
         return new UIButton[0];
     }
 
-
     protected void refreshLargeToolbarState() {
 
     }
 
-    public static final ToolBarMenuDockPlus NULLAVOID = new ToolBarMenuDockPlus() {
-
-        @Override
-        public ToolBarDef[] toolbars4Target() {
-            return new ToolBarDef[0];
-        }
-
-
-        @Override
-        public ShortCut[] shortcut4FileMenu() {
-            return new ShortCut[0];
-        }
-
-        @Override
-        public MenuDef[] menus4Target() {
-            return new MenuDef[0];
-        }
-
-        @Override
-        public JPanel[] toolbarPanes4Form() {
-            return new JPanel[0];
-        }
-
-        public JComponent[] toolBarButton4Form() {
-            return new JComponent[0];
-        }
-
-        public JComponent toolBar4Authority() {
-            return new JPanel();
-        }
-
-        @Override
-        public int getMenuState() {
-            return DesignState.WORK_SHEET;
-        }
-        public int getToolBarHeight(){
-            return PANLE_HEIGNT;
-        }
-
-        /**
-         * 导出菜单的子菜单 ，目前用于图表设计器
-         *
-         * @return 子菜单
-         */
-        public ShortCut[] shortcut4ExportMenu(){
-            return new ShortCut[0];
-        }
-
-    };
-
-    public NewTemplatePane getNewTemplatePane(){
+    public NewTemplatePane getNewTemplatePane() {
         return new NewTemplatePane() {
             @Override
             public Icon getNew() {
@@ -584,28 +600,28 @@ public abstract class ToolBarMenuDock {
     protected void insertMenu(MenuDef menuDef, String anchor) {
         insertMenu(menuDef, anchor, new NoTargetAction());
     }
-    
+
     protected void insertMenu(MenuDef menuDef, String anchor, ShortCutMethodAction action) {
-        
+
         listenPluginMenuChange(menuDef, anchor, action);
         Set<MenuHandler> set = ExtraDesignClassManager.getInstance().getArray(MenuHandler.MARK_STRING);
         addExtraMenus(menuDef, anchor, action, set);
-        
+
     }
-    
+
     private void listenPluginMenuChange(final MenuDef menuDef, final String anchor, final ShortCutMethodAction action) {
-        
+
         PluginFilter filter = new PluginFilter() {
-            
+
             @Override
             public boolean accept(PluginContext context) {
-                
+
                 return context.contain(MenuHandler.MARK_STRING);
             }
         };
-    
+
         GeneralContext.listenPlugin(PluginEventType.BeforeStop, new PluginEventListener() {
-            
+
             @Override
             public void on(PluginEvent event) {
                 PluginRuntime runtime = event.getContext().getRuntime();
@@ -614,59 +630,59 @@ public abstract class ToolBarMenuDock {
             }
         }, filter);
         GeneralContext.listenPlugin(PluginEventType.AfterRun, new PluginEventListener() {
-            
+
             @Override
             public void on(PluginEvent event) {
-                
+
                 PluginRuntime runtime = event.getContext().getRuntime();
                 Set<MenuHandler> menuHandlers = runtime.get(MenuHandler.MARK_STRING);
                 addExtraMenus(menuDef, anchor, action, menuHandlers);
             }
         }, filter);
     }
-    
+
     private void removeExtraMenus(MenuDef menuDef, String anchor, ShortCutMethodAction action, Set<MenuHandler> set) {
-    
-    
+
+
         List<MenuHandler> target = new ArrayList<>();
         for (MenuHandler handler : set) {
             if (ComparatorUtils.equals(handler.category(), anchor)) {
                 target.add(handler);
             }
         }
-    
+
         for (MenuHandler handler : target) {
             int insertPosition = handler.insertPosition(menuDef.getShortCutCount());
             if (insertPosition == MenuHandler.HIDE) {
                 return;
             }
             ShortCut shortCut = action.methodAction(handler);
-            if (shortCut == null){
+            if (shortCut == null) {
                 continue;
             }
             menuDef.removeShortCut(shortCut);
         }
     }
-    
+
     private void addExtraMenus(MenuDef menuDef, String anchor, ShortCutMethodAction action, Set<MenuHandler> set) {
-        
+
         List<MenuHandler> target = new ArrayList<>();
         for (MenuHandler handler : set) {
             if (ComparatorUtils.equals(handler.category(), anchor)) {
                 target.add(handler);
             }
         }
-        
+
         for (MenuHandler handler : target) {
             int insertPosition = handler.insertPosition(menuDef.getShortCutCount());
             if (insertPosition == MenuHandler.HIDE) {
                 return;
             }
             ShortCut shortCut = action.methodAction(handler);
-            if (shortCut == null){
+            if (shortCut == null) {
                 continue;
             }
-            
+
             if (insertPosition == MenuHandler.LAST) {
                 if (handler.insertSeparatorBefore()) {
                     menuDef.addShortCut(SeparatorDef.DEFAULT);
@@ -676,48 +692,47 @@ public abstract class ToolBarMenuDock {
                 menuDef.insertShortCut(insertPosition, shortCut);
                 if (handler.insertSeparatorBefore()) {
                     menuDef.insertShortCut(insertPosition, SeparatorDef.DEFAULT);
-                    insertPosition ++;
+                    insertPosition++;
                 }
                 if (handler.insertSeparatorAfter()) {
-                    insertPosition ++;
+                    insertPosition++;
                     menuDef.insertShortCut(insertPosition, SeparatorDef.DEFAULT);
                 }
             }
         }
     }
-    
+
     /**
      * 设计器退出时, 做的一些操作.
-     *
      */
-    public void shutDown(){
+    public void shutDown() {
 
     }
 
-    private interface ShortCutMethodAction{
+    private interface ShortCutMethodAction {
 
         public ShortCut methodAction(MenuHandler handler);
     }
 
-    private abstract class AbstractShortCutMethodAction implements ShortCutMethodAction{
+    private abstract class AbstractShortCutMethodAction implements ShortCutMethodAction {
 
-        public ShortCut methodAction(MenuHandler handler){
+        public ShortCut methodAction(MenuHandler handler) {
             return handler.shortcut();
         }
     }
 
     //不需要编辑对象的菜单, 比如文件, 服务器, 关于
-    private class NoTargetAction extends AbstractShortCutMethodAction{
+    private class NoTargetAction extends AbstractShortCutMethodAction {
 
     }
 
     //模板为对象的菜单, 比如模板, 后续如果单元格也要, 直接加个CellTargetAction即可.
     //在methodAction中做handler.shortcut(cell), 不需要修改handler中原有接口, 加个shortcut(cell).
-    private class TemplateTargetAction extends AbstractShortCutMethodAction{
+    private class TemplateTargetAction extends AbstractShortCutMethodAction {
 
         private ToolBarMenuDockPlus plus;
 
-        public TemplateTargetAction(ToolBarMenuDockPlus plus){
+        public TemplateTargetAction(ToolBarMenuDockPlus plus) {
             this.plus = plus;
         }
 

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

@@ -1,5 +1,8 @@
 package com.fr.design.mainframe.toolbar;
 
+import com.fr.design.actions.UpdateAction;
+import com.fr.general.ComparatorUtils;
+
 import java.util.List;
 
 /**
@@ -23,4 +26,13 @@ public class UpdateActionManager {
     public void setUpdateActions(List<UpdateActionModel> updateActions) {
         this.updateActions = updateActions;
     }
+
+    public boolean isEnable(UpdateAction updateAction) {
+        for (UpdateActionModel action : updateActions) {
+            if (ComparatorUtils.equals(updateAction.getName(), action.getActionName()) && action.getAction().isEnabled()) {
+                return true;
+            }
+        }
+        return false;
+    }
 }