Changeset 2990 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2010-02-15T09:03:57+01:00 (14 years ago)

Author:

jttt

Message:

Fix some eclipse warnings

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• APIDataSet.java (modified) (1 diff)
• coor/LatLon.java (modified) (1 diff)
• osm/ChangesetCache.java (modified) (1 diff)
• osm/DataSetMerger.java (modified) (2 diffs)
• osm/TagCollection.java (modified) (1 diff)
• osm/history/HistoryRelation.java (modified) (1 diff)
• projection/NTV2SubGrid.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/APIDataSet.java

@@ -330 +330 @@
      */
     private class RelationUploadDependencyGraph {
+        @SuppressWarnings("unused")
         private final Logger logger = Logger.getLogger(RelationUploadDependencyGraph.class.getName());
         private HashMap<Relation, Set<Relation>> children;

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -8 +8 @@
 import static java.lang.Math.sqrt;
 import static java.lang.Math.toRadians;
-import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trc;
 

trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java

@@ -35 +35 @@
  */
 public class ChangesetCache implements PreferenceChangedListener{
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(ChangesetCache.class.getName());
 

trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

@@ -94 +94 @@
             case WAY: candidates  =targetDataSet.getWays(); break;
             case RELATION: candidates = targetDataSet.getRelations(); break;
+            default: throw new AssertionError();
             }
             for (OsmPrimitive target : candidates) {
@@ -127 +128 @@
         case WAY: target = source.isNew() ? new Way() : new Way(source.getId()); break;
         case RELATION: target = source.isNew() ? new Relation() : new Relation(source.getId()); break;
+        default: throw new AssertionError();
         }
         target.mergeFrom(source);

trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java

@@ -640 +640 @@
     public TagCollection intersect(TagCollection other) {
         if (other == null) {
-            new TagCollection();
+            other = new TagCollection();
         }
         TagCollection ret = new TagCollection(this);

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm.history;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.text.MessageFormat;

trunk/src/org/openstreetmap/josm/data/projection/NTV2SubGrid.java

@@ -20 +20 @@
 package org.openstreetmap.josm.data.projection;
 
+import java.io.IOException;
 import java.io.InputStream;
-import java.io.IOException;
 import java.io.Serializable;
 
@@ -34 +34 @@
  */
 public class NTV2SubGrid implements Cloneable, Serializable {
-
-    private static final int REC_SIZE = 16;
 
     private String subGridName;