diff --git a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java index 03b073a621..b9950256f3 100644 --- a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java @@ -11,23 +11,23 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.chart.fun.ChartTypeUIProvider; import com.fr.design.chart.gui.ChartWidgetOption; -import com.fr.design.chartinterface.AreaIndependentChartInterface; -import com.fr.design.chartinterface.BarIndependentChartInterface; -import com.fr.design.chartinterface.BubbleIndependentChartInterface; -import com.fr.design.chartinterface.ColumnIndependentChartInterface; -import com.fr.design.chartinterface.CustomIndependentChartInterface; -import com.fr.design.chartinterface.DonutIndependentChartInterface; -import com.fr.design.chartinterface.FunnelIndependentChartInterface; -import com.fr.design.chartinterface.GanttIndependentChartInterface; -import com.fr.design.chartinterface.GisMapIndependentChartInterface; -import com.fr.design.chartinterface.LineIndependentChartInterface; -import com.fr.design.chartinterface.MapIndependentChartInterface; -import com.fr.design.chartinterface.MeterIndependentChartInterface; -import com.fr.design.chartinterface.PieIndependentChartInterface; -import com.fr.design.chartinterface.RadarIndependentChartInterface; -import com.fr.design.chartinterface.RangeIndependentChartInterface; -import com.fr.design.chartinterface.StockIndependentChartInterface; -import com.fr.design.chartinterface.XYScatterIndependentChartInterface; +import com.fr.design.type.ui.AreaChartTypeUI; +import com.fr.design.type.ui.BarChartTypeUI; +import com.fr.design.type.ui.BubbleChartTypeUI; +import com.fr.design.type.ui.ColumnChartTypeUI; +import com.fr.design.type.ui.CustomChartTypeUI; +import com.fr.design.type.ui.DonutChartTypeUI; +import com.fr.design.type.ui.FunnelChartTypeUI; +import com.fr.design.type.ui.GanttChartTypeUI; +import com.fr.design.type.ui.GisMapChartTypeUI; +import com.fr.design.type.ui.LineChartTypeUI; +import com.fr.design.type.ui.MapChartTypeUI; +import com.fr.design.type.ui.MeterChartTypeUI; +import com.fr.design.type.ui.PieChartTypeUI; +import com.fr.design.type.ui.RadarChartTypeUI; +import com.fr.design.type.ui.RangeChartTypeUI; +import com.fr.design.type.ui.StockChartTypeUI; +import com.fr.design.type.ui.XYScatterChartTypeUI; import com.fr.design.condition.ConditionAttributesPane; import com.fr.design.gui.core.WidgetOption; import com.fr.design.gui.frpane.AttributeChangeListener; @@ -205,23 +205,23 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr private static void readDefault() { - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.COLUMN_CHART, new ColumnIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.LINE_CHART, new LineIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.BAR_CHART, new BarIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.PIE_CHART, new PieIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.AREA_CHART, new AreaIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.SCATTER_CHART, new XYScatterIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.BUBBLE_CHART, new BubbleIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.RADAR_CHART, new RadarIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.STOCK_CHART, new StockIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.METER_CHART, new MeterIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.RANGE_CHART, new RangeIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.CUSTOM_CHART, new CustomIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.GANTT_CHART, new GanttIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.DONUT_CHART, new DonutIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.MAP_CHART, new MapIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.GIS_CHAER, new GisMapIndependentChartInterface()); - addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.FUNNEL_CHART, new FunnelIndependentChartInterface()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.COLUMN_CHART, new ColumnChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.LINE_CHART, new LineChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.BAR_CHART, new BarChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.PIE_CHART, new PieChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.AREA_CHART, new AreaChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.SCATTER_CHART, new XYScatterChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.BUBBLE_CHART, new BubbleChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.RADAR_CHART, new RadarChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.STOCK_CHART, new StockChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.METER_CHART, new MeterChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.RANGE_CHART, new RangeChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.CUSTOM_CHART, new CustomChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.GANTT_CHART, new GanttChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.DONUT_CHART, new DonutChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.MAP_CHART, new MapChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.GIS_CHAER, new GisMapChartTypeUI()); + addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.FUNNEL_CHART, new FunnelChartTypeUI()); } private static void addChartTypeInterface(String priority, String plotID, ChartTypeUIProvider provider) { diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/AreaIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/AreaChartTypeUI.java similarity index 96% rename from designer-chart/src/main/java/com/fr/design/chartinterface/AreaIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/AreaChartTypeUI.java index 52c111c188..60e52f2425 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/AreaIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/AreaChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -21,7 +21,7 @@ import com.fr.design.mainframe.chart.gui.type.AreaPlotPane; /** * Created by eason on 15/4/21. */ -public class AreaIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class AreaChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane() { return new AreaPlotPane(); diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/BarIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/BarChartTypeUI.java similarity index 97% rename from designer-chart/src/main/java/com/fr/design/chartinterface/BarIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/BarChartTypeUI.java index 7c7eda32e8..16300178b5 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/BarIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/BarChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -22,7 +22,7 @@ import com.fr.design.mainframe.chart.gui.type.BarPlotPane; /** * Created by eason on 15/4/21. */ -public class BarIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class BarChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane() { return new BarPlotPane(); diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/BubbleIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/BubbleChartTypeUI.java similarity index 94% rename from designer-chart/src/main/java/com/fr/design/chartinterface/BubbleIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/BubbleChartTypeUI.java index 8409a31c7d..eedb93c259 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/BubbleIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/BubbleChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -19,7 +19,7 @@ import com.fr.design.mainframe.chart.gui.type.BubblePlotPane; /** * Created by eason on 15/4/21. */ -public class BubbleIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class BubbleChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane(){ return new BubblePlotPane(); diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/ColumnIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/ColumnChartTypeUI.java similarity index 97% rename from designer-chart/src/main/java/com/fr/design/chartinterface/ColumnIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/ColumnChartTypeUI.java index 4c87320a30..4597ec5098 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/ColumnIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/ColumnChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -22,7 +22,7 @@ import com.fr.design.mainframe.chart.gui.type.ColumnPlotPane; /** * Created by eason on 15/4/21. */ -public class ColumnIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class ColumnChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane() { return new ColumnPlotPane(); diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/CustomIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/CustomChartTypeUI.java similarity index 94% rename from designer-chart/src/main/java/com/fr/design/chartinterface/CustomIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/CustomChartTypeUI.java index b8a0db59f2..ce47e17760 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/CustomIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/CustomChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -19,7 +19,7 @@ import com.fr.design.mainframe.chart.gui.type.CustomPlotPane; /** * Created by eason on 15/4/21. */ -public class CustomIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class CustomChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane() { diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/DonutIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/DonutChartTypeUI.java similarity index 95% rename from designer-chart/src/main/java/com/fr/design/chartinterface/DonutIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/DonutChartTypeUI.java index 5dd5f970ad..f75bbe3ba6 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/DonutIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/DonutChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -21,7 +21,7 @@ import com.fr.design.mainframe.chart.gui.type.DonutPlotPane; /** * Created by eason on 15/4/21. */ -public class DonutIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class DonutChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane() { diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/FunnelIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/FunnelChartTypeUI.java similarity index 94% rename from designer-chart/src/main/java/com/fr/design/chartinterface/FunnelIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/FunnelChartTypeUI.java index c0ad1d1b66..d6c850381c 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/FunnelIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/FunnelChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -19,7 +19,7 @@ import com.fr.design.mainframe.chart.gui.type.FunnelPlotPane; /** * Created by eason on 15/4/21. */ -public class FunnelIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class FunnelChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane(){ diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/GanttIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/GanttChartTypeUI.java similarity index 93% rename from designer-chart/src/main/java/com/fr/design/chartinterface/GanttIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/GanttChartTypeUI.java index 50d81e9b94..9e0b8184ca 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/GanttIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/GanttChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; @@ -16,7 +16,7 @@ import com.fr.design.mainframe.chart.gui.type.GanttPlotPane; /** * Created by eason on 15/4/21. */ -public class GanttIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class GanttChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane(){ diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/GisMapIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/GisMapChartTypeUI.java similarity index 92% rename from designer-chart/src/main/java/com/fr/design/chartinterface/GisMapIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/GisMapChartTypeUI.java index 9191c0ed17..e7aa6195ac 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/GisMapIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/GisMapChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; @@ -12,7 +12,7 @@ import com.fr.design.mainframe.chart.gui.type.GisMapPlotPane; /** * Created by eason on 15/4/21. */ -public class GisMapIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class GisMapChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane() { diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/LineIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/LineChartTypeUI.java similarity index 95% rename from designer-chart/src/main/java/com/fr/design/chartinterface/LineIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/LineChartTypeUI.java index dedc716673..4967b864c4 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/LineIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/LineChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -20,7 +20,7 @@ import com.fr.design.mainframe.chart.gui.type.LinePlotPane; /** * Created by eason on 15/4/21. */ -public class LineIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class LineChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane() { diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/MapIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/MapChartTypeUI.java similarity index 94% rename from designer-chart/src/main/java/com/fr/design/chartinterface/MapIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/MapChartTypeUI.java index 7f10760b16..da09ed48e5 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/MapIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/MapChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -17,7 +17,7 @@ import com.fr.design.mainframe.chart.gui.type.MapPlotPane; /** * Created by eason on 15/4/21. */ -public class MapIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class MapChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane(){ diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/MeterIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/MeterChartTypeUI.java similarity index 94% rename from designer-chart/src/main/java/com/fr/design/chartinterface/MeterIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/MeterChartTypeUI.java index 81bf22089c..cafef9ea24 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/MeterIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/MeterChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -17,7 +17,7 @@ import com.fr.design.mainframe.chart.gui.type.MeterPlotPane; /** * Created by eason on 15/4/21. */ -public class MeterIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class MeterChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane() { diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/PieIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/PieChartTypeUI.java similarity index 95% rename from designer-chart/src/main/java/com/fr/design/chartinterface/PieIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/PieChartTypeUI.java index 4a1bd36ae6..3e82d26dc8 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/PieIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/PieChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -21,7 +21,7 @@ import com.fr.design.mainframe.chart.gui.type.PiePlotPane; /** * Created by eason on 15/4/21. */ -public class PieIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class PieChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane() { diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/RadarIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/RadarChartTypeUI.java similarity index 94% rename from designer-chart/src/main/java/com/fr/design/chartinterface/RadarIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/RadarChartTypeUI.java index 128c65849b..e994bb5756 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/RadarIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/RadarChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -19,7 +19,7 @@ import com.fr.design.mainframe.chart.gui.type.RadarPlotPane; /** * Created by eason on 15/4/21. */ -public class RadarIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class RadarChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane(){ diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/RangeIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/RangeChartTypeUI.java similarity index 94% rename from designer-chart/src/main/java/com/fr/design/chartinterface/RangeIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/RangeChartTypeUI.java index 475904ad92..b75daf11ad 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/RangeIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/RangeChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -17,7 +17,7 @@ import com.fr.design.mainframe.chart.gui.type.RangePlotPane; /** * Created by eason on 15/4/21. */ -public class RangeIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class RangeChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane(){ diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/StockIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/StockChartTypeUI.java similarity index 94% rename from designer-chart/src/main/java/com/fr/design/chartinterface/StockIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/StockChartTypeUI.java index 5b3a858fe2..14917575de 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/StockIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/StockChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -20,7 +20,7 @@ import com.fr.design.mainframe.chart.gui.type.StockPlotPane; /** * Created by eason on 15/4/21. */ -public class StockIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class StockChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane(){ diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/type/ui/XYScatterChartTypeUI.java similarity index 94% rename from designer-chart/src/main/java/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java rename to designer-chart/src/main/java/com/fr/design/type/ui/XYScatterChartTypeUI.java index 13cf662e20..9bf5b787d9 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/XYScatterChartTypeUI.java @@ -1,4 +1,4 @@ -package com.fr.design.chartinterface; +package com.fr.design.type.ui; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; @@ -20,7 +20,7 @@ import com.fr.design.mainframe.chart.gui.type.XYScatterPlotPane; /** * Created by eason on 15/4/21. */ -public class XYScatterIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { +public class XYScatterChartTypeUI extends AbstractIndependentChartUIWithAPILevel { public AbstractChartTypePane getPlotTypePane() {