From f4b02049b70c5dfa2e82481922f3b41c076df17d Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Sun, 8 Mar 2020 15:22:49 +0800
Subject: [PATCH] =?UTF-8?q?get=E6=94=B9=E4=B8=BAupdate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/gui/style/ChartTextAttrNoColorPane.java      |  2 +-
 .../mainframe/chart/gui/style/ChartTextAttrPane.java   | 10 +++++-----
 .../chart/gui/style/ChartTextAttrPaneWithAuto.java     |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrNoColorPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrNoColorPane.java
index 249583768..177168cd7 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrNoColorPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrNoColorPane.java
@@ -56,6 +56,6 @@ public class ChartTextAttrNoColorPane extends ChartTextAttrPane {
     public FRFont updateFRFont() {
         String name = GeneralUtils.objectToString(getFontNameComboBox().getSelectedItem());
 
-        return FRFont.getInstance(name, getFontStyle(), getFontSize());
+        return FRFont.getInstance(name, updateFontStyle(), updateFontSize());
     }
 }
\ No newline at end of file
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java
index 7d38d4d39..a6be91a24 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java
@@ -147,10 +147,10 @@ public class ChartTextAttrPane extends BasicPane {
     public FRFont updateFRFont() {
         String name = GeneralUtils.objectToString(fontNameComboBox.getSelectedItem());
 
-        return FRFont.getInstance(name, getFontStyle(), getFontSize(), fontColor.getColor());
+        return FRFont.getInstance(name, updateFontStyle(), updateFontSize(), fontColor.getColor());
     }
 
-    protected int getFontStyle() {
+    protected int updateFontStyle() {
         int style = Font.PLAIN;
         if (bold.isSelected() && !italic.isSelected()) {
             style = Font.BOLD;
@@ -163,7 +163,7 @@ public class ChartTextAttrPane extends BasicPane {
         return style;
     }
 
-    protected float getFontSize() {
+    protected float updateFontSize() {
         return Float.parseFloat(GeneralUtils.objectToString(fontSizeComboBox.getSelectedItem()));
     }
 
@@ -205,7 +205,7 @@ public class ChartTextAttrPane extends BasicPane {
         populate(FRFont.getInstance());
     }
 
-    protected JPanel getContentPane (JPanel buttonPane) {
+    protected JPanel getContentPane(JPanel buttonPane) {
         double f = TableLayout.FILL;
         double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
         double[] columnSize = {f, e};
@@ -213,7 +213,7 @@ public class ChartTextAttrPane extends BasicPane {
         return TableLayout4VanChartHelper.createGapTableLayoutPane(getComponents(buttonPane), getRowSize(), columnSize);
     }
 
-    protected double[] getRowSize () {
+    protected double[] getRowSize() {
         double p = TableLayout.PREFERRED;
         return new double[]{p, p, p};
     }
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java
index 6061ed18b..70fdf903e 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java
@@ -42,7 +42,7 @@ public class ChartTextAttrPaneWithAuto extends ChartTextAttrPane {
         return isFontSizeAuto ? FONT_SIZES_WITH_AUTO : FONT_SIZES;
     }
 
-    protected float getFontSize() {
+    protected float updateFontSize() {
         if (isFontSizeAuto && ComparatorUtils.equals(getFontSizeComboBox().getSelectedItem(), AUTO)) {
             return ChartConstants.AUTO_FONT_SIZE;
         }