From 1eea84da0ba84c8f8264fe1f15d09123faa068b3 Mon Sep 17 00:00:00 2001 From: "Nelson A. de Oliveira" Date: Wed, 31 Jul 2013 15:15:26 -0300 Subject: [PATCH] Fix unnecessary boxing/unboxing --- OsmAnd-java/src/net/osmand/binary/BinaryInspector.java | 10 +++++----- OsmAnd-java/src/net/osmand/router/GeneralRouter.java | 2 +- .../src/net/osmand/router/NewGeneralRouter.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java index 91ffb1102b..7a4140e5c5 100644 --- a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java +++ b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java @@ -227,13 +227,13 @@ public class BinaryInspector { String pattern = partsToExtractFrom.get(f); boolean minus = true; for (int i = 0; i < indexes[c].getIndexes().size(); i++) { - partsSet[c].add(new Float(i + 1f)); + partsSet[c].add(i + 1f); BinaryIndexPart part = indexes[c].getIndexes().get(i); if(part instanceof MapIndex){ List roots = ((MapIndex) part).getRoots(); int rsize = roots.size(); for(int j=0; j cities = index.getCities(region, null, type); - print(MessageFormat.format("\t{0}, {1,number,#} group(s)", new Object[]{cityType_String[j], Integer.valueOf(cities.size())})); + print(MessageFormat.format("\t{0}, {1,number,#} group(s)", new Object[]{cityType_String[j], cities.size()})); if (BinaryMapAddressReaderAdapter.CITY_TOWN_TYPE == type) { if (!verbose.vstreetgroups && !verbose.vcities) { println(""); diff --git a/OsmAnd-java/src/net/osmand/router/GeneralRouter.java b/OsmAnd-java/src/net/osmand/router/GeneralRouter.java index 69097e9918..1486076b50 100644 --- a/OsmAnd-java/src/net/osmand/router/GeneralRouter.java +++ b/OsmAnd-java/src/net/osmand/router/GeneralRouter.java @@ -113,7 +113,7 @@ public class GeneralRouter extends VehicleRouter { RouteTypeRule r = reg.quickGetEncodingRule(types[i]); Float sp = highwaySpeed.get(r.getTag()+"$"+r.getValue()); if(sp != null){ - if(sp.floatValue() > 0) { + if(sp > 0) { accepted = true; } break; diff --git a/OsmAnd-java/src/net/osmand/router/NewGeneralRouter.java b/OsmAnd-java/src/net/osmand/router/NewGeneralRouter.java index c1ea8ab8c6..f49bac9fd6 100644 --- a/OsmAnd-java/src/net/osmand/router/NewGeneralRouter.java +++ b/OsmAnd-java/src/net/osmand/router/NewGeneralRouter.java @@ -336,7 +336,7 @@ public class NewGeneralRouter extends VehicleRouter { boolean val = false; if(defParams.containsKey(p)) { RoutingParameter t = defParams.get(p); - val = t.type == RoutingParameterType.BOOLEAN && t.value != null && ((Boolean)t.value).booleanValue(); + val = t.type == RoutingParameterType.BOOLEAN && t.value != null && (Boolean) t.value; } if(not && val){ parameterValue = false;