Changeset 12279 in josm for trunk/src/org/openstreetmap/josm/io
- Timestamp:
- 2017-05-30T15:12:36+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/io
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java
r11100 r12279 146 146 proxyExceptions = new HashSet<>( 147 147 Main.pref.getCollection(ProxyPreferencesPanel.PROXY_EXCEPTIONS, 148 Arrays.asList( new String[]{"localhost", IPV4_LOOPBACK, IPV6_LOOPBACK}))148 Arrays.asList("localhost", IPV4_LOOPBACK, IPV6_LOOPBACK)) 149 149 ); 150 150 } -
trunk/src/org/openstreetmap/josm/io/GpxExporter.java
r11620 r12279 148 148 ExtendedDialog ed = new ExtendedDialog(Main.parent, 149 149 tr("Export options"), 150 new String[] {tr("Export and Save"), tr("Cancel")}); 151 ed.setButtonIcons(new String[] {"exportgpx", "cancel"}); 152 ed.setContent(p); 153 ed.showDialog(); 154 155 if (ed.getValue() != 1) { 150 tr("Export and Save"), tr("Cancel")) 151 .setButtonIcons("exportgpx", "cancel") 152 .setContent(p); 153 154 if (ed.showDialog().getValue() != 1) { 156 155 setCanceled(true); 157 156 return; -
trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
r12259 r12279 171 171 break; 172 172 case MIRROR: 173 if (Arrays.asList( new String[] {173 if (Arrays.asList( 174 174 "type", 175 175 "url", 176 176 MIN_ZOOM, 177 177 MAX_ZOOM, 178 TILE_SIZE ,179 }).contains(qName)) {178 TILE_SIZE 179 ).contains(qName)) { 180 180 newState = State.MIRROR_ATTRIBUTE; 181 181 lang = atts.getValue("lang"); … … 186 186 break; 187 187 case ENTRY: 188 if (Arrays.asList( new String[] {188 if (Arrays.asList( 189 189 "name", 190 190 "id", … … 207 207 "date", 208 208 TILE_SIZE, 209 "valid-georeference" ,210 }).contains(qName)) {209 "valid-georeference" 210 ).contains(qName)) { 211 211 newState = State.ENTRY_ATTRIBUTE; 212 212 lang = atts.getValue("lang"); -
trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
r11452 r12279 140 140 false, 141 141 true); 142 setToolTipTexts( new String[]{tr("Add checked tags to selected objects"), tr("Shift+Enter: Add all tags to selected objects"), ""});142 setToolTipTexts(tr("Add checked tags to selected objects"), tr("Shift+Enter: Add all tags to selected objects"), ""); 143 143 144 144 this.sender = senderName; -
trunk/src/org/openstreetmap/josm/io/session/SessionReader.java
r11848 r12279 567 567 Main.parent, 568 568 title, 569 new String[] {tr("Cancel"), tr("Skip layer and continue")} 570 ); 571 dlg.setButtonIcons(new String[] {"cancel", "dialogs/next"}); 572 dlg.setIcon(icon); 573 dlg.setContent(message); 574 dlg.showDialog(); 575 cancel = dlg.getValue() != 2; 569 tr("Cancel"), tr("Skip layer and continue")) 570 .setButtonIcons("cancel", "dialogs/next") 571 .setIcon(icon) 572 .setContent(message); 573 cancel = dlg.showDialog().getValue() != 2; 576 574 }); 577 575 } catch (InvocationTargetException | InterruptedException ex) {
Note:
See TracChangeset
for help on using the changeset viewer.