From 4b0d138b37a1ff6bbf4400bb355a537d0f84cc61 Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Sat, 7 Mar 2020 13:32:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E8=BF=87=E6=97=B6=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/chart/gui/style/ChartTextAttrPane.java   | 10 ++++++----
 .../chart/gui/style/ChartTextAttrPaneWithAuto.java     |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

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 71ff1c9d0..3ac7f116e 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
@@ -10,10 +10,12 @@ import com.fr.design.gui.ibutton.UIColorButton;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.FRFont;
 
+import com.fr.general.GeneralUtils;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 
 import javax.swing.JPanel;
@@ -144,7 +146,7 @@ public class ChartTextAttrPane extends BasicPane {
      * @return 更新字
      */
     public FRFont updateFRFont() {
-        String name = Utils.objectToString(fontNameComboBox.getSelectedItem());
+        String name = GeneralUtils.objectToString(fontNameComboBox.getSelectedItem());
 
         return FRFont.getInstance(name, getFontStyle(), getFontSize(), fontColor.getColor());
     }
@@ -163,7 +165,7 @@ public class ChartTextAttrPane extends BasicPane {
     }
 
     protected float getFontSize() {
-        return Float.parseFloat(Utils.objectToString(fontSizeComboBox.getSelectedItem()));
+        return Float.parseFloat(GeneralUtils.objectToString(fontSizeComboBox.getSelectedItem()));
     }
 
     public void setEnabled(boolean enabled) {
@@ -207,7 +209,7 @@ public class ChartTextAttrPane extends BasicPane {
     protected JPanel getContentPane (JPanel buttonPane) {
         double f = TableLayout.FILL;
         double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
-        double[] columnSize = {f,e};
+        double[] columnSize = {f, e};
 
         return TableLayout4VanChartHelper.createGapTableLayoutPane(getComponents(buttonPane), getRowSize(), columnSize);
     }
@@ -218,7 +220,7 @@ public class ChartTextAttrPane extends BasicPane {
     }
 
     protected Component[][] getComponents(JPanel buttonPane) {
-        UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT);
+        UILabel text = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT);
         return new Component[][]{
                 new Component[]{null, null},
                 new Component[]{text, fontNameComboBox},
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 1301b243a..f959984c1 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
@@ -1,11 +1,11 @@
 package com.fr.design.mainframe.chart.gui.style;
 
-import com.fr.base.Utils;
 import com.fr.design.gui.ibutton.UIColorButton;
 import com.fr.design.gui.ibutton.UIColorButtonWithAuto;
 import com.fr.design.i18n.Toolkit;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
+import com.fr.general.GeneralUtils;
 
 public class ChartTextAttrPaneWithAuto extends ChartTextAttrPane {
 
@@ -59,7 +59,7 @@ public class ChartTextAttrPaneWithAuto extends ChartTextAttrPane {
             return AUTO_SIZE_INT;
         }
 
-        return Float.parseFloat(Utils.objectToString(getFontSizeComboBox().getSelectedItem()));
+        return Float.parseFloat(GeneralUtils.objectToString(getFontSizeComboBox().getSelectedItem()));
     }
 
     protected void setFontSize(FRFont frFont) {