From cc03fe5bc631fb165c4096d7853d986c66677584 Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Thu, 12 Oct 2017 15:24:32 +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

---
 .../design/editor/ValueEditorPaneFactory.java | 10 ++++-----
 .../hyperlink/ReporletHyperNorthPane.java     | 10 ++++-----
 .../fr/design/hyperlink/WebHyperlinkPane.java |  3 ++-
 .../javascript/ParameterJavaScriptPane.java   |  2 +-
 .../impl/ChartHyperRelateCellLinkPane.java    |  6 ++---
 .../impl/ChartHyperRelateFloatLinkPane.java   |  4 ++--
 .../impl/FormHyperlinkPane.java               | 10 ++++-----
 .../other/ChartDesignerInteractivePane.java   | 22 +++++++++----------
 8 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/designer_base/src/com/fr/design/editor/ValueEditorPaneFactory.java b/designer_base/src/com/fr/design/editor/ValueEditorPaneFactory.java
index f9425ec2b..7d0316273 100644
--- a/designer_base/src/com/fr/design/editor/ValueEditorPaneFactory.java
+++ b/designer_base/src/com/fr/design/editor/ValueEditorPaneFactory.java
@@ -252,7 +252,7 @@ public class ValueEditorPaneFactory {
                 new DateEditor(true, Inter.getLocText("FR-Designer_Date")),
                 new BooleanEditor(),
                 formulaEditor,
-                new WidgetNameEditor(Inter.getLocText("Widget"))
+                new WidgetNameEditor(Inter.getLocText("FR-Designer_Widget"))
         };
     }
 
@@ -316,7 +316,7 @@ public class ValueEditorPaneFactory {
      */
     public static Editor<?>[] URLEditors(String popupName, String textEditorValue) {
         return new Editor[]{
-                new NoneEditor(textEditorValue, StringUtils.isEmpty(popupName) ? Inter.getLocText("None") : popupName),
+                new NoneEditor(textEditorValue, StringUtils.isEmpty(popupName) ? Inter.getLocText("FR-Designer_None") : popupName),
                 new TextEditor()
         };
     }
@@ -330,7 +330,7 @@ public class ValueEditorPaneFactory {
      */
     public static Editor<?>[] dateEditors(String popupName, String textEditorValue) {
         return new Editor[]{
-                new NoneEditor(textEditorValue, StringUtils.isEmpty(popupName) ? Inter.getLocText("None") : popupName),
+                new NoneEditor(textEditorValue, StringUtils.isEmpty(popupName) ? Inter.getLocText("FR-Designer_None") : popupName),
                 new DateEditor(true, Inter.getLocText("FR-Designer_Date")),
                 new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula"))
         };
@@ -493,12 +493,12 @@ public class ValueEditorPaneFactory {
 
         JPanel paneLeft = FRGUIPaneFactory.createBorderLayout_S_Pane();
         pane.add(paneLeft);
-        paneLeft.add(new UILabel(" " + Inter.getLocText("Actual_Value") + ":"), BorderLayout.NORTH);
+        paneLeft.add(new UILabel(" " + Inter.getLocText("FR-Designer_Actual_Value") + ":"), BorderLayout.NORTH);
         paneLeft.add(keyColumnPane, BorderLayout.CENTER);
 
         JPanel paneRight = FRGUIPaneFactory.createBorderLayout_S_Pane();
         pane.add(paneRight);
-        paneRight.add(new UILabel(" " + Inter.getLocText("Display_Value") + ":"), BorderLayout.NORTH);
+        paneRight.add(new UILabel(" " + Inter.getLocText("FR-Designer_Display_Value") + ":"), BorderLayout.NORTH);
 
         paneRight.add(valueDictPane, BorderLayout.CENTER);
 
diff --git a/designer_base/src/com/fr/design/hyperlink/ReporletHyperNorthPane.java b/designer_base/src/com/fr/design/hyperlink/ReporletHyperNorthPane.java
index b450f6dda..b02c9dfae 100644
--- a/designer_base/src/com/fr/design/hyperlink/ReporletHyperNorthPane.java
+++ b/designer_base/src/com/fr/design/hyperlink/ReporletHyperNorthPane.java
@@ -86,13 +86,13 @@ public class ReporletHyperNorthPane extends AbstractHyperNorthPane<ReportletHype
         Component[][] components;
         if (!this.needRenamePane) {
             components = new Component[][]{
-                    {new UILabel(" " + Inter.getLocText("Reportlet") + ":"), reportletNamePane},
+                    {new UILabel(" " + Inter.getLocText("FR-Hyperlink_Reportlet") + ":"), reportletNamePane},
             };
         } else {
             itemNameTextField = new UITextField();
             components = new Component[][]{
-                    {new UILabel(" " + Inter.getLocText("Name") + ":"), itemNameTextField},
-                    {new UILabel(" " + Inter.getLocText("Reportlet") + ":"), reportletNamePane},
+                    {new UILabel(" " + Inter.getLocText("FR-Designer-Hyperlink_Name") + ":"), itemNameTextField},
+                    {new UILabel(" " + Inter.getLocText("FR-Hyperlink_Reportlet") + ":"), reportletNamePane},
             };
         }
         JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
@@ -134,7 +134,7 @@ public class ReporletHyperNorthPane extends AbstractHyperNorthPane<ReportletHype
     }
 
     public String getReportletName() {
-        return StringUtils.isBlank(this.reportPathTextField.getText()) ? "" : this.reportPathTextField.getText().substring(1);
+        return StringUtils.isBlank(this.reportPathTextField.getText()) ? StringUtils.EMPTY : this.reportPathTextField.getText().substring(1);
     }
 
     /**
@@ -155,7 +155,7 @@ public class ReporletHyperNorthPane extends AbstractHyperNorthPane<ReportletHype
         }
 
         public void actionPerformed(ActionEvent e) {
-
+            //do nothing
         }
     }
 
diff --git a/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java b/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java
index 25d698e86..26c649a6f 100644
--- a/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java
+++ b/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java
@@ -16,6 +16,7 @@ import java.util.HashMap;
 import java.util.List;
 
 public class WebHyperlinkPane extends AbstractHyperLinkPane<WebHyperlink> {
+    private final int BORDER_WIDTH = 4;
     private WebHyperNorthPane northPane;
 
     private UICheckBox useCJKCheckBox;
@@ -34,7 +35,7 @@ public class WebHyperlinkPane extends AbstractHyperLinkPane<WebHyperlink> {
 
     protected void initComponents() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        this.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
+        this.setBorder(BorderFactory.createEmptyBorder(BORDER_WIDTH, BORDER_WIDTH, BORDER_WIDTH, BORDER_WIDTH));
 
         northPane = new WebHyperNorthPane(needRenamePane());
         this.add(northPane, BorderLayout.NORTH);
diff --git a/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java b/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java
index a1129573b..0a6774507 100644
--- a/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java
+++ b/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java
@@ -29,7 +29,7 @@ public class ParameterJavaScriptPane extends AbstractHyperLinkPane<ParameterJava
         this.add(parameterViewPane, BorderLayout.CENTER);
         if (needRenamePane()) {
             itemNameTextField = new UITextField();
-            this.add(GUICoreUtils.createNamedPane(itemNameTextField, Inter.getLocText("Name") + ":"), BorderLayout.NORTH);
+            this.add(GUICoreUtils.createNamedPane(itemNameTextField, Inter.getLocText("FR-Designer-Hyperlink_Name") + ":"), BorderLayout.NORTH);
         }
     }
 
diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java
index 0904957c7..6b2e506d3 100644
--- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java
+++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java
@@ -42,19 +42,19 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
         this.setLayout(FRGUIPaneFactory.createM_BorderLayout());
         if (needRenamePane()) {
             itemNameTextField = new UITextField();
-            this.add(GUICoreUtils.createNamedPane(itemNameTextField, Inter.getLocText("Name") + ":"), BorderLayout.NORTH);
+            this.add(GUICoreUtils.createNamedPane(itemNameTextField, Inter.getLocText("FR-Designer_Name") + ":"), BorderLayout.NORTH);
         }
 
         JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
         this.add(centerPane, BorderLayout.CENTER);
 
-        centerPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText(new String[]{"Related", "Cell"})));
+        centerPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText(new String[]{"Related", "FR-Designer_Cell"})));
 
         colRowPane = new ColumnRowVerticalPane();
         centerPane.add(colRowPane, BorderLayout.NORTH);
 
         parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
-        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("Parameters")));
+        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Parameter")));
         parameterViewPane.setPreferredSize(new Dimension(500, 200));
         this.add(parameterViewPane, BorderLayout.SOUTH);
     }
diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
index e12f08ed1..bfda6332e 100644
--- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
+++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
@@ -50,7 +50,7 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
 
         if (needRenamePane()) {
             itemNameTextField = new UITextField();
-            this.add(GUICoreUtils.createNamedPane(itemNameTextField, Inter.getLocText("Name") + ":"), BorderLayout.NORTH);
+            this.add(GUICoreUtils.createNamedPane(itemNameTextField, Inter.getLocText("FR-Designer-Hyperlink_Name") + ":"), BorderLayout.NORTH);
         }
 
         this.add(centerPane, BorderLayout.CENTER);
@@ -70,7 +70,7 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
         centerPane.add(pane, BorderLayout.NORTH);
 
         parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
-        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("Parameters")));
+        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Parameter")));
         parameterViewPane.setPreferredSize(new Dimension(500, 200));
         this.add(parameterViewPane, BorderLayout.SOUTH);
     }
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 5924f89da..b83a7bcc1 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 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(4, 4, 4, 4));
+        this.setBorder(BorderFactory.createEmptyBorder(BORDER_WIDTH, BORDER_WIDTH, BORDER_WIDTH, BORDER_WIDTH));
         northPane = new FormHyperlinkNorthPane(needRenamePane());
         this.add(northPane, BorderLayout.NORTH);
 
@@ -48,10 +48,8 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane<FormHyperlinkProvid
     }
 
     protected int getHyperlinkType() {
-        if (northPane.getEditingEditor() != null) {
-            if (northPane.getEditingEditor().acceptType(ElementCaseEditorProvider.class)) {
-                return FormHyperlinkProvider.ELEMENTCASE;
-            }
+        if (northPane.getEditingEditor() != null && northPane.getEditingEditor().acceptType(ElementCaseEditorProvider.class)) {
+            return FormHyperlinkProvider.ELEMENTCASE;
         }
         return FormHyperlinkProvider.CHART;
     }
diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartDesignerInteractivePane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartDesignerInteractivePane.java
index 0ca4c66e0..19d3a8c5e 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartDesignerInteractivePane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartDesignerInteractivePane.java
@@ -30,23 +30,23 @@ public class ChartDesignerInteractivePane extends ChartInteractivePane {
     }
 
     protected List<ChartUIMenuNameableCreator> refreshList(HashMap map) {
-   		List<ChartUIMenuNameableCreator> list = new ArrayList<ChartUIMenuNameableCreator>();
+        List<ChartUIMenuNameableCreator> list = new ArrayList<ChartUIMenuNameableCreator>();
         java.util.HashMap<String, Formula> hyperLinkEditorMap = plot.getHyperLinkEditorMap();
 
-   		list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Hyperlink-Web_link"),
-                   new WebHyperlink(), getUseMap(map, WebHyperlink.class)));
-   		list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap,"JavaScript", new JavaScriptImpl(), getUseMap(map, JavaScriptImpl.class)));
-        list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("RelatedChart"),null,null));
+        list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Hyperlink-Web_link"),
+                new WebHyperlink(), getUseMap(map, WebHyperlink.class)));
+        list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, "FR-Designer_JavaScript", new JavaScriptImpl(), getUseMap(map, JavaScriptImpl.class)));
+        list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("FR-Engine_Interactive-chart"), null, null));
 
-   		return list;
-   	}
+        return list;
+    }
 
-    protected void populateAutoRefresh(Chart chart){
+    protected void populateAutoRefresh(Chart chart) {
         super.populateAutoRefresh(chart);
-        if(chart.getFilterDefinition() != null){
-            TopDefinition definition = (TopDefinition)chart.getFilterDefinition();
+        if (chart.getFilterDefinition() != null) {
+            TopDefinition definition = (TopDefinition) chart.getFilterDefinition();
             isAutoRefresh.setEnabled(definition.isSupportAutoRefresh());
-            if(!isAutoRefresh.isEnabled()){
+            if (!isAutoRefresh.isEnabled()) {
                 isAutoRefresh.setSelected(false);
             }
             autoRefreshTime.setEnabled(definition.isSupportAutoRefresh());