Changeset 4633 in josm

Timestamp:

Dec 4, 2011 2:21:52 PM (18 months ago)

Author:

jttt

Message:

Fix #7109 WMS-cache does not cache between sessions/INDEX_FILENAME = "index.xml" does not get created

File:

• trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

@@ -44 +44 @@
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.data.ProjectionBounds;
-import org.openstreetmap.josm.data.projection.Mercator;
-import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.imagery.GeorefImage;
@@ -53 +51 @@
 import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
 import org.openstreetmap.josm.data.imagery.WmsCache;
+import org.openstreetmap.josm.data.imagery.types.ObjectFactory;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
+import org.openstreetmap.josm.data.projection.Mercator;
+import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
@@ -71 +72 @@
  */
 public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceChangedListener {
+
+    private static final ObjectFactory OBJECT_FACTORY = null; // Fake reference to keep build scripts from removing ObjectFactory class. This class is not used directly but it's necessary for jaxb to work
+
     public static final BooleanProperty PROP_ALPHA_CHANNEL = new BooleanProperty("imagery.wms.alpha_channel", true);
     public static final IntegerProperty PROP_SIMULTANEOUS_CONNECTIONS = new IntegerProperty("imagery.wms.simultaneousConnections", 3);
@@ -151 +155 @@
         attribution.initialize(this.info);
 
-        if(info.getUrl() != null)
+        if(info.getUrl() != null) {
             startGrabberThreads();
+        }
 
         Main.pref.addPreferenceChangeListener(this);
@@ -572 +577 @@
                         tr("Error"),
                         JOptionPane.ERROR_MESSAGE
-                );
+                        );
             } else {
                 downloadAndPaintVisible(mv.getGraphics(), mv, true);
@@ -692 +697 @@
                     ObjectOutputStream oos = new ObjectOutputStream(
                             new FileOutputStream(f)
-                    );
+                            );
                     oos.writeInt(serializeFormatVersion);
                     oos.writeInt(dax);
@@ -921 +926 @@
         List<String> serverProjections = info.getServerProjections();
         return serverProjections.contains(proj.toCode().toUpperCase())
-        || (proj instanceof Mercator && serverProjections.contains("EPSG:4326"));
+                || (proj instanceof Mercator && serverProjections.contains("EPSG:4326"));
     }
 
@@ -928 +933 @@
         String res = "";
         for(String p : info.getServerProjections()) {
-            if(!res.isEmpty())
+            if(!res.isEmpty()) {
                 res += ", ";
+            }
             res += p;
         }