Merge pull request #2763 in DESIGN/design from release/10.0 to bugfix/10.0

* commit 'd7c2bb6b8a3087984ddd0ed595e3e15fc57e9daf':
  REPORT-42577 日文更新升级屏蔽回退
  REPORT-42577 日文更新升级屏蔽回退

designer-base/src/main/java/com/fr/design/locale/impl/SupportLocaleImpl.java

@@ -156,20 +156,5 @@ public enum SupportLocaleImpl implements SupportLocale {
             set.add(Locale.TAIWAN);
             return set;
         }
-    },
-
-    /**
-     * 更新升级-帮助菜单下
-     */
-    UPDATE_HELP {
-        @Override
-        public Set<Locale> support() {
-            Set<Locale> set = new HashSet<>();
-            set.add(Locale.US);
-            set.add(Locale.KOREA);
-            set.add(Locale.CHINA);
-            set.add(Locale.TAIWAN);
-            return set;
-        }
     }
 }

designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

@@ -54,7 +54,9 @@ import com.fr.design.mainframe.ToolBarNewTemplatePane;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.SeparatorDef;
 import com.fr.design.menu.ShortCut;
+import com.fr.design.menu.SnapChatMenuDef;
 import com.fr.design.menu.ToolBarDef;
+import com.fr.design.notification.SnapChatAllTypes;
 import com.fr.design.os.impl.SupportOSImpl;
 import com.fr.design.remote.action.RemoteDesignAuthManagerAction;
 import com.fr.design.update.actions.SoftwareUpdateAction;
@@ -528,18 +530,35 @@ public abstract class ToolBarMenuDock {
      * @return 帮组菜单的子菜单
      */
     public ShortCut[] createHelpShortCuts() {
-        final java.util.List<ShortCut> shortCuts = new ArrayList<>();
+        final java.util.List<ShortCut> shortCuts = new ArrayList<ShortCut>();
+
+        Locale locale = GeneralContext.getLocale();
 
-        LocaleCenter.buildAction(() -> shortCuts.add(new VideoAction()), SupportLocaleImpl.VIDEO);
+        LocaleCenter.buildAction(new LocaleAction() {
+            @Override
+            public void execute() {
+                shortCuts.add(new VideoAction());
+            }
+        }, SupportLocaleImpl.VIDEO);
 
-        LocaleCenter.buildAction(() -> shortCuts.add(new TutorialAction()), SupportLocaleImpl.TUTORIAL_HELP);
+        LocaleCenter.buildAction(new LocaleAction() {
+            @Override
+            public void execute() {
+                shortCuts.add(new TutorialAction());
+            }
+        }, SupportLocaleImpl.TUTORIAL_HELP);
 
-        LocaleCenter.buildAction(() -> shortCuts.add(new TechSupportAction()), SupportLocaleImpl.TECH_SUPPORT_HELP);
+        LocaleCenter.buildAction(new LocaleAction() {
+            @Override
+            public void execute() {
+                shortCuts.add(new TechSupportAction());
+            }
+        }, SupportLocaleImpl.TECH_SUPPORT_HELP);
 
         //远程不使用更新升级，产品演示
         if (WorkContext.getCurrent().isLocal()) {
             shortCuts.add(new WebDemoAction());
-            LocaleCenter.buildAction(() -> shortCuts.add(new SoftwareUpdateAction()), SupportLocaleImpl.UPDATE_HELP);
+            shortCuts.add(new SoftwareUpdateAction());
         }
         if (AlphaFineConfigManager.isALPHALicAvailable()) {
             shortCuts.add(new AlphaFineAction());
@@ -547,7 +566,12 @@ public abstract class ToolBarMenuDock {
 
         shortCuts.add(SeparatorDef.DEFAULT);
         if (DesignerEnvManager.getEnvManager().isOpenDebug()) {
-            OSSupportCenter.buildAction(objects -> shortCuts.add(new FineUIAction()), SupportOSImpl.FINEUI);
+            OSSupportCenter.buildAction(new OSBasedAction() {
+                @Override
+                public void execute(Object... objects) {
+                    shortCuts.add(new FineUIAction());
+                }
+            }, SupportOSImpl.FINEUI);
 
         }
         shortCuts.add(new AboutAction());
@@ -561,12 +585,12 @@ public abstract class ToolBarMenuDock {
      * @return 社区菜单的子菜单
      */
     public ShortCut[] createCommunityShortCuts() {
-        
+
         final java.util.List<ShortCut> shortCuts = new ArrayList<ShortCut>();
         shortCuts.add(new BBSAction());
-        
+
         shortCuts.add(SeparatorDef.DEFAULT);
-        
+
         shortCuts.add(new VideoAction());
         LocaleCenter.buildAction(new LocaleAction() {
             @Override
@@ -576,7 +600,7 @@ public abstract class ToolBarMenuDock {
         }, SupportLocaleImpl.TUTORIAL_COMMUNITY);
         shortCuts.add(new QuestionAction());
         shortCuts.add(new TechSolutionAction());
-        
+
         shortCuts.add(SeparatorDef.DEFAULT);
 
         LocaleCenter.buildAction(new LocaleAction() {
@@ -606,9 +630,9 @@ public abstract class ToolBarMenuDock {
                 shortCuts.add(new TechSupportAction());
             }
         }, SupportLocaleImpl.TECH_SUPPORT_COMMUNITY);
-        
+
         shortCuts.add(SeparatorDef.DEFAULT);
-        
+
         shortCuts.add(new CenterAction());
         shortCuts.add(new SignAction());
         LocaleCenter.buildAction(new LocaleAction() {
@@ -632,7 +656,10 @@ public abstract class ToolBarMenuDock {
 
     public MenuDef createCommunityMenuDef() {
 
-        MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community"), 'C');
+        MenuDef menuDef = new SnapChatMenuDef(
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community"),
+                'C',
+                SnapChatAllTypes.Menu.BBS);
         ShortCut[] otherCommunityShortCuts = createCommunityShortCuts();
         for (ShortCut shortCut : otherCommunityShortCuts) {
             menuDef.addShortCut(shortCut);

designer-base/src/main/java/com/fr/design/upm/UpmFinder.java

@@ -10,7 +10,6 @@ import com.fr.design.update.ui.dialog.UpdateMainDialog;
 import com.fr.event.Event;
 import com.fr.event.EventDispatcher;
 import com.fr.event.Listener;
-import com.fr.general.GeneralContext;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StableUtils;
 import com.fr.workspace.Workspace;
@@ -18,7 +17,6 @@ import com.fr.workspace.WorkspaceEvent;
 
 import javax.swing.*;
 import java.io.File;
-import java.util.Locale;
 
 /**
  * @author richie
@@ -29,7 +27,6 @@ public class UpmFinder {
 
     private static final String UPM_DIR = "/upm";
     private static final String MAIN_RESOURCE_PATH = UPM_DIR + "/plugin_design.html";
-    private static final String JXBROWSER = "com.teamdev.jxbrowser.chromium.Browser";
 
     public static String installHome = FRContext.getCommonOperator().getWebRootPath();
 
@@ -59,49 +56,39 @@ public class UpmFinder {
     }
 
     public static void showUPMDialog() {
-        boolean hasJxBrowser = true;
+        boolean flag = true;
         try {
-            Class.forName(JXBROWSER);
+            Class.forName("com.teamdev.jxbrowser.chromium.Browser");
         } catch (ClassNotFoundException e) {
-            hasJxBrowser = false;
+            flag = false;
         }
-        if (hasJxBrowser) {
+        if (flag) {
-            showUpmPane();
+            if (!checkUPMResourcesExist()){
-        } else {
+                // upm下载
-            showUpdatePane();
+                int val = FineJOptionPane.showConfirmDialog(null, Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install"),
-        }
+                        Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE);
-    }
+                if (val == JOptionPane.OK_OPTION){
-
+                    try {
-    private static void showUpmPane() {
+                        UpmResourceLoader.INSTANCE.download();
-        if (!checkUPMResourcesExist()){
+                        UpmResourceLoader.INSTANCE.install();
-            // upm下载
+                        FineJOptionPane.showMessageDialog(null, Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Installed"),
-            int val = FineJOptionPane.showConfirmDialog(null, Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install"),
+                                Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.INFORMATION_MESSAGE);
-                    Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE);
+                    } catch (Exception e){
-            if (val == JOptionPane.OK_OPTION){
+                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
-                try {
+                        FineJOptionPane.showMessageDialog(null, Toolkit.i18nText("Fine-Design_Updater_Download_Failed"),
-                    UpmResourceLoader.INSTANCE.download();
+                                Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.INFORMATION_MESSAGE);
-                    UpmResourceLoader.INSTANCE.install();
+                    }
-                    FineJOptionPane.showMessageDialog(null, Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Installed"),
-                            Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.INFORMATION_MESSAGE);
-                } catch (Exception e){
-                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
-                    FineJOptionPane.showMessageDialog(null, Toolkit.i18nText("Fine-Design_Updater_Download_Failed"),
-                            Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.INFORMATION_MESSAGE);
                 }
             }
-        }
+            else {
-        else {
+                UpmShowPane upmPane = new UpmShowPane();
-            UpmShowPane upmPane = new UpmShowPane();
+                if (dialog == null) {
-            if (dialog == null) {
+                    dialog = new UpmShowDialog(DesignerContext.getDesignerFrame(), upmPane);
-                dialog = new UpmShowDialog(DesignerContext.getDesignerFrame(), upmPane);
+                }
+                dialog.setVisible(true);
             }
-            dialog.setVisible(true);
+        } else {
-        }
+            FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Update_Info_Plugin_Message"));
-    }
-
-    private static void showUpdatePane() {
-        JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Update_Info_Plugin_Message"));
-        if (!GeneralContext.getLocale().equals(Locale.JAPAN)) {
             UpdateMainDialog dialog = new UpdateMainDialog(DesignerContext.getDesignerFrame());
             dialog.setAutoUpdateAfterInit();
             dialog.showDialog();