From ab51a98c129dbacd72b4fb9886dafaf453cdbb4e Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Fri, 29 Jun 2018 15:39:58 +0800 Subject: [PATCH 1/3] REPORT-9284 REPORT-9159 --- .../mainframe/loghandler/DesignerLogHandler.java | 4 +++- designer-realize/src/com/fr/start/Designer.java | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/designer-base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java b/designer-base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java index ef5325215..b4829a988 100644 --- a/designer-base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java +++ b/designer-base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java @@ -6,6 +6,7 @@ import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.imenu.UIMenuItem; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.general.ComparatorUtils; +import com.fr.general.FRLogLevel; import com.fr.general.GeneralContext; import com.fr.general.Inter; import com.fr.general.LogRecordTime; @@ -119,7 +120,8 @@ public class DesignerLogHandler { @Override public void actionPerformed(ActionEvent e) { JPopupMenu jPopupMenu = new JPopupMenu(); - int logLevelInt = Log4jConfig.getInstance().getRootLevel().toInt(); + //这里把log4j的日志级别也转成java级别,可以进行比对 + int logLevelInt = FRLogLevel.convertLog4jToJava(Log4jConfig.getInstance().getRootLevel()).intValue(); if (logLevelInt <= INFO_INT) { jPopupMenu.add(showInfo); jPopupMenu.add(showError); diff --git a/designer-realize/src/com/fr/start/Designer.java b/designer-realize/src/com/fr/start/Designer.java index fad29deb3..b0d0742ea 100644 --- a/designer-realize/src/com/fr/start/Designer.java +++ b/designer-realize/src/com/fr/start/Designer.java @@ -115,6 +115,18 @@ public class Designer extends BaseDesigner { //传递启动参数 designerRoot.setSingleton(StartupArgs.class, new StartupArgs(args)); designerRoot.start(); + + //加入从产品演示启动 + if (args != null) { + for (String arg : args) { + if (ComparatorUtils.equals(arg, "demo")) { + DesignerEnvManager.getEnvManager().setCurrentEnv2Default(); + ServerStarter.browserDemoURL(); + break; + } + } + } + if (WorkContext.getCurrent().isLocal()) { //初始化一下serverTray ServerTray.init(); From aed1fdc66e0153cfc4ba7e33917347b89171a57f Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Fri, 29 Jun 2018 16:20:22 +0800 Subject: [PATCH 2/3] REPORT-9284 REPORT-9159 --- .../loghandler/DesignerLogAppender.java | 2 +- .../mainframe/loghandler/DesignerLogHandler.java | 16 ++++++---------- designer-realize/src/com/fr/start/Designer.java | 11 ----------- .../start/module/DesignerWorkspaceProvider.java | 2 +- 4 files changed, 8 insertions(+), 23 deletions(-) diff --git a/designer-base/src/com/fr/design/mainframe/loghandler/DesignerLogAppender.java b/designer-base/src/com/fr/design/mainframe/loghandler/DesignerLogAppender.java index cf9e23114..65cbe2b21 100644 --- a/designer-base/src/com/fr/design/mainframe/loghandler/DesignerLogAppender.java +++ b/designer-base/src/com/fr/design/mainframe/loghandler/DesignerLogAppender.java @@ -37,7 +37,7 @@ public class DesignerLogAppender extends AppenderSkeleton { synchronized (DesignerLogHandler.getInstance()) { Level level = event.getLevel(); String msg = this.layout.format(event); - DesignerLogHandler.getInstance().printRemoteLog(msg, FRLogLevel.convertLog4jToJava(level), new Date()); + DesignerLogHandler.getInstance().printRemoteLog(msg, level, new Date()); } } } diff --git a/designer-base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java b/designer-base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java index e3af7b98c..59f7d82ef 100644 --- a/designer-base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java +++ b/designer-base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java @@ -7,14 +7,11 @@ import com.fr.design.gui.imenu.UIMenuItem; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.general.ComparatorUtils; import com.fr.general.FRLogLevel; -import com.fr.general.GeneralContext; import com.fr.general.Inter; import com.fr.general.LogRecordTime; import com.fr.general.log.Log4jConfig; -import com.fr.log.FineLoggerFactory; -import com.fr.log.LogHandler; -import com.fr.stable.EnvChangedListener; import com.fr.stable.xml.LogRecordTimeProvider; +import com.fr.third.apache.log4j.Level; import javax.swing.*; import javax.swing.text.BadLocationException; @@ -32,15 +29,14 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.logging.Level; import java.util.logging.LogRecord; import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; public class DesignerLogHandler { - protected static final int INFO_INT = Level.INFO.intValue(); - protected static final int ERROR_INT = Level.SEVERE.intValue(); - protected static final int WARN_INT = Level.WARNING.intValue(); + protected static final int INFO_INT = Level.INFO.toInt(); + protected static final int ERROR_INT = Level.ERROR.toInt(); + protected static final int WARN_INT = Level.WARN.toInt(); private static final int GAP_X = -150; private static final int INFO_GAP_Y = -60; private static final int ERRO_GAP_Y = -40; @@ -106,7 +102,7 @@ public class DesignerLogHandler { public void actionPerformed(ActionEvent e) { JPopupMenu jPopupMenu = new JPopupMenu(); //这里把log4j的日志级别也转成java级别,可以进行比对 - int logLevelInt = FRLogLevel.convertLog4jToJava(Log4jConfig.getInstance().getRootLevel()).intValue(); + int logLevelInt = Log4jConfig.getInstance().getRootLevel().toInt(); if (logLevelInt <= INFO_INT) { jPopupMenu.add(showInfo); jPopupMenu.add(showError); @@ -218,7 +214,7 @@ public class DesignerLogHandler { } public void printStackTrace(String message, Level level, Date date) { - int logLevelvalue = level.intValue(); + int logLevelvalue = level.toInt(); if (logLevelvalue == INFO_INT && showInfo.isSelected()) { printMessage(message, logLevelvalue, date); } else if (logLevelvalue == ERROR_INT && showError.isSelected()) { diff --git a/designer-realize/src/com/fr/start/Designer.java b/designer-realize/src/com/fr/start/Designer.java index fa8a5c2d4..d6e5b999f 100644 --- a/designer-realize/src/com/fr/start/Designer.java +++ b/designer-realize/src/com/fr/start/Designer.java @@ -119,17 +119,6 @@ public class Designer extends BaseDesigner { designerRoot.setSingleton(StartupArgs.class, new StartupArgs(args)); designerRoot.start(); - //加入从产品演示启动 - if (args != null) { - for (String arg : args) { - if (ComparatorUtils.equals(arg, "demo")) { - DesignerEnvManager.getEnvManager().setCurrentEnv2Default(); - ServerStarter.browserDemoURL(); - break; - } - } - } - if (WorkContext.getCurrent().isLocal()) { //初始化一下serverTray ServerTray.init(); diff --git a/designer-realize/src/com/fr/start/module/DesignerWorkspaceProvider.java b/designer-realize/src/com/fr/start/module/DesignerWorkspaceProvider.java index d9107109a..beb45fe98 100644 --- a/designer-realize/src/com/fr/start/module/DesignerWorkspaceProvider.java +++ b/designer-realize/src/com/fr/start/module/DesignerWorkspaceProvider.java @@ -20,7 +20,7 @@ public class DesignerWorkspaceProvider extends Activator { for (String arg : args) { if (ComparatorUtils.equals(arg, "demo")) { DesignerEnvManager.getEnvManager().setCurrentEnv2Default(); - // ServerStarter.browserDemoURL(); + ServerStarter.browserDemoURL(); break; } } From 41db103a26da1019b856828364c60f44f54c52cc Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Fri, 29 Jun 2018 16:21:57 +0800 Subject: [PATCH 3/3] REPORT-9284 REPORT-9159 --- .../com/fr/design/mainframe/loghandler/DesignerLogHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java b/designer-base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java index 59f7d82ef..d2e149e91 100644 --- a/designer-base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java +++ b/designer-base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java @@ -101,7 +101,7 @@ public class DesignerLogHandler { @Override public void actionPerformed(ActionEvent e) { JPopupMenu jPopupMenu = new JPopupMenu(); - //这里把log4j的日志级别也转成java级别,可以进行比对 + int logLevelInt = Log4jConfig.getInstance().getRootLevel().toInt(); if (logLevelInt <= INFO_INT) { jPopupMenu.add(showInfo);