Changeset 10626 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2016-07-24T13:54:44+02:00 (8 years ago)

Author:

Don-vip

Message:

simplify handling of ignored/traced exceptions

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (4 diffs)
• cache/JCSCachedTileLoaderJob.java (modified) (1 diff)
• osm/TagCollection.java (modified) (1 diff)
• osm/visitor/paint/StyledMapRenderer.java (modified) (1 diff)

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

@@ -793 +793 @@
         } catch (NumberFormatException e) {
             // fall out
-            if (Main.isTraceEnabled()) {
-                Main.trace(e.getMessage());
-            }
+            Main.trace(e);
         }
         return def;
@@ -811 +809 @@
         } catch (NumberFormatException e) {
             // fall out
-            if (Main.isTraceEnabled()) {
-                Main.trace(e.getMessage());
-            }
+            Main.trace(e);
         }
         return def;
@@ -827 +823 @@
         } catch (NumberFormatException e) {
             // fall out
-            if (Main.isTraceEnabled()) {
-                Main.trace(e.getMessage());
-            }
+            Main.trace(e);
         }
         return def;
@@ -843 +837 @@
         } catch (NumberFormatException e) {
             // fall out
-            if (Main.isTraceEnabled()) {
-                Main.trace(e.getMessage());
-            }
+            Main.trace(e);
         }
         return def;

trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

@@ -441 +441 @@
             } catch (NumberFormatException e) {
                 // ignore malformed Cache-Control headers
-                if (Main.isTraceEnabled()) {
-                    Main.trace(e.getMessage());
-                }
+                Main.trace(e);
             }
         }

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

@@ -770 +770 @@
                 result += Integer.parseInt(value);
             } catch (NumberFormatException e) {
-                if (Main.isTraceEnabled()) {
-                    Main.trace(e.getMessage());
-                }
+                Main.trace(e);
             }
         }

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

@@ -304 +304 @@
             gv.setGlyphTransform(0, AffineTransform.getTranslateInstance(1000, 1000));
             Shape shape = gv.getGlyphOutline(0);
-            Main.trace("#10446: shape: "+shape.getBounds());
+            if (Main.isTraceEnabled()) {
+                Main.trace("#10446: shape: "+shape.getBounds());
+            }
             // x is about 1000 on normal stystems and about 2000 when the bug occurs
             int x = shape.getBounds().x;