Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix java 1.8

Browse source
This commit is contained in:
Alexey Kulish 2017-05-16 22:20:48 +03:00
parent d453a2ed72
commit b614ab93c4
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/builder/MvtLayerProps.java
View file

@ -32,9 +32,17 @@ public final class MvtLayerProps {
* @return index of the key * @return index of the key
*/ */
public int addKey(String key) { public int addKey(String key) {
Objects.requireNonNull(key); if (key == null) {
throw new NullPointerException();
}
int nextIndex = keys.size(); int nextIndex = keys.size();
final Integer mapIndex = keys.putIfAbsent(key, nextIndex); //final Integer mapIndex = keys.putIfAbsent(key, nextIndex);
final Integer mapIndex;
if (!keys.containsKey(key)) {
mapIndex = keys.put(key, nextIndex);
} else {
mapIndex = keys.get(key);
}
return mapIndex == null ? nextIndex : mapIndex; return mapIndex == null ? nextIndex : mapIndex;
} }
@ -48,13 +56,21 @@ public final class MvtLayerProps {
* @see MvtValue#isValidPropValue(Object) * @see MvtValue#isValidPropValue(Object)
*/ */
public int addValue(Object value) { public int addValue(Object value) {
Objects.requireNonNull(value); if (value == null) {
throw new NullPointerException();
}
if(!MvtValue.isValidPropValue(value)) { if(!MvtValue.isValidPropValue(value)) {
return -1; return -1;
} }
int nextIndex = vals.size(); int nextIndex = vals.size();
final Integer mapIndex = vals.putIfAbsent(value, nextIndex); //final Integer mapIndex = vals.putIfAbsent(value, nextIndex);
final Integer mapIndex;
if (!vals.containsKey(value)) {
mapIndex = vals.put(value, nextIndex);
} else {
mapIndex = vals.get(value);
}
return mapIndex == null ? nextIndex : mapIndex; return mapIndex == null ? nextIndex : mapIndex;
} }