From f7a98017b19ddc2a12d472512f41ec7715034f70 Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Sun, 24 Aug 2014 09:36:39 +0200 Subject: [PATCH] TileCache: remove unused size field --- .../src/org/oscim/android/cache/TileCache.java | 14 ++++---------- vtm/src/org/oscim/tiling/ITileCache.java | 4 +--- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/vtm-android/src/org/oscim/android/cache/TileCache.java b/vtm-android/src/org/oscim/android/cache/TileCache.java index d686bf51..28d8835b 100644 --- a/vtm-android/src/org/oscim/android/cache/TileCache.java +++ b/vtm-android/src/org/oscim/android/cache/TileCache.java @@ -45,12 +45,10 @@ public class TileCache implements ITileCache { class CacheTileReader implements TileReader { final InputStream mInputStream; final Tile mTile; - final int mSize; - public CacheTileReader(Tile tile, InputStream is, int size) { + public CacheTileReader(Tile tile, InputStream is) { mTile = tile; mInputStream = is; - mSize = size; } @Override @@ -62,11 +60,6 @@ public class TileCache implements ITileCache { public InputStream getInputStream() { return mInputStream; } - - @Override - public int getBytes() { - return mSize; - } } class CacheTileWriter implements TileWriter { @@ -190,6 +183,7 @@ public class TileCache implements ITileCache { db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME); onCreate(db); } + @Override public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) { onUpgrade(db, oldVersion, newVersion); @@ -247,7 +241,7 @@ public class TileCache implements ITileCache { if (dbg) log.debug("load tile {}", tile); - return new CacheTileReader(tile, in, Integer.MAX_VALUE); + return new CacheTileReader(tile, in); } private final String[] mQueryVals = new String[3]; @@ -280,7 +274,7 @@ public class TileCache implements ITileCache { if (dbg) log.debug("load tile {}", tile); - return new CacheTileReader(tile, in, Integer.MAX_VALUE); + return new CacheTileReader(tile, in); } @Override diff --git a/vtm/src/org/oscim/tiling/ITileCache.java b/vtm/src/org/oscim/tiling/ITileCache.java index 98c05b7e..f27a69fc 100644 --- a/vtm/src/org/oscim/tiling/ITileCache.java +++ b/vtm/src/org/oscim/tiling/ITileCache.java @@ -38,7 +38,7 @@ public interface ITileCache { * @param tile * The accessed tile. * @return - * The stored file for this tile. + * The stored file for this tile or null if tile is not stored. */ TileReader getTile(Tile tile); @@ -52,8 +52,6 @@ public interface ITileCache { Tile getTile(); InputStream getInputStream(); - - int getBytes(); } public interface TileWriter {