From 0533f537a57338ecb5ae315dd6656181c7212b08 Mon Sep 17 00:00:00 2001
From: Bryant <Bryant@fanruan.com>
Date: Sun, 8 Sep 2019 11:09:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20sonar?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/widget/component/NumberEditorValidatePane.java | 5 +++--
 .../com/fr/design/write/submit/DBManipulationPane.java    | 5 +----
 .../design/chart/report/GisMapReportDataContentPane.java  | 6 +-----
 .../design/chart/report/GisMapTableDataContentPane.java   | 8 ++------
 .../com/fr/design/chart/report/MapMoreTableIndexPane.java | 8 ++------
 .../fr/design/chart/report/MapTableDataSinglePane.java    | 8 ++------
 .../chart/series/PlotSeries/UIGroupExtensionPane.java     | 3 ---
 .../AbstractMultiComponentPaneWithUISpinner.java          | 3 ++-
 .../com/fr/design/mainframe/chart/gui/ChartTypePane.java  | 2 ++
 .../gui/data/table/CategoryPlotTableDataContentPane.java  | 2 +-
 .../chart/gui/data/table/SeriesNameUseFieldNamePane.java  | 6 +-----
 .../chart/gui/style/ChartDataPointLabel4MapPane.java      | 6 +-----
 .../design/mainframe/chart/gui/type/GisMapPlotPane.java   | 5 +++--
 .../com/fr/van/chart/gauge/VanChartGaugePlotPane.java     | 6 +++++-
 .../java/com/fr/van/chart/line/VanChartLinePlotPane.java  | 6 +++++-
 15 files changed, 31 insertions(+), 48 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java b/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java
index 42bcfae0a..72a199a5b 100644
--- a/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java
+++ b/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java
@@ -9,6 +9,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.form.ui.NumberEditor;
+import com.fr.stable.AssistUtils;
 import com.fr.stable.StringUtils;
 
 import javax.swing.BorderFactory;
@@ -226,7 +227,7 @@ public class NumberEditorValidatePane extends JPanel {
         }
 
         allowNegativeCheckBox.setSelected(e.isAllowNegative());
-        if (e.getMaxValue() == Double.MAX_VALUE) {
+        if (AssistUtils.equals(e.getMaxValue(),Double.MAX_VALUE)) {
             setMaxValueCheckBox.setSelected(false);
             maxValueSpinner.setValue(Double.MAX_VALUE);
             maxValueSpinner.setEnabled(false);
@@ -236,7 +237,7 @@ public class NumberEditorValidatePane extends JPanel {
             maxValueSpinner.setValue(e.getMaxValue());
         }
 
-        if (e.getMinValue() == -Double.MAX_VALUE) {
+        if (AssistUtils.equals(e.getMinValue(),-Double.MAX_VALUE)) {
             setMinValueCheckBox.setSelected(false);
             minValueSpinner.setValue(-Double.MAX_VALUE);
             minValueSpinner.setEnabled(false);
diff --git a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
index 6692155dc..c28f70e5f 100644
--- a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
+++ b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
@@ -633,9 +633,6 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 		for (int i = 0; i < len; i++) {
 			currentColumnNames[i] = new ColumnName(colNames[i]);
 		}
-		if (currentColumnNames == null) {
-			currentColumnNames = new ColumnName[0];
-		}
 		return currentColumnNames;
 	}
 
@@ -701,7 +698,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 			} else {
 				dmlConfigComboBox.setSelectedIndex(0);
 			}
-			jobs = new NameSubmitJob[dmlConfig == null ? 0 : dmlConfig.getSubmitJobCount()];
+			jobs = new NameSubmitJob[dmlConfig.getSubmitJobCount()];
 			for (int i = 0; i < jobs.length; i++) {
 				jobs[i] = dmlConfig.getSubmitJob(i);
 			}
diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java
index b35f40c55..6b646ce83 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java
@@ -182,11 +182,7 @@ public class GisMapReportDataContentPane extends FurtherBasicBeanPane<GisMapRepo
 
         String addressName = addressNamePane.updateBean();
         if (addressName != null && !StringUtils.isBlank(addressName)) {
-            if (StableUtils.canBeFormula(addressName)) {
-                reportDefinition.setAddressName(addressName);
-            } else {
-                reportDefinition.setAddressName(addressName);
-            }
+            reportDefinition.setAddressName(addressName);
         }
         List values = seriesPane.updateBean();
         if (values != null && !values.isEmpty()) {
diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/GisMapTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/GisMapTableDataContentPane.java
index b8a56c129..723a91f88 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/report/GisMapTableDataContentPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/report/GisMapTableDataContentPane.java
@@ -341,12 +341,8 @@ public class GisMapTableDataContentPane extends FurtherBasicBeanPane<GisMapTable
 						titleValuePane.stopCellEditing();
 					}
 				});
-				
-				if (value != null && StringUtils.isNotEmpty(value.toString())) {
-					box.setSelectedItem(value);
-				} else {
-					box.setSelectedItem(value);
-				}
+
+				box.setSelectedItem(value);
 				
 				this.editorComponent = box;
 			}
diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreTableIndexPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreTableIndexPane.java
index 0189f863c..349081f31 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreTableIndexPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreTableIndexPane.java
@@ -179,12 +179,8 @@ public class MapMoreTableIndexPane extends BasicBeanPane<MapSingleLayerTableDefi
 						tabPane.stopCellEditing();
 					}
 				});
-				
-				if (value != null && StringUtils.isNotEmpty(value.toString())) {
-					box.setSelectedItem(value);
-				} else {
-					box.setSelectedItem(value);
-				}
+
+				box.setSelectedItem(value);
 				
 				editorComponent = box;
 			}
diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java
index 2be0679df..6c55878b8 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java
@@ -254,12 +254,8 @@ public class MapTableDataSinglePane extends FurtherBasicBeanPane<MapSingleLayerT
 						titleValuePane.stopCellEditing();
 					}
 				});
-				
-				if (value != null && StringUtils.isNotEmpty(value.toString())) {
-					box.setSelectedItem(value);
-				} else {
-					box.setSelectedItem(value);
-				}
+
+				box.setSelectedItem(value);
 				
 				this.editorComponent = box;
 			}
diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/UIGroupExtensionPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/UIGroupExtensionPane.java
index f693a45f6..056be9945 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/UIGroupExtensionPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/UIGroupExtensionPane.java
@@ -348,9 +348,6 @@ public class UIGroupExtensionPane extends BasicPane {
 				boolean isSelected,
 				boolean cellHasFocus) {
 			JComponent c = (JComponent) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-			if (!hasEditOperation(list)) {
-				return c;
-			}
 			Border border = null;
 			c.setBorder(border);
 			UILabel editLabel = new UILabel(UIConstants.EDIT_ICON);
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPaneWithUISpinner.java b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPaneWithUISpinner.java
index b24743c76..5f0e6500b 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPaneWithUISpinner.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPaneWithUISpinner.java
@@ -7,6 +7,7 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
+import com.fr.stable.AssistUtils;
 
 import javax.swing.JComponent;
 import javax.swing.JPanel;
@@ -59,7 +60,7 @@ public abstract class AbstractMultiComponentPaneWithUISpinner<T extends JCompone
             @Override
             public void setTextFieldValue(double value) {
                 //如果为0，则没有改变值
-                if (value == 0) {
+                if (AssistUtils.equals(value,0)) {
                     return;
                 }
                 super.setTextFieldValue(value);
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java
index 8ac031f75..38db3e5b4 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java
@@ -309,6 +309,8 @@ public class ChartTypePane extends AbstractChartAttrPane{
 		boolean isUseDefault = ChartTypeInterfaceManager.getInstance().isUseDefaultPane(plotID);
 		if (editPane != null && editPane.isDefaultPane() != isUseDefault || (!isUseDefault && !ComparatorUtils.equals(lastPlotID, plotID))){
 			editPane.reLayout(chart);
+		}else {
+			throw new IllegalArgumentException("editPane can not be null.");
 		}
 	}
 
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java
index 6ba03732e..8c988ce29 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java
@@ -140,7 +140,7 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa
         } else if(data!= null && !this.boxItemsContainsObject(categoryCombox,data.getCategoryName())){
 		     categoryCombox.setSelectedItem(null);
         }else {
-			combineCustomEditValue(categoryCombox, data == null ? null : data.getCategoryName());
+			combineCustomEditValue(categoryCombox, data.getCategoryName());
 		}
 
 		seriesTypeComboxPane.populateBean(collection,this.isNeedSummaryCaculateMethod());
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java
index 73c800f9e..0c643cf8c 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java
@@ -310,11 +310,7 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollec
             });
             editorComponent = uiComboBox;
 
-            if (value != null && StringUtils.isNotEmpty(value.toString())) {
-                uiComboBox.getModel().setSelectedItem(value);
-            } else {
-                uiComboBox.getModel().setSelectedItem(value);
-            }
+            uiComboBox.getModel().setSelectedItem(value);
 
             return uiComboBox;
         }
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4MapPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4MapPane.java
index 129ed176a..7726ad9cf 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4MapPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4MapPane.java
@@ -121,11 +121,7 @@ public class ChartDataPointLabel4MapPane extends ChartDatapointLabelPane {
 		percentFormat = attrContents.getPercentFormat();
 
         if(textFontPane != null) {
-            if (attrContents != null) {
-                textFontPane.populate(attrContents.getTextAttr());
-            } else {
-                textFontPane.populate(FRFont.getInstance());
-            }
+			textFontPane.populate(attrContents.getTextAttr());
         }
 	}
 	
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java
index e62f2e5c5..e15b0c4b1 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java
@@ -13,6 +13,7 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.locale.InterProviderFactory;
 import com.fr.log.FineLoggerFactory;
+import com.fr.stable.AssistUtils;
 
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
@@ -139,9 +140,9 @@ public class GisMapPlotPane extends AbstractDeprecatedChartTypePane {
 			}
 		}else{
 			String key = this.keyInput.getText().trim();
-			if(plot.isGisType() && key != plot.getBaiduKey()){
+			if(plot.isGisType() && !AssistUtils.equals(key,plot.getBaiduKey())){
 				plot.setBaiduKey(key);
-			}else if(!plot.isGisType() && key != plot.getGoogleKey()){
+			}else if(!plot.isGisType() && !AssistUtils.equals(key,plot.getGoogleKey())){
 				plot.setGoogleKey(key);
 			}
 		}
diff --git a/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugePlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugePlotPane.java
index f49752b1c..b05be5469 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugePlotPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugePlotPane.java
@@ -55,7 +55,11 @@ public class VanChartGaugePlotPane extends AbstractVanChartTypePane {
 
         Plot cloned = null;
         try {
-            cloned = (Plot)newPlot.clone();
+            if (newPlot == null) {
+                throw new IllegalArgumentException("newPlot con not be null");
+            }else {
+                cloned = (Plot)newPlot.clone();
+            }
         } catch (CloneNotSupportedException e) {
             FineLoggerFactory.getLogger().error("Error In GaugeChart");
         }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLinePlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLinePlotPane.java
index 9dac6fbe3..a44230a6e 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLinePlotPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLinePlotPane.java
@@ -60,7 +60,11 @@ public class VanChartLinePlotPane extends AbstractVanChartTypePane {
         }
         Plot cloned = null;
         try {
-            cloned = (Plot)newPlot.clone();
+            if (newPlot == null) {
+                throw new IllegalArgumentException("newPlot con not be null");
+            }else {
+                cloned = (Plot)newPlot.clone();
+            }
         } catch (CloneNotSupportedException e) {
             FineLoggerFactory.getLogger().error("Error In LineChart");
         }