Changeset 6310 in josm for trunk

Timestamp:

2013-10-07T00:04:48+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/FindBugs - Nested blocks of code should not be left empty

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DownloadPrimitiveAction.java (modified) (1 diff)
• actions/ExtensionFileFilter.java (modified) (3 diffs)
• actions/mapmode/DrawAction.java (modified) (1 diff)
• actions/mapmode/ExtrudeAction.java (modified) (2 diffs)
• actions/mapmode/ImproveWayAccuracyAction.java (modified) (2 diffs)
• actions/mapmode/ParallelWayAction.java (modified) (2 diffs)
• actions/mapmode/SelectAction.java (modified) (2 diffs)
• data/CustomConfigurator.java (modified) (2 diffs)
• data/Preferences.java (modified) (1 diff)
• data/ServerSidePreferences.java (modified) (1 diff)
• data/imagery/ImageryInfo.java (modified) (3 diffs)
• data/imagery/ImageryLayerInfo.java (modified) (1 diff)
• data/projection/CustomProjection.java (modified) (2 diffs)
• data/projection/datum/NTV2SubGrid.java (modified) (2 diffs)
• data/projection/datum/NTV2Util.java (modified) (2 diffs)
• gui/ExtendedDialog.java (modified) (1 diff)
• gui/MapStatus.java (modified) (2 diffs)
• gui/NavigatableComponent.java (modified) (2 diffs)
• gui/bbox/TileSelectionBBoxChooser.java (modified) (1 diff)
• gui/dialogs/properties/TagEditHelper.java (modified) (1 diff)
• gui/download/PlaceSelection.java (modified) (1 diff)
• gui/layer/GpxLayer.java (modified) (1 diff)
• gui/layer/TMSLayer.java (modified) (3 diffs)
• gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (3 diffs)
• gui/layer/geoimage/ImageDisplay.java (modified) (1 diff)
• gui/layer/geoimage/ThumbsLoader.java (modified) (1 diff)
• gui/layer/markerlayer/Marker.java (modified) (1 diff)
• gui/layer/markerlayer/MarkerLayer.java (modified) (1 diff)
• gui/mappaint/Cascade.java (modified) (1 diff)
• gui/mappaint/LineElemStyle.java (modified) (2 diffs)
• gui/mappaint/xml/XmlStyleSource.java (modified) (2 diffs)
• gui/preferences/PreferenceTabbedPane.java (modified) (1 diff)
• gui/preferences/projection/GaussKruegerProjectionChoice.java (modified) (3 diffs)
• io/MirroredInputStream.java (modified) (2 diffs)
• io/OsmApi.java (modified) (2 diffs)
• io/imagery/Grabber.java (modified) (1 diff)
• io/imagery/ImageryReader.java (modified) (1 diff)
• io/session/SessionReader.java (modified) (2 diffs)
• plugins/PluginInformation.java (modified) (1 diff)
• plugins/PluginProxy.java (modified) (4 diffs)
• tools/AudioPlayer.java (modified) (1 diff)
• tools/ImageProvider.java (modified) (2 diffs)
• tools/OsmUrlToBounds.java (modified) (1 diff)
• tools/PlatformHookUnixoid.java (modified) (3 diffs)
• tools/Utils.java (modified) (1 diff)

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

@@ -105 +105 @@
                         });
                     } catch (InterruptedException ex) {
+                        Main.warn(ex);
                     } catch (InvocationTargetException ex) {
+                        Main.warn(ex);
                     }
                 }

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

@@ -12 +12 @@
 import javax.swing.filechooser.FileFilter;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.io.AllFormatsImporter;
@@ -62 +63 @@
                 importers.add(importer);
                 MapView.addLayerChangeListener(importer);
-            } catch (Throwable t) { }
+            } catch (Throwable t) {
+                Main.debug(t.getMessage());
+            }
         }
 
@@ -81 +84 @@
                 exporters.add(exporter);
                 MapView.addLayerChangeListener(exporter);
-            } catch (Throwable t) { }
+            } catch (Throwable t) {
+                Main.debug(t.getMessage());
+            }
         }
     }

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -243 +243 @@
             Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.KEY_EVENT_MASK);
         } catch (SecurityException ex) {
+            Main.warn(ex);
         }
         // would like to but haven't got mouse position yet:

trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

@@ -206 +206 @@
             Toolkit.getDefaultToolkit().addAWTEventListener(altKeyListener, AWTEvent.KEY_EVENT_MASK);
         } catch (SecurityException ex) {
+            Main.warn(ex);
         }
         initialMoveDelay = Main.pref.getInteger("edit.initial-move-delay",200);
@@ -228 +229 @@
             Toolkit.getDefaultToolkit().removeAWTEventListener(altKeyListener);
         } catch (SecurityException ex) {
+            Main.warn(ex);
         }
         super.exitMode();

trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java

@@ -150 +150 @@
                     AWTEvent.KEY_EVENT_MASK);
         } catch (SecurityException ex) {
+            Main.warn(ex);
         }
     }
@@ -165 +166 @@
             Toolkit.getDefaultToolkit().removeAWTEventListener(this);
         } catch (SecurityException ex) {
+            Main.warn(ex);
         }
 

trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java

@@ -163 +163 @@
             Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.KEY_EVENT_MASK);
         } catch (SecurityException ex) {
+            Main.warn(ex);
         }
         sourceWays = new LinkedHashSet<Way>(getCurrentDataSet().getSelectedWays());
@@ -182 +183 @@
             Toolkit.getDefaultToolkit().removeAWTEventListener(this);
         } catch (SecurityException ex) {
+            Main.warn(ex);
         }
         removeWayHighlighting(sourceWays);

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -191 +191 @@
         try {
             Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.KEY_EVENT_MASK);
-        } catch (SecurityException ex) {}
+        } catch (SecurityException ex) {
+            Main.warn(ex);
+        }
     }
 
@@ -203 +205 @@
         try {
             Toolkit.getDefaultToolkit().removeAWTEventListener(this);
-        } catch (SecurityException ex) {}
+        } catch (SecurityException ex) {
+            Main.warn(ex);
+        }
         removeHighlighting();
     }

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

@@ -335 +335 @@
                 try { // proceed only after all other tasks were finished
                     while (busy) CustomConfigurator.class.wait();
-                } catch (InterruptedException ex) { }
+                } catch (InterruptedException ex) {
+                    Main.warn(ex);
+                }
 
                 SwingUtilities.invokeLater(new Runnable() {
@@ -1078 +1080 @@
         }
 
-        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

@@ -738 +738 @@
     /* only for preferences */
     synchronized public String getColorName(String o) {
-        try
-        {
+        try {
             Matcher m = Pattern.compile("mappaint\\.(.+?)\\.(.+)").matcher(o);
             m.matches();
             return tr("Paint style {0}: {1}", tr(m.group(1)), tr(m.group(2)));
-        }
-        catch (Exception e) {}
-        try
-        {
+        } catch (Exception e) {
+            Main.warn(e);
+        }
+        try {
             Matcher m = Pattern.compile("layer (.+)").matcher(o);
             m.matches();
             return tr("Layer: {0}", tr(m.group(1)));
-        }
-        catch (Exception e) {}
+        } catch (Exception e) {
+            Main.warn(e);
+        }
         return tr(colornames.containsKey(o) ? colornames.get(o) : o);
     }

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

@@ -160 +160 @@
             download();
         } catch (MissingPassword e) {
+            Main.warn(e);
         }
     }

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -440 +440 @@
         for (ImageryType type : ImageryType.values()) {
             Matcher m = Pattern.compile(type.getUrlString()+"(?:\\[(?:(\\d+),)?(\\d+)\\])?:(.*)").matcher(url);
-            if(m.matches()) {
+            if (m.matches()) {
                 this.url = m.group(3);
                 this.imageryType = type;
-                if(m.group(2) != null) {
+                if (m.group(2) != null) {
                     defaultMaxZoom = Integer.valueOf(m.group(2));
                 }
-                if(m.group(1) != null) {
+                if (m.group(1) != null) {
                     defaultMinZoom = Integer.valueOf(m.group(1));
                 }
@@ -453 +453 @@
         }
 
-        if(serverProjections == null || serverProjections.isEmpty()) {
+        if (serverProjections == null || serverProjections.isEmpty()) {
             try {
                 serverProjections = new ArrayList<String>();
@@ -461 +461 @@
                         serverProjections.add(p);
                 }
-            } catch(Exception e) {
+            } catch (Exception e) {
+                Main.warn(e);
             }
         }

trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java

@@ -89 +89 @@
             }
         }
-        while (defaultLayers.remove(null)) {}
+        while (defaultLayers.remove(null));
 
         Collection<String> defaults = Main.pref.getCollection("imagery.layers.default");

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

@@ -11 +11 @@
 import java.util.regex.Pattern;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -451 +452 @@
             try {
                 return Integer.parseInt(code.substring(5));
-            } catch (NumberFormatException e) {}
+            } catch (NumberFormatException e) {
+                Main.warn(e);
+            }
         }
         return null;

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

@@ -24 +24 @@
 import java.io.Serializable;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -336 +337 @@
             }
         } catch (CloneNotSupportedException cnse) {
+            Main.warn(cnse);
         }
         return clone;

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java

@@ -19 +19 @@
  */
 package org.openstreetmap.josm.data.projection.datum;
+
+import org.openstreetmap.josm.Main;
 
 /**
@@ -112 +114 @@
             Class.forName("java.nio.channels.FileChannel");
             nioAvailable = true;
-        } catch (ClassNotFoundException cnfe) {}
+        } catch (ClassNotFoundException cnfe) {
+            Main.info(cnfe.getMessage());
+        }
         return nioAvailable;
     }

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

@@ -438 +438 @@
                 x = JOptionPane.getFrameForComponent(parent).getSize();
             }
-        } catch(NullPointerException e) { }
+        } catch(NullPointerException e) {
+            Main.warn(e);
+        }
         return x;
     }

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

@@ -218 +218 @@
                     synchronized (this) {
                         // TODO Would be better if the timeout wasn't necessary
-                        try {wait(1000);} catch (InterruptedException e) {}
+                        try {
+                            wait(1000);
+                        } catch (InterruptedException e) {
+                            Main.warn(e);
+                        }
                         ms.modifiers = mouseState.modifiers;
                         ms.mousePos = mouseState.mousePos;
@@ -337 +341 @@
                         });
                     } catch (Exception e) {
-
+                        Main.warn(e);
                     }
                 }

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

@@ -478 +478 @@
      */
     public void smoothScrollTo(EastNorth newCenter) {
-        // fixme make these configurable.
+        // FIXME make these configurable.
         final int fps = 20;     // animation frames per second
         final int speed = 1500; // milliseconds for full-screen-width pan
@@ -491 +491 @@
                 @Override
                 public void run() {
-                    for (int i=0; i<frames; i++)
-                    {
-                        // fixme - not use zoom history here
+                    for (int i=0; i<frames; i++) {
+                        // 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) {
+                            Main.warn(ex);
+                        }
                     }
                 }

trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java

@@ -408 +408 @@
                 Point min = new Point(valMinX.getTileIndex(), valMinY.getTileIndex());
                 Point max = new Point(valMaxX.getTileIndex(), valMaxY.getTileIndex());
-                if (min.x > max.x) {
-
-                }
                 int zoomlevel = (Integer)spZoomLevel.getValue();
                 TileBounds tb = new TileBounds(min, max, zoomlevel);

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

@@ -620 +620 @@
                     return;
                 }
-            } catch (NumberFormatException ex) { }
+            } catch (NumberFormatException ex) {
+                Main.warn(ex);
+            }
             JOptionPane.showMessageDialog(this, tr("Please enter integer number between 0 and {0}", MAX_LRU_TAGS_NUMBER));
             

trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

@@ -259 +259 @@
         @Override
         public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
-            if (qName.equals("searchresults")) {
-            } else if (qName.equals("description") && description != null) {
+            if (qName.equals("description") && description != null) {
                 currentResult.description = description.toString();
                 description = null;
             }
             depth--;
-
         }
 

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -243 +243 @@
             return colorModes.values()[i];
         } catch (Exception e) {
+            Main.warn(e);
         }
         return colorModes.none;

trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

@@ -115 +115 @@
             defPath = OsmFileCacheTileLoader.getDefaultCacheDir().getAbsolutePath();
         } catch (SecurityException e) {
+            Main.warn(e);
         }
         PROP_TILECACHE_DIR = new StringProperty(PREFERENCE_PREFIX + ".tilecache_path", defPath);
@@ -139 +140 @@
                     return loader;
                 } catch (IOException e) {
+                    Main.warn(e);
                 }
             }
@@ -146 +148 @@
 
     /**
-    * Plugins that wish to set custom tile loader should call this method
-    */
+     * Plugins that wish to set custom tile loader should call this method
+     */
     public static void setCustomTileLoaderFactory(TileLoaderFactory loaderFactory) {
         TMSLayer.loaderFactory = loaderFactory;

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -348 +348 @@
                         orientation = ExifReader.readOrientation(yLayer.data.get(index).getFile());
                     } catch (Exception e) {
+                        Main.warn(e);
                     }
                     imgDisp.setImage(yLayer.data.get(index).getFile(), orientation);
@@ -381 +382 @@
                         orientation = ExifReader.readOrientation(sel);
                     } catch (Exception e) {
+                        Main.warn(e);
                     }
                     imgDisp.setImage(sel, orientation);
@@ -388 +390 @@
                         date = ExifReader.readTime(sel);
                     } catch (Exception e) {
+                        Main.warn(e);
                     }
                     if (date != null) {

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

@@ -80 +80 @@
                     Thread.sleep(5);
                 } catch (InterruptedException e) {
+                    Main.warn(e);
                 }
             }

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java

@@ -82 +82 @@
         BufferedImage scaledBI = new BufferedImage(targetSize.width, targetSize.height, BufferedImage.TYPE_INT_RGB);
         Graphics2D g = scaledBI.createGraphics();
-        while (!g.drawImage(img, 0, 0, targetSize.width, targetSize.height, null))
-        {
+        while (!g.drawImage(img, 0, 0, targetSize.width, targetSize.height, null)) {
             try {
                 Thread.sleep(10);
-            } catch(InterruptedException ie) {}
+            } catch(InterruptedException ie) {
+                Main.warn(ie);
+            }
         }
         g.dispose();

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

@@ -233 +233 @@
                             double syncOffset = Double.parseDouble(exts.get("sync-offset"));
                             audioMarker.syncOffset = syncOffset;
-                        } catch (NumberFormatException nfe) {}
+                        } catch (NumberFormatException nfe) {
+                            Main.warn(nfe);
+                        }
                     }
                     return audioMarker;

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -115 +115 @@
                 try {
                     offset = Double.parseDouble(exts.get("offset"));
-                } catch (NumberFormatException nfe) {}
+                } catch (NumberFormatException nfe) {
+                    Main.warn(nfe);
+                }
             }
             if (offset == null) {

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

@@ -126 +126 @@
                 return f;
             } catch (NumberFormatException e) {
+                Main.warn(e);
             }
         }

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

@@ -8 +8 @@
 import java.util.Arrays;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -137 +138 @@
             /* if we have a "width" tag, try use it */
             String widthTag = env.osm.get("width");
-            if(widthTag == null) {
+            if (widthTag == null) {
                 widthTag = env.osm.get("est_width");
             }
-            if(widthTag != null) {
+            if (widthTag != null) {
                 try {
                     realWidth = Float.valueOf(widthTag);
-                }
-                catch(NumberFormatException nfe) {
+                } catch(NumberFormatException nfe) {
+                    Main.warn(nfe);
                 }
             }

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

@@ -75 +75 @@
                         Main.JOSM_WEBSITE+"/mappaint-style-1.0",
                         "resource://data/mappaint-style.xsd");
-                while (parser.hasNext()) {
-                }
+                while (parser.hasNext());
             } finally {
                 closeSourceInputStream(in);
@@ -328 +327 @@
                 int numOver = 0, numUnder = 0;
 
-                while (mc.hasLayer(String.format("over_%d", ++numOver))) {}
-                while (mc.hasLayer(String.format("under_%d", ++numUnder))) {}
+                while (mc.hasLayer(String.format("over_%d", ++numOver)));
+                while (mc.hasLayer(String.format("under_%d", ++numUnder)));
 
                 for (LinemodPrototype mod : p.linemods) {

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

@@ -419 +419 @@
                 setSelectedComponent(sel);
             }
-        } catch (IllegalArgumentException e) {}
+        } catch (IllegalArgumentException e) {
+            Main.warn(e);
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java

@@ -6 +6 @@
 import java.util.Collection;
 import java.util.Collections;
+
+import org.openstreetmap.josm.Main;
 
 public class GaussKruegerProjectionChoice extends ListProjectionChoice {
@@ -32 +34 @@
         try {
             return Integer.parseInt(zone) - 2;
-        } catch(NumberFormatException e) {}
+        } catch(NumberFormatException e) {
+            Main.warn(e);
+        }
         return defaultIndex;
     }
@@ -46 +50 @@
 
     @Override
-    public Collection<String> getPreferencesFromCode(String code)
-    {
+    public Collection<String> getPreferencesFromCode(String code) {
         //zone 2 = EPSG:31466 up to zone 5 = EPSG:31469
         for (int zone = 2; zone <= 5; zone++) {

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

@@ -158 +158 @@
     }
 
-    public File getFile()
-    {
+    public File getFile() {
         return file;
     }
 
-    static public void cleanup(String name)
-    {
+    public static void cleanup(String name) {
         cleanup(name, null);
     }
-    static public void cleanup(String name, String destDir)
-    {
+    
+    public static void cleanup(String name, String destDir) {
         URL url;
         try {
             url = new URL(name);
-            if (!url.getProtocol().equals("file"))
-            {
+            if (!url.getProtocol().equals("file")) {
                 String prefKey = getPrefKey(url, destDir);
                 List<String> localPath = new ArrayList<String>(Main.pref.getCollection(prefKey));
@@ -184 +181 @@
                 Main.pref.putCollection(prefKey, null);
             }
-        } catch (java.net.MalformedURLException e) {}
+        } catch (MalformedURLException e) {
+            Main.warn(e);
+        }
     }
 

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

@@ -537 +537 @@
 
     private void sleepAndListen(int retry, ProgressMonitor monitor) throws OsmTransferCanceledException {
-        System.out.print(tr("Waiting 10 seconds ... "));
-        for(int i=0; i < 10; i++) {
+        Main.info(tr("Waiting 10 seconds ... "));
+        for (int i=0; i < 10; i++) {
             if (monitor != null) {
                 monitor.setCustomText(tr("Starting retry {0} of {1} in {2} seconds ...", getMaxRetries() - retry,getMaxRetries(), 10-i));
@@ -546 +546 @@
             try {
                 Thread.sleep(1000);
-            } catch (InterruptedException ex) {}
+            } catch (InterruptedException ex) {
+                Main.warn(ex);
+            }
         }
         Main.info(tr("OK - trying again."));

trunk/src/org/openstreetmap/josm/io/imagery/Grabber.java

@@ -66 +66 @@
                 try { // sleep some time and then ask the server again
                     Thread.sleep(random(1000, 2000));
-                } catch (InterruptedException e1) {}
-
+                } catch (InterruptedException e1) {
+                    Main.debug(e1.getMessage());
+                }
                 if(i == maxTries) {
                     e.printStackTrace();

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -258 +258 @@
                 } else if (qName.equals("icon")) {
                     entry.setIcon(accumulator.toString());
-                } else {
                 }
                 break;

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

@@ -378 +378 @@
                             try {
                                 d = Integer.parseInt(sd);
-                            } catch (NumberFormatException ex) {}
+                            } catch (NumberFormatException ex) {
+                                Main.warn(ex);
+                            }
                             if (d != null) {
                                 deps.put(idx, d);
@@ -492 +494 @@
                     double opacity = Double.parseDouble(el.getAttribute("opacity"));
                     layer.setOpacity(opacity);
-                } catch (NumberFormatException ex) {}
+                } catch (NumberFormatException ex) {
+                    Main.warn(ex);
+                }
             }
         }

trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java

@@ -210 +210 @@
         stage = stageStr == null ? 50 : Integer.parseInt(stageStr);
         version = attr.getValue("Plugin-Version");
-        try { mainversion = Integer.parseInt(attr.getValue("Plugin-Mainversion")); }
-        catch(NumberFormatException e) {}
+        try {
+            mainversion = Integer.parseInt(attr.getValue("Plugin-Mainversion"));
+        } catch(NumberFormatException e) {
+            Main.warn(e);
+        }
         author = attr.getValue("Author");
         iconPath = attr.getValue("Plugin-Icon");

trunk/src/org/openstreetmap/josm/plugins/PluginProxy.java

@@ -4 +4 @@
 import java.util.List;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.download.DownloadSelection;
@@ -29 +30 @@
             plugin.getClass().getMethod("mapFrameInitialized", MapFrame.class, MapFrame.class).invoke(plugin, oldFrame, newFrame);
         } catch (NoSuchMethodException e) {
+            Main.debug("Plugin "+plugin+" does not define mapFrameInitialized");
         } catch (Exception e) {
             BugReportExceptionHandler.handleException(new PluginException(this, getPluginInformation().name, e));
@@ -38 +40 @@
             return (PreferenceSetting)plugin.getClass().getMethod("getPreferenceSetting").invoke(plugin);
         } catch (NoSuchMethodException e) {
+            Main.debug("Plugin "+plugin+" does not define getPreferenceSetting");
             return null;
         } catch (Exception e) {
@@ -49 +52 @@
             plugin.getClass().getMethod("addDownloadSelection", List.class).invoke(plugin, list);
         } catch (NoSuchMethodException e) {
-            // ignore
+            Main.debug("Plugin "+plugin+" does not define addDownloadSelection");
         } catch (Exception e) {
             BugReportExceptionHandler.handleException(new PluginException(this, getPluginInformation().name, e));

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

@@ -198 +198 @@
      */
     public static void reset() {
-        if(audioPlayer != null)
-        {
+        if(audioPlayer != null) {
             try {
                 pause();
-            } catch(Exception e) {}
+            } catch(Exception e) {
+                Main.warn(e);
+            }
             audioPlayer.playingUrl = null;
         }

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

@@ -603 +603 @@
                         try {
                             img = ImageIO.read(new ByteArrayInputStream(buf));
-                        } catch (IOException e) {}
+                        } catch (IOException e) {
+                            Main.warn(e);
+                        }
                         return img == null ? null : new ImageResource(img);
                     default:
@@ -657 +659 @@
                     return f.toURI().toURL();
             } catch (MalformedURLException e) {
+                Main.warn(e);
             }
         }

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

@@ -23 +23 @@
             }
         } catch (UnsupportedEncodingException x) {
+            Main.error(x);
         } catch (IllegalArgumentException x) {
+            Main.error(x);
         }
         Bounds b = parseShortLink(url);

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

@@ -14 +14 @@
 import java.util.List;
 
+import org.openstreetmap.josm.Main;
+
 /**
  * see PlatformHook.java
@@ -42 +44 @@
                 return;
             } catch (IOException e) {
+                Main.warn(e);
             }
         }
@@ -123 +126 @@
             }
         } catch (IOException e) {
+            Main.warn(e);
         }
         return null;

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

@@ -394 +394 @@
                     Thread.sleep(1);
                 } catch (InterruptedException ex) {
+                    Main.warn(ex);
                 }
             }