- Timestamp:
- 2011-10-31T11:42:13+01:00 (12 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/preferences
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java
r4524 r4551 53 53 54 54 import org.openstreetmap.josm.data.Bounds; 55 import org.openstreetmap.josm.data.imagery.ImageryInfo; 56 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType; 55 57 import org.openstreetmap.josm.data.projection.Projection; 56 58 import org.openstreetmap.josm.data.projection.ProjectionSubPrefs; 57 59 import org.openstreetmap.josm.data.projection.Projections; 58 60 import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser; 61 import org.openstreetmap.josm.gui.layer.TMSLayer; 59 62 import org.openstreetmap.josm.tools.GBC; 60 63 import org.w3c.dom.Document; … … 502 505 } 503 506 504 public String getUrlName() { 505 return menuName.getText(); 506 } 507 508 public String getUrl() { 509 return resultingLayerField.getText(); 507 public ImageryInfo getImageryInfo() { 508 ImageryInfo info = new ImageryInfo(menuName.getText(), resultingLayerField.getText()); 509 if (ImageryType.TMS.equals(info.getImageryType())) { 510 TMSLayer.checkUrl(info.getUrl()); 511 } else { 512 HashSet<String> proj = new HashSet<String>(); 513 for(LayerDetails l : selectedLayers) 514 proj.addAll(l.getProjections()); 515 info.setServerProjections(proj); 516 } 517 return info; 510 518 } 511 519 … … 565 573 private List<LayerDetails> children; 566 574 private Bounds bounds; 575 private Set<String> crsList; 567 576 private boolean supported; 568 577 … … 575 584 this.children = childLayers; 576 585 this.bounds = bounds; 586 this.crsList = crsList; 577 587 } 578 588 579 589 public boolean isSupported() { 580 590 return this.supported; 591 } 592 593 public Set<String> getProjections() { 594 return crsList; 581 595 } 582 596 -
trunk/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java
r4531 r4551 628 628 if (answer == JOptionPane.OK_OPTION) { 629 629 try { 630 ImageryInfo info = new ImageryInfo(p.getUrlName(), p.getUrl()); 631 if (ImageryType.TMS.equals(info.getImageryType())) { 632 TMSLayer.checkUrl(info.getUrl()); 633 } 634 model.addRow(info); 630 model.addRow(p.getImageryInfo()); 635 631 } catch (IllegalArgumentException ex) { 636 632 if (ex.getMessage() == null || ex.getMessage().isEmpty()) {
Note:
See TracChangeset
for help on using the changeset viewer.