Index: /trunk/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java (revision 6310) @@ -105,5 +105,7 @@ }); } catch (InterruptedException ex) { + Main.warn(ex); } catch (InvocationTargetException ex) { + Main.warn(ex); } } Index: /trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 6310) @@ -12,4 +12,5 @@ import javax.swing.filechooser.FileFilter; +import org.openstreetmap.josm.Main; import org.openstreetmap.josm.gui.MapView; import org.openstreetmap.josm.io.AllFormatsImporter; @@ -62,5 +63,7 @@ importers.add(importer); MapView.addLayerChangeListener(importer); - } catch (Throwable t) { } + } catch (Throwable t) { + Main.debug(t.getMessage()); + } } @@ -81,5 +84,7 @@ exporters.add(exporter); MapView.addLayerChangeListener(exporter); - } catch (Throwable t) { } + } catch (Throwable t) { + Main.debug(t.getMessage()); + } } } Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 6310) @@ -243,4 +243,5 @@ Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.KEY_EVENT_MASK); } catch (SecurityException ex) { + Main.warn(ex); } // would like to but haven't got mouse position yet: Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 6310) @@ -206,4 +206,5 @@ Toolkit.getDefaultToolkit().addAWTEventListener(altKeyListener, AWTEvent.KEY_EVENT_MASK); } catch (SecurityException ex) { + Main.warn(ex); } initialMoveDelay = Main.pref.getInteger("edit.initial-move-delay",200); @@ -228,4 +229,5 @@ Toolkit.getDefaultToolkit().removeAWTEventListener(altKeyListener); } catch (SecurityException ex) { + Main.warn(ex); } super.exitMode(); Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (revision 6310) @@ -150,4 +150,5 @@ AWTEvent.KEY_EVENT_MASK); } catch (SecurityException ex) { + Main.warn(ex); } } @@ -165,4 +166,5 @@ Toolkit.getDefaultToolkit().removeAWTEventListener(this); } catch (SecurityException ex) { + Main.warn(ex); } Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java (revision 6310) @@ -163,4 +163,5 @@ Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.KEY_EVENT_MASK); } catch (SecurityException ex) { + Main.warn(ex); } sourceWays = new LinkedHashSet(getCurrentDataSet().getSelectedWays()); @@ -182,4 +183,5 @@ Toolkit.getDefaultToolkit().removeAWTEventListener(this); } catch (SecurityException ex) { + Main.warn(ex); } removeWayHighlighting(sourceWays); Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 6310) @@ -191,5 +191,7 @@ try { Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.KEY_EVENT_MASK); - } catch (SecurityException ex) {} + } catch (SecurityException ex) { + Main.warn(ex); + } } @@ -203,5 +205,7 @@ try { Toolkit.getDefaultToolkit().removeAWTEventListener(this); - } catch (SecurityException ex) {} + } catch (SecurityException ex) { + Main.warn(ex); + } removeHighlighting(); } Index: /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (revision 6310) @@ -335,5 +335,7 @@ 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,8 +1080,8 @@ } - 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); Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 6310) @@ -738,18 +738,18 @@ /* 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); } Index: /trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java (revision 6310) @@ -160,4 +160,5 @@ download(); } catch (MissingPassword e) { + Main.warn(e); } } Index: /trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (revision 6310) @@ -440,11 +440,11 @@ 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,5 +453,5 @@ } - if(serverProjections == null || serverProjections.isEmpty()) { + if (serverProjections == null || serverProjections.isEmpty()) { try { serverProjections = new ArrayList(); @@ -461,5 +461,6 @@ serverProjections.add(p); } - } catch(Exception e) { + } catch (Exception e) { + Main.warn(e); } } Index: /trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (revision 6310) @@ -89,5 +89,5 @@ } } - while (defaultLayers.remove(null)) {} + while (defaultLayers.remove(null)); Collection defaults = Main.pref.getCollection("imagery.layers.default"); Index: /trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java (revision 6310) @@ -11,4 +11,5 @@ import java.util.regex.Pattern; +import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.data.coor.LatLon; @@ -451,5 +452,7 @@ try { return Integer.parseInt(code.substring(5)); - } catch (NumberFormatException e) {} + } catch (NumberFormatException e) { + Main.warn(e); + } } return null; Index: /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java (revision 6310) @@ -24,4 +24,5 @@ import java.io.Serializable; +import org.openstreetmap.josm.Main; import org.openstreetmap.josm.tools.Utils; @@ -336,4 +337,5 @@ } } catch (CloneNotSupportedException cnse) { + Main.warn(cnse); } return clone; Index: /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java (revision 6310) @@ -19,4 +19,6 @@ */ package org.openstreetmap.josm.data.projection.datum; + +import org.openstreetmap.josm.Main; /** @@ -112,5 +114,7 @@ Class.forName("java.nio.channels.FileChannel"); nioAvailable = true; - } catch (ClassNotFoundException cnfe) {} + } catch (ClassNotFoundException cnfe) { + Main.info(cnfe.getMessage()); + } return nioAvailable; } Index: /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (revision 6310) @@ -438,5 +438,7 @@ x = JOptionPane.getFrameForComponent(parent).getSize(); } - } catch(NullPointerException e) { } + } catch(NullPointerException e) { + Main.warn(e); + } return x; } Index: /trunk/src/org/openstreetmap/josm/gui/MapStatus.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 6310) @@ -218,5 +218,9 @@ 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,5 +341,5 @@ }); } catch (Exception e) { - + Main.warn(e); } } Index: /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 6310) @@ -478,5 +478,5 @@ */ 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,9 +491,12 @@ @Override public void run() { - for (int i=0; i max.x) { - - } int zoomlevel = (Integer)spZoomLevel.getValue(); TileBounds tb = new TileBounds(min, max, zoomlevel); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 6310) @@ -620,5 +620,7 @@ 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)); Index: /trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 6310) @@ -259,11 +259,9 @@ @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--; - } Index: /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 6310) @@ -243,4 +243,5 @@ return colorModes.values()[i]; } catch (Exception e) { + Main.warn(e); } return colorModes.none; Index: /trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 6310) @@ -115,4 +115,5 @@ defPath = OsmFileCacheTileLoader.getDefaultCacheDir().getAbsolutePath(); } catch (SecurityException e) { + Main.warn(e); } PROP_TILECACHE_DIR = new StringProperty(PREFERENCE_PREFIX + ".tilecache_path", defPath); @@ -139,4 +140,5 @@ return loader; } catch (IOException e) { + Main.warn(e); } } @@ -146,6 +148,6 @@ /** - * 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; Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 6310) @@ -348,4 +348,5 @@ orientation = ExifReader.readOrientation(yLayer.data.get(index).getFile()); } catch (Exception e) { + Main.warn(e); } imgDisp.setImage(yLayer.data.get(index).getFile(), orientation); @@ -381,4 +382,5 @@ orientation = ExifReader.readOrientation(sel); } catch (Exception e) { + Main.warn(e); } imgDisp.setImage(sel, orientation); @@ -388,4 +390,5 @@ date = ExifReader.readTime(sel); } catch (Exception e) { + Main.warn(e); } if (date != null) { Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (revision 6310) @@ -80,4 +80,5 @@ Thread.sleep(5); } catch (InterruptedException e) { + Main.warn(e); } } Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java (revision 6310) @@ -82,9 +82,10 @@ 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(); Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 6310) @@ -233,5 +233,7 @@ double syncOffset = Double.parseDouble(exts.get("sync-offset")); audioMarker.syncOffset = syncOffset; - } catch (NumberFormatException nfe) {} + } catch (NumberFormatException nfe) { + Main.warn(nfe); + } } return audioMarker; Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 6310) @@ -115,5 +115,7 @@ try { offset = Double.parseDouble(exts.get("offset")); - } catch (NumberFormatException nfe) {} + } catch (NumberFormatException nfe) { + Main.warn(nfe); + } } if (offset == null) { Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java (revision 6310) @@ -126,4 +126,5 @@ return f; } catch (NumberFormatException e) { + Main.warn(e); } } Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java (revision 6310) @@ -8,4 +8,5 @@ import java.util.Arrays; +import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; @@ -137,12 +138,12 @@ /* 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); } } Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java (revision 6310) @@ -75,6 +75,5 @@ Main.JOSM_WEBSITE+"/mappaint-style-1.0", "resource://data/mappaint-style.xsd"); - while (parser.hasNext()) { - } + while (parser.hasNext()); } finally { closeSourceInputStream(in); @@ -328,6 +327,6 @@ 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) { Index: /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 6310) @@ -419,5 +419,7 @@ setSelectedComponent(sel); } - } catch (IllegalArgumentException e) {} + } catch (IllegalArgumentException e) { + Main.warn(e); + } } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java (revision 6310) @@ -6,4 +6,6 @@ import java.util.Collection; import java.util.Collections; + +import org.openstreetmap.josm.Main; public class GaussKruegerProjectionChoice extends ListProjectionChoice { @@ -32,5 +34,7 @@ try { return Integer.parseInt(zone) - 2; - } catch(NumberFormatException e) {} + } catch(NumberFormatException e) { + Main.warn(e); + } return defaultIndex; } @@ -46,6 +50,5 @@ @Override - public Collection getPreferencesFromCode(String code) - { + public Collection getPreferencesFromCode(String code) { //zone 2 = EPSG:31466 up to zone 5 = EPSG:31469 for (int zone = 2; zone <= 5; zone++) { Index: /trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java (revision 6310) @@ -158,20 +158,17 @@ } - 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 localPath = new ArrayList(Main.pref.getCollection(prefKey)); @@ -184,5 +181,7 @@ Main.pref.putCollection(prefKey, null); } - } catch (java.net.MalformedURLException e) {} + } catch (MalformedURLException e) { + Main.warn(e); + } } Index: /trunk/src/org/openstreetmap/josm/io/OsmApi.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 6310) @@ -537,6 +537,6 @@ 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,5 +546,7 @@ try { Thread.sleep(1000); - } catch (InterruptedException ex) {} + } catch (InterruptedException ex) { + Main.warn(ex); + } } Main.info(tr("OK - trying again.")); Index: /trunk/src/org/openstreetmap/josm/io/imagery/Grabber.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/imagery/Grabber.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/io/imagery/Grabber.java (revision 6310) @@ -66,6 +66,7 @@ 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(); Index: /trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java (revision 6310) @@ -258,5 +258,4 @@ } else if (qName.equals("icon")) { entry.setIcon(accumulator.toString()); - } else { } break; Index: /trunk/src/org/openstreetmap/josm/io/session/SessionReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/session/SessionReader.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/io/session/SessionReader.java (revision 6310) @@ -378,5 +378,7 @@ try { d = Integer.parseInt(sd); - } catch (NumberFormatException ex) {} + } catch (NumberFormatException ex) { + Main.warn(ex); + } if (d != null) { deps.put(idx, d); @@ -492,5 +494,7 @@ double opacity = Double.parseDouble(el.getAttribute("opacity")); layer.setOpacity(opacity); - } catch (NumberFormatException ex) {} + } catch (NumberFormatException ex) { + Main.warn(ex); + } } } Index: /trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java =================================================================== --- /trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 6310) @@ -210,6 +210,9 @@ 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"); Index: /trunk/src/org/openstreetmap/josm/plugins/PluginProxy.java =================================================================== --- /trunk/src/org/openstreetmap/josm/plugins/PluginProxy.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/plugins/PluginProxy.java (revision 6310) @@ -4,4 +4,5 @@ import java.util.List; +import org.openstreetmap.josm.Main; import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.gui.download.DownloadSelection; @@ -29,4 +30,5 @@ 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,4 +40,5 @@ 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,5 +52,5 @@ 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)); Index: /trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (revision 6310) @@ -198,9 +198,10 @@ */ public static void reset() { - if(audioPlayer != null) - { + if(audioPlayer != null) { try { pause(); - } catch(Exception e) {} + } catch(Exception e) { + Main.warn(e); + } audioPlayer.playingUrl = null; } Index: /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 6310) @@ -603,5 +603,7 @@ 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,4 +659,5 @@ return f.toURI().toURL(); } catch (MalformedURLException e) { + Main.warn(e); } } Index: /trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (revision 6310) @@ -23,5 +23,7 @@ } } catch (UnsupportedEncodingException x) { + Main.error(x); } catch (IllegalArgumentException x) { + Main.error(x); } Bounds b = parseShortLink(url); Index: /trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (revision 6310) @@ -14,4 +14,6 @@ import java.util.List; +import org.openstreetmap.josm.Main; + /** * see PlatformHook.java @@ -42,4 +44,5 @@ return; } catch (IOException e) { + Main.warn(e); } } @@ -123,4 +126,5 @@ } } catch (IOException e) { + Main.warn(e); } return null; Index: /trunk/src/org/openstreetmap/josm/tools/Utils.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 6309) +++ /trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 6310) @@ -394,4 +394,5 @@ Thread.sleep(1); } catch (InterruptedException ex) { + Main.warn(ex); } }