make RenderTheme only return render instruction

- i.e. dont pass render callback

remove unused matchWay function

src/org/oscim/theme/RenderTheme.java

@@ -151,14 +151,7 @@ public class RenderTheme {
 		return mMapBackground;
 	}
 
-	private static void render(IRenderCallback renderCallback,
-			RenderInstruction[] renderInstructions, Tag[] tags) {
-		for (int i = 0, n = renderInstructions.length; i < n; i++)
-			renderInstructions[i].renderNode(renderCallback, tags);
-	}
-
 	/**
-	 * @param renderCallback
 	 *            ...
 	 * @param tags
 	 *            ...
@@ -166,8 +159,7 @@ public class RenderTheme {
 	 *            ...
 	 * @return ...
 	 */
-	public RenderInstruction[] matchNode(IRenderCallback renderCallback,
-			Tag[] tags, byte zoomLevel) {
+	public RenderInstruction[] matchNode(Tag[] tags, byte zoomLevel) {
 
 		// list of renderinsctruction items in cache
 		RenderInstructionItem ris = null;
@@ -206,7 +198,7 @@ public class RenderTheme {
 				List<RenderInstruction> matches = mNodeInstructionList;
 				matches.clear();
 				for (int i = 0, n = mRulesList.size(); i < n; ++i)
-					mRulesList.get(i).matchNode(renderCallback, tags, zoomLevel, matches);
+					mRulesList.get(i).matchNode(tags, zoomLevel, matches);
 
 				int size = matches.size();
 
@@ -262,9 +254,6 @@ public class RenderTheme {
 			}
 		}
 
-		if (ri.list != null)
-			render(renderCallback, ri.list, tags);
-
 		mPrevNodeItem = ri;
 
 		return ri.list;
@@ -277,21 +266,15 @@ public class RenderTheme {
 	/**
 	 * Matches a way with the given parameters against this RenderTheme.
 	 *
-	 * @param renderCallback
-	 *            the callback implementation which will be executed on each
-	 *            match.
 	 * @param tags
 	 *            the tags of the way.
 	 * @param zoomLevel
 	 *            the zoom level at which the way should be matched.
 	 * @param closed
 	 *            way is Closed
-	 * @param render
-	 *            ...
 	 * @return currently processed render instructions
 	 */
-	public RenderInstruction[] matchWay(IRenderCallback renderCallback,
-			Tag[] tags, byte zoomLevel, boolean closed, boolean render) {
+	public RenderInstruction[] matchWay(Tag[] tags, byte zoomLevel, boolean closed) {
 
 		// list of renderinsctruction items in cache
 		RenderInstructionItem ris = null;
@@ -354,7 +337,7 @@ public class RenderTheme {
 				matches.clear();
 
 				for (int i = 0, n = mRulesList.size(); i < n; ++i)
-					mRulesList.get(i).matchWay(renderCallback, tags, zoomLevel, c, matches);
+					mRulesList.get(i).matchWay(tags, zoomLevel, c, matches);
 
 				int size = matches.size();
 				// check if same instructions are used in another level
@@ -421,11 +404,6 @@ public class RenderTheme {
 				mPrevWayItem = ri;
 		}
 
-		if (render && ri.list != null) {
-			for (int i = 0, n = ri.list.length; i < n; i++)
-				ri.list[i].renderWay(renderCallback, tags);
-		}
-
 		return ri.list;
 	}
 

src/org/oscim/theme/Rule.java

@@ -196,7 +196,7 @@ abstract class Rule {
 
 	abstract boolean matchesWay(Tag[] tags);
 
-	void matchNode(IRenderCallback renderCallback, Tag[] tags, byte zoomLevel,
+	void matchNode(Tag[] tags, byte zoomLevel,
 			List<RenderInstruction> matchingList) {
 		if ((mElement != Element.WAY)
 				&& mZoomMin <= zoomLevel
@@ -207,12 +207,12 @@ abstract class Rule {
 				matchingList.add(mRenderInstructionArray[i]);
 
 			for (int i = 0, n = mSubRuleArray.length; i < n; i++)
-				mSubRuleArray[i].matchNode(renderCallback, tags, zoomLevel, matchingList);
+				mSubRuleArray[i].matchNode(tags, zoomLevel, matchingList);
 
 		}
 	}
 
-	void matchWay(IRenderCallback renderCallback, Tag[] tags, byte zoomLevel,
+	void matchWay(Tag[] tags, byte zoomLevel,
 			int closed, List<RenderInstruction> matchingList) {
 
 		if ((mElement != Element.NODE)
@@ -227,7 +227,7 @@ abstract class Rule {
 
 			// check subrules
 			for (int i = 0, n = mSubRuleArray.length; i < n; i++)
-				mSubRuleArray[i].matchWay(renderCallback, tags, zoomLevel, closed,
+				mSubRuleArray[i].matchWay(tags, zoomLevel, closed,
 						matchingList);
 
 		}