Browse Source

Pull request #2229: REPORT-38645 【JDK11】设计器右上角,fs插件管理点击登录无反应

Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0

* commit '5610f5a3054edd08957e2a29c19422ca76a89875':
  REPORT-38645 【JDK11】设计器右上角,fs插件管理点击登录无反应
research/11.0
Hades 4 years ago
parent
commit
48d927f4cd
  1. 4
      designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java
  2. 2
      designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java

4
designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java

@ -159,7 +159,7 @@ public class WebViewDlgHelper {
}
public static void createLoginDialog() {
if (StableUtils.getMajorJavaVersion() == VERSION_8) {
if (StableUtils.getMajorJavaVersion() >= VERSION_8) {
File file = new File(StableUtils.pathJoin(installHome, "scripts"));
if (!file.exists()) {
confirmDownLoadShopJS();
@ -172,7 +172,7 @@ public class WebViewDlgHelper {
public static void createLoginDialog(Window parent) {
if (StableUtils.getMajorJavaVersion() == VERSION_8) {
if (StableUtils.getMajorJavaVersion() >= VERSION_8) {
File file = new File(StableUtils.pathJoin(installHome, "scripts"));
if (!file.exists()) {
confirmDownLoadShopJS();

2
designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java

@ -199,7 +199,7 @@ public class UserInfoLabel extends UILabel {
this.addMouseListener(userInfoAdapter);
this.setHorizontalAlignment(SwingConstants.CENTER);
if (StableUtils.getMajorJavaVersion() == VERSION_8) {
if (StableUtils.getMajorJavaVersion() >= VERSION_8) {
LoginWebBridge.getHelper().setUILabel(UserInfoLabel.this);
PluginWebBridge.getHelper().setUILabel(UserInfoLabel.this);
}

Loading…
Cancel
Save