Changeset 25667 in osm

Timestamp:

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

Author:

zverik

Message:

current

Location:

applications/editors/josm/plugins/relcontext

Files:

• build.xml (modified) (3 diffs)
• images/add_remove_member.png (added)
• images/create_relation.png (added)
• images/dialogs (added)
• images/dialogs/icon_relcontext.png (added)
• src/relcontext/ChosenRelation.java (modified) (3 diffs)
• src/relcontext/ChosenRelationComponent.java (added)
• src/relcontext/RelContextDialog.java (modified) (8 diffs)
• src/relcontext/actions/AddRemoveMemberAction.java (modified) (1 diff)
• src/relcontext/actions/ClearChosenRelationAction.java (modified) (1 diff)
• src/relcontext/actions/CreateRelationAction.java (modified) (1 diff)
• src/relcontext/actions/DownloadChosenRelationAction.java (added)
• src/relcontext/actions/EditChosenRelationAction.java (modified) (1 diff)

applications/editors/josm/plugins/relcontext/build.xml

@@ -28 +28 @@
 **
 -->
-<project name="myPluginName" default="dist" basedir=".">
+<project name="RelContext" default="dist" basedir=".">
 
     <!-- enter the SVN commit message -->
@@ -44 +44 @@
     <property name="plugin.src.dir"         value="src"/>
     <!-- this is the directory where the plugin jar is copied to -->
-    <property name="plugin.dist.dir"        value="../../dist"/>
+    <property name="plugin.dist.dir"        value="/Users/Zverik/AppData/Roaming/JOSM/plugins"/>
     <property name="ant.build.javac.target" value="1.5"/>
-    <property name="plugin.dist.dir"        value="../../dist"/>
     <property name="plugin.jar"             value="${plugin.dist.dir}/${ant.project.name}.jar"/>
 
@@ -78 +77 @@
     <target name="dist" depends="compile,revision">
         <echo message="creating ${ant.project.name}.jar ... "/>
-        <copy todir="${plugin.build.dir}/resources">
-            <fileset dir="resources"/>
-        </copy>
         <copy todir="${plugin.build.dir}/images">
             <fileset dir="images"/>

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

@@ -41 +41 @@
         chosenRelation = rel;
         analyse();
+        Main.map.mapView.repaint();
         for( ChosenRelationListener listener : chosenRelationListeners ) {
             listener.chosenRelationChanged(oldRel, chosenRelation);
@@ -92 +93 @@
         g.setColor(Color.yellow);
         g.setStroke(new BasicStroke(6, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
-        g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.4f));
+        g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3f));
         for( OsmPrimitive element : chosenRelation.getMemberPrimitives() ) {
             if( element.getType() == OsmPrimitiveType.NODE ) {
@@ -105 +106 @@
                     b.moveTo(p.x, p.y);
                     for( int i = 1; i < way.getNodesCount(); i++ ) {
-                        p = mv.getPoint(way.getNode(1));
+                        p = mv.getPoint(way.getNode(i));
                         b.lineTo(p.x, p.y);
                     }

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();
     }
 }

applications/editors/josm/plugins/relcontext/src/relcontext/actions/AddRemoveMemberAction.java

@@ -22 +22 @@
 
     public AddRemoveMemberAction( ChosenRelation rel ) {
-        super(tr(ACTION_NAME), "add_remove_member", "Add/remove member from the chosen relation",
-                null, false);
+        super("±", null, "Add/remove member from the chosen relation", null, false);
         this.rel = rel;
+        rel.addChosenRelationListener(this);
+        updateEnabledState();
     }
 

applications/editors/josm/plugins/relcontext/src/relcontext/actions/ClearChosenRelationAction.java

@@ -8 +8 @@
 
 public class ClearChosenRelationAction extends AbstractAction implements ChosenRelationListener {
+    private ChosenRelation rel;
 
-        private ChosenRelation rel;
+    public ClearChosenRelationAction( ChosenRelation rel ) {
+        super("X");
+        this.rel = rel;
+        rel.addChosenRelationListener(this);
+        setEnabled(false);
+    }
 
-        public ClearChosenRelationAction( ChosenRelation rel ) {
-                this.rel = rel;
-        }
+    public void actionPerformed( ActionEvent e ) {
+        rel.clear();
+    }
 
-        public void actionPerformed( ActionEvent e ) {
-                rel.clear();
-        }
-
-        public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
-                setEnabled(newRelation != null);
-        }
+    public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
+        setEnabled(newRelation != null);
+    }
 }

applications/editors/josm/plugins/relcontext/src/relcontext/actions/CreateRelationAction.java

@@ -21 +21 @@
  */
 public class CreateRelationAction extends JosmAction {
+    private static final String ACTION_NAME = "Create relation";
+    protected ChosenRelation chRel;
 
-        private static final String ACTION_NAME = "Create relation";
-        protected ChosenRelation chRel;
+    public CreateRelationAction( ChosenRelation chRel ) {
+        super("+", null, "Create a relation from selected objects", null, false);
+        this.chRel = chRel;
+        updateEnabledState();
+    }
 
-        public CreateRelationAction( ChosenRelation chRel ) {
-                super(tr(ACTION_NAME), "create_relation", "Create a relation from selected objects",
-                                null, false);
-                this.chRel = chRel;
-        }
+    public CreateRelationAction() {
+        this(null);
+    }
 
-        public CreateRelationAction() {
-                this(null);
-        }
+    public void actionPerformed( ActionEvent e ) {
+        // todo: ask user for relation type
+        String type = "";
 
-        public void actionPerformed( ActionEvent e ) {
-                // todo: ask user for relation type
-                String type = "";
+        Relation rel = new Relation();
+        if( type != null && type.length() > 0 ) {
+            rel.put("type", type);
+        }
+        for( OsmPrimitive selected : getCurrentDataSet().getSelected() ) {
+            rel.addMember(new RelationMember("", selected));
+        }
 
-                Relation rel = new Relation();
-                if( type != null && type.length() > 0 )
-                        rel.put("type", type);
-                for( OsmPrimitive selected : getCurrentDataSet().getSelected() ) {
-                        rel.addMember(new RelationMember("", selected));
-                }
+        Collection<Command> cmds = new LinkedList<Command>();
+        Main.main.undoRedo.add(new AddCommand(rel));
 
-                Collection<Command> cmds = new LinkedList<Command>();
-                Main.main.undoRedo.add(new AddCommand(rel));
+        if( chRel != null ) {
+            chRel.set(rel);
+        }
+    }
 
-                if( chRel != null)
-                        chRel.set(rel);
-        }
+    @Override
+    protected void updateEnabledState() {
+        if( getCurrentDataSet() == null ) {
+            setEnabled(false);
+        } else {
+            updateEnabledState(getCurrentDataSet().getSelected());
+        }
+    }
 
-        @Override
-        protected void updateEnabledState() {
-                if( getCurrentDataSet() == null )
-                        setEnabled(false);
-                else
-                        updateEnabledState(getCurrentDataSet().getSelected());
-        }
-
-        @Override
-        protected void updateEnabledState( Collection<? extends OsmPrimitive> selection ) {
-                setEnabled(selection != null && !selection.isEmpty());
-        }
+    @Override
+    protected void updateEnabledState( Collection<? extends OsmPrimitive> selection ) {
+        setEnabled(selection != null && !selection.isEmpty());
+    }
 }

applications/editors/josm/plugins/relcontext/src/relcontext/actions/EditChosenRelationAction.java

@@ -15 +15 @@
  */
 public class EditChosenRelationAction extends AbstractAction implements ChosenRelationListener {
+    private ChosenRelation rel;
 
-        private ChosenRelation rel;
+    public EditChosenRelationAction( ChosenRelation rel ) {
+        super("E");
+        this.rel = rel;
+        rel.addChosenRelationListener(this);
+        setEnabled(false);
+    }
 
-        public EditChosenRelationAction( ChosenRelation rel ) {
-                this.rel = rel;
-        }
+    public void actionPerformed( ActionEvent e ) {
+        Relation relation = rel.get();
+        if( relation == null ) return;
+        RelationEditor.getEditor(Main.map.mapView.getEditLayer(), relation, null).setVisible(true);
+    }
 
-        public void actionPerformed( ActionEvent e ) {
-        Relation relation = rel.get();
-                if( relation == null ) return;
-        //Main.map.relationListDialog.selectRelation(relation); // is it needed?
-        RelationEditor.getEditor(Main.map.mapView.getEditLayer(), relation, null).setVisible(true);
-        }
-
-        public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
-                setEnabled(newRelation != null);
-        }
+    public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
+        setEnabled(newRelation != null);
+    }
 }