From b70e83ab0d0fd41abc47f021eee8bac073af4e8b Mon Sep 17 00:00:00 2001 From: vito Date: Mon, 11 Sep 2017 10:50:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/start/StartServer.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/designer_base/src/com/fr/start/StartServer.java b/designer_base/src/com/fr/start/StartServer.java index 0d87dfb3e..27f89e1e4 100644 --- a/designer_base/src/com/fr/start/StartServer.java +++ b/designer_base/src/com/fr/start/StartServer.java @@ -14,10 +14,7 @@ import com.fr.env.SignIn; import com.fr.general.ComparatorUtils; import com.fr.general.GeneralContext; import com.fr.general.Inter; -import com.fr.stable.EnvChangedListener; -import com.fr.stable.ProductConstants; -import com.fr.stable.StableUtils; -import com.fr.stable.StringUtils; +import com.fr.stable.*; import com.fr.stable.project.ProjectConstants; import com.fr.start.server.JettyHost; From bb11bc1bed0316495638dea5533c1b870a4b0ead Mon Sep 17 00:00:00 2001 From: vito Date: Mon, 11 Sep 2017 16:28:01 +0800 Subject: [PATCH 2/4] pmd --- designer_base/src/com/fr/start/StartServer.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/start/StartServer.java b/designer_base/src/com/fr/start/StartServer.java index 27f89e1e4..56cc557aa 100644 --- a/designer_base/src/com/fr/start/StartServer.java +++ b/designer_base/src/com/fr/start/StartServer.java @@ -14,7 +14,11 @@ import com.fr.env.SignIn; import com.fr.general.ComparatorUtils; import com.fr.general.GeneralContext; import com.fr.general.Inter; -import com.fr.stable.*; +import com.fr.stable.EnvChangedListener; +import com.fr.stable.ProductConstants; +import com.fr.stable.StableUtils; +import com.fr.stable.StringUtils; +import com.fr.stable.OperatingSystem; import com.fr.stable.project.ProjectConstants; import com.fr.start.server.JettyHost; From 6671ca142741a54462c99ea086f924d64a350f74 Mon Sep 17 00:00:00 2001 From: vito Date: Tue, 12 Sep 2017 09:06:44 +0800 Subject: [PATCH 3/4] pmd --- designer_base/src/com/fr/start/StartServer.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/start/StartServer.java b/designer_base/src/com/fr/start/StartServer.java index 56cc557aa..c235c4f68 100644 --- a/designer_base/src/com/fr/start/StartServer.java +++ b/designer_base/src/com/fr/start/StartServer.java @@ -180,10 +180,16 @@ public class StartServer { private static class InformationPane extends BasicPane { private static final long serialVersionUID = 1L; + private final int FREE_STYLE_TOP = 15; + private final int FREE_STYLE_OTHER = 5; public InformationPane(String message) { + init(message); + } + + private void init(String message) { this.setLayout(new BorderLayout(10, 10)); - this.setBorder(BorderFactory.createEmptyBorder(15, 5, 5, 5)); + this.setBorder(BorderFactory.createEmptyBorder(FREE_STYLE_TOP, FREE_STYLE_OTHER, FREE_STYLE_OTHER, FREE_STYLE_OTHER)); String text; if (!ComparatorUtils.equals(message, Inter.getLocText(new String[]{"Default", "Utils-Report_Runtime_Env"}))) { text = new StringBuffer(Inter.getLocText("FR-Designer_Open")) From 0a35cc2864dd3738e9e18c2ae6a4ab6c607e1c24 Mon Sep 17 00:00:00 2001 From: vito Date: Tue, 12 Sep 2017 09:08:03 +0800 Subject: [PATCH 4/4] pmd --- designer_base/src/com/fr/start/StartServer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/start/StartServer.java b/designer_base/src/com/fr/start/StartServer.java index c235c4f68..ee06ede80 100644 --- a/designer_base/src/com/fr/start/StartServer.java +++ b/designer_base/src/com/fr/start/StartServer.java @@ -180,8 +180,8 @@ public class StartServer { private static class InformationPane extends BasicPane { private static final long serialVersionUID = 1L; - private final int FREE_STYLE_TOP = 15; - private final int FREE_STYLE_OTHER = 5; + private static final int FREE_STYLE_TOP = 15; + private static final int FREE_STYLE_OTHER = 5; public InformationPane(String message) { init(message);