Changeset 4633 in josm for trunk/src/org
- Timestamp:
- 2011-12-04T14:21:52+01:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
r4506 r4633 44 44 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener; 45 45 import org.openstreetmap.josm.data.ProjectionBounds; 46 import org.openstreetmap.josm.data.projection.Mercator;47 import org.openstreetmap.josm.data.projection.Projection;48 46 import org.openstreetmap.josm.data.coor.EastNorth; 49 47 import org.openstreetmap.josm.data.imagery.GeorefImage; … … 53 51 import org.openstreetmap.josm.data.imagery.ImageryLayerInfo; 54 52 import org.openstreetmap.josm.data.imagery.WmsCache; 53 import org.openstreetmap.josm.data.imagery.types.ObjectFactory; 55 54 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; 56 55 import org.openstreetmap.josm.data.preferences.BooleanProperty; 57 56 import org.openstreetmap.josm.data.preferences.IntegerProperty; 57 import org.openstreetmap.josm.data.projection.Mercator; 58 import org.openstreetmap.josm.data.projection.Projection; 58 59 import org.openstreetmap.josm.gui.MapView; 59 60 import org.openstreetmap.josm.gui.MapView.LayerChangeListener; … … 71 72 */ 72 73 public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceChangedListener { 74 75 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 76 73 77 public static final BooleanProperty PROP_ALPHA_CHANNEL = new BooleanProperty("imagery.wms.alpha_channel", true); 74 78 public static final IntegerProperty PROP_SIMULTANEOUS_CONNECTIONS = new IntegerProperty("imagery.wms.simultaneousConnections", 3); … … 151 155 attribution.initialize(this.info); 152 156 153 if(info.getUrl() != null) 157 if(info.getUrl() != null) { 154 158 startGrabberThreads(); 159 } 155 160 156 161 Main.pref.addPreferenceChangeListener(this); … … 572 577 tr("Error"), 573 578 JOptionPane.ERROR_MESSAGE 574 );579 ); 575 580 } else { 576 581 downloadAndPaintVisible(mv.getGraphics(), mv, true); … … 692 697 ObjectOutputStream oos = new ObjectOutputStream( 693 698 new FileOutputStream(f) 694 );699 ); 695 700 oos.writeInt(serializeFormatVersion); 696 701 oos.writeInt(dax); … … 921 926 List<String> serverProjections = info.getServerProjections(); 922 927 return serverProjections.contains(proj.toCode().toUpperCase()) 923 || (proj instanceof Mercator && serverProjections.contains("EPSG:4326"));928 || (proj instanceof Mercator && serverProjections.contains("EPSG:4326")); 924 929 } 925 930 … … 928 933 String res = ""; 929 934 for(String p : info.getServerProjections()) { 930 if(!res.isEmpty()) 935 if(!res.isEmpty()) { 931 936 res += ", "; 937 } 932 938 res += p; 933 939 }
Note:
See TracChangeset
for help on using the changeset viewer.