Changeset 12537 in josm for trunk/src/org/openstreetmap/josm/io
- Timestamp:
- 2017-07-30T00:22:46+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/io
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java
r12279 r12537 41 41 * We therefore read the property at class loading time and remember it's value. 42 42 */ 43 private static boolean JVM_WILL_USE_SYSTEM_PROXIES;43 private static boolean jvmWillUseSystemProxies; 44 44 static { 45 45 String v = System.getProperty("java.net.useSystemProxies"); 46 46 if (v != null && v.equals(Boolean.TRUE.toString())) { 47 JVM_WILL_USE_SYSTEM_PROXIES= true;47 jvmWillUseSystemProxies = true; 48 48 } 49 49 } … … 59 59 */ 60 60 public static boolean willJvmRetrieveSystemProxies() { 61 return JVM_WILL_USE_SYSTEM_PROXIES;61 return jvmWillUseSystemProxies; 62 62 } 63 63 … … 202 202 switch(proxyPolicy) { 203 203 case USE_SYSTEM_SETTINGS: 204 if (! JVM_WILL_USE_SYSTEM_PROXIES) {204 if (!jvmWillUseSystemProxies) { 205 205 Main.warn(tr("The JVM is not configured to lookup proxies from the system settings. "+ 206 206 "The property ''java.net.useSystemProxies'' was missing at startup time. Will not use a proxy.")); -
trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java
r12439 r12537 45 45 private final OsmDataLayer layer; 46 46 private final Projection projection; 47 private static final boolean skipEmptyNodes= true;47 private static final boolean SKIP_EMPTY_NODES = true; 48 48 49 49 /** … … 165 165 if (p.isIncomplete()) { 166 166 return; 167 } else if ( skipEmptyNodes&& p instanceof Node && p.getKeys().isEmpty()) {167 } else if (SKIP_EMPTY_NODES && p instanceof Node && p.getKeys().isEmpty()) { 168 168 return; 169 169 } -
trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java
r11987 r12537 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>> outputFormatReaders= new ConcurrentHashMap<>();101 static final Map<OverpassOutpoutFormat, Class<? extends AbstractReader>> OUTPUT_FORMAT_READERS = 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 outputFormatReaders.put(Objects.requireNonNull(format), Objects.requireNonNull(readerClass));127 return OUTPUT_FORMAT_READERS.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 = outputFormatReaders.get(OverpassOutpoutFormat.from(m.group(1)));234 Class<? extends AbstractReader> readerClass = OUTPUT_FORMAT_READERS.get(OverpassOutpoutFormat.from(m.group(1))); 235 235 if (readerClass != null) { 236 236 try { -
trunk/src/org/openstreetmap/josm/io/XmlWriter.java
r9828 r12537 62 62 String encS = null; 63 63 if (!keepApos || unencoded.charAt(i) != '\'') { 64 encS = XmlWriter.encoding.get(unencoded.charAt(i));64 encS = ENCODING.get(unencoded.charAt(i)); 65 65 } 66 66 if (encS != null) { … … 80 80 * The output writer to save the values to. 81 81 */ 82 private static final Map<Character, String> encoding= new HashMap<>();82 private static final Map<Character, String> ENCODING = new HashMap<>(); 83 83 static { 84 encoding.put('<', "<");85 encoding.put('>', ">");86 encoding.put('"', """);87 encoding.put('\'', "'");88 encoding.put('&', "&");89 encoding.put('\n', "
");90 encoding.put('\r', "
");91 encoding.put('\t', "	");84 ENCODING.put('<', "<"); 85 ENCODING.put('>', ">"); 86 ENCODING.put('"', """); 87 ENCODING.put('\'', "'"); 88 ENCODING.put('&', "&"); 89 ENCODING.put('\n', "
"); 90 ENCODING.put('\r', "
"); 91 ENCODING.put('\t', "	"); 92 92 } 93 93 -
trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
r12523 r12537 51 51 52 52 private final String sender; 53 private static final Set<String> trustedSenders= new HashSet<>();53 private static final Set<String> TRUSTED_SENDERS = 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() && ! trustedSenders.contains(sender)) {229 if (!sender.isEmpty() && !TRUSTED_SENDERS.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 trustedSenders.add(sender);234 TRUSTED_SENDERS.add(sender); 235 235 else 236 trustedSenders.remove(sender);236 TRUSTED_SENDERS.remove(sender); 237 237 } 238 238 }); … … 263 263 } 264 264 if (buttonIndex == 2) { 265 trustedSenders.remove(sender);265 TRUSTED_SENDERS.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 ( trustedSenders.contains(sender)) {310 if (TRUSTED_SENDERS.contains(sender)) { 311 311 if (Main.getLayerManager().getEditDataSet() != null) { 312 312 for (String[] row : keyValue) { -
trunk/src/org/openstreetmap/josm/io/session/SessionReader.java
r12489 r12537 147 147 } 148 148 149 private static final Map<String, Class<? extends SessionLayerImporter>> sessionLayerImporters= new HashMap<>();149 private static final Map<String, Class<? extends SessionLayerImporter>> SESSION_LAYER_IMPORTERS = new HashMap<>(); 150 150 151 151 private URI sessionFileURI; … … 174 174 */ 175 175 public static void registerSessionLayerImporter(String layerType, Class<? extends SessionLayerImporter> importer) { 176 sessionLayerImporters.put(layerType, importer);176 SESSION_LAYER_IMPORTERS.put(layerType, importer); 177 177 } 178 178 … … 183 183 */ 184 184 public static SessionLayerImporter getSessionLayerImporter(String layerType) { 185 Class<? extends SessionLayerImporter> importerClass = sessionLayerImporters.get(layerType);185 Class<? extends SessionLayerImporter> importerClass = SESSION_LAYER_IMPORTERS.get(layerType); 186 186 if (importerClass == null) 187 187 return null;
Note:
See TracChangeset
for help on using the changeset viewer.