Changeset 36092 in osm for applications/editors/josm/plugins/opendata/src

Timestamp:

2023-05-30T22:06:15+02:00 (18 months ago)

Author:

stoecker

Message:

fix warnings

Location:

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core

Files:

• datasets/be/BelgianDataSetHandler.java (modified) (1 diff)
• datasets/fr/FrenchDataSetHandler.java (modified) (1 diff)
• io/archive/CandidateChooser.java (modified) (1 diff)
• io/geographic/MifReader.java (modified) (8 diffs)
• io/geographic/TabFiles.java (modified) (2 diffs)
• licenses/License.java (modified) (1 diff)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/be/BelgianDataSetHandler.java

@@ -35 +35 @@
 
     protected class InternalCsvHandler extends DefaultCsvHandler {
-        /*@Override
-        public List<Projection> getSpreadSheetProjections() {
-            if (singleProjection != null) {
-                return Arrays.asList(new Projection[]{singleProjection});
-            } else {
-                return Arrays.asList(projections);
-            }
-        }*/
-
         @Override
         public LatLon getCoor(EastNorth en, String[] fields) {

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchDataSetHandler.java

@@ -48 +48 @@
 
     protected class InternalCsvHandler extends DefaultCsvHandler {
-        /*@Override
-        public List<Projection> getSpreadSheetProjections() {
-            if (singleProjection != null) {
-                return Arrays.asList(new Projection[]{singleProjection});
-            } else {
-                return Arrays.asList(projections);
-            }
-        }*/
-
         @Override
         public LatLon getCoor(EastNorth en, String[] fields) {

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/CandidateChooser.java

@@ -67 +67 @@
     }
 
-    /*public List<File> getSelectedFiles() {
-        List<File> result = new ArrayList<File>();
-        for (JCheckBox cbox : checkBoxes.keySet()) {
-            if (cbox.isSelected()) {
-                result.add(checkBoxes.get(cbox));
-            }
-        }
-        return result;
-    }*/
-
     public File getSelectedFile() {
         return (File) fileCombo.getSelectedItem();

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReader.java

@@ -68 +68 @@
 
     private Projection josmProj;
-    private DataSet ds;
+    private DataSet dataSet;
     private Relation region;
     private Way polygon;
@@ -381 +381 @@
 
     private void parseData(String[] words) {
-        if (ds == null) {
-            ds = new DataSet();
+        if (dataSet == null) {
+            dataSet = new DataSet();
         }
     }
@@ -392 +392 @@
     private void parseLine(String[] words) throws IOException {
         Way line = new Way();
-        ds.addPrimitive(line);
+        dataSet.addPrimitive(line);
         readAttributes(line);
         line.addNode(createNode(words[1], words[2]));
@@ -401 +401 @@
         Way previousPolyline = polyline;
         polyline = new Way();
-        ds.addPrimitive(polyline);
+        dataSet.addPrimitive(polyline);
         if (initial) {
             readAttributes(polyline);
@@ -431 +431 @@
             region = new Relation();
             region.put("type", "multipolygon");
-            ds.addPrimitive(region);
+            dataSet.addPrimitive(region);
             readAttributes(region);
         } else {
@@ -488 +488 @@
                 initializeReaders(in, file, cs, 1);
                 parseHeader();
-                return ds;
+                return dataSet;
             } finally {
                 if (midReader != null) {
@@ -520 +520 @@
         } else if (words[0].equalsIgnoreCase("Data")) {
             parseData(words);
-        } else if (ds != null) {
+        } else if (dataSet != null) {
             if (state == State.START_POLYGON) {
                 numpts = Integer.parseInt(words[0]);
                 polygon = new Way();
-                ds.addPrimitive(polygon);
+                dataSet.addPrimitive(polygon);
                 if (region != null) {
                     region.addMember(new RelationMember("outer", polygon));
@@ -629 +629 @@
     private Node createNode(String x, String y) {
         Node node = new Node(josmProj.eastNorth2latlon(new EastNorth(Double.parseDouble(x), Double.parseDouble(y))));
-        ds.addPrimitive(node);
+        dataSet.addPrimitive(node);
         return node;
     }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabFiles.java

@@ -111 +111 @@
             for (Entry<ShpFileType, URL> entry : entries) {
                 if (!exists(entry.getKey())) {
-                    url = findExistingFile(entry.getKey(), entry.getValue());
+                    url = findExistingFile(entry.getValue());
                     if (url != null) {
                         toUpdate.put(entry.getKey(), url);
@@ -121 +121 @@
     }
 
-    private URL findExistingFile(ShpFileType shpFileType, URL value) {
+    private URL findExistingFile(URL value) {
         final File file = URLs.urlToFile(value);
         File directory = file.getParentFile();

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/licenses/License.java

@@ -14 +14 @@
 public abstract class License {
 
-    public static final ODbL ODbL = new ODbL();
-    public static final LOOL LOOL = new LOOL();
+    public static final ODbL odbl = new ODbL();
+    public static final LOOL lool = new LOOL();
 
     private final Map<String, URL> urls = new HashMap<>();