diff --git a/src/json/converter/csv/builder/ColumnBuilder.java b/src/json/converter/csv/builder/ColumnBuilder.java index 5a25668..65a56a4 100644 --- a/src/json/converter/csv/builder/ColumnBuilder.java +++ b/src/json/converter/csv/builder/ColumnBuilder.java @@ -35,7 +35,7 @@ public String format(String[] iRow){ String aVal = iRow[_key]; switch (_type) { - case INTEGER: return String.format(_format,new Integer(aVal.equals("")?"0":aVal)); + case INTEGER: return String.format(_format,Integer.valueOf(aVal.equals("")?"0":aVal)); case STRING: return String.format(_format,aVal); } return ""; diff --git a/src/json/converter/shp/ShpFileReader.java b/src/json/converter/shp/ShpFileReader.java index ba3ea09..d71e8b6 100644 --- a/src/json/converter/shp/ShpFileReader.java +++ b/src/json/converter/shp/ShpFileReader.java @@ -303,7 +303,7 @@ public void readRecord(){ } } - _groupRecord._shapes.put(new Integer(aRecordNumber), aFeature); + _groupRecord._shapes.put(Integer.valueOf(aRecordNumber), aFeature); } else { diff --git a/src/json/geojson/FeatureCollection.java b/src/json/geojson/FeatureCollection.java index dbe42df..e8f1fed 100644 --- a/src/json/geojson/FeatureCollection.java +++ b/src/json/geojson/FeatureCollection.java @@ -103,8 +103,8 @@ public FeatureCollection processTileElement(TileElement iTileE){ } } - aGroupRecord._meta_properties.put("x", new Integer(iTileE.x)); - aGroupRecord._meta_properties.put("y", new Integer(iTileE.y)); + aGroupRecord._meta_properties.put("x", Integer.valueOf(iTileE.x)); + aGroupRecord._meta_properties.put("y", Integer.valueOf(iTileE.y)); return aGroupRecord; @@ -253,8 +253,8 @@ public FeatureCollection[][] groupGridDivide(int iZoom/*int iN, int iM*/){ } aDividedResult[i][j] = aGroupRecord; - aGroupRecord._meta_properties.put("x", new Integer(x)); - aGroupRecord._meta_properties.put("y", new Integer(y)); + aGroupRecord._meta_properties.put("x", Integer.valueOf(x)); + aGroupRecord._meta_properties.put("y", Integer.valueOf(y)); } diff --git a/src/json/graphic/JenksColorifierGeojson.java b/src/json/graphic/JenksColorifierGeojson.java index 7d9327f..9b07653 100644 --- a/src/json/graphic/JenksColorifierGeojson.java +++ b/src/json/graphic/JenksColorifierGeojson.java @@ -43,7 +43,7 @@ public void init(){ if (toconvert!=null) { try { - aArrayProp.add(new Double((String) toconvert)); + aArrayProp.add(Double.valueOf((String) toconvert)); } catch (java.lang.NumberFormatException e){ // Unable to decode this string } @@ -83,7 +83,7 @@ public Color getColor(java.lang.Object properties) { try { - double value = new Double((String) aProp.get(_param)); + double value = Double.valueOf((String) aProp.get(_param)); for (int i=0;ivalue)){ diff --git a/src/json/topojson/topology/Topology.java b/src/json/topojson/topology/Topology.java index 16aca59..c0fb44e 100644 --- a/src/json/topojson/topology/Topology.java +++ b/src/json/topojson/topology/Topology.java @@ -105,8 +105,8 @@ public void setArcs(ArcMap iArcMap){ for (int i=0; ivalue)){