Changeset 12542 in josm for trunk/src/org/openstreetmap/josm/io
- Timestamp:
- 2017-07-30T17:07:42+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/io
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java
r12537 r12542 99 99 static final Pattern OUTPUT_FORMAT_STATEMENT = Pattern.compile(".*\\[out:([a-z]{3,})\\].*", Pattern.DOTALL); 100 100 101 static final Map<OverpassOutpoutFormat, Class<? extends AbstractReader>> OUTPUT_FORMAT_READERS= new ConcurrentHashMap<>();101 static final Map<OverpassOutpoutFormat, Class<? extends AbstractReader>> outputFormatReaders = new ConcurrentHashMap<>(); 102 102 103 103 final String overpassServer; … … 125 125 public static final Class<? extends AbstractReader> registerOverpassOutpoutFormatReader( 126 126 OverpassOutpoutFormat format, Class<? extends AbstractReader> readerClass) { 127 return OUTPUT_FORMAT_READERS.put(Objects.requireNonNull(format), Objects.requireNonNull(readerClass));127 return outputFormatReaders.put(Objects.requireNonNull(format), Objects.requireNonNull(readerClass)); 128 128 } 129 129 … … 232 232 Matcher m = OUTPUT_FORMAT_STATEMENT.matcher(overpassQuery); 233 233 if (m.matches()) { 234 Class<? extends AbstractReader> readerClass = OUTPUT_FORMAT_READERS.get(OverpassOutpoutFormat.from(m.group(1)));234 Class<? extends AbstractReader> readerClass = outputFormatReaders.get(OverpassOutpoutFormat.from(m.group(1))); 235 235 if (readerClass != null) { 236 236 try { -
trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
r12537 r12542 51 51 52 52 private final String sender; 53 private static final Set<String> TRUSTED_SENDERS= new HashSet<>();53 private static final Set<String> trustedSenders = new HashSet<>(); 54 54 55 55 static final class PropertyTableModel extends DefaultTableModel { … … 227 227 tablePanel.add(propertyTable.getTableHeader(), GBC.eol().fill(GBC.HORIZONTAL)); 228 228 tablePanel.add(propertyTable, GBC.eol().fill(GBC.BOTH)); 229 if (!sender.isEmpty() && ! TRUSTED_SENDERS.contains(sender)) {229 if (!sender.isEmpty() && !trustedSenders.contains(sender)) { 230 230 final JCheckBox c = new JCheckBox(); 231 231 c.setAction(new AbstractAction(tr("Accept all tags from {0} for this session", sender)) { 232 232 @Override public void actionPerformed(ActionEvent e) { 233 233 if (c.isSelected()) 234 TRUSTED_SENDERS.add(sender);234 trustedSenders.add(sender); 235 235 else 236 TRUSTED_SENDERS.remove(sender);236 trustedSenders.remove(sender); 237 237 } 238 238 }); … … 263 263 } 264 264 if (buttonIndex == 2) { 265 TRUSTED_SENDERS.remove(sender);265 trustedSenders.remove(sender); 266 266 } 267 267 setVisible(false); … … 308 308 */ 309 309 public static void addTags(String[][] keyValue, String sender, Collection<? extends OsmPrimitive> primitives) { 310 if ( TRUSTED_SENDERS.contains(sender)) {310 if (trustedSenders.contains(sender)) { 311 311 if (Main.getLayerManager().getEditDataSet() != null) { 312 312 for (String[] row : keyValue) { -
trunk/src/org/openstreetmap/josm/io/session/SessionReader.java
r12537 r12542 147 147 } 148 148 149 private static final Map<String, Class<? extends SessionLayerImporter>> SESSION_LAYER_IMPORTERS= new HashMap<>();149 private static final Map<String, Class<? extends SessionLayerImporter>> sessionLayerImporters = new HashMap<>(); 150 150 151 151 private URI sessionFileURI; … … 174 174 */ 175 175 public static void registerSessionLayerImporter(String layerType, Class<? extends SessionLayerImporter> importer) { 176 SESSION_LAYER_IMPORTERS.put(layerType, importer);176 sessionLayerImporters.put(layerType, importer); 177 177 } 178 178 … … 183 183 */ 184 184 public static SessionLayerImporter getSessionLayerImporter(String layerType) { 185 Class<? extends SessionLayerImporter> importerClass = SESSION_LAYER_IMPORTERS.get(layerType);185 Class<? extends SessionLayerImporter> importerClass = sessionLayerImporters.get(layerType); 186 186 if (importerClass == null) 187 187 return null;
Note:
See TracChangeset
for help on using the changeset viewer.