REPORT-9953 & REPORT-10231

designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java

@@ -93,12 +93,7 @@ public class SwitchExistEnv extends MenuDef {
             Workspace workspace;
             try {
                 workspace = DesignerWorkspaceGenerator.generate(selectedEnv);
-                boolean checkValid = true;
-                if (workspace == null) {
-                    checkValid = false;
-                }else {
-                    checkValid = selectedEnv.checkValid();
-                }
+                boolean checkValid = workspace == null ? false : selectedEnv.checkValid();
                 if (!checkValid) {
                     JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Switch_Workspace_Failed"),
                             null, 0, UIManager.getIcon("OptionPane.errorIcon"));

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

@@ -147,12 +147,7 @@ public class TemplatePane extends JPanel implements MouseListener {
         DesignerWorkspaceInfo selectedEnv = envManager.getWorkspaceInfo(selectedName);
         try {
             Workspace workspace = DesignerWorkspaceGenerator.generate(selectedEnv);
-            boolean checkValid = true;
-            if (workspace == null) {
-                checkValid = false;
-            }else {
-                checkValid = selectedEnv.checkValid();
-            }
+            boolean checkValid = workspace == null ? false : selectedEnv.checkValid();
             if (!checkValid) {
                 JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Switch_Workspace_Failed"),
                         null, 0, UIManager.getIcon("OptionPane.errorIcon"));

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

@@ -234,7 +234,7 @@ public abstract class ToolBarMenuDock {
         // 添加帮助菜单
         menuList.add(createHelpMenuDef());
 
-        if (GeneralContext.getLocale() == Locale.CHINA || GeneralContext.getLocale() == Locale.TAIWAN) {
+        if (GeneralContext.getLocale().equals(Locale.CHINA) || GeneralContext.getLocale().equals(Locale.TAIWAN)) {
             // 添加社区菜单
             addCommunityMenuDef(menuList);
         }