打包类重复 重命名

designer_chart/src/com/fr/plugin/chart/custom/CustomPlotDesignerPaneFactory.java

@@ -10,17 +10,16 @@ import com.fr.plugin.chart.PiePlot4VanChart;
 import com.fr.plugin.chart.attr.plot.VanChartAxisPlot;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.bubble.VanChartBubblePlot;
-import com.fr.plugin.chart.custom.CustomPlotFactory;
+import com.fr.plugin.chart.bubble.data.VanChartBubblePlotTableDataContentPane;
 import com.fr.plugin.chart.custom.component.CustomPlotLocationPane;
 import com.fr.plugin.chart.custom.type.CustomPlotType;
-import com.fr.plugin.chart.bubble.data.VanChartBubblePlotTableDataContentPane;
-import com.fr.plugin.chart.scatter.data.VanChartScatterPlotTableDataContentPane;
 import com.fr.plugin.chart.designer.style.VanChartStylePane;
 import com.fr.plugin.chart.designer.style.axis.VanChartAxisPane;
 import com.fr.plugin.chart.designer.style.axis.gauge.VanChartGaugeAxisPane;
 import com.fr.plugin.chart.gauge.VanChartGaugePlot;
 import com.fr.plugin.chart.radar.VanChartRadarPlot;
 import com.fr.plugin.chart.scatter.VanChartScatterPlot;
+import com.fr.plugin.chart.scatter.data.VanChartScatterPlotTableDataContentPane;
 
 import java.lang.reflect.Constructor;
 import java.util.HashMap;

designer_chart/src/com/fr/plugin/chart/custom/VanChartCustomPlotPane.java

@@ -11,12 +11,11 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.type.ChartImagePane;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
-import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.base.VanChartAttrLine;
+import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.custom.component.VanChartCustomPlotSelectPane;
 import com.fr.plugin.chart.custom.type.CustomPlotType;
 import com.fr.plugin.chart.custom.type.CustomStyle;
-import com.fr.plugin.chart.custom.CustomPlotFactory;
 import com.fr.plugin.chart.designer.type.AbstractVanChartTypePane;
 import com.fr.plugin.chart.vanchart.VanChart;
 

designer_chart/src/com/fr/plugin/chart/custom/component/ChartImageCheckOutPane.java

@@ -4,7 +4,7 @@ import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
-import com.fr.plugin.chart.custom.CustomPlotFactory;
+import com.fr.plugin.chart.custom.CustomPlotGlyphFactory;
 import com.fr.plugin.chart.custom.type.CustomPlotType;
 
 import javax.swing.*;
@@ -42,7 +42,7 @@ public class ChartImageCheckOutPane extends BasicPane  implements UIObserver {
         this.checkBox = new JCheckBox();
         this.checkBox.setSelected(isSelected);
         //设置提示
-        this.checkBox.setToolTipText(CustomPlotFactory.getTooltipText(this.customPlotType));
+        this.checkBox.setToolTipText(CustomPlotGlyphFactory.getTooltipText(this.customPlotType));
         //背景
         checkBox.setIcon(new ImageIcon(getClass().getResource(getIconPath(customPlotType,isSelected))));
 
@@ -50,7 +50,7 @@ public class ChartImageCheckOutPane extends BasicPane  implements UIObserver {
     }
 
     private String getIconPath(CustomPlotType customPlotType, boolean isSelected) {
-        return isSelected ? CustomPlotFactory.getTypeIconPath(customPlotType)[0] : CustomPlotFactory.getTypeIconPath(customPlotType)[1];
+        return isSelected ? CustomPlotGlyphFactory.getTypeIconPath(customPlotType)[0] : CustomPlotGlyphFactory.getTypeIconPath(customPlotType)[1];
     }
 
 

designer_chart/src/com/fr/plugin/chart/custom/component/VanChartCustomPlotSelectPane.java

@@ -8,11 +8,11 @@ import com.fr.general.FRLogger;
 import com.fr.general.Inter;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot;
+import com.fr.plugin.chart.custom.CustomPlotDesignerPaneFactory;
+import com.fr.plugin.chart.custom.CustomPlotFactory;
 import com.fr.plugin.chart.custom.VanChartCustomPlot;
 import com.fr.plugin.chart.custom.type.CustomPlotType;
 import com.fr.plugin.chart.custom.type.CustomStyle;
-import com.fr.plugin.chart.custom.CustomPlotDesignerPaneFactory;
-import com.fr.plugin.chart.custom.CustomPlotFactory;
 
 import javax.swing.*;
 import java.awt.*;

designer_chart/src/com/fr/plugin/chart/custom/other/VanChartCustomPlotConditionAttrTabPane.java

@@ -3,6 +3,7 @@ package com.fr.plugin.chart.custom.other;
 import com.fr.design.dialog.BasicPane;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.custom.CustomPlotFactory;
+import com.fr.plugin.chart.custom.CustomPlotGlyphFactory;
 import com.fr.plugin.chart.custom.VanChartCustomPlot;
 import com.fr.plugin.chart.custom.component.VanChartCustomPlotTabPane;
 import com.fr.plugin.chart.custom.type.CustomPlotType;
@@ -31,7 +32,7 @@ public class VanChartCustomPlotConditionAttrTabPane extends VanChartCustomPlotTa
                 VanChartPlot vanChartPlot = customPlotList.get(j);
 
                 CustomPlotType plotType = CustomPlotFactory.getCustomType(vanChartPlot);
-                NameArray[i] = CustomPlotFactory.getTitle(plotType);
+                NameArray[i] = CustomPlotGlyphFactory.getTitle(plotType);
                 centerPane.add(pane, NameArray[i]);
             }else {
                 //如果不支持，则i不动

designer_chart/src/com/fr/plugin/chart/custom/other/VanChartCustomPlotHyperlinkTabPane.java

@@ -3,6 +3,7 @@ package com.fr.plugin.chart.custom.other;
 import com.fr.design.dialog.BasicPane;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.custom.CustomPlotFactory;
+import com.fr.plugin.chart.custom.CustomPlotGlyphFactory;
 import com.fr.plugin.chart.custom.VanChartCustomPlot;
 import com.fr.plugin.chart.custom.component.VanChartCustomPlotTabPane;
 import com.fr.plugin.chart.custom.component.VanChartHyperLinkPane;
@@ -29,7 +30,7 @@ public class VanChartCustomPlotHyperlinkTabPane extends VanChartCustomPlotTabPan
             //获取点的tooltip作为标题
             VanChartPlot vanChartPlot = customPlotList.get(i);
             CustomPlotType plotType = CustomPlotFactory.getCustomType(vanChartPlot);
-            String name = CustomPlotFactory.getTitle(plotType);
+            String name = CustomPlotGlyphFactory.getTitle(plotType);
             NameArray[i] = name.length() > 3 ? name.substring(0, 3) : name;
             centerPane.add(pane, NameArray[i]);
         }

designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomAxisAreaPane.java

@@ -2,9 +2,9 @@ package com.fr.plugin.chart.custom.style;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
-import com.fr.plugin.chart.custom.VanChartCustomPlot;
 import com.fr.plugin.chart.custom.CustomPlotDesignerPaneFactory;
 import com.fr.plugin.chart.custom.CustomPlotFactory;
+import com.fr.plugin.chart.custom.VanChartCustomPlot;
 import com.fr.plugin.chart.designer.style.background.VanChartAxisAreaPane;
 
 import java.util.List;

designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomAxisTabPane.java

@@ -6,6 +6,7 @@ import com.fr.plugin.chart.attr.plot.VanChartAxisPlot;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.custom.CustomPlotDesignerPaneFactory;
 import com.fr.plugin.chart.custom.CustomPlotFactory;
+import com.fr.plugin.chart.custom.CustomPlotGlyphFactory;
 import com.fr.plugin.chart.custom.VanChartCustomPlot;
 import com.fr.plugin.chart.custom.component.VanChartCustomPlotAxisPane;
 import com.fr.plugin.chart.custom.component.VanChartCustomPlotTabPane;
@@ -72,7 +73,7 @@ public class VanChartCustomAxisTabPane extends VanChartCustomPlotTabPane<VanChar
             VanChartPlot vanChartPlot = customPlotList.get(plotOrder.get(i));
             CustomPlotType plotType = CustomPlotFactory.getCustomType(vanChartPlot);
 
-            NameArray[i] = CustomPlotFactory.getTitle(plotType);
+            NameArray[i] = CustomPlotGlyphFactory.getTitle(plotType);
             centerPane.add(pane, NameArray[i]);
         }
 

designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomPlotLabelTabPane.java

@@ -5,10 +5,11 @@ import com.fr.chart.chartglyph.ConditionAttr;
 import com.fr.design.dialog.BasicPane;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.base.AttrLabel;
+import com.fr.plugin.chart.custom.CustomPlotFactory;
+import com.fr.plugin.chart.custom.CustomPlotGlyphFactory;
 import com.fr.plugin.chart.custom.VanChartCustomPlot;
 import com.fr.plugin.chart.custom.component.VanChartCustomPlotTabPane;
 import com.fr.plugin.chart.custom.type.CustomPlotType;
-import com.fr.plugin.chart.custom.CustomPlotFactory;
 import com.fr.plugin.chart.designer.PlotFactory;
 import com.fr.plugin.chart.designer.style.VanChartStylePane;
 import com.fr.plugin.chart.designer.style.label.VanChartPlotLabelPane;
@@ -35,7 +36,7 @@ public class VanChartCustomPlotLabelTabPane extends VanChartCustomPlotTabPane<Va
             VanChartPlot vanChartPlot = customPlotList.get(i);
             CustomPlotType plotType = CustomPlotFactory.getCustomType(vanChartPlot);
 
-            NameArray[i] = CustomPlotFactory.getTitle(plotType);
+            NameArray[i] = CustomPlotGlyphFactory.getTitle(plotType);
             centerPane.add(pane, NameArray[i]);
         }
     }

designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomPlotSeriesTabPane.java

@@ -8,6 +8,7 @@ import com.fr.design.mainframe.chart.gui.style.series.AbstractPlotSeriesPane;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.custom.CustomPlotDesignerPaneFactory;
 import com.fr.plugin.chart.custom.CustomPlotFactory;
+import com.fr.plugin.chart.custom.CustomPlotGlyphFactory;
 import com.fr.plugin.chart.custom.VanChartCustomPlot;
 import com.fr.plugin.chart.custom.component.VanChartCustomPlotTabPane;
 import com.fr.plugin.chart.custom.type.CustomPlotType;
@@ -35,7 +36,7 @@ public class VanChartCustomPlotSeriesTabPane extends VanChartCustomPlotTabPane<V
             VanChartPlot vanChartPlot = customPlotList.get(i);
             CustomPlotType plotType = CustomPlotFactory.getCustomType(vanChartPlot);
 
-            NameArray[i] = CustomPlotFactory.getTitle(plotType);
+            NameArray[i] = CustomPlotGlyphFactory.getTitle(plotType);
             centerPane.add(pane, NameArray[i]);
         }
     }

designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomPlotTooltipTabPane.java

@@ -6,6 +6,7 @@ import com.fr.design.dialog.BasicPane;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.base.AttrTooltip;
 import com.fr.plugin.chart.custom.CustomPlotFactory;
+import com.fr.plugin.chart.custom.CustomPlotGlyphFactory;
 import com.fr.plugin.chart.custom.VanChartCustomPlot;
 import com.fr.plugin.chart.custom.component.VanChartCustomPlotTabPane;
 import com.fr.plugin.chart.custom.type.CustomPlotType;
@@ -36,7 +37,7 @@ public class VanChartCustomPlotTooltipTabPane extends VanChartCustomPlotTabPane<
             VanChartPlot vanChartPlot = customPlotList.get(i);
             CustomPlotType plotType = CustomPlotFactory.getCustomType(vanChartPlot);
 
-            NameArray[i] = CustomPlotFactory.getTitle(plotType);
+            NameArray[i] = CustomPlotGlyphFactory.getTitle(plotType);
             centerPane.add(pane, NameArray[i]);
         }
     }