Index: trunk/src/org/openstreetmap/josm/Main.java =================================================================== --- trunk/src/org/openstreetmap/josm/Main.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/Main.java (revision 6990) @@ -1056,7 +1056,7 @@ } else if (os.toLowerCase().startsWith("windows")) { platform = new PlatformHookWindows(); - } else if (os.equals("Linux") || os.equals("Solaris") || - os.equals("SunOS") || os.equals("AIX") || - os.equals("FreeBSD") || os.equals("NetBSD") || os.equals("OpenBSD")) { + } else if ("Linux".equals(os) || "Solaris".equals(os) || + "SunOS".equals(os) || "AIX".equals(os) || + "FreeBSD".equals(os) || "NetBSD".equals(os) || "OpenBSD".equals(os)) { platform = new PlatformHookUnixoid(); } else if (os.toLowerCase().startsWith("mac os x")) { Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (revision 6990) @@ -81,5 +81,5 @@ String[] table = url.split("\\?|=|&"); for (int i = 0; i 0 && !key.equals("*")) { + if (regexp && key.length() > 0 && !"*".equals(key)) { try { keyPattern = Pattern.compile(key, regexFlags(false)); @@ -614,5 +614,5 @@ keyPattern = null; } - if (regexp && this.value.length() > 0 && !this.value.equals("*")) { + if (regexp && this.value.length() > 0 && !"*".equals(this.value)) { try { valuePattern = Pattern.compile(this.value, regexFlags(false)); @@ -769,5 +769,5 @@ private String user; public UserMatch(String user) { - if (user.equals("anonymous")) { + if ("anonymous".equals(user)) { this.user = null; } else { @@ -1314,9 +1314,9 @@ value = ""; } - if (key.equals("type")) + if ("type".equals(key)) return new ExactType(value); - else if (key.equals("user")) + else if ("user".equals(key)) return new UserMatch(value); - else if (key.equals("role")) + else if ("role".equals(key)) return new RoleMatch(value); else Index: trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java =================================================================== --- trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (revision 6990) @@ -191,5 +191,5 @@ String sign = matcher.group(1); String rest = matcher.group(2); - sign = sign.equals("-") ? "" : "-"; + sign = "-".equals(sign) ? "" : "-"; return sign + rest; } Index: trunk/src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 6990) @@ -1365,15 +1365,16 @@ int event = parser.next(); if (event == XMLStreamConstants.START_ELEMENT) { - if (parser.getLocalName().equals("tag")) { + String localName = parser.getLocalName(); + if ("tag".equals(localName)) { settingsMap.put(parser.getAttributeValue(null, "key"), new StringSetting(parser.getAttributeValue(null, "value"))); jumpToEnd(); - } else if (parser.getLocalName().equals("list") || - parser.getLocalName().equals("collection") || - parser.getLocalName().equals("lists") || - parser.getLocalName().equals("maps") + } else if ("list".equals(localName) || + "collection".equals(localName) || + "lists".equals(localName) || + "maps".equals(localName) ) { parseToplevelList(); } else { - throwException("Unexpected element: "+parser.getLocalName()); + throwException("Unexpected element: "+localName); } } else if (event == XMLStreamConstants.END_ELEMENT) { @@ -1404,5 +1405,6 @@ int event = parser.next(); if (event == XMLStreamConstants.START_ELEMENT) { - if (parser.getLocalName().equals("entry")) { + String localName = parser.getLocalName(); + if ("entry".equals(localName)) { if (entries == null) { entries = new ArrayList(); @@ -1410,10 +1412,10 @@ entries.add(parser.getAttributeValue(null, "value")); jumpToEnd(); - } else if (parser.getLocalName().equals("list")) { + } else if ("list".equals(localName)) { if (lists == null) { lists = new ArrayList>(); } lists.add(parseInnerList()); - } else if (parser.getLocalName().equals("map")) { + } else if ("map".equals(localName)) { if (maps == null) { maps = new ArrayList>(); @@ -1421,5 +1423,5 @@ maps.add(parseMap()); } else { - throwException("Unexpected element: "+parser.getLocalName()); + throwException("Unexpected element: "+localName); } } else if (event == XMLStreamConstants.END_ELEMENT) { @@ -1434,7 +1436,7 @@ settingsMap.put(key, new MapListSetting(Collections.unmodifiableList(maps))); } else { - if (name.equals("lists")) { + if ("lists".equals(name)) { settingsMap.put(key, new ListListSetting(Collections.>emptyList())); - } else if (name.equals("maps")) { + } else if ("maps".equals(name)) { settingsMap.put(key, new MapListSetting(Collections.>emptyList())); } else { @@ -1449,5 +1451,5 @@ int event = parser.next(); if (event == XMLStreamConstants.START_ELEMENT) { - if (parser.getLocalName().equals("entry")) { + if ("entry".equals(parser.getLocalName())) { entries.add(parser.getAttributeValue(null, "value")); jumpToEnd(); @@ -1467,5 +1469,5 @@ int event = parser.next(); if (event == XMLStreamConstants.START_ELEMENT) { - if (parser.getLocalName().equals("tag")) { + if ("tag".equals(parser.getLocalName())) { map.put(parser.getAttributeValue(null, "key"), parser.getAttributeValue(null, "value")); jumpToEnd(); @@ -1500,5 +1502,5 @@ @Override public void visit(StringSetting setting) { - if (noPassword && key.equals("osm-server.password")) + if (noPassword && "osm-server.password".equals(key)) return; // do not store plain password. /* don't save default values */ Index: trunk/src/org/openstreetmap/josm/data/Version.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/Version.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/data/Version.java (revision 6990) @@ -131,5 +131,5 @@ isLocalBuild = false; value = properties.get("Is-Local-Build"); - if (value != null && value.trim().equalsIgnoreCase("true")) { + if (value != null && "true".equalsIgnoreCase(value.trim())) { isLocalBuild = true; } Index: trunk/src/org/openstreetmap/josm/data/coor/LatLon.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 6990) @@ -136,9 +136,9 @@ String sSeconds = cDmsSecondFormatter.format(tSeconds); - if (sSeconds.equals(cDms60)) { + if (cDms60.equals(sSeconds)) { sSeconds = cDms00; sMinutes = cDmsMinuteFormatter.format(tMinutes+1); } - if (sMinutes.equals("60")) { + if ("60".equals(sMinutes)) { sMinutes = "00"; sDegrees = Integer.toString(tDegree+1); Index: trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (revision 6990) @@ -765,5 +765,5 @@ public void setAttribution(AbstractTileSource s) { if (attributionText != null) { - if (attributionText.equals("osm")) { + if ("osm".equals(attributionText)) { s.setAttributionText(new Mapnik().getAttributionText(0, null, null)); } else { @@ -772,5 +772,5 @@ } if (attributionLinkURL != null) { - if (attributionLinkURL.equals("osm")) { + if ("osm".equals(attributionLinkURL)) { s.setAttributionLinkURL(new Mapnik().getAttributionLinkURL()); } else { @@ -791,5 +791,5 @@ } if (termsOfUseURL != null) { - if (termsOfUseURL.equals("osm")) { + if ("osm".equals(termsOfUseURL)) { s.setTermsOfUseURL(new Mapnik().getTermsOfUseURL()); } else { Index: trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (revision 6990) @@ -175,4 +175,8 @@ } + /** + * Replies the list of open changesets. + * @return The list of open changesets + */ public List getOpenChangesets() { List ret = new ArrayList(); @@ -190,5 +194,5 @@ @Override public void preferenceChanged(PreferenceChangeEvent e) { - if (e.getKey() == null || ! e.getKey().equals("osm-server.url")) + if (e.getKey() == null || !"osm-server.url".equals(e.getKey())) return; Index: trunk/src/org/openstreetmap/josm/data/osm/TigerUtils.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/TigerUtils.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/data/osm/TigerUtils.java (revision 6990) @@ -28,6 +28,11 @@ } + /** + * Determines if the given key denotes an integer value. + * @param name The key to determine + * @return {@code true} if the given key denotes an integer value + */ public static boolean tagIsInt(String name) { - if (name.equals("tiger:tlid")) + if ("tiger:tlid".equals(name)) return true; return false; Index: trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java (revision 6990) @@ -173,5 +173,5 @@ String key = m.group(1); // alias - if (key.equals("k")) { + if ("k".equals(key)) { key = Param.k_0.key; } @@ -181,5 +181,5 @@ // some aliases if (key.equals(Param.proj.key)) { - if (value.equals("longlat") || value.equals("latlon") || value.equals("latlong")) { + if ("longlat".equals(value) || "latlon".equals(value) || "latlong".equals(value)) { value = "lonlat"; } @@ -264,5 +264,5 @@ nadgridsId = nadgridsId.substring(1); } - if (nadgridsId.equals("null")) + if ("null".equals(nadgridsId)) return new NullDatum(null, ellps); NTV2GridShiftFileWrapper nadgrids = Projections.getNTV2Grid(nadgridsId); Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java (revision 6990) @@ -169,5 +169,5 @@ HashMap> subGridMap = new HashMap>(); for (int i = 0; i < subGrid.length; i++) { - if (subGrid[i].getParentSubGridName().equalsIgnoreCase("NONE")) { + if ("NONE".equalsIgnoreCase(subGrid[i].getParentSubGridName())) { topLevelCount++; } @@ -177,5 +177,5 @@ topLevelCount = 0; for (int i = 0; i < subGrid.length; i++) { - if (subGrid[i].getParentSubGridName().equalsIgnoreCase("NONE")) { + if ("NONE".equalsIgnoreCase(subGrid[i].getParentSubGridName())) { topLevelSubGrid[topLevelCount++] = subGrid[i]; } else { Index: trunk/src/org/openstreetmap/josm/data/validation/Test.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/Test.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/data/validation/Test.java (revision 6990) @@ -327,5 +327,5 @@ protected static final boolean isBuilding(OsmPrimitive p) { String v = p.get("building"); - return v != null && !v.equals("no") && !v.equals("entrance"); + return v != null && !"no".equals(v) && !"entrance".equals(v); } } Index: trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 6990) @@ -445,10 +445,10 @@ private String getNameTagValue(IRelation relation, String nameTag) { - if (nameTag.equals("name")) { + if ("name".equals(nameTag)) { if (Main.pref.getBoolean("osm-primitives.localize-name", true)) return relation.getLocalName(); else return relation.getName(); - } else if (nameTag.equals(":LocationCode")) { + } else if (":LocationCode".equals(nameTag)) { for (String m : relation.keySet()) { if (m.endsWith(nameTag)) Index: trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java (revision 6990) @@ -62,8 +62,8 @@ @Override public void propertyChange(PropertyChangeEvent evt) { - if (evt.getPropertyName().equals("active")) { + if ("active".equals(evt.getPropertyName())) { setSelected((Boolean)evt.getNewValue()); requestFocusInWindow(); - } else if (evt.getPropertyName().equals("selected")) { + } else if ("selected".equals(evt.getPropertyName())) { setSelected((Boolean)evt.getNewValue()); } Index: trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (revision 6990) @@ -21,5 +21,5 @@ /** - * JosmUserStateManager is a global object which keeps track of what JOSM knows about + * JosmUserIdentityManager is a global object which keeps track of what JOSM knows about * the identity of the current user. * @@ -37,10 +37,10 @@ * of the current user. * - * The global JosmUserStateManager listens to {@link PreferenceChangeEvent}s and keeps track + * The global JosmUserIdentityManager listens to {@link PreferenceChangeEvent}s and keeps track * of what the current JOSM instance knows about the current user. Other subsystems can - * let the global JosmUserStateManager know in case they fully identify the current user, see + * let the global JosmUserIdentityManager know in case they fully identify the current user, see * {@link #setFullyIdentified}. * - * The information kept by the JosmUserStateManager can be used to + * The information kept by the JosmUserIdentityManager can be used to *
    *
  • safely query changesets owned by the current user based on its user id, not on its user name
    • @@ -242,5 +242,5 @@ @Override public void preferenceChanged(PreferenceChangeEvent evt) { - if (evt.getKey().equals("osm-server.username")) { + if ("osm-server.username".equals(evt.getKey())) { if (!(evt.getNewValue() instanceof StringSetting)) return; String newValue = ((StringSetting) evt.getNewValue()).getValue(); @@ -254,5 +254,5 @@ return; - } else if (evt.getKey().equals("osm-server.url")) { + } else if ("osm-server.url".equals(evt.getKey())) { if (!(evt.getNewValue() instanceof StringSetting)) return; String newValue = ((StringSetting) evt.getNewValue()).getValue(); @@ -263,8 +263,8 @@ } - } else if (evt.getKey().equals("oauth.access-token.key")) { + } else if ("oauth.access-token.key".equals(evt.getKey())) { accessTokenKeyChanged = true; - } else if (evt.getKey().equals("oauth.access-token.secret")) { + } else if ("oauth.access-token.secret".equals(evt.getKey())) { accessTokenSecretChanged = true; } Index: trunk/src/org/openstreetmap/josm/gui/MainMenu.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MainMenu.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/MainMenu.java (revision 6990) @@ -753,5 +753,5 @@ @Override public void preferenceChanged(PreferenceChangeEvent e) { - if (e.getKey().equals("audio.menuinvisible")) { + if ("audio.menuinvisible".equals(e.getKey())) { showAudioMenu(!Boolean.parseBoolean(e.getNewValue().toString())); } Index: trunk/src/org/openstreetmap/josm/gui/MapMover.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapMover.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/MapMover.java (revision 6990) @@ -41,20 +41,21 @@ @Override public void actionPerformed(ActionEvent e) { - if (action.equals(".") || action.equals(",")) { + if (".".equals(action) || ",".equals(action)) { Point mouse = nc.getMousePosition(); if (mouse == null) mouse = new Point((int)nc.getBounds().getCenterX(), (int)nc.getBounds().getCenterY()); - MouseWheelEvent we = new MouseWheelEvent(nc, e.getID(), e.getWhen(), e.getModifiers(), mouse.x, mouse.y, 0, false, MouseWheelEvent.WHEEL_UNIT_SCROLL, 1, action.equals(",") ? -1 : 1); + MouseWheelEvent we = new MouseWheelEvent(nc, e.getID(), e.getWhen(), e.getModifiers(), mouse.x, mouse.y, 0, false, + MouseWheelEvent.WHEEL_UNIT_SCROLL, 1, ",".equals(action) ? -1 : 1); mouseWheelMoved(we); } else { EastNorth center = nc.getCenter(); EastNorth newcenter = nc.getEastNorth(nc.getWidth()/2+nc.getWidth()/5, nc.getHeight()/2+nc.getHeight()/5); - if (action.equals("left")) + if ("left".equals(action)) nc.zoomTo(new EastNorth(2*center.east()-newcenter.east(), center.north())); - else if (action.equals("right")) + else if ("right".equals(action)) nc.zoomTo(new EastNorth(newcenter.east(), center.north())); - else if (action.equals("up")) + else if ("up".equals(action)) nc.zoomTo(new EastNorth(center.east(), 2*center.north()-newcenter.north())); - else if (action.equals("down")) + else if ("down".equals(action)) nc.zoomTo(new EastNorth(center.east(), newcenter.north())); } Index: trunk/src/org/openstreetmap/josm/gui/SelectionManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/SelectionManager.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/SelectionManager.java (revision 6990) @@ -279,5 +279,5 @@ @Override public void propertyChange(PropertyChangeEvent evt) { - if (evt.getPropertyName().equals("active") && !(Boolean)evt.getNewValue() && mousePosStart != null) { + if ("active".equals(evt.getPropertyName()) && !(Boolean)evt.getNewValue() && mousePosStart != null) { paintRect(); mousePosStart = null; Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java (revision 6990) @@ -363,5 +363,5 @@ sb.append("x"); // cardinal direction String c = m.group(7).toUpperCase(); - if (c.equals("N") || c.equals("S") || c.equals("E") || c.equals("W")) { + if ("N".equals(c) || "S".equals(c) || "E".equals(c) || "W".equals(c)) { list.add(c); } else { @@ -461,6 +461,6 @@ double coord = (coordDeg < 0 ? -1 : 1) * (Math.abs(coordDeg) + coordMin / 60 + coordSec / 3600); - coord = card.equals("N") || card.equals("E") ? coord : -coord; - if (card.equals("N") || card.equals("S")) { + coord = "N".equals(card) || "E".equals(card) ? coord : -coord; + if ("N".equals(card) || "S".equals(card)) { latLon.lat = coord; } else { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 6990) @@ -362,7 +362,7 @@ String prefRoot = "changeset-query.advanced.open-restrictions"; String v = Main.pref.get(prefRoot + ".query-type", "open"); - rbBoth.setSelected(v.equals("both")); - rbOpenOnly.setSelected(v.equals("open")); - rbClosedOnly.setSelected(v.equals("closed")); + rbBoth.setSelected("both".equals(v)); + rbOpenOnly.setSelected("open".equals(v)); + rbClosedOnly.setSelected("closed".equals(v)); } } @@ -599,5 +599,5 @@ String prefRoot = "changeset-query.advanced.user-restrictions"; String v = Main.pref.get(prefRoot + ".query-type", "mine"); - if (v.equals("mine")) { + if ("mine".equals(v)) { JosmUserIdentityManager im = JosmUserIdentityManager.getInstance(); if (im.isAnonymous()) { @@ -606,7 +606,7 @@ rbRestrictToMyself.setSelected(true); } - } else if (v.equals("uid")) { + } else if ("uid".equals(v)) { rbRestrictToUid.setSelected(true); - } else if (v.equals("username")) { + } else if ("username".equals(v)) { rbRestrictToUserName.setSelected(true); } @@ -896,6 +896,6 @@ String prefRoot = "changeset-query.advanced.open-restrictions"; String v = Main.pref.get(prefRoot + ".query-type", "closed-after"); - rbClosedAfter.setSelected(v.equals("closed-after")); - rbClosedAfterAndCreatedBefore.setSelected(v.equals("closed-after-created-before")); + rbClosedAfter.setSelected("closed-after".equals(v)); + rbClosedAfterAndCreatedBefore.setSelected("closed-after-created-before".equals(v)); if (!rbClosedAfter.isSelected() && !rbClosedAfterAndCreatedBefore.isSelected()) { rbClosedAfter.setSelected(true); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java (revision 6990) @@ -169,5 +169,5 @@ } protected void feedbackValid() { - if (getCurrentFeedback().equals("valid")) return; + if ("valid".equals(getCurrentFeedback())) return; lblValid.setIcon(ImageProvider.get("dialogs", "valid")); lblValid.setToolTipText(""); @@ -176,5 +176,5 @@ protected void feedbackInvalid() { - if (getCurrentFeedback().equals("invalid")) return; + if ("invalid".equals(getCurrentFeedback())) return; lblValid.setIcon(ImageProvider.get("warning-small")); lblValid.setToolTipText(tr("This changeset query URL is invalid")); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java (revision 6990) @@ -63,5 +63,7 @@ public static Node firstOnewayNode(RelationMember m){ if(!m.isWay()) return null; - if(m.getRole().equals("backward")) return m.getWay().lastNode(); + if("backward".equals(m.getRole())) { + return m.getWay().lastNode(); + } return m.getWay().firstNode(); } @@ -69,5 +71,7 @@ public static Node lastOnewayNode(RelationMember m){ if(!m.isWay()) return null; - if(m.getRole().equals("backward")) return m.getWay().firstNode(); + if("backward".equals(m.getRole())) { + return m.getWay().firstNode(); + } return m.getWay().lastNode(); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSortUtils.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSortUtils.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSortUtils.java (revision 6990) @@ -50,9 +50,9 @@ static boolean isBackward(final RelationMember member){ - return member.getRole().equals("backward"); + return "backward".equals(member.getRole()); } static boolean isForward(final RelationMember member){ - return member.getRole().equals("forward"); + return "forward".equals(member.getRole()); } @@ -60,4 +60,3 @@ return isForward(member) || isBackward(member); } - } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java (revision 6990) @@ -78,5 +78,5 @@ for (KeyListener keyListener : getKeyListeners()) { // Fix #3596 - Remove default keyListener to avoid conflicts with JOSM commands - if (keyListener.getClass().getName().equals("javax.swing.plaf.basic.BasicTreeUI$Handler")) { + if ("javax.swing.plaf.basic.BasicTreeUI$Handler".equals(keyListener.getClass().getName())) { removeKeyListener(keyListener); } Index: trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 6990) @@ -206,7 +206,7 @@ depth++; try { - if (qName.equals("searchresults")) { + if ("searchresults".equals(qName)) { // do nothing - } else if (qName.equals("named") && (depth == 2)) { + } else if ("named".equals(qName) && (depth == 2)) { currentResult = new PlaceSelection.SearchResult(); currentResult.name = atts.getValue("name"); @@ -219,7 +219,7 @@ currentResult.zoom = Integer.parseInt(atts.getValue("zoom")); data.add(currentResult); - } else if (qName.equals("description") && (depth == 3)) { + } else if ("description".equals(qName) && (depth == 3)) { description = new StringBuffer(); - } else if (qName.equals("named") && (depth == 4)) { + } else if ("named".equals(qName) && (depth == 4)) { // this is a "named" place in the nearest places list. String info = atts.getValue("info"); @@ -227,5 +227,5 @@ currentResult.nearestPlace = atts.getValue("name"); } - } else if (qName.equals("place") && atts.getValue("lat") != null) { + } else if ("place".equals(qName) && atts.getValue("lat") != null) { currentResult = new PlaceSelection.SearchResult(); currentResult.name = atts.getValue("display_name"); @@ -258,5 +258,5 @@ @Override public void endElement(String namespaceURI, String localName, String qName) throws SAXException { - if (qName.equals("description") && description != null) { + if ("description".equals(qName) && description != null) { currentResult.description = description.toString(); description = null; Index: trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java (revision 6990) @@ -16,4 +16,8 @@ import org.openstreetmap.josm.tools.LanguageInfo.LocaleType; +/** + * Provides utility methods for help system. + * @since 2252 + */ public final class HelpUtil { @@ -140,5 +144,5 @@ public static String buildAbsoluteHelpTopic(String topic, LocaleType type) { String prefix = getHelpTopicPrefix(type); - if (prefix == null || topic == null || topic.trim().length() == 0 || topic.trim().equals("/")) + if (prefix == null || topic == null || topic.trim().length() == 0 || "/".equals(topic.trim())) return prefix; prefix += "/" + topic; @@ -220,6 +224,6 @@ * * - * - * @param helpTopic + * @param helpTopic Help topic to mark + * @return {@code helpTopic} */ public static String ht(String helpTopic) { Index: trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 6990) @@ -578,5 +578,5 @@ @Override public void preferenceChanged(PreferenceChangeEvent e) { - if (e.getKey() == null || ! e.getKey().equals("osm-server.url")) + if (e.getKey() == null || !"osm-server.url".equals(e.getKey())) return; final Setting newValue = e.getNewValue(); Index: trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (revision 6990) @@ -156,9 +156,10 @@ public void hyperlinkUpdate(HyperlinkEvent e) { if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType())) { - if (e.getDescription() == null || configHandler == null) + String desc = e.getDescription(); + if (desc == null || configHandler == null) return; - if (e.getDescription().equals("urn:changeset-configuration")) { + if ("urn:changeset-configuration".equals(desc)) { configHandler.handleChangesetConfigurationRequest(); - } else if (e.getDescription().equals("urn:advanced-configuration")) { + } else if ("urn:advanced-configuration".equals(desc)) { configHandler.handleUploadStrategyConfigurationRequest(); } Index: trunk/src/org/openstreetmap/josm/gui/io/UploadStrategy.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadStrategy.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadStrategy.java (revision 6990) @@ -77,7 +77,7 @@ } v = v.trim().toLowerCase(); - if (v.equals("true")) + if ("true".equals(v)) return SINGLE_REQUEST_STRATEGY; - else if (v.equals("false")) + else if ("false".equals(v)) return INDIVIDUAL_OBJECTS_STRATEGY; else Index: trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (revision 6990) @@ -406,5 +406,5 @@ } - protected void valiateChunkSize() { + protected void validateChunkSize() { try { int chunkSize = Integer.parseInt(tfChunkSize.getText().trim()); @@ -430,15 +430,15 @@ @Override public void changedUpdate(DocumentEvent arg0) { - valiateChunkSize(); + validateChunkSize(); } @Override public void insertUpdate(DocumentEvent arg0) { - valiateChunkSize(); + validateChunkSize(); } @Override public void removeUpdate(DocumentEvent arg0) { - valiateChunkSize(); + validateChunkSize(); } @@ -446,8 +446,8 @@ public void propertyChange(PropertyChangeEvent evt) { if (evt.getSource() == tfChunkSize - && evt.getPropertyName().equals("enabled") + && "enabled".equals(evt.getPropertyName()) && (Boolean)evt.getNewValue() ) { - valiateChunkSize(); + validateChunkSize(); } } Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 6990) @@ -147,5 +147,5 @@ MapImage mapImage = ((NodeElemStyle) style).mapImage; if (mapImage != null) { - if (includeDeprecatedIcon || mapImage.name == null || !mapImage.name.equals("misc/deprecated.png")) { + if (includeDeprecatedIcon || mapImage.name == null || !"misc/deprecated.png".equals(mapImage.name)) { return new ImageIcon(mapImage.getDisplayedNodeIcon(false)); } else { Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MultiCascade.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/MultiCascade.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/MultiCascade.java (revision 6990) @@ -19,4 +19,7 @@ public Range range; + /** + * Constructs a new {@code MultiCascade}. + */ public MultiCascade() { layers = new HashMap(); @@ -39,5 +42,5 @@ // Everything that is not on the default layer is assumed to // be a modifier. Can be overridden in style definition. - if (!layer.equals("default") && !layer.equals("*")) { + if (!"default".equals(layer) && !"*".equals(layer)) { c.put(MODIFIER, true); } @@ -60,5 +63,5 @@ if (c == null) { c = new Cascade(); - if (!layer.equals("default") && !layer.equals("*")) { + if (!"default".equals(layer) && !"*".equals(layer)) { c.put(MODIFIER, true); } Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 6990) @@ -429,12 +429,12 @@ public boolean matchesBase(OsmPrimitiveType type) { - if (base.equals("*")) { + if ("*".equals(base)) { return true; } else if (OsmPrimitiveType.NODE.equals(type)) { - return base.equals("node"); + return "node".equals(base); } else if (OsmPrimitiveType.WAY.equals(type)) { - return base.equals("way") || base.equals("area"); + return "way".equals(base) || "area".equals(base); } else if (OsmPrimitiveType.RELATION.equals(type)) { - return base.equals("area") || base.equals("relation") || base.equals("canvas"); + return "area".equals(base) || "relation".equals(base) || "canvas".equals(base); } return false; @@ -446,7 +446,7 @@ } else { if (p instanceof Relation) { - if (base.equals("area")) { + if ("area".equals(base)) { return ((Relation) p).isMultipolygon(); - } else if (base.equals("canvas")) { + } else if ("canvas".equals(base)) { return p.get("#canvas") != null; } Index: trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (revision 6990) @@ -249,5 +249,5 @@ continue; } - if (kv[0].equals("_osm_session")) { + if ("_osm_session".equals(kv[0])) { // osm session cookie found String token = extractToken(connection); Index: trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 6990) @@ -487,5 +487,5 @@ @Override public void actionPerformed(ActionEvent e) { - if (e.getActionCommand().equals("<") && actionsTree.getSelectionCount() > 0) { + if ("<".equals(e.getActionCommand()) && actionsTree.getSelectionCount() > 0) { int leadItem = selected.getSize(); @@ -500,12 +500,11 @@ } else if (node.getUserObject() instanceof Action) { selected.add(leadItem++, new ActionDefinition((Action)node.getUserObject())); - } } - } else if (e.getActionCommand().equals(">") && selectedList.getSelectedIndex() != -1) { + } else if (">".equals(e.getActionCommand()) && selectedList.getSelectedIndex() != -1) { while (selectedList.getSelectedIndex() != -1) { selected.remove(selectedList.getSelectedIndex()); } - } else if (e.getActionCommand().equals("up")) { + } else if ("up".equals(e.getActionCommand())) { int i = selectedList.getSelectedIndex(); Object o = selected.get(i); @@ -515,5 +514,5 @@ selectedList.setSelectedIndex(i-1); } - } else if (e.getActionCommand().equals("down")) { + } else if ("down".equals(e.getActionCommand())) { int i = selectedList.getSelectedIndex(); Object o = selected.get(i); @@ -580,7 +579,7 @@ private JButton createButton(String name) { JButton b = new JButton(); - if (name.equals("up")) { + if ("up".equals(name)) { b.setIcon(ImageProvider.get("dialogs", "up")); - } else if (name.equals("down")) { + } else if ("down".equals(name)) { b.setIcon(ImageProvider.get("dialogs", "down")); } else { @@ -739,5 +738,5 @@ @Override protected void exportDone(JComponent source, Transferable data, int action) { - if (movingComponent.equals("list")) { + if ("list".equals(movingComponent)) { try { List draggedData = (List) data.getTransferData(ACTION_FLAVOR); @@ -981,5 +980,5 @@ for (String s : getToolString()) { - if (s.equals("|")) { + if ("|".equals(s)) { result.add(ActionDefinition.getSeparator()); } else { Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java (revision 6990) @@ -115,7 +115,7 @@ public final void initFromPreferences() { String authMethod = Main.pref.get("osm-server.auth-method", "basic"); - if (authMethod.equals("basic")) { + if ("basic".equals(authMethod)) { rbBasicAuthentication.setSelected(true); - } else if (authMethod.equals("oauth")) { + } else if ("oauth".equals(authMethod)) { rbOAuth.setSelected(true); } else { @@ -140,10 +140,10 @@ } Main.pref.put("osm-server.auth-method", authMethod); - if (authMethod.equals("basic")) { + if ("basic".equals(authMethod)) { // save username and password and clear the OAuth token pnlBasicAuthPreferences.saveToPreferences(); OAuthAccessTokenHolder.getInstance().clear(); OAuthAccessTokenHolder.getInstance().save(Main.pref, CredentialsManager.getInstance()); - } else if (authMethod.equals("oauth")) { + } else if ("oauth".equals(authMethod)) { // clear the password in the preferences pnlBasicAuthPreferences.clearPassword(); Index: trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 6990) @@ -322,5 +322,5 @@ if (panel.cbDisable.isSelected()) { sc.setAssignedModifier(-1); - } else if (panel.tfKey.getSelectedItem() == null || panel.tfKey.getSelectedItem().equals("")) { + } else if (panel.tfKey.getSelectedItem() == null || "".equals(panel.tfKey.getSelectedItem())) { sc.setAssignedModifier(KeyEvent.VK_CANCEL); } else { Index: trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java (revision 6990) @@ -173,5 +173,5 @@ @Override public void propertyChange(PropertyChangeEvent evt) { - if (evt.getPropertyName().equals("enabled")) { + if ("enabled".equals(evt.getPropertyName())) { boolean enabled = (Boolean)evt.getNewValue(); if (enabled) { Index: trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java (revision 6990) @@ -187,5 +187,5 @@ @Override public void propertyChange(PropertyChangeEvent evt) { - if (evt.getPropertyName().equals("editable")) { + if ("editable".equals(evt.getPropertyName())) { if (evt.getNewValue().equals(true)) { enableMenu(); @@ -193,5 +193,5 @@ disableMenu(); } - } else if (evt.getPropertyName().equals("editor")) { + } else if ("editor".equals(evt.getPropertyName())) { disableMenu(); if (isEditable()) { Index: trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java (revision 6990) @@ -42,5 +42,5 @@ protected final PropertyChangeListener propertyChangeListener = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - if (evt.getPropertyName().equals("editable")) { + if ("editable".equals(evt.getPropertyName())) { removeAll(); addMenuEntries(); Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (revision 6990) @@ -165,5 +165,5 @@ String url = st.nextToken(); - if (!method.equals("GET")) { + if (!"GET".equals(method)) { sendNotImplemented(out); return; Index: trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java (revision 6990) @@ -37,5 +37,5 @@ if (imgNode.getNodeType() == Node.ELEMENT_NODE) { Element imgElem = (Element) imgNode; - if (imgElem.getTagName().equals("geoimage")) { + if ("geoimage".equals(imgElem.getTagName())) { ImageEntry entry = new ImageEntry(); NodeList attrNodes = imgElem.getChildNodes(); @@ -45,29 +45,30 @@ Element attrElem = (Element) attrNode; try { - if (attrElem.getTagName().equals("file")) { + String attrElemName = attrElem.getTagName(); + if ("file".equals(attrElemName)) { entry.setFile(new File(attrElem.getTextContent())); - } else if (attrElem.getTagName().equals("position")) { + } else if ("position".equals(attrElemName)) { double lat = Double.parseDouble(attrElem.getAttribute("lat")); double lon = Double.parseDouble(attrElem.getAttribute("lon")); entry.setPos(new LatLon(lat, lon)); - } else if (attrElem.getTagName().equals("speed")) { + } else if ("speed".equals(attrElemName)) { entry.setSpeed(Double.parseDouble(attrElem.getTextContent())); - } else if (attrElem.getTagName().equals("elevation")) { + } else if ("elevation".equals(attrElemName)) { entry.setElevation(Double.parseDouble(attrElem.getTextContent())); - } else if (attrElem.getTagName().equals("gps-time")) { + } else if ("gps-time".equals(attrElemName)) { entry.setGpsTime(new Date(Long.parseLong(attrElem.getTextContent()))); - } else if (attrElem.getTagName().equals("exif-orientation")) { + } else if ("exif-orientation".equals(attrElemName)) { entry.setExifOrientation(Integer.parseInt(attrElem.getTextContent())); - } else if (attrElem.getTagName().equals("exif-time")) { + } else if ("exif-time".equals(attrElemName)) { entry.setExifTime(new Date(Long.parseLong(attrElem.getTextContent()))); - } else if (attrElem.getTagName().equals("exif-gps-time")) { + } else if ("exif-gps-time".equals(attrElemName)) { entry.setExifGpsTime(new Date(Long.parseLong(attrElem.getTextContent()))); - } else if (attrElem.getTagName().equals("exif-coordinates")) { + } else if ("exif-coordinates".equals(attrElemName)) { double lat = Double.parseDouble(attrElem.getAttribute("lat")); double lon = Double.parseDouble(attrElem.getAttribute("lon")); entry.setExifCoor(new LatLon(lat, lon)); - } else if (attrElem.getTagName().equals("exif-image-direction")) { + } else if ("exif-image-direction".equals(attrElemName)) { entry.setExifImgDir(Double.parseDouble(attrElem.getTextContent())); - } else if (attrElem.getTagName().equals("is-new-gps-data") && Boolean.parseBoolean(attrElem.getTextContent())) { + } else if ("is-new-gps-data".equals(attrElemName) && Boolean.parseBoolean(attrElem.getTextContent())) { entry.flagNewGpsData(); } @@ -79,5 +80,5 @@ } entries.add(entry); - } else if (imgElem.getTagName().equals("show-thumbnails")) { + } else if ("show-thumbnails".equals(imgElem.getTagName())) { useThumbs = Boolean.parseBoolean(imgElem.getTextContent()); } Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 6989) +++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 6990) @@ -353,5 +353,5 @@ String policy = Main.pref.get(togglePreferenceKey, "ask"); policy = policy.trim().toLowerCase(); - if (policy.equals("never")) { + if ("never".equals(policy)) { if ("pluginmanager.version-based-update.policy".equals(togglePreferenceKey)) { Main.info(tr("Skipping plugin update after JOSM upgrade. Automatic update at startup is disabled.")); @@ -362,5 +362,5 @@ } - if (policy.equals("always")) { + if ("always".equals(policy)) { if ("pluginmanager.version-based-update.policy".equals(togglePreferenceKey)) { Main.info(tr("Running plugin update after JOSM upgrade. Automatic update at startup is enabled.")); @@ -371,5 +371,5 @@ } - if (!policy.equals("ask")) { + if (!"ask".equals(policy)) { Main.warn(tr("Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''.", policy, togglePreferenceKey)); } @@ -1355,5 +1355,5 @@ String policy = Main.pref.get(preferencesKey, "ask"); policy = policy.trim().toLowerCase(); - cbDontShowAgain.setSelected(! policy.equals("ask")); + cbDontShowAgain.setSelected(!"ask".equals(policy)); }