From 4491ba813d030f06ad52c17d1403503d92c29372 Mon Sep 17 00:00:00 2001
From: fr_shine <zheng@finereport.com>
Date: Wed, 14 Dec 2016 11:44:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/chart/report/GisMapTableDataContentPane.java    | 2 +-
 .../design/chart/report/GisMapTableDataContentPane4Chart.java | 2 +-
 .../src/com/fr/design/chart/report/MapCubeLayerPane.java      | 4 ++--
 .../chart/gui/data/table/BubblePlotTableDataContentPane.java  | 2 +-
 .../gui/data/table/CategoryPlotTableDataContentPane.java      | 2 +-
 .../gui/data/table/XYScatterPlotTableDataContentPane.java     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/designer_chart/src/com/fr/design/chart/report/GisMapTableDataContentPane.java b/designer_chart/src/com/fr/design/chart/report/GisMapTableDataContentPane.java
index 4e0443c9ff..5a2f3a4b93 100644
--- a/designer_chart/src/com/fr/design/chart/report/GisMapTableDataContentPane.java
+++ b/designer_chart/src/com/fr/design/chart/report/GisMapTableDataContentPane.java
@@ -245,7 +245,7 @@ public class GisMapTableDataContentPane extends FurtherBasicBeanPane<GisMapTable
 
 		if(addressNameBox.getSelectedItem() != null){
             String adName = Utils.objectToString(addressNameBox.getSelectedItem());
-            if(ArrayUtils.contains(ChartConstants.NONE_KEYS, adName)) {
+            if(ArrayUtils.contains(ChartConstants.getNoneKeys(), adName)) {
                 definition.setAddressName(StringUtils.EMPTY);
             } else {
                 definition.setAddressName(adName);
diff --git a/designer_chart/src/com/fr/design/chart/report/GisMapTableDataContentPane4Chart.java b/designer_chart/src/com/fr/design/chart/report/GisMapTableDataContentPane4Chart.java
index 2f2f869b95..f70390a431 100644
--- a/designer_chart/src/com/fr/design/chart/report/GisMapTableDataContentPane4Chart.java
+++ b/designer_chart/src/com/fr/design/chart/report/GisMapTableDataContentPane4Chart.java
@@ -226,7 +226,7 @@ public class GisMapTableDataContentPane4Chart extends FurtherBasicBeanPane<GisMa
 
         if (addressNameBox.getSelectedItem() != null) {
             String adName = Utils.objectToString(addressNameBox.getSelectedItem());
-            if (ArrayUtils.contains(ChartConstants.NONE_KEYS, adName)) {
+            if (ArrayUtils.contains(ChartConstants.getNoneKeys(), adName)) {
                 definition.setAddressName(StringUtils.EMPTY);
             } else {
                 definition.setAddressName(adName);
diff --git a/designer_chart/src/com/fr/design/chart/report/MapCubeLayerPane.java b/designer_chart/src/com/fr/design/chart/report/MapCubeLayerPane.java
index cffddfd679..461fe220a0 100644
--- a/designer_chart/src/com/fr/design/chart/report/MapCubeLayerPane.java
+++ b/designer_chart/src/com/fr/design/chart/report/MapCubeLayerPane.java
@@ -188,7 +188,7 @@ public class MapCubeLayerPane extends BasicBeanPane<String>{
 					  while(names.hasNext()) {
 						  Object name = names.next();
                           String layName = editingAttr.getLayerTo(Utils.objectToString(name));
-                          if(ArrayUtils.contains(ChartConstants.NONE_KEYS, layName)) {// kunsnat: 考虑切换设计器语言.
+                          if(ArrayUtils.contains(ChartConstants.getNoneKeys(), layName)) {// kunsnat: 考虑切换设计器语言.
                               layName = StringUtils.EMPTY;
                           }
 						  list.add(new Object[]{name, layName});
@@ -230,7 +230,7 @@ public class MapCubeLayerPane extends BasicBeanPane<String>{
             while(names.hasNext()) {
                 Object name = names.next();
                 String layName = editingAttr.getLayerTo(Utils.objectToString(name));
-                if(ArrayUtils.contains(ChartConstants.NONE_KEYS, layName)) {// kunsnat: 考虑切换设计器语言.
+                if(ArrayUtils.contains(ChartConstants.getNoneKeys(), layName)) {// kunsnat: 考虑切换设计器语言.
                     layName = StringUtils.EMPTY;
                 }
                 list.add(new Object[]{name, layName});
diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java
index 73c5f1b180..2d404196c8 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java
@@ -137,7 +137,7 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane
         Object resultY = yCombox.getSelectedItem();
         Object resultSize = bubbleSize.getSelectedItem();
 
-        if(resultName == null || ArrayUtils.contains(ChartConstants.NONE_KEYS, resultName)) {
+        if(resultName == null || ArrayUtils.contains(ChartConstants.getNoneKeys(), resultName)) {
             definition.setSeriesName(StringUtils.EMPTY);
         } else {
             definition.setSeriesName(resultName.toString());
diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java
index a8c1bc1f87..6de692f6f0 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java
@@ -113,7 +113,7 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa
 		}
 		Object categoryName = categoryCombox.getSelectedItem();
 
-        if(ArrayUtils.contains(ChartConstants.NONE_KEYS, categoryName)) {
+        if(ArrayUtils.contains(ChartConstants.getNoneKeys(), categoryName)) {
             dataDefinition.setCategoryName(StringUtils.EMPTY);
         } else {
 		    dataDefinition.setCategoryName(categoryName == null ? null : categoryName.toString());
diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/XYScatterPlotTableDataContentPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/XYScatterPlotTableDataContentPane.java
index c27b4322c5..8abb46bf5b 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/XYScatterPlotTableDataContentPane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/XYScatterPlotTableDataContentPane.java
@@ -107,7 +107,7 @@ public class XYScatterPlotTableDataContentPane extends AbstractTableDataContentP
 		Object resultX = xCombox.getSelectedItem();
 		Object resultY = yCombox.getSelectedItem();
 
-        if(resultName == null || ArrayUtils.contains(ChartConstants.NONE_KEYS, resultName)) {
+        if(resultName == null || ArrayUtils.contains(ChartConstants.getNoneKeys(), resultName)) {
             definition.setSeriesName(StringUtils.EMPTY);
         } else {
 			definition.setSeriesName(resultName.toString());