set RenderStyle itself as current

This commit is contained in:
Hannes Janetzek 2014-03-31 01:07:00 +02:00
parent 9f8bc93d91
commit a3251a4aa6
7 changed files with 7 additions and 7 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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