- Timestamp:
- 2014-05-29T10:27:48+02:00 (11 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
r7119 r7187 535 535 * <tt>osm-primitives.showid</tt> is set. 536 536 * 537 * The id is append to the {@link StringBuilder} passed in in<code>name</code>.537 * The id is append to the {@link StringBuilder} passed in <code>name</code>. 538 538 * 539 539 * @param name the name without the id -
trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
r6920 r7187 150 150 /** 151 151 * Explains a {@link IllegalDataException} which has caused an {@link OsmTransferException}. 152 * This is most likely happening when JOSM tries to load data in inan unsupported format.152 * This is most likely happening when JOSM tries to load data in an unsupported format. 153 153 * 154 154 * @param e the exception -
trunk/src/org/openstreetmap/josm/gui/MainApplication.java
r7043 r7187 546 546 "but <b>failed</b> to do so, because of the following network errors:<br>" + 547 547 "{1}" + 548 "It may result ofa missing proxy configuration.<br>" +548 "It may be due to a missing proxy configuration.<br>" + 549 549 "Would you like to change your proxy settings now?", 550 550 Utils.joinAsHtmlUnorderedList(NETWORK_ERRORS.keySet()), -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
r6990 r7187 965 965 966 966 /** 967 * Validator for user ids entered in ina {@link JTextComponent}.967 * Validator for user ids entered in a {@link JTextComponent}. 968 968 * 969 969 */ … … 1041 1041 1042 1042 /** 1043 * Validates dates entered as text in ina {@link JTextComponent}. Validates the input1043 * Validates dates entered as text in a {@link JTextComponent}. Validates the input 1044 1044 * on the fly and gives feedback about whether the date is valid or not. 1045 1045 * … … 1104 1104 1105 1105 /** 1106 * Validates time values entered as text in ina {@link JTextComponent}. Validates the input1106 * Validates time values entered as text in a {@link JTextComponent}. Validates the input 1107 1107 * on the fly and gives feedback about whether the time value is valid or not. 1108 1108 * -
trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java
r7025 r7187 29 29 30 30 private static final List<Proxy> NO_PROXY_LIST = Collections.singletonList(Proxy.NO_PROXY); 31 31 32 32 private static final String IPV4_LOOPBACK = "127.0.0.1"; 33 33 private static final String IPV6_LOOPBACK = "::1"; … … 93 93 port = Integer.parseInt(value); 94 94 } catch (NumberFormatException e) { 95 Main.error(tr("Unexpected format for port number in inpreference ''{0}''. Got ''{1}''.", property, value));95 Main.error(tr("Unexpected format for port number in preference ''{0}''. Got ''{1}''.", property, value)); 96 96 Main.error(tr("The proxy will not be used.")); 97 97 return 0; -
trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java
r7024 r7187 486 486 /** 487 487 * Explains a {@link IllegalDataException} which has caused an {@link OsmTransferException}. 488 * This is most likely happening when JOSM tries to load data in inan unsupported format.488 * This is most likely happening when JOSM tries to load data in an unsupported format. 489 489 * 490 490 * @param e the exception
Note:
See TracChangeset
for help on using the changeset viewer.