Attachment 636 Details for Bug 1615 – diff-based patch

Steema Issues Database

Note: This database is for bugs and wishes only. For technical support help, if you are a customer please visit our online forums;
otherwise you can use StackOverflow.
Before using this bug-tracker we recommend a look at this document, Steema Bug Fixing Policy.

[patch] diff-based patch

fixed_assign.diff (text/plain), 55.06 KB, created by alex on 2016-08-31 09:03:46 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: alex

Created: 2016-08-31 09:03:46 EDT

Size: 55.06 KB

patch

obsolete

>diff --git a/src/com/steema/teechart/ImageBevel.java b/src/com/steema/teechart/ImageBevel.java
>index 2a302d5..733199f 100644
>--- a/src/com/steema/teechart/ImageBevel.java
>+++ b/src/com/steema/teechart/ImageBevel.java
>@@ -97,10 +97,18 @@ public class ImageBevel extends TeeBase {
>      * @param b ImageBevel
>      */
>     public void assign(ImageBevel b) {
>-        if (b!=null) {
>-            this.getPen().assign(b.getPen());
>-            this.getBrush().assign(b.getBrush());
>-            this.setVisible(b.getVisible());
>+        if (b != null) {
>+            if (b.pen == null) {
>+                pen = null;
>+            } else {
>+                getPen().assign(b.pen);
>+            }
>+            if (b.brush == null) {
>+                brush = null;
>+            } else {
>+                getBrush().assign(b.getBrush());
>+            }
>+            setVisible(b.getVisible());
>         }
>     }
> 
>diff --git a/src/com/steema/teechart/Shape.java b/src/com/steema/teechart/Shape.java
>index 95c7fab..802f183 100644
>--- a/src/com/steema/teechart/Shape.java
>+++ b/src/com/steema/teechart/Shape.java
>@@ -565,22 +565,27 @@ public class Shape extends TeeBase {
> 	 */
> 	public void assign(final Shape s) {
> 		if (s != null) {
>-			if (s.bBevel != null) {
>-				bBevel.assign(s.bBevel);
>-			}
>-			if (s.bBrush != null) {
>-				bBrush.assign(s.bBrush);
>-			}
>-
>+			if (s.bBevel == null) {
>+			    bBevel = null;
>+			} else {
>+                getBevel().assign(s.bBevel);
>+            }
>+			if (s.bBrush == null) {
>+				bBrush = null;
>+			} else {
>+                getBrush().assign(s.bBrush);
>+            }
> 			setShapeBounds(s.shapeBounds);
>-
>-			if (s.pPen != null) {
>-				pPen.assign(s.pPen, s.pPen.getColor());
>-			}
>-			if (s.shadow != null) {
>-				shadow.assign(s.shadow);
>-			}
>-
>+			if (s.pPen == null) {
>+				pPen = null;
>+			} else {
>+                getPen().assign(s.pPen, s.pPen.getColor());
>+            }
>+			if (s.shadow == null) {
>+				shadow = null;
>+			} else {
>+                getShadow().assign(s.shadow);
>+            }
> 			setVisible(s.getVisible());
> 			setTransparent(s.getTransparent());
> 		}
>diff --git a/src/com/steema/teechart/TextShape.java b/src/com/steema/teechart/TextShape.java
>index 8262a32..d6d57ad 100644
>--- a/src/com/steema/teechart/TextShape.java
>+++ b/src/com/steema/teechart/TextShape.java
>@@ -199,21 +199,19 @@ public class TextShape extends Shape {
>         return font;
>     }
> 
>-    /**
>-     * Assign all properties from a TextShape to another.
>-     *
>-     * @param s TextShape
>-     */
>-    public void assign(TextShape s) {
>-        if (s != null) {
>-            super.assign(s);
>-
>-            if (s.font != null) {
>-                getFont().assign(s.font);
>+    @Override
>+    public void assign(Shape s) {
>+        super.assign(s);
>+        if (s instanceof TextShape) {
>+            TextShape tmp = (TextShape)s;
>+            if (tmp.font == null) {
>+                font = null;
>+            } else {
>+                getFont().assign(tmp.font);
>             }
>-            lines = s.lines;
>-            shapeStyle = s.shapeStyle;
>-             textAlign = s.textAlign;
>+            lines = tmp.lines;
>+            shapeStyle = tmp.shapeStyle;
>+            textAlign = tmp.textAlign;
>         }
>     }
> 
>diff --git a/src/com/steema/teechart/drawing/ChartBrush.java b/src/com/steema/teechart/drawing/ChartBrush.java
>index eaa1a7f..1c14863 100644
>--- a/src/com/steema/teechart/drawing/ChartBrush.java
>+++ b/src/com/steema/teechart/drawing/ChartBrush.java
>@@ -106,7 +106,7 @@ public class ChartBrush extends TeeBase {
>         imageMode = b.imageMode;
> 
>         //CDI chart cannot be null
>-        if(chart == null) {
>+        if (chart == null) {
>             chart = b.chart;
>         }
> 
>diff --git a/src/com/steema/teechart/styles/BarJoin.java b/src/com/steema/teechart/styles/BarJoin.java
>index d8d1a7e..a2dbb9b 100644
>--- a/src/com/steema/teechart/styles/BarJoin.java
>+++ b/src/com/steema/teechart/styles/BarJoin.java
>@@ -51,11 +51,15 @@ public class BarJoin extends Bar {
>     
>     @Override
>     public void assign(Series source) {
>-            super.assign(source);
>-            if(source instanceof BarJoin)
>-            {
>-                this.joinPen.assign(((BarJoin)source).joinPen);
>+        super.assign(source);
>+        if (source instanceof BarJoin) {
>+            BarJoin tmp = (BarJoin)source;
>+            if (tmp.joinPen == null) {
>+                joinPen = null;
>+            } else {
>+                getJoinPen().assign(tmp.joinPen);
>             }
>+        }
>     }
> 
>     /**
>diff --git a/src/com/steema/teechart/styles/BubbleCloud.java b/src/com/steema/teechart/styles/BubbleCloud.java
>index 1fc045c..0990f50 100644
>--- a/src/com/steema/teechart/styles/BubbleCloud.java
>+++ b/src/com/steema/teechart/styles/BubbleCloud.java
>@@ -79,11 +79,10 @@ public class BubbleCloud extends Custom3DPalette {
>     
>     @Override
>     public void assign(Series source) {
>-            super.assign(source);
>-            if(source instanceof BubbleCloud)
>-            {
>-                this.separationUnits=((BubbleCloud)source).separationUnits;
>-            }
>+        super.assign(source);
>+        if (source instanceof BubbleCloud) {
>+            separationUnits = ((BubbleCloud)source).separationUnits;
>+        }
>     }    
> 
>     /**
>diff --git a/src/com/steema/teechart/styles/Candle.java b/src/com/steema/teechart/styles/Candle.java
>index 27ff7f7..002c832 100644
>--- a/src/com/steema/teechart/styles/Candle.java
>+++ b/src/com/steema/teechart/styles/Candle.java
>@@ -62,16 +62,16 @@ public class Candle extends OHLC {
>     
>     @Override
>     public void assign(Series source) {
>-            super.assign(source);
>-            if(source instanceof Candle)
>-            {
>-                this.upCloseColor=((Candle)source).upCloseColor;
>-                this.downCloseColor=((Candle)source).downCloseColor;
>-                this.candleWidth=((Candle)source).candleWidth;
>-                this.style=((Candle)source).style;
>-                this.showOpenTick=((Candle)source).showOpenTick;
>-                this.showCloseTick=((Candle)source).showCloseTick;
>-            }
>+        super.assign(source);
>+        if (source instanceof Candle) {
>+            Candle tmp = (Candle)source;
>+            upCloseColor = tmp.upCloseColor;
>+            downCloseColor = tmp.downCloseColor;
>+            candleWidth = tmp.candleWidth;
>+            style = tmp.style;
>+            showOpenTick = tmp.showOpenTick;
>+            showCloseTick = tmp.showCloseTick;
>+        }
>     }    
> 
>     /**
>diff --git a/src/com/steema/teechart/styles/Circular.java b/src/com/steema/teechart/styles/Circular.java
>index c50aeac..7ca0777 100644
>--- a/src/com/steema/teechart/styles/Circular.java
>+++ b/src/com/steema/teechart/styles/Circular.java
>@@ -69,19 +69,22 @@ public class Circular extends Series {
> 
>     public void assign(final Series source) {
>         if (source instanceof Circular) {
>-            Circular sourceCircular = (Circular)source;
>-            this.circled = sourceCircular.circled;
>-            this.rotationAngle = sourceCircular.rotationAngle;
>-            this.rotDegree = sourceCircular.rotDegree;
>-            this.customXRadius = sourceCircular.customXRadius;
>-            this.customYRadius = sourceCircular.customYRadius;
>-            this.uniqueCustomRadius = sourceCircular.uniqueCustomRadius;
>-            this.autoPenColor = sourceCircular.autoPenColor;
>-            this.circleBackColor = sourceCircular.circleBackColor;
>-            this.circleGradient.assign(sourceCircular.circleGradient);
>-            this.iAdjustCircleForMarks = sourceCircular.iAdjustCircleForMarks;
>+            Circular tmp = (Circular)source;
>+            circled = tmp.circled;
>+            rotationAngle = tmp.rotationAngle;
>+            rotDegree = tmp.rotDegree;
>+            customXRadius = tmp.customXRadius;
>+            customYRadius = tmp.customYRadius;
>+            uniqueCustomRadius = tmp.uniqueCustomRadius;
>+            autoPenColor = tmp.autoPenColor;
>+            circleBackColor = tmp.circleBackColor;
>+            if (tmp.circleGradient == null) {
>+                circleGradient = null;
>+            } else {
>+                getCircleGradient().assign(tmp.circleGradient);
>+            }
>+            iAdjustCircleForMarks = tmp.iAdjustCircleForMarks;
>         }
>-        
>         super.assign(source);
>     }
>     
>diff --git a/src/com/steema/teechart/styles/CircularGauge.java b/src/com/steema/teechart/styles/CircularGauge.java
>index cf96eb3..c6324d4 100644
>--- a/src/com/steema/teechart/styles/CircularGauge.java
>+++ b/src/com/steema/teechart/styles/CircularGauge.java
>@@ -54,23 +54,22 @@ public class CircularGauge extends Circular {
> 		super.dispose();
> 	}
>         
>-        public void assign(final Series source) {
>+    public void assign(final Series source) {
>         if (source instanceof CircularGauge) {
>-            CircularGauge sourceCircularGauge = (CircularGauge)source;
>-            this.handDistance = sourceCircularGauge.handDistance;
>-            this.totalAngle = sourceCircularGauge.totalAngle;
>-            this.maximum = sourceCircularGauge.maximum;
>-            this.redLineStartValue = sourceCircularGauge.redLineStartValue;
>-            this.redLineEndValue = sourceCircularGauge.redLineEndValue;
>-            this.greenLineStartValue = sourceCircularGauge.greenLineStartValue;
>-            this.greenLineEndValue = sourceCircularGauge.greenLineEndValue;
>-            this.labelsInside = sourceCircularGauge.labelsInside;
>-            this.rotateLabels = sourceCircularGauge.rotateLabels;
>-            this.labelsVisible = sourceCircularGauge.labelsVisible;
>-            this.handOffset = sourceCircularGauge.handOffset;
>-            this.fillToSemiCircle = sourceCircularGauge.fillToSemiCircle;
>+            CircularGauge tmp = (CircularGauge)source;
>+            handDistance = tmp.handDistance;
>+            totalAngle = tmp.totalAngle;
>+            maximum = tmp.maximum;
>+            redLineStartValue = tmp.redLineStartValue;
>+            redLineEndValue = tmp.redLineEndValue;
>+            greenLineStartValue = tmp.greenLineStartValue;
>+            greenLineEndValue = tmp.greenLineEndValue;
>+            labelsInside = tmp.labelsInside;
>+            rotateLabels = tmp.rotateLabels;
>+            labelsVisible = tmp.labelsVisible;
>+            handOffset = tmp.handOffset;
>+            fillToSemiCircle = tmp.fillToSemiCircle;
>         }
>-        
>         super.assign(source);
>     }
> 
>diff --git a/src/com/steema/teechart/styles/Clock.java b/src/com/steema/teechart/styles/Clock.java
>index bf8ec59..d0b12f8 100644
>--- a/src/com/steema/teechart/styles/Clock.java
>+++ b/src/com/steema/teechart/styles/Clock.java
>@@ -96,13 +96,25 @@ public class Clock extends Custom2DPolar {
>     
>     @Override
>     public void assign(Series source) {
>-            super.assign(source);
>-            if(source instanceof Clock)
>-            {
>-                this.penHours.assign(((Clock)source).penHours);
>-                this.penMinutes.assign(((Clock)source).penMinutes);
>-                this.penSeconds.assign(((Clock)source).penSeconds);
>+        super.assign(source);
>+        if (source instanceof Clock) {
>+            Clock tmp = (Clock)source;
>+            if (tmp.penHours == null) {
>+                penHours = null;
>+            } else {
>+                getPenHours().assign(tmp.penHours);
>             }
>+            if (tmp.penMinutes == null) {
>+                penMinutes = null;
>+            } else {
>+                getPenMinutes().assign(tmp.penMinutes);
>+            }
>+            if (tmp.penSeconds == null) {
>+                penSeconds = null;
>+            } else {
>+                getPenSeconds().assign(tmp.penSeconds);
>+            }
>+        }
>     } 
> 
>     private void startTimer() {
>diff --git a/src/com/steema/teechart/styles/ColorGrid.java b/src/com/steema/teechart/styles/ColorGrid.java
>index b1ec6ce..56eaba0 100644
>--- a/src/com/steema/teechart/styles/ColorGrid.java
>+++ b/src/com/steema/teechart/styles/ColorGrid.java
>@@ -66,11 +66,10 @@ public class ColorGrid extends Custom3DGrid {
>     
>     @Override
>     public void assign(Series source) {
>-            super.assign(source);
>-            if(source instanceof ColorGrid)
>-            {
>-                this.centered=((ColorGrid)source).centered;
>-            }
>+        super.assign(source);
>+        if (source instanceof ColorGrid) {
>+            centered = ((ColorGrid)source).centered;
>+        }
>     } 
> 
>     /**
>diff --git a/src/com/steema/teechart/styles/Contour.java b/src/com/steema/teechart/styles/Contour.java
>index 3c4008f..7fa1ce7 100644
>--- a/src/com/steema/teechart/styles/Contour.java
>+++ b/src/com/steema/teechart/styles/Contour.java
>@@ -125,18 +125,18 @@ public class Contour extends Custom3DGrid {
>     
>     @Override
>     public void assign(Series source) {
>-            super.assign(source);
>-            if(source instanceof Contour)
>-            {
>-                this.automaticLevels=((Contour)source).automaticLevels;
>-                this.levels=((Contour)source).levels;
>-                this.numLevels=((Contour)source).numLevels;
>-                this.yPosition=((Contour)source).yPosition;
>-                this.yPositionLevel=((Contour)source).yPositionLevel;
>-                this.drawingalgorithm=((Contour)source).drawingalgorithm;
>-                this.fillLevels=((Contour)source).fillLevels;
>-                this.contourmarks=((Contour)source).contourmarks;
>-            }
>+        super.assign(source);
>+        if (source instanceof Contour) {
>+            Contour tmp = (Contour)source;
>+            automaticLevels = tmp.automaticLevels;
>+            levels = tmp.levels;
>+            numLevels = tmp.numLevels;
>+            yPosition = tmp.yPosition;
>+            yPositionLevel = tmp.yPositionLevel;
>+            drawingalgorithm = tmp.drawingalgorithm;
>+            fillLevels = tmp.fillLevels;
>+            contourmarks = tmp.contourmarks;
>+        }
>     }     
>     
>     /// <summary>
>diff --git a/src/com/steema/teechart/styles/Custom.java b/src/com/steema/teechart/styles/Custom.java
>index 16a7960..23a1d6f 100644
>--- a/src/com/steema/teechart/styles/Custom.java
>+++ b/src/com/steema/teechart/styles/Custom.java
>@@ -324,31 +324,40 @@ public class Custom extends CustomPoint
>     
>     public void assign(Series source) {
>         super.assign(source);
>-        if(source instanceof Custom) {
>-            Custom series = (Custom)source;
>-            this.setStairs(series.getStairs());
>-            this.setClickableLine(series.getClickableLine());
>-            this.setLineHeight(series.getLineHeight());
>-            if(series.bAreaBrush != null) {
>-              if(this.bAreaBrush == null)
>-                this.bAreaBrush =  new ChartBrush(this.getChart());
>-                this.bAreaBrush.assign(series.bAreaBrush);
>+        if (source instanceof Custom) {
>+            Custom tmp = (Custom)source;
>+            setStairs(tmp.getStairs());
>+            setClickableLine(tmp.getClickableLine());
>+            setLineHeight(tmp.getLineHeight());
>+            if (tmp.bAreaBrush == null) {
>+                bAreaBrush = null;
>+            } else {
>+                if (bAreaBrush == null) {
>+                    bAreaBrush = new ChartBrush(getChart());
>+                }
>+                bAreaBrush.assign(tmp.bAreaBrush);
>+            }
>+            if (tmp.pAreaLines == null) {
>+                pAreaLines = null;
>+            } else {
>+                if (pAreaLines == null) {
>+                    pAreaLines = new ChartPen(getChart());
>+                }
>+                pAreaLines.assign(tmp.pAreaLines);
>             }
>-            if(series.pAreaLines != null) {
>-                if(this.pAreaLines == null)
>-                  this.pAreaLines =  new ChartPen(this.getChart());
>-                this.pAreaLines.assign(series.pAreaLines);
>+            if (tmp.linePen == null) {
>+                linePen = null;
>+            } else {
>+                getLinePen().assign(tmp.linePen);
>             }
>-            this.getLinePen().assign(series.getLinePen());
>-            
>-            this.bDark3D=((Custom)source).bDark3D;
>-            this.drawArea=((Custom)source).drawArea;
>-            this.invertedStairs=((Custom)source).invertedStairs;
>-            this.colorEachLine=((Custom)source).colorEachLine;
>-            this.lineHeight=((Custom)source).lineHeight;
>-            this.outLine=((Custom)source).outLine;
>-            this.stairs=((Custom)source).stairs;
>-            this.smoothed=((Custom)source).smoothed;
>+            bDark3D = tmp.bDark3D;
>+            drawArea = tmp.drawArea;
>+            invertedStairs = tmp.invertedStairs;
>+            colorEachLine = tmp.colorEachLine;
>+            lineHeight = tmp.lineHeight;
>+            outLine = tmp.outLine;
>+            stairs = tmp.stairs;
>+            smoothed = tmp.smoothed;
>         }
>     }
>     
>diff --git a/src/com/steema/teechart/styles/CustomBar.java b/src/com/steema/teechart/styles/CustomBar.java
>index a705157..1393698 100644
>--- a/src/com/steema/teechart/styles/CustomBar.java
>+++ b/src/com/steema/teechart/styles/CustomBar.java
>@@ -164,38 +164,41 @@ public class CustomBar extends Series {
> 	@Override
> 	public void assign(Series source) {
> 		super.assign(source);
>-		if(source instanceof CustomBar)
>-		{
>-			this.setBarSizePercent(((CustomBar) source).getBarSizePercent());
>-			this.setDepthPercent(((CustomBar) source).getDepthPercent());
>-			this.setOffsetPercent(((CustomBar) source).getOffsetPercent());
>-			this.setConePercent(((CustomBar) source).getConePercent());
>-			this.setDark3D(((CustomBar) source).getDark3D());
>-			this.setMultiBar(((CustomBar) source).getMultiBar());
>-			this.setUseOrigin(((CustomBar) source).getUseOrigin());
>-			this.setMarksOnBar(((CustomBar) source).getMarksOnBar());
>-			this.setOrigin(((CustomBar) source).getOrigin());
>-			this.setMarksLocation(((CustomBar) source).getMarksLocation());
>-			this.setAutoMarkPosition(((CustomBar) source).getAutoMarkPosition());
>-			this.setBarStyle(((CustomBar) source).getBarStyle());
>-			this.setGradientRelative(((CustomBar) source).getGradientRelative());
>-			this.setRoundSize(((CustomBar) source).getRoundSize());
>-			this.setBarRound(((CustomBar) source).getBarRound());
>-			this.setSideMargins(((CustomBar) source).getSideMargins());
>-			this.setStackGroup(((CustomBar) source).getStackGroup());
>-			this.iBarBounds=((CustomBar) source).iBarBounds;
>-			this.iMaxBarPoints=((CustomBar) source).iMaxBarPoints;
>-			this.iOrderPos=((CustomBar) source).iOrderPos;
>-			this.iPreviousCount=((CustomBar) source).iPreviousCount;
>-			this.iBarSize=((CustomBar) source).iBarSize;
>-			this.customBarSize=((CustomBar) source).customBarSize;
>-                        this.allowSinglePoint = ((CustomBar) source).allowSinglePoint;
>-                        this.groups = ((CustomBar) source).groups;
>-                        this.normalBarColor = ((CustomBar) source).normalBarColor;
>-                        this.roundSize = ((CustomBar) source).roundSize;
>-                        this.styleResolver = ((CustomBar) source).styleResolver;
>-                        this.tickLines.assign(((CustomBar) source).tickLines);
>-
>+        if (source instanceof CustomBar) {
>+            CustomBar tmp = (CustomBar)source;
>+            setBarSizePercent(tmp.getBarSizePercent());
>+            setDepthPercent(tmp.getDepthPercent());
>+            setOffsetPercent(tmp.getOffsetPercent());
>+            setConePercent(tmp.getConePercent());
>+            setDark3D(tmp.getDark3D());
>+            setMultiBar(tmp.getMultiBar());
>+            setUseOrigin(tmp.getUseOrigin());
>+            setMarksOnBar(tmp.getMarksOnBar());
>+            setOrigin(tmp.getOrigin());
>+            setMarksLocation(tmp.getMarksLocation());
>+            setAutoMarkPosition(tmp.getAutoMarkPosition());
>+            setBarStyle(tmp.getBarStyle());
>+            setGradientRelative(tmp.getGradientRelative());
>+            setRoundSize(tmp.getRoundSize());
>+            setBarRound(tmp.getBarRound());
>+            setSideMargins(tmp.getSideMargins());
>+            setStackGroup(tmp.getStackGroup());
>+            iBarBounds = tmp.iBarBounds;
>+            iMaxBarPoints = tmp.iMaxBarPoints;
>+            iOrderPos = tmp.iOrderPos;
>+            iPreviousCount = tmp.iPreviousCount;
>+            iBarSize = tmp.iBarSize;
>+            customBarSize = tmp.customBarSize;
>+            allowSinglePoint = tmp.allowSinglePoint;
>+            groups = tmp.groups;
>+            normalBarColor = tmp.normalBarColor;
>+            roundSize = tmp.roundSize;
>+            styleResolver = tmp.styleResolver;
>+            if (tmp.tickLines == null) {
>+                tickLines = null;
>+            } else {
>+                getTickLines().assign(tmp.tickLines);
>+            }
> 		}
> 	}
> 
>diff --git a/src/com/steema/teechart/styles/CustomBox.java b/src/com/steema/teechart/styles/CustomBox.java
>index 88f5dd9..9f05b60 100644
>--- a/src/com/steema/teechart/styles/CustomBox.java
>+++ b/src/com/steema/teechart/styles/CustomBox.java
>@@ -73,13 +73,29 @@ public class CustomBox extends Points {
>     public void assign(Series source) {
>         if (source instanceof CustomBox) {
>             CustomBox tmp = (CustomBox)source;
>-            this.extrOut.assign(tmp.extrOut);
>-            this.mildOut.assign(tmp.mildOut);
>-            this.medianPen.assign(tmp.medianPen);
>-            this.whiskerPen.assign(tmp.whiskerPen);
>-            this.dPosition = tmp.dPosition;
>-            this.whiskerLength = tmp.whiskerLength;
>-            this.useCustomValues = tmp.useCustomValues;
>+            if (tmp.extrOut == null) {
>+                extrOut = null;
>+            } else {
>+                getExtrOut().assign(tmp.extrOut);
>+            }
>+            if (tmp.mildOut == null) {
>+                mildOut = null;
>+            } else {
>+                getMildOut().assign(tmp.mildOut);
>+            }
>+            if (tmp.medianPen == null) {
>+                medianPen = null;
>+            } else {
>+                getMedianPen().assign(tmp.medianPen);
>+            }
>+            if (tmp.whiskerPen == null) {
>+                whiskerPen = null;
>+            } else {
>+                getWhiskerPen().assign(tmp.whiskerPen);
>+            }
>+            dPosition = tmp.dPosition;
>+            whiskerLength = tmp.whiskerLength;
>+            useCustomValues = tmp.useCustomValues;
>         }
>         super.assign(source);
>     }
>diff --git a/src/com/steema/teechart/styles/CustomError.java b/src/com/steema/teechart/styles/CustomError.java
>index 136f2f5..8687167 100644
>--- a/src/com/steema/teechart/styles/CustomError.java
>+++ b/src/com/steema/teechart/styles/CustomError.java
>@@ -50,10 +50,14 @@ public class CustomError extends Bar {
>     public void assign(Series source) {
>         if (source instanceof CustomError) {
>             CustomError tmp = (CustomError)source;
>-            this.getErrorPen().assign(tmp.getErrorPen());
>-            this.setErrorWidth(tmp.getErrorWidth());
>-            this.setErrorWidthUnits(tmp.getErrorWidthUnits());
>-            this.setErrorStyle(tmp.getErrorStyle());
>+            if (tmp.errorPen == null) {
>+                errorPen = null;
>+            } else {
>+                getErrorPen().assign(tmp.errorPen);
>+            }
>+            setErrorWidth(tmp.getErrorWidth());
>+            setErrorWidthUnits(tmp.getErrorWidthUnits());
>+            setErrorStyle(tmp.getErrorStyle());
>         }
>         super.assign(source);
>     }
>diff --git a/src/com/steema/teechart/styles/CustomPoint.java b/src/com/steema/teechart/styles/CustomPoint.java
>index 9d39cd0..d6d1066 100644
>--- a/src/com/steema/teechart/styles/CustomPoint.java
>+++ b/src/com/steema/teechart/styles/CustomPoint.java
>@@ -36,10 +36,12 @@ public class CustomPoint extends BaseLine {
>     public void assign(Series source) {
>         if (source instanceof CustomPoint) {
>             CustomPoint tmp = (CustomPoint)source;
>-            if (tmp.point != null) {
>-                this.getPointer().assign(tmp.point);
>+            if (tmp.point == null) {
>+                point = null;
>+            } else {
>+                getPointer().assign(tmp.point);
>             }
>-            this.iStacked = tmp.iStacked;
>+            iStacked = tmp.iStacked;
>         }
>         super.assign(source);
>     }
>diff --git a/src/com/steema/teechart/styles/CustomPolar.java b/src/com/steema/teechart/styles/CustomPolar.java
>index ecfd945..8d54524 100644
>--- a/src/com/steema/teechart/styles/CustomPolar.java
>+++ b/src/com/steema/teechart/styles/CustomPolar.java
>@@ -75,16 +75,19 @@ public class CustomPolar extends Circular {
>     public void assign(Series source) {
>         if (source instanceof CustomPolar) {
>             CustomPolar tmp = (CustomPolar)source;
>-            
>-            this.getPen().assign(tmp.getPen());
>-            this.getCirclePen().assign(tmp.getCirclePen());
>-            this.getCircleLabelsFont().assign(tmp.getCircleLabelsFont());
>-            this.circleLabels = tmp.circleLabels;
>-            this.circleLabelsInside = tmp.circleLabelsInside;
>-            this.circleLabelsRot = tmp.circleLabelsRot;
>-            this.clockWiseLabels = tmp.clockWiseLabels;
>-            this.closeCircle = tmp.closeCircle;
>-            this.treatnulls = tmp.treatnulls;
>+            if (tmp.pen == null) {
>+                pen = null;
>+            } else {
>+                getPen().assign(tmp.pen);
>+            }
>+            getCirclePen().assign(tmp.getCirclePen());
>+            getCircleLabelsFont().assign(tmp.getCircleLabelsFont());
>+            circleLabels = tmp.circleLabels;
>+            circleLabelsInside = tmp.circleLabelsInside;
>+            circleLabelsRot = tmp.circleLabelsRot;
>+            clockWiseLabels = tmp.clockWiseLabels;
>+            closeCircle = tmp.closeCircle;
>+            treatnulls = tmp.treatnulls;
>         }
>         super.assign(source);
>     }
>diff --git a/src/com/steema/teechart/styles/Donut.java b/src/com/steema/teechart/styles/Donut.java
>index 80b130a..b8f4eb1 100644
>--- a/src/com/steema/teechart/styles/Donut.java
>+++ b/src/com/steema/teechart/styles/Donut.java
>@@ -42,9 +42,7 @@ public class Donut extends Pie {
>     
>     public void assign(Series source) {
>         if (source instanceof Donut) {
>-            Donut tmp = (Donut)source;
>-            
>-            this.setDonutPercent(tmp.DEFAULTDONUTPERCENT);
>+            setDonutPercent(((Donut)source).getDonutPercent());
>         }
>         super.assign(source);
>     }
>diff --git a/src/com/steema/teechart/styles/FastLine.java b/src/com/steema/teechart/styles/FastLine.java
>index 4512ce1..e96de31 100644
>--- a/src/com/steema/teechart/styles/FastLine.java
>+++ b/src/com/steema/teechart/styles/FastLine.java
>@@ -607,8 +607,10 @@ abstract class BaseLine extends Series {
>     public void assign(Series source) {
>         if (source instanceof BaseLine) {
>             BaseLine tmp = (BaseLine)source;
>-            if (tmp.linePen != null) {
>-                this.getLinePen().assign(tmp.linePen);
>+            if (tmp.linePen == null) {
>+                tmp.linePen = null;
>+            } else {
>+                getLinePen().assign(tmp.linePen);
>             }
>             treatnulls = tmp.getTreatNulls();
>             setTreatNaNAsNull(tmp.getTreatNaNAsNull());
>diff --git a/src/com/steema/teechart/styles/Funnel.java b/src/com/steema/teechart/styles/Funnel.java
>index 9a2cc11..ec5fff1 100644
>--- a/src/com/steema/teechart/styles/Funnel.java
>+++ b/src/com/steema/teechart/styles/Funnel.java
>@@ -68,15 +68,14 @@ public class Funnel extends Series {
>     public void assign(Series source) {
>         if (source instanceof Funnel) {
>             Funnel tmp = (Funnel)source;
>-            
>-            tmp.setAboveColor(((Funnel) source).getAboveColor());
>-            tmp.setAutoUpdate(((Funnel) source).getAutoUpdate());
>-            tmp.setBelowColor(((Funnel) source).getBelowColor());
>-            tmp.setChart(((Funnel) source).getChart());
>-            tmp.setDifferenceLimit(((Funnel) source).getDifferenceLimit());
>-            tmp.setOpportunityValues(((Funnel) source).getOpportunityValues());
>-            tmp.setQuotesSorted(((Funnel) source).getQuotesSorted());
>-            tmp.setWithinColor(((Funnel) source).getWithinColor());
>+            setAboveColor(tmp.getAboveColor());
>+            setAutoUpdate(tmp.getAutoUpdate());
>+            setBelowColor(tmp.getBelowColor());
>+            setChart(tmp.getChart());
>+            setDifferenceLimit(tmp.getDifferenceLimit());
>+            setOpportunityValues(tmp.getOpportunityValues());
>+            setQuotesSorted(tmp.getQuotesSorted());
>+            setWithinColor(tmp.getWithinColor());
>         }
>         super.assign(source);
>     }
>diff --git a/src/com/steema/teechart/styles/HighLow.java b/src/com/steema/teechart/styles/HighLow.java
>index 347739e..35b504b 100644
>--- a/src/com/steema/teechart/styles/HighLow.java
>+++ b/src/com/steema/teechart/styles/HighLow.java
>@@ -94,8 +94,7 @@ public class HighLow extends Series {
>     
>     public void assign(Series source) {
>         if (source instanceof HighLow) {
>-            HighLow tmp = (HighLow)source;
>-            tmp.setChart(((HighLow) source).getChart());
>+            setChart(source.getChart());
>         }
>         super.assign(source);
>     }
>diff --git a/src/com/steema/teechart/styles/Histogram.java b/src/com/steema/teechart/styles/Histogram.java
>index d17570c..4aa907e 100644
>--- a/src/com/steema/teechart/styles/Histogram.java
>+++ b/src/com/steema/teechart/styles/Histogram.java
>@@ -57,9 +57,9 @@ public class Histogram extends BaseLine {
>     public void assign(Series source) {
>         if (source instanceof Histogram) {
>             Histogram tmp = (Histogram)source;
>-            tmp.setChart(((Histogram) source).getChart());
>-            tmp.setTransparency(((Histogram) source).getTransparency());
>-            tmp.setUseYOrigin(((Histogram) source).getUseYOrigin());
>+            setChart(tmp.getChart());
>+            setTransparency(tmp.getTransparency());
>+            setUseYOrigin(tmp.getUseYOrigin());
>         }
>         super.assign(source);
>     }
>diff --git a/src/com/steema/teechart/styles/IsoSurface.java b/src/com/steema/teechart/styles/IsoSurface.java
>index 5a8cddd..2c167b7 100644
>--- a/src/com/steema/teechart/styles/IsoSurface.java
>+++ b/src/com/steema/teechart/styles/IsoSurface.java
>@@ -89,11 +89,15 @@ public class IsoSurface extends Surface {
>     public void assign(Series source) {
>         if (source instanceof IsoSurface) {
>             IsoSurface tmp = (IsoSurface)source;
>-            tmp.setChart(((IsoSurface) source).getChart());
>-            tmp.getBandPen().assign(((IsoSurface)source).getBandPen());
>-            tmp.setSides(((IsoSurface)source).getSides());
>-            tmp.setUseYPosition(((IsoSurface)source).getUseYPosition());
>-            tmp.setYPosition(((IsoSurface)source).getYPosition());
>+            setChart(tmp.getChart());
>+            if (tmp.bandPen == null) {
>+                bandPen = null;
>+            } else {
>+                getBandPen().assign(tmp.bandPen);
>+            }
>+            setSides(tmp.getSides());
>+            setUseYPosition(tmp.getUseYPosition());
>+            setYPosition(tmp.getYPosition());
>         }
>         super.assign(source);
>     }
>diff --git a/src/com/steema/teechart/styles/KnobGauge.java b/src/com/steema/teechart/styles/KnobGauge.java
>index 09ad6f7..fc6b892 100644
>--- a/src/com/steema/teechart/styles/KnobGauge.java
>+++ b/src/com/steema/teechart/styles/KnobGauge.java
>@@ -44,8 +44,8 @@ public class KnobGauge extends CircularGauge {
>     public void assign(Series source) {
>         if (source instanceof KnobGauge) {
>             KnobGauge tmp = (KnobGauge)source;
>-            tmp.setChart(((KnobGauge) source).getChart());
>-            tmp.setAxisInside(((KnobGauge)source).getAxisInside());
>+            setChart(tmp.getChart());
>+            setAxisInside(tmp.getAxisInside());
>         }
>         super.assign(source);
>     }
>diff --git a/src/com/steema/teechart/styles/LinearGauge.java b/src/com/steema/teechart/styles/LinearGauge.java
>index 314d941..67d5ed8 100644
>--- a/src/com/steema/teechart/styles/LinearGauge.java
>+++ b/src/com/steema/teechart/styles/LinearGauge.java
>@@ -59,14 +59,14 @@ public class LinearGauge extends CustomGauge {
> 		this((IBaseChart) null);
> 	}
> 
>-        public void assign(Series source) {
>-            if (source instanceof LinearGauge) {
>-                LinearGauge tmp = (LinearGauge)source;
>-                tmp.setChart(((LinearGauge) source).getChart());
>-                tmp.setMaxValueIndicator(((LinearGauge)source).getMaxValueIndicator());
>-            }
>-            super.assign(source);
>+    public void assign(Series source) {
>+        if (source instanceof LinearGauge) {
>+            LinearGauge tmp = (LinearGauge)source;
>+            setChart(tmp.getChart());
>+            setMaxValueIndicator(tmp.getMaxValueIndicator());
>         }
>+        super.assign(source);
>+    }
>     
> 	protected void drawFace(IGraphics3D g) {
> 		g.rectangle(iNewRectangle);
>diff --git a/src/com/steema/teechart/styles/Map.java b/src/com/steema/teechart/styles/Map.java
>index 3e9638a..d9951eb 100644
>--- a/src/com/steema/teechart/styles/Map.java
>+++ b/src/com/steema/teechart/styles/Map.java
>@@ -55,9 +55,9 @@ public class Map extends Custom3DPalette {
>     public void assign(Series source) {
>         if (source instanceof Map) {
>             Map tmp = (Map)source;
>-            tmp.setChart(((Map) source).getChart());
>-            tmp.setShapes(((Map)source).getShapes());
>-            tmp.setTransparency(((Map)source).getTransparency());
>+            setChart(tmp.getChart());
>+            setShapes(tmp.getShapes());
>+            setTransparency(tmp.getTransparency());
>         }
>         super.assign(source);
>     }    
>diff --git a/src/com/steema/teechart/styles/NumericGauge.java b/src/com/steema/teechart/styles/NumericGauge.java
>index a81d21e..c719c82 100644
>--- a/src/com/steema/teechart/styles/NumericGauge.java
>+++ b/src/com/steema/teechart/styles/NumericGauge.java
>@@ -50,11 +50,11 @@ public class NumericGauge extends CustomGauge {
>     public void assign(Series source) {
>         if (source instanceof NumericGauge) {
>             NumericGauge tmp = (NumericGauge)source;
>-            tmp.setChart(((NumericGauge) source).getChart());
>-            tmp.setMarkersCollection(((NumericGauge)source).getMarkersCollection());
>-            tmp.setTextMarker(((NumericGauge)source).getTextMarker());
>-            tmp.setUnitsMarker(((NumericGauge)source).getUnitsMarker());
>-            tmp.setValueMarker(((NumericGauge)source).getValueMarker());
>+            setChart(tmp.getChart());
>+            setMarkersCollection(tmp.getMarkersCollection());
>+            setTextMarker(tmp.getTextMarker());
>+            setUnitsMarker(tmp.getUnitsMarker());
>+            setValueMarker(tmp.getValueMarker());
>         }
>         super.assign(source);
>     }     
>diff --git a/src/com/steema/teechart/styles/OHLC.java b/src/com/steema/teechart/styles/OHLC.java
>index 1180533..ae1a56d 100644
>--- a/src/com/steema/teechart/styles/OHLC.java
>+++ b/src/com/steema/teechart/styles/OHLC.java
>@@ -48,11 +48,11 @@ public class OHLC extends Custom {
>     public void assign(Series source) {
>         if (source instanceof OHLC) {
>             OHLC tmp = (OHLC)source;
>-            tmp.setChart(((OHLC) source).getChart());
>-            tmp.setCloseValues(((OHLC)source).getCloseValues());
>-            tmp.setDateValues(((OHLC)source).getDateValues());
>-            tmp.setHighValues(((OHLC)source).getHighValues());
>-            tmp.setLowValues(((OHLC)source).getLowValues());
>+            setChart(tmp.getChart());
>+            setCloseValues(tmp.getCloseValues());
>+            setDateValues(tmp.getDateValues());
>+            setHighValues(tmp.getHighValues());
>+            setLowValues(tmp.getLowValues());
>         }
>         super.assign(source);
>     }    
>diff --git a/src/com/steema/teechart/styles/Pie.java b/src/com/steema/teechart/styles/Pie.java
>index 06a6a85..66363e3 100644
>--- a/src/com/steema/teechart/styles/Pie.java
>+++ b/src/com/steema/teechart/styles/Pie.java
>@@ -356,22 +356,20 @@ public class Pie extends Circular {
> 
>     public void assign(final Series source) {
>         if (source instanceof Pie) {
>-            Pie sourcePie = (Pie)source;
>-        
>-            this.angleSize = sourcePie.angleSize;
>-            this.bevelPercent = sourcePie.bevelPercent;
>-            this.dark3D = sourcePie.dark3D;
>-            this.darkPen =sourcePie.darkPen;
>-            this.iDonutPercent = sourcePie.iDonutPercent;
>-            this.explodeBiggest = sourcePie.explodeBiggest;
>-            this.explodedSlice = (ExplodedSliceList)sourcePie.explodedSlice.clone();
>-            this.multiPie = sourcePie.multiPie;
>-            this.sliceHeight = (SliceValueList)sourcePie.sliceHeight.clone();
>-            this.usePatterns = sourcePie.usePatterns;
>-            this.otherSlice = sourcePie.otherSlice;
>-            this.piemarks = sourcePie.piemarks;
>+            Pie tmp = (Pie)source;
>+            angleSize = tmp.angleSize;
>+            bevelPercent = tmp.bevelPercent;
>+            dark3D = tmp.dark3D;
>+            darkPen = tmp.darkPen;
>+            iDonutPercent = tmp.iDonutPercent;
>+            explodeBiggest = tmp.explodeBiggest;
>+            explodedSlice = (ExplodedSliceList)tmp.explodedSlice.clone();
>+            multiPie = tmp.multiPie;
>+            sliceHeight = (SliceValueList)tmp.sliceHeight.clone();
>+            usePatterns = tmp.usePatterns;
>+            otherSlice = tmp.otherSlice;
>+            piemarks = tmp.piemarks;
>         }
>-        
>         super.assign(source);
>     }
>     
>diff --git a/src/com/steema/teechart/styles/PointFigure.java b/src/com/steema/teechart/styles/PointFigure.java
>index 00e6171..9b8cc32 100644
>--- a/src/com/steema/teechart/styles/PointFigure.java
>+++ b/src/com/steema/teechart/styles/PointFigure.java
>@@ -56,8 +56,8 @@ public class PointFigure extends OHLC {
>     public void assign(Series source) {
>         if (source instanceof PointFigure) {
>             PointFigure tmp = (PointFigure)source;
>-            tmp.setChart(((PointFigure) source).getChart());
>-            tmp.setBoxSize(((PointFigure)source).getBoxSize());
>+            setChart(tmp.getChart());
>+            setBoxSize(tmp.getBoxSize());
>         }
>         super.assign(source);
>     }    
>diff --git a/src/com/steema/teechart/styles/Points.java b/src/com/steema/teechart/styles/Points.java
>index 4916f5c..e6cda80 100644
>--- a/src/com/steema/teechart/styles/Points.java
>+++ b/src/com/steema/teechart/styles/Points.java
>@@ -44,8 +44,8 @@ public class Points extends CustomPoint {
>     public void assign(Series source) {
>         if (source instanceof Points) {
>             Points tmp = (Points)source;
>-            tmp.setColor(((Points)source).getColor());
>-            tmp.setColorEach(((Points) source).getColorEach());  
>+            setColor(tmp.getColor());
>+            setColorEach(tmp.getColorEach());
>         }
>         super.assign(source);
>     }     
>diff --git a/src/com/steema/teechart/styles/Points3D.java b/src/com/steema/teechart/styles/Points3D.java
>index 181b1f8..66bd9a1 100644
>--- a/src/com/steema/teechart/styles/Points3D.java
>+++ b/src/com/steema/teechart/styles/Points3D.java
>@@ -78,10 +78,10 @@ public class Points3D extends Custom3D {
>     public void assign(Series source) {
>         if (source instanceof Points3D) {
>             Points3D tmp = (Points3D)source;
>-            tmp.setChart(((Points3D)source).getChart());
>-            tmp.setColor(((Points3D) source).getColor());  
>-            tmp.setDepthSize(((Points3D) source).getDepthSize());  
>-            tmp.setTreatNulls(((Points3D) source).getTreatNulls());  
>+            setChart(tmp.getChart());
>+            setColor(tmp.getColor());
>+            setDepthSize(tmp.getDepthSize());
>+            setTreatNulls(tmp.getTreatNulls());
>         }
>         super.assign(source);
>     }    
>diff --git a/src/com/steema/teechart/styles/PolygonList.java b/src/com/steema/teechart/styles/PolygonList.java
>index 8017fcc..ccefadc 100644
>--- a/src/com/steema/teechart/styles/PolygonList.java
>+++ b/src/com/steema/teechart/styles/PolygonList.java
>@@ -53,7 +53,7 @@ import java.util.ArrayList;
> 
>         public void assign(PolygonList value) {
>             clear();
>-            add(value);
>+            addAll(value);
>         }
> 
>         public Polygon getPolygon(int index) {
>diff --git a/src/com/steema/teechart/styles/PolygonSeries.java b/src/com/steema/teechart/styles/PolygonSeries.java
>index 1e874fc..4165f97 100644
>--- a/src/com/steema/teechart/styles/PolygonSeries.java
>+++ b/src/com/steema/teechart/styles/PolygonSeries.java
>@@ -47,8 +47,8 @@ import com.steema.teechart.drawing.IGraphics3D;
>         public void assign(Series source) {
>             if (source instanceof PolygonSeries) {
>                 PolygonSeries tmp = (PolygonSeries)source;
>-                tmp.setPolygon(((PolygonSeries)source).getPolygon());
>-                tmp.setColor(((PolygonSeries) source).getColor());   
>+                setPolygon(tmp.getPolygon());
>+                setColor(tmp.getColor());
>             }
>             super.assign(source);
>         }        
>diff --git a/src/com/steema/teechart/styles/Pyramid.java b/src/com/steema/teechart/styles/Pyramid.java
>index cb18375..852d5f5 100644
>--- a/src/com/steema/teechart/styles/Pyramid.java
>+++ b/src/com/steema/teechart/styles/Pyramid.java
>@@ -42,8 +42,7 @@ public class Pyramid extends Series {
>     
>     public void assign(Series source) {
>         if (source instanceof Pyramid) {
>-            Pyramid tmp = (Pyramid)source;
>-            tmp.setSizePercent(((Pyramid)source).getSizePercent()); 
>+            setSizePercent(((Pyramid)source).getSizePercent());
>         }
>         super.assign(source);
>     }      
>diff --git a/src/com/steema/teechart/styles/SeriesMarks.java b/src/com/steema/teechart/styles/SeriesMarks.java
>index 03c7a07..58aa152 100644
>--- a/src/com/steema/teechart/styles/SeriesMarks.java
>+++ b/src/com/steema/teechart/styles/SeriesMarks.java
>@@ -92,14 +92,17 @@ public class SeriesMarks extends TextShape {
>     @Override
>     public void assign(Shape s) {
>         super.assign(s);
>-        ((SeriesMarks) s).iSeries = iSeries;
>-        ((SeriesMarks) s).setStyle(markerStyle);
>-        ((SeriesMarks) s).setAngle(angle);
>-        ((SeriesMarks) s).setMultiLine(multiLine);
>-        ((SeriesMarks) s).setDrawEvery(drawEvery);
>-        ((SeriesMarks) s).setFontSeriesColor(fontSeriesColor);
>-        ((SeriesMarks) s).setCallout(getCallout());
>-        ((SeriesMarks) s).setMarkerTail(markerTail);
>+        if (s instanceof SeriesMarks) {
>+            SeriesMarks tmp = (SeriesMarks)s;
>+            iSeries = tmp.iSeries;
>+            setStyle(tmp.getStyle());
>+            setAngle(tmp.getAngle());
>+            setMultiLine(tmp.getMultiLine());
>+            setDrawEvery(tmp.getDrawEvery());
>+            setFontSeriesColor(tmp.getFontSeriesColor());
>+            setCallout(tmp.getCallout());
>+            setMarkerTail(tmp.getMarkerTail());
>+        }
>     }
> 
>     public MarksCallout getCallout() {
>diff --git a/src/com/steema/teechart/styles/SeriesMarksPosition.java b/src/com/steema/teechart/styles/SeriesMarksPosition.java
>index 08edc11..7e67eee 100644
>--- a/src/com/steema/teechart/styles/SeriesMarksPosition.java
>+++ b/src/com/steema/teechart/styles/SeriesMarksPosition.java
>@@ -37,15 +37,12 @@ public class SeriesMarksPosition {
>     }
> 
>     public void assign(SeriesMarksPosition source) {
>-        arrowFrom.x = source.arrowFrom.x;
>-        arrowFrom.y = source.arrowFrom.y;
>-        arrowTo.x = source.arrowTo.x;
>-        arrowTo.y = source.arrowTo.y;
>-        leftTop.x = source.leftTop.x;
>-        leftTop.y = source.leftTop.y;
>+        arrowFrom.set(source.arrowFrom);
>+        arrowTo.set(source.arrowTo);
>+        leftTop.set(source.leftTop);
>         height = source.height;
>         width = source.width;
>-        midPoint = new Point(source.midPoint.x,source.midPoint.y);
>+        midPoint.set(source.midPoint);
>         hasMid = source.hasMid;
>     }
>     
>diff --git a/src/com/steema/teechart/styles/SeriesPointer.java b/src/com/steema/teechart/styles/SeriesPointer.java
>index cf3d776..dc18fad 100644
>--- a/src/com/steema/teechart/styles/SeriesPointer.java
>+++ b/src/com/steema/teechart/styles/SeriesPointer.java
>@@ -51,21 +51,25 @@ public class SeriesPointer extends TeeBase {
>     }
> 
>     public void assign(SeriesPointer source) {
>-        if (source.bBrush != null) {
>-            this.getBrush().assign(source.bBrush);
>+        if (source.bBrush == null) {
>+            bBrush = null;
>+        } else {
>+            getBrush().assign(source.bBrush);
>         }
>-        if (source.pen != null) {
>-            this.getPen().assign(source.pen);
>+        if (source.pen == null) {
>+            pen = null;
>+        } else {
>+            getPen().assign(source.pen);
>         }
>-        this.style = source.style;
>-        this.vertSize = source.vertSize;
>-        this.horizSize = source.horizSize;
>-        this.dark3D = source.dark3D;
>-        this.draw3D = source.draw3D;
>-        this.inflate = source.inflate;
>-        this.bVisible = source.bVisible;
>-        this.allowChangeSize = source.allowChangeSize;
>-        this.defaultVisible = source.defaultVisible;
>+        style = source.style;
>+        vertSize = source.vertSize;
>+        horizSize = source.horizSize;
>+        dark3D = source.dark3D;
>+        draw3D = source.draw3D;
>+        inflate = source.inflate;
>+        bVisible = source.bVisible;
>+        allowChangeSize = source.allowChangeSize;
>+        defaultVisible = source.defaultVisible;
>     }
> 
>     protected Object readResolve() {
>diff --git a/src/com/steema/teechart/styles/Shape.java b/src/com/steema/teechart/styles/Shape.java
>index e728ff7..71454fa 100644
>--- a/src/com/steema/teechart/styles/Shape.java
>+++ b/src/com/steema/teechart/styles/Shape.java
>@@ -54,17 +54,17 @@ public class Shape extends Series {
>     public void assign(Series source) {
>         if (source instanceof Shape) {
>             Shape tmp = (Shape)source;
>-            tmp.setChart(((Shape)source).getChart()); 
>-            tmp.setHorizAlignment(((Shape)source).getHorizAlignment()); 
>-            tmp.setStyle(((Shape)source).getStyle()); 
>-            tmp.setText(((Shape)source).getText()); 
>-            tmp.setTransparent(((Shape)source).getTransparent()); 
>-            tmp.setVertAlignment(((Shape)source).getVertAlignment());
>-            tmp.setX0(((Shape)source).getX0());
>-            tmp.setY0(((Shape)source).getY0());
>-            tmp.setX1(((Shape)source).getX1());
>-            tmp.setY1(((Shape)source).getY1());
>-            tmp.setXYStyle(((Shape)source).getXYStyle());
>+            setChart(tmp.getChart());
>+            setHorizAlignment(tmp.getHorizAlignment());
>+            setStyle(tmp.getStyle());
>+            setText(tmp.getText());
>+            setTransparent(tmp.getTransparent());
>+            setVertAlignment(tmp.getVertAlignment());
>+            setX0(tmp.getX0());
>+            setY0(tmp.getY0());
>+            setX1(tmp.getX1());
>+            setY1(tmp.getY1());
>+            setXYStyle(tmp.getXYStyle());
>         }
>         super.assign(source);
>     }     
>diff --git a/src/com/steema/teechart/styles/Smith.java b/src/com/steema/teechart/styles/Smith.java
>index 9983af2..f97bbb4 100644
>--- a/src/com/steema/teechart/styles/Smith.java
>+++ b/src/com/steema/teechart/styles/Smith.java
>@@ -59,10 +59,10 @@ public class Smith extends Circular {
>     public void assign(Series source) {
>         if (source instanceof Smith) {
>             Smith tmp = (Smith)source;
>-            tmp.setChart(((Smith)source).getChart());
>-            tmp.setCLabels(((Smith)source).getCLabels());
>-            tmp.setImagSymbol(((Smith)source).getImagSymbol());
>-            tmp.setRLabels(((Smith)source).getRLabels());
>+            setChart(tmp.getChart());
>+            setCLabels(tmp.getCLabels());
>+            setImagSymbol(tmp.getImagSymbol());
>+            setRLabels(tmp.getRLabels());
>         }
>         super.assign(source);
>     }     
>diff --git a/src/com/steema/teechart/styles/Surface.java b/src/com/steema/teechart/styles/Surface.java
>index b6604a4..60a5dae 100644
>--- a/src/com/steema/teechart/styles/Surface.java
>+++ b/src/com/steema/teechart/styles/Surface.java
>@@ -96,13 +96,13 @@ public class Surface extends Custom3DGrid {
>     public void assign(Series source) {
>         if (source instanceof Surface) {
>             Surface tmp = (Surface)source;
>-            tmp.setChart(((Surface)source).getChart());
>-            tmp.setDotFrame(((Surface)source).getDotFrame());
>-            tmp.setHideCells(((Surface)source).getHideCells());
>-            tmp.setSideLines(((Surface)source).getSideLines());
>-            tmp.setSmoothPalette(((Surface)source).getSmoothPalette());
>-            tmp.setWaterFall(((Surface)source).getWaterFall());
>-            tmp.setWireFrame(((Surface)source).getWireFrame());
>+            setChart(tmp.getChart());
>+            setDotFrame(tmp.getDotFrame());
>+            setHideCells(tmp.getHideCells());
>+            setSideLines(tmp.getSideLines());
>+            setSmoothPalette(tmp.getSmoothPalette());
>+            setWaterFall(tmp.getWaterFall());
>+            setWireFrame(tmp.getWireFrame());
>         }
>         super.assign(source);
>     }     
>diff --git a/src/com/steema/teechart/styles/Ternary.java b/src/com/steema/teechart/styles/Ternary.java
>index debf5c5..b76ed9d 100644
>--- a/src/com/steema/teechart/styles/Ternary.java
>+++ b/src/com/steema/teechart/styles/Ternary.java
>@@ -121,20 +121,28 @@ public class Ternary extends Custom3DPalette {
>         public void assign(Series source) {
>             if (source instanceof Ternary) {
>                 Ternary tmp = (Ternary)source;
>-                tmp.setAxisScale(((Ternary)source).getAxisScale());
>-                tmp.setChart(((Ternary)source).getChart()); 
>-                tmp.getGradient().assign(((Ternary)source).getGradient()); 
>-                tmp.getLinesPen().assign(((Ternary)source).getLinesPen()); 
>-                tmp.setMarkStyle(((Ternary)source).getMarkStyle());
>-                tmp.setPlotFormat(((Ternary)source).getPlotFormat());
>-                tmp.getPointer().assign(((Ternary)source).getPointer());
>-                tmp.setRadiusValues(((Ternary)source).getRadiusValues());
>-                tmp.setRotateLabels(((Ternary)source).getRotateLabels());
>-                tmp.setTernaryLegendStyle(((Ternary)source).getTernaryLegendStyle());
>-                tmp.setTernaryMarkStyle(((Ternary)source).getTernaryMarkStyle());
>-                tmp.setTernaryStyle(((Ternary)source).getTernaryStyle());
>-                tmp.fVertexTitles = (((Ternary)source).fVertexTitles);
>-                tmp.setWeightValues(((Ternary)source).getWeightValues());
>+                setAxisScale(tmp.getAxisScale());
>+                setChart(tmp.getChart());
>+                getGradient().assign(tmp.getGradient());
>+                if (tmp.fLinesPen == null) {
>+                    fLinesPen = null;
>+                } else {
>+                    getLinesPen().assign(tmp.fLinesPen);
>+                }
>+                setMarkStyle(tmp.getMarkStyle());
>+                setPlotFormat(tmp.getPlotFormat());
>+                if (tmp.fPointer == null) {
>+                    fPointer = null;
>+                } else {
>+                    getPointer().assign(tmp.fPointer);
>+                }
>+                setRadiusValues(tmp.getRadiusValues());
>+                setRotateLabels(tmp.getRotateLabels());
>+                setTernaryLegendStyle(tmp.getTernaryLegendStyle());
>+                setTernaryMarkStyle(tmp.getTernaryMarkStyle());
>+                setTernaryStyle(tmp.getTernaryStyle());
>+                fVertexTitles = tmp.fVertexTitles;
>+                setWeightValues(tmp.getWeightValues());
>             }
>             super.assign(source);
>         }         
>diff --git a/src/com/steema/teechart/styles/Tower.java b/src/com/steema/teechart/styles/Tower.java
>index 37be15c..359509f 100644
>--- a/src/com/steema/teechart/styles/Tower.java
>+++ b/src/com/steema/teechart/styles/Tower.java
>@@ -58,11 +58,11 @@ public class Tower extends Custom3DGrid {
>     public void assign(Series source) {
>         if (source instanceof Tower) {
>             Tower tmp = (Tower)source;
>-            tmp.setPercentWidth(((Tower)source).getPercentWidth()); 
>-            tmp.setPercentDepth(((Tower)source).getPercentDepth()); 
>-            tmp.setTowerStyle(((Tower)source).getTowerStyle()); 
>-            tmp.setTransparency(((Tower)source).getTransparency());
>-            tmp.setUseOrigin(((Tower)source).getUseOrigin());
>+            setPercentWidth(tmp.getPercentWidth());
>+            setPercentDepth(tmp.getPercentDepth());
>+            setTowerStyle(tmp.getTowerStyle());
>+            setTransparency(tmp.getTransparency());
>+            setUseOrigin(tmp.getUseOrigin());
>         }
>         super.assign(source);
>     }     
>diff --git a/src/com/steema/teechart/styles/TriSurface.java b/src/com/steema/teechart/styles/TriSurface.java
>index e1c3018..1114073 100644
>--- a/src/com/steema/teechart/styles/TriSurface.java
>+++ b/src/com/steema/teechart/styles/TriSurface.java
>@@ -103,8 +103,8 @@ public class TriSurface extends Custom3DPalette {
>     public void assign(Series source) {
>         if (source instanceof TriSurface) {
>             TriSurface tmp = (TriSurface)source;
>-            tmp.setCacheTriangles(((TriSurface)source).getCacheTriangles()); 
>-            tmp.setHideTriangles(((TriSurface)source).getHideTriangles());
>+            setCacheTriangles(tmp.getCacheTriangles());
>+            setHideTriangles(tmp.getHideTriangles());
>         }
>         super.assign(source);
>     }     
>diff --git a/src/com/steema/teechart/styles/Vector3D.java b/src/com/steema/teechart/styles/Vector3D.java
>index c89cb59..fcc199e 100644
>--- a/src/com/steema/teechart/styles/Vector3D.java
>+++ b/src/com/steema/teechart/styles/Vector3D.java
>@@ -54,8 +54,8 @@ public class Vector3D extends Custom3DPalette {
>     public void assign(Series source) {
>         if (source instanceof Vector3D) {
>             Vector3D tmp = (Vector3D)source;
>-            tmp.setArrowHeight(((Vector3D)source).getArrowHeight());
>-            tmp.setArrowWidth(((Vector3D)source).getArrowWidth());
>+            setArrowHeight(tmp.getArrowHeight());
>+            setArrowWidth(tmp.getArrowWidth());
>         }
>         super.assign(source);
>     }     
>diff --git a/src/com/steema/teechart/styles/Volume.java b/src/com/steema/teechart/styles/Volume.java
>index b435782..8b23cfb 100644
>--- a/src/com/steema/teechart/styles/Volume.java
>+++ b/src/com/steema/teechart/styles/Volume.java
>@@ -58,9 +58,9 @@ public class Volume extends Custom {
>     public void assign(Series source) {
>         if (source instanceof Volume) {
>             Volume tmp = (Volume)source;
>-            tmp.setColor(((Volume)source).getColor()); 
>-            tmp.setOrigin(((Volume)source).getOrigin());
>-            tmp.setUseOrigin(((Volume)source).getUseOrigin());
>+            setColor(tmp.getColor());
>+            setOrigin(tmp.getOrigin());
>+            setUseOrigin(tmp.getUseOrigin());
>         }
>         super.assign(source);
>     }     
>diff --git a/src/com/steema/teechart/styles/World.java b/src/com/steema/teechart/styles/World.java
>index 664b6b7..558c65e 100644
>--- a/src/com/steema/teechart/styles/World.java
>+++ b/src/com/steema/teechart/styles/World.java
>@@ -157,14 +157,17 @@ import java.util.logging.Logger;
>       }
>     }
> 
>-    public void assign(Series source)
>-    {
>-      super.assign(source);
>-      if (source instanceof World)
>-      {
>-        this.shadow.assign(((World)source).shadow);
>-        this.map = ((World)source).map;
>-      }
>+    public void assign(Series source) {
>+        super.assign(source);
>+        if (source instanceof World) {
>+            World tmp = (World)source;
>+            if (tmp.shadow == null) {
>+                shadow = null;
>+            } else {
>+                getShadow().assign(tmp.shadow);
>+            }
>+            map = tmp.map;
>+        }
>     }
> 
>     public void galleryChanged3D(boolean Is3D)
>

Actions: View | Diff

Attachments on bug 1615: 636