diff --git a/designer_base/src/com/fr/design/editor/ValueEditorPaneFactory.java b/designer_base/src/com/fr/design/editor/ValueEditorPaneFactory.java index 2efa9012e..2da01d896 100644 --- a/designer_base/src/com/fr/design/editor/ValueEditorPaneFactory.java +++ b/designer_base/src/com/fr/design/editor/ValueEditorPaneFactory.java @@ -1,7 +1,7 @@ package com.fr.design.editor; import com.fr.base.Formula; -import com.fr.chart.chartattr.Plot; +import com.fr.base.chart.BasePlot; import com.fr.design.editor.editor.BooleanEditor; import com.fr.design.editor.editor.ColumnRowEditor; import com.fr.design.editor.editor.ColumnRowGroupEditor; @@ -202,7 +202,7 @@ public class ValueEditorPaneFactory { return createVallueEditorPaneWithUseType(paraUseType, null); } - public static ValueEditorPane createVallueEditorPaneWithUseType(int paraUseType, Plot plot) { + public static ValueEditorPane createVallueEditorPaneWithUseType(int paraUseType, BasePlot plot) { if (paraUseType == ParameterTableModel.NO_CHART_USE) { return createBasicValueEditorPane(); } else if (paraUseType == ParameterTableModel.FORM_NORMAL_USE) { @@ -218,7 +218,7 @@ public class ValueEditorPaneFactory { * @param plot plot类型 * @return 值编辑器 */ - public static ValueEditorPane createChartHotValueEditorPane(Plot plot) { + public static ValueEditorPane createChartHotValueEditorPane(BasePlot plot) { return createValueEditorPane(chartHotEditors(plot), StringUtils.EMPTY, StringUtils.EMPTY); } @@ -446,7 +446,7 @@ public class ValueEditorPaneFactory { * * @return 值编辑器 */ - public static Editor[] chartHotEditors(Plot plot) { + public static Editor[] chartHotEditors(BasePlot plot) { List list = createEditors4Chart(plot); list.add(new TextEditor()); @@ -467,7 +467,7 @@ public class ValueEditorPaneFactory { * * @return 值编辑器 */ - private static List createEditors4Chart(Plot plot) { + private static List createEditors4Chart(BasePlot plot) { List lists = new ArrayList(); if (plot == null) { return lists; diff --git a/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java b/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java index b893dad71..f2cf7e70c 100644 --- a/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java +++ b/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java @@ -2,7 +2,7 @@ package com.fr.design.hyperlink; import com.fr.base.BaseUtils; import com.fr.base.Parameter; -import com.fr.chart.chartattr.Plot; +import com.fr.base.chart.BasePlot; import com.fr.design.beans.BasicBeanPane; import com.fr.design.editor.ValueEditorPane; import com.fr.design.editor.ValueEditorPaneFactory; @@ -25,16 +25,16 @@ import java.awt.event.ActionEvent; import java.util.List; public class ReportletHyperlinkPane extends BasicBeanPane { - private Plot plot; + private BasePlot plot; private ReporletHyperNorthPane northPane; private ReportletParameterViewPane parameterViewPane = null; private UICheckBox extendParametersCheckBox; - protected Plot getPlot() { + protected BasePlot getPlot() { return plot; } - public ReportletHyperlinkPane(Plot plot) { + public ReportletHyperlinkPane(BasePlot plot) { super(); this.plot = plot; 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 055ec23a1..2b225ac67 100644 --- a/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java +++ b/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java @@ -1,7 +1,7 @@ package com.fr.design.hyperlink; import com.fr.base.Parameter; -import com.fr.chart.chartattr.Plot; +import com.fr.base.chart.BasePlot; import com.fr.design.beans.BasicBeanPane; import com.fr.design.editor.ValueEditorPane; import com.fr.design.editor.ValueEditorPaneFactory; @@ -19,7 +19,7 @@ import java.awt.*; import java.util.List; public class WebHyperlinkPane extends BasicBeanPane { - private Plot plot; + private BasePlot plot; private WebHyperNorthPane northPane; private ReportletParameterViewPane parameterViewPane; @@ -28,7 +28,7 @@ public class WebHyperlinkPane extends BasicBeanPane { private UICheckBox extendParametersCheckBox; - protected Plot getPlot() { + protected BasePlot getPlot() { return plot; } @@ -37,7 +37,7 @@ public class WebHyperlinkPane extends BasicBeanPane { this.initComponents(); } - public WebHyperlinkPane(Plot plot) { + public WebHyperlinkPane(BasePlot plot) { super(); this.plot = plot; 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 dcdb4e6b5..f0adc6b19 100644 --- a/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java +++ b/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java @@ -1,7 +1,7 @@ package com.fr.design.javascript; import com.fr.base.Parameter; -import com.fr.chart.chartattr.Plot; +import com.fr.base.chart.BasePlot; import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.data.tabledata.tabledatapane.OneListTableModel; import com.fr.design.editor.ValueEditorPane; @@ -27,14 +27,14 @@ import java.util.HashSet; import java.util.List; public class JavaScriptImplPane extends FurtherBasicBeanPane { - private Plot plot; + private BasePlot plot; private UITextField itemNameTextField; private JSContentPane jsPane; private UITableEditorPane importedJsPane; private ReportletParameterViewPane parameterPane; private String[] defaultArgs; - protected Plot getPlot() { + protected BasePlot getPlot() { return plot; } @@ -42,7 +42,7 @@ public class JavaScriptImplPane extends FurtherBasicBeanPane { this(new String[0]); } - public JavaScriptImplPane(Plot plot) { + public JavaScriptImplPane(BasePlot plot) { this.plot = plot; 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 5a5067b10..cf3e0c76a 100644 --- a/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java +++ b/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java @@ -1,7 +1,7 @@ package com.fr.design.javascript; import com.fr.base.Parameter; -import com.fr.chart.chartattr.Plot; +import com.fr.base.chart.BasePlot; import com.fr.design.beans.BasicBeanPane; import com.fr.design.editor.ValueEditorPane; import com.fr.design.editor.ValueEditorPaneFactory; @@ -17,11 +17,11 @@ import java.awt.*; import java.util.List; public class ParameterJavaScriptPane extends BasicBeanPane { - private Plot plot; + private BasePlot plot; private UITextField itemNameTextField; private ReportletParameterViewPane parameterViewPane; - protected Plot getPlot() { + protected BasePlot getPlot() { return plot; } @@ -29,7 +29,7 @@ public class ParameterJavaScriptPane extends BasicBeanPane this(null); } - public ParameterJavaScriptPane(Plot plot){ + public ParameterJavaScriptPane(BasePlot plot){ this.plot = plot; this.setLayout(new BorderLayout()); parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane()); 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 e49b9e1bb..d0ad6bf8e 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 @@ -1,6 +1,7 @@ package com.fr.design.chart.series.SeriesCondition.impl; import com.fr.base.chart.BaseChartCollection; +import com.fr.base.chart.BasePlot; import com.fr.chart.chartattr.Bar2DPlot; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.ChartCollection; @@ -34,9 +35,9 @@ public class ChartHyperPoplinkPane extends BasicBeanPane { private ChartHyperEditPane hyperEditPane; private ChartComponent chartComponent; - private Plot plot; + private BasePlot plot; - protected Plot getPlot() { + protected BasePlot getPlot() { return plot; } @@ -44,7 +45,7 @@ public class ChartHyperPoplinkPane extends BasicBeanPane { this(null); } - public ChartHyperPoplinkPane(Plot plot) { + public ChartHyperPoplinkPane(BasePlot plot) { this.plot = plot; this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); 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 0b6a91a06..b29585c23 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 @@ -1,6 +1,7 @@ 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; @@ -32,9 +33,9 @@ public class ChartHyperRelateCellLinkPane extends BasicBeanPane { - private Plot plot; + private BasePlot plot; private ReportletParameterViewPane parameterViewPane; private FormHyperlinkNorthPane northPane; - protected Plot getPlot() { + protected BasePlot getPlot() { return plot; } - public FormHyperlinkPane(Plot plot) { + public FormHyperlinkPane(BasePlot plot) { super(); this.plot = plot; this.initComponents();