Changeset 7402 in josm for trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java
- Timestamp:
- 2014-08-15T18:53:18+02:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java
r7358 r7402 12 12 import javax.swing.table.DefaultTableModel; 13 13 14 import org.openstreetmap.josm.gui.layer. ModifiableLayer;14 import org.openstreetmap.josm.gui.layer.AbstractModifiableLayer; 15 15 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 16 16 … … 65 65 * @since 7358 66 66 */ 67 public void populate(List<? extends ModifiableLayer> layers) {67 public void populate(List<? extends AbstractModifiableLayer> layers) { 68 68 layerInfo = new ArrayList<>(); 69 69 if (layers == null) return; 70 for ( ModifiableLayer layer: layers) {70 for (AbstractModifiableLayer layer: layers) { 71 71 layerInfo.add(new SaveLayerInfo(layer)); 72 72 } … … 143 143 List<SaveLayerInfo> ret = new ArrayList<>(); 144 144 for (SaveLayerInfo info: layerInfo) { 145 ModifiableLayer l = info.getLayer();145 AbstractModifiableLayer l = info.getLayer(); 146 146 if (info.isDoUploadToServer() && l instanceof OsmDataLayer && !((OsmDataLayer)l).getConflicts().isEmpty()) { 147 147 ret.add(info); … … 171 171 } 172 172 173 public void setUploadState( ModifiableLayer layer, UploadOrSaveState state) {173 public void setUploadState(AbstractModifiableLayer layer, UploadOrSaveState state) { 174 174 SaveLayerInfo info = getSaveLayerInfo(layer); 175 175 if (info != null) { … … 179 179 } 180 180 181 public void setSaveState( ModifiableLayer layer, UploadOrSaveState state) {181 public void setSaveState(AbstractModifiableLayer layer, UploadOrSaveState state) { 182 182 SaveLayerInfo info = getSaveLayerInfo(layer); 183 183 if (info != null) { … … 187 187 } 188 188 189 public SaveLayerInfo getSaveLayerInfo( ModifiableLayer layer) {189 public SaveLayerInfo getSaveLayerInfo(AbstractModifiableLayer layer) { 190 190 for (SaveLayerInfo info: this.layerInfo) { 191 191 if (info.getLayer() == layer)
Note:
See TracChangeset
for help on using the changeset viewer.