Changeset 1801 in josm

Timestamp:

2009-07-17T20:31:25+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #2980: selected objects not in relation editor

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/relation

Files:

• GenericRelationEditor.java (modified) (2 diffs)
• SelectionTableModel.java (modified) (3 diffs)

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

@@ -347 +347 @@
         gc.fill = GridBagConstraints.BOTH;
         gc.anchor = GridBagConstraints.CENTER;
-        gc.weightx = 0.8;
+        gc.weightx = 0.6;
         gc.weighty = 1.0;
         pnl.add(scrollPane, gc);
@@ -359 +359 @@
         gc.gridx = 3;
         gc.gridy = 1;
-        gc.weightx = 0.2;
+        gc.weightx = 0.4;
         gc.weighty = 1.0;
         pnl.add(buildSelectionTablePanel(), gc);

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.dialogs.relation;
-
+import static org.openstreetmap.josm.tools.I18n.tr;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -22 +22 @@
     private ArrayList<OsmPrimitive> cache;
 
-    public SelectionTableModel(OsmDataLayer layer) {
+    /**
+     * constructor
+     * 
+     * @param layer  the data layer. Must not be null.
+     * @exception IllegalArgumentException thrown if layer is null
+     */
+    public SelectionTableModel(OsmDataLayer layer) throws IllegalArgumentException {
+        if (layer == null)
+            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "layer"));
         this.layer = layer;
         cache = new ArrayList<OsmPrimitive>();
         DataSet.selListeners.add(this);
         Layer.listeners.add(this);
+        populateSelectedPrimitives(layer);
     }
 
@@ -84 +93 @@
         return cache;
     }
+
+    /**
+     * populates the model with the primitives currently selected in
+     * <code>layer</code>
+     * 
+     * @param layer  the data layer
+     */
+    protected void populateSelectedPrimitives(OsmDataLayer layer) {
+        selectionChanged(layer.data.getSelected());
+    }
 }