refactor 'final static' to 'static final' convention

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;

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;

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);
+    static final org.slf4j.Logger log = LoggerFactory.getLogger(TileCache.class);
-    final static boolean dbg = false;
+    static final boolean dbg = false;
 
     class CacheTileReader implements TileReader {
         final InputStream mInputStream;

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;

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;

vtm-app/src/org/oscim/app/POISearch.java

@@ -48,11 +48,11 @@ public class POISearch {
     ItemizedOverlayWithBubble<ExtendedMarkerItem> poiMarkers;
     MarkerSymbol[] mMarkers;
 
-    private final static int MDEFAULT = 0;
+    private static final int MDEFAULT = 0;
-    private final static int MFLICKR = 1;
+    private static final int MFLICKR = 1;
-    private final static int MPICASA = 2;
+    private static final int MPICASA = 2;
-    private final static int MWIKI16 = 3;
+    private static final int MWIKI16 = 3;
-    private final static int MWIKI32 = 4;
+    private static final int MWIKI32 = 4;
 
     POISearch() {
         mPOIs = new ArrayList<POI>();
@@ -89,12 +89,12 @@ public class POISearch {
         return mPOIs;
     }
 
-    final static String TAG_WIKIPEDIA = "wikipedia";
+    static final String TAG_WIKIPEDIA = "wikipedia";
-    final static String TAG_FLICKR = "flickr";
+    static final String TAG_FLICKR = "flickr";
-    final static String TAG_PICASA = "picasa";
+    static final String TAG_PICASA = "picasa";
-    final static String TAG_FOURSQUARE = "foursquare";
+    static final String TAG_FOURSQUARE = "foursquare";
 
-    //private final static String TAG_NOMINATIM = "nominatim";
+    //private static final String TAG_NOMINATIM = "nominatim";
 
     class POITask extends AsyncTask<Object, Void, List<POI>> {
         String mTag;

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;

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,

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 static final int DIALOG_LOCATION_PROVIDER_DISABLED = 2;
-    private final static int SHOW_LOCATION_ZOOM = 14;
+    private static final int SHOW_LOCATION_ZOOM = 14;
 
     private final LocationManager mLocationManager;
     private final LocationLayerImpl mLocationLayer;

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;

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;
 

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.

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

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;
 

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/";

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

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();

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;
 

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

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

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?";
 

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?";
 

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?";

vtm-app/src/org/osmdroid/utils/HttpConnection.java

@@ -26,8 +26,8 @@ import okhttp3.Response;
  * connection.close();</pre>
  */
 public class HttpConnection {
-    private final static int TIMEOUT_CONNECTION = 3000; //ms
+    private static final int TIMEOUT_CONNECTION = 3000; //ms
-    private final static int TIMEOUT_SOCKET = 10000; //ms
+    private static final int TIMEOUT_SOCKET = 10000; //ms
 
     private static OkHttpClient client;
     private InputStream stream;

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

vtm-extras/src/org/oscim/tiling/source/geojson/GeoJsonTileDecoder.java

@@ -54,18 +54,18 @@ public class GeoJsonTileDecoder implements ITileDecoder {
     private final LinkedHashMap<String, Object> mTagMap;
     private final JsonFactory mJsonFactory;
 
-    private final static char[] FIELD_FEATURES = "features".toCharArray();
+    private static final char[] FIELD_FEATURES = "features".toCharArray();
-    private final static char[] FIELD_GEOMETRY = "geometry".toCharArray();
+    private static final char[] FIELD_GEOMETRY = "geometry".toCharArray();
-    private final static char[] FIELD_PROPERTIES = "properties".toCharArray();
+    private static final char[] FIELD_PROPERTIES = "properties".toCharArray();
-    private final static char[] FIELD_COORDINATES = "coordinates".toCharArray();
+    private static final char[] FIELD_COORDINATES = "coordinates".toCharArray();
-    private final static char[] FIELD_TYPE = "type".toCharArray();
+    private static final char[] FIELD_TYPE = "type".toCharArray();
 
-    private final static char[] LINETRING = "LineString".toCharArray();
+    private static final char[] LINETRING = "LineString".toCharArray();
-    private final static char[] POLYGON = "Polygon".toCharArray();
+    private static final char[] POLYGON = "Polygon".toCharArray();
-    private final static char[] POINT = "Point".toCharArray();
+    private static final char[] POINT = "Point".toCharArray();
-    private final static char[] MULTI_LINESTRING = "MultiLineString".toCharArray();
+    private static final char[] MULTI_LINESTRING = "MultiLineString".toCharArray();
-    private final static char[] MULTI_POLYGON = "MultiPolygon".toCharArray();
+    private static final char[] MULTI_POLYGON = "MultiPolygon".toCharArray();
-    private final static char[] MULTI_POINT = "MultiPoint".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();

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<String, Object> properties) {

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 static final int CLOSE_PATH = 0x07;
-    private final static int MOVE_TO = 0x01;
+    private static final int MOVE_TO = 0x01;
-    //private final static int LINE_TO = 0x02;
+    //private static final int LINE_TO = 0x02;
 
     private int lastX, lastY;
 

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 static final int MAX = 654;
-    public final static int LIMIT = 1024;
+    public static final int LIMIT = 1024;
 
     private static final String s_limited = "limited".intern();
     private static final String s_chain = "chain".intern();

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;

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() {

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 static final int MAX = 628;
-    public final static int LIMIT = 1024;
+    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),

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

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 static final Tag TAG_TREE = new Tag("natural", "tree");
-    public final static Tag TAG_MEMORIAL = new Tag("historic", "memorial");
+    public static final Tag TAG_MEMORIAL = new Tag("historic", "memorial");
-    public final static Tag TAG_FOREST = new Tag("landuse", "forest");
+    public static final Tag TAG_FOREST = new Tag("landuse", "forest");
-    public final static Tag TAG_WOOD = new Tag("natural", "wood");
+    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 static final Tag TAG_ARTWORK = new Tag("tourism", "artwork");
-    public final static Tag TAG_TREE_BROADLEAVED = new Tag("leaf_type", "broadleaved");
+    public static final Tag TAG_TREE_BROADLEAVED = new Tag("leaf_type", "broadleaved");
-    public final static Tag TAG_TREE_NEEDLELEAVED = new Tag("leaf_type", "needleleaved");
+    public static final 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_STREETLAMP = new Tag("highway", "street_lamp");
 
     AssetManager mAssets;
     GdxRenderer3D2 mG3d;

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<String, UIFont> fontHashMap = new HashMap<>();
+    private static final HashMap<String, UIFont> fontHashMap = new HashMap<>();
 
     float strokeWidth;
 

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;
 

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 static final 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_PATH = "/{Z}/{X}/{Y}.json";
 
     public static class Builder<T extends Builder<T>> extends UrlTileSource.Builder<T> {
         private String locale = "";

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 static final 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_PATH = "/{Z}/{X}/{Y}.json";
 
     public static class Builder<T extends Builder<T>> extends UrlTileSource.Builder<T> {
         private String locale = "";

vtm-json/src/org/oscim/tiling/source/geojson/TileDecoder.java

@@ -52,18 +52,18 @@ public class TileDecoder implements ITileDecoder {
     private final LinkedHashMap<String, Object> mTagMap;
     private final JsonFactory mJsonFactory;
 
-    private final static char[] FIELD_FEATURES = "features".toCharArray();
+    private static final char[] FIELD_FEATURES = "features".toCharArray();
-    private final static char[] FIELD_GEOMETRY = "geometry".toCharArray();
+    private static final char[] FIELD_GEOMETRY = "geometry".toCharArray();
-    private final static char[] FIELD_PROPERTIES = "properties".toCharArray();
+    private static final char[] FIELD_PROPERTIES = "properties".toCharArray();
-    private final static char[] FIELD_COORDINATES = "coordinates".toCharArray();
+    private static final char[] FIELD_COORDINATES = "coordinates".toCharArray();
-    private final static char[] FIELD_TYPE = "type".toCharArray();
+    private static final char[] FIELD_TYPE = "type".toCharArray();
 
-    private final static char[] LINESTRING = "LineString".toCharArray();
+    private static final char[] LINESTRING = "LineString".toCharArray();
-    private final static char[] POLYGON = "Polygon".toCharArray();
+    private static final char[] POLYGON = "Polygon".toCharArray();
-    private final static char[] POINT = "Point".toCharArray();
+    private static final char[] POINT = "Point".toCharArray();
-    private final static char[] MULTI_LINESTRING = "MultiLineString".toCharArray();
+    private static final char[] MULTI_LINESTRING = "MultiLineString".toCharArray();
-    private final static char[] MULTI_POLYGON = "MultiPolygon".toCharArray();
+    private static final char[] MULTI_POLYGON = "MultiPolygon".toCharArray();
-    private final static char[] MULTI_POINT = "MultiPoint".toCharArray();
+    private static final char[] MULTI_POINT = "MultiPoint".toCharArray();
 
     private ITileDataSink mTileDataSink;
 

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 static final 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_PATH = "/{Z}/{X}/{Y}.mvt";
 
     public static class Builder<T extends Builder<T>> extends UrlTileSource.Builder<T> {
         private String locale = "";

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;

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 static final 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_PATH = "/{Z}/{X}/{Y}.mvt";
 
     public static class Builder<T extends Builder<T>> extends UrlTileSource.Builder<T> {
         private String locale = "";

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 static final 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_PATH = "/{Z}/{X}/{Y}.pbf.pict";
 
     public static class Builder<T extends Builder<T>> extends UrlTileSource.Builder<T> {
         private String locale = "";

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 static final LineStyle[] line = {new LineStyle(1, Color.MAGENTA, 2)};
-    private final static AreaStyle[] area = {new AreaStyle(0, Color.CYAN)};
+    private static final AreaStyle[] area = {new AreaStyle(0, Color.CYAN)};
 
     @Override
     public RenderStyle[] matchElement(GeometryType type, TagSet tags, int zoomLevel) {

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()"

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"

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;

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 static final BaseAppender ALL_APPENDER = new AllAppender();
-    public final static BaseAppender VTM_APPENDER = new VtmAppender();
+    public static final BaseAppender VTM_APPENDER = new VtmAppender();
-    public final static BaseAppender MAPSFORGE_APPENDER = new MapsforgeAppender();
+    public static final BaseAppender MAPSFORGE_APPENDER = new MapsforgeAppender();
 
-    public final static int MAX_ZOOM_LEVEL = 21;
+    public static final int MAX_ZOOM_LEVEL = 21;
-    public final static int MIN_ZOOM_LEVEL = 0;
+    public static final int MIN_ZOOM_LEVEL = 0;
 
 
-    public final static ImageIcon ICON_OPEN = new ImageIcon(Main.class.getClassLoader().getResource("menu-open.png"));
+    public static final 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_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"));

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;
 

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();

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<JsArrayNumber> {
+        static final class Polygon extends JsArray<JsArrayNumber> {
             protected Polygon() {
             }
 

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 static final String POINT = "POINT";
-    private final static String LINE = "LINESTRING";
+    private static final String LINE = "LINESTRING";
-    private final static String POLY = "POLYGON";
+    private static final String POLY = "POLYGON";
-    private final static String MULTI = "MULTI";
+    private static final String MULTI = "MULTI";
 
-    private final static int SKIP_POINT = POINT.length();
+    private static final int SKIP_POINT = POINT.length();
-    private final static int SKIP_LINE = LINE.length();
+    private static final int SKIP_LINE = LINE.length();
-    private final static int SKIP_POLY = POLY.length();
+    private static final int SKIP_POLY = POLY.length();
-    private final static int SKIP_MULTI = MULTI.length();
+    private static final int SKIP_MULTI = MULTI.length();
 
     public void parse(String wkt, GeometryBuffer geom) throws Exception {
         // return position.

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;

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];

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<String, Object> mProperties = new LinkedHashMap<String, Object>(10);
+    static final LinkedHashMap<String, Object> mProperties = new LinkedHashMap<String, Object>(10);
 
     double mTileY, mTileX, mTileScale;
 

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 static final boolean debug = false;
-    public final static boolean debugView = false;
+    public static final boolean debugView = false;
 
     /**
      * The instance provided by backend

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 static final int GROW_INDICES = 64;
-    private final static int GROW_POINTS = 512;
+    private static final int GROW_POINTS = 512;
 
     /**
      * The Enum GeometryType.

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();
     }

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<InternalItem> zComparator = new Comparator<InternalItem>() {
+    static final Comparator<InternalItem> zComparator = new Comparator<InternalItem>() {
         @Override
         public int compare(InternalItem a, InternalItem b) {
             if (a.visible && b.visible) {

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 static final int PROXY_CHILD00 = (1 << 0);
-    public final static int PROXY_CHILD01 = (1 << 1);
+    public static final int PROXY_CHILD01 = (1 << 1);
-    public final static int PROXY_CHILD10 = (1 << 2);
+    public static final int PROXY_CHILD10 = (1 << 2);
-    public final static int PROXY_CHILD11 = (1 << 3);
+    public static final int PROXY_CHILD11 = (1 << 3);
-    public final static int PROXY_PARENT = (1 << 4);
+    public static final int PROXY_PARENT = (1 << 4);
-    public final static int PROXY_GRAMPA = (1 << 5);
+    public static final int PROXY_GRAMPA = (1 << 5);
-    public final static int PROXY_HOLDER = (1 << 6);
+    public static final int PROXY_HOLDER = (1 << 6);
 
     /**
      * Tile state

vtm/src/org/oscim/layers/tile/TileDistanceSort.java

@@ -39,7 +39,7 @@ public class TileDistanceSort extends TimSort<MapTile> {
         }
     }
 
-    final static Comparator<MapTile> DistanceComparator = new Comparator<MapTile>() {
+    static final Comparator<MapTile> DistanceComparator = new Comparator<MapTile>() {
         @Override
         public int compare(MapTile a, MapTile b) {
             if (a == null) {

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 static final Event TILE_LOADED = new Event();
-    public final static Event TILE_REMOVED = new Event();
+    public static final Event TILE_REMOVED = new Event();
 
     private final int mCacheLimit;
     private int mCacheReduce;

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

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).

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 static final int MIN_ZOOM = 16;
-    private final static int MAX_ZOOM = 16;
+    private static final int MAX_ZOOM = 16;
 
     private final TileSource mTileSource;
 

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 static final double HSV_S = 0.7;
-    private final static double HSV_V = 1.2;
+    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;

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;
 

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 static final float MIN_CAPTION_DIST = 5;
-    private final static float MIN_WAY_DIST = 3;
+    private static final float MIN_WAY_DIST = 3;
 
     /**
      * thread local pool of for unused label items

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'..

vtm/src/org/oscim/layers/vector/AbstractVectorLayer.java

@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
 public abstract class AbstractVectorLayer<T> 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);

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 static final int ANIM_NONE = 0;
-    public final static int ANIM_MOVE = 1 << 0;
+    public static final int ANIM_MOVE = 1 << 0;
-    public final static int ANIM_SCALE = 1 << 1;
+    public static final int ANIM_SCALE = 1 << 1;
-    public final static int ANIM_ROTATE = 1 << 2;
+    public static final int ANIM_ROTATE = 1 << 2;
-    public final static int ANIM_TILT = 1 << 3;
+    public static final int ANIM_TILT = 1 << 3;
-    public final static int ANIM_FLING = 1 << 4;
+    public static final int ANIM_FLING = 1 << 4;
 
     final Map mMap;
 

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.

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 static final int MAX_ZOOM_LEVEL = 20;
-    public final static int MIN_ZOOM_LEVEL = 2;
+    public static final int MIN_ZOOM_LEVEL = 2;
-    public final static float MIN_TILT = 0;
+    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 static final float VIEW_DISTANCE = 3.0f;
-    public final static float VIEW_NEAR = 1;
+    public static final float VIEW_NEAR = 1;
-    public final static float VIEW_FAR = 8;
+    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;

vtm/src/org/oscim/renderer/BufferObject.java

@@ -102,8 +102,8 @@ public final class BufferObject extends Inlist<BufferObject> {
         log.debug("now: " + mBufferMemoryUsage / MB + "MB");
     }
 
-    private final static BufferObject pool[] = new BufferObject[2];
+    private static final BufferObject pool[] = new BufferObject[2];
-    private final static int counter[] = new int[2];
+    private static final int counter[] = new int[2];
 
     /**
      * @param target can be GL20.ARRAY_BUFFER or GL20.ELEMENT_ARRAY_BUFFER

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();

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;
 

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 static final int DISABLED = -1;
-    public final static int UNBIND = 0;
+    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;

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;"

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;

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

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;
+        public static final int INDICES_PER_SPRITE = 6;
-        final static int VERTICES_PER_SPRITE = 4;
+        static final int VERTICES_PER_SPRITE = 4;
-        final static int SHORTS_PER_VERTICE = 6;
+        static final int SHORTS_PER_VERTICE = 6;
         static Shader shader;
 
         static void init() {

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 static final int IND_EVEN_SIDE = 0;
-    //private final static int IND_ODD_SIDE = 1;
+    //private static final int IND_ODD_SIDE = 1;
-    private final static int IND_ROOF = 2;
+    private static final int IND_ROOF = 2;
 
     // FIXME flip OUTLINE / MESH!
-    private final static int IND_OUTLINE = 3;
+    private static final int IND_OUTLINE = 3;
-    private final static int IND_MESH = 4;
+    private static final int IND_MESH = 4;
 
     private final float mGroundResolution;
 

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 static final int CAP_THIN = 0;
-        private final static int CAP_BUTT = 1;
+        private static final int CAP_BUTT = 1;
-        private final static int CAP_ROUND = 2;
+        private static final int CAP_ROUND = 2;
 
-        private final static int SHADER_FLAT = 1;
+        private static final int SHADER_FLAT = 1;
-        private final static int SHADER_PROJ = 0;
+        private static final int SHADER_PROJ = 0;
 
         public static int mTexID;
         private static Shader[] shaders = {null, null};

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) {

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 static final int CLIP_STENCIL = 1;
-    public final static int CLIP_DEPTH = 2;
+    public static final int CLIP_DEPTH = 2;
-    public final static int CLIP_TEST_DEPTH = 3;
+    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;
 

vtm/src/org/oscim/renderer/bucket/RenderBucket.java

@@ -53,7 +53,7 @@ public abstract class RenderBucket extends Inlist<RenderBucket> {
     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) {

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 static final int SHORT_BYTES = 2;
-    // public final static int INT_BYTES = 4;
+    // public static final int INT_BYTES = 4;
 
     private RenderBucket buckets;
 

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 static final int VERTICES_PER_SPRITE = 4;
-    private final static int LBIT_MASK = 0xfffffffe;
+    private static final int LBIT_MASK = 0xfffffffe;
 
     private TextureItem prevTextures;
     private List<SymbolItem> mSymbols = new List<SymbolItem>();

vtm/src/org/oscim/renderer/bucket/SymbolItem.java

@@ -26,7 +26,7 @@ import org.oscim.utils.pool.SyncPool;
 
 public class SymbolItem extends Inlist<SymbolItem> {
 
-    public final static SyncPool<SymbolItem> pool = new SyncPool<SymbolItem>(128) {
+    public static final SyncPool<SymbolItem> pool = new SyncPool<SymbolItem>(128) {
 
         @Override
         protected SymbolItem createItem() {

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;

vtm/src/org/oscim/renderer/bucket/TextItem.java

@@ -23,9 +23,9 @@ import org.oscim.utils.pool.SyncPool;
 
 public class TextItem extends Inlist<TextItem> {
     //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<TextItem> pool = new SyncPool<TextItem>(MAX_POOL) {
+    public static final SyncPool<TextItem> pool = new SyncPool<TextItem>(MAX_POOL) {
 
         @Override
         protected TextItem createItem() {

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;
+    public static final int INDICES_PER_SPRITE = 6;
-    final static int VERTICES_PER_SPRITE = 4;
+    static final int VERTICES_PER_SPRITE = 4;
-    final static int SHORTS_PER_VERTICE = 6;
+    static final int SHORTS_PER_VERTICE = 6;
 
-    public final static int TEXTURE_HEIGHT = 256;
+    public static final int TEXTURE_HEIGHT = 256;
-    public final static int TEXTURE_WIDTH = 1024;
+    public static final int TEXTURE_WIDTH = 1024;
-    final static int POOL_FILL = 4;
+    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);

vtm/src/org/oscim/renderer/bucket/TextureItem.java

@@ -340,8 +340,8 @@ public class TextureItem extends Inlist<TextureItem> {
 
     /* 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);
+    static final TexturePool NOPOOL = new TexturePool(0);
-    final static ArrayList<Integer> disposedTextures = new ArrayList<Integer>();
+    static final ArrayList<Integer> disposedTextures = new ArrayList<Integer>();
 
     /**
      * Disposed textures are released by MapRenderer after each frame

vtm/src/org/oscim/renderer/bucket/VertexData.java

@@ -94,7 +94,7 @@ public class VertexData extends Inlist.List<Chunk> {
         return super.clear();
     }
 
-    private final static Pool pool = new Pool();
+    private static final Pool pool = new Pool();
 
     public void dispose() {
         pool.releaseAll(super.clear());

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 static final RenderStyle[] EMPTY_STYLE = new RenderStyle[0];
-    public final static Rule[] EMPTY_RULES = new Rule[0];
+    public static final Rule[] EMPTY_RULES = new Rule[0];
 
     public final Rule[] subRules;
     public final RenderStyle[] styles;

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,

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 static final byte[] HEADER_HTTP_OK = "200 OK".getBytes();
-    private final static byte[] HEADER_CONTENT_LENGTH = "Content-Length".getBytes();
+    private static final byte[] HEADER_CONTENT_LENGTH = "Content-Length".getBytes();
-    private final static byte[] HEADER_CONNECTION_CLOSE = "Connection: close".getBytes();
+    private static final byte[] HEADER_CONNECTION_CLOSE = "Connection: close".getBytes();
-    private final static byte[] HEADER_ENCODING_GZIP = "Content-Encoding: gzip".getBytes();
+    private static final byte[] HEADER_ENCODING_GZIP = "Content-Encoding: gzip".getBytes();
 
-    private final static int RESPONSE_EXPECTED_LIVES = 100;
+    private static final int RESPONSE_EXPECTED_LIVES = 100;
-    private final static long RESPONSE_TIMEOUT = (long) 10E9; // 10 second in nanosecond
+    private static final long RESPONSE_TIMEOUT = (long) 10E9; // 10 second in nanosecond
 
-    private final static int CONNECT_TIMEOUT = 15000; // 15 seconds
+    private static final int CONNECT_TIMEOUT = 15000; // 15 seconds
-    private final static int SOCKET_TIMEOUT = 8000; // 8 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;

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 static final int S1 = 7;
-    private final static int S2 = 14;
+    private static final int S2 = 14;
-    private final static int S3 = 21;
+    private static final int S3 = 21;
-    private final static int S4 = 28;
+    private static final int S4 = 28;
 
-    private final static int M1 = (1 << S1) - 1;
+    private static final int M1 = (1 << S1) - 1;
-    private final static int M2 = (1 << S2) - 1;
+    private static final int M2 = (1 << S2) - 1;
-    private final static int M3 = (1 << S3) - 1;
+    private static final int M3 = (1 << S3) - 1;
-    private final static int M4 = (1 << S4) - 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

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.

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 static final int CLOSE_PATH = 0x07;
-    private final static int MOVE_TO = 0x01;
+    private static final int MOVE_TO = 0x01;
-    private final static int LINE_TO = 0x02;
+    private static final int LINE_TO = 0x02;
 
     private int lastX, lastY;