Changeset 9198 in josm for trunk/src/org


Ignore:
Timestamp:
2015-12-28T14:52:29+01:00 (4 years ago)
Author:
simon04
Message:

fix #11918 - Make obtain sources from current layers add only visible imagery sources

Location:
trunk/src/org/openstreetmap/josm/gui
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/MapView.java

    r9078 r9198  
    11511151        }
    11521152        for (final GeoImageLayer i : getLayersOfType(GeoImageLayer.class)) {
    1153             layerInfo.add(i.getName());
     1153            if (i.isVisible()) {
     1154                layerInfo.add(i.getName());
     1155            }
    11541156        }
    11551157        for (final ImageryLayer i : getLayersOfType(ImageryLayer.class)) {
    1156             layerInfo.add(ImageryInfo.ImageryType.BING.equals(i.getInfo().getImageryType()) ? "Bing" : i.getName());
     1158            if (i.isVisible()) {
     1159                layerInfo.add(ImageryInfo.ImageryType.BING.equals(i.getInfo().getImageryType()) ? "Bing" : i.getName());
     1160            }
    11571161        }
    11581162        return Utils.join("; ", layerInfo);
  • trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java

    r8510 r9198  
    3232import org.openstreetmap.josm.tools.CheckParameterUtil;
    3333import org.openstreetmap.josm.tools.GBC;
     34import org.openstreetmap.josm.tools.Utils;
    3435
    3536/**
     
    7374            public void hyperlinkUpdate(HyperlinkEvent e) {
    7475                if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType())) {
    75                     hcbUploadSource.setText(Main.map.mapView.getLayerInformationForSourceTag());
     76                    final String source = Main.map.mapView.getLayerInformationForSourceTag();
     77                    hcbUploadSource.setText(Utils.shortenString(source, Changeset.MAX_CHANGESET_TAG_LENGTH));
    7678                    // Fix #9965
    7779                    changesetSourceModel.setComment(hcbUploadSource.getText());
Note: See TracChangeset for help on using the changeset viewer.