diff --git a/designer_base/src/com/fr/design/gui/style/FormatPane.java b/designer_base/src/com/fr/design/gui/style/FormatPane.java index 5dc9d347a..0b810b7ae 100644 --- a/designer_base/src/com/fr/design/gui/style/FormatPane.java +++ b/designer_base/src/com/fr/design/gui/style/FormatPane.java @@ -69,7 +69,7 @@ public class FormatPane extends AbstractBasicStylePane { this.initComponents(TYPES); } - public UIComboBox getTypeComboBox() { + protected UIComboBox getTypeComboBox() { return typeComboBox; } diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPane.java b/designer_chart/src/com/fr/plugin/chart/designer/component/format/FormatPaneWithOutFont.java similarity index 94% rename from designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPane.java rename to designer_chart/src/com/fr/plugin/chart/designer/component/format/FormatPaneWithOutFont.java index ea9a1deef..cd4ff91fe 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/component/format/FormatPaneWithOutFont.java @@ -10,7 +10,7 @@ import java.awt.*; /** * Created by mengao on 2017/8/28. */ -public class VanChartFormatPane extends FormatPane { +public class FormatPaneWithOutFont extends FormatPane { private static final int HEIGHT = 30; diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java b/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java index feba874e9..2319956f1 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java @@ -114,7 +114,7 @@ public abstract class VanChartFormatPaneWithCheckBox extends JPanel{ } protected FormatPane createFormatPane() { - return new VanChartFormatPane(); + return new FormatPaneWithOutFont(); } public boolean isDirty() { diff --git a/designer_chart/src/com/fr/plugin/chart/range/component/LegendLabelFormatPane.java b/designer_chart/src/com/fr/plugin/chart/range/component/LegendLabelFormatPane.java index dea47c00d..a9ea6a10c 100644 --- a/designer_chart/src/com/fr/plugin/chart/range/component/LegendLabelFormatPane.java +++ b/designer_chart/src/com/fr/plugin/chart/range/component/LegendLabelFormatPane.java @@ -8,7 +8,7 @@ import com.fr.design.layout.TableLayout; import com.fr.general.Inter; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.designer.component.VanChartHtmlLabelPaneWithOutWidthAndHeight; -import com.fr.plugin.chart.designer.component.format.VanChartFormatPane; +import com.fr.plugin.chart.designer.component.format.FormatPaneWithOutFont; import com.fr.plugin.chart.designer.style.VanChartStylePane; import javax.swing.*; @@ -31,7 +31,7 @@ public class LegendLabelFormatPane extends JPanel{ public LegendLabelFormatPane(){ labelFormatStyle = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Common"), Inter.getLocText("Plugin-ChartF_Custom")}); - labelFormat = new VanChartFormatPane(); + labelFormat = new FormatPaneWithOutFont(); htmlLabelPane = new VanChartHtmlLabelPaneWithOutWidthAndHeight(); centerPane = new JPanel(new CardLayout()){