Merge pull request #1049 in DESIGN/design from ~MAKSIM/design:feature/10.0 to feature/10.0

* commit '61ab68fc4d316ab17bf9fa013e0602c43a3b4e6a':
  REPORT-20323 sonar问题修复

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java

@@ -114,7 +114,9 @@ public class AreaPlotPane extends AbstractDeprecatedChartTypePane {
             ((Area3DPlot)plot).setStacked(true);
             ((Area3DPlot)plot).getyAxis().setPercentage(true);
         }
+        if(plot != null) {
 			createAreaCondition(plot);
+		}
         return plot;
     }
 

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java

@@ -97,11 +97,13 @@ public class BarPlotPane extends AbstractBarPane{
         }
 
         Plot cloned = null;
+        if(newPlot != null) {
             try {
                 cloned = (Plot) newPlot.clone();
             } catch (CloneNotSupportedException e) {
                 FineLoggerFactory.getLogger().error("Error In ColumnChart");
             }
+        }
         return cloned;
     }
 

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java

@@ -94,11 +94,13 @@ public class ColumnPlotPane extends AbstractBarPane{
         }
 
         Plot cloned = null;
+        if(newPlot != null) {
             try {
                 cloned = (Plot) newPlot.clone();
             } catch (CloneNotSupportedException e) {
                 FineLoggerFactory.getLogger().error("Error In ColumnChart");
             }
+        }
         return cloned;
     }
 

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java

@@ -66,11 +66,13 @@ public class MeterPlotPane extends AbstractDeprecatedChartTypePane {
         }
 
         Plot cloned = null;
+        if(newPlot != null) {
             try {
                 cloned = (Plot) newPlot.clone();
             } catch (CloneNotSupportedException e) {
                 FineLoggerFactory.getLogger().error("Error In ColumnChart");
             }
+        }
         return cloned;
     }
 

designer-chart/src/main/java/com/fr/van/chart/area/VanChartAreaPlotPane.java

@@ -68,11 +68,13 @@ public class VanChartAreaPlotPane extends AbstractVanChartTypePane {
             }
         }
         Plot cloned = null;
+        if(newPlot != null) {
             try {
                 cloned = (Plot) newPlot.clone();
             } catch (CloneNotSupportedException e) {
                 FineLoggerFactory.getLogger().error("Error In AreaChart");
             }
+        }
         return cloned;
     }