Changeset 7 in josm for src/org/openstreetmap/josm/gui/MapFrame.java

Timestamp:

2005-10-02T20:32:00+02:00 (19 years ago)

Author:

imi

Message:

added mapmodes for adding and combining stuff. Reorganized images

File:

• src/org/openstreetmap/josm/gui/MapFrame.java (modified) (4 diffs)

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

@@ -25 +25 @@
 import javax.swing.event.ChangeListener;
 
+import org.openstreetmap.josm.actions.mapmode.AddLineSegmentAction;
+import org.openstreetmap.josm.actions.mapmode.AddNodeAction;
+import org.openstreetmap.josm.actions.mapmode.AddTrackAction;
+import org.openstreetmap.josm.actions.mapmode.CombineAction;
 import org.openstreetmap.josm.actions.mapmode.DebugAction;
+import org.openstreetmap.josm.actions.mapmode.DeleteAction;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
+import org.openstreetmap.josm.actions.mapmode.MoveAction;
 import org.openstreetmap.josm.actions.mapmode.SelectionAction;
 import org.openstreetmap.josm.actions.mapmode.ZoomAction;
@@ -39 +45 @@
  * @author imi
  */
-public class MapFrame extends JComponent {
+public class MapFrame extends JPanel {
 
         /**
@@ -123 +129 @@
 
                 add(mapView = new MapView(dataSet), BorderLayout.CENTER);
-                
+
+                // toolbar
                 toolBarActions.setFloatable(false);
                 toolBarActions.add(new IconToggleButton(this, new ZoomAction(this)));
                 toolBarActions.add(new IconToggleButton(this, new SelectionAction(this)));
+                toolBarActions.add(new IconToggleButton(this, new MoveAction(this)));
+                toolBarActions.add(new IconToggleButton(this, new AddNodeAction(this)));
+                toolBarActions.add(new IconToggleButton(this, new AddLineSegmentAction(this)));
+                toolBarActions.add(new IconToggleButton(this, new AddTrackAction(this)));
+                toolBarActions.add(new IconToggleButton(this, new CombineAction(this)));
+                toolBarActions.add(new IconToggleButton(this, new DeleteAction(this)));
                 toolBarActions.add(new IconToggleButton(this, new DebugAction(this)));
 
@@ -159 +172 @@
         public void selectMapMode(MapMode mapMode) {
                 if (this.mapMode != null)
-                        this.mapMode.unregisterListener(mapView);
+                        this.mapMode.unregisterListener();
                 this.mapMode = mapMode;
-                mapMode.registerListener(mapView);
+                mapMode.registerListener();
         }