Changeset 14214 in josm for trunk/src

Timestamp:

2018-09-01T15:29:15+02:00 (6 years ago)

Author:

Don-vip

Message:

sonarqube - squid:S4551 - Enum values should be compared with "=="

Location:

trunk/src

Files:

• javax/json/JsonValueImpl.java (modified) (1 diff)
• org/openstreetmap/josm/actions/AddImageryLayerAction.java (modified) (1 diff)
• org/openstreetmap/josm/actions/UpdateModifiedAction.java (modified) (1 diff)
• org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified) (1 diff)
• org/openstreetmap/josm/actions/relation/AbstractRelationAction.java (modified) (1 diff)
• org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommand.java (modified) (1 diff)
• org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommand.java (modified) (2 diffs)
• org/openstreetmap/josm/command/conflict/TagConflictResolveCommand.java (modified) (2 diffs)
• org/openstreetmap/josm/data/imagery/DefaultLayer.java (modified) (1 diff)
• org/openstreetmap/josm/data/imagery/ImageryInfo.java (modified) (1 diff)
• org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (modified) (1 diff)
• org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java (modified) (1 diff)
• org/openstreetmap/josm/data/imagery/WMSEndpointTileSource.java (modified) (1 diff)
• org/openstreetmap/josm/data/osm/ChangesetDataSet.java (modified) (4 diffs)
• org/openstreetmap/josm/data/osm/search/SearchCompiler.java (modified) (1 diff)
• org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (modified) (2 diffs)
• org/openstreetmap/josm/data/validation/tests/OverlappingWays.java (modified) (1 diff)
• org/openstreetmap/josm/data/validation/tests/RelationChecker.java (modified) (2 diffs)
• org/openstreetmap/josm/gui/MapMover.java (modified) (1 diff)
• org/openstreetmap/josm/gui/conflict/pair/AbstractListMerger.java (modified) (1 diff)
• org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java (modified) (2 diffs)
• org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (modified) (5 diffs)
• org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java (modified) (3 diffs)
• org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java (modified) (2 diffs)
• org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java (modified) (5 diffs)
• org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java (modified) (2 diffs)
• org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java (modified) (2 diffs)
• org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (modified) (1 diff)
• org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java (modified) (1 diff)
• org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java (modified) (1 diff)
• org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java (modified) (1 diff)
• org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java (modified) (2 diffs)
• org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (modified) (1 diff)
• org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java (modified) (1 diff)
• org/openstreetmap/josm/gui/dialogs/relation/actions/AbstractRelationEditorAction.java (modified) (1 diff)
• org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (modified) (1 diff)
• org/openstreetmap/josm/gui/history/HistoryBrowser.java (modified) (1 diff)
• org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (modified) (4 diffs)
• org/openstreetmap/josm/gui/history/PointInTimeType.java (modified) (1 diff)
• org/openstreetmap/josm/gui/history/TagTableModel.java (modified) (2 diffs)
• org/openstreetmap/josm/gui/io/CredentialDialog.java (modified) (1 diff)
• org/openstreetmap/josm/gui/io/SaveLayersModel.java (modified) (3 diffs)
• org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java (modified) (1 diff)
• org/openstreetmap/josm/gui/io/UploadDialog.java (modified) (1 diff)
• org/openstreetmap/josm/gui/io/UploadLayerTask.java (modified) (1 diff)
• org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (modified) (3 diffs)
• org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (modified) (1 diff)
• org/openstreetmap/josm/gui/mappaint/Environment.java (modified) (2 diffs)
• org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java (modified) (5 diffs)
• org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (modified) (7 diffs)
• org/openstreetmap/josm/gui/preferences/SourceEditor.java (modified) (3 diffs)
• org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java (modified) (1 diff)
• org/openstreetmap/josm/gui/tagging/presets/items/Check.java (modified) (1 diff)
• org/openstreetmap/josm/io/AbstractParser.java (modified) (2 diffs)
• org/openstreetmap/josm/io/DefaultProxySelector.java (modified) (2 diffs)
• org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified) (1 diff)
• org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (modified) (2 diffs)
• org/openstreetmap/josm/io/OsmServerObjectReader.java (modified) (1 diff)
• org/openstreetmap/josm/io/OsmWriter.java (modified) (1 diff)
• org/openstreetmap/josm/io/OverpassDownloadReader.java (modified) (1 diff)
• org/openstreetmap/josm/io/auth/DefaultAuthenticator.java (modified) (2 diffs)
• org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java (modified) (1 diff)
• org/openstreetmap/josm/tools/HttpClient.java (modified) (1 diff)
• org/openstreetmap/josm/tools/ImageProvider.java (modified) (1 diff)

trunk/src/javax/json/JsonValueImpl.java

@@ -83 +83 @@
         }
         if (obj instanceof JsonValue) {
-            return getValueType().equals(((JsonValue) obj).getValueType());
+            return getValueType() == ((JsonValue) obj).getValueType();
         }
         return false;

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -172 +172 @@
     protected static ImageryInfo getWMSLayerInfo(ImageryInfo info) throws IOException, WMSGetCapabilitiesException {
         try {
-            CheckParameterUtil.ensureThat(ImageryType.WMS_ENDPOINT.equals(info.getImageryType()), "wms_endpoint imagery type expected");
+            CheckParameterUtil.ensureThat(ImageryType.WMS_ENDPOINT == info.getImageryType(), "wms_endpoint imagery type expected");
             final WMSImagery wms = new WMSImagery(info.getUrl(), info.getCustomHttpHeaders());
 

trunk/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java

@@ -48 +48 @@
     protected void updateEnabledState() {
         DataSet ds = getLayerManager().getEditDataSet();
-        setEnabled(ds != null && !DownloadPolicy.BLOCKED.equals(ds.getDownloadPolicy())
+        setEnabled(ds != null && DownloadPolicy.BLOCKED != ds.getDownloadPolicy()
                 && !NetworkManager.isOffline(OnlineResource.OSM_API));
     }

trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java

@@ -124 +124 @@
         } else {
             DataSet ds = selection.iterator().next().getDataSet();
-            setEnabled(!ds.isLocked() && !DownloadPolicy.BLOCKED.equals(ds.getDownloadPolicy())
+            setEnabled(!ds.isLocked() && DownloadPolicy.BLOCKED != ds.getDownloadPolicy()
                     && !NetworkManager.isOffline(OnlineResource.OSM_API));
         }

trunk/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java

@@ -58 +58 @@
         OsmData<?, ?, ?, ?> ds = relations.iterator().next().getDataSet();
         return !NetworkManager.isOffline(OnlineResource.OSM_API)
-            && ds != null && !ds.isLocked() && !DownloadPolicy.BLOCKED.equals(ds.getDownloadPolicy());
+            && ds != null && !ds.isLocked() && DownloadPolicy.BLOCKED != ds.getDownloadPolicy();
     }
 }

trunk/src/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommand.java

@@ -54 +54 @@
         super.executeCommand();
 
-        if (decision.equals(MergeDecisionType.KEEP_MINE)) {
+        if (decision == MergeDecisionType.KEEP_MINE) {
             // do nothing
-        } else if (decision.equals(MergeDecisionType.KEEP_THEIR)) {
+        } else if (decision == MergeDecisionType.KEEP_THEIR) {
             Node my = (Node) conflict.getMy();
             Node their = (Node) conflict.getTheir();

trunk/src/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommand.java

@@ -54 +54 @@
         super.executeCommand();
 
-        if (decision.equals(MergeDecisionType.KEEP_MINE)) {
+        if (decision == MergeDecisionType.KEEP_MINE) {
             if (conflict.getMy().isDeleted() || conflict.isMyDeleted()) {
                 // because my was involved in a conflict it my still be referred
@@ -60 +60 @@
                 deleteMy();
             }
-        } else if (decision.equals(MergeDecisionType.KEEP_THEIR)) {
+        } else if (decision == MergeDecisionType.KEEP_THEIR) {
             if (conflict.getTheir().isDeleted()) {
                 deleteMy();

trunk/src/org/openstreetmap/josm/command/conflict/TagConflictResolveCommand.java

@@ -36 +36 @@
         int n = 0;
         for (TagMergeItem item: mergeItems) {
-            if (!item.getMergeDecision().equals(MergeDecisionType.UNDECIDED)) {
+            if (item.getMergeDecision() != MergeDecisionType.UNDECIDED) {
                 n++;
             }
@@ -90 +90 @@
         //
         for (TagMergeItem item: mergeItems) {
-            if (!item.getMergeDecision().equals(MergeDecisionType.UNDECIDED)) {
+            if (item.getMergeDecision() != MergeDecisionType.UNDECIDED) {
                 item.applyToMyPrimitive(conflict.getMy());
             }

trunk/src/org/openstreetmap/josm/data/imagery/DefaultLayer.java

@@ -34 +34 @@
         this.layerName = layerName == null ? "" : layerName;
         this.style = style == null ? "" : style;
-        if (!imageryType.equals(ImageryType.WMTS) && !(tileMatrixSet == null || "".equals(tileMatrixSet))) {
+        if (imageryType != ImageryType.WMTS && !(tileMatrixSet == null || "".equals(tileMatrixSet))) {
             throw new IllegalArgumentException(tr("{0} imagery has tileMatrixSet defined to: {1}", imageryType, tileMatrixSet));
         }

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -1589 +1589 @@
      */
     public String getSourceName() {
-        if (ImageryType.BING.equals(getImageryType())) {
+        if (ImageryType.BING == getImageryType()) {
             return "Bing";
         } else {

trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java

@@ -337 +337 @@
 
     private static boolean isSimilar(ImageryInfo iiA, ImageryInfo iiB) {
-        if (iiA == null)
+        if (iiA == null || iiA.getImageryType() != iiB.getImageryType())
             return false;
-        if (!iiA.getImageryType().equals(iiB.getImageryType()))
-            return false;
-        if (iiA.getId() != null && iiB.getId() != null) return iiA.getId().equals(iiB.getId());
+        if (iiA.getId() != null && iiB.getId() != null)
+            return iiA.getId().equals(iiB.getId());
         return isSimilar(iiA.getUrl(), iiB.getUrl());
     }

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

@@ -164 +164 @@
             listeners = inProgress.remove(getCacheKey());
         }
-        boolean status = result.equals(LoadResult.SUCCESS);
+        boolean status = result == LoadResult.SUCCESS;
 
         try {

trunk/src/org/openstreetmap/josm/data/imagery/WMSEndpointTileSource.java

@@ -41 +41 @@
     public WMSEndpointTileSource(ImageryInfo info, Projection tileProjection) {
         super(info, tileProjection);
-        CheckParameterUtil.ensure(info, "imageryType", x -> ImageryType.WMS_ENDPOINT.equals(x.getImageryType()));
+        CheckParameterUtil.ensure(info, "imageryType", x -> ImageryType.WMS_ENDPOINT == x.getImageryType());
         try {
             wmsi = new WMSImagery(info.getUrl(), info.getCustomHttpHeaders());

trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java

@@ -97 +97 @@
     public boolean isCreated(PrimitiveId id) {
         if (!contains(id)) return false;
-        return ChangesetModificationType.CREATED.equals(getModificationType(id));
+        return ChangesetModificationType.CREATED == getModificationType(id);
     }
 
@@ -110 +110 @@
     public boolean isUpdated(PrimitiveId id) {
         if (!contains(id)) return false;
-        return ChangesetModificationType.UPDATED.equals(getModificationType(id));
+        return ChangesetModificationType.UPDATED == getModificationType(id);
     }
 
@@ -123 +123 @@
     public boolean isDeleted(PrimitiveId id) {
         if (!contains(id)) return false;
-        return ChangesetModificationType.DELETED.equals(getModificationType(id));
+        return ChangesetModificationType.DELETED == getModificationType(id);
     }
 
@@ -136 +136 @@
         CheckParameterUtil.ensureParameterNotNull(cmt, "cmt");
         return modificationTypes.entrySet().stream()
-                .filter(entry -> entry.getValue().equals(cmt))
+                .filter(entry -> entry.getValue() == cmt)
                 .map(entry -> primitives.get(entry.getKey()))
                 .collect(Collectors.toSet());

trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

@@ -1178 +1178 @@
         @Override
         public boolean match(OsmPrimitive osm) {
-            return type.equals(osm.getType());
+            return type == osm.getType();
         }
 

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.validation.tests;
 
+import static org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.FixCommand.evaluateObject;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -686 +687 @@
         for (Set<TagCheck> schecks : checksCol) {
             for (TagCheck check : schecks) {
-                boolean ignoreError = Severity.OTHER.equals(check.getSeverity()) && !includeOtherSeverity;
+                boolean ignoreError = Severity.OTHER == check.getSeverity() && !includeOtherSeverity;
                 // Do not run "information" level checks if not wanted, unless they also set a MapCSS class
                 if (ignoreError && check.setClassExpressions.isEmpty()) {

trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java

@@ -157 +157 @@
         // see ticket #9598 - only report if at least 3 segments are shared, except for overlapping ways, i.e warnings (see #9820)
         for (TestError error : preliminaryErrors) {
-            if (error.getSeverity().equals(Severity.WARNING) || error.getHighlighted().size() / error.getPrimitives().size() >= 3) {
+            if (error.getSeverity() == Severity.WARNING || error.getHighlighted().size() / error.getPrimitives().size() >= 3) {
                 boolean ignore = false;
                 for (String ignoredKey : IGNORED_KEYS.get()) {

trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

@@ -226 +226 @@
                     }
                 }
-            } else if (OsmPrimitiveType.RELATION.equals(member.getType()) && !member.getMember().isUsable()
+            } else if (OsmPrimitiveType.RELATION == member.getType() && !member.getMember().isUsable()
                     && r.types.contains(TaggingPresetType.MULTIPOLYGON)) {
                 // if relation is incomplete we cannot verify if it's a multipolygon - so we just skip it
@@ -245 +245 @@
 
             // Do not raise an error for incomplete ways for which we expect them to be closed, as we cannot know
-            boolean ignored = member.getMember().isIncomplete() && OsmPrimitiveType.WAY.equals(member.getType())
+            boolean ignored = member.getMember().isIncomplete() && OsmPrimitiveType.WAY == member.getType()
                     && !types.contains(TaggingPresetType.WAY) && types.contains(TaggingPresetType.CLOSEDWAY);
             if (!ignored) {

trunk/src/org/openstreetmap/josm/gui/MapMover.java

@@ -180 +180 @@
             boolean macMovement = e.getModifiersEx() == macMouseMask;
             boolean allowedMode = !map.mapModeSelect.equals(map.mapMode)
-                              || SelectAction.Mode.SELECT.equals(map.mapModeSelect.getMode());
+                              || SelectAction.Mode.SELECT == map.mapModeSelect.getMode();
             allowMovement |= macMovement && allowedMode;
         }

trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMerger.java

@@ -933 +933 @@
     public void decideRemaining(MergeDecisionType decision) {
         if (!model.isFrozen()) {
-            model.copyAll(MergeDecisionType.KEEP_MINE.equals(decision) ? ListRole.MY_ENTRIES : ListRole.THEIR_ENTRIES);
+            model.copyAll(MergeDecisionType.KEEP_MINE == decision ? ListRole.MY_ENTRIES : ListRole.THEIR_ENTRIES);
             model.setFrozen(true);
         }

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java

@@ -55 +55 @@
     public boolean isParticipatingIn(ListRole role) {
         for (ListRole r: participatingRoles) {
-            if (r.equals(role)) return true;
+            if (r == role) return true;
         }
         return false;
@@ -79 +79 @@
         if (!isParticipatingIn(role))
             throw new IllegalStateException(tr("Role {0} is not participating in compare pair {1}.", role.toString(), this.toString()));
-        if (participatingRoles[0].equals(role))
+        if (participatingRoles[0] == role)
             return participatingRoles[1];
         else

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java

@@ -86 +86 @@
      */
     public boolean isDecidedCoord() {
-        return !coordMergeDecision.equals(UNDECIDED);
+        return coordMergeDecision != UNDECIDED;
     }
 
@@ -96 +96 @@
      */
     public boolean isDecidedDeletedState() {
-        return !deletedMergeDecision.equals(UNDECIDED);
+        return deletedMergeDecision != UNDECIDED;
     }
 
@@ -107 +107 @@
      */
     public boolean isCoordMergeDecision(MergeDecisionType decision) {
-        return coordMergeDecision.equals(decision);
+        return coordMergeDecision == decision;
     }
 
@@ -118 +118 @@
      */
     public boolean isDeletedStateDecision(MergeDecisionType decision) {
-        return deletedMergeDecision.equals(decision);
+        return deletedMergeDecision == decision;
     }
 
@@ -310 +310 @@
         boolean ret = true;
         if (hasCoordConflict()) {
-            ret = ret && !coordMergeDecision.equals(UNDECIDED);
+            ret = ret && coordMergeDecision != UNDECIDED;
         }
         if (hasDeletedStateConflict()) {
-            ret = ret && !deletedMergeDecision.equals(UNDECIDED);
+            ret = ret && deletedMergeDecision != UNDECIDED;
         }
         return ret;

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java

@@ -18 +18 @@
             return;
         }
-        if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision())) {
+        if (MergeDecisionType.KEEP_MINE == item.getMergeDecision()) {
             setBackground(ConflictColors.BGCOLOR_COMBINED.get());
-        } else if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
+        } else if (MergeDecisionType.KEEP_THEIR == item.getMergeDecision()) {
             setBackground(ConflictColors.BGCOLOR_COMBINED.get());
-        } else if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
+        } else if (MergeDecisionType.UNDECIDED == item.getMergeDecision()) {
             setBackground(ConflictColors.BGCOLOR_UNDECIDED.get());
         }
@@ -30 +30 @@
     protected void renderKey(TagMergeItem item, boolean isSelected) {
         setBackgroundColor(item, isSelected);
-        if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision()) && item.getMyTagValue() == null) {
+        if (MergeDecisionType.KEEP_MINE == item.getMergeDecision() && item.getMyTagValue() == null) {
             setText(tr("<undefined>"));
             setToolTipText(tr("The merged dataset will not include a tag with key {0}", item.getKey()));
-        } else if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision()) && item.getTheirTagValue() == null) {
+        } else if (MergeDecisionType.KEEP_THEIR == item.getMergeDecision() && item.getTheirTagValue() == null) {
             setText(tr("<undefined>"));
             setToolTipText(tr("The merged dataset will not include a tag with key {0}", item.getKey()));
-        } else if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
+        } else if (MergeDecisionType.UNDECIDED == item.getMergeDecision()) {
             setText("");
         } else {
@@ -47 +47 @@
     protected void renderValue(TagMergeItem item, boolean isSelected) {
         setBackgroundColor(item, isSelected);
-        if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision()) && item.getMyTagValue() == null) {
+        if (MergeDecisionType.KEEP_MINE == item.getMergeDecision() && item.getMyTagValue() == null) {
             setText(tr("<undefined>"));
             setToolTipText(tr("The merged dataset will not include a tag with key {0}", item.getKey()));
-        } else if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision()) && item.getTheirTagValue() == null) {
+        } else if (MergeDecisionType.KEEP_THEIR == item.getMergeDecision() && item.getTheirTagValue() == null) {
             setText(tr("<undefined>"));
             setToolTipText(tr("The merged dataset will not include a tag with key {0}", item.getKey()));
-        } else if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
+        } else if (MergeDecisionType.UNDECIDED == item.getMergeDecision()) {
             setText("");
         } else {
-            if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision())) {
+            if (MergeDecisionType.KEEP_MINE == item.getMergeDecision()) {
                 setText(item.getMyTagValue());
                 setToolTipText(item.getMyTagValue());
-            } else if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
+            } else if (MergeDecisionType.KEEP_THEIR == item.getMergeDecision()) {
                 setText(item.getTheirTagValue());
                 setToolTipText(item.getTheirTagValue());

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java

@@ -19 +19 @@
             return;
         }
-        if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision())) {
+        if (MergeDecisionType.KEEP_MINE == item.getMergeDecision()) {
             setBackground(ConflictColors.BGCOLOR_KEEP.get());
-        } else if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
+        } else if (MergeDecisionType.KEEP_THEIR == item.getMergeDecision()) {
             setBackground(ConflictColors.BGCOLOR_DROP.get());
-        } else if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
+        } else if (MergeDecisionType.UNDECIDED == item.getMergeDecision()) {
             setBackground(ConflictColors.BGCOLOR_UNDECIDED.get());
         }
@@ -29 +29 @@
 
     protected void setTextColor(TagMergeItem item) {
-        if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision())) {
+        if (MergeDecisionType.KEEP_MINE == item.getMergeDecision()) {
             setForeground(ConflictColors.FGCOLOR_KEEP.get());
-        } else if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
+        } else if (MergeDecisionType.KEEP_THEIR == item.getMergeDecision()) {
             setForeground(ConflictColors.FGCOLOR_DROP.get());
-        } else if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
+        } else if (MergeDecisionType.UNDECIDED == item.getMergeDecision()) {
             setForeground(ConflictColors.FGCOLOR_UNDECIDED.get());
         }

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java

@@ -87 +87 @@
         int newValue = 0;
         for (TagMergeItem item: tagMergeItems) {
-            if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
+            if (MergeDecisionType.UNDECIDED == item.getMergeDecision()) {
                 newValue++;
             }
@@ -94 +94 @@
         numUndecidedTags = newValue;
         fireNumUndecidedTagsChanged(oldValue, numUndecidedTags);
-
     }
 
@@ -196 +195 @@
     public boolean isResolvedCompletely() {
         for (TagMergeItem item: tagMergeItems) {
-            if (item.getMergeDecision().equals(MergeDecisionType.UNDECIDED))
+            if (item.getMergeDecision() == MergeDecisionType.UNDECIDED)
                 return false;
         }
@@ -204 +203 @@
     public void decideRemaining(MergeDecisionType decision) {
         for (TagMergeItem item: tagMergeItems) {
-            if (item.getMergeDecision().equals(MergeDecisionType.UNDECIDED))
+            if (item.getMergeDecision() == MergeDecisionType.UNDECIDED)
                 item.decide(decision);
         }
@@ -212 +211 @@
         int n = 0;
         for (TagMergeItem item: tagMergeItems) {
-            if (!item.getMergeDecision().equals(MergeDecisionType.UNDECIDED)) {
+            if (item.getMergeDecision() != MergeDecisionType.UNDECIDED) {
                 n++;
             }

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java

@@ -19 +19 @@
             return;
         }
-        if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision())) {
+        if (MergeDecisionType.KEEP_MINE == item.getMergeDecision()) {
             setBackground(ConflictColors.BGCOLOR_DROP.get());
-        } else if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
+        } else if (MergeDecisionType.KEEP_THEIR == item.getMergeDecision()) {
             setBackground(ConflictColors.BGCOLOR_KEEP.get());
-        } else if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
+        } else if (MergeDecisionType.UNDECIDED == item.getMergeDecision()) {
             setBackground(ConflictColors.BGCOLOR_UNDECIDED.get());
         }
@@ -29 +29 @@
 
     protected void setTextColor(TagMergeItem item) {
-        if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision())) {
+        if (MergeDecisionType.KEEP_MINE == item.getMergeDecision()) {
             setForeground(ConflictColors.FGCOLOR_DROP.get());
-        } else if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
+        } else if (MergeDecisionType.KEEP_THEIR == item.getMergeDecision()) {
             setForeground(ConflictColors.FGCOLOR_KEEP.get());
-        } else if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
+        } else if (MergeDecisionType.UNDECIDED == item.getMergeDecision()) {
             setForeground(ConflictColors.FGCOLOR_UNDECIDED.get());
         }

trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java

@@ -216 +216 @@
      */
     public boolean isDecided() {
-        return !type.equals(MultiValueDecisionType.UNDECIDED);
+        return type != MultiValueDecisionType.UNDECIDED;
     }
 
@@ -240 +240 @@
             throw new IllegalStateException(tr("Not decided yet"));
         String key = tags.getKeys().iterator().next();
-        if (type.equals(MultiValueDecisionType.KEEP_NONE)) {
+        if (type == MultiValueDecisionType.KEEP_NONE) {
             primitive.remove(key);
         } else {

trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java

@@ -300 +300 @@
             if (mode == null) {
                 setEnabled(false);
-            } else if (mode.equals(Mode.RESOLVING_ONE_TAGCOLLECTION_ONLY)) {
+            } else if (mode == Mode.RESOLVING_ONE_TAGCOLLECTION_ONLY) {
                 setEnabled(model.isResolvedCompletely());
             } else {

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java

@@ -66 +66 @@
 
     public boolean isDecided() {
-        return !UNDECIDED.equals(decision);
+        return UNDECIDED != decision;
     }
 

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java

@@ -77 +77 @@
         }
         RelationMemberConflictDecisionType.prepareLabel(decision, this);
-        if (RelationMemberConflictDecisionType.UNDECIDED.equals(decision)) {
+        if (RelationMemberConflictDecisionType.UNDECIDED == decision) {
             setFont(getFont().deriveFont(Font.ITALIC));
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java

@@ -95 +95 @@
     protected void sort() {
         data.sort((c1, c2) -> {
-                if (c1.getModificationType().equals(c2.getModificationType())) {
+                if (c1.getModificationType() == c2.getModificationType()) {
                     long id1 = c1.getPrimitive().getId();
                     long id2 = c2.getPrimitive().getId();

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java

@@ -224 +224 @@
         rbQueries.get(q).setSelected(true);
         boolean mineOnly = Config.getPref().getBoolean("changeset-query.basic.my-changesets-only", false);
-        mineOnly = mineOnly || q.equals(BasicQuery.MY_OPEN_CHANGESETS);
+        mineOnly = mineOnly || q == BasicQuery.MY_OPEN_CHANGESETS;
         cbMyChangesetsOnly.setSelected(mineOnly);
     }
@@ -280 +280 @@
             BasicQuery q = getSelectedQuery();
             if (q == null) return;
-            if (q.equals(BasicQuery.MY_OPEN_CHANGESETS)) {
+            if (q == BasicQuery.MY_OPEN_CHANGESETS) {
                 cbMyChangesetsOnly.setSelected(true);
                 cbMyChangesetsOnly.setEnabled(false);

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java

@@ -237 +237 @@
             Way way = (Way) getMemberTableModel().getReferredPrimitive(getSelectedRows()[0]);
             if (!connectionType.linkPrev) {
-                getLayer().data.setSelected(WayConnectionType.Direction.FORWARD.equals(connectionType.direction)
+                getLayer().data.setSelected(WayConnectionType.Direction.FORWARD == connectionType.direction
                         ? way.firstNode() : way.lastNode());
                 AutoScaleAction.autoScale("selection");
             } else if (!connectionType.linkNext) {
-                getLayer().data.setSelected(WayConnectionType.Direction.FORWARD.equals(connectionType.direction)
+                getLayer().data.setSelected(WayConnectionType.Direction.FORWARD == connectionType.direction
                         ? way.lastNode() : way.firstNode());
                 AutoScaleAction.autoScale("selection");

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java

@@ -109 +109 @@
         return relation != null && !relation.isNew()
                 && !relation.getDataSet().isLocked()
-                && !DownloadPolicy.BLOCKED.equals(relation.getDataSet().getDownloadPolicy());
+                && DownloadPolicy.BLOCKED != relation.getDataSet().getDownloadPolicy();
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AbstractRelationEditorAction.java

@@ -94 +94 @@
         DataSet ds = editorAccess.getEditor().getRelation().getDataSet();
         return !NetworkManager.isOffline(OnlineResource.OSM_API) && ds != null && !ds.isLocked()
-                && !DownloadPolicy.BLOCKED.equals(ds.getDownloadPolicy());
+                && DownloadPolicy.BLOCKED != ds.getDownloadPolicy();
     }
 

trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java

@@ -295 +295 @@
         LatLonViewer(HistoryBrowserModel model, PointInTimeType role) {
             this.updater = new Updater(model, role);
-            this.modifiedColor = PointInTimeType.CURRENT_POINT_IN_TIME.equals(role)
+            this.modifiedColor = PointInTimeType.CURRENT_POINT_IN_TIME == role
                     ? TwoColumnDiff.Item.DiffItemType.INSERTED.getColor()
                     : TwoColumnDiff.Item.DiffItemType.DELETED.getColor();

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java

@@ -120 +120 @@
         tpViewers.setTitleAt(0, tr("Tags"));
 
-        if (history.getEarliest().getType().equals(OsmPrimitiveType.NODE)) {
+        if (history.getEarliest().getType() == OsmPrimitiveType.NODE) {
             tpViewers.add(coordinateInfoViewer);
             tpViewers.setTitleAt(1, tr("Coordinates"));
-        } else if (history.getEarliest().getType().equals(OsmPrimitiveType.WAY)) {
+        } else if (history.getEarliest().getType() == OsmPrimitiveType.WAY) {
             tpViewers.add(nodeListViewer);
             tpViewers.setTitleAt(1, tr("Nodes"));
-        } else if (history.getEarliest().getType().equals(OsmPrimitiveType.RELATION)) {
+        } else if (history.getEarliest().getType() == OsmPrimitiveType.RELATION) {
             tpViewers.add(relationMemberListViewer);
             tpViewers.setTitleAt(1, tr("Members"));

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

@@ -245 +245 @@
     public TagTableModel getTagTableModel(PointInTimeType pointInTimeType) {
         CheckParameterUtil.ensureParameterNotNull(pointInTimeType, "pointInTimeType");
-        if (pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME))
+        if (pointInTimeType == PointInTimeType.CURRENT_POINT_IN_TIME)
             return currentTagTableModel;
         else // REFERENCE_POINT_IN_TIME
@@ -260 +260 @@
     public DiffTableModel getNodeListTableModel(PointInTimeType pointInTimeType) {
         CheckParameterUtil.ensureParameterNotNull(pointInTimeType, "pointInTimeType");
-        if (pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME))
+        if (pointInTimeType == PointInTimeType.CURRENT_POINT_IN_TIME)
             return currentNodeListTableModel;
         else // REFERENCE_POINT_IN_TIME
@@ -275 +275 @@
     public DiffTableModel getRelationMemberTableModel(PointInTimeType pointInTimeType) {
         CheckParameterUtil.ensureParameterNotNull(pointInTimeType, "pointInTimeType");
-        if (pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME))
+        if (pointInTimeType == PointInTimeType.CURRENT_POINT_IN_TIME)
             return currentRelationMemberTableModel;
         else // REFERENCE_POINT_IN_TIME
@@ -367 +367 @@
     public HistoryOsmPrimitive getPointInTime(PointInTimeType type) {
         CheckParameterUtil.ensureParameterNotNull(type, "type");
-        if (type.equals(PointInTimeType.CURRENT_POINT_IN_TIME))
+        if (type == PointInTimeType.CURRENT_POINT_IN_TIME)
             return current;
-        else if (type.equals(PointInTimeType.REFERENCE_POINT_IN_TIME))
+        else if (type == PointInTimeType.REFERENCE_POINT_IN_TIME)
             return reference;
 

trunk/src/org/openstreetmap/josm/gui/history/PointInTimeType.java

@@ -19 +19 @@
      */
     public PointInTimeType opposite() {
-        if (this.equals(REFERENCE_POINT_IN_TIME))
+        if (this == REFERENCE_POINT_IN_TIME)
             return CURRENT_POINT_IN_TIME;
         else

trunk/src/org/openstreetmap/josm/gui/history/TagTableModel.java

@@ -129 +129 @@
      */
     public boolean isCurrentPointInTime() {
-        return pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME);
+        return pointInTimeType == PointInTimeType.CURRENT_POINT_IN_TIME;
     }
 
@@ -137 +137 @@
      */
     public boolean isReferencePointInTime() {
-        return pointInTimeType.equals(PointInTimeType.REFERENCE_POINT_IN_TIME);
+        return pointInTimeType == PointInTimeType.REFERENCE_POINT_IN_TIME;
     }
 

trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java

@@ -89 +89 @@
         GuiHelper.runInEDTAndWait(() -> {
             CredentialDialog dialog;
-            if (requestorType.equals(RequestorType.PROXY))
+            if (requestorType == RequestorType.PROXY)
                 dialog = getHttpProxyCredentialDialog(
                         username, password, host, agent.getSaveUsernameAndPasswordCheckboxText());

trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java

@@ -213 +213 @@
     public boolean hasUnsavedData() {
         for (SaveLayerInfo info: layerInfo) {
-            if (info.isDoUploadToServer() && !UploadOrSaveState.OK.equals(info.getUploadState()))
+            if (info.isDoUploadToServer() && UploadOrSaveState.OK != info.getUploadState())
                 return true;
-            if (info.isDoSaveToFile() && !UploadOrSaveState.OK.equals(info.getSaveState()))
+            if (info.isDoSaveToFile() && UploadOrSaveState.OK != info.getSaveState())
                 return true;
         }
@@ -224 +224 @@
         int ret = 0;
         for (SaveLayerInfo info: layerInfo) {
-            if (UploadOrSaveState.CANCELED.equals(info.getSaveState())
-                    || UploadOrSaveState.CANCELED.equals(info.getUploadState())) {
+            if (UploadOrSaveState.CANCELED == info.getSaveState()
+                    || UploadOrSaveState.CANCELED == info.getUploadState()) {
                 ret++;
             }
@@ -235 +235 @@
         int ret = 0;
         for (SaveLayerInfo info: layerInfo) {
-            if (UploadOrSaveState.FAILED.equals(info.getSaveState())
-                    || UploadOrSaveState.FAILED.equals(info.getUploadState())) {
+            if (UploadOrSaveState.FAILED == info.getSaveState()
+                    || UploadOrSaveState.FAILED == info.getUploadState()) {
                 ret++;
             }

trunk/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java

@@ -86 +86 @@
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getPropertyName().equals(SaveLayersModel.MODE_PROP)) {
-            setVisible(Mode.UPLOADING_AND_SAVING.equals(evt.getNewValue()));
+            setVisible(Mode.UPLOADING_AND_SAVING == evt.getNewValue());
         }
         getParent().validate();

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -559 +559 @@
 
             UploadStrategySpecification strategy = dialog.getUploadStrategySpecification();
-            if (strategy.getStrategy().equals(UploadStrategy.CHUNKED_DATASET_STRATEGY)
+            if (strategy.getStrategy() == UploadStrategy.CHUNKED_DATASET_STRATEGY
                     && strategy.getChunkSize() == UploadStrategySpecification.UNSPECIFIED_CHUNK_SIZE) {
                 warnIllegalChunkSize();

trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java

@@ -73 +73 @@
     protected OsmPrimitive getPrimitive(OsmPrimitiveType type, long id) {
         for (OsmPrimitive p: toUpload) {
-            if (OsmPrimitiveType.from(p).equals(type) && p.getId() == id)
+            if (OsmPrimitiveType.from(p) == type && p.getId() == id)
                 return p;
         }

trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

@@ -161 +161 @@
             return false;
         }
-        if (strategy.getPolicy() == null || strategy.getPolicy().equals(MaxChangesetSizeExceededPolicy.ABORT)) {
+        if (strategy.getPolicy() == null || strategy.getPolicy() == MaxChangesetSizeExceededPolicy.ABORT) {
             strategy.setPolicy(askMaxChangesetSizeExceedsPolicy());
         }
@@ -355 +355 @@
             if (lastException instanceof ChangesetClosedException) {
                 ChangesetClosedException e = (ChangesetClosedException) lastException;
-                if (e.getSource().equals(ChangesetClosedException.Source.UPDATE_CHANGESET)) {
+                if (e.getSource() == ChangesetClosedException.Source.UPDATE_CHANGESET) {
                     handleFailedUpload(lastException);
                     return;
@@ -362 +362 @@
                     /* do nothing if unknown policy */
                     return;
-                if (e.getSource().equals(ChangesetClosedException.Source.UPLOAD_DATA)) {
+                if (e.getSource() == ChangesetClosedException.Source.UPLOAD_DATA) {
                     switch(strategy.getPolicy()) {
                     case ABORT:

trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java

@@ -256 +256 @@
         rbStrategy.get(strategy.getStrategy()).setSelected(true);
         tfChunkSize.setEnabled(strategy.getStrategy() == UploadStrategy.CHUNKED_DATASET_STRATEGY);
-        if (strategy.getStrategy().equals(UploadStrategy.CHUNKED_DATASET_STRATEGY)) {
+        if (strategy.getStrategy() == UploadStrategy.CHUNKED_DATASET_STRATEGY) {
             if (strategy.getChunkSize() != UploadStrategySpecification.UNSPECIFIED_CHUNK_SIZE) {
                 tfChunkSize.setText(Integer.toString(strategy.getChunkSize()));

trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java

@@ -230 +230 @@
      */
     public boolean isLinkContext() {
-        return Context.LINK.equals(context);
+        return Context.LINK == context;
     }
 
@@ -256 +256 @@
      */
     public String getRole() {
-        if (getContext().equals(Context.PRIMITIVE))
+        if (getContext() == Context.PRIMITIVE)
             return null;
 

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java

@@ -64 +64 @@
                 }
             }
-            if (!considerValAsKey && op.equals(Op.EQ))
+            if (!considerValAsKey && op == Op.EQ)
                 return new SimpleKeyValueCondition(k, v);
             return new KeyValueCondition(k, v, op, considerValAsKey);
@@ -362 +362 @@
         @Override
         public boolean applies(Environment env) {
-            if (Op.REGEX.equals(op)) {
+            if (Op.REGEX == op) {
                 return matches(env);
-            } else if (Op.NREGEX.equals(op)) {
+            } else if (Op.NREGEX == op) {
                 return !matches(env);
             } else {
@@ -527 +527 @@
             this.negateResult = negateResult;
             this.matchType = matchType == null ? KeyMatchType.EQ : matchType;
-            this.containsPattern = KeyMatchType.REGEX.equals(matchType)
+            this.containsPattern = KeyMatchType.REGEX == matchType
                     ? Pattern.compile(label).asPredicate()
                     : null;
@@ -565 +565 @@
         public Tag asTag(OsmPrimitive p) {
             String key = label;
-            if (KeyMatchType.REGEX.equals(matchType)) {
+            if (KeyMatchType.REGEX == matchType) {
                 key = p.keySet().stream().filter(containsPattern).findAny().orElse(key);
             }
@@ -801 +801 @@
          */
         public static PseudoClassCondition createPseudoClassCondition(String id, boolean not, Context context) {
-            CheckParameterUtil.ensureThat(!"sameTags".equals(id) || Context.LINK.equals(context), "sameTags only supported in LINK context");
+            CheckParameterUtil.ensureThat(!"sameTags".equals(id) || Context.LINK == context, "sameTags only supported in LINK context");
             if ("open_end".equals(id)) {
                 return new OpenEndPseudoClassCondition(not);

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -317 +317 @@
                 return false;
 
-            if (ChildOrParentSelectorType.ELEMENT_OF.equals(type)) {
+            if (ChildOrParentSelectorType.ELEMENT_OF == type) {
 
                 if (e.osm instanceof INode || e.osm.getDataSet() == null) {
@@ -364 +364 @@
                 return e.child != null;
 
-            } else if (ChildOrParentSelectorType.CROSSING.equals(type) && e.osm instanceof IWay) {
+            } else if (ChildOrParentSelectorType.CROSSING == type && e.osm instanceof IWay) {
                 e.parent = e.osm;
                 final CrossingFinder crossingFinder = new CrossingFinder(e);
@@ -372 +372 @@
                 }
                 return e.child != null;
-            } else if (ChildOrParentSelectorType.SIBLING.equals(type)) {
+            } else if (ChildOrParentSelectorType.SIBLING == type) {
                 if (e.osm instanceof INode) {
                     for (IPrimitive ref : e.osm.getReferrers(true)) {
@@ -392 +392 @@
                     }
                 }
-            } else if (ChildOrParentSelectorType.CHILD.equals(type)
+            } else if (ChildOrParentSelectorType.CHILD == type
                     && link.conds != null && !link.conds.isEmpty()
                     && link.conds.get(0) instanceof OpenEndPseudoClassCondition) {
@@ -399 +399 @@
                     return e.parent != null;
                 }
-            } else if (ChildOrParentSelectorType.CHILD.equals(type)) {
+            } else if (ChildOrParentSelectorType.CHILD == type) {
                 MatchingReferrerFinder collector = new MatchingReferrerFinder(e);
                 e.osm.visitReferrers(collector);
                 if (e.parent != null)
                     return true;
-            } else if (ChildOrParentSelectorType.PARENT.equals(type)) {
+            } else if (ChildOrParentSelectorType.PARENT == type) {
                 if (e.osm instanceof IWay) {
                     List<? extends INode> wayNodes = ((IWay<?>) e.osm).getNodes();
@@ -451 +451 @@
         @Override
         public String toString() {
-            return left.toString() + ' ' + (ChildOrParentSelectorType.PARENT.equals(type) ? '<' : '>') + link + ' ' + right;
+            return left.toString() + ' ' + (ChildOrParentSelectorType.PARENT == type ? '<' : '>') + link + ' ' + right;
         }
     }
@@ -619 +619 @@
             if ("*".equals(base)) {
                 return true;
-            } else if (OsmPrimitiveType.NODE.equals(type)) {
+            } else if (OsmPrimitiveType.NODE == type) {
                 return "node".equals(base);
-            } else if (OsmPrimitiveType.WAY.equals(type)) {
+            } else if (OsmPrimitiveType.WAY == type) {
                 return "way".equals(base) || "area".equals(base);
-            } else if (OsmPrimitiveType.RELATION.equals(type)) {
+            } else if (OsmPrimitiveType.RELATION == type) {
                 return "area".equals(base) || "relation".equals(base) || "canvas".equals(base);
             }

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -143 +143 @@
 
         this.sourceType = sourceType;
-        this.canEnable = sourceType.equals(SourceType.MAP_PAINT_STYLE) || sourceType.equals(SourceType.TAGCHECKER_RULE);
+        this.canEnable = sourceType == SourceType.MAP_PAINT_STYLE || sourceType == SourceType.TAGCHECKER_RULE;
 
         DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
@@ -211 +211 @@
         MoveUpDownAction moveUp = null;
         MoveUpDownAction moveDown = null;
-        if (sourceType.equals(SourceType.MAP_PAINT_STYLE)) {
+        if (sourceType == SourceType.MAP_PAINT_STYLE) {
             moveUp = new MoveUpDownAction(false);
             moveDown = new MoveUpDownAction(true);
@@ -288 +288 @@
         sideButtonTB.add(removeActiveSourcesAction);
         sideButtonTB.addSeparator(new Dimension(12, 30));
-        if (sourceType.equals(SourceType.MAP_PAINT_STYLE)) {
+        if (sourceType == SourceType.MAP_PAINT_STYLE) {
             sideButtonTB.add(moveUp);
             sideButtonTB.add(moveDown);

trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java

@@ -272 +272 @@
         tfProxySocksPort.setText(Config.getPref().get(DefaultProxySelector.PROXY_SOCKS_PORT, ""));
 
-        if (pp.equals(ProxyPolicy.USE_SYSTEM_SETTINGS) && !DefaultProxySelector.willJvmRetrieveSystemProxies()) {
+        if (pp == ProxyPolicy.USE_SYSTEM_SETTINGS && !DefaultProxySelector.willJvmRetrieveSystemProxies()) {
             Logging.warn(tr("JOSM is configured to use proxies from the system setting, but the JVM is not configured to retrieve them. " +
                          "Resetting preferences to ''No proxy''"));

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Check.java

@@ -74 +74 @@
 
         final List<QuadStateCheckBox.State> allowedStates = new ArrayList<>(4);
-        if (QuadStateCheckBox.State.PARTIAL.equals(initialState))
+        if (QuadStateCheckBox.State.PARTIAL == initialState)
             allowedStates.add(QuadStateCheckBox.State.PARTIAL);
         allowedStates.add(QuadStateCheckBox.State.SELECTED);

trunk/src/org/openstreetmap/josm/io/AbstractParser.java

@@ -129 +129 @@
         Date timestamp = DateUtils.fromString(v);
         HistoryOsmPrimitive primitive = null;
-        if (type.equals(OsmPrimitiveType.NODE)) {
+        if (type == OsmPrimitiveType.NODE) {
             Double lat = getAttributeDouble(atts, "lat");
             Double lon = getAttributeDouble(atts, "lon");
@@ -135 +135 @@
             primitive = new HistoryNode(id, version, visible, user, changesetId, timestamp, coor, changeset != null);
 
-        } else if (type.equals(OsmPrimitiveType.WAY)) {
+        } else if (type == OsmPrimitiveType.WAY) {
             primitive = new HistoryWay(id, version, visible, user, changesetId, timestamp, changeset != null);
-        } else if (type.equals(OsmPrimitiveType.RELATION)) {
+        } else if (type == OsmPrimitiveType.RELATION) {
             primitive = new HistoryRelation(id, version, visible, user, changesetId, timestamp, changeset != null);
         }

trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java

@@ -141 +141 @@
         int port = parseProxyPortValue(PROXY_HTTP_PORT, Config.getPref().get(PROXY_HTTP_PORT, null));
         httpProxySocketAddress = null;
-        if (proxyPolicy.equals(ProxyPolicy.USE_HTTP_PROXY)) {
+        if (proxyPolicy == ProxyPolicy.USE_HTTP_PROXY) {
             if (host != null && !host.trim().isEmpty() && port > 0) {
                 httpProxySocketAddress = new InetSocketAddress(host, port);
@@ -153 +153 @@
         port = parseProxyPortValue(PROXY_SOCKS_PORT, Config.getPref().get(PROXY_SOCKS_PORT, null));
         socksProxySocketAddress = null;
-        if (proxyPolicy.equals(ProxyPolicy.USE_SOCKS_PROXY)) {
+        if (proxyPolicy == ProxyPolicy.USE_SOCKS_PROXY) {
             if (host != null && !host.trim().isEmpty() && port > 0) {
                 socksProxySocketAddress = new InetSocketAddress(host, port);

trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

@@ -194 +194 @@
         for (RelationMember member : !recursesDown() ? relation.getMembers() : Collections.<RelationMember>emptyList()) {
             // avoid infinite recursion in case of cyclic dependencies in relations
-            if (OsmPrimitiveType.from(member.getMember()).equals(OsmPrimitiveType.RELATION)
+            if (OsmPrimitiveType.from(member.getMember()) == OsmPrimitiveType.RELATION
                     && relations.contains(member.getMember().getId())) {
                 continue;

trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java

@@ -191 +191 @@
         try {
             Collection<Way> waysToCheck = new ArrayList<>(ds.getWays());
-            if (isReadFull() || primitiveType.equals(OsmPrimitiveType.NODE)) {
+            if (isReadFull() || primitiveType == OsmPrimitiveType.NODE) {
                 for (Way way: waysToCheck) {
                     if (!way.isNew() && way.hasIncompleteNodes()) {
@@ -234 +234 @@
             progressMonitor.beginTask(null, 3);
             DataSet ret = new DataSet();
-            if (primitiveType.equals(OsmPrimitiveType.NODE)) {
+            if (primitiveType == OsmPrimitiveType.NODE) {
                 DataSet ds = getReferringWays(progressMonitor.createSubTaskMonitor(1, false));
                 DataSetMerger visitor = new DataSetMerger(ret, ds);

trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java

@@ -121 +121 @@
               .append('/')
               .append(id.getUniqueId());
-            if (full && !id.getType().equals(OsmPrimitiveType.NODE)) {
+            if (full && id.getType() != OsmPrimitiveType.NODE) {
                 sb.append("/full");
             } else if (version > 0) {

trunk/src/org/openstreetmap/josm/io/OsmWriter.java

@@ -180 +180 @@
      */
     public void writeContent(DataSet ds) {
-        setWithVisible(UploadPolicy.NORMAL.equals(ds.getUploadPolicy()));
+        setWithVisible(UploadPolicy.NORMAL == ds.getUploadPolicy());
         writeNodes(ds.getNodes());
         writeWays(ds.getWays());

trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java

@@ -292 +292 @@
     static SearchResult searchName(List<SearchResult> results) {
         return results.stream().filter(
-                x -> !OsmPrimitiveType.NODE.equals(x.getOsmId().getType())).iterator().next();
+                x -> OsmPrimitiveType.NODE != x.getOsmId().getType()).iterator().next();
     }
 

trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java

@@ -44 +44 @@
             if (OsmApi.isUsingOAuth()
                     && Objects.equals(OsmApi.getOsmApi().getHost(), getRequestingHost())
-                    && RequestorType.SERVER.equals(getRequestorType())) {
+                    && RequestorType.SERVER == getRequestorType()) {
                 // if we are working with OAuth we don't prompt for a password
                 return null;
@@ -55 +55 @@
                 return null;
             }
-            if (RequestorType.PROXY.equals(getRequestorType())) {
+            if (RequestorType.PROXY == getRequestorType()) {
                 // Query user in case this authenticator is called (indicating that the authentication failed) the next time.
                 failedCredentials.add(hostTypePair);

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java

@@ -50 +50 @@
     protected static ImageryInfo findBingEntry() {
         for (ImageryInfo i : ImageryLayerInfo.instance.getDefaultLayers()) {
-            if (ImageryType.BING.equals(i.getImageryType())) {
+            if (ImageryType.BING == i.getImageryType()) {
                 return i;
             }

trunk/src/org/openstreetmap/josm/tools/HttpClient.java

@@ -314 +314 @@
                 compression = Compression.forContentType(contentType);
             }
-            if (uncompressAccordingToContentDisposition && Compression.NONE.equals(compression)) {
+            if (uncompressAccordingToContentDisposition && Compression.NONE == compression) {
                 final String contentDisposition = getHeaderField("Content-Disposition");
                 final Matcher matcher = Pattern.compile("filename=\"([^\"]+)\"").matcher(

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -1536 +1536 @@
 
         // Check if the presets have icons for nodes/relations.
-        if (!OsmPrimitiveType.WAY.equals(primitive.getType())) {
+        if (OsmPrimitiveType.WAY != primitive.getType()) {
             final Collection<TaggingPreset> presets = new TreeSet<>((o1, o2) -> {
                 final int o1TypesSize = o1.types == null || o1.types.isEmpty() ? Integer.MAX_VALUE : o1.types.size();