Changeset 9822 in josm for trunk/src/org/openstreetmap/josm
- Timestamp:
- 2016-02-18T13:27:27+01:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/Preferences.java
r9821 r9822 1399 1399 } 1400 1400 1401 private class SettingToXml implements SettingVisitor {1401 private static class SettingToXml implements SettingVisitor { 1402 1402 private final StringBuilder b; 1403 1403 private final boolean noPassword; … … 1515 1515 * @param settings preferences settings 1516 1516 * @param nopass if password must be excluded 1517 * @param defaults true, if default values are converted to XML, false for 1518 * regular preferences 1517 1519 * @return XML 1518 1520 */ -
trunk/src/org/openstreetmap/josm/data/preferences/PreferencesReader.java
r9821 r9822 127 127 String localName = parser.getLocalName(); 128 128 if (!topLevelElementName.equals(localName)) { 129 throw new XMLStreamException(tr("Expected element ''{0}'', but got ''{1}''", topLevelElementName, localName), parser.getLocation()); 129 throw new XMLStreamException( 130 tr("Expected element ''{0}'', but got ''{1}''", topLevelElementName, localName), 131 parser.getLocation()); 130 132 } 131 133 try { … … 322 324 * Check if the current element is nil (meaning the value of the setting is null). 323 325 * @return true, if the current element is nil 324 * @see https://msdn.microsoft.com/en-us/library/2b314yt2(v=vs.85).aspx326 * @see <a href="https://msdn.microsoft.com/en-us/library/2b314yt2(v=vs.85).aspx">Nillable Attribute on MS Developer Network</a> 325 327 */ 326 328 private boolean isNil() {
Note:
See TracChangeset
for help on using the changeset viewer.