Merge remote-tracking branch 'origin/fbp/release' into fbp/release

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

@@ -1,30 +1,16 @@
 package com.fr.van.chart.designer.style.axis;
 
-import com.fr.design.layout.TableLayout;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithThemeStyle;
 import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 
-import javax.swing.JPanel;
-
 public class VanChartAxisPaneHelper {
     public static ChartTextAttrPane createAxisTextAttrPane() {
         return ChartEditContext.supportTheme() ? new ChartTextAttrPaneWithThemeStyle() {
             protected double getEdithAreaWidth() {
                 return TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH;
             }
-        } : new ChartTextAttrPane() {
-            @Override
-            protected JPanel getContentPane(JPanel buttonPane) {
-                double p = TableLayout.PREFERRED;
-                double f = TableLayout.FILL;
-                double e = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH;
-                double[] columnSize = {f, e};
-                double[] rowSize = {p, p, p};
-
-                return TableLayout4VanChartHelper.createGapTableLayoutPane(getComponents(buttonPane), rowSize, columnSize);
-            }
-        };
+        } : new ChartTextAttrPane();
     }
 }