From fba6f44f307b8e13b70bdef6e0836ce625d5846c Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Tue, 3 Sep 2013 05:33:47 +0200
Subject: [PATCH] cleanup + formatting

---
 vtm/src/org/oscim/theme/RenderTheme.java      | 27 +------------------
 .../org/oscim/theme/RenderThemeHandler.java   | 25 +++++++++--------
 vtm/src/org/oscim/theme/rule/Rule.java        |  5 ----
 3 files changed, 13 insertions(+), 44 deletions(-)

diff --git a/vtm/src/org/oscim/theme/RenderTheme.java b/vtm/src/org/oscim/theme/RenderTheme.java
index 3fedd646..b1571087 100644
--- a/vtm/src/org/oscim/theme/RenderTheme.java
+++ b/vtm/src/org/oscim/theme/RenderTheme.java
@@ -82,10 +82,6 @@ public class RenderTheme implements IRenderTheme {
 		mElementCache[2] = new ElementCache(Element.POLY);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.oscim.theme.IRenderTheme#destroy()
-	 */
 	@Override
 	public void destroy() {
 
@@ -98,29 +94,16 @@ public class RenderTheme implements IRenderTheme {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.oscim.theme.IRenderTheme#getLevels()
-	 */
 	@Override
 	public int getLevels() {
 		return mLevels;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.oscim.theme.IRenderTheme#getMapBackground()
-	 */
 	@Override
 	public int getMapBackground() {
 		return mMapBackground;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.oscim.theme.IRenderTheme#matchWay(org.oscim.core.Tag[], byte,
-	 * boolean)
-	 */
 	@Override
 	public RenderInstruction[] matchElement(MapElement element, int zoomLevel) {
 
@@ -143,7 +126,7 @@ public class RenderTheme implements IRenderTheme {
 
 		synchronized (cache) {
 
-			if (cache.prevItem == null || (cache.prevItem.zoom & zoomMask) == 0) {
+			if ((cache.prevItem == null) || (cache.prevItem.zoom & zoomMask) == 0) {
 				// previous instructions zoom does not match
 				cache.cacheKey.set(element.tags, null);
 			} else {
@@ -266,10 +249,6 @@ public class RenderTheme implements IRenderTheme {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.oscim.theme.IRenderTheme#scaleStrokeWidth(float)
-	 */
 	@Override
 	public void scaleStrokeWidth(float scaleFactor) {
 
@@ -277,10 +256,6 @@ public class RenderTheme implements IRenderTheme {
 			mRules[i].scaleStrokeWidth(scaleFactor * mBaseStrokeWidth);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.oscim.theme.IRenderTheme#scaleTextSize(float)
-	 */
 	@Override
 	public void scaleTextSize(float scaleFactor) {
 
diff --git a/vtm/src/org/oscim/theme/RenderThemeHandler.java b/vtm/src/org/oscim/theme/RenderThemeHandler.java
index f0190c9e..1c4b358e 100644
--- a/vtm/src/org/oscim/theme/RenderThemeHandler.java
+++ b/vtm/src/org/oscim/theme/RenderThemeHandler.java
@@ -110,16 +110,16 @@ public class RenderThemeHandler extends DefaultHandler {
 	 */
 	public static void logUnknownAttribute(String element, String name,
 	                                       String value, int attributeIndex) {
-		StringBuilder stringBuilder = new StringBuilder();
-		stringBuilder.append("unknown attribute in element ");
-		stringBuilder.append(element);
-		stringBuilder.append(" (");
-		stringBuilder.append(attributeIndex);
-		stringBuilder.append("): ");
-		stringBuilder.append(name);
-		stringBuilder.append('=');
-		stringBuilder.append(value);
-		Log.d(TAG, stringBuilder.toString());
+		StringBuilder sb = new StringBuilder();
+		sb.append("unknown attribute in element ");
+		sb.append(element);
+		sb.append(" (");
+		sb.append(attributeIndex);
+		sb.append("): ");
+		sb.append(name);
+		sb.append('=');
+		sb.append(value);
+		Log.d(TAG, sb.toString());
 	}
 
 	private final ArrayList<Rule> mRulesList = new ArrayList<Rule>();
@@ -140,7 +140,6 @@ public class RenderThemeHandler extends DefaultHandler {
 		}
 
 		mRenderTheme.complete(mRulesList, mLevel);
-		// mRenderTheme.mTextureAtlas = mTextureAtlas;
 
 		mTextureAtlas = null;
 		mRulesList.clear();
@@ -281,8 +280,8 @@ public class RenderThemeHandler extends DefaultHandler {
 
 				if ((symbol.texture = mTextureAtlas.getTextureRegion(symbol.src)) == null)
 					Log.d(TAG, "missing texture atlas item '" + symbol.src + "'");
-				else
-					Log.d(TAG, "using atlas item '" + symbol.src + "'");
+				//else
+				//	Log.d(TAG, "using atlas item '" + symbol.src + "'");
 			}
 
 			else if (ELEMENT_NAME_USE_STYLE_LINE.equals(localName)) {
diff --git a/vtm/src/org/oscim/theme/rule/Rule.java b/vtm/src/org/oscim/theme/rule/Rule.java
index 2f323612..1f8551cf 100644
--- a/vtm/src/org/oscim/theme/rule/Rule.java
+++ b/vtm/src/org/oscim/theme/rule/Rule.java
@@ -223,7 +223,6 @@ public abstract class Rule {
 			// check subrules
 			for (Rule subRule : mSubRuleArray)
 				subRule.matchElement(type, tags, zoomLevel, matchingList);
-
 		}
 	}
 
@@ -244,7 +243,6 @@ public abstract class Rule {
 
 		for (Rule subRule : mSubRuleArray)
 			subRule.onComplete();
-
 	}
 
 	public void onDestroy() {
@@ -253,7 +251,6 @@ public abstract class Rule {
 
 		for (Rule subRule : mSubRuleArray)
 			subRule.onDestroy();
-
 	}
 
 	public void scaleStrokeWidth(float scaleFactor) {
@@ -262,7 +259,6 @@ public abstract class Rule {
 
 		for (Rule subRule : mSubRuleArray)
 			subRule.scaleStrokeWidth(scaleFactor);
-
 	}
 
 	public void scaleTextSize(float scaleFactor) {
@@ -270,6 +266,5 @@ public abstract class Rule {
 			ri.scaleTextSize(scaleFactor);
 		for (Rule subRule : mSubRuleArray)
 			subRule.scaleTextSize(scaleFactor);
-
 	}
 }