set RenderStyle itself as current

vtm/src/org/oscim/theme/styles/AreaStyle.java

@@ -93,7 +93,7 @@ public class AreaStyle extends RenderStyle {
 
 	@Override
 	public AreaStyle current() {
-		return (AreaStyle) (mCurrent == null ? this : mCurrent);
+		return (AreaStyle) mCurrent;
 	}
 
 	@Override

vtm/src/org/oscim/theme/styles/CircleStyle.java

@@ -54,6 +54,6 @@ public final class CircleStyle extends RenderStyle {
 
 	@Override
 	public CircleStyle current() {
-		return (CircleStyle) (mCurrent == null ? this : mCurrent);
+		return (CircleStyle) mCurrent;
 	}
 }

vtm/src/org/oscim/theme/styles/ExtrusionStyle.java

@@ -63,7 +63,7 @@ public class ExtrusionStyle extends RenderStyle {
 
 	@Override
 	public ExtrusionStyle current() {
-		return (ExtrusionStyle) (mCurrent == null ? this : mCurrent);
+		return (ExtrusionStyle) mCurrent;
 	}
 
 	private final int level;

vtm/src/org/oscim/theme/styles/LineStyle.java

@@ -95,7 +95,7 @@ public final class LineStyle extends RenderStyle {
 
 	@Override
 	public LineStyle current() {
-		return (LineStyle) (mCurrent == null ? this : mCurrent);
+		return (LineStyle) mCurrent;
 	}
 
 	public final static class LineBuilder {

vtm/src/org/oscim/theme/styles/RenderStyle.java

@@ -24,7 +24,7 @@ import org.oscim.theme.IRenderTheme.Callback;
  */
 public abstract class RenderStyle {
 
-	RenderStyle mCurrent;
+	RenderStyle mCurrent = this;
 	RenderStyle mNext;
 	boolean update;
 

vtm/src/org/oscim/theme/styles/SymbolStyle.java

@@ -47,6 +47,6 @@ public final class SymbolStyle extends RenderStyle {
 
 	@Override
 	public SymbolStyle current() {
-		return (SymbolStyle) (mCurrent == null ? this : mCurrent);
+		return (SymbolStyle) mCurrent;
 	}
 }

vtm/src/org/oscim/theme/styles/TextStyle.java

@@ -193,7 +193,7 @@ public final class TextStyle extends RenderStyle {
 
 	@Override
 	public TextStyle current() {
-		return (TextStyle) (mCurrent == null ? this : mCurrent);
+		return (TextStyle) mCurrent;
 	}
 
 	@Override