From a42ac5956122466f89578b018bfb1a5ea5073cb8 Mon Sep 17 00:00:00 2001 From: fr_shine Date: Mon, 14 Aug 2017 14:45:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7=E5=AD=98?= =?UTF-8?q?=E5=8F=96classpath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/area/VanChartAreaConditionPane.java | 22 ++++++++++++++----- .../bubble/VanChartBubbleConditionPane.java | 8 +++++-- .../bubble/VanChartBubbleSeriesPane.java | 2 +- .../bubble/component/VanChartBubblePane.java | 2 +- .../column/VanChartColumnConditionPane.java | 19 ++++++++++++---- .../item/VanChartBubbleSetConditionPane.java | 2 +- .../item/VanChartCurveConditionPane.java | 2 +- .../item/VanChartDataSheetContentPane.java | 2 +- .../item/VanChartLineEffectConditionPane.java | 2 +- .../VanchartDataSheetNoCheckPane.java | 2 +- .../VanChartAbstractPlotSeriesPane.java | 15 ++++++++++--- .../chart/line/VanChartLineConditionPane.java | 20 ++++++++++++----- .../chart/map/VanChartMapSeriesPane.java | 8 +++---- .../VanChartBubblePointMapConditionPane.java | 2 +- .../pane/VanChartLineMapConditionPane.java | 11 ++++++---- .../style/label/VanChartMapLabelPane.java | 2 +- .../style/tooltip/VanChartMapTooltipPane.java | 2 +- .../chart/map/line/VanChartCurvePane.java | 2 +- .../map/line/VanChartLineMapEffectPane.java | 2 +- .../VanChartMultiPieLabelContentPane.java | 1 - .../VanChartMultiPieTooltipContentPane.java | 1 - .../VanChartStructureLabelContentPane.java | 2 +- .../VanChartStructureTooltipContentPane.java | 2 +- 23 files changed, 90 insertions(+), 43 deletions(-) diff --git a/designer_chart/src/com/fr/plugin/chart/area/VanChartAreaConditionPane.java b/designer_chart/src/com/fr/plugin/chart/area/VanChartAreaConditionPane.java index 0591a6008c..3d452a358e 100644 --- a/designer_chart/src/com/fr/plugin/chart/area/VanChartAreaConditionPane.java +++ b/designer_chart/src/com/fr/plugin/chart/area/VanChartAreaConditionPane.java @@ -5,13 +5,25 @@ import com.fr.chart.base.ChartConstants; import com.fr.chart.chartattr.Plot; import com.fr.design.chart.series.SeriesCondition.ChartConditionPane; import com.fr.design.chart.series.SeriesCondition.DataSeriesConditionPane; -import com.fr.plugin.chart.attr.AttrDataSheet; -import com.fr.plugin.chart.base.AttrTooltip; import com.fr.plugin.chart.attr.EffectHelper; -import com.fr.plugin.chart.VanChartAttrHelper; -import com.fr.plugin.chart.base.*; +import com.fr.plugin.chart.base.AttrAreaSeriesFillColorBackground; +import com.fr.plugin.chart.base.AttrDataSheet; +import com.fr.plugin.chart.base.AttrEffect; +import com.fr.plugin.chart.base.AttrLabel; +import com.fr.plugin.chart.base.AttrTooltip; +import com.fr.plugin.chart.base.VanChartAttrLine; +import com.fr.plugin.chart.base.VanChartAttrMarker; +import com.fr.plugin.chart.base.VanChartAttrTrendLine; import com.fr.plugin.chart.designer.PlotFactory; -import com.fr.plugin.chart.designer.other.condition.item.*; +import com.fr.plugin.chart.designer.other.condition.item.VanChartAreaFillColorConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartDataSheetContentPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartEffectConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartLabelConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartLineTypeConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartMarkerConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartSeriesColorConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartTooltipConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartTrendLineConditionPane; import com.fr.plugin.chart.glyph.VanChartMultiCategoryDataPoint; import com.fr.plugin.chart.scatter.large.VanChartLargeModelMarkerConditionPane; diff --git a/designer_chart/src/com/fr/plugin/chart/bubble/VanChartBubbleConditionPane.java b/designer_chart/src/com/fr/plugin/chart/bubble/VanChartBubbleConditionPane.java index 77e06a5121..3623c24789 100644 --- a/designer_chart/src/com/fr/plugin/chart/bubble/VanChartBubbleConditionPane.java +++ b/designer_chart/src/com/fr/plugin/chart/bubble/VanChartBubbleConditionPane.java @@ -10,9 +10,13 @@ import com.fr.plugin.chart.attr.EffectHelper; import com.fr.plugin.chart.base.AttrEffect; import com.fr.plugin.chart.base.AttrLabel; import com.fr.plugin.chart.base.AttrTooltip; -import com.fr.plugin.chart.base.VanChartAttrBubble; +import com.fr.plugin.chart.bubble.attr.VanChartAttrBubble; import com.fr.plugin.chart.designer.PlotFactory; -import com.fr.plugin.chart.designer.other.condition.item.*; +import com.fr.plugin.chart.designer.other.condition.item.VanChartBubbleSetConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartEffectConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartLabelConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartSeriesColorConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartTooltipConditionPane; import com.fr.plugin.chart.scatter.attr.ScatterAttrLabel; import com.fr.plugin.chart.scatter.attr.ScatterAttrTooltip; import com.fr.plugin.chart.scatter.component.label.VanChartScatterLabelConditionPane; diff --git a/designer_chart/src/com/fr/plugin/chart/bubble/VanChartBubbleSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/bubble/VanChartBubbleSeriesPane.java index 6c9be8ef10..d64ae34b1c 100644 --- a/designer_chart/src/com/fr/plugin/chart/bubble/VanChartBubbleSeriesPane.java +++ b/designer_chart/src/com/fr/plugin/chart/bubble/VanChartBubbleSeriesPane.java @@ -7,7 +7,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.general.Inter; -import com.fr.plugin.chart.base.VanChartAttrBubble; +import com.fr.plugin.chart.bubble.attr.VanChartAttrBubble; import com.fr.plugin.chart.bubble.component.VanChartBubblePane; import com.fr.plugin.chart.custom.component.VanChartCustomAxisConditionPane; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; diff --git a/designer_chart/src/com/fr/plugin/chart/bubble/component/VanChartBubblePane.java b/designer_chart/src/com/fr/plugin/chart/bubble/component/VanChartBubblePane.java index 563341380e..208f8203d5 100644 --- a/designer_chart/src/com/fr/plugin/chart/bubble/component/VanChartBubblePane.java +++ b/designer_chart/src/com/fr/plugin/chart/bubble/component/VanChartBubblePane.java @@ -7,7 +7,7 @@ import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.general.Inter; -import com.fr.plugin.chart.base.VanChartAttrBubble; +import com.fr.plugin.chart.bubble.attr.VanChartAttrBubble; import javax.swing.*; import java.awt.*; diff --git a/designer_chart/src/com/fr/plugin/chart/column/VanChartColumnConditionPane.java b/designer_chart/src/com/fr/plugin/chart/column/VanChartColumnConditionPane.java index 7bec7744b7..86421dd6b0 100644 --- a/designer_chart/src/com/fr/plugin/chart/column/VanChartColumnConditionPane.java +++ b/designer_chart/src/com/fr/plugin/chart/column/VanChartColumnConditionPane.java @@ -8,11 +8,22 @@ import com.fr.chart.chartattr.Plot; import com.fr.design.chart.series.SeriesCondition.ChartConditionPane; import com.fr.design.chart.series.SeriesCondition.DataSeriesConditionPane; import com.fr.design.chart.series.SeriesCondition.LabelAlphaPane; -import com.fr.plugin.chart.attr.AttrDataSheet; -import com.fr.plugin.chart.base.AttrTooltip; import com.fr.plugin.chart.attr.EffectHelper; -import com.fr.plugin.chart.base.*; -import com.fr.plugin.chart.designer.other.condition.item.*; +import com.fr.plugin.chart.base.AttrDataSheet; +import com.fr.plugin.chart.base.AttrEffect; +import com.fr.plugin.chart.base.AttrFloatColor; +import com.fr.plugin.chart.base.AttrLabel; +import com.fr.plugin.chart.base.AttrSeriesImageBackground; +import com.fr.plugin.chart.base.AttrTooltip; +import com.fr.plugin.chart.base.VanChartAttrTrendLine; +import com.fr.plugin.chart.designer.other.condition.item.VanChartDataSheetContentPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartEffectConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartFloatColorConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartLabelConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartSeriesColorConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartSeriesImageBackgroundConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartTooltipConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartTrendLineConditionPane; import com.fr.plugin.chart.glyph.VanChartMultiCategoryDataPoint; import java.awt.*; diff --git a/designer_chart/src/com/fr/plugin/chart/designer/other/condition/item/VanChartBubbleSetConditionPane.java b/designer_chart/src/com/fr/plugin/chart/designer/other/condition/item/VanChartBubbleSetConditionPane.java index ab503cd8dc..baaa664c0c 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/other/condition/item/VanChartBubbleSetConditionPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/other/condition/item/VanChartBubbleSetConditionPane.java @@ -3,7 +3,7 @@ package com.fr.plugin.chart.designer.other.condition.item; import com.fr.chart.base.DataSeriesCondition; import com.fr.design.condition.ConditionAttributesPane; import com.fr.general.Inter; -import com.fr.plugin.chart.base.VanChartAttrBubble; +import com.fr.plugin.chart.bubble.attr.VanChartAttrBubble; import com.fr.plugin.chart.bubble.component.VanChartBubblePane; import javax.swing.*; diff --git a/designer_chart/src/com/fr/plugin/chart/designer/other/condition/item/VanChartCurveConditionPane.java b/designer_chart/src/com/fr/plugin/chart/designer/other/condition/item/VanChartCurveConditionPane.java index 66b9ac2da4..cdb96e6f7b 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/other/condition/item/VanChartCurveConditionPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/other/condition/item/VanChartCurveConditionPane.java @@ -4,7 +4,7 @@ import com.fr.chart.base.DataSeriesCondition; import com.fr.design.condition.ConditionAttributesPane; import com.fr.general.Inter; import com.fr.plugin.chart.map.line.VanChartCurvePane; -import com.fr.plugin.chart.base.AttrCurve; +import com.fr.plugin.chart.map.line.condition.AttrCurve; import javax.swing.*; diff --git a/designer_chart/src/com/fr/plugin/chart/designer/other/condition/item/VanChartDataSheetContentPane.java b/designer_chart/src/com/fr/plugin/chart/designer/other/condition/item/VanChartDataSheetContentPane.java index eda9d6439b..8602e97d56 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/other/condition/item/VanChartDataSheetContentPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/other/condition/item/VanChartDataSheetContentPane.java @@ -4,7 +4,7 @@ import com.fr.chart.base.DataSeriesCondition; import com.fr.chart.chartattr.Plot; import com.fr.design.condition.ConditionAttributesPane; import com.fr.general.Inter; -import com.fr.plugin.chart.attr.AttrDataSheet; +import com.fr.plugin.chart.base.AttrDataSheet; import com.fr.plugin.chart.designer.style.datasheet.VanchartDataSheetNoCheckPane; import javax.swing.*; diff --git a/designer_chart/src/com/fr/plugin/chart/designer/other/condition/item/VanChartLineEffectConditionPane.java b/designer_chart/src/com/fr/plugin/chart/designer/other/condition/item/VanChartLineEffectConditionPane.java index 502404a487..4eb7a58ad4 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/other/condition/item/VanChartLineEffectConditionPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/other/condition/item/VanChartLineEffectConditionPane.java @@ -6,7 +6,7 @@ import com.fr.general.Inter; import com.fr.plugin.chart.base.AttrEffect; import com.fr.plugin.chart.designer.style.series.VanChartEffectPane; import com.fr.plugin.chart.map.line.VanChartLineMapEffectPane; -import com.fr.plugin.chart.base.AttrLineEffect; +import com.fr.plugin.chart.map.line.condition.AttrLineEffect; /** * Created by hufan on 2016/12/23. diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/datasheet/VanchartDataSheetNoCheckPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/datasheet/VanchartDataSheetNoCheckPane.java index fd048bf8c9..fea5d8e327 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/datasheet/VanchartDataSheetNoCheckPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/datasheet/VanchartDataSheetNoCheckPane.java @@ -1,7 +1,7 @@ package com.fr.plugin.chart.designer.style.datasheet; import com.fr.chart.chartglyph.DataSheet; -import com.fr.plugin.chart.attr.AttrDataSheet; +import com.fr.plugin.chart.base.AttrDataSheet; import javax.swing.*; import java.awt.*; diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java index 04cda0cbc0..370e162c08 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java @@ -19,12 +19,21 @@ import com.fr.plugin.chart.VanChartAttrHelper; import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot; import com.fr.plugin.chart.attr.radius.VanChartRadiusPlot; -import com.fr.plugin.chart.base.*; +import com.fr.plugin.chart.base.AttrAreaSeriesFillColorBackground; +import com.fr.plugin.chart.base.AttrEffect; +import com.fr.plugin.chart.base.AttrLabel; +import com.fr.plugin.chart.base.VanChartAttrLine; +import com.fr.plugin.chart.base.VanChartAttrMarker; +import com.fr.plugin.chart.base.VanChartAttrTrendLine; import com.fr.plugin.chart.custom.style.VanChartCustomStylePane; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; -import com.fr.plugin.chart.designer.component.*; +import com.fr.plugin.chart.designer.component.VanChartAreaSeriesFillColorPane; +import com.fr.plugin.chart.designer.component.VanChartBeautyPane; +import com.fr.plugin.chart.designer.component.VanChartLineTypePane; +import com.fr.plugin.chart.designer.component.VanChartMarkerPane; +import com.fr.plugin.chart.designer.component.VanChartTrendLinePane; import com.fr.plugin.chart.designer.component.border.VanChartBorderPane; -import com.fr.plugin.chart.base.AttrLineEffect; +import com.fr.plugin.chart.map.line.condition.AttrLineEffect; import com.fr.plugin.chart.pie.RadiusCardLayoutPane; import com.fr.plugin.chart.scatter.attr.ScatterAttrLabel; diff --git a/designer_chart/src/com/fr/plugin/chart/line/VanChartLineConditionPane.java b/designer_chart/src/com/fr/plugin/chart/line/VanChartLineConditionPane.java index c6a9cf8259..f5109e1acb 100644 --- a/designer_chart/src/com/fr/plugin/chart/line/VanChartLineConditionPane.java +++ b/designer_chart/src/com/fr/plugin/chart/line/VanChartLineConditionPane.java @@ -5,13 +5,23 @@ import com.fr.chart.base.ChartConstants; import com.fr.chart.chartattr.Plot; import com.fr.design.chart.series.SeriesCondition.ChartConditionPane; import com.fr.design.chart.series.SeriesCondition.DataSeriesConditionPane; -import com.fr.plugin.chart.attr.AttrDataSheet; -import com.fr.plugin.chart.base.AttrTooltip; import com.fr.plugin.chart.attr.EffectHelper; -import com.fr.plugin.chart.VanChartAttrHelper; -import com.fr.plugin.chart.base.*; +import com.fr.plugin.chart.base.AttrDataSheet; +import com.fr.plugin.chart.base.AttrEffect; +import com.fr.plugin.chart.base.AttrLabel; +import com.fr.plugin.chart.base.AttrTooltip; +import com.fr.plugin.chart.base.VanChartAttrLine; +import com.fr.plugin.chart.base.VanChartAttrMarker; +import com.fr.plugin.chart.base.VanChartAttrTrendLine; import com.fr.plugin.chart.designer.PlotFactory; -import com.fr.plugin.chart.designer.other.condition.item.*; +import com.fr.plugin.chart.designer.other.condition.item.VanChartDataSheetContentPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartEffectConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartLabelConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartLineTypeConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartMarkerConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartSeriesColorConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartTooltipConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartTrendLineConditionPane; import com.fr.plugin.chart.glyph.VanChartMultiCategoryDataPoint; import com.fr.plugin.chart.scatter.large.VanChartLargeModelMarkerConditionPane; diff --git a/designer_chart/src/com/fr/plugin/chart/map/VanChartMapSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/map/VanChartMapSeriesPane.java index 6b29dcaddd..e94328ace4 100644 --- a/designer_chart/src/com/fr/plugin/chart/map/VanChartMapSeriesPane.java +++ b/designer_chart/src/com/fr/plugin/chart/map/VanChartMapSeriesPane.java @@ -19,7 +19,7 @@ import com.fr.plugin.chart.base.AttrBorderWithAlpha; import com.fr.plugin.chart.base.AttrEffect; import com.fr.plugin.chart.base.AttrMarkerAlpha; import com.fr.plugin.chart.base.VanChartAttrMarker; -import com.fr.plugin.chart.base.VanChartAttrBubble; +import com.fr.plugin.chart.bubble.attr.VanChartAttrBubble; import com.fr.plugin.chart.bubble.component.VanChartBubblePane; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.designer.component.border.VanChartBorderWithAlphaPane; @@ -27,12 +27,12 @@ import com.fr.plugin.chart.designer.component.marker.VanChartImageMarkerPane; import com.fr.plugin.chart.designer.style.series.VanChartAbstractPlotSeriesPane; import com.fr.plugin.chart.designer.style.series.VanChartEffectPane; import com.fr.plugin.chart.drillmap.VanChartDrillMapPlot; -import com.fr.plugin.chart.base.AttrMapLabel; +import com.fr.plugin.chart.map.attr.AttrMapLabel; import com.fr.plugin.chart.map.designer.style.series.VanChartMapScatterMarkerPane; import com.fr.plugin.chart.map.line.VanChartCurvePane; import com.fr.plugin.chart.map.line.VanChartLineMapEffectPane; -import com.fr.plugin.chart.base.AttrCurve; -import com.fr.plugin.chart.base.AttrLineEffect; +import com.fr.plugin.chart.map.line.condition.AttrCurve; +import com.fr.plugin.chart.map.line.condition.AttrLineEffect; import com.fr.plugin.chart.type.MapMarkerType; import com.fr.plugin.chart.type.MapType; diff --git a/designer_chart/src/com/fr/plugin/chart/map/designer/other/condition/pane/VanChartBubblePointMapConditionPane.java b/designer_chart/src/com/fr/plugin/chart/map/designer/other/condition/pane/VanChartBubblePointMapConditionPane.java index 45a4fd25c9..90bb240c04 100644 --- a/designer_chart/src/com/fr/plugin/chart/map/designer/other/condition/pane/VanChartBubblePointMapConditionPane.java +++ b/designer_chart/src/com/fr/plugin/chart/map/designer/other/condition/pane/VanChartBubblePointMapConditionPane.java @@ -3,7 +3,7 @@ package com.fr.plugin.chart.map.designer.other.condition.pane; import com.fr.chart.chartattr.Plot; import com.fr.plugin.chart.attr.EffectHelper; import com.fr.plugin.chart.base.AttrEffect; -import com.fr.plugin.chart.base.VanChartAttrBubble; +import com.fr.plugin.chart.bubble.attr.VanChartAttrBubble; import com.fr.plugin.chart.designer.other.condition.item.VanChartEffectConditionPane; import com.fr.plugin.chart.map.designer.other.condition.item.VanChartBubbleMarkerConditionPane; diff --git a/designer_chart/src/com/fr/plugin/chart/map/designer/other/condition/pane/VanChartLineMapConditionPane.java b/designer_chart/src/com/fr/plugin/chart/map/designer/other/condition/pane/VanChartLineMapConditionPane.java index e5896a1b50..8d7d8db34b 100644 --- a/designer_chart/src/com/fr/plugin/chart/map/designer/other/condition/pane/VanChartLineMapConditionPane.java +++ b/designer_chart/src/com/fr/plugin/chart/map/designer/other/condition/pane/VanChartLineMapConditionPane.java @@ -5,15 +5,18 @@ import com.fr.chart.chartattr.Plot; import com.fr.design.chart.series.SeriesCondition.ChartConditionPane; import com.fr.design.chart.series.SeriesCondition.DataSeriesConditionPane; import com.fr.plugin.chart.attr.EffectHelper; -import com.fr.plugin.chart.VanChartAttrHelper; import com.fr.plugin.chart.base.AttrFloatColor; import com.fr.plugin.chart.base.AttrTooltip; import com.fr.plugin.chart.designer.PlotFactory; -import com.fr.plugin.chart.designer.other.condition.item.*; +import com.fr.plugin.chart.designer.other.condition.item.VanChartCurveConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartFloatColorConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartLineEffectConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartLineMapTooltipConditionPane; +import com.fr.plugin.chart.designer.other.condition.item.VanChartSeriesColorConditionPane; import com.fr.plugin.chart.map.VanChartMapPlot; import com.fr.plugin.chart.map.designer.other.condition.VanChartLineMapConditionSelectionPane; -import com.fr.plugin.chart.base.AttrCurve; -import com.fr.plugin.chart.base.AttrLineEffect; +import com.fr.plugin.chart.map.line.condition.AttrCurve; +import com.fr.plugin.chart.map.line.condition.AttrLineEffect; import java.awt.*; diff --git a/designer_chart/src/com/fr/plugin/chart/map/designer/style/label/VanChartMapLabelPane.java b/designer_chart/src/com/fr/plugin/chart/map/designer/style/label/VanChartMapLabelPane.java index 1e04261420..53eefb2c4c 100644 --- a/designer_chart/src/com/fr/plugin/chart/map/designer/style/label/VanChartMapLabelPane.java +++ b/designer_chart/src/com/fr/plugin/chart/map/designer/style/label/VanChartMapLabelPane.java @@ -8,7 +8,7 @@ import com.fr.design.mainframe.chart.PaneTitleConstants; import com.fr.plugin.chart.designer.style.VanChartStylePane; import com.fr.plugin.chart.designer.style.label.VanChartPlotLabelPane; import com.fr.plugin.chart.map.VanChartMapPlot; -import com.fr.plugin.chart.base.AttrMapLabel; +import com.fr.plugin.chart.map.attr.AttrMapLabel; import com.fr.plugin.chart.map.designer.VanMapAreaAndPointGroupPane; import javax.swing.*; diff --git a/designer_chart/src/com/fr/plugin/chart/map/designer/style/tooltip/VanChartMapTooltipPane.java b/designer_chart/src/com/fr/plugin/chart/map/designer/style/tooltip/VanChartMapTooltipPane.java index 2fc71075aa..b76270efbe 100644 --- a/designer_chart/src/com/fr/plugin/chart/map/designer/style/tooltip/VanChartMapTooltipPane.java +++ b/designer_chart/src/com/fr/plugin/chart/map/designer/style/tooltip/VanChartMapTooltipPane.java @@ -8,7 +8,7 @@ import com.fr.general.Inter; import com.fr.plugin.chart.designer.style.VanChartStylePane; import com.fr.plugin.chart.designer.style.tooltip.VanChartPlotTooltipPane; import com.fr.plugin.chart.map.VanChartMapPlot; -import com.fr.plugin.chart.base.AttrMapTooltip; +import com.fr.plugin.chart.map.attr.AttrMapTooltip; import com.fr.plugin.chart.map.designer.VanMapAreaAndPointGroupPane; import com.fr.plugin.chart.map.designer.VanMapAreaPointAndLineGroupPane; import com.fr.plugin.chart.map.line.VanChartLineMapPlotTooltipPane; diff --git a/designer_chart/src/com/fr/plugin/chart/map/line/VanChartCurvePane.java b/designer_chart/src/com/fr/plugin/chart/map/line/VanChartCurvePane.java index 58bfce56f8..2aa92a8a92 100644 --- a/designer_chart/src/com/fr/plugin/chart/map/line/VanChartCurvePane.java +++ b/designer_chart/src/com/fr/plugin/chart/map/line/VanChartCurvePane.java @@ -7,7 +7,7 @@ import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.general.Inter; -import com.fr.plugin.chart.base.AttrCurve; +import com.fr.plugin.chart.map.line.condition.AttrCurve; import javax.swing.*; import java.awt.*; diff --git a/designer_chart/src/com/fr/plugin/chart/map/line/VanChartLineMapEffectPane.java b/designer_chart/src/com/fr/plugin/chart/map/line/VanChartLineMapEffectPane.java index 420e27861d..1f398dcaff 100644 --- a/designer_chart/src/com/fr/plugin/chart/map/line/VanChartLineMapEffectPane.java +++ b/designer_chart/src/com/fr/plugin/chart/map/line/VanChartLineMapEffectPane.java @@ -7,7 +7,7 @@ import com.fr.general.Inter; import com.fr.plugin.chart.base.AttrEffect; import com.fr.plugin.chart.designer.component.marker.VanChartImageMarkerPane; import com.fr.plugin.chart.designer.style.series.VanChartEffectPane; -import com.fr.plugin.chart.base.AttrLineEffect; +import com.fr.plugin.chart.map.line.condition.AttrLineEffect; import com.fr.plugin.chart.type.LineMapAnimationType; import javax.swing.*; diff --git a/designer_chart/src/com/fr/plugin/chart/multilayer/style/VanChartMultiPieLabelContentPane.java b/designer_chart/src/com/fr/plugin/chart/multilayer/style/VanChartMultiPieLabelContentPane.java index d1b614e6b8..9f271c666f 100644 --- a/designer_chart/src/com/fr/plugin/chart/multilayer/style/VanChartMultiPieLabelContentPane.java +++ b/designer_chart/src/com/fr/plugin/chart/multilayer/style/VanChartMultiPieLabelContentPane.java @@ -1,7 +1,6 @@ package com.fr.plugin.chart.multilayer.style; import com.fr.plugin.chart.base.AttrTooltipContent; -import com.fr.plugin.chart.base.format.AttrTooltipMultiLevelNameFormat; import com.fr.plugin.chart.designer.component.VanChartLabelContentPane; import com.fr.plugin.chart.designer.component.format.PercentFormatPaneWithCheckBox; import com.fr.plugin.chart.designer.component.format.ValueFormatPaneWithCheckBox; diff --git a/designer_chart/src/com/fr/plugin/chart/multilayer/style/VanChartMultiPieTooltipContentPane.java b/designer_chart/src/com/fr/plugin/chart/multilayer/style/VanChartMultiPieTooltipContentPane.java index 2007cea8ae..a4a79bf40f 100644 --- a/designer_chart/src/com/fr/plugin/chart/multilayer/style/VanChartMultiPieTooltipContentPane.java +++ b/designer_chart/src/com/fr/plugin/chart/multilayer/style/VanChartMultiPieTooltipContentPane.java @@ -1,7 +1,6 @@ package com.fr.plugin.chart.multilayer.style; import com.fr.plugin.chart.base.AttrTooltipContent; -import com.fr.plugin.chart.base.format.AttrTooltipMultiLevelNameFormat; import com.fr.plugin.chart.designer.component.VanChartTooltipContentPane; import com.fr.plugin.chart.designer.component.format.PercentFormatPaneWithCheckBox; import com.fr.plugin.chart.designer.component.format.ValueFormatPaneWithCheckBox; diff --git a/designer_chart/src/com/fr/plugin/chart/structure/desinger/style/VanChartStructureLabelContentPane.java b/designer_chart/src/com/fr/plugin/chart/structure/desinger/style/VanChartStructureLabelContentPane.java index d4d52f67b1..dc2a3c2f51 100644 --- a/designer_chart/src/com/fr/plugin/chart/structure/desinger/style/VanChartStructureLabelContentPane.java +++ b/designer_chart/src/com/fr/plugin/chart/structure/desinger/style/VanChartStructureLabelContentPane.java @@ -8,7 +8,7 @@ import com.fr.plugin.chart.designer.component.format.PercentFormatPaneWithCheckB import com.fr.plugin.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox; import com.fr.plugin.chart.designer.component.format.ValueFormatPaneWithCheckBox; import com.fr.plugin.chart.designer.style.VanChartStylePane; -import com.fr.plugin.chart.base.format.AttrTooltipMultiLevelNameFormat; +import com.fr.plugin.chart.multilayer.style.AttrTooltipMultiLevelNameFormat; import javax.swing.*; import java.awt.*; diff --git a/designer_chart/src/com/fr/plugin/chart/structure/desinger/style/VanChartStructureTooltipContentPane.java b/designer_chart/src/com/fr/plugin/chart/structure/desinger/style/VanChartStructureTooltipContentPane.java index 370ec05674..d29c6bb9d4 100644 --- a/designer_chart/src/com/fr/plugin/chart/structure/desinger/style/VanChartStructureTooltipContentPane.java +++ b/designer_chart/src/com/fr/plugin/chart/structure/desinger/style/VanChartStructureTooltipContentPane.java @@ -8,7 +8,7 @@ import com.fr.plugin.chart.designer.component.format.PercentFormatPaneWithCheckB import com.fr.plugin.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox; import com.fr.plugin.chart.designer.component.format.ValueFormatPaneWithCheckBox; import com.fr.plugin.chart.designer.style.VanChartStylePane; -import com.fr.plugin.chart.base.format.AttrTooltipMultiLevelNameFormat; +import com.fr.plugin.chart.multilayer.style.AttrTooltipMultiLevelNameFormat; import javax.swing.*; import java.awt.*;