Changeset 9 in josm for src/org/openstreetmap/josm/gui/MapView.java

Timestamp:

2005-10-04T00:09:32+02:00 (21 years ago)

Author:

imi

Message:

• added support for DataReaders
• added a nice status line and a tooltip when holding middle mouse button

File:

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

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

@@ -84 +84 @@
         
         /**
-         * Construct a MapView and attach it to a frame.
+         * Construct a MapView.
          */
         public MapView(DataSet dataSet) {
                 this.dataSet = dataSet;
                 addComponentListener(this);
-                
+
                 // initialize the movement listener
                 new MapMover(this);
-                
+
                 // initialize the projection
                 setProjection(Main.pref.projection.clone());
-                
-                // initialize the engine
+
+                // initialize the drawing engine
                 engine = new SimpleEngine(this);
         }
@@ -222 +222 @@
         }
 
+        
         /**
          * Zoom to the given coordinate.
@@ -247 +248 @@
         
         /**
+         * Draw the component.
+         */
+        @Override
+        public void paint(Graphics g) {
+                engine.init(g);
+                engine.drawBackground(getPoint(0,0,true), getPoint(getWidth(), getHeight(), true));
+
+                for (Track t : dataSet.tracks())
+                        engine.drawTrack(t);
+                for (LineSegment ls : dataSet.pendingLineSegments())
+                        engine.drawPendingLineSegment(ls);
+                for (Node n : dataSet.nodes)
+                        engine.drawNode(n);
+        }
+
+        /**
+         * Notify from the projection, that something has changed.
+         * @param e
+         */
+        public void stateChanged(ChangeEvent e) {
+                projection.init(dataSet);
+                recalculateCenterScale();
+        }
+
+        /**
+         * Set a new projection method. This call is not cheap, as it will
+         * transform the whole underlying dataSet and repaint itself.
+         * 
+         * @param projection The new projection method to set.
+         */
+        public void setProjection(Projection projection) {
+                if (projection == this.projection)
+                        return;
+
+                Projection oldProjection = this.projection;
+                
+                if (this.projection != null)
+                        this.projection.removeChangeListener(this);
+                this.projection = projection;
+                projection.addChangeListener(this);
+                
+                stateChanged(new ChangeEvent(this));
+                firePropertyChange("projection", oldProjection, projection);
+        }
+
+        /**
+         * Return the projection method for this map view.
+         * @return The projection method.
+         */
+        public Projection getProjection() {
+                return projection;
+        }
+
+        /**
          * Return the current scale value.
          * @return The scale value currently used in display
@@ -254 +309 @@
         }
 
+        /**
+         * @return Returns the autoScale.
+         */
+        public boolean isAutoScale() {
+                return autoScale;
+        }
+
+        /**
+         * @param autoScale The autoScale to set.
+         */
+        public void setAutoScale(boolean autoScale) {
+                if (this.autoScale != autoScale) {
+                        this.autoScale = autoScale;
+                        firePropertyChange("autoScale", !autoScale, autoScale);
+                }
+        }
+        /**
+         * @return Returns the center point. A copy is returned, so users cannot
+         *              change the center by accessing the return value. Use zoomTo instead.
+         */
+        public GeoPoint getCenter() {
+                return center.clone();
+        }
+
+        
+        
         /**
          * Set the new dimension to the projection class. Also adjust the components 
@@ -285 +366 @@
                                 scale = Math.max(scaleX, scaleY); // minimum scale to see all of the screen
                         }
-
+        
                         firePropertyChange("center", oldCenter, center);
                         if (oldAutoScale != autoScale)
@@ -303 +384 @@
 
         /**
-         * Draw the component.
-         */
-        @Override
-        public void paint(Graphics g) {
-                engine.init(g);
-                engine.drawBackground(getPoint(0,0,true), getPoint(getWidth(), getHeight(), true));
-
-                for (Track t : dataSet.tracks())
-                        engine.drawTrack(t);
-                for (LineSegment ls : dataSet.pendingLineSegments())
-                        engine.drawPendingLineSegment(ls);
-                for (Node n : dataSet.nodes)
-                        engine.drawNode(n);
-        }
-
-        /**
-         * Notify from the projection, that something has changed.
-         * @param e
-         */
-        public void stateChanged(ChangeEvent e) {
-                projection.init(dataSet);
-                recalculateCenterScale();
-        }
-
-        /**
-         * Set a new projection method. This call is not cheap, as it will
-         * transform the whole underlying dataSet and repaint itself.
-         * 
-         * @param projection The new projection method to set.
-         */
-        public void setProjection(Projection projection) {
-                if (projection == this.projection)
-                        return;
-
-                Projection oldProjection = this.projection;
-                
-                if (this.projection != null)
-                        this.projection.removeChangeListener(this);
-                this.projection = projection;
-                projection.addChangeListener(this);
-                
-                stateChanged(new ChangeEvent(this));
-                firePropertyChange("projection", oldProjection, projection);
-        }
-
-        /**
-         * Return the projection method for this map view.
-         * @return The projection method.
-         */
-        public Projection getProjection() {
-                return projection;
-        }
-
-        /**
-         * @return Returns the autoScale.
-         */
-        public boolean isAutoScale() {
-                return autoScale;
-        }
-
-        /**
-         * @param autoScale The autoScale to set.
-         */
-        public void setAutoScale(boolean autoScale) {
-                if (this.autoScale != autoScale) {
-                        this.autoScale = autoScale;
-                        firePropertyChange("autoScale", !autoScale, autoScale);
-                }
-        }
-        /**
-         * @return Returns the center point. A copy is returned, so users cannot
-         *              change the center by accessing the return value. Use zoomTo instead.
-         */
-        public GeoPoint getCenter() {
-                return center.clone();
-        }
-
-        /**
          * Does nothing. Just to satisfy ComponentListener.
          */