Changeset 8394 in josm for trunk/src/org/openstreetmap/josm/tools
- Timestamp:
- 2015-05-18T23:34:11+02:00 (10 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/tools/CopyList.java
r8285 r8394 178 178 } catch (IndexOutOfBoundsException e) { 179 179 checkForComodification(); 180 throw new NoSuchElementException(); 180 throw new NoSuchElementException(e.getMessage()); 181 181 } 182 182 } … … 196 196 expectedModCount = modCount; 197 197 } catch (IndexOutOfBoundsException e) { 198 throw new ConcurrentModificationException(); 198 throw new ConcurrentModificationException(e); 199 199 } 200 200 } -
trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java
r8390 r8394 153 153 Matcher m = p.matcher(preferenceValue); 154 154 if (!m.find()) 155 throw new WindowGeometryException(tr("Preference with key ''{0}'' does not include ''{1}''. Cannot restore window geometry from preferences.", preferenceKey, field)); 155 throw new WindowGeometryException( 156 tr("Preference with key ''{0}'' does not include ''{1}''. Cannot restore window geometry from preferences.", 157 preferenceKey, field)); 156 158 v = m.group(1); 157 159 return Integer.parseInt(v); … … 159 161 throw e; 160 162 } catch(NumberFormatException e) { 161 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)); 163 throw new WindowGeometryException( 164 tr("Preference with key ''{0}'' does not provide an int value for ''{1}''. Got {2}. Cannot restore window geometry from preferences.", 165 preferenceKey, field, v), e); 162 166 } catch(Exception e) { 163 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); 167 throw new WindowGeometryException( 168 tr("Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: {2}. Cannot restore window geometry from preferences.", 169 preferenceKey, field, e.toString()), e); 164 170 } 165 171 } … … 168 174 String value = Main.pref.get(preferenceKey); 169 175 if (value == null || value.isEmpty()) 170 throw new WindowGeometryException(tr("Preference with key ''{0}'' does not exist. Cannot restore window geometry from preferences.", preferenceKey)); 176 throw new WindowGeometryException( 177 tr("Preference with key ''{0}'' does not exist. Cannot restore window geometry from preferences.", preferenceKey)); 171 178 topLeft = new Point(); 172 179 extent = new Dimension();
Note:
See TracChangeset
for help on using the changeset viewer.