From 7b706e11c0984aafe700090cf3241e2a9037b126 Mon Sep 17 00:00:00 2001 From: "Henry.Wang" Date: Wed, 12 Aug 2020 19:54:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-36778=20=E3=80=90=E9=85=8D=E5=90=88?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E3=80=91=E7=89=88=E6=9C=AC=E5=8F=B7=E8=A7=84?= =?UTF-8?q?=E8=8C=83FR=E9=80=82=E9=85=8D=E4=BB=BB=E5=8A=A1=20=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E5=A4=9A=E5=A4=84=E7=9A=84=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/actions/help/AboutPane.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java index b1f4bad071..ce8165975e 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java @@ -303,12 +303,13 @@ public class AboutPane extends JPanel { public BoxCenterAlignmentCopyablePane(String title, String copyText, final String[] descriptions) { setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel centerPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - this.label = new UILabel(title); + if (!ComparatorUtils.equals(title, StringUtils.EMPTY)) { + this.label = new UILabel(title); + centerPane.add(label); + } this.textField = new UILabel(copyText); textField.setBackground(null); textField.setBorder(null); - - centerPane.add(label); centerPane.add(textField); textField.addMouseListener(new MouseAdapter() { @Override From 6a3492cd78745bd6057b2c0c27839f3bff6f4379 Mon Sep 17 00:00:00 2001 From: "Henry.Wang" Date: Wed, 12 Aug 2020 20:03:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-36778=20=E3=80=90=E9=85=8D=E5=90=88?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E3=80=91=E7=89=88=E6=9C=AC=E5=8F=B7=E8=A7=84?= =?UTF-8?q?=E8=8C=83FR=E9=80=82=E9=85=8D=E4=BB=BB=E5=8A=A1=20=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E5=A4=9A=E5=A4=84=E7=9A=84=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/actions/help/AboutPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java index ce8165975e..6158540888 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java @@ -303,7 +303,7 @@ public class AboutPane extends JPanel { public BoxCenterAlignmentCopyablePane(String title, String copyText, final String[] descriptions) { setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel centerPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - if (!ComparatorUtils.equals(title, StringUtils.EMPTY)) { + if (StringUtils.isNotEmpty(title)) { this.label = new UILabel(title); centerPane.add(label); }