Changeset 8373 in josm
- Timestamp:
- 2015-05-17T02:40:26+02:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java
r7575 r8373 54 54 // TODO: Detect conflicts. 55 55 String k = ent.getKey(); 56 if ( k.equals(META_LINKS) && attr.containsKey(META_LINKS)) {56 if (META_LINKS.equals(k) && attr.containsKey(META_LINKS)) { 57 57 Collection<GpxLink> my = super.<GpxLink>getCollection(META_LINKS); 58 58 @SuppressWarnings("unchecked") -
trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
r8331 r8373 292 292 check.fixCommands.add(FixCommand.fixChangeKey(Tag.removeWhiteSpaces(x[0]), Tag.removeWhiteSpaces(x[1]))); 293 293 } else if ("fixDeleteObject".equals(ai.key) && val != null) { 294 CheckParameterUtil.ensureThat( val.equals("this"), "fixDeleteObject must be followed by 'this'");294 CheckParameterUtil.ensureThat("this".equals(val), "fixDeleteObject must be followed by 'this'"); 295 295 check.deletion = true; 296 296 } else if ("suggestAlternative".equals(ai.key) && val != null) { -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
r8338 r8373 482 482 @Override 483 483 public void propertyChange(PropertyChangeEvent evt) { 484 if ( evt.getPropertyName().equals(JSplitPane.DIVIDER_LOCATION_PROPERTY)) {484 if (JSplitPane.DIVIDER_LOCATION_PROPERTY.equals(evt.getPropertyName())) { 485 485 int newVal = (Integer) evt.getNewValue(); 486 486 if (getHeight() != 0) { -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
r8342 r8373 626 626 double speed = dirGps.getDouble(GpsDirectory.TAG_SPEED); 627 627 String speedRef = dirGps.getString(GpsDirectory.TAG_SPEED_REF); 628 if (speedRef != null) { 629 if (speedRef.equalsIgnoreCase("M")) { 630 // miles per hour 631 speed *= 1.609344; 632 } else if (speedRef.equalsIgnoreCase("N")) { 633 // knots == nautical miles per hour 634 speed *= 1.852; 635 } 636 // default is K (km/h) 637 } 628 if ("M".equalsIgnoreCase(speedRef)) { 629 // miles per hour 630 speed *= 1.609344; 631 } else if ("N".equalsIgnoreCase(speedRef)) { 632 // knots == nautical miles per hour 633 speed *= 1.852; 634 } 635 // default is K (km/h) 638 636 e.setSpeed(speed); 639 637 } catch (Exception ex) { -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java
r7881 r8373 40 40 if (litValue instanceof Keyword && "none".equals(((Keyword) litValue).val)) { 41 41 this.val = null; 42 } else if ( key.equals(TEXT)) {42 } else if (TEXT.equals(key)) { 43 43 /* Special case for declaration 'text: ...' 44 44 * … … 77 77 value = val; 78 78 } 79 if ( key.equals(ICON_IMAGE) || key.equals(FILL_IMAGE) || key.equals(REPEAT_IMAGE)) {79 if (ICON_IMAGE.equals(key) || FILL_IMAGE.equals(key) || REPEAT_IMAGE.equals(key)) { 80 80 if (value instanceof String) { 81 81 value = new IconReference((String) value, env.source); -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
r8345 r8373 538 538 if (r.selector instanceof GeneralSelector) { 539 539 GeneralSelector gs = (GeneralSelector) r.selector; 540 if ( gs.getBase().equals("setting")) {540 if ("setting".equals(gs.getBase())) { 541 541 if (!gs.matchesConditions(env)) { 542 542 continue; -
trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
r8308 r8373 119 119 public void initFromPreferences() { 120 120 String url = Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL); 121 if ( url.trim().equals(OsmApi.DEFAULT_API_URL)) {121 if (OsmApi.DEFAULT_API_URL.equals(url.trim())) { 122 122 cbUseDefaultServerUrl.setSelected(true); 123 123 propagator.propagate(OsmApi.DEFAULT_API_URL); … … 137 137 if (cbUseDefaultServerUrl.isSelected()) { 138 138 Main.pref.put("osm-server.url", null); 139 } else if ( hmiUrl.equals(OsmApi.DEFAULT_API_URL)) {139 } else if (OsmApi.DEFAULT_API_URL.equals(hmiUrl)) { 140 140 Main.pref.put("osm-server.url", null); 141 141 } else { -
trunk/src/org/openstreetmap/josm/io/GpxWriter.java
r7518 r8373 95 95 private void writeAttr(IWithAttributes obj, List<String> keys) { 96 96 for (String key : keys) { 97 if ( key.equals(META_LINKS)) {97 if (META_LINKS.equals(key)) { 98 98 Collection<GpxLink> lValue = obj.<GpxLink>getCollection(key); 99 99 if (lValue != null) { … … 102 102 } 103 103 } 104 } else if ( key.equals(META_EXTENSIONS)) {104 } else if (META_EXTENSIONS.equals(key)) { 105 105 Extensions extensions = (Extensions) obj.get(key); 106 106 if (extensions != null) { -
trunk/src/org/openstreetmap/josm/tools/I18n.java
r8352 r8373 451 451 if ("en".equals(loadedCode)) 452 452 return; 453 String enfile = "data/en.lang";454 String langfile = "data/"+loadedCode+".lang";453 final String enfile = "data/en.lang"; 454 final String langfile = "data/"+loadedCode+".lang"; 455 455 try ( 456 456 FileInputStream fis = new FileInputStream(source); … … 461 461 while (!found && (e = jar.getNextEntry()) != null) { 462 462 String name = e.getName(); 463 if (name.equals(enfile))463 if (enfile.equals(name)) 464 464 found = true; 465 465 }
Note:
See TracChangeset
for help on using the changeset viewer.