From cf0474e36d651eb573dc8bdb831f802565f8411b Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Wed, 11 Oct 2017 18:38:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gui/itableeditorpane/ParameterTableModel.java | 12 ------------ .../fr/design/hyperlink/ReportletHyperlinkPane.java | 4 ++-- .../com/fr/design/hyperlink/WebHyperlinkPane.java | 4 ++-- .../com/fr/design/javascript/JavaScriptImplPane.java | 4 ++-- .../design/javascript/ParameterJavaScriptPane.java | 4 ++-- .../SeriesCondition/impl/ChartHyperPoplinkPane.java | 5 ++--- .../impl/ChartHyperRelateCellLinkPane.java | 5 ++--- .../impl/ChartHyperRelateFloatLinkPane.java | 5 ++--- .../SeriesCondition/impl/FormHyperlinkPane.java | 5 ++--- 9 files changed, 16 insertions(+), 32 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/itableeditorpane/ParameterTableModel.java b/designer_base/src/com/fr/design/gui/itableeditorpane/ParameterTableModel.java index 488c5ee66..debfc7ced 100644 --- a/designer_base/src/com/fr/design/gui/itableeditorpane/ParameterTableModel.java +++ b/designer_base/src/com/fr/design/gui/itableeditorpane/ParameterTableModel.java @@ -26,19 +26,7 @@ public class ParameterTableModel extends UITableModelAdapter 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 diff --git a/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java b/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java index f2cf7e70c..395c6dbd8 100644 --- a/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java +++ b/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java @@ -67,7 +67,7 @@ public class ReportletHyperlinkPane extends BasicBeanPane { } 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 { } protected boolean needRenamePane(){ - return getChartParaType() != ParameterTableModel.NO_CHART_USE && getChartParaType() != ParameterTableModel.VAN_CHART_USE ; + return plot != null && plot.needRenameHyperLinkPane(); } @Override diff --git a/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java b/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java index 2b225ac67..c3185d392 100644 --- a/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java +++ b/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java @@ -65,7 +65,7 @@ public class WebHyperlinkPane extends BasicBeanPane { } 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 { } protected boolean needRenamePane(){ - return getChartParaType() != ParameterTableModel.NO_CHART_USE && getChartParaType() != ParameterTableModel.VAN_CHART_USE ; + return plot != null && plot.needRenameHyperLinkPane(); } @Override diff --git a/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java b/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java index f0adc6b19..c110471a3 100644 --- a/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java +++ b/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java @@ -110,7 +110,7 @@ public class JavaScriptImplPane extends FurtherBasicBeanPane { } 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 { } protected boolean needRenamePane(){ - return getChartParaType() != ParameterTableModel.NO_CHART_USE && getChartParaType() != ParameterTableModel.VAN_CHART_USE ; + return plot != null && plot.needRenameHyperLinkPane(); } /** diff --git a/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java b/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java index cf3e0c76a..353fd887d 100644 --- a/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java +++ b/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java @@ -41,7 +41,7 @@ public class ParameterJavaScriptPane extends BasicBeanPane } 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 } protected boolean needRenamePane(){ - return getChartParaType() != ParameterTableModel.NO_CHART_USE && getChartParaType() != ParameterTableModel.VAN_CHART_USE ; + return plot != null && plot.needRenameHyperLinkPane(); } @Override 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 d0ad6bf8e..f0669a99e 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 @@ -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 { } 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 { } protected boolean needRenamePane(){ - return getChartParaType() != ParameterTableModel.NO_CHART_USE && getChartParaType() != ParameterTableModel.VAN_CHART_USE ; + return plot != null && plot.needRenameHyperLinkPane(); } @Override 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 b29585c23..6d535e487 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 @@ -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 { } 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 { } protected boolean needRenamePane(){ - return getChartParaType() != ParameterTableModel.NO_CHART_USE && getChartParaType() != ParameterTableModel.VAN_CHART_USE ; + return plot != null && plot.needRenameHyperLinkPane(); } protected int getHyperlinkType() {