Changeset 9991 in josm
- Timestamp:
- 2016-03-14T02:10:35+01:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
r9977 r9991 67 67 * @param fastFail whether opening HTTP connections should fail fast, see {@link ImageryReader#setFastFail(boolean)} 68 68 */ 69 69 public void load(boolean fastFail) { 70 70 clear(); 71 71 List<ImageryPreferenceEntry> entries = Main.pref.getListOfStructs("imagery.entries", null, ImageryPreferenceEntry.class); -
trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
r9978 r9991 290 290 // WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search 291 291 private static final String[] GENERIC_TLDS = new String[] { 292 292 // Taken from Version 2016031001, Last Updated Fri Mar 11 07:07:01 2016 UTC 293 293 "aaa", // aaa American Automobile Association, Inc. 294 294 "aarp", // aarp AARP … … 1262 1262 "al", // Albania 1263 1263 "am", // Armenia 1264 // "an",// Netherlands Antilles (retired)1264 //"an", // Netherlands Antilles (retired) 1265 1265 "ao", // Angola 1266 1266 "aq", // Antarctica … … 1477 1477 "tn", // Tunisia 1478 1478 "to", // Tonga 1479 // "tp",// East Timor (Retired)1479 //"tp", // East Timor (Retired) 1480 1480 "tr", // Turkey 1481 1481 "tt", // Trinidad and Tobago -
trunk/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java
r9983 r9991 155 155 156 156 private static final int PARSE_AUTHORITY_HOST_IP = 2; // excludes userinfo, if present 157 158 // Not needed, because it is validated by AUTHORITY_REGEX159 // private static final int PARSE_AUTHORITY_PORT = 3;160 157 161 158 /** -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
r9659 r9991 231 231 } 232 232 ); 233 registerCopyPasteAction(tagEditorPanel.getPasteAction(), 234 "PASTE_TAGS", 235 // CHECKSTYLE.OFF: LineLength 233 // CHECKSTYLE.OFF: LineLength 234 registerCopyPasteAction(tagEditorPanel.getPasteAction(), "PASTE_TAGS", 236 235 Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")), KeyEvent.VK_V, Shortcut.CTRL_SHIFT).getKeyStroke()); 237 236 // CHECKSTYLE.ON: LineLength 238 237 239 238 registerCopyPasteAction(new PasteMembersAction(memberTableModel, getLayer(), this) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DownloadSelectedIncompleteMembersAction.java
r9665 r9991 9 9 import org.openstreetmap.josm.Main; 10 10 import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationMemberTask; 11 import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor; 11 12 import org.openstreetmap.josm.gui.dialogs.relation.MemberTable; 12 13 import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel; 13 import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;14 14 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 15 15 import org.openstreetmap.josm.io.OnlineResource; … … 33 33 OsmDataLayer layer, IRelationEditor editor) { 34 34 super(memberTable, memberTableModel, actionMapKey, layer, editor); 35 // Shortcut.register Shortcut("relationeditor:downloadincomplete", tr("Relation Editor: Download Members"),36 // KeyEvent.VK_K, Shortcut.ALT)37 35 putValue(SHORT_DESCRIPTION, tr("Download selected incomplete members")); 38 36 putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "downloadincompleteselected")); -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/ReverseAction.java
r9665 r9991 26 26 putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "reverse")); 27 27 putValue(NAME, tr("Reverse")); 28 // Shortcut.register Shortcut("relationeditor:reverse", tr("Relation Editor: Reverse"), KeyEvent.VK_END, Shortcut.ALT)29 28 updateEnabledState(); 30 29 } -
trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
r9972 r9991 544 544 * @return {@code true} if this preset matches the primitive 545 545 */ 546 546 @Override 547 547 public boolean evaluate(OsmPrimitive p) { 548 548 return matches(EnumSet.of(TaggingPresetType.forPrimitive(p)), p.getKeys(), false); -
trunk/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java
r9978 r9991 210 210 * @return this 211 211 */ 212 212 public FileChooserManager title(String value) { 213 213 title = value; 214 214 return this;
Note:
See TracChangeset
for help on using the changeset viewer.