Changeset 8530 in josm for trunk/src/org/openstreetmap/josm/io
- Timestamp:
- 2015-06-25T00:05:23+02:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/io
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/WMSLayerImporter.java
r8526 r8530 41 41 } 42 42 43 44 43 @Override 45 44 public void importData(File file, ProgressMonitor progressMonitor) throws IOException, IllegalDataException { … … 61 60 double pixelPerDegree = ois.readDouble(); 62 61 63 String name = (String) ois.readObject();64 String extendedUrl = (String) ois.readObject();62 String name = (String) ois.readObject(); 63 String extendedUrl = (String) ois.readObject(); 65 64 66 65 info = new ImageryInfo(name); … … 68 67 info.setPixelPerDegree(pixelPerDegree); 69 68 info.setTileSize(imageSize); 70 } else if (sfv == WMSLayerExporter.CURRENT_FILE_VERSION) {69 } else if (sfv == WMSLayerExporter.CURRENT_FILE_VERSION) { 71 70 zoomTo = (EastNorth) ois.readObject(); 72 71 73 72 @SuppressWarnings("unchecked") 74 73 ImageryPreferenceEntry entry = Preferences.deserializeStruct( 75 (Map<String, String>) ois.readObject(),74 (Map<String, String>) ois.readObject(), 76 75 ImageryPreferenceEntry.class); 77 76 info = new ImageryInfo(entry); -
trunk/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.java
r8526 r8530 49 49 AbstractTileSourceLayer tsLayer = (AbstractTileSourceLayer) layer; 50 50 if (attributes.containsKey("automatic-downloading")) { 51 tsLayer.autoLoad = new Boolean(attributes.get("automatic-downloading")).booleanValue();51 tsLayer.autoLoad = Boolean.valueOf(attributes.get("automatic-downloading")); 52 52 } 53 53 54 54 if (attributes.containsKey("automatically-change-resolution")) { 55 tsLayer.autoZoom = new Boolean(attributes.get("automatically-change-resolution")).booleanValue();55 tsLayer.autoZoom = Boolean.valueOf(attributes.get("automatically-change-resolution")); 56 56 } 57 57 58 58 if (attributes.containsKey("show-errors")) { 59 tsLayer.showErrors = new Boolean(attributes.get("show-errors")).booleanValue();59 tsLayer.showErrors = Boolean.valueOf(attributes.get("show-errors")); 60 60 } 61 61 }
Note:
See TracChangeset
for help on using the changeset viewer.