Changeset 19050 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java

Timestamp:

2024-04-22T20:59:26+02:00 (6 weeks ago)

Author:

taylor.smock

Message:

Revert most var changes from r19048, fix most new compile warnings and checkstyle issues

Also, document why various ErrorProne checks were originally disabled and fix
generic SonarLint issues.

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (modified) (2 diffs)

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

@@ -180 +180 @@
      */
     public LatLon getMergedCoords() {
-        switch(coordMergeDecision) {
+        switch (coordMergeDecision) {
         case KEEP_MINE: return myCoords;
         case KEEP_THEIR: return theirCoords;
@@ -221 +221 @@
      */
     public Boolean getMergedDeletedState() {
-        switch(deletedMergeDecision) {
+        switch (deletedMergeDecision) {
         case KEEP_MINE: return myDeletedState;
         case KEEP_THEIR: return theirDeletedState;