Changeset 11277 in josm
- Timestamp:
- 2016-11-17T22:45:25+01:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/PurgeAction.java
r11252 r11277 58 58 public class PurgeAction extends JosmAction { 59 59 60 protected transient OsmDataLayer layer; 61 protected JCheckBox cbClearUndoRedo; 62 protected boolean modified; 63 64 protected transient Set<OsmPrimitive> toPurge; 65 /** 66 * finally, contains all objects that are purged 67 */ 68 protected transient Set<OsmPrimitive> toPurgeChecked; 69 /** 70 * Subset of toPurgeChecked. Marks primitives that remain in the 71 * dataset, but incomplete. 72 */ 73 protected transient Set<OsmPrimitive> makeIncomplete; 74 /** 75 * Subset of toPurgeChecked. Those that have not been in the selection. 76 */ 77 protected transient List<OsmPrimitive> toPurgeAdditionally; 78 60 79 /** 61 80 * Constructs a new {@code PurgeAction}. … … 69 88 putValue("help", HelpUtil.ht("/Action/Purge")); 70 89 } 71 72 protected transient OsmDataLayer layer;73 protected JCheckBox cbClearUndoRedo;74 protected boolean modified;75 76 protected transient Set<OsmPrimitive> toPurge;77 /**78 * finally, contains all objects that are purged79 */80 protected transient Set<OsmPrimitive> toPurgeChecked;81 /**82 * Subset of toPurgeChecked. Marks primitives that remain in the83 * dataset, but incomplete.84 */85 protected transient Set<OsmPrimitive> makeIncomplete;86 /**87 * Subset of toPurgeChecked. Those that have not been in the selection.88 */89 protected transient List<OsmPrimitive> toPurgeAdditionally;90 90 91 91 @Override -
trunk/src/org/openstreetmap/josm/data/imagery/WMTSDefaultLayer.java
r11257 r11277 2 2 package org.openstreetmap.josm.data.imagery; 3 3 4 /** 5 * WMTS default layer. 6 * @since 11257 7 */ 4 8 public class WMTSDefaultLayer extends DefaultLayer { 5 String tileMatrixSet; 9 private final String tileMatrixSet; 6 10 11 /** 12 * Constructs a new {@code WMTSDefaultLayer}. 13 * @param layerName layer name 14 * @param tileMatrixSet tile matrix set 15 */ 7 16 public WMTSDefaultLayer(String layerName, String tileMatrixSet) { 8 17 super(layerName); … … 10 19 } 11 20 21 /** 22 * Returns the tile matrix set. 23 * @return the tile matrix set 24 */ 12 25 public String getTileMatrixSet() { 13 26 return tileMatrixSet; -
trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
r11257 r11277 271 271 */ 272 272 public DefaultLayer userSelectLayer() { 273 Collection<Entry<String, List<Layer>>> grouppedLayers = groupLayersByName(layers); ;273 Collection<Entry<String, List<Layer>>> grouppedLayers = groupLayersByName(layers); 274 274 275 275 // if there is only one layer name no point in asking -
trunk/src/org/openstreetmap/josm/data/osm/BBox.java
r11272 r11277 26 26 * Constructs a new (invalid) BBox 27 27 */ 28 public BBox() { } 28 public BBox() { 29 // Nothing to do 30 } 29 31 30 32 /** -
trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
r11272 r11277 473 473 private QBLevel<T> currentNode; 474 474 private int contentIndex; 475 private Iterator<T> invalidBBoxIterator = invalidBBoxPrimitives.iterator(); 475 private final Iterator<T> invalidBBoxIterator = invalidBBoxPrimitives.iterator(); 476 476 boolean fromInvalidBBoxPrimitives; 477 477 QuadBuckets<T> qb; -
trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
r11270 r11277 56 56 */ 57 57 public class DownloadDialog extends JDialog { 58 private static IntegerProperty DOWNLOAD_TAB = new IntegerProperty("download.tab", 0); 59 60 private static BooleanProperty DOWNLOAD_AUTORUN = new BooleanProperty("download.autorun", false); 61 private static BooleanProperty DOWNLOAD_OSM = new BooleanProperty("download.osm", true); 62 private static BooleanProperty DOWNLOAD_GPS = new BooleanProperty("download.gps", false); 63 private static BooleanProperty DOWNLOAD_NOTES = new BooleanProperty("download.notes", false); 64 private static BooleanProperty DOWNLOAD_NEWLAYER = new BooleanProperty("download.newlayer", false); 58 private static final IntegerProperty DOWNLOAD_TAB = new IntegerProperty("download.tab", 0); 59 60 private static final BooleanProperty DOWNLOAD_AUTORUN = new BooleanProperty("download.autorun", false); 61 private static final BooleanProperty DOWNLOAD_OSM = new BooleanProperty("download.osm", true); 62 private static final BooleanProperty DOWNLOAD_GPS = new BooleanProperty("download.gps", false); 63 private static final BooleanProperty DOWNLOAD_NOTES = new BooleanProperty("download.notes", false); 64 private static final BooleanProperty DOWNLOAD_NEWLAYER = new BooleanProperty("download.newlayer", false); 65 65 66 66 /** the unique instance of the download dialog */ -
trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
r11261 r11277 357 357 data.addDataSetListener(MultipolygonCache.getInstance()); 358 358 DataSet.addSelectionListener(this); 359 if (name != null && name.startsWith(createLayerName("")) 360 && Character.isDigit((name.substring(createLayerName("").length()) + "XX" /*avoid StringIndexOutOfBoundsException*/).charAt(1))) {359 if (name != null && name.startsWith(createLayerName("")) && Character.isDigit( 360 (name.substring(createLayerName("").length()) + "XX" /*avoid StringIndexOutOfBoundsException*/).charAt(1))) { 361 361 while (AlphanumComparator.getInstance().compare(createLayerName(dataLayerCounter), name) < 0) { 362 362 final int i = dataLayerCounter.incrementAndGet(); -
trunk/src/org/openstreetmap/josm/tools/DefaultGeoProperty.java
r11264 r11277 40 40 public Boolean get(BBox box) { 41 41 Area abox = new Area(box.toRectangle()); 42 Geometry.PolygonIntersection is = Geometry.polygonIntersection(abox, area, 1e-10 /* using deg and not meters */ 42 Geometry.PolygonIntersection is = Geometry.polygonIntersection(abox, area, 1e-10 /* using deg and not meters */); 43 43 switch (is) { 44 44 case FIRST_INSIDE_SECOND: -
trunk/src/org/openstreetmap/josm/tools/HttpClient.java
r11250 r11277 191 191 private boolean uncompress; 192 192 private boolean uncompressAccordingToContentDisposition; 193 private String responseData = null;193 private String responseData; 194 194 195 195 private Response(HttpURLConnection connection, ProgressMonitor monitor) throws IOException {
Note:
See TracChangeset
for help on using the changeset viewer.