Changeset 7022 in josm for trunk/src

Timestamp:

2014-04-29T02:07:27+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8465 - enable and fix more warnings

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/PreferencesAction.java (modified) (1 diff)
• data/osm/visitor/paint/WireframeMapRenderer.java (modified) (2 diffs)
• data/validation/tests/RelationChecker.java (modified) (3 diffs)
• gui/conflict/tags/TagConflictResolverTable.java (modified) (1 diff)
• gui/mappaint/mapcss/ExpressionFactory.java (modified) (1 diff)
• gui/tagging/TaggingPresetSelector.java (modified) (2 diffs)
• tools/PlatformHookOsx.java (modified) (2 diffs)

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

@@ -28 +28 @@
     private PreferencesAction(String name, String icon, String tooltip,
                               Class<? extends TabPreferenceSetting> tab, Class<? extends SubPreferenceSetting> subTab) {
-        super(name, icon, tooltip, null, false, "preference_" + Utils.<Class>firstNonNull(tab, subTab).getName(), false);
+        super(name, icon, tooltip, null, false, "preference_" + Utils.<Class<?>>firstNonNull(tab, subTab).getName(), false);
         this.tab = tab;
         this.subTab = subTab;

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java

@@ -12 +12 @@
 import java.awt.geom.GeneralPath;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
@@ -185 +184 @@
 
         // Display highlighted ways after the other ones (fix #8276)
-        for (List<Way> specialWays : Arrays.asList(new List[]{untaggedWays, highlightedWays})) {
-            for (final Way way : specialWays){
-                way.accept(this);
-            }
-            specialWays.clear();
-            displaySegments();
-        }
+        List<Way> specialWays = new ArrayList<>(untaggedWays);
+        specialWays.addAll(highlightedWays);
+        for (final Way way : specialWays){
+            way.accept(this);
+        }
+        specialWays.clear();
+        displaySegments();
 
         for (final OsmPrimitive osm : data.getSelected()) {

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

@@ -6 +6 @@
 
 import java.text.MessageFormat;
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -93 +93 @@
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public void visit(Relation n) {
@@ -201 +200 @@
                         if (r.memberExpression != null) {
                             Set<OsmPrimitive> notMatching = new HashSet<>();
-                            for (Collection<OsmPrimitive> c : Arrays.asList(new Collection[]{ri.nodes, ri.ways, ri.relations})) {
-                                for (OsmPrimitive p : c) {
-                                    if (p.isUsable() && !r.memberExpression.match(p)) {
-                                        notMatching.add(p);
-                                    }
+                            Collection<OsmPrimitive> allPrimitives = new ArrayList<>();
+                            allPrimitives.addAll(ri.nodes);
+                            allPrimitives.addAll(ri.ways);
+                            allPrimitives.addAll(ri.relations);
+                            for (OsmPrimitive p : allPrimitives) {
+                                if (p.isUsable() && !r.memberExpression.match(p)) {
+                                    notMatching.add(p);
                                 }
                             }

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java

@@ -42 +42 @@
         ((MultiValueCellEditor)getColumnModel().getColumn(2).getCellEditor()).addNavigationListeners(this);
 
-        setRowHeight((int)new JosmComboBox().getPreferredSize().getHeight());
+        setRowHeight((int)new JosmComboBox<String>().getPreferredSize().getHeight());
     }
 

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

@@ -391 +391 @@
             // 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);

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

@@ -34 +34 @@
 import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
+import javax.swing.ListCellRenderer;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
@@ -80 +81 @@
     private ActionListener clickListener;
 
-    private static class ResultListCellRenderer extends DefaultListCellRenderer {
+    private static class ResultListCellRenderer implements ListCellRenderer<TaggingPreset> {
+        final DefaultListCellRenderer def = new DefaultListCellRenderer();
         @Override
-        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
-            JLabel result = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-            TaggingPreset tp = (TaggingPreset)value;
+        public Component getListCellRendererComponent(JList<? extends TaggingPreset> list, TaggingPreset tp, int index, boolean isSelected, boolean cellHasFocus) {
+            JLabel result = (JLabel) def.getListCellRendererComponent(list, tp, index, isSelected, cellHasFocus);
             result.setText(tp.getName());
             result.setIcon((Icon) tp.getValue(Action.SMALL_ICON));

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

@@ -39 +39 @@
             Object Ocom_apple_eawt_Application = Ccom_apple_eawt_Application.getConstructor((Class[])null).newInstance((Object[])null);
             Class<?> Ccom_apple_eawt_ApplicationListener = Class.forName("com.apple.eawt.ApplicationListener");
-            Method MaddApplicationListener = Ccom_apple_eawt_Application.getDeclaredMethod("addApplicationListener", new Class[] { Ccom_apple_eawt_ApplicationListener });
-            Object Oproxy = Proxy.newProxyInstance(PlatformHookOsx.class.getClassLoader(), new Class[] { Ccom_apple_eawt_ApplicationListener }, ivhandler);
+            Method MaddApplicationListener = Ccom_apple_eawt_Application.getDeclaredMethod("addApplicationListener", new Class<?>[] { Ccom_apple_eawt_ApplicationListener });
+            Object Oproxy = Proxy.newProxyInstance(PlatformHookOsx.class.getClassLoader(), new Class<?>[] { Ccom_apple_eawt_ApplicationListener }, ivhandler);
             MaddApplicationListener.invoke(Ocom_apple_eawt_Application, new Object[] { Oproxy });
-            Method MsetEnabledPreferencesMenu = Ccom_apple_eawt_Application.getDeclaredMethod("setEnabledPreferencesMenu", new Class[] { boolean.class });
+            Method MsetEnabledPreferencesMenu = Ccom_apple_eawt_Application.getDeclaredMethod("setEnabledPreferencesMenu", new Class<?>[] { boolean.class });
             MsetEnabledPreferencesMenu.invoke(Ocom_apple_eawt_Application, new Object[] { Boolean.TRUE });
         } catch (Exception ex) {
@@ -68 +68 @@
         if (args[0] != null) {
             try {
-                args[0].getClass().getDeclaredMethod("setHandled", new Class[] { boolean.class }).invoke(args[0], new Object[] { handled });
+                args[0].getClass().getDeclaredMethod("setHandled", new Class<?>[] { boolean.class }).invoke(args[0], new Object[] { handled });
             } catch (Exception ex) {
                 Main.warn("Failed to report handled event: " + ex);