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

Timestamp:

2005-10-08T17:14:54+02:00 (19 years ago)

Author:

imi

Message:

• reverted to 14, but kept the global Projection.
• improved the preference settings for projections.

File:

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

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

@@ -14 +14 @@
 import javax.swing.JToolBar;
 
-import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.mapmode.AddLineSegmentAction;
 import org.openstreetmap.josm.actions.mapmode.AddNodeAction;
@@ -26 +25 @@
 import org.openstreetmap.josm.actions.mapmode.ZoomAction;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.dialogs.PropertiesDialog;
 import org.openstreetmap.josm.gui.dialogs.SelectionListDialog;
 
@@ -43 +43 @@
          * The view control displayed.
          */
-        public Layer layer;
+        public MapView mapView;
         /**
          * The toolbar with the action icons
@@ -61 +61 @@
                 setLayout(new BorderLayout());
 
-                add(layer = new Layer(dataSet), BorderLayout.CENTER);
+                add(mapView = new MapView(dataSet), BorderLayout.CENTER);
 
                 // toolbar
@@ -84 +84 @@
                 // autoScale
                 toolBarActions.addSeparator();
-                final JToggleButton autoScaleButton = new IconToggleButton(this, new AutoScaleAction(layer));
+                final JToggleButton autoScaleButton = new IconToggleButton(this, mapView.new AutoScaleAction());
                 toolBarActions.add(autoScaleButton);
                 autoScaleButton.setText(null);
-                autoScaleButton.setSelected(layer.isAutoScale());
-                layer.addPropertyChangeListener(new PropertyChangeListener(){
+                autoScaleButton.setSelected(mapView.isAutoScale());
+                mapView.addPropertyChangeListener(new PropertyChangeListener(){
                         public void propertyChange(PropertyChangeEvent evt) {
                                 if (evt.getPropertyName().equals("autoScale"))
-                                        autoScaleButton.setSelected(layer.isAutoScale());
+                                        autoScaleButton.setSelected(mapView.isAutoScale());
                         }
                 });
+
+                // properties
+                toolBarActions.add(new IconToggleButton(this, new PropertiesDialog(this)));
 
                 // selection dialog
@@ -107 +110 @@
 
                 // status line below the map
-                statusLine = new MapStatus(layer);
+                statusLine = new MapStatus(mapView);
         }