Pull request #1669: REPORT-31003 && REPORT-31236 && REPORT-31508

Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit '9da47c5434085f35e00f6eed12824ea612d4828d':
  fix import
  fix
  REPORT-31003 && REPORT-31236 && REPORT-31508

designer-base/src/main/java/com/fr/design/DesignerEnvManager.java

@@ -58,6 +58,7 @@ import javax.swing.SwingWorker.StateValue;
 import java.awt.Color;
 import java.awt.Rectangle;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
@@ -206,9 +207,11 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
             GeneralContext.setLocale(designerEnvManager.getLanguage());
             try {
                 XMLTools.readFileXML(designerEnvManager, designerEnvManager.getDesignerEnvFile());
-            } catch (Exception e) {
+            } catch (FileNotFoundException e) {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
                 XmlHandler.Self.handle(e);
+            } catch (Exception e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
 
             // james：如果没有env定义，要设置一个默认的

designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java

@@ -415,10 +415,7 @@ public class EnvChangeEntrance {
 
             @Override
             public void doOk() {
-                ProcessEventPipe pipe = FineProcessContext.getParentPipe();
-                if (FineProcessContext.getParentPipe() != null) {
-                    pipe.fire(new CarryMessageEvent(ReportState.ACTIVE.getValue()));
-                }
+                FineProcessContext.getParentPipe().fire(new CarryMessageEvent(ReportState.ACTIVE.getValue()));
                 if (!envListOkAction(envListPane, PopTipStrategy.NOW)) {
                     DesignerExiter.getInstance().execute();
                 }

designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java

@@ -72,10 +72,7 @@ public class DesignerWorkspaceGenerator {
     enum  RemoteHandler {
         SELF;
         public static void handle(DesignerWorkspaceInfo config) {
-            ProcessEventPipe eventPipe = FineProcessContext.getParentPipe();
-            if (eventPipe != null) {
-                eventPipe.fire(new CarryMessageEvent(ReportState.STOP.getValue()));
-            }
+            FineProcessContext.getParentPipe().fire(new CarryMessageEvent(ReportState.STOP.getValue()));
             StartErrorMessageCollector.getInstance().record(DesignerErrorMessage.REMOTE_DESIGN_NO_RESPONSE.getId(),
                                                             DesignerErrorMessage.REMOTE_DESIGN_NO_RESPONSE.getMessage(),
                                                             StringUtils.EMPTY);

designer-base/src/main/java/com/fr/design/utils/DesignUtils.java

@@ -291,10 +291,8 @@ public class DesignUtils {
 
         if (isDisplaySimSun(defaultLocale)) {
             guiFRFont = getNamedFont("SimSun");
-        } else if (isDisplayDialog(defaultLocale)) {
+        }  else {
             guiFRFont = getNamedFont("Dialog");
-        } else {
-            guiFRFont = getNamedFont("Tahoma");
         }
 
         //先初始化的设计器locale, 后初始化lookandfeel.如果顺序改了, 这边也要调整.

designer-base/src/main/java/com/fr/design/utils/DesignerPort.java

@@ -90,10 +90,7 @@ public class DesignerPort implements XMLReadable, XMLWriter {
     }
 
     public void resetPort() {
-        ProcessEventPipe eventPipe = FineProcessContext.getParentPipe();
-        if (eventPipe != null) {
-            eventPipe.fire(new CarryMessageEvent(ReportState.STOP.getValue()));
-        }
+        FineProcessContext.getParentPipe().fire(new CarryMessageEvent(ReportState.STOP.getValue()));
         TipDialog dialog = new TipDialog(null,
                                          StringUtils.EMPTY,
                                          Toolkit.i18nText("Fine-Design_Port_Found_Port_Conflict"),

designer-realize/src/main/java/com/fr/design/report/RichTextPane.java

@@ -1,6 +1,7 @@
 package com.fr.design.report;
 
 import com.fr.base.BaseFormula;
+import com.fr.base.FRContext;
 import com.fr.base.Style;
 import com.fr.design.cell.editor.RichTextToolBar;
 import com.fr.design.dialog.BasicPane;
@@ -36,7 +37,7 @@ public class RichTextPane extends BasicPane {
 	
 	//12号字体有个奇怪的bug, 字体下部分渲染会截断一部分, 换其他字体没问题, 字体改大小也没问题.
 	//直接弄个jtexarea放到jframe里也有同样问题, 不知道是字体渲染bug还是jdk问题
-	public static final FRFont DEFAUL_FONT = FRFont.getInstance().applySize(13);
+	public static final FRFont DEFAUL_FONT = FRContext.getDefaultValues().getFRFont().applySize(13);
 	
 	private RichTextEditingPane textPane;
 	//用于populate时动态更新按钮

designer-realize/src/main/java/com/fr/start/LifecycleFatalErrorHandler.java

@@ -49,10 +49,7 @@ public class LifecycleFatalErrorHandler {
 
     public void handle(FineLifecycleFatalError fatal) {
         SplashContext.getInstance().hide();
-        ProcessEventPipe eventPipe = FineProcessContext.getParentPipe();
-        if (eventPipe != null) {
-            eventPipe.fire(new CarryMessageEvent(ReportState.STOP.getValue()));
-        }
+        FineProcessContext.getParentPipe().fire(new CarryMessageEvent(ReportState.STOP.getValue()));
         map.get(fatal.getErrorType()).handle(fatal);
     }