Changeset 25667 in osm for applications/editors/josm/plugins/relcontext/src/relcontext/RelContextDialog.java

Timestamp:

2011-03-22T15:53:58+01:00 (14 years ago)

Author:

zverik

Message:

current

File:

• applications/editors/josm/plugins/relcontext/src/relcontext/RelContextDialog.java (modified) (8 diffs)

applications/editors/josm/plugins/relcontext/src/relcontext/RelContextDialog.java

@@ -2 +2 @@
 
 import java.awt.event.MouseEvent;
+import java.util.Collection;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -9 +11 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import javax.swing.DefaultListModel;
+import javax.swing.JButton;
 
 import javax.swing.JList;
@@ -15 +22 @@
 import javax.swing.ListSelectionModel;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
+import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.MapView.EditLayerChangeListener;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
@@ -23 +34 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.Shortcut;
+import relcontext.actions.AddRemoveMemberAction;
+import relcontext.actions.ClearChosenRelationAction;
+import relcontext.actions.CreateRelationAction;
+import relcontext.actions.DownloadChosenRelationAction;
+import relcontext.actions.EditChosenRelationAction;
 
 /**
@@ -29 +45 @@
  * @author Zverik
  */
-public class RelContextDialog extends ToggleDialog implements LayerChangeListener, ChosenRelationListener {
+public class RelContextDialog extends ToggleDialog implements EditLayerChangeListener, ChosenRelationListener, SelectionChangedListener {
     private JList relationsList;
+    private final DefaultListModel relationsData;
     private ChosenRelation chosenRelation;
 
     public RelContextDialog() {
-        super(tr("Open Relation Editor"), "icon_relcontext",
+        super(tr("Advanced Relation Editor"), "icon_relcontext",
                 tr("Opens advanced relation/multipolygon editor panel"),
                 Shortcut.registerShortcut("view:relcontext", tr("Toggle: {0}", tr("Open Relation Editor")),
                 KeyEvent.VK_R, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 150);
+
+        JPanel rcPanel = new JPanel(new BorderLayout());
 
         chosenRelation = new ChosenRelation();
@@ -43 +62 @@
         MapView.addEditLayerChangeListener(chosenRelation);
 
-        relationsList = new JList();
+        relationsData = new DefaultListModel();
+        relationsList = new JList(relationsData);
         relationsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         relationsList.setCellRenderer(new OsmPrimitivRenderer() {
@@ -58 +78 @@
                 }
                 chosenRelation.set((Relation)relationsList.getSelectedValue());
+                relationsList.clearSelection();
             }
         });
-        add(new JScrollPane(relationsList), BorderLayout.CENTER);
+        rcPanel.add(new JScrollPane(relationsList), BorderLayout.CENTER);
 
         // [±][X] relation U [AZ][Down][Edit]
         JPanel topLine = new JPanel(new BorderLayout());
         JPanel topLeftButtons = new JPanel(new FlowLayout(FlowLayout.LEFT));
+        topLeftButtons.add(new JButton(new AddRemoveMemberAction(chosenRelation)));
+        topLeftButtons.add(new JButton(new ClearChosenRelationAction(chosenRelation)));
+        topLine.add(topLeftButtons, BorderLayout.WEST);
+        topLine.add(new ChosenRelationComponent(chosenRelation), BorderLayout.CENTER);
         JPanel topRightButtons = new JPanel(new FlowLayout(FlowLayout.RIGHT));
-        topLine.add(topLeftButtons, BorderLayout.WEST);
+        topRightButtons.add(new JButton(new DownloadChosenRelationAction(chosenRelation)));
+        topRightButtons.add(new JButton(new EditChosenRelationAction(chosenRelation)));
         topLine.add(topRightButtons, BorderLayout.EAST);
-        add(topLine, BorderLayout.NORTH);
+        rcPanel.add(topLine, BorderLayout.NORTH);
 
         // [+][Multi] [X]Adm [X]Tags [X]1
         JPanel bottomLine = new JPanel(new FlowLayout(FlowLayout.LEFT));
-        add(bottomLine, BorderLayout.SOUTH);
+        bottomLine.add(new JButton(new CreateRelationAction(chosenRelation)));
+        rcPanel.add(bottomLine, BorderLayout.SOUTH);
 
-        MapView.addLayerChangeListener(this);
+        add(rcPanel, BorderLayout.CENTER);
     }
+
+    @Override
+    public void hideNotify() {
+        SelectionEventManager.getInstance().removeSelectionListener(this);
+        MapView.removeEditLayerChangeListener(this);
+    }
+
+    @Override
+    public void showNotify() {
+        SelectionEventManager.getInstance().addSelectionListener(this, FireMode.IN_EDT_CONSOLIDATED);
+        MapView.addEditLayerChangeListener(this);
+    }
+
+
 
     public ChosenRelation getChosenRelation() {
@@ -85 +126 @@
     }
 
-    @Override
-    public void activeLayerChange( Layer arg0, Layer arg1 ) {
-        // TODO Auto-generated method stub
+    public void selectionChanged( Collection<? extends OsmPrimitive> newSelection ) {
+        if( !isVisible() || relationsData == null )
+            return;
+        // repopulate relations table
+        relationsData.clear();
+        if( newSelection == null )
+            return;
+        Set<Relation> rels = new HashSet<Relation>();
+        for( OsmPrimitive element : newSelection ) {
+            for( OsmPrimitive ref : element.getReferrers() ) {
+                if( ref instanceof Relation && !ref.isIncomplete() && !ref.isDeleted() ) {
+                    rels.add((Relation) ref);
+                }
+            }
+        }
+        for( Relation rel : rels )
+            relationsData.addElement(rel);
     }
 
-    @Override
-    public void layerAdded( Layer arg0 ) {
-        // TODO Auto-generated method stub
+    private void updateSelection() {
+        if (Main.main.getCurrentDataSet() == null) {
+            selectionChanged(Collections.<OsmPrimitive>emptyList());
+        } else {
+            selectionChanged(Main.main.getCurrentDataSet().getSelected());
+        }
     }
 
-    @Override
-    public void layerRemoved( Layer arg0 ) {
-        // TODO Auto-generated method stub
+    public void editLayerChanged( OsmDataLayer oldLayer, OsmDataLayer newLayer ) {
+        updateSelection();
     }
 }