Changeset 8394 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2015-05-18T23:34:11+02:00 (7 years ago)

Author:

Don-vip

Message:

• global use of String.isEmpty()
• Correctness - Method throws alternative exception from catch block without history

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• CopyList.java (modified) (2 diffs)
• WindowGeometry.java (modified) (3 diffs)

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

@@ -178 +178 @@
             } catch (IndexOutOfBoundsException e) {
                 checkForComodification();
-                throw new NoSuchElementException();
+                throw new NoSuchElementException(e.getMessage());
             }
         }
@@ -196 +196 @@
                 expectedModCount = modCount;
             } catch (IndexOutOfBoundsException e) {
-                throw new ConcurrentModificationException();
+                throw new ConcurrentModificationException(e);
             }
         }

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

@@ -153 +153 @@
             Matcher m = p.matcher(preferenceValue);
             if (!m.find())
-                throw new WindowGeometryException(tr("Preference with key ''{0}'' does not include ''{1}''. Cannot restore window geometry from preferences.", preferenceKey, field));
+                throw new WindowGeometryException(
+                        tr("Preference with key ''{0}'' does not include ''{1}''. Cannot restore window geometry from preferences.",
+                                preferenceKey, field));
             v = m.group(1);
             return Integer.parseInt(v);
@@ -159 +161 @@
             throw e;
         } catch(NumberFormatException e) {
-            throw new WindowGeometryException(tr("Preference with key ''{0}'' does not provide an int value for ''{1}''. Got {2}. Cannot restore window geometry from preferences.", preferenceKey, field, v));
+            throw new WindowGeometryException(
+                    tr("Preference with key ''{0}'' does not provide an int value for ''{1}''. Got {2}. Cannot restore window geometry from preferences.",
+                            preferenceKey, field, v), e);
         } catch(Exception e) {
-            throw new WindowGeometryException(tr("Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: {2}. Cannot restore window geometry from preferences.", preferenceKey, field, e.toString()), e);
+            throw new WindowGeometryException(
+                    tr("Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: {2}. Cannot restore window geometry from preferences.",
+                            preferenceKey, field, e.toString()), e);
         }
     }
@@ -168 +174 @@
         String value = Main.pref.get(preferenceKey);
         if (value == null || value.isEmpty())
-            throw new WindowGeometryException(tr("Preference with key ''{0}'' does not exist. Cannot restore window geometry from preferences.", preferenceKey));
+            throw new WindowGeometryException(
+                    tr("Preference with key ''{0}'' does not exist. Cannot restore window geometry from preferences.", preferenceKey));
         topLeft = new Point();
         extent = new Dimension();