diff --git a/designer_chart/src/com/fr/plugin/chart/custom/component/ChartImageCheckOutPane.java b/designer_chart/src/com/fr/plugin/chart/custom/component/ChartImageCheckOutPane.java index d9515ac68..fc36decc9 100644 --- a/designer_chart/src/com/fr/plugin/chart/custom/component/ChartImageCheckOutPane.java +++ b/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.CustomPlotGlyphFactory; +import com.fr.plugin.chart.custom.CustomPlotFactory; 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(CustomPlotGlyphFactory.getTooltipText(this.customPlotType)); + this.checkBox.setToolTipText(CustomPlotFactory.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 ? CustomPlotGlyphFactory.getTypeIconPath(customPlotType)[0] : CustomPlotGlyphFactory.getTypeIconPath(customPlotType)[1]; + return isSelected ? CustomPlotFactory.getTypeIconPath(customPlotType)[0] : CustomPlotFactory.getTypeIconPath(customPlotType)[1]; } diff --git a/designer_chart/src/com/fr/plugin/chart/custom/other/VanChartCustomPlotConditionAttrTabPane.java b/designer_chart/src/com/fr/plugin/chart/custom/other/VanChartCustomPlotConditionAttrTabPane.java index 2e6e2c945..18285dfd1 100644 --- a/designer_chart/src/com/fr/plugin/chart/custom/other/VanChartCustomPlotConditionAttrTabPane.java +++ b/designer_chart/src/com/fr/plugin/chart/custom/other/VanChartCustomPlotConditionAttrTabPane.java @@ -3,7 +3,6 @@ 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; @@ -32,7 +31,7 @@ public class VanChartCustomPlotConditionAttrTabPane extends VanChartCustomPlotTa VanChartPlot vanChartPlot = customPlotList.get(j); CustomPlotType plotType = CustomPlotFactory.getCustomType(vanChartPlot); - NameArray[i] = CustomPlotGlyphFactory.getTitle(plotType); + NameArray[i] = CustomPlotFactory.getTitle(plotType); centerPane.add(pane, NameArray[i]); }else { //如果不支持,则i不动 diff --git a/designer_chart/src/com/fr/plugin/chart/custom/other/VanChartCustomPlotHyperlinkTabPane.java b/designer_chart/src/com/fr/plugin/chart/custom/other/VanChartCustomPlotHyperlinkTabPane.java index 1a86793b0..073a84520 100644 --- a/designer_chart/src/com/fr/plugin/chart/custom/other/VanChartCustomPlotHyperlinkTabPane.java +++ b/designer_chart/src/com/fr/plugin/chart/custom/other/VanChartCustomPlotHyperlinkTabPane.java @@ -3,7 +3,6 @@ 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; @@ -30,7 +29,7 @@ public class VanChartCustomPlotHyperlinkTabPane extends VanChartCustomPlotTabPan //获取点的tooltip作为标题 VanChartPlot vanChartPlot = customPlotList.get(i); CustomPlotType plotType = CustomPlotFactory.getCustomType(vanChartPlot); - String name = CustomPlotGlyphFactory.getTitle(plotType); + String name = CustomPlotFactory.getTitle(plotType); NameArray[i] = name.length() > 3 ? name.substring(0, 3) : name; centerPane.add(pane, NameArray[i]); } diff --git a/designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomAxisTabPane.java b/designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomAxisTabPane.java index dc205b539..8fc7a774c 100644 --- a/designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomAxisTabPane.java +++ b/designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomAxisTabPane.java @@ -6,7 +6,6 @@ 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; @@ -73,7 +72,7 @@ public class VanChartCustomAxisTabPane extends VanChartCustomPlotTabPane