From ce8a3b10564e6033b0f335b9563dab77b91252f7 Mon Sep 17 00:00:00 2001 From: juhaoyu <2335173323@qq.com> Date: Wed, 12 Jul 2017 15:32:42 +0800 Subject: [PATCH 1/8] =?UTF-8?q?PFC-607=20=E6=8F=92=E4=BB=B6=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E5=88=A0=E9=99=A4=E6=9B=B4=E6=96=B0=E4=B8=8D=E9=87=8D?= =?UTF-8?q?=E5=90=AF=E6=94=AF=E6=8C=81=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/env/RemoteEnv.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/env/RemoteEnv.java b/designer_base/src/com/fr/env/RemoteEnv.java index a17815092..4ef8d61e1 100644 --- a/designer_base/src/com/fr/env/RemoteEnv.java +++ b/designer_base/src/com/fr/env/RemoteEnv.java @@ -2181,7 +2181,7 @@ public class RemoteEnv extends AbstractEnv { try { HashMap para = new HashMap(); para.put("op", "plugin"); - para.put("cmd", "get_states"); + para.put("cmd", "get_status"); para.put("current_uid", this.createUserID()); para.put("currentUsername", this.getUser()); From 3921acd85e938f5d12112d789b0aef8c273c96c6 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Wed, 12 Jul 2017 20:33:17 +0800 Subject: [PATCH 2/8] =?UTF-8?q?alphafine=20=E9=80=89=E4=B8=AD=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=9A=84=E4=BA=A4=E4=BA=92=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cell/render/ContentCellRender.java | 11 ++++++++--- .../mainframe/alphafine/images/selected1.png | Bin 0 -> 14908 bytes .../mainframe/alphafine/images/selected2.png | Bin 0 -> 14941 bytes .../mainframe/alphafine/images/selected3.png | Bin 0 -> 14855 bytes .../mainframe/alphafine/images/selected4.png | Bin 0 -> 14907 bytes .../mainframe/alphafine/images/selected5.png | Bin 0 -> 14834 bytes 6 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 designer/src/com/fr/design/mainframe/alphafine/images/selected1.png create mode 100644 designer/src/com/fr/design/mainframe/alphafine/images/selected2.png create mode 100644 designer/src/com/fr/design/mainframe/alphafine/images/selected3.png create mode 100644 designer/src/com/fr/design/mainframe/alphafine/images/selected4.png create mode 100644 designer/src/com/fr/design/mainframe/alphafine/images/selected5.png diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java b/designer/src/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java index 28d70e5b7..25506cbcc 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java +++ b/designer/src/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java @@ -28,13 +28,18 @@ public class ContentCellRender implements ListCellRenderer { panel.setBackground(null); panel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0)); titleLabel.setText(" " + model.getName()); - String iconUrl = "/com/fr/design/mainframe/alphafine/images/alphafine" + model.getType().getTypeValue() + ".png"; if (model.hasAction()) { if (isSelected) { + String iconUrl = "/com/fr/design/mainframe/alphafine/images/selected" + model.getType().getTypeValue() + ".png"; panel.setBackground(AlphaFineConstants.BLUE); + titleLabel.setForeground(Color.white); + titleLabel.setIcon(new ImageIcon(IOUtils.readImage(iconUrl))); + } else { + String iconUrl = "/com/fr/design/mainframe/alphafine/images/alphafine" + model.getType().getTypeValue() + ".png"; + titleLabel.setIcon(new ImageIcon(IOUtils.readImage(iconUrl))); + titleLabel.setForeground(AlphaFineConstants.BLACK); } - titleLabel.setIcon(new ImageIcon(IOUtils.readImage(iconUrl))); - titleLabel.setForeground(AlphaFineConstants.BLACK); + } else { titleLabel.setIcon(null); titleLabel.setForeground(AlphaFineConstants.MEDIUM_GRAY); diff --git a/designer/src/com/fr/design/mainframe/alphafine/images/selected1.png b/designer/src/com/fr/design/mainframe/alphafine/images/selected1.png new file mode 100644 index 0000000000000000000000000000000000000000..3d7cf2514a45895e3a555c5020c8ae78275bafaf GIT binary patch literal 14908 zcmeI3eQXnD9LH}iY%pZJ1TcW&SzwWu?(W)dw3oIp*NqPBm|Jx(hQRH5-OjbW(q7lD zf(%3u#E^(VKxIhKO$d$wiHSs6VoVe@LANPEgEJDqO~O`7bl>)L!rBVvTU$N_Qd*g*X{unzzkqU8Mipiy^R3-->_jm(7 zS7c}oo)TPwTkyz!;A2wyy!DbS`Rk=IO2)g#EDYwvW{cNOIbOFrWof@$)Cds7kfwC{ z?M+^RDi{1xz{d+kjo?z|rMh}qbS5TeL?)$Y%&`k0aSWT%6SYN_LUe|V;9A*2pTNnI z&n`(Wb99xJ4I?BA3zb#1lzh_0@uElJy3j}^n-Vjg$R}7hSuiVJHN8~LXzYxRWwfl0 zSxoC$nud}@l}R~ll0$ShCFju4tQIWn5jh}bat^SA9GuMEQx;eY<#F(=Q}Vev*(|!b zI)UWoyP5mLt26gN9sDbg+!GR%g)b zc(qQ)IMh0=HczeB^Rzl&r*%3wE$Gs55r{S$Y#)`{BJlxbzr<2I?lU!HAC-EwPXuQj z=YllK=0HWsV~FfuMO3yhH()t0Cn z)mJIA>Iy{lIvovO6r+5`yl{WAw;JJv`;)y1>$4tFHfv(#lA0lxa{fk-h6-@2Aei&> z^0awID!Dn?Q6`22SCvHsd)Tk6OeR0(N$yB#tRBke96<3b{W1sE4h0~upnNJOvz zK*kss5)mxGxL_K{7~?`Bf&~~COamEXTu4N)0ONvbAY+URi3k>8Trdq}jBz0m!2*m6 zrh$wxE+isYfN{YzkTJ%EL<9>kE|>-~#<-A(U;)Mj(?G@;7ZMRHz_?%<$Qa{7B7y}N z7fb^gV_Zl?umIzNX&~df;>t=q04R9CQ-4A5cweTa$qF6~BzbGOjUd9{QNrez3F4n2 z@clbM1ZaZjTSpM=K7x2edSmSu#RQSItHe@Z4_!R6r(jh#H)VUv@xk*?Y{|~)S(#D1 zE<8Y5wl+>Xb?lk4t>@p{v$191@JUtp)%mx2gY@`otJi=8~U;%|IFll;~F<#UB1jatBPoB4)06iC`)?ZReX1 zXWQ-PuJ3GL@vi;GvAW;-v%0L=Z54gahxoMiqjTn-n;0NFI!?UZH@z=2P#Ns%yJ?MS?gx9{xz*Ov{paERt=+*FDom}}SDGvPzS=UUGI+Feb#L~-vouz$?%m)!(6+nBJ@`6%plf^g;Ni@MqRGXd&%H?uma}(iuJ3Ape&eA_i*veW zUD>_x^v#;Rm&3m{{KyS9T$uM-_jffnHc&)xa}GUu!@m<>ysXxp?Ekvc(z$5hv8r9| yf3<(y94=Z@cD7ABi*Ntr&HkRA&oozW5t|;JlJ0r`&JW7-oh3!3mXDrVx8*-{24<`P literal 0 HcmV?d00001 diff --git a/designer/src/com/fr/design/mainframe/alphafine/images/selected2.png b/designer/src/com/fr/design/mainframe/alphafine/images/selected2.png new file mode 100644 index 0000000000000000000000000000000000000000..dd04302fc1c97c1f0a9efe308ec39e6ea45abd31 GIT binary patch literal 14941 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 literal 0 HcmV?d00001 diff --git a/designer/src/com/fr/design/mainframe/alphafine/images/selected4.png b/designer/src/com/fr/design/mainframe/alphafine/images/selected4.png new file mode 100644 index 0000000000000000000000000000000000000000..2d4c9b262042d77638f762e4e776d3f02ca94227 GIT binary patch literal 14907 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 Date: Wed, 12 Jul 2017 20:54:55 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=8A=A0=E4=B8=80=E6=9D=A1=E5=88=86?= =?UTF-8?q?=E5=89=B2=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/alphafine/component/AlphaFineDialog.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java index 5a1c89220..6e94a5c15 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -299,8 +299,12 @@ public class AlphaFineDialog extends UIDialog { leftSearchResultPane.setPreferredSize(new Dimension(AlphaFineConstants.LEFT_WIDTH, AlphaFineConstants.CONTENT_HEIGHT)); rightSearchResultPane = new JPanel(); rightSearchResultPane.setBackground(Color.white); + UILabel splitLine = new UILabel(); + splitLine.setBackground(AlphaFineConstants.GRAY); + splitLine.setPreferredSize(new Dimension(1, AlphaFineConstants.CONTENT_HEIGHT)); + rightSearchResultPane.setPreferredSize(new Dimension(AlphaFineConstants.RIGHT_WIDTH - 1, AlphaFineConstants.CONTENT_HEIGHT)); searchResultPane.add(leftSearchResultPane, BorderLayout.WEST); - rightSearchResultPane.setPreferredSize(new Dimension(AlphaFineConstants.RIGHT_WIDTH, AlphaFineConstants.CONTENT_HEIGHT)); + searchResultPane.add(splitLine, BorderLayout.CENTER); searchResultPane.add(rightSearchResultPane, BorderLayout.EAST); UILabel splitLabel = new UILabel(); splitLabel.setBackground(AlphaFineConstants.GRAY); From ed95b49e463a51592e29221111ab428e74e72baf Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Wed, 12 Jul 2017 20:58:42 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/mainframe/alphafine/component/AlphaFineDialog.java | 2 +- designer_base/src/com/fr/design/locale/designer.properties | 2 +- .../src/com/fr/design/locale/designer_en_US.properties | 2 +- .../src/com/fr/design/locale/designer_zh_CN.properties | 2 +- .../src/com/fr/design/locale/designer_zh_TW.properties | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java index 6e94a5c15..c2d5a53c4 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -168,7 +168,7 @@ public class AlphaFineDialog extends UIDialog { * 初始化输入框 */ private void initSearchTextField() { - searchTextField = new AlphaFineTextField(PLACE_HOLDER); + searchTextField = new AlphaFineTextField(Inter.getLocText("FR-Designer_AlphaFine")); initTextFieldKeyListener(); searchTextField.setFont(AlphaFineConstants.GREATER_FONT); searchTextField.setBackground(Color.white); diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index 3c6d79d4d..75aa03f71 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -1999,7 +1999,7 @@ FR-Designer_Templates_Content=Templates Contents FR-Designer_AlphaFine_ShowAll=show all FR-Designer_AlphaFine_Latest=Latest FR-Designer_AlphaFine_ShowLess=show less -FR-Designer_Alphafine=AlphaFine +FR-Designer_AlphaFine=AlphaFine FR-Designer-Alphafine_No_Remind= <<<<<<< HEAD FR-Designer_AlphaFine_NoResult=no results diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties index 1d11d02d1..addb7514c 100644 --- a/designer_base/src/com/fr/design/locale/designer_en_US.properties +++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties @@ -1997,7 +1997,7 @@ FR-Designer_Templates_Content=Files'contents FR-Designer_AlphaFine_ShowAll=Show all FR-Designer_AlphaFine_Latest=Recent FR-Designer_AlphaFine_ShowLess=Show less -FR-Designer_Alphafine=AlphaFine +FR-Designer_AlphaFine=AlphaFine <<<<<<< HEAD FR-Designer-Alphafine_No_Remind=don't remind FR-Designer_AlphaFine_NoResult=No results diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index 9e5a80bfa..44ffa555b 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -1997,7 +1997,7 @@ FR-Designer_AlphaFine_ShowAll=\u663E\u793A\u5168\u90E8 FR-Designer_AlphaFine_Recommend=\u731C\u60A8\u9700\u8981 FR-Designer_AlphaFine_Latest=\u672C\u5730\u5E38\u7528 FR-Designer_AlphaFine_ShowLess=\u6536\u8D77 -FR-Designer_Alphafine=AlphaFine\u667A\u80FD\u641C\u7D22 +FR-Designer_AlphaFine=AlphaFine\u667A\u80FD\u641C\u7D22 FR-Designer-Alphafine_No_Remind=\u4E0D\u518D\u63D0\u793A FR-Designer_AlphaFine_NoResult=\u6682\u65E0\u76F8\u5173\u5185\u5BB9 FR-Designer_ConnectionFailed=\u94FE\u63A5\u5931\u8D25 diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties index 313e86740..e3f98c9c5 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties @@ -1997,7 +1997,7 @@ FR-Designer_Templates=\u6A21\u677F FR-Designer_Templates_Content=\u6A21\u677F\u5167\u5BB9 FR-Designer_AlphaFine_Latest=\u6700\u8FD1\u5E38\u7528 FR-Designer_AlphaFine_ShowLess=\u6536\u8D77 -FR-Designer_Alphafine=AlphaFine\u667A\u80FD\u641C\u7D22 +FR-Designer_AlphaFine=AlphaFine\u667A\u80FD\u641C\u7D22 FR-Designer_AlphaFine_ShowAll=\u986F\u793A\u5168\u90E8 FR-Designer-Alphafine_No_Remind=\u4E0D\u518D\u63D0\u793A FR-Designer_AlphaFine_NoResult=\u66AB\u7121\u76F8\u95DC\u5167\u5BB9 From fc07b767bb008cd8c995b268a50aabc4f39fd8f5 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Thu, 13 Jul 2017 16:38:18 +0800 Subject: [PATCH 5/8] =?UTF-8?q?placeholder=E6=94=B9=E9=94=99=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/mainframe/alphafine/component/AlphaFineDialog.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java index c2d5a53c4..074279e7c 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -68,7 +68,7 @@ public class AlphaFineDialog extends UIDialog { private static final String DS_NAME = "dsname=\""; private static final String PLUGIN_MARK_SHORT = "k:4 "; private static final String PLUGIN_MARK = "k:shop "; - private static final String PLACE_HOLDER = "AlphaFine"; + private static final String PLACE_HOLDER = Inter.getLocText("FR-Designer_AlphaFine"); private AlphaFineTextField searchTextField; private UIButton closeButton; @@ -168,7 +168,7 @@ public class AlphaFineDialog extends UIDialog { * 初始化输入框 */ private void initSearchTextField() { - searchTextField = new AlphaFineTextField(Inter.getLocText("FR-Designer_AlphaFine")); + searchTextField = new AlphaFineTextField(PLACE_HOLDER); initTextFieldKeyListener(); searchTextField.setFont(AlphaFineConstants.GREATER_FONT); searchTextField.setBackground(Color.white); From 19303658da7de628bc3303f32b056cae45d7679f Mon Sep 17 00:00:00 2001 From: juhaoyu <2335173323@qq.com> Date: Fri, 14 Jul 2017 10:13:43 +0800 Subject: [PATCH 6/8] =?UTF-8?q?PFC-607=20=E6=8F=92=E4=BB=B6=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E5=88=A0=E9=99=A4=E6=9B=B4=E6=96=B0=E4=B8=8D=E9=87=8D?= =?UTF-8?q?=E5=90=AF=E6=94=AF=E6=8C=81=20=E8=A7=A3=E5=86=B3SandboxCollecti?= =?UTF-8?q?on=EF=BC=8C=E4=B8=8D=E5=85=B3=E9=97=AD=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E5=B0=B1=E6=97=A0=E6=B3=95GC=E7=9B=B8=E5=85=B3=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82=E6=94=B9=E6=88=90?= =?UTF-8?q?=E4=BA=86=E5=9C=A8=E5=86=85=E9=83=A8=E7=B1=BB=E4=B8=AD=E5=8F=AA?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=B8=80=E4=B8=AAID=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E5=85=B7=E4=BD=93=E7=9A=84=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/DesignerEnvManager.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/designer_base/src/com/fr/design/DesignerEnvManager.java b/designer_base/src/com/fr/design/DesignerEnvManager.java index 5658a318d..536574f9c 100644 --- a/designer_base/src/com/fr/design/DesignerEnvManager.java +++ b/designer_base/src/com/fr/design/DesignerEnvManager.java @@ -152,17 +152,19 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { designerEnvManager.setCurEnvName(name); } } + + GeneralContext.addEnvChangedListener(new EnvChangedListener() { + @Override + public void envChanged() { + + designerEnvManager.setCurrentDirectoryPrefix(FILEFactory.ENV_PREFIX); + designerEnvManager.setDialogCurrentDirectory(ProjectConstants.REPORTLETS_NAME); + } + }); + } - GeneralContext.addEnvChangedListener(new EnvChangedListener() { - @Override - public void envChanged() { - - designerEnvManager.setCurrentDirectoryPrefix(FILEFactory.ENV_PREFIX); - designerEnvManager.setDialogCurrentDirectory(ProjectConstants.REPORTLETS_NAME); - } - }); - + return designerEnvManager; } From 1aceeba735c8afb2271cf5874742e5fb78bd1f1b Mon Sep 17 00:00:00 2001 From: neil <459208047@qq.com> Date: Mon, 17 Jul 2017 15:42:08 +0800 Subject: [PATCH 7/8] =?UTF-8?q?REPORT-1013=20=E7=94=A8log4j=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=97=A5=E5=BF=97.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/DesignerEnvManager.java | 2 +- .../loghandler/DesignerLogAppendThread.java | 60 +++++++++++++++++++ .../loghandler/DesignerLogHandler.java | 24 ++------ .../com/fr/design/module/DesignModule.java | 6 +- 4 files changed, 70 insertions(+), 22 deletions(-) create mode 100644 designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogAppendThread.java diff --git a/designer_base/src/com/fr/design/DesignerEnvManager.java b/designer_base/src/com/fr/design/DesignerEnvManager.java index 536574f9c..d02d41abf 100644 --- a/designer_base/src/com/fr/design/DesignerEnvManager.java +++ b/designer_base/src/com/fr/design/DesignerEnvManager.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map.Entry; import java.util.logging.FileHandler; import java.util.logging.Handler; -import java.util.logging.Level; +import org.apache.log4j.Level; /** * The manager of Designer GUI. diff --git a/designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogAppendThread.java b/designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogAppendThread.java new file mode 100644 index 000000000..0d374bdfe --- /dev/null +++ b/designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogAppendThread.java @@ -0,0 +1,60 @@ +package com.fr.design.mainframe.loghandler; + +import com.fr.general.LogRecordTime; +import com.fr.stable.StringUtils; +import org.apache.log4j.Appender; +import org.apache.log4j.Logger; +import org.apache.log4j.WriterAppender; + +import java.io.PipedReader; +import java.io.PipedWriter; +import java.io.Writer; +import java.util.Date; +import java.util.Scanner; +import java.util.logging.Level; +import java.util.logging.LogRecord; + +/** + * Created by Administrator on 2017/6/2/0002. + */ +public class DesignerLogAppendThread extends Thread{ + + PipedReader reader; + + public DesignerLogAppendThread() { + Logger root = Logger.getRootLogger(); + // ȡӼ¼Դ + Appender appender = root.getAppender("design"); + // һδӵܵ + reader = new PipedReader(); + // һӵӵreader + Writer writer = null; + try { + writer = new PipedWriter(reader); + // appender + ((WriterAppender) appender).setWriter(writer); + } catch (Throwable e) { + } + } + + public void run() { + // ϵɨ + Scanner scanner = new Scanner(reader); + + // ɨ赽ַӡĿ + while (scanner.hasNext()) { + try { + Thread.sleep(100); + String log = scanner.nextLine(); + if (StringUtils.isEmpty(log)) { + return; + } + + LogRecordTime logRecordTime = new LogRecordTime(new Date(),new LogRecord(Level.INFO, log)); + DesignerLogHandler.getInstance().printRemoteLog(logRecordTime); + } catch (Throwable e) { + + } + } + } +} 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 e45ade484..ddf301fd2 100644 --- a/designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java +++ b/designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java @@ -18,15 +18,14 @@ import java.awt.*; import java.awt.event.*; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.logging.Handler; 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 = FRLogLevel.INFO.intValue(); - protected static final int ERRO_INT = FRLogLevel.ERROR.intValue(); - protected static final int SERVER_INT = FRLogLevel.SEVERE.intValue(); + protected static final int INFO_INT = FRLogLevel.INFO.toInt(); + protected static final int ERRO_INT = FRLogLevel.ERROR.toInt(); + protected static final int SERVER_INT = FRLogLevel.SEVERE.toInt(); private static final int GAP_X = -150; private static final int INFO_GAP_Y = -60; private static final int ERRO_GAP_Y = -40; @@ -91,7 +90,7 @@ public class DesignerLogHandler { @Override public void actionPerformed(ActionEvent e) { JPopupMenu showsetPopup = new JPopupMenu(); - int logLevelvalue = DesignerEnvManager.getEnvManager().getLogLevel().intValue(); + int logLevelvalue = DesignerEnvManager.getEnvManager().getLogLevel().toInt(); if (logLevelvalue <= INFO_INT) { showsetPopup.add(showInfo); showsetPopup.add(showError); @@ -169,21 +168,6 @@ public class DesignerLogHandler { } } }); - - // 写到日志面板上面的Log和日志工具栏 - FRContext.getLogger().addLogHandler(new Handler() { - public void publish(LogRecord logRecord) { - Date date = new Date(); - LogRecordTime logRecordTime = new LogRecordTime(date, logRecord); - printStackTrace(logRecordTime); - } - - public void flush() { - } - - public void close() { - } - }); } private JTextPane initLogJTextArea() { diff --git a/designer_base/src/com/fr/design/module/DesignModule.java b/designer_base/src/com/fr/design/module/DesignModule.java index f04aa5474..1929452b9 100644 --- a/designer_base/src/com/fr/design/module/DesignModule.java +++ b/designer_base/src/com/fr/design/module/DesignModule.java @@ -12,11 +12,11 @@ import com.fr.design.javascript.JavaScriptImplPane; import com.fr.design.javascript.ParameterJavaScriptPane; import com.fr.design.mainframe.App; import com.fr.design.mainframe.DesignerFrame; +import com.fr.design.mainframe.loghandler.DesignerLogAppendThread; import com.fr.general.Inter; import com.fr.general.ModuleContext; import com.fr.js.*; import com.fr.module.TopModule; -import com.fr.stable.ArrayUtils; import com.fr.stable.bridge.StableFactory; import com.fr.stable.plugin.ExtraDesignClassManagerProvider; @@ -45,6 +45,10 @@ public abstract class DesignModule extends TopModule { ActionFactory.registerCellInsertActionClass(actionsForInsertCellElement()); ActionFactory.registerFloatInsertActionClass(actionsForInsertFloatElement()); DesignModuleFactory.registerCreators4Hyperlink(hyperlinkTypes()); + + // 将log4j日志输出到设计器日志面板的线程. + DesignerLogAppendThread logTread = new DesignerLogAppendThread(); + logTread.start(); } public boolean isStarted() { From e2790a4cc8ffb16c10998e2b0343c88c4d70ef19 Mon Sep 17 00:00:00 2001 From: neil <459208047@qq.com> Date: Mon, 17 Jul 2017 15:45:51 +0800 Subject: [PATCH 8/8] utf8 --- .../loghandler/DesignerLogAppendThread.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogAppendThread.java b/designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogAppendThread.java index 0d374bdfe..12d281627 100644 --- a/designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogAppendThread.java +++ b/designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogAppendThread.java @@ -23,25 +23,25 @@ public class DesignerLogAppendThread extends Thread{ public DesignerLogAppendThread() { Logger root = Logger.getRootLogger(); - // ȡӼ¼Դ + // 获取子记录器的输出源 Appender appender = root.getAppender("design"); - // һδӵܵ + // 定义一个未连接的输入流管道 reader = new PipedReader(); - // һӵӵreader + // 定义一个已连接的输出流管理，并连接到reader Writer writer = null; try { writer = new PipedWriter(reader); - // appender + // 设置 appender 输出流 ((WriterAppender) appender).setWriter(writer); } catch (Throwable e) { } } public void run() { - // ϵɨ + // 不间断地扫描输入流 Scanner scanner = new Scanner(reader); - // ɨ赽ַӡĿ + // 将扫描到的字符流打印在屏目 while (scanner.hasNext()) { try { Thread.sleep(100);