Changeset 8308 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/PairTable.java

Timestamp:

2015-05-02T00:55:19+02:00 (11 years ago)

Author:

Don-vip

Message:

fix potential NPEs and Sonar issues related to serialization

File:

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

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

@@ -14 +14 @@
 public abstract class PairTable extends OsmPrimitivesTable {
 
-    private final ListMergeModel<? extends PrimitiveId> model;
-    
+    private final transient ListMergeModel<? extends PrimitiveId> model;
+
     public PairTable(String name, ListMergeModel<? extends PrimitiveId> model, OsmPrimitivesTableModel dm, TableColumnModel cm, ListSelectionModel sm) {
         super(dm, cm, sm);