From da28b35f825cb19d18e7991d46a24ca2ad36ca90 Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Thu, 12 Oct 2017 15:45:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E8=B4=A8?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/hyperlink/ReportletHyperlinkPane.java   | 2 +-
 .../src/com/fr/design/hyperlink/WebHyperlinkPane.java     | 6 +++---
 .../src/com/fr/design/javascript/JavaScriptImplPane.java  | 6 +++---
 .../com/fr/design/javascript/ParameterJavaScriptPane.java | 2 +-
 designer_base/src/com/fr/design/module/DesignModule.java  | 8 ++++----
 .../series/SeriesCondition/impl/FormHyperlinkPane.java    | 6 +++---
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java b/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java
index d7e1cf7336..2406786e02 100644
--- a/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java
+++ b/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java
@@ -128,7 +128,7 @@ public class ReportletHyperlinkPane extends AbstractHyperLinkPane<ReportletHyper
         }
     }
 
-    public static class chartNoRename extends ReportletHyperlinkPane {
+    public static class ChartNoRename extends ReportletHyperlinkPane {
         protected int getChartParaType() {
             return ParameterTableModel.CHART_NORMAL_USE;
         }
diff --git a/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java b/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java
index ac8383767c..c9e0d2ec2b 100644
--- a/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java
+++ b/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java
@@ -16,7 +16,7 @@ import java.util.HashMap;
 import java.util.List;
 
 public class WebHyperlinkPane extends AbstractHyperLinkPane<WebHyperlink> {
-    private final int borderWidth = 4;
+    private static final int BORDER_WIDTH = 4;
     private WebHyperNorthPane northPane;
 
     private UICheckBox useCJKCheckBox;
@@ -35,7 +35,7 @@ public class WebHyperlinkPane extends AbstractHyperLinkPane<WebHyperlink> {
 
     protected void initComponents() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        this.setBorder(BorderFactory.createEmptyBorder(borderWidth, borderWidth, borderWidth, borderWidth));
+        this.setBorder(BorderFactory.createEmptyBorder(BORDER_WIDTH, BORDER_WIDTH, BORDER_WIDTH, BORDER_WIDTH));
 
         northPane = new WebHyperNorthPane(needRenamePane());
         this.add(northPane, BorderLayout.NORTH);
@@ -92,7 +92,7 @@ public class WebHyperlinkPane extends AbstractHyperLinkPane<WebHyperlink> {
         webHyperlink.setExtendParameters(this.extendParametersCheckBox.isSelected());
     }
 
-    public static class chartNoRename extends WebHyperlinkPane {
+    public static class ChartNoRename extends WebHyperlinkPane {
         protected boolean needRenamePane() {
             return false;
         }
diff --git a/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java b/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java
index 3a700c9d7c..3c67ba7b05 100644
--- a/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java
+++ b/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java
@@ -25,7 +25,7 @@ import java.util.HashSet;
 import java.util.List;
 
 public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
-    private final int bottomBorder = 12;
+    private static final int BOTTOM_BORDER = 12;
     private UITextField itemNameTextField;
     private JSContentPane jsPane;
     private UITableEditorPane<String> importedJsPane;
@@ -95,7 +95,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
                 parameterPane, BorderLayout.EAST
         );
         topPane.setPreferredSize(new Dimension(300, 150));
-        topPane.setBorder(BorderFactory.createEmptyBorder(0, 0, bottomBorder, 0));
+        topPane.setBorder(BorderFactory.createEmptyBorder(0, 0, BOTTOM_BORDER, 0));
 
         this.setLayout(new BorderLayout());
         this.add(topPane, BorderLayout.NORTH);
@@ -209,7 +209,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
         }
     }
 
-    public static class chartNoRename extends JavaScriptImplPane {
+    public static class ChartNoRename extends JavaScriptImplPane {
         protected int getChartParaType() {
             return ParameterTableModel.CHART_NORMAL_USE;
         }
diff --git a/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java b/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java
index 3a7957e00e..9ac045d0e9 100644
--- a/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java
+++ b/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java
@@ -70,7 +70,7 @@ public class ParameterJavaScriptPane extends AbstractHyperLinkPane<ParameterJava
         }
     }
 
-    public static class chartNoRename extends ParameterJavaScriptPane {
+    public static class ChartNoRename extends ParameterJavaScriptPane {
         protected int getChartParaType() {
             return ParameterTableModel.CHART_NORMAL_USE;
         }
diff --git a/designer_base/src/com/fr/design/module/DesignModule.java b/designer_base/src/com/fr/design/module/DesignModule.java
index 91ad907689..2830566c2e 100644
--- a/designer_base/src/com/fr/design/module/DesignModule.java
+++ b/designer_base/src/com/fr/design/module/DesignModule.java
@@ -91,11 +91,11 @@ public abstract class DesignModule extends TopModule {
 
     public NameableCreator[] hyperlinkTypes() {
         return new NameableCreator[]{
-                new NameObjectCreator(Inter.getLocText("FR-Hyperlink_Reportlet"), ReportletHyperlink.class, ReportletHyperlinkPane.chartNoRename.class),
+                new NameObjectCreator(Inter.getLocText("FR-Hyperlink_Reportlet"), ReportletHyperlink.class, ReportletHyperlinkPane.ChartNoRename.class),
                 new NameObjectCreator(Inter.getLocText("FR-Designer_Email"), EmailJavaScript.class, EmailPane.class),
-                new NameObjectCreator(Inter.getLocText("Hyperlink-Web_link"), WebHyperlink.class, WebHyperlinkPane.chartNoRename.class),
-                new NameObjectCreator(Inter.getLocText("JavaScript-Dynamic_Parameters"), ParameterJavaScript.class, ParameterJavaScriptPane.chartNoRename.class),
-                new NameObjectCreator("FR-Designer_JavaScript", JavaScriptImpl.class, JavaScriptImplPane.chartNoRename.class)
+                new NameObjectCreator(Inter.getLocText("Hyperlink-Web_link"), WebHyperlink.class, WebHyperlinkPane.ChartNoRename.class),
+                new NameObjectCreator(Inter.getLocText("JavaScript-Dynamic_Parameters"), ParameterJavaScript.class, ParameterJavaScriptPane.ChartNoRename.class),
+                new NameObjectCreator("FR-Designer_JavaScript", JavaScriptImpl.class, JavaScriptImplPane.ChartNoRename.class)
         };
     }
 
diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java
index 10ea529765..0b670599d6 100644
--- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java
+++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java
@@ -17,7 +17,7 @@ import java.awt.*;
 import java.util.HashMap;
 
 public class FormHyperlinkPane extends AbstractHyperLinkPane<FormHyperlinkProvider> {
-    private final int borderWidth = 4;
+    private static final int BORDER_WIDTH = 4;
     private FormHyperlinkNorthPane northPane;
 
 
@@ -33,7 +33,7 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane<FormHyperlinkProvid
 
     protected void initComponents() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        this.setBorder(BorderFactory.createEmptyBorder(borderWidth, borderWidth, borderWidth, borderWidth));
+        this.setBorder(BorderFactory.createEmptyBorder(BORDER_WIDTH, BORDER_WIDTH, BORDER_WIDTH, BORDER_WIDTH));
         northPane = new FormHyperlinkNorthPane(needRenamePane());
         this.add(northPane, BorderLayout.NORTH);
 
@@ -90,7 +90,7 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane<FormHyperlinkProvid
         }
     }
 
-    public static class CHART_NO_RENAME extends FormHyperlinkPane {
+    public static class ChartNoRename extends FormHyperlinkPane {
         protected boolean needRenamePane() {
             return false;
         }