Changeset 8399 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

Timestamp:

2015-05-19T23:04:25+02:00 (9 years ago)

Author:

Don-vip

Message:

see #11397, see #11447 - partial revert of r8308 (SONARJAVA-1061: FP on S1948: no issue should be raised when using Collections of Serializable objects)

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (modified) (1 diff)

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

@@ -827 +827 @@
 
         private int selectedIdx;
-        private final transient List<ComparePairType> compareModes;
+        private final List<ComparePairType> compareModes;
 
         /**