From 6bdcfc81df10256e22bc9911a05f3b416467b393 Mon Sep 17 00:00:00 2001
From: fr_shine <zheng@finereport.com>
Date: Thu, 16 Feb 2017 11:59:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=B3=BB=E5=88=97=E5=80=BC=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/AbstractReportDataContentPane.java   | 17 +++++++++++++++++
 .../CategoryPlotReportDataContentPane.java      | 15 ---------------
 .../report/PiePlotReportDataContentPane.java    | 15 ---------------
 3 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java
index 4ff643522..768ecb7e8 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java
@@ -3,6 +3,8 @@ package com.fr.design.mainframe.chart.gui.data.report;
 import com.fr.base.Formula;
 import com.fr.base.Utils;
 import com.fr.chart.chartattr.ChartCollection;
+import com.fr.chart.chartdata.NormalReportDataDefinition;
+import com.fr.chart.chartdata.SeriesDefinition;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.event.UIObserverListener;
@@ -16,6 +18,7 @@ import com.fr.stable.StableUtils;
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import java.awt.*;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
@@ -95,6 +98,20 @@ public abstract class AbstractReportDataContentPane extends BasicBeanPane<ChartC
 		return seriesPane.updateBean();
 	}
 
+	protected List getEntryList(NormalReportDataDefinition seriesList) {
+		List list = new ArrayList();
+		for (int i = 0; i < seriesList.size(); i++) {
+			SeriesDefinition seriesEntry = (SeriesDefinition) seriesList.get(i);
+			Object[] nameAndValue = new Object[2];
+			nameAndValue[0] = seriesEntry.getSeriesName();
+			nameAndValue[1] = seriesEntry.getValue();
+			if (nameAndValue[0] != null || nameAndValue[1] != null) {
+				list.add(nameAndValue);
+			}
+		}
+		return list;
+	}
+
 	/**
 	 * 界面标题: 
 	 */
diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java
index 5c6d94fff..1e39f52d5 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java
@@ -18,7 +18,6 @@ import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import java.awt.*;
-import java.util.ArrayList;
 import java.util.List;
 
 public class CategoryPlotReportDataContentPane extends AbstractReportDataContentPane {
@@ -113,20 +112,6 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent
         filterPane.populateBean(collection);
     }
 
-    private List getEntryList(NormalReportDataDefinition seriesList) {
-        List list = new ArrayList();
-        for (int i = 0; i < seriesList.size(); i++) {
-            SeriesDefinition seriesEntry = (SeriesDefinition) seriesList.get(i);
-            Object[] nameAndValue = new Object[2];
-            nameAndValue[0] = seriesEntry.getSeriesName();
-            nameAndValue[1] = seriesEntry.getValue();
-            if (nameAndValue[0] != null && nameAndValue[1] != null) {
-                list.add(nameAndValue);
-            }
-        }
-        return list;
-    }
-
     public void updateBean(ChartCollection collection) {
         collection.getSelectedChart().setFilterDefinition(new NormalReportDataDefinition());
 
diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/PiePlotReportDataContentPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/PiePlotReportDataContentPane.java
index 1bededb91..f94160a74 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/PiePlotReportDataContentPane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/PiePlotReportDataContentPane.java
@@ -10,7 +10,6 @@ import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane;
 import com.fr.general.Inter;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -51,20 +50,6 @@ public class PiePlotReportDataContentPane extends AbstractReportDataContentPane
 		filterPane.populateBean(collection);
 	}
 	
-	private List getEntryList(NormalReportDataDefinition seriesList) {
-		List list = new ArrayList();
-		for(int i = 0; i < seriesList.size(); i++) {
-			SeriesDefinition seriesEntry = (SeriesDefinition)seriesList.get(i);
-			Object[] nameAndValue = new Object[2];
-			nameAndValue[0] = seriesEntry.getSeriesName();
-			nameAndValue[1] = seriesEntry.getValue();
-			if(nameAndValue[0] != null && nameAndValue[1] != null) {
-				list.add(nameAndValue);
-			}
-		}
-		return list;
-    }
-	
 	public void updateBean(ChartCollection collection) {
 		collection.getSelectedChart().setFilterDefinition(new NormalReportDataDefinition());
 		

From 88ef53518ea4568d4d1b53f1f0a09650fa14d956 Mon Sep 17 00:00:00 2001
From: fr_shine <zheng@finereport.com>
Date: Thu, 16 Feb 2017 14:28:49 +0800
Subject: [PATCH 2/2] pmd

---
 .../chart/gui/data/report/PiePlotReportDataContentPane.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/PiePlotReportDataContentPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/PiePlotReportDataContentPane.java
index f94160a74..3c8d6a48e 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/PiePlotReportDataContentPane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/PiePlotReportDataContentPane.java
@@ -24,7 +24,7 @@ public class PiePlotReportDataContentPane extends AbstractReportDataContentPane
 	public PiePlotReportDataContentPane(ChartDataPane parent) {
 		initEveryPane();
 		
-		this.add(new BoldFontTextLabel(Inter.getLocText("Data_Filter")), "0,4,2,4");
+		this.add(new BoldFontTextLabel(Inter.getLocText("FR-Chart-Data_Filter")), "0,4,2,4");
 		this.add(filterPane = new ChartDataFilterPane(new PiePlot(), parent), "0,6,2,4");
 	}