Changeset 582 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2008-03-15T14:39:28+01:00 (16 years ago)

Author:

framm

Message:

• got rid of a few compiler warnings

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• Relation.java (modified) (1 diff)
• RelationMember.java (modified) (1 diff)
• TigerUtils.java (modified) (5 diffs)
• visitor/NameVisitor.java (modified) (2 diffs)

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

@@ -3 +3 @@
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
-import java.util.Map.Entry;
 
 import org.openstreetmap.josm.data.osm.visitor.Visitor;

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

@@ -16 +16 @@
          * Default constructor. Does nothing.
          */
-        public RelationMember() { };
+        public RelationMember() { }
 
         public RelationMember(String role, OsmPrimitive member) {

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

@@ -12 +12 @@
  */
 public class TigerUtils {
+        
         public static boolean isTigerTag(String tag)
         {       
@@ -18 +19 @@
                 return true;
         }
+        
         public static boolean tagIsInt(String name) {
                 if (name.equals("tiger:tlid"))
@@ -23 +25 @@
                 return false;
         }
+        
         public static Object tagObj(String name) {
                 if (tagIsInt(name))
@@ -28 +31 @@
                 return name;
         }
+        
         public static String combineTags(String name, Set<String> values) {
-        TreeSet resultSet = new TreeSet();
+        TreeSet<Object> resultSet = new TreeSet<Object>();
         for (String value: values) {
                 for (String part: value.split(":")) {
@@ -43 +47 @@
                 return combined;
         }
+        
         public static String combineTags(String name, String t1, String t2) {
                 Set<String> set = new TreeSet<String>();

trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java

@@ -8 +8 @@
 import java.text.NumberFormat;
 import java.util.HashSet;
-import java.util.Set;
 
 import javax.swing.Icon;
@@ -14 +13 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.tools.ImageProvider;