From d822ea7665a15fcb98a72d4f044aab23df1a42ec Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Thu, 12 Oct 2017 13:48:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/hyperlink/AbstractHyperLinkPane.java  | 5 +++--
 .../src/com/fr/design/hyperlink/ReportletHyperlinkPane.java | 4 ++--
 .../src/com/fr/design/hyperlink/WebHyperlinkPane.java       | 4 ++--
 .../src/com/fr/design/javascript/JavaScriptImplPane.java    | 4 ++--
 .../com/fr/design/javascript/ParameterJavaScriptPane.java   | 6 +++---
 .../series/SeriesCondition/impl/ChartHyperPoplinkPane.java  | 6 +++---
 .../SeriesCondition/impl/ChartHyperRelateCellLinkPane.java  | 4 ++--
 .../SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java | 4 ++--
 .../series/SeriesCondition/impl/FormHyperlinkPane.java      | 4 ++--
 .../chart/custom/component/VanChartHyperLinkPane.java       | 4 ++--
 .../designer/component/ChartUIMenuNameableCreator.java      | 4 ++--
 11 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/designer_base/src/com/fr/design/hyperlink/AbstractHyperLinkPane.java b/designer_base/src/com/fr/design/hyperlink/AbstractHyperLinkPane.java
index 8629c60d48..5ed04136c9 100644
--- a/designer_base/src/com/fr/design/hyperlink/AbstractHyperLinkPane.java
+++ b/designer_base/src/com/fr/design/hyperlink/AbstractHyperLinkPane.java
@@ -14,10 +14,11 @@ import java.util.HashMap;
  */
 public abstract class AbstractHyperLinkPane<T> extends FurtherBasicBeanPane<T> {
     private HashMap hyperLinkEditorMap;
+    private boolean needRenamePane = false;
     protected ReportletParameterViewPane parameterViewPane;
 
 
-    public AbstractHyperLinkPane(HashMap hyperLinkEditorMap) {
+    public AbstractHyperLinkPane(HashMap hyperLinkEditorMap, boolean needRenamePane) {
         this.hyperLinkEditorMap = hyperLinkEditorMap;
     }
 
@@ -47,7 +48,7 @@ public abstract class AbstractHyperLinkPane<T> extends FurtherBasicBeanPane<T> {
     }
 
     protected boolean needRenamePane(){
-        return false;
+        return needRenamePane;
     }
 
 }
diff --git a/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java b/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java
index 51d8069ec7..24fac1482f 100644
--- a/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java
+++ b/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java
@@ -25,8 +25,8 @@ public class ReportletHyperlinkPane extends AbstractHyperLinkPane<ReportletHyper
     private ReporletHyperNorthPane northPane;
     private UICheckBox extendParametersCheckBox;
 
-    public ReportletHyperlinkPane(HashMap hyperLinkEditorMap) {
-        super(hyperLinkEditorMap);
+    public ReportletHyperlinkPane(HashMap hyperLinkEditorMap, boolean needRenamePane) {
+        super(hyperLinkEditorMap, needRenamePane);
         this.initComponents();
     }
 
diff --git a/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java b/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java
index 6860b7ac6d..176753bd95 100644
--- a/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java
+++ b/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java
@@ -27,8 +27,8 @@ public class WebHyperlinkPane extends AbstractHyperLinkPane<WebHyperlink> {
 		this.initComponents();
 	}
     
-	public WebHyperlinkPane(HashMap hyperLinkEditorMap) {
-		super(hyperLinkEditorMap);
+	public WebHyperlinkPane(HashMap hyperLinkEditorMap, boolean needRenamePane) {
+		super(hyperLinkEditorMap, needRenamePane);
 		this.initComponents();
 	}
 
diff --git a/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java b/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java
index 31ef732547..a449c89de1 100644
--- a/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java
+++ b/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java
@@ -36,8 +36,8 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
 		this(new String[0]);
 	}
 
-	public JavaScriptImplPane(HashMap hyperLinkEditorMap) {
-		super(hyperLinkEditorMap);
+	public JavaScriptImplPane(HashMap hyperLinkEditorMap, boolean needRenamePane) {
+		super(hyperLinkEditorMap, needRenamePane);
 		this.defaultArgs = new String[0];
 		initComponents();
 	}
diff --git a/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java b/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java
index fda398d499..bc07199ba2 100644
--- a/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java
+++ b/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java
@@ -19,11 +19,11 @@ public class ParameterJavaScriptPane extends AbstractHyperLinkPane<ParameterJava
 
 
     public ParameterJavaScriptPane(){
-        this(null);
+        this(null, false);
     }
 
-	public ParameterJavaScriptPane(HashMap hyperLinkEditorMap){
-        super(hyperLinkEditorMap);
+	public ParameterJavaScriptPane(HashMap hyperLinkEditorMap, boolean needRenamePane){
+        super(hyperLinkEditorMap, needRenamePane);
 		this.setLayout(new  BorderLayout());
 		parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
 		this.add(parameterViewPane, BorderLayout.CENTER);
diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java
index 8c9289e302..2556412b18 100644
--- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java
+++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java
@@ -34,11 +34,11 @@ public class ChartHyperPoplinkPane extends AbstractHyperLinkPane<ChartHyperPopli
 
 
 	public ChartHyperPoplinkPane() {
-		this(null);
+		this(null, false);
 	}
 	
-	public ChartHyperPoplinkPane(HashMap hyperLinkEditorMap) {
-		super(hyperLinkEditorMap);
+	public ChartHyperPoplinkPane(HashMap hyperLinkEditorMap, boolean needRenamePane) {
+		super(hyperLinkEditorMap, needRenamePane);
 		this.setLayout(FRGUIPaneFactory.createM_BorderLayout());
 
         if(this.needRenamePane()){
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 5df8ad7f2f..2429430aaa 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
@@ -33,8 +33,8 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
 		this.initComponent();
 	}
 
-	public ChartHyperRelateCellLinkPane(HashMap hyperLinkEditorMap) {
-		super(hyperLinkEditorMap);
+	public ChartHyperRelateCellLinkPane(HashMap hyperLinkEditorMap, boolean needRenamePane) {
+		super(hyperLinkEditorMap, needRenamePane);
 		this.initComponent();
 	}
 
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 138b280345..c26b4d131b 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
@@ -38,8 +38,8 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
 		this.initComponent();
 	}
 
-	public ChartHyperRelateFloatLinkPane(HashMap hyperLinkEditorMap) {
-		super(hyperLinkEditorMap);
+	public ChartHyperRelateFloatLinkPane(HashMap hyperLinkEditorMap, boolean needRenamePane) {
+		super(hyperLinkEditorMap, needRenamePane);
 		this.initComponent();
 	}
 	
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 d1ec140493..7bb95bcee4 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
@@ -21,8 +21,8 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane<FormHyperlinkProvid
     private FormHyperlinkNorthPane northPane;
 
 
-    public FormHyperlinkPane(HashMap hyperLinkEditorMap) {
-        super(hyperLinkEditorMap);
+    public FormHyperlinkPane(HashMap hyperLinkEditorMap, boolean needRenamePane) {
+        super(hyperLinkEditorMap, needRenamePane);
         this.initComponents();
     }
 
diff --git a/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java b/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java
index 125adfc6be..e46d4d4f99 100644
--- a/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java
@@ -75,8 +75,8 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
     protected BasicBeanPane createPaneByCreators(NameableCreator creator) {
         Constructor<? extends BasicBeanPane> constructor = null;
         try {
-            constructor = creator.getUpdatePane().getConstructor(HashMap.class);
-            return constructor.newInstance(plot.getHyperLinkEditorMap());
+            constructor = creator.getUpdatePane().getConstructor(HashMap.class, boolean.class);
+            return constructor.newInstance(plot.getHyperLinkEditorMap(), false);
 
         } catch (InstantiationException e) {
             throw new RuntimeException(e);
diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/ChartUIMenuNameableCreator.java b/designer_chart/src/com/fr/plugin/chart/designer/component/ChartUIMenuNameableCreator.java
index 828fbaf1ff..3007f31e63 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/component/ChartUIMenuNameableCreator.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/component/ChartUIMenuNameableCreator.java
@@ -35,8 +35,8 @@ public class ChartUIMenuNameableCreator extends UIMenuNameableCreator {
     public BasicBeanPane getPane() {
         try {
             if (hyperLinkEditorMap != null) {
-                Constructor<? extends BasicBeanPane> constructor = paneClazz.getConstructor(Plot.class);
-                return constructor.newInstance(hyperLinkEditorMap);
+                Constructor<? extends BasicBeanPane> constructor = paneClazz.getConstructor(HashMap.class, boolean.class);
+                return constructor.newInstance(hyperLinkEditorMap,true);
             }
         } catch (Exception e) {
             return super.getPane();