Merge pull request #1385 in BA/design from ~JU/9.0release-design:release/9.0 to release/9.0

* commit 'd0c789075f3409ce4de745837f1ac49ed3dc63b5':
  pmd
  pmd
  REPORT-5217

designer_base/src/com/fr/start/BaseDesigner.java

@@ -63,14 +63,15 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
 
     public BaseDesigner(String[] args) {
     
+        init(args);
+    }
+    
+    private void init(String[] args) {
+        
         RestartHelper.deleteRecordFilesWhenStart();
         ConfigManagerFactory.registerConfigManagerProxy(new ConfigManagerCreatorProxy());
         //启动core
         BuildContext.setBuildFilePath(buildPropertiesPath());
-        Register.load();
-        //标记一下是设计器启动
-        PluginConversionModule.getInstance().markDesignerStart();
-        SiteCenter.getInstance();
         
         if (isDebug()) {
             setDebugEnv();
@@ -83,6 +84,11 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
             return;
         }
         
+        Register.load();
+        //标记一下是设计器启动
+        PluginConversionModule.getInstance().markDesignerStart();
+        SiteCenter.getInstance();
+        
         //下面这两句的位置不能随便调换，因为会影响语言切换的问题
         initLanguage();
         
@@ -99,6 +105,10 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
                 }
             }
         }
+        initLookAndFeel(args, splashWindow);
+    }
+    
+    private void initLookAndFeel(String[] args, SplashWindow splashWindow) {
         
         // 初始化look and feel.这个在预加载之前执行是因为lookAndFeel里的东西，预加载时也要用到
         DesignUtils.initLookAndFeel();
@@ -199,7 +209,8 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
 
     //在VM options里加入-Ddebug=true激活
     private boolean isDebug() {
-        return "true".equals(System.getProperty("debug"));
+    
+        return ComparatorUtils.equals("true", System.getProperty("debug"));
     }
 
     private static final int DEBUG_PORT = 51463;
@@ -250,6 +261,18 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
                 file = FILEFactory.createFILE(FILEFactory.ENV_PREFIX
                         + DesignerEnvManager.getEnvManager().getLastOpenFile());
             }
+            isException = openFile(df, isException, file);
+        } catch (Exception e) {
+            FRLogger.getLogger().error(e.getMessage(), e);
+            if (!isException) {
+                showDesignerFrame(args, df, true);
+            } else {
+                System.exit(0);
+            }
+        }
+    }
+    
+    private boolean openFile(final DesignerFrame df, boolean isException, FILE file) {
         
         //启动时打开指定文件的接口
         DesignerStartOpenFileProcessor processor = ExtraDesignClassManager.getInstance().getSingle(DesignerStartOpenFileProcessor.XML_TAG);
@@ -276,14 +299,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
             }
         });
         df.setVisible(true);
-        } catch (Exception e) {
+        return isException;
-            FRLogger.getLogger().error(e.getMessage(), e);
-            if (!isException) {
-                showDesignerFrame(args, df, true);
-            } else {
-                System.exit(0);
-            }
-        }
     }