Browse Source

CHART-14022 父类方法改变,子类增加参数

feature/big-screen
白岳 4 years ago
parent
commit
1e5f8d36f1
  1. 4
      designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java
  2. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithNormalType.java
  3. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithOutFont.java
  4. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java

4
designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java

@ -63,12 +63,12 @@ import javax.swing.BorderFactory;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JList; import javax.swing.JList;
import javax.swing.JPanel; import javax.swing.JPanel;
import java.awt.Component;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.awt.Component;
/** /**
* Created by Mitisky on 16/3/1. * Created by Mitisky on 16/3/1.
@ -339,7 +339,7 @@ public class PlotFactory {
public static FormatPane createAutoFormatPane() { public static FormatPane createAutoFormatPane() {
FormatPane formatPane = new FormatPane() { FormatPane formatPane = new FormatPane() {
protected Component[][] getComponent(JPanel fontPane, JPanel centerPane, JPanel typePane) { protected Component[][] getComponent(JPanel fontPane, JPanel centerPane, JPanel typePane, JPanel optionPane) {
typePane.setBorder(BorderFactory.createEmptyBorder()); typePane.setBorder(BorderFactory.createEmptyBorder());
return new Component[][]{ return new Component[][]{
new Component[]{typePane, null}, new Component[]{typePane, null},

2
designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithNormalType.java

@ -23,7 +23,7 @@ public class FormatPaneWithNormalType extends FormatPaneWithOutFont {
setForDataSheet(); setForDataSheet();
} }
protected Component[][] getComponent(JPanel fontPane, JPanel centerPane, JPanel typePane) { protected Component[][] getComponent(JPanel fontPane, JPanel centerPane, JPanel typePane, JPanel optionPane) {
return new Component[][]{ return new Component[][]{
new Component[]{null, centerPane}, new Component[]{null, centerPane},
}; };

2
designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithOutFont.java

@ -28,7 +28,7 @@ public class FormatPaneWithOutFont extends FormatPane {
return TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); return TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
} }
protected Component[][] getComponent (JPanel fontPane, JPanel centerPane, JPanel typePane) { protected Component[][] getComponent (JPanel fontPane, JPanel centerPane, JPanel typePane, JPanel optionPane) {
typePane.setBorder(BorderFactory.createEmptyBorder()); typePane.setBorder(BorderFactory.createEmptyBorder());
return new Component[][]{ return new Component[][]{
new Component[]{null, null}, new Component[]{null, null},

2
designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java

@ -445,7 +445,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
protected FormatPane createFormatPane(){ protected FormatPane createFormatPane(){
return new FormatPane(){ return new FormatPane(){
protected Component[][] getComponent (JPanel fontPane, JPanel centerPane, JPanel typePane) { protected Component[][] getComponent (JPanel fontPane, JPanel centerPane, JPanel typePane, JPanel optionPane) {
typePane.setBorder(BorderFactory.createEmptyBorder()); typePane.setBorder(BorderFactory.createEmptyBorder());
return new Component[][]{ return new Component[][]{
new Component[]{typePane,null}, new Component[]{typePane,null},

Loading…
Cancel
Save