From 61717f3ab202b077ad97035105898cca7763a459 Mon Sep 17 00:00:00 2001 From: ju Date: Tue, 31 Jul 2018 18:23:47 +0800 Subject: [PATCH 1/4] REPORT-10215 --- designer-realize/src/main/java/com/fr/start/Designer.java | 8 ++++---- .../main/java/com/fr/start/module/DesignerStartup.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/start/Designer.java b/designer-realize/src/main/java/com/fr/start/Designer.java index e4c119f7d5..082fd27845 100644 --- a/designer-realize/src/main/java/com/fr/start/Designer.java +++ b/designer-realize/src/main/java/com/fr/start/Designer.java @@ -101,10 +101,10 @@ public class Designer extends BaseDesigner { } preloadResource(); - - SplashContext.getInstance().registerSplash(createSplash()); - - SplashContext.getInstance().show(); +// +// SplashContext.getInstance().registerSplash(createSplash()); +// +// SplashContext.getInstance().show(); Module designerRoot = ModuleContext.parseRoot("designer-startup.xml"); //传递启动参数 designerRoot.setSingleton(StartupArgs.class, new StartupArgs(args)); diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java b/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java index 9d684a8216..2c8810aa67 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java @@ -59,7 +59,7 @@ public class DesignerStartup extends Activator { service.shutdown(); DesignerContext.getDesignerFrame().setVisible(true); //启动画面结束 - SplashContext.getInstance().hide(); +// SplashContext.getInstance().hide(); DesignerContext.getDesignerFrame().getProgressDialog().setVisible(true); startSub(StartFinishActivator.class); From e0ef826de1094601275efef7155ef196c9fe48ea Mon Sep 17 00:00:00 2001 From: ju Date: Wed, 1 Aug 2018 09:56:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20backup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-realize/src/main/java/com/fr/start/Designer.java | 8 ++++---- .../main/java/com/fr/start/module/DesignerStartup.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/start/Designer.java b/designer-realize/src/main/java/com/fr/start/Designer.java index 13fbabb195..d02fcb0164 100644 --- a/designer-realize/src/main/java/com/fr/start/Designer.java +++ b/designer-realize/src/main/java/com/fr/start/Designer.java @@ -102,10 +102,10 @@ public class Designer extends BaseDesigner { } preloadResource(); -// -// SplashContext.getInstance().registerSplash(createSplash()); -// -// SplashContext.getInstance().show(); + + SplashContext.getInstance().registerSplash(createSplash()); + + SplashContext.getInstance().show(); Module designerRoot = ModuleContext.parseRoot("designer-startup.xml"); //传递启动参数 designerRoot.setSingleton(StartupArgs.class, new StartupArgs(args)); diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java b/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java index 2c8810aa67..9d684a8216 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java @@ -59,7 +59,7 @@ public class DesignerStartup extends Activator { service.shutdown(); DesignerContext.getDesignerFrame().setVisible(true); //启动画面结束 -// SplashContext.getInstance().hide(); + SplashContext.getInstance().hide(); DesignerContext.getDesignerFrame().getProgressDialog().setVisible(true); startSub(StartFinishActivator.class); From 8dd0d777709afd148d480f1c03f6bf9430642647 Mon Sep 17 00:00:00 2001 From: ju Date: Wed, 1 Aug 2018 10:59:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?REPORT-10225=20=E3=80=9010.0=E5=86=92?= =?UTF-8?q?=E7=83=9F=E3=80=91=E8=AE=BE=E8=AE=A1=E5=99=A8=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=8F=98=E6=88=90=E8=8B=B1=E6=96=87=E7=9A=84=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/DesignerEnvManager.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java index dba69e00a5..7ae6cbcd2d 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java @@ -1295,21 +1295,22 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { int value = Integer.parseInt(tmpVal); switch (value) { case 0: + case 1: setLanguage(Locale.SIMPLIFIED_CHINESE); break; - case 1: + case 2: setLanguage(Locale.US); break; - case 2: + case 3: setLanguage(Locale.JAPAN); break; - case 3: + case 4: setLanguage(Locale.TRADITIONAL_CHINESE); break; - case 4: + case 5: setLanguage(Locale.KOREA); break; - case 5: + case 6: setLanguage(new Locale("pt", "PT")); break; default: From 33ecac4fa020e39e597495e9cd33b091ce353b60 Mon Sep 17 00:00:00 2001 From: ju Date: Wed, 1 Aug 2018 11:00:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?REPORT-10225=20=E3=80=9010.0=E5=86=92?= =?UTF-8?q?=E7=83=9F=E3=80=91=E8=AE=BE=E8=AE=A1=E5=99=A8=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=8F=98=E6=88=90=E8=8B=B1=E6=96=87=E7=9A=84=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/DesignerEnvManager.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java index 7ae6cbcd2d..104f6f847f 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java @@ -1294,7 +1294,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { // 用于兼容10.0之前的版本 int value = Integer.parseInt(tmpVal); switch (value) { + //原来0、1都是中文 case 0: + setLanguage(Locale.SIMPLIFIED_CHINESE); + break; case 1: setLanguage(Locale.SIMPLIFIED_CHINESE); break;