修改接口

designer_base/src/com/fr/design/gui/itableeditorpane/ParameterTableModel.java

@@ -26,19 +26,7 @@ public class ParameterTableModel extends UITableModelAdapter<ParameterProvider>
 	
 	public static final int NO_CHART_USE = 0;
 	public static final int CHART_NORMAL_USE = 1;
-	public static final int CHART_MAP_USE = 2;
-	public static final int CHART_PIE_USE = 3;
-	public static final int CHART__XY_USE = 4;
-	public static final int CHART_BUBBLE_USE = 5;
-	public static final int CHART_STOCK_USE = 6;
-	public static final int CHART_NO_USE = 7;
-	public static final int CHART_GIS_USE = 8;
-    public static final int CHART_GANTT_USE = 9;
-    public static final int CHART_METER_USE = 10;
     public static final int FORM_NORMAL_USE = -1;
-    public static final int FORM_ELEMENTCASE_USE = 11;
-    public static final int FORM_CHART_USE = 12;
-    public static final int VAN_CHART_USE = 20;
 
 	private static final long serialVersionUID = 1L;
 	protected Component component = null; //指定确认对话框的父窗口,bug40340

designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java

@@ -67,7 +67,7 @@ public class ReportletHyperlinkPane extends BasicBeanPane<ReportletHyperlink> {
     }
 
     protected int getChartParaType() {
-        return plot != null ? plot.getHyperLinkParaType() : ParameterTableModel.NO_CHART_USE;
+        return plot != null ? ParameterTableModel.CHART_NORMAL_USE : ParameterTableModel.NO_CHART_USE;
     }
 
     protected ValueEditorPane getValueEditorPane() {
@@ -75,7 +75,7 @@ public class ReportletHyperlinkPane extends BasicBeanPane<ReportletHyperlink> {
     }
 
     protected boolean needRenamePane(){
-        return getChartParaType() != ParameterTableModel.NO_CHART_USE  && getChartParaType() != ParameterTableModel.VAN_CHART_USE ;
+        return plot != null && plot.needRenameHyperLinkPane();
     }
 
     @Override

designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java

@@ -65,7 +65,7 @@ public class WebHyperlinkPane extends BasicBeanPane<WebHyperlink> {
 	}
 	
 	protected int getChartParaType() {
-		return plot != null ? plot.getHyperLinkParaType() : ParameterTableModel.NO_CHART_USE;
+		return plot != null ? ParameterTableModel.CHART_NORMAL_USE : ParameterTableModel.NO_CHART_USE;
 	}
 
 	protected ValueEditorPane getValueEditorPane() {
@@ -73,7 +73,7 @@ public class WebHyperlinkPane extends BasicBeanPane<WebHyperlink> {
 	}
 
     protected boolean needRenamePane(){
-        return getChartParaType() != ParameterTableModel.NO_CHART_USE  && getChartParaType() != ParameterTableModel.VAN_CHART_USE ;
+        return plot != null && plot.needRenameHyperLinkPane();
     }
 
     @Override

designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java

@@ -110,7 +110,7 @@ public class JavaScriptImplPane extends FurtherBasicBeanPane<JavaScriptImpl> {
 	}
 
 	protected int getChartParaType() {
-		return plot != null ? plot.getHyperLinkParaType() : ParameterTableModel.NO_CHART_USE;
+		return plot != null ? ParameterTableModel.CHART_NORMAL_USE : ParameterTableModel.NO_CHART_USE;
 	}
 
 	protected ValueEditorPane getValueEditorPane() {
@@ -118,7 +118,7 @@ public class JavaScriptImplPane extends FurtherBasicBeanPane<JavaScriptImpl> {
 	}
 
 	protected boolean needRenamePane(){
-		return getChartParaType() != ParameterTableModel.NO_CHART_USE  && getChartParaType() != ParameterTableModel.VAN_CHART_USE ;
+		return plot != null && plot.needRenameHyperLinkPane();
 	}
 
 	/**

designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java

@@ -41,7 +41,7 @@ public class ParameterJavaScriptPane extends BasicBeanPane<ParameterJavaScript>
 	}
 
     protected int getChartParaType() {
-        return plot != null ? plot.getHyperLinkParaType() : ParameterTableModel.NO_CHART_USE;
+        return plot != null ? ParameterTableModel.CHART_NORMAL_USE : ParameterTableModel.NO_CHART_USE;
     }
 
     protected ValueEditorPane getValueEditorPane() {
@@ -49,7 +49,7 @@ public class ParameterJavaScriptPane extends BasicBeanPane<ParameterJavaScript>
     }
 
     protected boolean needRenamePane(){
-        return getChartParaType() != ParameterTableModel.NO_CHART_USE  && getChartParaType() != ParameterTableModel.VAN_CHART_USE ;
+        return plot != null && plot.needRenameHyperLinkPane();
     }
 
 	@Override

designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java

@@ -5,7 +5,6 @@ import com.fr.base.chart.BasePlot;
 import com.fr.chart.chartattr.Bar2DPlot;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
-import com.fr.chart.chartattr.Plot;
 import com.fr.chart.charttypes.ChartTypeManager;
 import com.fr.chart.web.ChartHyperPoplink;
 import com.fr.design.beans.BasicBeanPane;
@@ -89,7 +88,7 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
     }
 
 	protected int getChartParaType() {
-		return plot != null ? plot.getHyperLinkParaType() : ParameterTableModel.NO_CHART_USE;
+		return plot != null ? ParameterTableModel.CHART_NORMAL_USE : ParameterTableModel.NO_CHART_USE;
 	}
 
 	protected ValueEditorPane getValueEditorPane() {
@@ -97,7 +96,7 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
 	}
 
 	protected boolean needRenamePane(){
-		return getChartParaType() != ParameterTableModel.NO_CHART_USE  && getChartParaType() != ParameterTableModel.VAN_CHART_USE ;
+		return plot != null && plot.needRenameHyperLinkPane();
 	}
 	
 	@Override

designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java

@@ -2,7 +2,6 @@ package com.fr.design.chart.series.SeriesCondition.impl;
 
 import com.fr.base.Utils;
 import com.fr.base.chart.BasePlot;
-import com.fr.chart.chartattr.Plot;
 import com.fr.chart.web.ChartHyperRelateCellLink;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.editor.ValueEditorPane;
@@ -70,7 +69,7 @@ public class ChartHyperRelateCellLinkPane extends BasicBeanPane<ChartHyperRelate
 	}
 
 	protected int getChartParaType() {
-		return plot != null ? plot.getHyperLinkParaType() : ParameterTableModel.NO_CHART_USE;
+		return plot != null ? ParameterTableModel.CHART_NORMAL_USE : ParameterTableModel.NO_CHART_USE;
 	}
 
 	protected ValueEditorPane getValueEditorPane() {
@@ -78,7 +77,7 @@ public class ChartHyperRelateCellLinkPane extends BasicBeanPane<ChartHyperRelate
 	}
 
 	protected boolean needRenamePane(){
-		return getChartParaType() != ParameterTableModel.NO_CHART_USE  && plot.getHyperLinkParaType() != ParameterTableModel.VAN_CHART_USE ;
+		return plot != null && plot.needRenameHyperLinkPane();
 	}
 	
 	@Override

designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java

@@ -2,7 +2,6 @@ package com.fr.design.chart.series.SeriesCondition.impl;
 
 import com.fr.base.Utils;
 import com.fr.base.chart.BasePlot;
-import com.fr.chart.chartattr.Plot;
 import com.fr.chart.web.ChartHyperRelateFloatLink;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.beans.BasicBeanPane;
@@ -88,7 +87,7 @@ public class ChartHyperRelateFloatLinkPane extends BasicBeanPane<ChartHyperRelat
 	}
 
 	protected int getChartParaType() {
-		return plot != null ? plot.getHyperLinkParaType() : ParameterTableModel.NO_CHART_USE;
+		return plot != null ? ParameterTableModel.CHART_NORMAL_USE : ParameterTableModel.NO_CHART_USE;
 	}
 
 	protected ValueEditorPane getValueEditorPane() {
@@ -96,7 +95,7 @@ public class ChartHyperRelateFloatLinkPane extends BasicBeanPane<ChartHyperRelat
 	}
 
 	protected boolean needRenamePane(){
-		return getChartParaType() != ParameterTableModel.NO_CHART_USE  && getChartParaType() != ParameterTableModel.VAN_CHART_USE ;
+		return plot != null && plot.needRenameHyperLinkPane();
 	}
 
 	private String[] getFloatNames() {

designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java

@@ -2,7 +2,6 @@ package com.fr.design.chart.series.SeriesCondition.impl;
 
 import com.fr.base.Parameter;
 import com.fr.base.chart.BasePlot;
-import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.editor.ValueEditorPane;
 import com.fr.design.editor.ValueEditorPaneFactory;
@@ -57,7 +56,7 @@ public class FormHyperlinkPane extends BasicBeanPane<FormHyperlinkProvider> {
     }
 
     protected int getChartParaType() {
-        return plot != null ? plot.getHyperLinkParaType() : ParameterTableModel.NO_CHART_USE;
+        return plot != null ? ParameterTableModel.CHART_NORMAL_USE : ParameterTableModel.NO_CHART_USE;
     }
 
     protected ValueEditorPane getValueEditorPane() {
@@ -65,7 +64,7 @@ public class FormHyperlinkPane extends BasicBeanPane<FormHyperlinkProvider> {
     }
 
     protected boolean needRenamePane(){
-        return getChartParaType() != ParameterTableModel.NO_CHART_USE  && getChartParaType() != ParameterTableModel.VAN_CHART_USE ;
+        return plot != null && plot.needRenameHyperLinkPane();
     }
     
     protected int getHyperlinkType() {