From 10f4be45070fd5233c3c062431621b105bb4d147 Mon Sep 17 00:00:00 2001
From: fr_shine <zheng@finereport.com>
Date: Tue, 25 Oct 2016 09:31:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=A0=87=E7=AD=BE=20?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E5=90=8D=E5=92=8C=E5=8C=BA=E5=9F=9F=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SeriesCondition/TooltipContentsPane.java  | 29 +++++++++----------
 .../SeriesCondition/dlp/DataLabelPane.java    | 15 +++++-----
 .../SeriesCondition/dlp/MapDataLabelPane.java | 18 ++++++++++++
 3 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/TooltipContentsPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/TooltipContentsPane.java
index 0be84de39..c8f2fe394 100644
--- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/TooltipContentsPane.java
+++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/TooltipContentsPane.java
@@ -1,28 +1,23 @@
 package com.fr.design.chart.series.SeriesCondition;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.text.Format;
-
-import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
-
 import com.fr.chart.base.AttrContents;
 import com.fr.chart.base.ChartConstants;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.dialog.BasicPane;
-import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.style.FormatPane;
 import com.fr.general.Inter;
 import com.fr.stable.StringUtils;
-import com.fr.design.style.FormatPane;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.text.Format;
 
 /**
  * 数据点提示内容面板，包含系列值、系列百分比
@@ -58,7 +53,7 @@ public class TooltipContentsPane extends BasicPane{
 
 	protected JPanel createJPanel4Value() {
 		if (showValueCB == null) {
-			showValueCB = new UICheckBox(Inter.getLocText("Value"));
+			showValueCB = new UICheckBox(getValueString());
 		}
 		showValueCB.setSelected(true);
 
@@ -75,7 +70,9 @@ public class TooltipContentsPane extends BasicPane{
 		return valuePane;
 	}
 
-
+	protected String getValueString() {
+		return Inter.getLocText("Value");
+	}
 
 	protected Component[] createComponents4PercentValue() {
 		if (showPercent == null) {
diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java
index 33f2dccb7..7d8b6c8ce 100644
--- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java
+++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java
@@ -1,12 +1,5 @@
 package com.fr.design.chart.series.SeriesCondition.dlp;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-
-import javax.swing.ButtonGroup;
-import javax.swing.JPanel;
-
 import com.fr.base.Utils;
 import com.fr.chart.base.AttrContents;
 import com.fr.chart.base.ChartConstants;
@@ -21,6 +14,9 @@ import com.fr.general.Inter;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
 
+import javax.swing.*;
+import java.awt.*;
+
 /**
  * Created by IntelliJ IDEA.
  * Author : Richer
@@ -80,11 +76,14 @@ public class DataLabelPane extends TooltipContentsPane {
 
     protected Component[] createComponents4ShowCategoryName() {
         if (showCategoryNameCB == null) {
-            showCategoryNameCB = new UICheckBox(Inter.getLocText(new String[]{"StyleFormat-Category", "WF-Name"}));
+            showCategoryNameCB = new UICheckBox(getCategoryString());
         }
         return new Component[]{null, showCategoryNameCB};
     }
 
+    protected String getCategoryString(){
+        return Inter.getLocText(new String[]{"StyleFormat-Category", "WF-Name"});
+    }
    
 
     protected Component[] createComponents4ShowGuidLine() {
diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/MapDataLabelPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/MapDataLabelPane.java
index 355ec9eee..451197e2a 100644
--- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/MapDataLabelPane.java
+++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/MapDataLabelPane.java
@@ -1,6 +1,9 @@
 package com.fr.design.chart.series.SeriesCondition.dlp;
 
+import com.fr.general.Inter;
+
 import javax.swing.*;
+import java.awt.*;
 
 
 /**
@@ -13,6 +16,21 @@ import javax.swing.*;
  */
 public class MapDataLabelPane extends DataLabelPane {
 
+    @Override
+    protected Component[] createComponents4ShowSeriesName() {
+        return new Component[0];
+    }
+
+    @Override
+    protected String getCategoryString() {
+        return Inter.getLocText("FR-Chart-Area_Name");
+    }
+
+    @Override
+    protected String getValueString() {
+        return Inter.getLocText("FR-Chart-Area_Value");
+    }
+
     protected JPanel createJPanel4Position() {
         return null;
     }