Changeset 43 in josm for src/org/openstreetmap/josm/data/projection

Timestamp:

2006-01-22T16:10:57+01:00 (18 years ago)

Author:

imi

Message:

• removed UTM (too complex)
• added please wait dialog for down-/uploading
• added created_by=JOSM to every new element

Location:

src/org/openstreetmap/josm/data/projection

Files:

• Epsg4263.java (modified) (4 diffs)
• Mercator.java (modified) (4 diffs)
• Projection.java (modified) (5 diffs)
• UTM.java (deleted)

src/org/openstreetmap/josm/data/projection/Epsg4263.java

@@ -1 +1 @@
 package org.openstreetmap.josm.data.projection;
-
-import javax.swing.JComponent;
 
 import org.openstreetmap.josm.data.GeoPoint;
@@ -10 +8 @@
  * @author imi
  */
-public class Epsg4263 extends Projection {
+public class Epsg4263 implements Projection {
 
-        @Override
         public void latlon2xy(GeoPoint p) {
                 p.x = p.lon;
@@ -18 +15 @@
         }
 
-        @Override
         public void xy2latlon(GeoPoint p) {
                 p.lat = p.y;
@@ -28 +24 @@
                 return "EPSG:4263";
         }
-
-        @Override
-        public JComponent getConfigurationPanel() {
-                return null;
-        }
-
-        @Override
-        public void commitConfigurationPanel() {
-        }
 }

src/org/openstreetmap/josm/data/projection/Mercator.java

@@ -1 +1 @@
 package org.openstreetmap.josm.data.projection;
-
-import javax.swing.JComponent;
 
 import org.openstreetmap.josm.data.GeoPoint;
@@ -14 +12 @@
  * @author imi
  */
-public class Mercator extends Projection {
+public class Mercator implements Projection {
 
-        @Override
         public void latlon2xy(GeoPoint p) {
                 p.x = p.lon*Math.PI/180;
@@ -22 +19 @@
         }
 
-        @Override
         public void xy2latlon(GeoPoint p) {
                 p.lon = p.x*180/Math.PI;
@@ -32 +28 @@
                 return "Mercator";
         }
-
-        @Override
-        public JComponent getConfigurationPanel() {
-                return null;
-        }
-
-        @Override
-        public void commitConfigurationPanel() {
-        }
 }

src/org/openstreetmap/josm/data/projection/Projection.java

@@ -1 +1 @@
 package org.openstreetmap.josm.data.projection;
 
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.swing.JComponent;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.GeoPoint;
 
@@ -17 +9 @@
  * @author imi
  */
-abstract public class Projection implements Cloneable {
+public interface Projection {
 
         public static double MAX_LAT = 85;
         public static double MAX_LON = 180;
-
-        /**
-         * The event list with all state chaned listener
-         */
-        List<ChangeListener> listener = new LinkedList<ChangeListener>();
         
         /**
@@ -32 +19 @@
          * @param p             The geo point to convert. x/y members of the point are filled.
          */
-        abstract public void latlon2xy(GeoPoint p);
+        void latlon2xy(GeoPoint p);
         
         /**
@@ -39 +26 @@
          * @param p             The geo point to convert. lat/lon members of the point are filled.
          */
-        abstract public void xy2latlon(GeoPoint p);
+        void xy2latlon(GeoPoint p);
 
         
@@ -47 +34 @@
          * Describe the projection converter in one or two words.
          */
-        @Override
-        abstract public String toString();
-        
-        // miscellous functions
-        
-        /**
-         * If the projection supports any configuration, this function return
-         * the configuration panel. If no configuration needed, 
-         * return <code>null</code>.
-         * 
-         * The items on the configuration panel should not update the configuration
-         * directly, but remember changed settings so a call to commitConfigurationPanel
-         * can set them.
-         * 
-         * This function also rolls back all changes to the configuration panel interna
-         * components.
-         */
-        abstract public JComponent getConfigurationPanel();
-        /**
-         * Commits any changes from components created by addToConfigurationPanel.
-         * The projection should now obtain the new settings. If any setting has
-         * changed, the implementation have to call to fireStateChanged to inform
-         * the listeners.
-         */
-        abstract public void commitConfigurationPanel();
-
-        /**
-         * Initialize itself with the given bounding rectangle (regarding lat/lon).
-         * 
-         * This function should initialize own parameters needed to do the
-         * projection at best effort.
-         * 
-         * Init must not fire an state changed event, since it is usually called
-         * during the initialization of the mapFrame.
-         *
-         * This implementation does nothing. It is provided only for subclasses
-         * to initialize their data members.
-         */
-        public void init(Bounds b) {}
-        
-        /**
-         * Add an event listener to the state changed event queue. If passed 
-         * <code>null</code>, nothing happens.
-         */
-        public final void addChangeListener(ChangeListener l) {
-                if (l != null)
-                        listener.add(l);
-        }
-        /**
-         * Remove an event listener from the event queue. If passed 
-         * <code>null</code>, nothing happens.
-         */
-        public final void removeChangeListener(ChangeListener l) {
-                listener.remove(l);
-        }
-        /**
-         * Fire an ChangeEvent to every listener on the queue.
-         */
-        public final void fireStateChanged() {
-                ChangeEvent e = null;
-                for(ChangeListener l : listener) {
-                        if (e == null)
-                                e = new ChangeEvent(this);
-                        l.stateChanged(e);
-                }
-        }
+        String toString();
 }