Changeset 4172 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2011-06-26T13:43:35+02:00 (13 years ago)

Author:

stoecker

Message:

remove unused icons, make connection timouts configurable and increase them a bit to handle JOSM server delays

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• ImageryMenu.java (modified) (1 diff)
• dialogs/properties/PropertiesDialog.java (modified) (2 diffs)
• download/PlaceSelection.java (modified) (1 diff)
• layer/markerlayer/Marker.java (modified) (1 diff)
• mappaint/MapPaintStyles.java (modified) (1 diff)
• tagging/TaggingPreset.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java

@@ -70 +70 @@
     Map_Rectifier_WMSmenuAction rectaction = new Map_Rectifier_WMSmenuAction();
     JosmAction blankmenu = new JosmAction(
-            tr("Blank Layer"), "blankmenu", tr("Open a blank WMS layer to load data from a file"), null, false) {
+            tr("Blank Layer"), /* ICON */"blankmenu", tr("Open a blank WMS layer to load data from a file"), null, false) {
         @Override
         public void actionPerformed(ActionEvent ev) {

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -1158 +1158 @@
                             for (URI u : uris) {
                                 conn = (HttpURLConnection) u.toURL().openConnection();
-                                conn.setConnectTimeout(5000);
+                                conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
 
                                 if (conn.getResponseCode() != 200) {
@@ -1171 +1171 @@
                                             .replaceFirst("/wiki/", "/w/index.php?redirect=no&title=")
                                     ).toURL().openConnection();
-                                    conn.setConnectTimeout(5000);
+                                    conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
 
                                     /* redirect pages have different content length, but retrieving a "nonredirect"

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

@@ -365 +365 @@
                     connection = (HttpURLConnection)url.openConnection();
                 }
-                connection.setConnectTimeout(15000);
+                connection.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
                 InputStream inputStream = connection.getInputStream();
                 InputSource inputSource = new InputSource(new InputStreamReader(inputStream, "UTF-8"));

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

@@ -179 +179 @@
         this.offset = offset;
         this.time = time;
+        // /* ICON(markers/) */"Bridge"
+        // /* ICON(markers/) */"Crossing"
         this.symbol = ImageProvider.getIfAvailable("markers",iconName);
         this.parentLayer = parentLayer;

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -84 +84 @@
         if(i == null)
         {
-            System.out.println("Mappaint style \""+namespace+"\" icon \"" + ref.iconName + "\" not found.");
+            System.out.println("Mappaint style \""+namespace+"\" ("+ref.source.getDisplayString()+") icon \"" + ref.iconName + "\" not found.");
             return null;
         }

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -88 +88 @@
 
     public enum PresetType {
-        NODE("Mf_node"), WAY("Mf_way"), RELATION("Mf_relation"), CLOSEDWAY("Mf_closedway");
+        NODE(/* ICON */"Mf_node"), WAY(/* ICON */"Mf_way"), RELATION(/* ICON */"Mf_relation"), CLOSEDWAY(/* ICON */"Mf_closedway");
 
         private final String iconName;