Merge pull request #348 in BA/design from ~NEIL/design:master to master

* commit '6a11040f9e54072cf4eaa7d61fe6c506a5ef8322':
  冲突修正.

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

@@ -120,7 +120,7 @@ public abstract class ToolBarMenuDock {
     ///////////////////////////////menu below/////////////////////////////////////////////////
     //////////////////////////////////////////////////////////////////////////////////////////
 
-    private MenuDef[] menus(final ToolBarMenuDockPlus plus) {
+    public MenuDef[] menus(final ToolBarMenuDockPlus plus) {
         java.util.List<MenuDef> menuList = new java.util.ArrayList<MenuDef>();
         // 添加文件菜单
         menuList.add(createFileMenuDef(plus));
@@ -142,7 +142,7 @@ public abstract class ToolBarMenuDock {
         return menuList.toArray(new MenuDef[menuList.size()]);
     }
 
-    private void insertTemplateExtendMenu(ToolBarMenuDockPlus plus, MenuDef[] menuDefs) {
+    public void insertTemplateExtendMenu(ToolBarMenuDockPlus plus, MenuDef[] menuDefs) {
         // 给菜单加插件入口
         for (MenuDef m : menuDefs) {
             switch (m.getAnchor()) {
@@ -171,7 +171,7 @@ public abstract class ToolBarMenuDock {
         return plus.menus4Target();
     }
 
-    private MenuDef createFileMenuDef(ToolBarMenuDockPlus plus) {
+    public MenuDef createFileMenuDef(ToolBarMenuDockPlus plus) {
         MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_File"), 'F');
 
         ShortCut[] scs = new ShortCut[0];
@@ -284,7 +284,7 @@ public abstract class ToolBarMenuDock {
         return processor == null ? new GlobalTableDataAction() : processor.createServerTDAction();
     }
 
-    protected boolean shouldShowPlugin() {
+    private boolean shouldShowPlugin() {
         return FRContext.isChineseEnv() || ComparatorUtils.equals(GeneralContext.getLocale(), Locale.TAIWAN);
     }
 
@@ -326,7 +326,6 @@ 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();
@@ -336,7 +335,6 @@ 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();