Changeset 43 in josm for src/org/openstreetmap/josm/gui

Timestamp:

2006-01-22T16:10:57+01:00 (20 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/gui

Files:

• MapView.java (modified) (4 diffs)
• PreferenceDialog.java (modified) (5 diffs)
• WorldChooser.java (modified) (3 diffs)

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

@@ -20 +20 @@
 import org.openstreetmap.josm.data.GeoPoint;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -97 +96 @@
          */
         public void addLayer(Layer layer) {
-                // initialize the projection if it is the first layer
-                if (layers.isEmpty())
-                        getProjection().init(layer.getBoundsLatLon());
-
                 // reinitialize layer's data
                 layer.init(getProjection());
@@ -339 +334 @@
                 // reset all datasets.
                 Projection p = getProjection();
-                for (Node n : Main.main.ds.nodes)
-                        p.latlon2xy(n.coor);
+                for (Layer l : layers)
+                        l.init(p);
                 recalculateCenterScale();
         }
@@ -351 +346 @@
          */
         public void propertyChange(PropertyChangeEvent evt) {
-                if (!evt.getPropertyName().equals("projection"))
-                        return;
-                if (evt.getOldValue() != null)
-                        ((Projection)evt.getOldValue()).removeChangeListener(this);
-                if (evt.getNewValue() != null) {
-                        Projection p = (Projection)evt.getNewValue();
-                        p.addChangeListener(this);
-        
+                if (evt.getPropertyName().equals("projection"))
                         stateChanged(new ChangeEvent(this));
-                }
         }
 }

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

@@ -15 +15 @@
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
-import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
@@ -51 +50 @@
                 public void actionPerformed(ActionEvent e) {
                         Main.pref.laf = (LookAndFeelInfo)lafCombo.getSelectedItem();
-                        Projection projection = (Projection)projectionCombo.getSelectedItem();
-                        projection.commitConfigurationPanel();
-                        Main.pref.setProjection(projection);
+                        Main.pref.setProjection((Projection)projectionCombo.getSelectedItem());
                         Main.pref.osmDataServer = osmDataServer.getText();
                         Main.pref.osmDataUsername = osmDataUsername.getText();
@@ -99 +96 @@
          * Combobox with all projections available
          */
-        JComboBox projectionCombo = new JComboBox(Preferences.allProjections.clone());
+        JComboBox projectionCombo = new JComboBox(Preferences.allProjections);
         /**
          * The main tab panel.
@@ -160 +157 @@
                         }
                 }
-                JButton projectionDetail = new JButton("Configure");
-                projectionDetail.addActionListener(new ActionListener(){
-                        public void actionPerformed(ActionEvent e) {
-                                Projection p = (Projection)projectionCombo.getSelectedItem();
-                                JComponent configurationPanel = p.getConfigurationPanel();
-                                if (configurationPanel == null) {
-                                        JOptionPane.showMessageDialog(PreferenceDialog.this,
-                                                        "This projection does not need any configuration.");
-                                        return;
-                                }
-                                JPanel detail = new JPanel(new GridBagLayout());
-                                detail.setLayout(new GridBagLayout());
-                                detail.add(configurationPanel, GBC.eop().fill());
-                                int result = JOptionPane.showConfirmDialog(
-                                                PreferenceDialog.this, detail, "Configuration of "+p, 
-                                                JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE);
-                                if (result != JOptionPane.OK_OPTION)
-                                        p.getConfigurationPanel(); // rollback
-                        }
-                });
                 
                 // drawRawGpsLines
@@ -242 +219 @@
                 map.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
                 map.add(projectionCombo, GBC.eol().fill(GBC.HORIZONTAL).insets(0,0,0,5));
-                map.add(new JLabel("Projection details:"), GBC.std());
-                map.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
-                map.add(projectionDetail, GBC.eop());
                 map.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
 

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

@@ -13 +13 @@
 
 import javax.swing.ImageIcon;
-import javax.swing.JComponent;
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
@@ -63 +62 @@
                 new MapMover(this);
                 projection = new Projection(){
-                        @Override
                         public void latlon2xy(GeoPoint p) {
                                 p.x = (p.lon+180) / 360 * world.getIconWidth();
                                 p.y = (p.lat+90) / 180 * world.getIconHeight();
                         }
-                        @Override
                         public void xy2latlon(GeoPoint p) {
                                 p.lon = p.x*360/world.getIconWidth() - 180;
@@ -76 +73 @@
                         public String toString() {
                                 return "WorldChooser";
-                        }
-                        @Override
-                        public JComponent getConfigurationPanel() {
-                                return null;
-                        }
-                        @Override
-                        public void commitConfigurationPanel() {
                         }
                 };