Changeset 6142 in josm for trunk/src

Timestamp:

2013-08-11T21:23:19+02:00 (12 years ago)

Author:

Don-vip

Message:

see #8902 - fix compilation warnings

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/FollowLineAction.java (modified) (1 diff)
• command/SequenceCommand.java (modified) (1 diff)
• data/CustomConfigurator.java (modified) (1 diff)
• data/Preferences.java (modified) (3 diffs)
• data/gpx/IWithAttributes.java (modified) (1 diff)
• data/gpx/WithAttributes.java (modified) (1 diff)
• data/projection/CustomProjection.java (modified) (1 diff)
• data/projection/proj/LambertConformalConic.java (modified) (1 diff)
• data/validation/tests/TagChecker.java (modified) (1 diff)
• data/validation/tests/UntaggedWay.java (modified) (1 diff)
• gui/NavigatableComponent.java (modified) (1 diff)
• gui/dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• gui/io/UpdatePrimitivesTask.java (modified) (3 diffs)
• gui/layer/gpx/ChooseTrackVisibilityAction.java (modified) (1 diff)
• gui/mappaint/Cascade.java (modified) (1 diff)
• gui/mappaint/mapcss/ExpressionFactory.java (modified) (6 diffs)
• gui/preferences/PluginPreference.java (modified) (1 diff)
• gui/preferences/advanced/PreferencesTable.java (modified) (1 diff)
• gui/preferences/plugin/PluginListPanel.java (modified) (1 diff)
• gui/tagging/TaggingPresetItems.java (modified) (1 diff)
• io/GpxReader.java (modified) (1 diff)
• io/GpxWriter.java (modified) (1 diff)
• io/remotecontrol/AddTagsDialog.java (modified) (1 diff)
• io/remotecontrol/RequestProcessor.java (modified) (1 diff)
• io/session/SessionWriter.java (modified) (1 diff)
• tools/Diff.java (modified) (1 diff)
• tools/ExifReader.java (modified) (1 diff)
• tools/LanguageInfo.java (modified) (1 diff)
• tools/TextTagParser.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/FollowLineAction.java

@@ -120 +120 @@
             if (Main.map.mapView.viewportFollowing) {
                 Main.map.mapView.smoothScrollTo(newPoint.getEastNorth());
-            };
+            }
         }
     }

trunk/src/org/openstreetmap/josm/command/SequenceCommand.java

@@ -97 +97 @@
 
     @Override
-    @SuppressWarnings("unchecked")
     public Collection<PseudoCommand> getChildren() {
-        return (List) Arrays.asList(sequence);
+        return Arrays.<PseudoCommand>asList(sequence);
     }
 

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

@@ -1085 +1085 @@
         }
 
-        while (stringMap.values().remove(null)) { };
-        while (listMap.values().remove(null)) { };
-        while (listlistMap.values().remove(null)) { };
-        while (listmapMap.values().remove(null)) { };
+        while (stringMap.values().remove(null)) { }
+        while (listMap.values().remove(null)) { }
+        while (listlistMap.values().remove(null)) { }
+        while (listmapMap.values().remove(null)) { }
 
         stringMap.putAll(tmpPref.properties);

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

@@ -1288 +1288 @@
                 changed = putListOfStructs(key, setting.getValue());
             }
-        };
+        }
         PutVisitor putVisitor = new PutVisitor();
         value.visit(putVisitor);
@@ -1669 +1669 @@
     }
 
-    public static boolean isEqual(Setting a, Setting b) {
+    public static boolean isEqual(Setting<?> a, Setting<?> b) {
         if (a==null && b==null) return true;
         if (a==null) return false;
@@ -1678 +1678 @@
             return (a.getValue().equals(b.getValue()));
         if (a instanceof ListSetting) {
-            @SuppressWarnings("unchecked") Collection<String> aValue = (Collection) a.getValue();
-            @SuppressWarnings("unchecked") Collection<String> bValue = (Collection) b.getValue();
+            @SuppressWarnings("unchecked") Collection<String> aValue = (Collection<String>) a.getValue();
+            @SuppressWarnings("unchecked") Collection<String> bValue = (Collection<String>) b.getValue();
             return equalCollection(aValue, bValue);
         }
         if (a instanceof ListListSetting) {
-            @SuppressWarnings("unchecked") Collection<Collection<String>> aValue = (Collection) a.getValue();
-            @SuppressWarnings("unchecked") Collection<List<String>> bValue = (Collection) b.getValue();
+            @SuppressWarnings("unchecked") Collection<Collection<String>> aValue = (Collection<Collection<String>>) a.getValue();
+            @SuppressWarnings("unchecked") Collection<List<String>> bValue = (Collection<List<String>>) b.getValue();
             return equalArray(aValue, bValue);
         }
         if (a instanceof MapListSetting) {
-            @SuppressWarnings("unchecked") Collection<Map<String, String>> aValue = (Collection) a.getValue();
-            @SuppressWarnings("unchecked") Collection<Map<String, String>> bValue = (Collection) b.getValue();
+            @SuppressWarnings("unchecked") Collection<Map<String, String>> aValue = (Collection<Map<String, String>>) a.getValue();
+            @SuppressWarnings("unchecked") Collection<Map<String, String>> bValue = (Collection<Map<String, String>>) b.getValue();
             return equalListOfStructs(aValue, bValue);
         }

trunk/src/org/openstreetmap/josm/data/gpx/IWithAttributes.java

@@ -37 +37 @@
      * @since 5502
      */
-    Collection getCollection(String key);
+    Collection<?> getCollection(String key);
 
     /**

trunk/src/org/openstreetmap/josm/data/gpx/WithAttributes.java

@@ -57 +57 @@
      */
     @Override
-    public Collection getCollection(String key) {
+    public Collection<?> getCollection(String key) {
         Object value = attr.get(key);
-        return (value instanceof Collection) ? (Collection)value : null;
+        return (value instanceof Collection) ? (Collection<?>)value : null;
     }
 

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

@@ -327 +327 @@
 
     public Proj parseProjection(Map<String, String> parameters, Ellipsoid ellps) throws ProjectionConfigurationException {
-        String id = (String) parameters.get(Param.proj.key);
+        String id = parameters.get(Param.proj.key);
         if (id == null) throw new ProjectionConfigurationException(tr("Projection required (+proj=*)"));
 

trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java

@@ -24 +24 @@
             this.latitudeOrigin = latitudeOrigin;
         }
-    };
+    }
 
     public static class Parameters1SP extends Parameters {

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -822 +822 @@
                 return noMatch;
             }
-        };
+        }
 
         public String getData(String str) {

trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java

@@ -50 +50 @@
         NAMED_WAYS.add( "tertiary" );
         NAMED_WAYS.add( "residential" );
-        NAMED_WAYS.add( "pedestrian" ); ;
+        NAMED_WAYS.add( "pedestrian" );
     }
 

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -494 +494 @@
                         // fixme - not use zoom history here
                         zoomTo(oldCenter.interpolate(finalNewCenter, (i+1) / frames));
-                        try { Thread.sleep(1000 / fps); } catch (InterruptedException ex) { };
+                        try { Thread.sleep(1000 / fps); } catch (InterruptedException ex) { }
                     }
                 }

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -851 +851 @@
             return String.class;
         }
-    };
+    }
 
     /**

trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java

@@ -91 +91 @@
         for (OsmPrimitive primitive : toUpdate) {
             if (primitive instanceof Node && !primitive.isNew()) {
-                reader.append((Node)primitive);
+                reader.append(primitive);
             } else if (primitive instanceof Way) {
                 Way way = (Way)primitive;
@@ -107 +107 @@
         for (OsmPrimitive primitive : toUpdate) {
             if (primitive instanceof Way && !primitive.isNew()) {
-                reader.append((Way)primitive);
+                reader.append(primitive);
             }
         }
@@ -116 +116 @@
         for (OsmPrimitive primitive : toUpdate) {
             if (primitive instanceof Relation && !primitive.isNew()) {
-                reader.append((Relation)primitive);
+                reader.append(primitive);
             }
         }

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java

@@ -156 +156 @@
 
     private void updateVisibilityFromTable() {
-        ListSelectionModel s = (ListSelectionModel) table.getSelectionModel();
+        ListSelectionModel s = table.getSelectionModel();
         for (int i = 0; i < layer.trackVisibility.length; i++) {
             layer.trackVisibility[table.convertRowIndexToModel(i)] = s.isSelectedIndex(i);

trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java

@@ -147 +147 @@
             return (float[]) o;
         if (o instanceof List) {
-            List l = (List) o;
+            List<?> l = (List<?>) o;
             float[] a = new float[l.size()];
             for (int i=0; i<l.size(); ++i) {

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -131 +131 @@
         }
 
-        public static Object get(List objects, float index) {
+        public static Object get(List<? extends Object> objects, float index) {
             int idx = Math.round(index);
             if (idx >= 0 && idx < objects.size()) {
@@ -139 +139 @@
         }
 
-        public static List split(String sep, String toSplit) {
+        public static List<String> split(String sep, String toSplit) {
             return Arrays.asList(toSplit.split(Pattern.quote(sep), -1));
         }
@@ -265 +265 @@
         }
 
-        @SuppressWarnings(value = "unchecked")
         public static boolean equal(Object a, Object b) {
             // make sure the casts are done in a meaningful way, so
             // the 2 objects really can be considered equal
-            for (Class klass : new Class[]{Float.class, Boolean.class, Color.class, float[].class, String.class}) {
+            for (Class<?> klass : new Class[]{Float.class, Boolean.class, Color.class, float[].class, String.class}) {
                 Object a2 = Cascade.convertTo(a, klass);
                 Object b2 = Cascade.convertTo(b, klass);
@@ -317 +316 @@
         }
 
-        public static List regexp_match(String pattern, String target, String flags) {
+        public static List<String> regexp_match(String pattern, String target, String flags) {
             int f = 0;
             if (flags.contains("i")) {
@@ -340 +339 @@
         }
 
-        public static List regexp_match(String pattern, String target) {
+        public static List<String> regexp_match(String pattern, String target) {
             Matcher m = Pattern.compile(pattern).matcher(target);
             if (m.matches()) {
@@ -480 +479 @@
         @Override
         public Object evaluate(Environment env) {
-            List l = Cascade.convertTo(arg.evaluate(env), List.class);
+            List<?> l = Cascade.convertTo(arg.evaluate(env), List.class);
             if (l != null)
                 return l.size();

trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java

@@ -347 +347 @@
                                 null // FIXME: provide help context
                                 );
-                    };
+                    }
                 });
             } catch (Exception e) {

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java

@@ -117 +117 @@
                 List<List<String>> data = llEditor.getData();
                 @SuppressWarnings("unchecked")
-                Collection<Collection<String>> stgValue = (Collection) stg.getValue();
+                Collection<Collection<String>> stgValue = (Collection<Collection<String>>) stg.getValue();
                 if (!Preferences.equalArray(stgValue, data)) {
                     e.setValue(new Preferences.ListListSetting(data));

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java

@@ -151 +151 @@
             }
         }
-    };
+    }
 
 

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java

@@ -578 +578 @@
                     try {
                         // TODO there must be a better way to parse a number like "+3" than this.
-                        final int buttonvalue = ((Number)NumberFormat.getIntegerInstance().parse(ai.replace("+", ""))).intValue();
+                        final int buttonvalue = (NumberFormat.getIntegerInstance().parse(ai.replace("+", ""))).intValue();
                         if (auto_increment_selected == buttonvalue) aibutton.setSelected(true);
                         aibutton.addActionListener(new ActionListener() {

trunk/src/org/openstreetmap/josm/io/GpxReader.java

@@ -409 +409 @@
                 link.text = urlname;
                 @SuppressWarnings({ "unchecked", "rawtypes" })
-                Collection<GpxLink> links = (Collection) attr.get(META_LINKS);
+                Collection<GpxLink> links = (Collection<GpxLink>) attr.get(META_LINKS);
                 links.add(link);
             }

trunk/src/org/openstreetmap/josm/io/GpxWriter.java

@@ -82 +82 @@
             if (key.equals(META_LINKS)) {
                 @SuppressWarnings("unchecked")
-                Collection<GpxLink> lValue = obj.getCollection(key);
+                Collection<GpxLink> lValue = (Collection<GpxLink>) obj.getCollection(key);
                 if (lValue != null) {
                     for (GpxLink link : lValue) {

trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java

@@ -135 +135 @@
             final Class<?>[] types = {Boolean.class, String.class, Object.class, ExistingValues.class};
             @Override
-            public Class getColumnClass(int c) {
+            public Class<?> getColumnClass(int c) {
                 return types[c];
             }

trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java

@@ -385 +385 @@
         RequestHandler handler = null;
         try {
-            Class c = handlers.get(cmd);
+            Class<?> c = handlers.get(cmd);
             if (c==null) return null;
             handler = handlers.get(cmd).newInstance();

trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java

@@ -73 +73 @@
         if (exporterClass == null) return null;
         try {
-            @SuppressWarnings("unchecked")
-            Constructor<? extends SessionLayerExporter> constructor = (Constructor) exporterClass.getConstructor(layerClass);
+            Constructor<? extends SessionLayerExporter> constructor = exporterClass.getConstructor(layerClass);
             return constructor.newInstance(layer);
         } catch (Exception e) {

trunk/src/org/openstreetmap/josm/tools/Diff.java

@@ -816 +816 @@
 
             for (int i = 0; i < data.length; ++i) {
-                Integer ir = (Integer)h.get(data[i]);
+                Integer ir = h.get(data[i]);
                 if (ir == null) {
                     h.put(data[i],new Integer(equivs[i] = equiv_max++));

trunk/src/org/openstreetmap/josm/tools/ExifReader.java

@@ -51 +51 @@
     }
 
-    @SuppressWarnings("unchecked") public static Integer readOrientation(File filename) throws ParseException {
+    public static Integer readOrientation(File filename) throws ParseException {
         Integer orientation = null;
         try {

trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java

@@ -18 +18 @@
         /** The standard english texts */
         ENGLISH
-    };
+    }
 
     /**

trunk/src/org/openstreetmap/josm/tools/TextTagParser.java

@@ -110 +110 @@
         private void skipSign() {
             char c;
-            boolean signFound = false;;
+            boolean signFound = false;
             while (pos < n) {
                 c = data.charAt(pos);