From 6d3bc0caeafa6109d74f9403ea6c4d79979dfa1b Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Sat, 8 Mar 2014 13:20:26 +0100
Subject: [PATCH] remove MapTile.loader field for GWT

---
 .../oscim/gdx/emu/org/oscim/layers/tile/TileLoader.java    | 4 ----
 .../emu/org/oscim/layers/tile/bitmap/BitmapTileLoader.java | 7 ++-----
 .../emu/org/oscim/layers/tile/vector/VectorTileLoader.java | 7 ++-----
 .../org/oscim/tiling/source/bitmap/BitmapTileSource.java   | 4 ++--
 vtm/src/org/oscim/layers/tile/MapTile.java                 | 5 +----
 5 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/TileLoader.java b/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/TileLoader.java
index 106d2804..561fe5f1 100644
--- a/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/TileLoader.java
+++ b/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/TileLoader.java
@@ -14,9 +14,6 @@
  */
 package org.oscim.layers.tile;
 
-import org.oscim.layers.tile.MapTile;
-import org.oscim.layers.tile.TileManager;
-
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.utils.Timer;
 
@@ -86,7 +83,6 @@ public abstract class TileLoader {
 			return;
 
 		try {
-			tile.loader = this;
 			executeJob(tile);
 
 			mWorking = true;
diff --git a/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/bitmap/BitmapTileLoader.java b/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/bitmap/BitmapTileLoader.java
index 6ca2472b..035257c9 100644
--- a/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/bitmap/BitmapTileLoader.java
+++ b/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/bitmap/BitmapTileLoader.java
@@ -73,10 +73,7 @@ public class BitmapTileLoader extends TileLoader implements ITileDataSink {
 
 	@Override
 	public void completed(boolean success) {
-		if (success) {
-			mTile.loader.jobCompleted(mTile, true);
-			mTile = null;
-			return;
-		}
+		jobCompleted(mTile, success);
+		mTile = null;
 	}
 }
diff --git a/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/vector/VectorTileLoader.java b/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/vector/VectorTileLoader.java
index 6e7ef596..e6ca50a1 100644
--- a/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/vector/VectorTileLoader.java
+++ b/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/vector/VectorTileLoader.java
@@ -130,11 +130,8 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
 	}
 
 	public void completed(boolean success) {
-		if (success) {
-			mTile.loader.jobCompleted(mTile, true);
-			mTile = null;
-			return;
-		}
+		jobCompleted(mTile, success);
+		mTile = null;
 	}
 
 	protected static int getValidLayer(int layer) {
diff --git a/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/bitmap/BitmapTileSource.java b/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/bitmap/BitmapTileSource.java
index 0ee537c5..eb665343 100644
--- a/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/bitmap/BitmapTileSource.java
+++ b/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/bitmap/BitmapTileSource.java
@@ -73,7 +73,7 @@ public abstract class BitmapTileSource extends UrlTileSource {
 			img.addLoadHandler(new LoadHandler() {
 				public void onLoad(LoadEvent event) {
 					sink.setTileImage(new GwtBitmap(img));
-					tile.loader.jobCompleted(tile, true);
+					sink.completed(true);
 				}
 			});
 
@@ -81,7 +81,7 @@ public abstract class BitmapTileSource extends UrlTileSource {
 
 				@Override
 				public void onError(ErrorEvent event) {
-					tile.loader.jobCompleted(tile, false);
+					sink.completed(false);
 					RootPanel.get().remove(img);
 				}
 			});
diff --git a/vtm/src/org/oscim/layers/tile/MapTile.java b/vtm/src/org/oscim/layers/tile/MapTile.java
index f4e2f8c1..a4ce0a40 100644
--- a/vtm/src/org/oscim/layers/tile/MapTile.java
+++ b/vtm/src/org/oscim/layers/tile/MapTile.java
@@ -35,9 +35,6 @@ public class MapTile extends Tile {
 
 	}
 
-	/** To be removed: used by GWT backend */
-	public TileLoader loader;
-
 	public static final class State {
 		public final static byte NONE = 0;
 
@@ -67,7 +64,7 @@ public class MapTile extends Tile {
 	}
 
 	public MapTile(TileNode node, int tileX, int tileY, int zoomLevel) {
-		super(tileX, tileY, (byte)zoomLevel);
+		super(tileX, tileY, (byte) zoomLevel);
 		this.x = (double) tileX / (1 << zoomLevel);
 		this.y = (double) tileY / (1 << zoomLevel);
 		this.node = node;