diff --git a/vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java b/vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java index 2a891039..43463162 100644 --- a/vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/BaseMapActivity.java @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory; public class BaseMapActivity extends MapActivity { static final Logger log = LoggerFactory.getLogger(BaseMapActivity.class); - final static boolean USE_CACHE = false; + static final boolean USE_CACHE = false; VectorTileLayer mBaseLayer; TileSource mTileSource; diff --git a/vtm-android-example/src/org/oscim/android/test/BitmapTileActivity.java b/vtm-android-example/src/org/oscim/android/test/BitmapTileActivity.java index 4f1b44a9..3b2684d2 100644 --- a/vtm-android-example/src/org/oscim/android/test/BitmapTileActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/BitmapTileActivity.java @@ -31,7 +31,7 @@ public class BitmapTileActivity extends MapActivity { static final Logger log = LoggerFactory.getLogger(BitmapTileActivity.class); - private final static boolean USE_CACHE = false; + private static final boolean USE_CACHE = false; private final BitmapTileSource mTileSource; protected BitmapTileLayer mBitmapLayer; diff --git a/vtm-android/src/org/oscim/android/cache/TileCache.java b/vtm-android/src/org/oscim/android/cache/TileCache.java index d0aa6e8a..43e915ae 100644 --- a/vtm-android/src/org/oscim/android/cache/TileCache.java +++ b/vtm-android/src/org/oscim/android/cache/TileCache.java @@ -42,8 +42,8 @@ import java.util.ArrayList; public class TileCache implements ITileCache { - final static org.slf4j.Logger log = LoggerFactory.getLogger(TileCache.class); - final static boolean dbg = false; + static final org.slf4j.Logger log = LoggerFactory.getLogger(TileCache.class); + static final boolean dbg = false; class CacheTileReader implements TileReader { final InputStream mInputStream; diff --git a/vtm-app/src/org/oscim/app/App.java b/vtm-app/src/org/oscim/app/App.java index 7f95c9a5..85f10007 100644 --- a/vtm-app/src/org/oscim/app/App.java +++ b/vtm-app/src/org/oscim/app/App.java @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; public class App extends Application { - public final static Logger log = LoggerFactory.getLogger(App.class); + public static final Logger log = LoggerFactory.getLogger(App.class); public static Map map; public static MapView view; diff --git a/vtm-app/src/org/oscim/app/MapLayers.java b/vtm-app/src/org/oscim/app/MapLayers.java index dccaae95..47b5169d 100644 --- a/vtm-app/src/org/oscim/app/MapLayers.java +++ b/vtm-app/src/org/oscim/app/MapLayers.java @@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory; public class MapLayers { - final static Logger log = LoggerFactory.getLogger(MapLayers.class); + static final Logger log = LoggerFactory.getLogger(MapLayers.class); abstract static class Config { final String name; diff --git a/vtm-app/src/org/oscim/app/POISearch.java b/vtm-app/src/org/oscim/app/POISearch.java index a1b9517a..a779218e 100644 --- a/vtm-app/src/org/oscim/app/POISearch.java +++ b/vtm-app/src/org/oscim/app/POISearch.java @@ -48,11 +48,11 @@ public class POISearch { ItemizedOverlayWithBubble poiMarkers; MarkerSymbol[] mMarkers; - private final static int MDEFAULT = 0; - private final static int MFLICKR = 1; - private final static int MPICASA = 2; - private final static int MWIKI16 = 3; - private final static int MWIKI32 = 4; + private static final int MDEFAULT = 0; + private static final int MFLICKR = 1; + private static final int MPICASA = 2; + private static final int MWIKI16 = 3; + private static final int MWIKI32 = 4; POISearch() { mPOIs = new ArrayList(); @@ -89,12 +89,12 @@ public class POISearch { return mPOIs; } - final static String TAG_WIKIPEDIA = "wikipedia"; - final static String TAG_FLICKR = "flickr"; - final static String TAG_PICASA = "picasa"; - final static String TAG_FOURSQUARE = "foursquare"; + static final String TAG_WIKIPEDIA = "wikipedia"; + static final String TAG_FLICKR = "flickr"; + static final String TAG_PICASA = "picasa"; + static final String TAG_FOURSQUARE = "foursquare"; - //private final static String TAG_NOMINATIM = "nominatim"; + //private static final String TAG_NOMINATIM = "nominatim"; class POITask extends AsyncTask> { String mTag; diff --git a/vtm-app/src/org/oscim/app/TileMap.java b/vtm-app/src/org/oscim/app/TileMap.java index cff38c6b..cc5a3134 100755 --- a/vtm-app/src/org/oscim/app/TileMap.java +++ b/vtm-app/src/org/oscim/app/TileMap.java @@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory; import java.util.Map; public class TileMap extends MapActivity implements MapEventsReceiver { - final static Logger log = LoggerFactory.getLogger(TileMap.class); + static final Logger log = LoggerFactory.getLogger(TileMap.class); private static final int DIALOG_ENTER_COORDINATES = 0; private static final int DIALOG_LOCATION_PROVIDER_DISABLED = 2; diff --git a/vtm-app/src/org/oscim/app/location/Compass.java b/vtm-app/src/org/oscim/app/location/Compass.java index 9ccb7718..6d357b79 100644 --- a/vtm-app/src/org/oscim/app/location/Compass.java +++ b/vtm-app/src/org/oscim/app/location/Compass.java @@ -38,7 +38,7 @@ import org.oscim.utils.FastMath; public class Compass extends Layer implements SensorEventListener, Map.UpdateListener, LocationRenderer.Callback { - // final static Logger log = LoggerFactory.getLogger(Compass.class); + // static final Logger log = LoggerFactory.getLogger(Compass.class); public enum Mode { OFF, C2D, C3D, diff --git a/vtm-app/src/org/oscim/app/location/LocationHandler.java b/vtm-app/src/org/oscim/app/location/LocationHandler.java index e4839a3a..b1c53651 100644 --- a/vtm-app/src/org/oscim/app/location/LocationHandler.java +++ b/vtm-app/src/org/oscim/app/location/LocationHandler.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class LocationHandler implements LocationListener { - private final static Logger log = LoggerFactory.getLogger(LocationHandler.class); + private static final Logger log = LoggerFactory.getLogger(LocationHandler.class); public enum Mode { OFF, @@ -40,8 +40,8 @@ public class LocationHandler implements LocationListener { SNAP, } - private final static int DIALOG_LOCATION_PROVIDER_DISABLED = 2; - private final static int SHOW_LOCATION_ZOOM = 14; + private static final int DIALOG_LOCATION_PROVIDER_DISABLED = 2; + private static final int SHOW_LOCATION_ZOOM = 14; private final LocationManager mLocationManager; private final LocationLayerImpl mLocationLayer; diff --git a/vtm-app/src/org/oscim/app/preferences/CacheSizePreference.java b/vtm-app/src/org/oscim/app/preferences/CacheSizePreference.java index 02d82531..4f1d6601 100644 --- a/vtm-app/src/org/oscim/app/preferences/CacheSizePreference.java +++ b/vtm-app/src/org/oscim/app/preferences/CacheSizePreference.java @@ -18,7 +18,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class CacheSizePreference extends Preference implements OnSeekBarChangeListener { - final static Logger log = LoggerFactory.getLogger(CacheSizePreference.class); + static final Logger log = LoggerFactory.getLogger(CacheSizePreference.class); private static final String NS_OCIM_APP = "http://app.oscim.org"; private static final int DEFAULT_VALUE = 50; diff --git a/vtm-app/src/org/oscim/overlay/DistanceTouchOverlay.java b/vtm-app/src/org/oscim/overlay/DistanceTouchOverlay.java index f9d57e62..7d3b3199 100644 --- a/vtm-app/src/org/oscim/overlay/DistanceTouchOverlay.java +++ b/vtm-app/src/org/oscim/overlay/DistanceTouchOverlay.java @@ -38,7 +38,7 @@ public class DistanceTouchOverlay extends Layer implements Map.InputListener, private float mPrevX1, mPrevX2, mPrevY1, mPrevY2; private float mCurX1, mCurX2, mCurY1, mCurY2; - // private final static int POINTER_UP = -1; + // private static final int POINTER_UP = -1; // private int mPointer1 = POINTER_UP; // private int mPointer2 = POINTER_UP; diff --git a/vtm-app/src/org/osmdroid/location/FlickrPOIProvider.java b/vtm-app/src/org/osmdroid/location/FlickrPOIProvider.java index e33f3d32..9e84960c 100644 --- a/vtm-app/src/org/osmdroid/location/FlickrPOIProvider.java +++ b/vtm-app/src/org/osmdroid/location/FlickrPOIProvider.java @@ -20,10 +20,10 @@ import java.util.HashMap; */ public class FlickrPOIProvider implements POIProvider { - final static Logger log = LoggerFactory.getLogger(FlickrPOIProvider.class); + static final Logger log = LoggerFactory.getLogger(FlickrPOIProvider.class); protected String mApiKey; - private final static String PHOTO_URL = "http://www.flickr.com/photos/%s/%s/sizes/o/in/photostream/"; + private static final String PHOTO_URL = "http://www.flickr.com/photos/%s/%s/sizes/o/in/photostream/"; /** * @param apiKey the registered API key to give to Flickr service. diff --git a/vtm-app/src/org/osmdroid/location/FourSquareProvider.java b/vtm-app/src/org/osmdroid/location/FourSquareProvider.java index 4035bbfd..f5ddf10e 100644 --- a/vtm-app/src/org/osmdroid/location/FourSquareProvider.java +++ b/vtm-app/src/org/osmdroid/location/FourSquareProvider.java @@ -37,7 +37,7 @@ import java.util.ArrayList; public class FourSquareProvider implements POIProvider { - final static Logger log = LoggerFactory.getLogger(FourSquareProvider.class); + static final Logger log = LoggerFactory.getLogger(FourSquareProvider.class); // https://developer.foursquare.com/docs/venues/search // https://developer.foursquare.com/docs/responses/venue diff --git a/vtm-app/src/org/osmdroid/location/GeoNamesPOIProvider.java b/vtm-app/src/org/osmdroid/location/GeoNamesPOIProvider.java index 24d09bd0..a94b0266 100644 --- a/vtm-app/src/org/osmdroid/location/GeoNamesPOIProvider.java +++ b/vtm-app/src/org/osmdroid/location/GeoNamesPOIProvider.java @@ -31,7 +31,7 @@ import javax.xml.parsers.SAXParserFactory; */ public class GeoNamesPOIProvider { - final static Logger log = LoggerFactory.getLogger(GeoNamesPOIProvider.class); + static final Logger log = LoggerFactory.getLogger(GeoNamesPOIProvider.class); protected String mUserName; diff --git a/vtm-app/src/org/osmdroid/location/GeocoderNominatim.java b/vtm-app/src/org/osmdroid/location/GeocoderNominatim.java index 6ea92210..09061e2d 100644 --- a/vtm-app/src/org/osmdroid/location/GeocoderNominatim.java +++ b/vtm-app/src/org/osmdroid/location/GeocoderNominatim.java @@ -26,7 +26,7 @@ import java.util.Locale; */ public class GeocoderNominatim { - final static Logger log = LoggerFactory.getLogger(GeocoderNominatim.class); + static final Logger log = LoggerFactory.getLogger(GeocoderNominatim.class); public static final String NOMINATIM_SERVICE_URL = "http://nominatim.openstreetmap.org/"; public static final String MAPQUEST_SERVICE_URL = "http://open.mapquestapi.com/nominatim/v1/"; diff --git a/vtm-app/src/org/osmdroid/location/NominatimPOIProvider.java b/vtm-app/src/org/osmdroid/location/NominatimPOIProvider.java index 09ea46ff..7c2a18d5 100644 --- a/vtm-app/src/org/osmdroid/location/NominatimPOIProvider.java +++ b/vtm-app/src/org/osmdroid/location/NominatimPOIProvider.java @@ -23,7 +23,7 @@ import java.util.ArrayList; */ public class NominatimPOIProvider implements POIProvider { - final static Logger log = LoggerFactory.getLogger(NominatimPOIProvider.class); + static final Logger log = LoggerFactory.getLogger(NominatimPOIProvider.class); /* As the doc lacks a lot of features, source code may help: * https://trac.openstreetmap diff --git a/vtm-app/src/org/osmdroid/location/OverpassPOIProvider.java b/vtm-app/src/org/osmdroid/location/OverpassPOIProvider.java index b9bade53..b1ad3cf5 100644 --- a/vtm-app/src/org/osmdroid/location/OverpassPOIProvider.java +++ b/vtm-app/src/org/osmdroid/location/OverpassPOIProvider.java @@ -17,7 +17,7 @@ import java.util.List; public class OverpassPOIProvider implements POIProvider { - final static Logger log = LoggerFactory + static final Logger log = LoggerFactory .getLogger(OverpassPOIProvider.class); public static final String TAG_KEY_WEBSITE = "website".intern(); diff --git a/vtm-app/src/org/osmdroid/location/PicasaPOIProvider.java b/vtm-app/src/org/osmdroid/location/PicasaPOIProvider.java index 9552e2d3..7bed56c5 100644 --- a/vtm-app/src/org/osmdroid/location/PicasaPOIProvider.java +++ b/vtm-app/src/org/osmdroid/location/PicasaPOIProvider.java @@ -27,7 +27,7 @@ import javax.xml.parsers.SAXParserFactory; */ public class PicasaPOIProvider implements POIProvider { - final static Logger log = LoggerFactory.getLogger(PicasaPOIProvider.class); + static final Logger log = LoggerFactory.getLogger(PicasaPOIProvider.class); String mAccessToken; diff --git a/vtm-app/src/org/osmdroid/routing/Route.java b/vtm-app/src/org/osmdroid/routing/Route.java index 8423f376..f72ded6b 100644 --- a/vtm-app/src/org/osmdroid/routing/Route.java +++ b/vtm-app/src/org/osmdroid/routing/Route.java @@ -20,7 +20,7 @@ import java.util.List; * @see OSRMRouteProvider */ public class Route { - //final static Logger log = LoggerFactory.getLogger(Route.class); + //static final Logger log = LoggerFactory.getLogger(Route.class); /** * @see #STATUS_INVALID STATUS_INVALID diff --git a/vtm-app/src/org/osmdroid/routing/RouteLeg.java b/vtm-app/src/org/osmdroid/routing/RouteLeg.java index d2f49b26..d30df39e 100644 --- a/vtm-app/src/org/osmdroid/routing/RouteLeg.java +++ b/vtm-app/src/org/osmdroid/routing/RouteLeg.java @@ -12,7 +12,7 @@ import java.util.List; * @author M.Kergall */ public class RouteLeg implements Parcelable { - //final static Logger log = LoggerFactory.getLogger(RouteLeg.class); + //static final Logger log = LoggerFactory.getLogger(RouteLeg.class); /** * in km diff --git a/vtm-app/src/org/osmdroid/routing/provider/GoogleRouteProvider.java b/vtm-app/src/org/osmdroid/routing/provider/GoogleRouteProvider.java index 2870f20c..60c0fff6 100644 --- a/vtm-app/src/org/osmdroid/routing/provider/GoogleRouteProvider.java +++ b/vtm-app/src/org/osmdroid/routing/provider/GoogleRouteProvider.java @@ -35,7 +35,7 @@ import javax.xml.parsers.SAXParserFactory; */ public class GoogleRouteProvider extends RouteProvider { - final static Logger log = LoggerFactory.getLogger(GoogleRouteProvider.class); + static final Logger log = LoggerFactory.getLogger(GoogleRouteProvider.class); static final String GOOGLE_DIRECTIONS_SERVICE = "http://maps.googleapis.com/maps/api/directions/xml?"; diff --git a/vtm-app/src/org/osmdroid/routing/provider/MapQuestRouteProvider.java b/vtm-app/src/org/osmdroid/routing/provider/MapQuestRouteProvider.java index 4ff3ad6f..748adc56 100644 --- a/vtm-app/src/org/osmdroid/routing/provider/MapQuestRouteProvider.java +++ b/vtm-app/src/org/osmdroid/routing/provider/MapQuestRouteProvider.java @@ -32,7 +32,7 @@ import javax.xml.parsers.SAXParserFactory; */ public class MapQuestRouteProvider extends RouteProvider { - final static Logger log = LoggerFactory.getLogger(MapQuestRouteProvider.class); + static final Logger log = LoggerFactory.getLogger(MapQuestRouteProvider.class); static final String MAPQUEST_GUIDANCE_SERVICE = "http://open.mapquestapi.com/guidance/v0/route?"; diff --git a/vtm-app/src/org/osmdroid/routing/provider/OSRMRouteProvider.java b/vtm-app/src/org/osmdroid/routing/provider/OSRMRouteProvider.java index 7b072fb1..f6089d27 100644 --- a/vtm-app/src/org/osmdroid/routing/provider/OSRMRouteProvider.java +++ b/vtm-app/src/org/osmdroid/routing/provider/OSRMRouteProvider.java @@ -30,10 +30,10 @@ import java.util.Locale; */ public class OSRMRouteProvider extends RouteProvider { - final static Logger log = LoggerFactory.getLogger(OSRMRouteProvider.class); + static final Logger log = LoggerFactory.getLogger(OSRMRouteProvider.class); // 1 for 6 digit precision, 10 for 5 - private final static int ENCODING_PRECISION = 1; + private static final int ENCODING_PRECISION = 1; //static final String OSRM_SERVICE = "http://city.informatik.uni-bremen.de:5000/viaroute?"; //static final String OSRM_SERVICE = "http://city.informatik.uni-bremen.de:5001/viaroute?"; diff --git a/vtm-app/src/org/osmdroid/utils/HttpConnection.java b/vtm-app/src/org/osmdroid/utils/HttpConnection.java index 104c3c94..cde1e239 100644 --- a/vtm-app/src/org/osmdroid/utils/HttpConnection.java +++ b/vtm-app/src/org/osmdroid/utils/HttpConnection.java @@ -26,8 +26,8 @@ import okhttp3.Response; * connection.close(); */ public class HttpConnection { - private final static int TIMEOUT_CONNECTION = 3000; //ms - private final static int TIMEOUT_SOCKET = 10000; //ms + private static final int TIMEOUT_CONNECTION = 3000; //ms + private static final int TIMEOUT_SOCKET = 10000; //ms private static OkHttpClient client; private InputStream stream; diff --git a/vtm-desktop/src/org/oscim/awt/AwtBitmap.java b/vtm-desktop/src/org/oscim/awt/AwtBitmap.java index 15acd768..3dc4cae1 100644 --- a/vtm-desktop/src/org/oscim/awt/AwtBitmap.java +++ b/vtm-desktop/src/org/oscim/awt/AwtBitmap.java @@ -94,13 +94,13 @@ public class AwtBitmap implements Bitmap { public void eraseColor(int transparent) { } - private final static IntBuffer tmpBuffer = BufferUtils + private static final IntBuffer tmpBuffer = BufferUtils .newIntBuffer(TextureBucket.TEXTURE_HEIGHT * TextureBucket.TEXTURE_WIDTH); - private final static int[] tmpPixel = new int[TextureBucket.TEXTURE_HEIGHT + private static final int[] tmpPixel = new int[TextureBucket.TEXTURE_HEIGHT * TextureBucket.TEXTURE_WIDTH]; - private final static boolean WRITE_TEX = false; + private static final boolean WRITE_TEX = false; private int dbgCnt; @Override diff --git a/vtm-extras/src/org/oscim/tiling/source/geojson/GeoJsonTileDecoder.java b/vtm-extras/src/org/oscim/tiling/source/geojson/GeoJsonTileDecoder.java index 4e86d3ee..e7e40082 100644 --- a/vtm-extras/src/org/oscim/tiling/source/geojson/GeoJsonTileDecoder.java +++ b/vtm-extras/src/org/oscim/tiling/source/geojson/GeoJsonTileDecoder.java @@ -54,18 +54,18 @@ public class GeoJsonTileDecoder implements ITileDecoder { private final LinkedHashMap mTagMap; private final JsonFactory mJsonFactory; - private final static char[] FIELD_FEATURES = "features".toCharArray(); - private final static char[] FIELD_GEOMETRY = "geometry".toCharArray(); - private final static char[] FIELD_PROPERTIES = "properties".toCharArray(); - private final static char[] FIELD_COORDINATES = "coordinates".toCharArray(); - private final static char[] FIELD_TYPE = "type".toCharArray(); + private static final char[] FIELD_FEATURES = "features".toCharArray(); + private static final char[] FIELD_GEOMETRY = "geometry".toCharArray(); + private static final char[] FIELD_PROPERTIES = "properties".toCharArray(); + private static final char[] FIELD_COORDINATES = "coordinates".toCharArray(); + private static final char[] FIELD_TYPE = "type".toCharArray(); - private final static char[] LINETRING = "LineString".toCharArray(); - private final static char[] POLYGON = "Polygon".toCharArray(); - private final static char[] POINT = "Point".toCharArray(); - private final static char[] MULTI_LINESTRING = "MultiLineString".toCharArray(); - private final static char[] MULTI_POLYGON = "MultiPolygon".toCharArray(); - private final static char[] MULTI_POINT = "MultiPoint".toCharArray(); + private static final char[] LINETRING = "LineString".toCharArray(); + private static final char[] POLYGON = "Polygon".toCharArray(); + private static final char[] POINT = "Point".toCharArray(); + private static final char[] MULTI_LINESTRING = "MultiLineString".toCharArray(); + private static final char[] MULTI_POLYGON = "MultiPolygon".toCharArray(); + private static final char[] MULTI_POINT = "MultiPoint".toCharArray(); private ITileDataSink mTileDataSink; @@ -329,7 +329,7 @@ public class GeoJsonTileDecoder implements ITileDecoder { } - private final static boolean match(JsonParser jp, char[] fieldName) + private static final boolean match(JsonParser jp, char[] fieldName) throws JsonParseException, IOException { int length = jp.getTextLength(); diff --git a/vtm-extras/src/org/oscim/tiling/source/geojson/OsmLanduseJsonTileSource.java b/vtm-extras/src/org/oscim/tiling/source/geojson/OsmLanduseJsonTileSource.java index e3f12916..c8c60e8a 100644 --- a/vtm-extras/src/org/oscim/tiling/source/geojson/OsmLanduseJsonTileSource.java +++ b/vtm-extras/src/org/oscim/tiling/source/geojson/OsmLanduseJsonTileSource.java @@ -94,7 +94,7 @@ public class OsmLanduseJsonTileSource extends GeoJsonTileSource { mappings.put("park or protected land", new Tag("leisure", "park")); } - private final static Tag mTagArea = new Tag("area", "yes"); + private static final Tag mTagArea = new Tag("area", "yes"); @Override public void decodeTags(MapElement mapElement, Map properties) { diff --git a/vtm-extras/src/org/oscim/tiling/source/mapnik/TileDecoder.java b/vtm-extras/src/org/oscim/tiling/source/mapnik/TileDecoder.java index da7a6787..62618e05 100644 --- a/vtm-extras/src/org/oscim/tiling/source/mapnik/TileDecoder.java +++ b/vtm-extras/src/org/oscim/tiling/source/mapnik/TileDecoder.java @@ -68,7 +68,7 @@ public class TileDecoder extends PbfDecoder { private final String mLocale = "de"; private ITileDataSink mMapDataCallback; - private final static float REF_TILE_SIZE = 4096.0f; + private static final float REF_TILE_SIZE = 4096.0f; private float mScale; @Override @@ -373,9 +373,9 @@ public class TileDecoder extends PbfDecoder { } } - private final static int CLOSE_PATH = 0x07; - private final static int MOVE_TO = 0x01; - //private final static int LINE_TO = 0x02; + private static final int CLOSE_PATH = 0x07; + private static final int MOVE_TO = 0x01; + //private static final int LINE_TO = 0x02; private int lastX, lastY; diff --git a/vtm-extras/src/org/oscim/tiling/source/oscimap/Tags.java b/vtm-extras/src/org/oscim/tiling/source/oscimap/Tags.java index b3de6603..5a5a5739 100644 --- a/vtm-extras/src/org/oscim/tiling/source/oscimap/Tags.java +++ b/vtm-extras/src/org/oscim/tiling/source/oscimap/Tags.java @@ -19,8 +19,8 @@ package org.oscim.tiling.source.oscimap; import org.oscim.core.Tag; public class Tags { - public final static int MAX = 654; - public final static int LIMIT = 1024; + public static final int MAX = 654; + public static final int LIMIT = 1024; private static final String s_limited = "limited".intern(); private static final String s_chain = "chain".intern(); diff --git a/vtm-extras/src/org/oscim/tiling/source/oscimap/TileDecoder.java b/vtm-extras/src/org/oscim/tiling/source/oscimap/TileDecoder.java index 5205c98f..ea55d070 100644 --- a/vtm-extras/src/org/oscim/tiling/source/oscimap/TileDecoder.java +++ b/vtm-extras/src/org/oscim/tiling/source/oscimap/TileDecoder.java @@ -34,7 +34,7 @@ import java.util.Map; public class TileDecoder extends PbfDecoder { static final Logger log = LoggerFactory.getLogger(TileDecoder.class); - private final static float REF_TILE_SIZE = 4096.0f; + private static final float REF_TILE_SIZE = 4096.0f; private static final int TAG_TILE_TAGS = 1; private static final int TAG_TILE_WAYS = 2; diff --git a/vtm-extras/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java b/vtm-extras/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java index 489ea55a..2f1c442b 100644 --- a/vtm-extras/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java +++ b/vtm-extras/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java @@ -75,7 +75,7 @@ public class OSciMap2TileSource extends UrlTileSource { private ITileDataSink mMapDataSink; // scale coordinates to tile size - private final static float REF_TILE_SIZE = 4096.0f; + private static final float REF_TILE_SIZE = 4096.0f; private float mScale; TileDecoder() { diff --git a/vtm-extras/src/org/oscim/tiling/source/oscimap2/Tags.java b/vtm-extras/src/org/oscim/tiling/source/oscimap2/Tags.java index f371a1e2..f8c51dba 100644 --- a/vtm-extras/src/org/oscim/tiling/source/oscimap2/Tags.java +++ b/vtm-extras/src/org/oscim/tiling/source/oscimap2/Tags.java @@ -19,8 +19,8 @@ package org.oscim.tiling.source.oscimap2; import org.oscim.core.Tag; public class Tags { - public final static int MAX = 628; - public final static int LIMIT = 1024; + public static final int MAX = 628; + public static final int LIMIT = 1024; private static final String s_limited = "limited"; private static final String s_chain = "chain"; @@ -584,7 +584,7 @@ public class Tags { // only the keys that were imported via osm2pgsql // FIXME add whats missing, e.g. wheelchair - public final static String[] keys = { + public static final String[] keys = { "access", "addr:housename", "addr:housenumber", @@ -651,7 +651,7 @@ public class Tags { }; // most common tags, ordered by tag count - public final static Tag[] tags = { + public static final Tag[] tags = { new Tag(s_building, s_yes, false), new Tag(s_highway, s_residential, false), new Tag(s_highway, s_service, false), diff --git a/vtm-extras/src/org/oscim/utils/wkb/Geometry.java b/vtm-extras/src/org/oscim/utils/wkb/Geometry.java index c800090c..0683e9bd 100644 --- a/vtm-extras/src/org/oscim/utils/wkb/Geometry.java +++ b/vtm-extras/src/org/oscim/utils/wkb/Geometry.java @@ -119,7 +119,7 @@ abstract class Geometry implements Serializable { /** * Official UNKNOWN srid value */ - final static int UNKNOWN_SRID = 0; + static final int UNKNOWN_SRID = 0; /** * The spacial reference system id of this geometry, default is no srid diff --git a/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/Poi3DLayer.java b/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/Poi3DLayer.java index 26b69611..34374b78 100644 --- a/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/Poi3DLayer.java +++ b/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/Poi3DLayer.java @@ -69,19 +69,19 @@ public class Poi3DLayer extends Layer implements Map.UpdateListener { } } - public final static int MIN_ZOOM = BuildingLayer.MIN_ZOOM; + public static final int MIN_ZOOM = BuildingLayer.MIN_ZOOM; static final String POI_DATA = Poi3DLayer.class.getSimpleName(); - public final static boolean RANDOM_TRANSFORM = true; // TODO customizable for each tag + public static final boolean RANDOM_TRANSFORM = true; // TODO customizable for each tag - public final static Tag TAG_TREE = new Tag("natural", "tree"); - public final static Tag TAG_MEMORIAL = new Tag("historic", "memorial"); - public final static Tag TAG_FOREST = new Tag("landuse", "forest"); - public final static Tag TAG_WOOD = new Tag("natural", "wood"); + public static final Tag TAG_TREE = new Tag("natural", "tree"); + public static final Tag TAG_MEMORIAL = new Tag("historic", "memorial"); + public static final Tag TAG_FOREST = new Tag("landuse", "forest"); + public static final Tag TAG_WOOD = new Tag("natural", "wood"); // Not supported by Oscim Tiles - public final static Tag TAG_ARTWORK = new Tag("tourism", "artwork"); - public final static Tag TAG_TREE_BROADLEAVED = new Tag("leaf_type", "broadleaved"); - public final static Tag TAG_TREE_NEEDLELEAVED = new Tag("leaf_type", "needleleaved"); - public final static Tag TAG_STREETLAMP = new Tag("highway", "street_lamp"); + public static final Tag TAG_ARTWORK = new Tag("tourism", "artwork"); + public static final Tag TAG_TREE_BROADLEAVED = new Tag("leaf_type", "broadleaved"); + public static final Tag TAG_TREE_NEEDLELEAVED = new Tag("leaf_type", "needleleaved"); + public static final Tag TAG_STREETLAMP = new Tag("highway", "street_lamp"); AssetManager mAssets; GdxRenderer3D2 mG3d; diff --git a/vtm-ios/src/org/oscim/ios/backend/IosPaint.java b/vtm-ios/src/org/oscim/ios/backend/IosPaint.java index 17085f72..68986eb5 100644 --- a/vtm-ios/src/org/oscim/ios/backend/IosPaint.java +++ b/vtm-ios/src/org/oscim/ios/backend/IosPaint.java @@ -77,7 +77,7 @@ public class IosPaint implements Paint { private String lastText = ""; private float descent; private float fontHeight; - private final static HashMap fontHashMap = new HashMap<>(); + private static final HashMap fontHashMap = new HashMap<>(); float strokeWidth; diff --git a/vtm-jeo/src/org/oscim/layers/JeoTileSource.java b/vtm-jeo/src/org/oscim/layers/JeoTileSource.java index a0cea10e..9cade819 100644 --- a/vtm-jeo/src/org/oscim/layers/JeoTileSource.java +++ b/vtm-jeo/src/org/oscim/layers/JeoTileSource.java @@ -35,7 +35,7 @@ import static org.oscim.tiling.QueryResult.SUCCESS; import static org.oscim.tiling.QueryResult.TILE_NOT_FOUND; public class JeoTileSource extends TileSource { - final static Logger log = LoggerFactory.getLogger(JeoTileSource.class); + static final Logger log = LoggerFactory.getLogger(JeoTileSource.class); final TileDataset mTileDataset; diff --git a/vtm-json/src/org/oscim/tiling/source/geojson/MapzenGeojsonTileSource.java b/vtm-json/src/org/oscim/tiling/source/geojson/MapzenGeojsonTileSource.java index 54d21af7..bec442b2 100644 --- a/vtm-json/src/org/oscim/tiling/source/geojson/MapzenGeojsonTileSource.java +++ b/vtm-json/src/org/oscim/tiling/source/geojson/MapzenGeojsonTileSource.java @@ -25,8 +25,8 @@ import java.util.Map; public class MapzenGeojsonTileSource extends GeojsonTileSource { - private final static String DEFAULT_URL = "https://tile.mapzen.com/mapzen/vector/v1/all"; - private final static String DEFAULT_PATH = "/{Z}/{X}/{Y}.json"; + private static final String DEFAULT_URL = "https://tile.mapzen.com/mapzen/vector/v1/all"; + private static final String DEFAULT_PATH = "/{Z}/{X}/{Y}.json"; public static class Builder> extends UrlTileSource.Builder { private String locale = ""; diff --git a/vtm-json/src/org/oscim/tiling/source/geojson/NextzenGeojsonTileSource.java b/vtm-json/src/org/oscim/tiling/source/geojson/NextzenGeojsonTileSource.java index 414b9138..00f96a14 100644 --- a/vtm-json/src/org/oscim/tiling/source/geojson/NextzenGeojsonTileSource.java +++ b/vtm-json/src/org/oscim/tiling/source/geojson/NextzenGeojsonTileSource.java @@ -24,8 +24,8 @@ import java.util.Map; public class NextzenGeojsonTileSource extends GeojsonTileSource { - private final static String DEFAULT_URL = "https://tile.nextzen.org/tilezen/vector/v1/all"; - private final static String DEFAULT_PATH = "/{Z}/{X}/{Y}.json"; + private static final String DEFAULT_URL = "https://tile.nextzen.org/tilezen/vector/v1/all"; + private static final String DEFAULT_PATH = "/{Z}/{X}/{Y}.json"; public static class Builder> extends UrlTileSource.Builder { private String locale = ""; diff --git a/vtm-json/src/org/oscim/tiling/source/geojson/TileDecoder.java b/vtm-json/src/org/oscim/tiling/source/geojson/TileDecoder.java index ab6396e8..25289f55 100644 --- a/vtm-json/src/org/oscim/tiling/source/geojson/TileDecoder.java +++ b/vtm-json/src/org/oscim/tiling/source/geojson/TileDecoder.java @@ -52,18 +52,18 @@ public class TileDecoder implements ITileDecoder { private final LinkedHashMap mTagMap; private final JsonFactory mJsonFactory; - private final static char[] FIELD_FEATURES = "features".toCharArray(); - private final static char[] FIELD_GEOMETRY = "geometry".toCharArray(); - private final static char[] FIELD_PROPERTIES = "properties".toCharArray(); - private final static char[] FIELD_COORDINATES = "coordinates".toCharArray(); - private final static char[] FIELD_TYPE = "type".toCharArray(); + private static final char[] FIELD_FEATURES = "features".toCharArray(); + private static final char[] FIELD_GEOMETRY = "geometry".toCharArray(); + private static final char[] FIELD_PROPERTIES = "properties".toCharArray(); + private static final char[] FIELD_COORDINATES = "coordinates".toCharArray(); + private static final char[] FIELD_TYPE = "type".toCharArray(); - private final static char[] LINESTRING = "LineString".toCharArray(); - private final static char[] POLYGON = "Polygon".toCharArray(); - private final static char[] POINT = "Point".toCharArray(); - private final static char[] MULTI_LINESTRING = "MultiLineString".toCharArray(); - private final static char[] MULTI_POLYGON = "MultiPolygon".toCharArray(); - private final static char[] MULTI_POINT = "MultiPoint".toCharArray(); + private static final char[] LINESTRING = "LineString".toCharArray(); + private static final char[] POLYGON = "Polygon".toCharArray(); + private static final char[] POINT = "Point".toCharArray(); + private static final char[] MULTI_LINESTRING = "MultiLineString".toCharArray(); + private static final char[] MULTI_POLYGON = "MultiPolygon".toCharArray(); + private static final char[] MULTI_POINT = "MultiPoint".toCharArray(); private ITileDataSink mTileDataSink; diff --git a/vtm-mvt/src/org/oscim/tiling/source/mvt/MapzenMvtTileSource.java b/vtm-mvt/src/org/oscim/tiling/source/mvt/MapzenMvtTileSource.java index 4d791c06..325c109d 100644 --- a/vtm-mvt/src/org/oscim/tiling/source/mvt/MapzenMvtTileSource.java +++ b/vtm-mvt/src/org/oscim/tiling/source/mvt/MapzenMvtTileSource.java @@ -24,8 +24,8 @@ import org.oscim.tiling.source.UrlTileSource; public class MapzenMvtTileSource extends UrlTileSource { - private final static String DEFAULT_URL = "https://tile.mapzen.com/mapzen/vector/v1/all"; - private final static String DEFAULT_PATH = "/{Z}/{X}/{Y}.mvt"; + private static final String DEFAULT_URL = "https://tile.mapzen.com/mapzen/vector/v1/all"; + private static final String DEFAULT_PATH = "/{Z}/{X}/{Y}.mvt"; public static class Builder> extends UrlTileSource.Builder { private String locale = ""; diff --git a/vtm-mvt/src/org/oscim/tiling/source/mvt/MvtTileDecoder.java b/vtm-mvt/src/org/oscim/tiling/source/mvt/MvtTileDecoder.java index 7259a59e..69005781 100644 --- a/vtm-mvt/src/org/oscim/tiling/source/mvt/MvtTileDecoder.java +++ b/vtm-mvt/src/org/oscim/tiling/source/mvt/MvtTileDecoder.java @@ -45,7 +45,7 @@ import java.util.Map; public class MvtTileDecoder implements ITileDecoder { private final String mLocale; - private final static float REF_TILE_SIZE = 4096.0f; + private static final float REF_TILE_SIZE = 4096.0f; private float mScale; private final GeometryFactory mGeomFactory; diff --git a/vtm-mvt/src/org/oscim/tiling/source/mvt/NextzenMvtTileSource.java b/vtm-mvt/src/org/oscim/tiling/source/mvt/NextzenMvtTileSource.java index 9bbf5ab4..fbd54684 100644 --- a/vtm-mvt/src/org/oscim/tiling/source/mvt/NextzenMvtTileSource.java +++ b/vtm-mvt/src/org/oscim/tiling/source/mvt/NextzenMvtTileSource.java @@ -21,8 +21,8 @@ import org.oscim.tiling.source.UrlTileSource; public class NextzenMvtTileSource extends UrlTileSource { - private final static String DEFAULT_URL = "https://tile.nextzen.org/tilezen/vector/v1/all"; - private final static String DEFAULT_PATH = "/{Z}/{X}/{Y}.mvt"; + private static final String DEFAULT_URL = "https://tile.nextzen.org/tilezen/vector/v1/all"; + private static final String DEFAULT_PATH = "/{Z}/{X}/{Y}.mvt"; public static class Builder> extends UrlTileSource.Builder { private String locale = ""; diff --git a/vtm-mvt/src/org/oscim/tiling/source/mvt/OpenMapTilesMvtTileSource.java b/vtm-mvt/src/org/oscim/tiling/source/mvt/OpenMapTilesMvtTileSource.java index d75281a2..08602ce2 100644 --- a/vtm-mvt/src/org/oscim/tiling/source/mvt/OpenMapTilesMvtTileSource.java +++ b/vtm-mvt/src/org/oscim/tiling/source/mvt/OpenMapTilesMvtTileSource.java @@ -25,8 +25,8 @@ import org.oscim.tiling.source.UrlTileSource; public class OpenMapTilesMvtTileSource extends UrlTileSource { - private final static String DEFAULT_URL = "https://free.tilehosting.com/data/v3"; - private final static String DEFAULT_PATH = "/{Z}/{X}/{Y}.pbf.pict"; + private static final String DEFAULT_URL = "https://free.tilehosting.com/data/v3"; + private static final String DEFAULT_PATH = "/{Z}/{X}/{Y}.pbf.pict"; public static class Builder> extends UrlTileSource.Builder { private String locale = ""; diff --git a/vtm-playground/src/org/oscim/test/DebugTheme.java b/vtm-playground/src/org/oscim/test/DebugTheme.java index 7845850f..b0f41a66 100644 --- a/vtm-playground/src/org/oscim/test/DebugTheme.java +++ b/vtm-playground/src/org/oscim/test/DebugTheme.java @@ -11,8 +11,8 @@ import org.oscim.theme.styles.RenderStyle; public class DebugTheme implements IRenderTheme { - private final static LineStyle[] line = {new LineStyle(1, Color.MAGENTA, 2)}; - private final static AreaStyle[] area = {new AreaStyle(0, Color.CYAN)}; + private static final LineStyle[] line = {new LineStyle(1, Color.MAGENTA, 2)}; + private static final AreaStyle[] area = {new AreaStyle(0, Color.CYAN)}; @Override public RenderStyle[] matchElement(GeometryType type, TagSet tags, int zoomLevel) { diff --git a/vtm-playground/src/org/oscim/test/renderer/CustomRenderer.java b/vtm-playground/src/org/oscim/test/renderer/CustomRenderer.java index 15a564b8..f9e0c915 100644 --- a/vtm-playground/src/org/oscim/test/renderer/CustomRenderer.java +++ b/vtm-playground/src/org/oscim/test/renderer/CustomRenderer.java @@ -144,7 +144,7 @@ public class CustomRenderer extends LayerRenderer { return true; } - private final static String vShaderStr = "" + + private static final String vShaderStr = "" + "precision mediump float;" + "uniform mat4 u_mvp;" + "attribute vec4 a_pos;" @@ -155,7 +155,7 @@ public class CustomRenderer extends LayerRenderer { + " alpha = a_pos.z;" + "}"; - private final static String fShaderStr = "" + + private static final String fShaderStr = "" + "precision mediump float;" + "varying float alpha;" + "void main()" diff --git a/vtm-playground/src/org/oscim/test/renderer/HexagonRenderTest.java b/vtm-playground/src/org/oscim/test/renderer/HexagonRenderTest.java index 0b939b03..2791db65 100644 --- a/vtm-playground/src/org/oscim/test/renderer/HexagonRenderTest.java +++ b/vtm-playground/src/org/oscim/test/renderer/HexagonRenderTest.java @@ -200,7 +200,7 @@ public class HexagonRenderTest extends GdxMapApp { return true; } - private final static String vShaderStr = "" + private static final String vShaderStr = "" + "#ifdef GLES\n" + "precision mediump float;\n" + "#endif\n" @@ -212,7 +212,7 @@ public class HexagonRenderTest extends GdxMapApp { + " gl_Position = u_mvp * vec4(u_center + a_pos, 0.0, 1.0);" + "}"; - private final static String fShaderStr = "" + private static final String fShaderStr = "" + "#ifdef GLES\n" + "precision mediump float;\n" + "#endif\n" diff --git a/vtm-tests/test/org/oscim/utils/QuadTreeTest.java b/vtm-tests/test/org/oscim/utils/QuadTreeTest.java index 04a18ead..f9c40fdd 100644 --- a/vtm-tests/test/org/oscim/utils/QuadTreeTest.java +++ b/vtm-tests/test/org/oscim/utils/QuadTreeTest.java @@ -13,7 +13,7 @@ import static java.lang.System.currentTimeMillis; import static java.lang.System.out; public class QuadTreeTest { - final static Random rand = new Random((long) (Math.PI * 10000000)); + static final Random rand = new Random((long) (Math.PI * 10000000)); public class Item { final int val; diff --git a/vtm-theme-comparator/src/org/oscim/theme/comparator/Main.java b/vtm-theme-comparator/src/org/oscim/theme/comparator/Main.java index 7f0843bb..88c54477 100644 --- a/vtm-theme-comparator/src/org/oscim/theme/comparator/Main.java +++ b/vtm-theme-comparator/src/org/oscim/theme/comparator/Main.java @@ -46,16 +46,16 @@ public class Main { public static Preferences prefs = Preferences.userNodeForPackage(Main.class); public static boolean useDarkTheme = true; // set black look and feel as default for unimpaired color impression - public final static BaseAppender ALL_APPENDER = new AllAppender(); - public final static BaseAppender VTM_APPENDER = new VtmAppender(); - public final static BaseAppender MAPSFORGE_APPENDER = new MapsforgeAppender(); + public static final BaseAppender ALL_APPENDER = new AllAppender(); + public static final BaseAppender VTM_APPENDER = new VtmAppender(); + public static final BaseAppender MAPSFORGE_APPENDER = new MapsforgeAppender(); - public final static int MAX_ZOOM_LEVEL = 21; - public final static int MIN_ZOOM_LEVEL = 0; + public static final int MAX_ZOOM_LEVEL = 21; + public static final int MIN_ZOOM_LEVEL = 0; - public final static ImageIcon ICON_OPEN = new ImageIcon(Main.class.getClassLoader().getResource("menu-open.png")); - public final static ImageIcon ICON_SAVE = new ImageIcon(Main.class.getClassLoader().getResource("menu-saveall.png")); + public static final ImageIcon ICON_OPEN = new ImageIcon(Main.class.getClassLoader().getResource("menu-open.png")); + public static final ImageIcon ICON_SAVE = new ImageIcon(Main.class.getClassLoader().getResource("menu-saveall.png")); public static final ImageIcon ICON_EDIT = new ImageIcon(Main.class.getClassLoader().getResource("editSource_dark.png")); public static final ImageIcon ICON_DEBUG = new ImageIcon(Main.class.getClassLoader().getResource("debug_dark.png")); public static final ImageIcon ICON_EXIT = new ImageIcon(Main.class.getClassLoader().getResource("exit_dark.png")); diff --git a/vtm-theme-comparator/src/org/oscim/theme/comparator/mapsforge/MapsforgeMapPanel.java b/vtm-theme-comparator/src/org/oscim/theme/comparator/mapsforge/MapsforgeMapPanel.java index 1822f6b8..90d9f479 100644 --- a/vtm-theme-comparator/src/org/oscim/theme/comparator/mapsforge/MapsforgeMapPanel.java +++ b/vtm-theme-comparator/src/org/oscim/theme/comparator/mapsforge/MapsforgeMapPanel.java @@ -52,7 +52,7 @@ import javax.swing.BorderFactory; import javax.swing.JPanel; public class MapsforgeMapPanel extends JPanel { - private final static Logger log = LoggerFactory.getLogger(MapsforgeMapPanel.class); + private static final Logger log = LoggerFactory.getLogger(MapsforgeMapPanel.class); private final GraphicFactory GRAPHIC_FACTORY = AwtGraphicFactory.INSTANCE; private AwtMapView mapView; diff --git a/vtm-theme-comparator/src/org/oscim/theme/comparator/vtm/MapAdapter.java b/vtm-theme-comparator/src/org/oscim/theme/comparator/vtm/MapAdapter.java index a5d20521..fbc2e8c0 100644 --- a/vtm-theme-comparator/src/org/oscim/theme/comparator/vtm/MapAdapter.java +++ b/vtm-theme-comparator/src/org/oscim/theme/comparator/vtm/MapAdapter.java @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; public class MapAdapter extends Map implements Map.UpdateListener { - private final static Logger log = LoggerFactory.getLogger(MapAdapter.class); + private static final Logger log = LoggerFactory.getLogger(MapAdapter.class); MapAdapter() { super(); diff --git a/vtm-web-app/src/org/oscim/web/client/SearchBox.java b/vtm-web-app/src/org/oscim/web/client/SearchBox.java index eb80e520..0f6eb2d0 100644 --- a/vtm-web-app/src/org/oscim/web/client/SearchBox.java +++ b/vtm-web-app/src/org/oscim/web/client/SearchBox.java @@ -82,18 +82,18 @@ public class SearchBox { BoundingBox getBoundingBox(); } - final static class NominatimData extends JavaScriptObject implements + static final class NominatimData extends JavaScriptObject implements PoiData { protected NominatimData() { } - final static class BBox extends JsArrayNumber { + static final class BBox extends JsArrayNumber { protected BBox() { } } - final static class Polygon extends JsArray { + static final class Polygon extends JsArray { protected Polygon() { } diff --git a/vtm-web-app/src/org/oscim/web/client/WKTReader.java b/vtm-web-app/src/org/oscim/web/client/WKTReader.java index 7e187477..6c4cd82c 100644 --- a/vtm-web-app/src/org/oscim/web/client/WKTReader.java +++ b/vtm-web-app/src/org/oscim/web/client/WKTReader.java @@ -19,15 +19,15 @@ package org.oscim.web.client; import org.oscim.core.GeometryBuffer; public class WKTReader { - private final static String POINT = "POINT"; - private final static String LINE = "LINESTRING"; - private final static String POLY = "POLYGON"; - private final static String MULTI = "MULTI"; + private static final String POINT = "POINT"; + private static final String LINE = "LINESTRING"; + private static final String POLY = "POLYGON"; + private static final String MULTI = "MULTI"; - private final static int SKIP_POINT = POINT.length(); - private final static int SKIP_LINE = LINE.length(); - private final static int SKIP_POLY = POLY.length(); - private final static int SKIP_MULTI = MULTI.length(); + private static final int SKIP_POINT = POINT.length(); + private static final int SKIP_LINE = LINE.length(); + private static final int SKIP_POLY = POLY.length(); + private static final int SKIP_MULTI = MULTI.length(); public void parse(String wkt, GeometryBuffer geom) throws Exception { // return position. diff --git a/vtm-web/src/org/oscim/gdx/emu/org/oscim/layers/tile/TileLoader.java b/vtm-web/src/org/oscim/gdx/emu/org/oscim/layers/tile/TileLoader.java index 34e91a5a..a50b1b81 100644 --- a/vtm-web/src/org/oscim/gdx/emu/org/oscim/layers/tile/TileLoader.java +++ b/vtm-web/src/org/oscim/gdx/emu/org/oscim/layers/tile/TileLoader.java @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; import static org.oscim.tiling.QueryResult.FAILED; public abstract class TileLoader implements ITileDataSink { - final static Logger log = LoggerFactory.getLogger(TileLoader.class); + static final Logger log = LoggerFactory.getLogger(TileLoader.class); private final TileManager mTileManager; private Timer mTimer; diff --git a/vtm-web/src/org/oscim/gdx/emu/org/oscim/renderer/GLMatrix.java b/vtm-web/src/org/oscim/gdx/emu/org/oscim/renderer/GLMatrix.java index 4a5ff3e5..52b0acb4 100644 --- a/vtm-web/src/org/oscim/gdx/emu/org/oscim/renderer/GLMatrix.java +++ b/vtm-web/src/org/oscim/gdx/emu/org/oscim/renderer/GLMatrix.java @@ -46,7 +46,7 @@ public class GLMatrix { .order(ByteOrder.nativeOrder()) .asFloatBuffer(); - private final static String INVALID_INPUT = "Bad Array!"; + private static final String INVALID_INPUT = "Bad Array!"; public final float tmp[] = new float[16]; public final float val[] = new float[16]; diff --git a/vtm-web/src/org/oscim/tiling/source/geojson/GeoJsonTileDecoder.java b/vtm-web/src/org/oscim/tiling/source/geojson/GeoJsonTileDecoder.java index 01cc3b3e..a4558584 100644 --- a/vtm-web/src/org/oscim/tiling/source/geojson/GeoJsonTileDecoder.java +++ b/vtm-web/src/org/oscim/tiling/source/geojson/GeoJsonTileDecoder.java @@ -47,7 +47,7 @@ public class GeoJsonTileDecoder implements ITileDecoder { mapElement.layer = 5; } - final static LinkedHashMap mProperties = new LinkedHashMap(10); + static final LinkedHashMap mProperties = new LinkedHashMap(10); double mTileY, mTileX, mTileScale; diff --git a/vtm/src/org/oscim/backend/GLAdapter.java b/vtm/src/org/oscim/backend/GLAdapter.java index 46e4ad04..9c61760b 100644 --- a/vtm/src/org/oscim/backend/GLAdapter.java +++ b/vtm/src/org/oscim/backend/GLAdapter.java @@ -21,8 +21,8 @@ import org.oscim.layers.tile.buildings.BuildingLayer; public class GLAdapter { - public final static boolean debug = false; - public final static boolean debugView = false; + public static final boolean debug = false; + public static final boolean debugView = false; /** * The instance provided by backend diff --git a/vtm/src/org/oscim/core/GeometryBuffer.java b/vtm/src/org/oscim/core/GeometryBuffer.java index cb4a39ec..a3ef42dc 100644 --- a/vtm/src/org/oscim/core/GeometryBuffer.java +++ b/vtm/src/org/oscim/core/GeometryBuffer.java @@ -37,8 +37,8 @@ import java.util.Arrays; */ public class GeometryBuffer { - private final static int GROW_INDICES = 64; - private final static int GROW_POINTS = 512; + private static final int GROW_INDICES = 64; + private static final int GROW_POINTS = 512; /** * The Enum GeometryType. diff --git a/vtm/src/org/oscim/layers/PathLayer.java b/vtm/src/org/oscim/layers/PathLayer.java index b5ede4b6..5c0101e9 100644 --- a/vtm/src/org/oscim/layers/PathLayer.java +++ b/vtm/src/org/oscim/layers/PathLayer.java @@ -256,7 +256,7 @@ public class PathLayer extends Layer implements GestureListener { } } - final static class Task { + static final class Task { final RenderBuckets buckets = new RenderBuckets(); final MapPosition position = new MapPosition(); } diff --git a/vtm/src/org/oscim/layers/marker/MarkerRenderer.java b/vtm/src/org/oscim/layers/marker/MarkerRenderer.java index 463d75e7..34210d6f 100644 --- a/vtm/src/org/oscim/layers/marker/MarkerRenderer.java +++ b/vtm/src/org/oscim/layers/marker/MarkerRenderer.java @@ -196,7 +196,7 @@ public class MarkerRenderer extends BucketRenderer { ZSORT.doSort(a, zComparator, lo, hi); } - final static Comparator zComparator = new Comparator() { + static final Comparator zComparator = new Comparator() { @Override public int compare(InternalItem a, InternalItem b) { if (a.visible && b.visible) { diff --git a/vtm/src/org/oscim/layers/tile/MapTile.java b/vtm/src/org/oscim/layers/tile/MapTile.java index d6b386c0..84913b57 100644 --- a/vtm/src/org/oscim/layers/tile/MapTile.java +++ b/vtm/src/org/oscim/layers/tile/MapTile.java @@ -49,45 +49,45 @@ public class MapTile extends Tile { } public static final class State { - public final static byte NONE = (1 << 0); + public static final byte NONE = (1 << 0); /** * STATE_LOADING means the tile is about to be loaded / loading. * Tile belongs to TileLoader thread. */ - public final static byte LOADING = (1 << 1); + public static final byte LOADING = (1 << 1); /** * STATE_NEW_DATA: tile data is prepared for rendering. * While 'locked' it belongs to GL Thread. */ - public final static byte NEW_DATA = (1 << 2); + public static final byte NEW_DATA = (1 << 2); /** * STATE_READY: tile data is uploaded to GL. * While 'locked' it belongs to GL Thread. */ - public final static byte READY = (1 << 3); + public static final byte READY = (1 << 3); /** * STATE_CANCEL: tile is removed from TileManager, * but may still be processed by TileLoader. */ - public final static byte CANCEL = (1 << 4); + public static final byte CANCEL = (1 << 4); /** * Dont touch if you find some. */ - public final static byte DEADBEEF = (1 << 6); + public static final byte DEADBEEF = (1 << 6); } - public final static int PROXY_CHILD00 = (1 << 0); - public final static int PROXY_CHILD01 = (1 << 1); - public final static int PROXY_CHILD10 = (1 << 2); - public final static int PROXY_CHILD11 = (1 << 3); - public final static int PROXY_PARENT = (1 << 4); - public final static int PROXY_GRAMPA = (1 << 5); - public final static int PROXY_HOLDER = (1 << 6); + public static final int PROXY_CHILD00 = (1 << 0); + public static final int PROXY_CHILD01 = (1 << 1); + public static final int PROXY_CHILD10 = (1 << 2); + public static final int PROXY_CHILD11 = (1 << 3); + public static final int PROXY_PARENT = (1 << 4); + public static final int PROXY_GRAMPA = (1 << 5); + public static final int PROXY_HOLDER = (1 << 6); /** * Tile state diff --git a/vtm/src/org/oscim/layers/tile/TileDistanceSort.java b/vtm/src/org/oscim/layers/tile/TileDistanceSort.java index 33c76708..d6cd7ba4 100644 --- a/vtm/src/org/oscim/layers/tile/TileDistanceSort.java +++ b/vtm/src/org/oscim/layers/tile/TileDistanceSort.java @@ -39,7 +39,7 @@ public class TileDistanceSort extends TimSort { } } - final static Comparator DistanceComparator = new Comparator() { + static final Comparator DistanceComparator = new Comparator() { @Override public int compare(MapTile a, MapTile b) { if (a == null) { diff --git a/vtm/src/org/oscim/layers/tile/TileManager.java b/vtm/src/org/oscim/layers/tile/TileManager.java index 7dabfe74..8a99a0b0 100644 --- a/vtm/src/org/oscim/layers/tile/TileManager.java +++ b/vtm/src/org/oscim/layers/tile/TileManager.java @@ -50,8 +50,8 @@ public class TileManager { static final Logger log = LoggerFactory.getLogger(TileManager.class); static final boolean dbg = false; - public final static Event TILE_LOADED = new Event(); - public final static Event TILE_REMOVED = new Event(); + public static final Event TILE_LOADED = new Event(); + public static final Event TILE_REMOVED = new Event(); private final int mCacheLimit; private int mCacheReduce; diff --git a/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java b/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java index 57fd98d1..8e94a780 100644 --- a/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java +++ b/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java @@ -35,7 +35,7 @@ public class BitmapTileLayer extends TileLayer { protected static final Logger log = LoggerFactory.getLogger(BitmapTileLayer.class); - private final static int CACHE_LIMIT = 40; + private static final int CACHE_LIMIT = 40; protected final TileSource mTileSource; private float mBitmapAlpha = 1.0f; @@ -144,7 +144,7 @@ public class BitmapTileLayer extends TileLayer { pool.clear(); } - final static int POOL_FILL = 20; + static final int POOL_FILL = 20; /** * pool shared by TextLayers diff --git a/vtm/src/org/oscim/layers/tile/buildings/BuildingLayer.java b/vtm/src/org/oscim/layers/tile/buildings/BuildingLayer.java index cf4cb8ec..b799a9c8 100644 --- a/vtm/src/org/oscim/layers/tile/buildings/BuildingLayer.java +++ b/vtm/src/org/oscim/layers/tile/buildings/BuildingLayer.java @@ -43,9 +43,9 @@ import java.util.Set; public class BuildingLayer extends Layer implements TileLoaderThemeHook, ZoomLimiter.IZoomLimiter { - protected final static int BUILDING_LEVEL_HEIGHT = 280; // cm + protected static final int BUILDING_LEVEL_HEIGHT = 280; // cm - public final static int MIN_ZOOM = 17; + public static final int MIN_ZOOM = 17; /** * Use Fast Approximate Anti-Aliasing (FXAA) and Screen Space Ambient Occlusion (SSAO). diff --git a/vtm/src/org/oscim/layers/tile/buildings/S3DBTileLayer.java b/vtm/src/org/oscim/layers/tile/buildings/S3DBTileLayer.java index 77f9ba47..afc3078f 100644 --- a/vtm/src/org/oscim/layers/tile/buildings/S3DBTileLayer.java +++ b/vtm/src/org/oscim/layers/tile/buildings/S3DBTileLayer.java @@ -29,10 +29,10 @@ import org.oscim.tiling.TileSource; public class S3DBTileLayer extends TileLayer { - private final static int MAX_CACHE = 32; + private static final int MAX_CACHE = 32; - private final static int MIN_ZOOM = 16; - private final static int MAX_ZOOM = 16; + private static final int MIN_ZOOM = 16; + private static final int MAX_ZOOM = 16; private final TileSource mTileSource; diff --git a/vtm/src/org/oscim/layers/tile/buildings/S3DBUtils.java b/vtm/src/org/oscim/layers/tile/buildings/S3DBUtils.java index ca115709..5d5ef2bf 100644 --- a/vtm/src/org/oscim/layers/tile/buildings/S3DBUtils.java +++ b/vtm/src/org/oscim/layers/tile/buildings/S3DBUtils.java @@ -43,8 +43,8 @@ public final class S3DBUtils { private static final Logger log = LoggerFactory.getLogger(S3DBUtils.class); /* TODO get from theme */ - private final static double HSV_S = 0.7; - private final static double HSV_V = 1.2; + private static final double HSV_S = 0.7; + private static final double HSV_V = 1.2; // Toggle this to debug and improve ridge calculation, you can see the faults in map then. private static final boolean IMPROVE_RIDGE_CALCULATION = false; diff --git a/vtm/src/org/oscim/layers/tile/vector/labeling/Debug.java b/vtm/src/org/oscim/layers/tile/vector/labeling/Debug.java index 7bb583ea..d510493c 100644 --- a/vtm/src/org/oscim/layers/tile/vector/labeling/Debug.java +++ b/vtm/src/org/oscim/layers/tile/vector/labeling/Debug.java @@ -26,7 +26,7 @@ import org.oscim.theme.styles.LineStyle; class Debug { - private final static float[] mDebugPoints = new float[8]; + private static final float[] mDebugPoints = new float[8]; // TODO Auto-generated method stub static RenderBuckets dbg; diff --git a/vtm/src/org/oscim/layers/tile/vector/labeling/LabelPlacement.java b/vtm/src/org/oscim/layers/tile/vector/labeling/LabelPlacement.java index 493afd5b..0d96f4dd 100644 --- a/vtm/src/org/oscim/layers/tile/vector/labeling/LabelPlacement.java +++ b/vtm/src/org/oscim/layers/tile/vector/labeling/LabelPlacement.java @@ -45,12 +45,12 @@ public class LabelPlacement { static final boolean dbg = false; static final Logger log = LoggerFactory.getLogger(LabelPlacement.class); - public final static LabelTileData getLabels(MapTile tile) { + public static final LabelTileData getLabels(MapTile tile) { return (LabelTileData) tile.getData(LabelLayer.LABEL_DATA); } - private final static float MIN_CAPTION_DIST = 5; - private final static float MIN_WAY_DIST = 3; + private static final float MIN_CAPTION_DIST = 5; + private static final float MIN_WAY_DIST = 3; /** * thread local pool of for unused label items diff --git a/vtm/src/org/oscim/layers/tile/vector/labeling/LabelTileLoaderHook.java b/vtm/src/org/oscim/layers/tile/vector/labeling/LabelTileLoaderHook.java index 8d1ef20c..bc94e270 100644 --- a/vtm/src/org/oscim/layers/tile/vector/labeling/LabelTileLoaderHook.java +++ b/vtm/src/org/oscim/layers/tile/vector/labeling/LabelTileLoaderHook.java @@ -39,7 +39,7 @@ import static org.oscim.layers.tile.vector.labeling.LabelLayer.LABEL_DATA; public class LabelTileLoaderHook implements TileLoaderThemeHook { - //public final static LabelTileData EMPTY = new LabelTileData(); + //public static final LabelTileData EMPTY = new LabelTileData(); private LabelTileData get(MapTile tile) { // FIXME could be 'this'.. diff --git a/vtm/src/org/oscim/layers/vector/AbstractVectorLayer.java b/vtm/src/org/oscim/layers/vector/AbstractVectorLayer.java index d4fa298d..6dc5fda8 100644 --- a/vtm/src/org/oscim/layers/vector/AbstractVectorLayer.java +++ b/vtm/src/org/oscim/layers/vector/AbstractVectorLayer.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; public abstract class AbstractVectorLayer extends Layer implements UpdateListener { public static final Logger log = LoggerFactory.getLogger(AbstractVectorLayer.class); - protected final static double UNSCALE_COORD = 4; + protected static final double UNSCALE_COORD = 4; // limit coords to maximum resolution of GL.Short private static final int MAX_CLIP = (int) (Short.MAX_VALUE / MapRenderer.COORD_SCALE); diff --git a/vtm/src/org/oscim/map/Animator.java b/vtm/src/org/oscim/map/Animator.java index 6aadaf5b..2cefa100 100644 --- a/vtm/src/org/oscim/map/Animator.java +++ b/vtm/src/org/oscim/map/Animator.java @@ -41,12 +41,12 @@ import static org.oscim.utils.FastMath.clamp; public class Animator { static final Logger log = LoggerFactory.getLogger(Animator.class); - public final static int ANIM_NONE = 0; - public final static int ANIM_MOVE = 1 << 0; - public final static int ANIM_SCALE = 1 << 1; - public final static int ANIM_ROTATE = 1 << 2; - public final static int ANIM_TILT = 1 << 3; - public final static int ANIM_FLING = 1 << 4; + public static final int ANIM_NONE = 0; + public static final int ANIM_MOVE = 1 << 0; + public static final int ANIM_SCALE = 1 << 1; + public static final int ANIM_ROTATE = 1 << 2; + public static final int ANIM_TILT = 1 << 3; + public static final int ANIM_FLING = 1 << 4; final Map mMap; diff --git a/vtm/src/org/oscim/map/Animator2.java b/vtm/src/org/oscim/map/Animator2.java index eb37740e..1ac0f9ab 100644 --- a/vtm/src/org/oscim/map/Animator2.java +++ b/vtm/src/org/oscim/map/Animator2.java @@ -36,7 +36,7 @@ import static org.oscim.utils.FastMath.clamp; public class Animator2 extends Animator { private static final Logger log = LoggerFactory.getLogger(Animator2.class); - private final static int ANIM_KINETIC = 1 << 5; + private static final int ANIM_KINETIC = 1 << 5; /** * The minimum changes that are pleasant for users. diff --git a/vtm/src/org/oscim/map/Viewport.java b/vtm/src/org/oscim/map/Viewport.java index 5b9694df..8e54b603 100644 --- a/vtm/src/org/oscim/map/Viewport.java +++ b/vtm/src/org/oscim/map/Viewport.java @@ -39,12 +39,12 @@ import org.oscim.utils.FastMath; */ public class Viewport { - public final static int MAX_ZOOM_LEVEL = 20; - public final static int MIN_ZOOM_LEVEL = 2; - public final static float MIN_TILT = 0; + public static final int MAX_ZOOM_LEVEL = 20; + public static final int MIN_ZOOM_LEVEL = 2; + public static final float MIN_TILT = 0; /* Note: limited by numTiles in TileManager to ~80° */ - public final static float MAX_TILT = 65; + public static final float MAX_TILT = 65; protected double mMaxScale = (1 << MAX_ZOOM_LEVEL); protected double mMinScale = (1 << MIN_ZOOM_LEVEL); @@ -82,13 +82,13 @@ public class Viewport { protected float mHeight, mWidth; - public final static float VIEW_DISTANCE = 3.0f; - public final static float VIEW_NEAR = 1; - public final static float VIEW_FAR = 8; + public static final float VIEW_DISTANCE = 3.0f; + public static final float VIEW_NEAR = 1; + public static final float VIEW_FAR = 8; /** * scale map plane at VIEW_DISTANCE to near plane */ - public final static float VIEW_SCALE = (VIEW_NEAR / VIEW_DISTANCE) * 0.5f; + public static final float VIEW_SCALE = (VIEW_NEAR / VIEW_DISTANCE) * 0.5f; public Viewport() { mPos.scale = mMinScale; diff --git a/vtm/src/org/oscim/renderer/BufferObject.java b/vtm/src/org/oscim/renderer/BufferObject.java index 373e76d5..3c30a750 100644 --- a/vtm/src/org/oscim/renderer/BufferObject.java +++ b/vtm/src/org/oscim/renderer/BufferObject.java @@ -102,8 +102,8 @@ public final class BufferObject extends Inlist { log.debug("now: " + mBufferMemoryUsage / MB + "MB"); } - private final static BufferObject pool[] = new BufferObject[2]; - private final static int counter[] = new int[2]; + private static final BufferObject pool[] = new BufferObject[2]; + private static final int counter[] = new int[2]; /** * @param target can be GL20.ARRAY_BUFFER or GL20.ELEMENT_ARRAY_BUFFER diff --git a/vtm/src/org/oscim/renderer/GLMatrix.java b/vtm/src/org/oscim/renderer/GLMatrix.java index 83ba3a65..a77d5c5a 100644 --- a/vtm/src/org/oscim/renderer/GLMatrix.java +++ b/vtm/src/org/oscim/renderer/GLMatrix.java @@ -28,12 +28,12 @@ import static org.oscim.backend.GLAdapter.gl; public class GLMatrix { static final Logger log = LoggerFactory.getLogger(GLMatrix.class); - private final static boolean dbg = false; + private static final boolean dbg = false; private final long pointer; private final FloatBuffer buffer; - private final static String INVALID_INPUT = "Bad Array!"; + private static final String INVALID_INPUT = "Bad Array!"; public GLMatrix() { pointer = alloc(); diff --git a/vtm/src/org/oscim/renderer/GLShader.java b/vtm/src/org/oscim/renderer/GLShader.java index d9c06c48..cb76fd05 100644 --- a/vtm/src/org/oscim/renderer/GLShader.java +++ b/vtm/src/org/oscim/renderer/GLShader.java @@ -28,7 +28,7 @@ import java.nio.IntBuffer; import static org.oscim.backend.GLAdapter.gl; public abstract class GLShader { - final static Logger log = LoggerFactory.getLogger(GLShader.class); + static final Logger log = LoggerFactory.getLogger(GLShader.class); public int program; diff --git a/vtm/src/org/oscim/renderer/GLState.java b/vtm/src/org/oscim/renderer/GLState.java index 60c57c1d..c41beb76 100644 --- a/vtm/src/org/oscim/renderer/GLState.java +++ b/vtm/src/org/oscim/renderer/GLState.java @@ -28,10 +28,10 @@ import static org.oscim.backend.GLAdapter.gl; public class GLState { static final Logger log = LoggerFactory.getLogger(GLState.class); - public final static int DISABLED = -1; - public final static int UNBIND = 0; + public static final int DISABLED = -1; + public static final int UNBIND = 0; - private final static boolean[] vertexArray = {false, false}; + private static final boolean[] vertexArray = {false, false}; private static boolean blend = false; private static boolean depth = false; private static boolean stencil = false; diff --git a/vtm/src/org/oscim/renderer/LocationTextureRenderer.java b/vtm/src/org/oscim/renderer/LocationTextureRenderer.java index 87bef4d9..80a3c3cf 100644 --- a/vtm/src/org/oscim/renderer/LocationTextureRenderer.java +++ b/vtm/src/org/oscim/renderer/LocationTextureRenderer.java @@ -43,7 +43,7 @@ public class LocationTextureRenderer extends BucketRenderer { private static final int SHOW_ACCURACY_ZOOM = 13; private static final boolean IS_MAC = System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("mac"); - private final static String V_SHADER = ("" + private static final String V_SHADER = ("" + "precision highp float;" + "uniform mat4 u_mvp;" + "uniform float u_phase;" diff --git a/vtm/src/org/oscim/renderer/MapRenderer.java b/vtm/src/org/oscim/renderer/MapRenderer.java index c2e0840f..749af542 100644 --- a/vtm/src/org/oscim/renderer/MapRenderer.java +++ b/vtm/src/org/oscim/renderer/MapRenderer.java @@ -52,11 +52,11 @@ public class MapRenderer { /** * Number of Quads that can be rendered with bindQuadIndicesVBO() */ - public final static int MAX_QUADS = 512; + public static final int MAX_QUADS = 512; /** * Number of Indices that can be rendered with bindQuadIndicesVBO() */ - public final static int MAX_INDICES = MAX_QUADS * 6; + public static final int MAX_INDICES = MAX_QUADS * 6; public static long frametime; private static boolean rerender; diff --git a/vtm/src/org/oscim/renderer/OffscreenRenderer.java b/vtm/src/org/oscim/renderer/OffscreenRenderer.java index 8a7791d2..dd3f4a0f 100644 --- a/vtm/src/org/oscim/renderer/OffscreenRenderer.java +++ b/vtm/src/org/oscim/renderer/OffscreenRenderer.java @@ -9,7 +9,7 @@ import java.nio.IntBuffer; import static org.oscim.backend.GLAdapter.gl; public class OffscreenRenderer extends LayerRenderer { - final static Logger log = LoggerFactory.getLogger(OffscreenRenderer.class); + static final Logger log = LoggerFactory.getLogger(OffscreenRenderer.class); public enum Mode { FXAA, // Fast Approximate Anti-Aliasing diff --git a/vtm/src/org/oscim/renderer/bucket/BitmapBucket.java b/vtm/src/org/oscim/renderer/bucket/BitmapBucket.java index e48aedfe..440b8923 100644 --- a/vtm/src/org/oscim/renderer/bucket/BitmapBucket.java +++ b/vtm/src/org/oscim/renderer/bucket/BitmapBucket.java @@ -187,9 +187,9 @@ public class BitmapBucket extends TextureBucket { public static final class Renderer { - public final static int INDICES_PER_SPRITE = 6; - final static int VERTICES_PER_SPRITE = 4; - final static int SHORTS_PER_VERTICE = 6; + public static final int INDICES_PER_SPRITE = 6; + static final int VERTICES_PER_SPRITE = 4; + static final int SHORTS_PER_VERTICE = 6; static Shader shader; static void init() { diff --git a/vtm/src/org/oscim/renderer/bucket/ExtrusionBucket.java b/vtm/src/org/oscim/renderer/bucket/ExtrusionBucket.java index 7026b8bc..dfd16937 100644 --- a/vtm/src/org/oscim/renderer/bucket/ExtrusionBucket.java +++ b/vtm/src/org/oscim/renderer/bucket/ExtrusionBucket.java @@ -56,13 +56,13 @@ public class ExtrusionBucket extends RenderBucket { */ public int off[] = {0, 0, 0, 0, 0}; - //private final static int IND_EVEN_SIDE = 0; - //private final static int IND_ODD_SIDE = 1; - private final static int IND_ROOF = 2; + //private static final int IND_EVEN_SIDE = 0; + //private static final int IND_ODD_SIDE = 1; + private static final int IND_ROOF = 2; // FIXME flip OUTLINE / MESH! - private final static int IND_OUTLINE = 3; - private final static int IND_MESH = 4; + private static final int IND_OUTLINE = 3; + private static final int IND_MESH = 4; private final float mGroundResolution; diff --git a/vtm/src/org/oscim/renderer/bucket/LineBucket.java b/vtm/src/org/oscim/renderer/bucket/LineBucket.java index e8304fdd..ca0a76d4 100644 --- a/vtm/src/org/oscim/renderer/bucket/LineBucket.java +++ b/vtm/src/org/oscim/renderer/bucket/LineBucket.java @@ -535,15 +535,15 @@ public class LineBucket extends RenderBucket { * http://http.developer.nvidia.com/GPUGems2/gpugems2_chapter22.html */ /* factor to normalize extrusion vector and scale to coord scale */ - private final static float COORD_SCALE_BY_DIR_SCALE = + private static final float COORD_SCALE_BY_DIR_SCALE = COORD_SCALE / LineBucket.DIR_SCALE; - private final static int CAP_THIN = 0; - private final static int CAP_BUTT = 1; - private final static int CAP_ROUND = 2; + private static final int CAP_THIN = 0; + private static final int CAP_BUTT = 1; + private static final int CAP_ROUND = 2; - private final static int SHADER_FLAT = 1; - private final static int SHADER_PROJ = 0; + private static final int SHADER_FLAT = 1; + private static final int SHADER_PROJ = 0; public static int mTexID; private static Shader[] shaders = {null, null}; diff --git a/vtm/src/org/oscim/renderer/bucket/LineTexBucket.java b/vtm/src/org/oscim/renderer/bucket/LineTexBucket.java index 43691bc2..2a9c483f 100644 --- a/vtm/src/org/oscim/renderer/bucket/LineTexBucket.java +++ b/vtm/src/org/oscim/renderer/bucket/LineTexBucket.java @@ -264,11 +264,11 @@ public final class LineTexBucket extends LineBucket { } } - public final static class Renderer { + public static final class Renderer { private static Shader shader; /* factor to normalize extrusion vector and scale to coord scale */ - private final static float COORD_SCALE_BY_DIR_SCALE = + private static final float COORD_SCALE_BY_DIR_SCALE = COORD_SCALE / LineBucket.DIR_SCALE; private static int mVertexFlipID; @@ -342,10 +342,10 @@ public final class LineTexBucket extends LineBucket { } /* posX, posY, extrX, extrY, length, unused */ - private final static int STRIDE = 6 * RenderBuckets.SHORT_BYTES; + private static final int STRIDE = 6 * RenderBuckets.SHORT_BYTES; /* offset for line length, unused; skip first 4 units */ - private final static int LEN_OFFSET = 4 * RenderBuckets.SHORT_BYTES; + private static final int LEN_OFFSET = 4 * RenderBuckets.SHORT_BYTES; public static RenderBucket draw(RenderBucket b, GLViewport v, float div, RenderBuckets buckets) { diff --git a/vtm/src/org/oscim/renderer/bucket/PolygonBucket.java b/vtm/src/org/oscim/renderer/bucket/PolygonBucket.java index 47703894..df35e23a 100644 --- a/vtm/src/org/oscim/renderer/bucket/PolygonBucket.java +++ b/vtm/src/org/oscim/renderer/bucket/PolygonBucket.java @@ -48,9 +48,9 @@ public final class PolygonBucket extends RenderBucket { static final Logger log = LoggerFactory.getLogger(PolygonBucket.class); - public final static int CLIP_STENCIL = 1; - public final static int CLIP_DEPTH = 2; - public final static int CLIP_TEST_DEPTH = 3; + public static final int CLIP_STENCIL = 1; + public static final int CLIP_DEPTH = 2; + public static final int CLIP_TEST_DEPTH = 3; public static boolean enableTexture = true; @@ -157,7 +157,7 @@ public final class PolygonBucket extends RenderBucket { public static final class Renderer { private static final int STENCIL_BITS = 8; - public final static int CLIP_BIT = 0x80; + public static final int CLIP_BIT = 0x80; private static PolygonBucket[] mAreaLayer; diff --git a/vtm/src/org/oscim/renderer/bucket/RenderBucket.java b/vtm/src/org/oscim/renderer/bucket/RenderBucket.java index 3ed28332..41b991d8 100644 --- a/vtm/src/org/oscim/renderer/bucket/RenderBucket.java +++ b/vtm/src/org/oscim/renderer/bucket/RenderBucket.java @@ -53,7 +53,7 @@ public abstract class RenderBucket extends Inlist { protected final VertexData vertexItems; protected final VertexData indiceItems; - final static VertexData EMPTY = new VertexData(); + static final VertexData EMPTY = new VertexData(); final boolean quads; protected RenderBucket(byte type, boolean indexed, boolean quads) { diff --git a/vtm/src/org/oscim/renderer/bucket/RenderBuckets.java b/vtm/src/org/oscim/renderer/bucket/RenderBuckets.java index fd3813e1..a1f199b2 100644 --- a/vtm/src/org/oscim/renderer/bucket/RenderBuckets.java +++ b/vtm/src/org/oscim/renderer/bucket/RenderBuckets.java @@ -47,7 +47,7 @@ public class RenderBuckets extends TileData { static final Logger log = LoggerFactory.getLogger(RenderBuckets.class); /* Count of units needed for one vertex */ - public final static int[] VERTEX_CNT = { + public static final int[] VERTEX_CNT = { 4, // LINE_VERTEX 6, // TEXLINE_VERTEX 2, // POLY_VERTEX @@ -59,8 +59,8 @@ public class RenderBuckets extends TileData { 2, // CIRCLE }; - public final static int SHORT_BYTES = 2; - // public final static int INT_BYTES = 4; + public static final int SHORT_BYTES = 2; + // public static final int INT_BYTES = 4; private RenderBucket buckets; diff --git a/vtm/src/org/oscim/renderer/bucket/SymbolBucket.java b/vtm/src/org/oscim/renderer/bucket/SymbolBucket.java index 01c94db1..783b5d50 100755 --- a/vtm/src/org/oscim/renderer/bucket/SymbolBucket.java +++ b/vtm/src/org/oscim/renderer/bucket/SymbolBucket.java @@ -33,8 +33,8 @@ import static org.oscim.renderer.MapRenderer.COORD_SCALE; public final class SymbolBucket extends TextureBucket { static final Logger log = LoggerFactory.getLogger(SymbolBucket.class); - private final static int VERTICES_PER_SPRITE = 4; - private final static int LBIT_MASK = 0xfffffffe; + private static final int VERTICES_PER_SPRITE = 4; + private static final int LBIT_MASK = 0xfffffffe; private TextureItem prevTextures; private List mSymbols = new List(); diff --git a/vtm/src/org/oscim/renderer/bucket/SymbolItem.java b/vtm/src/org/oscim/renderer/bucket/SymbolItem.java index ec49c1e8..346590ba 100644 --- a/vtm/src/org/oscim/renderer/bucket/SymbolItem.java +++ b/vtm/src/org/oscim/renderer/bucket/SymbolItem.java @@ -26,7 +26,7 @@ import org.oscim.utils.pool.SyncPool; public class SymbolItem extends Inlist { - public final static SyncPool pool = new SyncPool(128) { + public static final SyncPool pool = new SyncPool(128) { @Override protected SymbolItem createItem() { diff --git a/vtm/src/org/oscim/renderer/bucket/TextBucket.java b/vtm/src/org/oscim/renderer/bucket/TextBucket.java index 6f37db96..d6cfe523 100644 --- a/vtm/src/org/oscim/renderer/bucket/TextBucket.java +++ b/vtm/src/org/oscim/renderer/bucket/TextBucket.java @@ -26,7 +26,7 @@ import static org.oscim.renderer.MapRenderer.COORD_SCALE; public class TextBucket extends TextureBucket { static final Logger log = LoggerFactory.getLogger(TextBucket.class); - protected final static int LBIT_MASK = 0xfffffffe; + protected static final int LBIT_MASK = 0xfffffffe; protected static int mFontPadX = 1; //private static int mFontPadY = 1; diff --git a/vtm/src/org/oscim/renderer/bucket/TextItem.java b/vtm/src/org/oscim/renderer/bucket/TextItem.java index 3a3a8a12..550bc7fe 100644 --- a/vtm/src/org/oscim/renderer/bucket/TextItem.java +++ b/vtm/src/org/oscim/renderer/bucket/TextItem.java @@ -23,9 +23,9 @@ import org.oscim.utils.pool.SyncPool; public class TextItem extends Inlist { //static final Logger log = LoggerFactory.getLogger(TextItem.class); - private final static int MAX_POOL = 250; + private static final int MAX_POOL = 250; - public final static SyncPool pool = new SyncPool(MAX_POOL) { + public static final SyncPool pool = new SyncPool(MAX_POOL) { @Override protected TextItem createItem() { diff --git a/vtm/src/org/oscim/renderer/bucket/TextureBucket.java b/vtm/src/org/oscim/renderer/bucket/TextureBucket.java index c92e93aa..b4ecca36 100644 --- a/vtm/src/org/oscim/renderer/bucket/TextureBucket.java +++ b/vtm/src/org/oscim/renderer/bucket/TextureBucket.java @@ -36,18 +36,18 @@ public class TextureBucket extends RenderBucket { static final Logger log = LoggerFactory.getLogger(TextureBucket.class); - public final static int INDICES_PER_SPRITE = 6; - final static int VERTICES_PER_SPRITE = 4; - final static int SHORTS_PER_VERTICE = 6; + public static final int INDICES_PER_SPRITE = 6; + static final int VERTICES_PER_SPRITE = 4; + static final int SHORTS_PER_VERTICE = 6; - public final static int TEXTURE_HEIGHT = 256; - public final static int TEXTURE_WIDTH = 1024; - final static int POOL_FILL = 4; + public static final int TEXTURE_HEIGHT = 256; + public static final int TEXTURE_WIDTH = 1024; + static final int POOL_FILL = 4; /** * pool shared by TextLayers */ - public final static TexturePool pool = new TexturePool(POOL_FILL, + public static final TexturePool pool = new TexturePool(POOL_FILL, TEXTURE_WIDTH, TEXTURE_HEIGHT, false); diff --git a/vtm/src/org/oscim/renderer/bucket/TextureItem.java b/vtm/src/org/oscim/renderer/bucket/TextureItem.java index dbb4a68f..877692ef 100755 --- a/vtm/src/org/oscim/renderer/bucket/TextureItem.java +++ b/vtm/src/org/oscim/renderer/bucket/TextureItem.java @@ -340,8 +340,8 @@ public class TextureItem extends Inlist { /* Pool for not-pooled textures. Disposed items will only be released * on the GL-Thread and will not be put back in any pool. */ - final static TexturePool NOPOOL = new TexturePool(0); - final static ArrayList disposedTextures = new ArrayList(); + static final TexturePool NOPOOL = new TexturePool(0); + static final ArrayList disposedTextures = new ArrayList(); /** * Disposed textures are released by MapRenderer after each frame diff --git a/vtm/src/org/oscim/renderer/bucket/VertexData.java b/vtm/src/org/oscim/renderer/bucket/VertexData.java index 1bd931d0..9c4c9529 100644 --- a/vtm/src/org/oscim/renderer/bucket/VertexData.java +++ b/vtm/src/org/oscim/renderer/bucket/VertexData.java @@ -94,7 +94,7 @@ public class VertexData extends Inlist.List { return super.clear(); } - private final static Pool pool = new Pool(); + private static final Pool pool = new Pool(); public void dispose() { pool.releaseAll(super.clear()); diff --git a/vtm/src/org/oscim/theme/rule/Rule.java b/vtm/src/org/oscim/theme/rule/Rule.java index 15efe4d5..f03d80f5 100644 --- a/vtm/src/org/oscim/theme/rule/Rule.java +++ b/vtm/src/org/oscim/theme/rule/Rule.java @@ -45,8 +45,8 @@ public class Rule { public static final int WHEN_MATCHED = 1 << 1; } - public final static RenderStyle[] EMPTY_STYLE = new RenderStyle[0]; - public final static Rule[] EMPTY_RULES = new Rule[0]; + public static final RenderStyle[] EMPTY_STYLE = new RenderStyle[0]; + public static final Rule[] EMPTY_RULES = new Rule[0]; public final Rule[] subRules; public final RenderStyle[] styles; diff --git a/vtm/src/org/oscim/theme/rule/RuleBuilder.java b/vtm/src/org/oscim/theme/rule/RuleBuilder.java index 8faeb2ad..10dc910a 100644 --- a/vtm/src/org/oscim/theme/rule/RuleBuilder.java +++ b/vtm/src/org/oscim/theme/rule/RuleBuilder.java @@ -34,7 +34,7 @@ import java.util.List; public class RuleBuilder { - private final static String[] EMPTY_KV = {}; + private static final String[] EMPTY_KV = {}; public enum RuleType { POSITIVE, diff --git a/vtm/src/org/oscim/tiling/source/LwHttp.java b/vtm/src/org/oscim/tiling/source/LwHttp.java index 1001c211..66acf650 100644 --- a/vtm/src/org/oscim/tiling/source/LwHttp.java +++ b/vtm/src/org/oscim/tiling/source/LwHttp.java @@ -42,18 +42,18 @@ public class LwHttp implements HttpEngine { static final Logger log = LoggerFactory.getLogger(LwHttp.class); static final boolean dbg = false; - private final static byte[] HEADER_HTTP_OK = "200 OK".getBytes(); - private final static byte[] HEADER_CONTENT_LENGTH = "Content-Length".getBytes(); - private final static byte[] HEADER_CONNECTION_CLOSE = "Connection: close".getBytes(); - private final static byte[] HEADER_ENCODING_GZIP = "Content-Encoding: gzip".getBytes(); + private static final byte[] HEADER_HTTP_OK = "200 OK".getBytes(); + private static final byte[] HEADER_CONTENT_LENGTH = "Content-Length".getBytes(); + private static final byte[] HEADER_CONNECTION_CLOSE = "Connection: close".getBytes(); + private static final byte[] HEADER_ENCODING_GZIP = "Content-Encoding: gzip".getBytes(); - private final static int RESPONSE_EXPECTED_LIVES = 100; - private final static long RESPONSE_TIMEOUT = (long) 10E9; // 10 second in nanosecond + private static final int RESPONSE_EXPECTED_LIVES = 100; + private static final long RESPONSE_TIMEOUT = (long) 10E9; // 10 second in nanosecond - private final static int CONNECT_TIMEOUT = 15000; // 15 seconds - private final static int SOCKET_TIMEOUT = 8000; // 8 seconds + private static final int CONNECT_TIMEOUT = 15000; // 15 seconds + private static final int SOCKET_TIMEOUT = 8000; // 8 seconds - private final static int BUFFER_SIZE = 8192; + private static final int BUFFER_SIZE = 8192; private final byte[] buffer = new byte[BUFFER_SIZE]; private final String mHost; diff --git a/vtm/src/org/oscim/tiling/source/PbfDecoder.java b/vtm/src/org/oscim/tiling/source/PbfDecoder.java index 34574065..bcf47d05 100644 --- a/vtm/src/org/oscim/tiling/source/PbfDecoder.java +++ b/vtm/src/org/oscim/tiling/source/PbfDecoder.java @@ -27,15 +27,15 @@ import java.io.InputStream; public abstract class PbfDecoder implements ITileDecoder { static final Logger log = LoggerFactory.getLogger(PbfDecoder.class); - private final static int S1 = 7; - private final static int S2 = 14; - private final static int S3 = 21; - private final static int S4 = 28; + private static final int S1 = 7; + private static final int S2 = 14; + private static final int S3 = 21; + private static final int S4 = 28; - private final static int M1 = (1 << S1) - 1; - private final static int M2 = (1 << S2) - 1; - private final static int M3 = (1 << S3) - 1; - private final static int M4 = (1 << S4) - 1; + private static final int M1 = (1 << S1) - 1; + private static final int M2 = (1 << S2) - 1; + private static final int M3 = (1 << S3) - 1; + private static final int M4 = (1 << S4) - 1; protected static final boolean debug = false; @@ -47,20 +47,20 @@ public abstract class PbfDecoder implements ITileDecoder { } } - final static ProtobufException TRUNCATED_MSG = + static final ProtobufException TRUNCATED_MSG = new ProtobufException("truncated msg"); - protected final static ProtobufException INVALID_VARINT = + protected static final ProtobufException INVALID_VARINT = new ProtobufException("invalid varint"); - protected final static ProtobufException INVALID_PACKED_SIZE = + protected static final ProtobufException INVALID_PACKED_SIZE = new ProtobufException("invalid message size"); protected void error(String msg) throws IOException { throw new ProtobufException(msg); } - private final static int BUFFER_SIZE = 1 << 15; // 32kb + private static final int BUFFER_SIZE = 1 << 15; // 32kb protected byte[] buffer = new byte[BUFFER_SIZE]; // position in buffer diff --git a/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java b/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java index 4a9a1583..f5675ec0 100644 --- a/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java +++ b/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java @@ -460,7 +460,7 @@ public class MapDatabase implements ITileDataSource { mTileSeparator.setRect(xSmin, ySmin, xSmax, ySmax); } - //private final static Tag mWaterTag = new Tag("natural", "water"); + //private static final Tag mWaterTag = new Tag("natural", "water"); /** * Map rendering. diff --git a/vtm/src/org/oscim/tiling/source/mvt/TileDecoder.java b/vtm/src/org/oscim/tiling/source/mvt/TileDecoder.java index acdaf198..1190aa42 100644 --- a/vtm/src/org/oscim/tiling/source/mvt/TileDecoder.java +++ b/vtm/src/org/oscim/tiling/source/mvt/TileDecoder.java @@ -70,7 +70,7 @@ public class TileDecoder extends PbfDecoder { private final String mLocale; private ITileDataSink mMapDataCallback; - private final static float REF_TILE_SIZE = 4096.0f; + private static final float REF_TILE_SIZE = 4096.0f; private float mScale; public TileDecoder() { @@ -399,9 +399,9 @@ public class TileDecoder extends PbfDecoder { } } - private final static int CLOSE_PATH = 0x07; - private final static int MOVE_TO = 0x01; - private final static int LINE_TO = 0x02; + private static final int CLOSE_PATH = 0x07; + private static final int MOVE_TO = 0x01; + private static final int LINE_TO = 0x02; private int lastX, lastY; diff --git a/vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java b/vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java index 0fa288bc..20b95d66 100644 --- a/vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java +++ b/vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java @@ -24,8 +24,8 @@ import org.oscim.tiling.source.UrlTileSource; public class OSciMap4TileSource extends UrlTileSource { - private final static String DEFAULT_URL = "http://opensciencemap.org/tiles/vtm"; - private final static String DEFAULT_PATH = "/{Z}/{X}/{Y}.vtm"; + private static final String DEFAULT_URL = "http://opensciencemap.org/tiles/vtm"; + private static final String DEFAULT_PATH = "/{Z}/{X}/{Y}.vtm"; public static class Builder> extends UrlTileSource.Builder { diff --git a/vtm/src/org/oscim/tiling/source/oscimap4/Tags.java b/vtm/src/org/oscim/tiling/source/oscimap4/Tags.java index dfe1b0ed..1a268547 100644 --- a/vtm/src/org/oscim/tiling/source/oscimap4/Tags.java +++ b/vtm/src/org/oscim/tiling/source/oscimap4/Tags.java @@ -19,10 +19,10 @@ package org.oscim.tiling.source.oscimap4; public class Tags { // TODO this should be retrieved from tile 0/0/0 - public final static int ATTRIB_OFFSET = 256; + public static final int ATTRIB_OFFSET = 256; // the keys that were imported via osm2pgsql + some more - public final static String[] keys = { + public static final String[] keys = { "access", "addr:housename", "addr:housenumber", @@ -93,10 +93,10 @@ public class Tags { "roof:height", "rank" }; - public final static int MAX_KEY = keys.length - 1; + public static final int MAX_KEY = keys.length - 1; // most popular values for the selected key (created from taginfo db) - public final static String[] values = { + public static final String[] values = { "yes", "residential", "service", @@ -354,6 +354,6 @@ public class Tags { "florist", "butcher" }; - public final static int MAX_VALUE = values.length - 1; + public static final int MAX_VALUE = values.length - 1; } diff --git a/vtm/src/org/oscim/tiling/source/oscimap4/TileDecoder.java b/vtm/src/org/oscim/tiling/source/oscimap4/TileDecoder.java index 9c3e0565..c4ca3d81 100644 --- a/vtm/src/org/oscim/tiling/source/oscimap4/TileDecoder.java +++ b/vtm/src/org/oscim/tiling/source/oscimap4/TileDecoder.java @@ -78,7 +78,7 @@ public class TileDecoder extends PbfDecoder { private int mVersion; // scale coordinates to tile size - private final static float REF_TILE_SIZE = 4096.0f; + private static final float REF_TILE_SIZE = 4096.0f; private final float mScaleFactor = REF_TILE_SIZE / Tile.SIZE; public TileDecoder() { diff --git a/vtm/src/org/oscim/utils/ColorUtil.java b/vtm/src/org/oscim/utils/ColorUtil.java index e0976bac..b3f4e05b 100644 --- a/vtm/src/org/oscim/utils/ColorUtil.java +++ b/vtm/src/org/oscim/utils/ColorUtil.java @@ -10,7 +10,7 @@ import static org.oscim.utils.FastMath.clamp; public class ColorUtil { - private final static Vec3 TMP_VEC = new Vec3(); + private static final Vec3 TMP_VEC = new Vec3(); public static synchronized int desaturate(int color) { Vec3 hsl = TMP_VEC; diff --git a/vtm/src/org/oscim/utils/IOUtils.java b/vtm/src/org/oscim/utils/IOUtils.java index dd0496d9..9046cd11 100644 --- a/vtm/src/org/oscim/utils/IOUtils.java +++ b/vtm/src/org/oscim/utils/IOUtils.java @@ -27,7 +27,7 @@ import java.net.Socket; * A utility class with IO-specific helper methods. */ public final class IOUtils { - final static Logger log = LoggerFactory.getLogger(IOUtils.class); + static final Logger log = LoggerFactory.getLogger(IOUtils.class); /** * Invokes the {@link Closeable#close()} method on the given object. If an diff --git a/vtm/src/org/oscim/utils/PausableThread.java b/vtm/src/org/oscim/utils/PausableThread.java index 247e834c..24431895 100644 --- a/vtm/src/org/oscim/utils/PausableThread.java +++ b/vtm/src/org/oscim/utils/PausableThread.java @@ -24,8 +24,8 @@ import org.slf4j.LoggerFactory; * An abstract base class for threads which support pausing and resuming. */ public abstract class PausableThread extends Thread { - private final static Logger log = LoggerFactory.getLogger(PausableThread.class); - private final static boolean dbg = false; + private static final Logger log = LoggerFactory.getLogger(PausableThread.class); + private static final boolean dbg = false; private boolean mPausing = true; private boolean mRunning = true; diff --git a/vtm/src/org/oscim/utils/RTree.java b/vtm/src/org/oscim/utils/RTree.java index 3e926420..399c4dd6 100644 --- a/vtm/src/org/oscim/utils/RTree.java +++ b/vtm/src/org/oscim/utils/RTree.java @@ -45,10 +45,10 @@ public class RTree implements SpatialIndex, Iterable { static final Logger log = LoggerFactory.getLogger(RTree.class); - final static int MAXNODES = 8; - final static int MINNODES = 4; + static final int MAXNODES = 8; + static final int MINNODES = 4; - final static int NUMDIMS = 2; + static final int NUMDIMS = 2; static final boolean DEBUG = true; @@ -57,7 +57,7 @@ public class RTree implements SpatialIndex, Iterable { * The parents level determines this. * If the parents level is 0, then this is data */ - final static class Branch extends Rect { + static final class Branch extends Rect { /** * Child node or data item */ @@ -72,7 +72,7 @@ public class RTree implements SpatialIndex, Iterable { /** * Node for each branch level */ - final static class Node { + static final class Node { /** * Leaf is zero, others positive @@ -492,7 +492,7 @@ public class RTree implements SpatialIndex, Iterable { return null; } - final static double mergedArea(Rect a, Rect b) { + static final double mergedArea(Rect a, Rect b) { return ((a.xmax > b.xmax ? a.xmax : b.xmax) - (a.xmin < b.xmin ? a.xmin : b.xmin) * ((a.ymax > b.ymax ? a.ymax : b.ymax) - (a.ymin < b.ymin ? a.ymin : b.ymin))); } @@ -898,7 +898,7 @@ public class RTree implements SpatialIndex, Iterable { /* Max stack size. Allows almost n^32 where n is number of branches in * node */ - final static int MAX_STACK = 32; + static final int MAX_STACK = 32; static class StackElement { Node node; diff --git a/vtm/src/org/oscim/utils/geom/OBB2D.java b/vtm/src/org/oscim/utils/geom/OBB2D.java index f3fa80df..90344c31 100644 --- a/vtm/src/org/oscim/utils/geom/OBB2D.java +++ b/vtm/src/org/oscim/utils/geom/OBB2D.java @@ -36,14 +36,14 @@ public class OBB2D { return v[a] * v[b] + v[a + 1] * v[b + 1]; } - public final static float lengthSquared(float[] v, int pos) { + public static final float lengthSquared(float[] v, int pos) { float x = v[pos + 0]; float y = v[pos + 1]; return x * x + y * y; } - public final static void normalizeSquared(float[] v, int pos) { + public static final void normalizeSquared(float[] v, int pos) { float x = v[pos + 0]; float y = v[pos + 1]; @@ -53,7 +53,7 @@ public class OBB2D { v[pos + 1] = y / length; } - public final static void normalize(float[] v, int pos) { + public static final void normalize(float[] v, int pos) { float x = v[pos + 0]; float y = v[pos + 1]; @@ -63,24 +63,24 @@ public class OBB2D { v[pos + 1] = (float) (y / length); } - public final static float length(float[] v, int pos) { + public static final float length(float[] v, int pos) { float x = v[pos + 0]; float y = v[pos + 1]; return (float) Math.sqrt(x * x + y * y); } - public final static void add(float[] v, int r, int a, int b) { + public static final void add(float[] v, int r, int a, int b) { v[r + 0] = v[a + 0] + v[b + 0]; v[r + 1] = v[a + 1] + v[b + 1]; } - public final static void sub(float[] v, int r, int a, int b) { + public static final void sub(float[] v, int r, int a, int b) { v[r + 0] = v[a + 0] - v[b + 0]; v[r + 1] = v[a + 1] - v[b + 1]; } - public final static void mul(float[] v, int pos, float a) { + public static final void mul(float[] v, int pos, float a) { v[pos + 0] *= a; v[pos + 1] *= a; } @@ -93,20 +93,20 @@ public class OBB2D { // Corners of the box, where 0 is the lower left. //public final float[] corner = new float[ 4 * 2]; - private final static int CORNER_X = 0; - private final static int CORNER_Y = CORNER_X + 1; - private final static int CORNER_0 = CORNER_X; - private final static int CORNER_1 = CORNER_X + 2; - //private final static int CORNER_2 = CORNER_X + 4; - private final static int CORNER_3 = CORNER_X + 6; + private static final int CORNER_X = 0; + private static final int CORNER_Y = CORNER_X + 1; + private static final int CORNER_0 = CORNER_X; + private static final int CORNER_1 = CORNER_X + 2; + //private static final int CORNER_2 = CORNER_X + 4; + private static final int CORNER_3 = CORNER_X + 6; // Two edges of the box extended away from origin[CORNER_X + 0]. //public final float[] axis = new float[2 * 2]; - private final static int AXIS_X = 2 * 4; - private final static int AXIS_Y = AXIS_X + 1; + private static final int AXIS_X = 2 * 4; + private static final int AXIS_Y = AXIS_X + 1; - private final static int AXIS_1 = AXIS_X; - private final static int AXIS_2 = AXIS_X + 2; + private static final int AXIS_1 = AXIS_X; + private static final int AXIS_2 = AXIS_X + 2; // Returns true if other overlaps one dimension of this. private boolean overlaps1Way(OBB2D other) { diff --git a/vtm/src/org/oscim/utils/geom/SimplifyDP.java b/vtm/src/org/oscim/utils/geom/SimplifyDP.java index afffdc29..1c92a47d 100644 --- a/vtm/src/org/oscim/utils/geom/SimplifyDP.java +++ b/vtm/src/org/oscim/utils/geom/SimplifyDP.java @@ -30,7 +30,7 @@ import static org.oscim.utils.geom.GeometryUtils.squareSegmentDistance; * https://github.com/ekeneijeoma/simplify-java */ public class SimplifyDP { - final static Logger log = LoggerFactory.getLogger(SimplifyDP.class); + static final Logger log = LoggerFactory.getLogger(SimplifyDP.class); boolean[] markers = new boolean[128]; int[] stack = new int[32]; diff --git a/vtm/src/org/oscim/utils/quadtree/BoxTree.java b/vtm/src/org/oscim/utils/quadtree/BoxTree.java index 08ce3482..0f04f684 100644 --- a/vtm/src/org/oscim/utils/quadtree/BoxTree.java +++ b/vtm/src/org/oscim/utils/quadtree/BoxTree.java @@ -18,12 +18,12 @@ import java.util.Arrays; */ public class BoxTree, E> extends TileIndex, T> { - final static Logger log = LoggerFactory.getLogger(BoxTree.class); + static final Logger log = LoggerFactory.getLogger(BoxTree.class); static boolean dbg = false; protected final int extents; protected final int maxDepth; - private final static int MAX_STACK = 32; + private static final int MAX_STACK = 32; static class Stack extends Inlist> { /**