Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0

designer-chart/src/main/java/com/fr/van/chart/bar/VanChartBarPlotPane.java

@@ -65,10 +65,11 @@ public class VanChartBarPlotPane extends AbstractVanChartTypePane {
                 newPlot = (VanChartColumnPlot)barChart[i].getPlot();
             }
         }
-
         Plot cloned = null;
         try {
-            cloned = (Plot)newPlot.clone();
+            if(newPlot != null) {
+                cloned = (Plot) newPlot.clone();
+            }
         } catch (CloneNotSupportedException e) {
             FineLoggerFactory.getLogger().error("Error In ColumnChart");
         }

designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubblePlotPane.java

@@ -77,10 +77,11 @@ public class VanChartBubblePlotPane extends AbstractVanChartTypePane {
                 newPlot = (VanChartBubblePlot)bubbleChart[i].getPlot();
             }
         }
-
         Plot cloned = null;
         try {
-            cloned = (Plot)newPlot.clone();
+             if(newPlot != null) {
+                 cloned = (Plot) newPlot.clone();
+             }
         } catch (CloneNotSupportedException e) {
             FineLoggerFactory.getLogger().error("Error In BubbleChart");
         }

designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotPane.java

@@ -66,10 +66,11 @@ public class VanChartColumnPlotPane extends AbstractVanChartTypePane {
                 newPlot = (VanChartColumnPlot)columnChart[i].getPlot();
             }
         }
-
         Plot cloned = null;
         try {
-            cloned = (Plot)newPlot.clone();
+             if(newPlot != null) {
+                 cloned = (Plot) newPlot.clone();
+             }
         } catch (CloneNotSupportedException e) {
             FineLoggerFactory.getLogger().error("Error In ColumnChart");
         }

designer-chart/src/main/java/com/fr/van/chart/custom/VanChartCustomPlotPane.java

@@ -261,7 +261,9 @@ public class VanChartCustomPlotPane extends AbstractVanChartTypePane {
         }
         Plot cloned = null;
         try {
-            cloned = (Plot) newPlot.clone();
+              if(newPlot != null) {
+                 cloned = (Plot) newPlot.clone();
+              }
         } catch (CloneNotSupportedException e) {
             FineLoggerFactory.getLogger().error("Error In ScatterChart");
         }

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartAxisButtonPane.java

@@ -92,8 +92,9 @@ public class VanChartAxisButtonPane extends BasicBeanPane<VanChartAxisPlot> {
                 pane = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
                 buttonPane.add(pane);
             }
-
+            if(pane != null) {
-            pane.add(indexList_Y.get(i));
+                pane.add(indexList_Y.get(i));
+            }
         }
 
         if(popupMenu != null){