Changeset 128 in josm

Timestamp:

Jul 25, 2006 11:56:55 PM (7 years ago)

Author:

imi

Message:

• added icons to annotation preset selection box
• added history dialog (not finished)

Files:

• images/dialogs/history.png (added)
• images/dialogs/revert.png (added)
• images/misc/showhide.png (added)
• src/org/openstreetmap/josm/Main.java (modified) (3 diffs)
• src/org/openstreetmap/josm/actions/ReverseSegmentAction.java (added)
• src/org/openstreetmap/josm/gui/MapFrame.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (added)
• src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) (2 diffs)

src/org/openstreetmap/josm/Main.java

@@ -12 +12 @@
 import java.net.URISyntaxException;
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.Map;
 import java.util.StringTokenizer;
@@ -37 +36 @@
 import org.openstreetmap.josm.actions.PreferencesAction;
 import org.openstreetmap.josm.actions.RedoAction;
+import org.openstreetmap.josm.actions.ReverseSegmentAction;
 import org.openstreetmap.josm.actions.SaveAction;
 import org.openstreetmap.josm.actions.UndoAction;
 import org.openstreetmap.josm.actions.UploadAction;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
-import org.openstreetmap.josm.command.ChangeCommand;
-import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.projection.Epsg4326;
 import org.openstreetmap.josm.data.projection.Projection;
@@ -165 +159 @@
                 annotationTesterAction.putValue(Action.NAME, tr("Annotation Preset Tester"));
                 annotationTesterAction.putValue(Action.SMALL_ICON, ImageProvider.get("annotation-tester"));
-                final Action reverseSegmentAction = new AbstractAction(){
-                        public void actionPerformed(ActionEvent e) {
-                                Collection<OsmPrimitive> sel = Main.ds.getSelected();
-                                boolean hasSegments = false;
-                                for (OsmPrimitive osm : sel) {
-                                        if (osm instanceof Segment) {
-                                                hasSegments = true;
-                                                break;
-                                        }
-                                }
-                                if (!hasSegments) {
-                                        JOptionPane.showMessageDialog(Main.parent, tr("Please select at least one segment."));
-                                        return;
-                                }
-                                Collection<Command> c = new LinkedList<Command>();
-                                for (OsmPrimitive osm : sel) {
-                                        if (!(osm instanceof Segment))
-                                                continue;
-                                        Segment s = (Segment)osm;
-                                        Segment snew = new Segment(s);
-                                        Node n = snew.from;
-                                        snew.from = snew.to;
-                                        snew.to = n;
-                                        c.add(new ChangeCommand(s, snew));
-                                }
-                                editLayer().add(new SequenceCommand(tr("Reverse Segments"), c));
-                                map.repaint();
-                        }
-                };
-                reverseSegmentAction.putValue(Action.NAME, tr("Reverse Segments"));
-                reverseSegmentAction.putValue(Action.SMALL_ICON, ImageProvider.get("segmentflip"));
-
+                final Action reverseSegmentAction = new ReverseSegmentAction();
                 final Action uploadAction = new UploadAction();
                 final Action saveAction = new SaveAction();

src/org/openstreetmap/josm/gui/MapFrame.java

@@ -28 +28 @@
 import org.openstreetmap.josm.gui.dialogs.CommandStackDialog;
 import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
+import org.openstreetmap.josm.gui.dialogs.HistoryDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerList;
 import org.openstreetmap.josm.gui.dialogs.PropertiesDialog;
@@ -119 +120 @@
                 addIconToggle(toggleDialogs, new LayerList(this));
                 addIconToggle(toggleDialogs, new PropertiesDialog(this));
-                addIconToggle(toggleDialogs, new SelectionListDialog(this));
+                addIconToggle(toggleDialogs, new HistoryDialog());
+                addIconToggle(toggleDialogs, new SelectionListDialog());
                 addIconToggle(toggleDialogs, conflictDialog = new ConflictDialog());
                 addIconToggle(toggleDialogs, new CommandStackDialog(this));

src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -36 +36 @@
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -111 +110 @@
         private JList displaylist = new JList(list);
 
-        /**
-         * Create a SelectionList dialog.
-         * @param mapView The mapView to get the dataset from.
-         */
-        public SelectionListDialog(MapFrame mapFrame) {
+        public SelectionListDialog() {
                 super(tr("Current Selection"), "selectionlist", tr("Open a selection list window."), KeyEvent.VK_E, 150);
                 displaylist.setCellRenderer(new OsmPrimitivRenderer());