Changeset 13453 in josm for trunk/src/org/openstreetmap/josm/gui/layer
- Timestamp:
- 2018-02-24T18:58:28+01:00 (6 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/layer
- Files:
-
- 1 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/layer/AbstractModifiableLayer.java
r13434 r13453 2 2 package org.openstreetmap.josm.gui.layer; 3 3 4 import org.openstreetmap.josm.data.osm. ReadOnly;4 import org.openstreetmap.josm.data.osm.Lockable; 5 5 import org.openstreetmap.josm.gui.io.AbstractIOTask; 6 6 import org.openstreetmap.josm.gui.io.AbstractUploadDialog; … … 11 11 * @since 7358 12 12 */ 13 public abstract class AbstractModifiableLayer extends Layer implements UploadToServer, SaveToFile, ReadOnly{13 public abstract class AbstractModifiableLayer extends Layer implements DownloadFromServer, UploadToServer, SaveToFile, Lockable { 14 14 15 15 /** … … 19 19 public AbstractModifiableLayer(String name) { 20 20 super(name); 21 } 22 23 @Override 24 public boolean isDownloadable() { 25 // Override if needed 26 return false; 21 27 } 22 28 … … 83 89 84 90 @Override 85 public void setReadOnly() {91 public void lock() { 86 92 // Override if needed 87 93 } 88 94 89 95 @Override 90 public void un setReadOnly() {96 public void unlock() { 91 97 // Override if needed 92 98 } 93 99 94 100 @Override 95 public boolean is ReadOnly() {101 public boolean isLocked() { 96 102 // Override if needed 97 103 return false; -
trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java
r13437 r13453 376 376 */ 377 377 public synchronized OsmDataLayer getEditLayer() { 378 if (dataLayer != null && !dataLayer.is ReadOnly())378 if (dataLayer != null && !dataLayer.isLocked()) 379 379 return dataLayer; 380 380 else … … 402 402 */ 403 403 public synchronized DataSet getEditDataSet() { 404 if (dataLayer != null && !dataLayer.is ReadOnly()) {404 if (dataLayer != null && !dataLayer.isLocked()) { 405 405 return dataLayer.data; 406 406 } else { … … 509 509 GuiHelper.assertCallFromEdt(); 510 510 layer.setUploadInProgress(); 511 layer. setReadOnly();511 layer.lock(); 512 512 513 513 // Reset only the edit layer as empty … … 528 528 public synchronized void processLayerAfterUpload(OsmDataLayer layer) { 529 529 GuiHelper.assertCallFromEdt(); 530 layer.un setReadOnly();530 layer.unlock(); 531 531 layer.unsetUploadInProgress(); 532 532 -
trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java
r13437 r13453 134 134 135 135 @Override 136 public boolean isDownloadable() { 137 return true; 138 } 139 140 @Override 136 141 public boolean isUploadable() { 137 142 return true; -
trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
r13435 r13453 64 64 import org.openstreetmap.josm.data.osm.DataSelectionListener; 65 65 import org.openstreetmap.josm.data.osm.DataSet; 66 import org.openstreetmap.josm.data.osm.DataSet.DownloadPolicy; 66 67 import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy; 67 68 import org.openstreetmap.josm.data.osm.DataSetMerger; … … 421 422 public Icon getIcon() { 422 423 ImageProvider base = getBaseIconProvider().setMaxSize(ImageSizes.LAYER); 423 if (isUploadDiscouraged() || data.getUploadPolicy() == UploadPolicy.BLOCKED) { 424 if (data.getDownloadPolicy() != null && data.getDownloadPolicy() != DownloadPolicy.NORMAL) { 425 base.addOverlay(new ImageOverlay(new ImageProvider("warning-small"), 0.5, 0.0, 1.0, 0.5)); 426 } 427 if (data.getUploadPolicy() != null && data.getUploadPolicy() != UploadPolicy.NORMAL) { 424 428 base.addOverlay(new ImageOverlay(new ImageProvider("warning-small"), 0.5, 0.5, 1.0, 1.0)); 425 429 } … … 428 432 // If the layer is being uploaded then change the default icon to a clock 429 433 base = new ImageProvider("clock").setMaxSize(ImageSizes.LAYER); 430 } else if (is ReadOnly()) {434 } else if (isLocked()) { 431 435 // If the layer is read only then change the default icon to a lock 432 436 base = new ImageProvider("lock").setMaxSize(ImageSizes.LAYER); … … 940 944 941 945 @Override 946 public boolean isDownloadable() { 947 return data.getDownloadPolicy() != DownloadPolicy.BLOCKED && !isLocked(); 948 } 949 950 @Override 942 951 public boolean isUploadable() { 943 return data.getUploadPolicy() != UploadPolicy.BLOCKED ;952 return data.getUploadPolicy() != UploadPolicy.BLOCKED && !isLocked(); 944 953 } 945 954 … … 1031 1040 } 1032 1041 1033 /**1034 * Determines if upload is being discouraged.1035 * (i.e. this dataset contains private data which should not be uploaded)1036 * @return {@code true} if upload is being discouraged, {@code false} otherwise1037 */1038 1042 @Override 1039 1043 public final boolean isUploadDiscouraged() { … … 1174 1178 1175 1179 @Override 1176 public void setReadOnly() {1177 data. setReadOnly();1178 } 1179 1180 @Override 1181 public void un setReadOnly() {1182 data.un setReadOnly();1183 } 1184 1185 @Override 1186 public boolean is ReadOnly() {1187 return data.is ReadOnly();1180 public void lock() { 1181 data.lock(); 1182 } 1183 1184 @Override 1185 public void unlock() { 1186 data.unlock(); 1187 } 1188 1189 @Override 1190 public boolean isLocked() { 1191 return data.isLocked(); 1188 1192 } 1189 1193 -
trunk/src/org/openstreetmap/josm/gui/layer/UploadToServer.java
r13434 r13453 8 8 /** 9 9 * Interface for layers that can upload data. 10 * @see DownloadFromServer 10 11 * @since 9751 11 12 */
Note:
See TracChangeset
for help on using the changeset viewer.