Changeset 2504 in josm

Timestamp:

2009-11-22T18:26:54+01:00 (14 years ago)

Author:

Gubaer

Message:

see #4009 : further update as proposed by jttt

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -511 +511 @@
      */
     private static  class RelationListModel extends AbstractListModel {
-        /** the list of relations managaged by this model. Should never be null */
-        private ArrayList<Relation> relations;
+        private final ArrayList<Relation> relations = new ArrayList<Relation>();
         private DefaultListSelectionModel selectionModel;
 
         public RelationListModel(DefaultListSelectionModel selectionModel) {
             this.selectionModel = selectionModel;
-            relations = new ArrayList<Relation>();
         }
 
@@ -526 +524 @@
         public synchronized void setRelations(Collection<Relation> relations) {
             List<Relation> sel =  getSelectedRelations();
-            if (relations == null) {
-                this.relations.clear();
-            } else {
-                this.relations = new ArrayList<Relation>(relations.size());
-                for (Relation r: relations) {
-                    if (! r.isDeleted() && r.isVisible() && !r.incomplete) {
-                        this.relations.add(r);
-                    }
+            this.relations.clear();
+            for (Relation r: relations) {
+                if (! r.isDeleted() && r.isVisible() && !r.incomplete) {
+                    this.relations.add(r);
                 }
             }
@@ -564 +558 @@
             if (addedPrimitives == null || addedPrimitives.isEmpty()) return;
             boolean added = false;
-            if (relations == null) {
-                relations = new ArrayList<Relation>();
-            }
             for (OsmPrimitive p: addedPrimitives) {
                 if (! (p instanceof Relation)) {