From 555876f985ba92edb6835308254988aac1813dc5 Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Mon, 14 Aug 2017 15:08:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/VanChartTooltipContentPane.java      | 14 +++++++-------
 .../component/label/GaugeLabelContentPane.java     | 13 +++++++------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartTooltipContentPane.java b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartTooltipContentPane.java
index c36de8e090..3569579754 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartTooltipContentPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartTooltipContentPane.java
@@ -85,23 +85,23 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         centerPane.add(htmlLabelPane, Inter.getLocText("Plugin-ChartF_Custom"));
         centerPane.add(commonPanel,Inter.getLocText("Plugin-ChartF_Common"));
 
-        UILabel text = new UILabel();
-
         double[] column = {p, f};
         double[] row = {p,p,p};
         Component[][] components = new Component[][]{
                 new Component[]{null,null},
-                new Component[]{text,content},
+                new Component[]{new UILabel(getLabelContentTitle()),content},
                 new Component[]{null,centerPane},
         };
         initContentListener();
-        return getContentPane(components, column, row, text);
+        JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, column);
+        return getLabelContentPane(contentPane);
     }
 
-    protected JPanel getContentPane(Component[][] components, double[] column, double[] row, UILabel text) {
-        text.setText(Inter.getLocText("FR-Designer_Text"));
+    protected String getLabelContentTitle () {
+        return Inter.getLocText("FR-Designer_Text");
+    }
 
-        JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, column);
+    protected JPanel getLabelContentPane(JPanel contentPane) {
         return createTableLayoutPaneWithTitle(Inter.getLocText("Plugin-ChartF_Content"), contentPane);
     }
 
diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/label/GaugeLabelContentPane.java b/designer_chart/src/com/fr/plugin/chart/designer/component/label/GaugeLabelContentPane.java
index 89c329344c..2b2dcaf621 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/component/label/GaugeLabelContentPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/component/label/GaugeLabelContentPane.java
@@ -1,13 +1,10 @@
 package com.fr.plugin.chart.designer.component.label;
 
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.general.Inter;
-import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
 import com.fr.plugin.chart.designer.component.VanChartLabelContentPane;
 import com.fr.plugin.chart.designer.style.VanChartStylePane;
 
 import javax.swing.*;
-import java.awt.*;
 
 /**
  * Created by mengao on 2017/8/13.
@@ -18,8 +15,12 @@ public class GaugeLabelContentPane extends VanChartLabelContentPane {
         super(parent, showOnPane);
     }
 
-    protected JPanel getContentPane(Component[][] components, double[] column, double[] row, UILabel text) {
-        text.setText(Inter.getLocText("Plugin-ChartF_Content"));
-        return TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, column);
+    protected String getLabelContentTitle() {
+        return Inter.getLocText("Plugin-ChartF_Content");
     }
+
+    protected JPanel getLabelContentPane(JPanel contentPane) {
+        return contentPane;
+    }
+
 }