From 87bd092c93940bc073fee20395481953e7e6b498 Mon Sep 17 00:00:00 2001 From: vito Date: Sat, 11 Nov 2017 14:47:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-5518=20[9.0=E4=B8=89=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]jdk1.7=E7=9A=84=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E8=B5=B7=E4=B8=8D=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/mainframe/bbs/UserInfoLabel.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java index 940bc9b4f..e2dfb0866 100644 --- a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java +++ b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java @@ -25,6 +25,7 @@ import com.fr.general.SiteCenter; import com.fr.general.http.HttpClient; import com.fr.stable.EncodeConstants; import com.fr.stable.OperatingSystem; +import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; import javax.swing.SwingConstants; @@ -98,8 +99,10 @@ public class UserInfoLabel extends UILabel { this.setHorizontalAlignment(SwingConstants.CENTER); this.setText(userName); - LoginWebBridge.getHelper().setUILabel(UserInfoLabel.this); - PluginWebBridge.getHelper().setUILabel(UserInfoLabel.this); + if (StableUtils.getMajorJavaVersion() == 8) { + LoginWebBridge.getHelper().setUILabel(UserInfoLabel.this); + PluginWebBridge.getHelper().setUILabel(UserInfoLabel.this); + } UserLoginContext.addLoginContextListener(new LoginContextListener() { @Override From 09416aca4dd2fef74d61f7851cf4fc70a6a959df Mon Sep 17 00:00:00 2001 From: vito Date: Sat, 11 Nov 2017 14:51:18 +0800 Subject: [PATCH 2/2] pmd --- designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java index e2dfb0866..b313ac1ba 100644 --- a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java +++ b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java @@ -52,6 +52,7 @@ import java.util.concurrent.TimeUnit; */ public class UserInfoLabel extends UILabel { + private static final int VERSION_8 = 8; //默认查询消息时间, 30s private static final long CHECK_MESSAGE_TIME = 30 * 1000L; //默认论坛检测到更新后的弹出延迟时间 @@ -99,7 +100,7 @@ public class UserInfoLabel extends UILabel { this.setHorizontalAlignment(SwingConstants.CENTER); this.setText(userName); - if (StableUtils.getMajorJavaVersion() == 8) { + if (StableUtils.getMajorJavaVersion() == VERSION_8) { LoginWebBridge.getHelper().setUILabel(UserInfoLabel.this); PluginWebBridge.getHelper().setUILabel(UserInfoLabel.this); }