Changeset 1038 in josm for trunk/src/org

Timestamp:

2008-10-13T10:53:44+02:00 (16 years ago)

Author:

stoecker

Message:

moved Downlod area check from bounding box to main download dialog

Location:

trunk/src/org/openstreetmap/josm/gui/download

Files:

• BoundingBoxSelection.java (modified) (8 diffs)
• DownloadDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Color;
 import java.awt.Dimension;
-import java.awt.Font;
 import java.awt.GridBagLayout;
 import java.awt.event.FocusAdapter;
@@ -44 +42 @@
         String noteUrl = tr("You can paste an URL here to download the area.");
         
-        final JLabel sizeCheck = new JLabel();
-        
         public void addGui(final DownloadDialog gui) {
 
@@ -69 +65 @@
                                                 }
                                                 updateUrl(gui);
-                                                updateSizeCheck(gui);
                                         }
                                 });
@@ -93 +88 @@
                                         updateBboxFields(gui);
                                         updateUrl(gui);
-                                        updateSizeCheck(gui);
                                 }
                         }
@@ -115 +109 @@
                 osmUrl.setBorder(latlon[0].getBorder());
                 
-                Font labelFont = sizeCheck.getFont();
-                sizeCheck.setFont(labelFont.deriveFont(Font.PLAIN, labelFont.getSize()));
-                
                 dlg.add(new JLabel(tr("min lat")), GBC.std().insets(10,20,5,0));
                 dlg.add(latlon[0], GBC.std().insets(0,20,0,0));
@@ -129 +120 @@
                 dlg.add(new JLabel(tr("URL from www.openstreetmap.org")), GBC.eol().insets(10,20,5,0));
                 dlg.add(osmUrl, GBC.eop().insets(10,0,5,0).fill());
-                dlg.add(showUrl, GBC.eop().insets(10,0,5,20));
-                dlg.add(sizeCheck, GBC.eop().insets(10,0,5,20));
+                dlg.add(showUrl, GBC.eop().insets(10,0,5,5));
 
                 gui.tabpane.addTab(tr("Bounding Box"), dlg);
@@ -141 +131 @@
                 updateBboxFields(gui);
                 updateUrl(gui);
-                updateSizeCheck(gui);
         }
         
@@ -168 +157 @@
                 }
                 showUrl.setText("http://www.openstreetmap.org/index.html?mlat="+lat+"&mlon="+lon+"&zoom="+zoom);
-        }
-        
-        private void updateSizeCheck(DownloadDialog gui) {
-                double squareDegrees = (gui.maxlon-gui.minlon)*(gui.maxlat-gui.minlat);
-                double maxBboxSize = 0.25;
-                try {
-                        Double.parseDouble(Main.pref.get("osm-server.max-request-area", "0.25"));
-                } catch (NumberFormatException nfe) {
-                        maxBboxSize = 0.25;
-                }
-                if (squareDegrees > maxBboxSize) {
-                        sizeCheck.setText(tr("Download area too large; will probably be rejected by server"));
-                        sizeCheck.setForeground(Color.red);
-                } else {
-                        sizeCheck.setText(tr("Download area ok, size probably acceptable to server"));
-                        sizeCheck.setForeground(Color.darkGray);
-                }
         }
         

trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Color;
+import java.awt.Font;
 import java.awt.GridBagLayout;
 import java.util.ArrayList;
@@ -63 +65 @@
         public final JTabbedPane tabpane = new JTabbedPane();
         public final JCheckBox newLayer;
+        public final JLabel sizeCheck = new JLabel();
 
         public double minlon;
@@ -138 +141 @@
                         Main.pref.put("download.tab", "0");
                 }
+
+                Font labelFont = sizeCheck.getFont();
+                sizeCheck.setFont(labelFont.deriveFont(Font.PLAIN, labelFont.getSize()));
+                add(sizeCheck, GBC.eop().insets(0,5,5,10));
+        }
+
+        private void updateSizeCheck() {
+                double squareDegrees = (maxlon-minlon)*(maxlat-minlat);
+                double maxBboxSize = 0.25;
+                try {
+                        Double.parseDouble(Main.pref.get("osm-server.max-request-area", "0.25"));
+                } catch (NumberFormatException nfe) {
+                        maxBboxSize = 0.25;
+                }
+                if (squareDegrees > maxBboxSize) {
+                        sizeCheck.setText(tr("Download area too large; will probably be rejected by server"));
+                        sizeCheck.setForeground(Color.red);
+                } else {
+                        sizeCheck.setText(tr("Download area ok, size probably acceptable to server"));
+                        sizeCheck.setForeground(Color.darkGray);
+                }
         }
 
@@ -151 +175 @@
                         if (s != eventSource) s.boundingBoxChanged(this);
                 }
+                updateSizeCheck();
         }