xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor 'final static' to 'static final' convention

Browse Source
This commit is contained in:
Gustl22
2018-12-06 21:06:04 +01:00
parent 62132937da
commit 70dd6554c3
110 changed files with 306 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
vtm-extras/src/org/oscim/tiling/source/geojson/OsmLanduseJsonTileSource.java
View File

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

8
vtm-extras/src/org/oscim/tiling/source/mapnik/TileDecoder.java
View File

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

4
vtm-extras/src/org/oscim/tiling/source/oscimap/Tags.java
View File

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

2
vtm-extras/src/org/oscim/tiling/source/oscimap/TileDecoder.java
View File

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

2
vtm-extras/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java
View File

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

8
vtm-extras/src/org/oscim/tiling/source/oscimap2/Tags.java
View File

@@ -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),