From 8637ca61e78cda0db123151db731a1b2ccef1103 Mon Sep 17 00:00:00 2001 From: "Hugh.C" Date: Thu, 10 Oct 2019 10:05:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-22291=20=E6=A8=A1=E7=89=88=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E6=8E=A7=E5=88=B6=EF=BC=8C=E8=BF=9C=E7=A8=8B=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=88=9A=E5=8D=87=E7=BA=A7=E5=88=B010.0.4=E7=9A=84?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=EF=BC=8C=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=B9=E5=BC=80=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/actions/file/PreferencePane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index 6a8132a609..3c1d7ed4db 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java @@ -305,7 +305,7 @@ public class PreferencePane extends BasicPane { gcButton.setEnabled(gcEnableCheckBox.isSelected()); } }); - + gcEnableCheckBox.setSelected(GcConfig.getInstance().isGcEnable()); //集群下禁用 if (ClusterBridge.isClusterMode()) { gcEnableCheckBox.setEnabled(false); From ccab3dd2279a12f4eb9771d8da02e05797c44774 Mon Sep 17 00:00:00 2001 From: "Hugh.C" Date: Thu, 10 Oct 2019 14:40:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-20329=20sonar=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/gui/syntax/ui/rsyntaxtextarea/SyntaxView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/SyntaxView.java b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/SyntaxView.java index fcae55615b..4ee6fe978d 100644 --- a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/SyntaxView.java +++ b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/SyntaxView.java @@ -374,7 +374,7 @@ public class SyntaxView extends View implements TabExpander, if (host.isCodeFoldingEnabled()) { visibleLineCount -= host.getFoldManager().getHiddenLineCount(); } - return visibleLineCount * lineHeight; + return (float) visibleLineCount * lineHeight; default: throw new IllegalArgumentException("Invalid axis: " + axis); } From 228010dbe7ff2953f3b6c9ecabb99bdd44dbf3ee Mon Sep 17 00:00:00 2001 From: "Hugh.C" Date: Thu, 10 Oct 2019 14:44:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-22291=20=E6=92=A4=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/actions/file/PreferencePane.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index 3c1d7ed4db..72b87d4252 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java @@ -305,7 +305,6 @@ public class PreferencePane extends BasicPane { gcButton.setEnabled(gcEnableCheckBox.isSelected()); } }); - gcEnableCheckBox.setSelected(GcConfig.getInstance().isGcEnable()); //集群下禁用 if (ClusterBridge.isClusterMode()) { gcEnableCheckBox.setEnabled(false);