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/update/ui/dialog/UpdateMainDialog.java

@@ -30,6 +30,7 @@ import com.fr.general.http.HttpToolbox;
 import com.fr.json.JSONArray;
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
+import com.fr.process.ProcessEventPipe;
 import com.fr.process.engine.core.FineProcessContext;
 import com.fr.process.engine.core.FineProcessEngineEvent;
 import com.fr.stable.*;
@@ -600,7 +601,10 @@ public class UpdateMainDialog extends UIDialog {
                     final String installLib = StableUtils.pathJoin(StableUtils.getInstallHome(), ProjectConstants.LOGS_NAME, UpdateConstants.INSTALL_LIB);
                     final JFrame frame = DesignerContext.getDesignerFrame();
                     final RestartHelper helper = new RestartHelper();
-                    FineProcessContext.getParentPipe().fire(FineProcessEngineEvent.DESTROY);
+                    ProcessEventPipe pipe = FineProcessContext.getParentPipe();
+                    if (pipe != null) {
+                        pipe.fire(FineProcessEngineEvent.DESTROY);
+                    }
                     new FileProcess(callBack) {
                         @Override
                         public void onDownloadSuccess() {

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)) {
-            guiFRFont = getNamedFont("Dialog");
         }  else {
-            guiFRFont = getNamedFont("Tahoma");
+            guiFRFont = getNamedFont("Dialog");
         }
 
         //先初始化的设计器locale, 后初始化lookandfeel.如果顺序改了, 这边也要调整.

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时动态更新按钮