From 1e5f8d36f1401cee6a1401e251d9ed89b8201142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com>
Date: Fri, 22 May 2020 16:20:26 +0800
Subject: [PATCH] =?UTF-8?q?CHART-14022=20=20=E7=88=B6=E7=B1=BB=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E6=94=B9=E5=8F=98=EF=BC=8C=E5=AD=90=E7=B1=BB=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/van/chart/designer/PlotFactory.java  | 4 ++--
 .../designer/component/format/FormatPaneWithNormalType.java   | 2 +-
 .../designer/component/format/FormatPaneWithOutFont.java      | 2 +-
 .../van/chart/designer/style/axis/VanChartBaseAxisPane.java   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java b/designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java
index d3e1adbb9..e92afa38f 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java
+++ b/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.JList;
 import javax.swing.JPanel;
-import java.awt.Component;
 import java.lang.reflect.Constructor;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.awt.Component;
 
 /**
  * Created by Mitisky on 16/3/1.
@@ -339,7 +339,7 @@ public class PlotFactory {
 
     public static FormatPane createAutoFormatPane() {
         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());
                 return new Component[][]{
                         new Component[]{typePane, null},
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithNormalType.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithNormalType.java
index 728bc1b1c..959194ad1 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithNormalType.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithNormalType.java
@@ -23,7 +23,7 @@ public class FormatPaneWithNormalType extends FormatPaneWithOutFont {
         setForDataSheet();
     }
 
-    protected Component[][] getComponent(JPanel fontPane, JPanel centerPane, JPanel typePane) {
+    protected Component[][] getComponent(JPanel fontPane, JPanel centerPane, JPanel typePane, JPanel optionPane) {
         return new Component[][]{
                 new Component[]{null, centerPane},
         };
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithOutFont.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithOutFont.java
index 7275ad074..f225156d8 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithOutFont.java
+++ b/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);
     }
 
-    protected Component[][] getComponent (JPanel fontPane, JPanel centerPane, JPanel typePane) {
+    protected Component[][] getComponent (JPanel fontPane, JPanel centerPane, JPanel typePane, JPanel optionPane) {
         typePane.setBorder(BorderFactory.createEmptyBorder());
         return new Component[][]{
                 new Component[]{null, null},
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java
index 064a7156b..1858f0a40 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java
+++ b/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(){
         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());
                 return new Component[][]{
                         new Component[]{typePane,null},