Changeset 8851 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2015-10-10T15:47:41+02:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
r8846 r8851 11 11 import java.nio.charset.StandardCharsets; 12 12 import java.text.NumberFormat; 13 import java.util.ArrayDeque; 13 14 import java.util.ArrayList; 14 15 import java.util.Collection; 15 16 import java.util.Collections; 16 17 import java.util.Date; 18 import java.util.Deque; 17 19 import java.util.HashSet; 18 20 import java.util.LinkedList; … … 21 23 import java.util.Map.Entry; 22 24 import java.util.Set; 23 import java.util.Stack;24 25 import java.util.TreeMap; 25 26 import java.util.concurrent.CopyOnWriteArrayList; … … 649 650 } 650 651 651 private Stack<ZoomData> zoomUndoBuffer = new Stack<>();652 private Stack<ZoomData> zoomRedoBuffer = new Stack<>();652 private Deque<ZoomData> zoomUndoBuffer = new ArrayDeque<>(); 653 private Deque<ZoomData> zoomRedoBuffer = new ArrayDeque<>(); 653 654 private Date zoomTimestamp = new Date(); 654 655 -
trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
r8836 r8851 9 9 import java.awt.event.KeyEvent; 10 10 import java.awt.event.MouseEvent; 11 import java.util.ArrayDeque; 11 12 import java.util.ArrayList; 12 13 import java.util.Arrays; 13 14 import java.util.Collection; 15 import java.util.Deque; 14 16 import java.util.HashSet; 15 17 import java.util.List; 16 18 import java.util.Set; 17 import java.util.Stack;18 19 19 20 import javax.swing.AbstractAction; … … 291 292 // Filters can use nested parent/child expression so complete tree is necessary 292 293 Set<OsmPrimitive> result = new HashSet<>(); 293 Stack<OsmPrimitive> stack = new Stack<>();294 Deque<OsmPrimitive> stack = new ArrayDeque<>(); 294 295 stack.addAll(primitives); 295 296 -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
r8836 r8851 12 12 import java.io.IOException; 13 13 import java.net.HttpURLConnection; 14 import java.util.ArrayDeque; 15 import java.util.Deque; 14 16 import java.util.HashSet; 15 17 import java.util.Iterator; 16 18 import java.util.List; 17 19 import java.util.Set; 18 import java.util.Stack;19 20 20 21 import javax.swing.AbstractAction; … … 329 330 class DownloadAllChildrenTask extends DownloadTask { 330 331 private final Relation relation; 331 private final Stack<Relation> relationsToDownload;332 private final Deque<Relation> relationsToDownload; 332 333 private final Set<Long> downloadedRelationIds; 333 334 … … 335 336 super(tr("Download relation members"), parent); 336 337 this.relation = r; 337 relationsToDownload = new Stack<>();338 relationsToDownload = new ArrayDeque<>(); 338 339 downloadedRelationIds = new HashSet<>(); 339 340 relationsToDownload.push(this.relation); -
trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
r8840 r8851 199 199 private static class NameFinderResultParser extends DefaultHandler { 200 200 private SearchResult currentResult; 201 private StringBu ffer description;201 private StringBuilder description; 202 202 private int depth; 203 203 private List<SearchResult> data = new LinkedList<>(); … … 226 226 data.add(currentResult); 227 227 } else if ("description".equals(qName) && (depth == 3)) { 228 description = new StringBu ffer();228 description = new StringBuilder(); 229 229 } else if ("named".equals(qName) && (depth == 4)) { 230 230 // this is a "named" place in the nearest places list. -
trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
r8846 r8851 26 26 import java.text.AttributedString; 27 27 import java.util.ArrayList; 28 import java.util.Hash table;28 import java.util.HashMap; 29 29 import java.util.List; 30 30 import java.util.Map; … … 405 405 } else { 406 406 // Draw message on several lines 407 Map<TextAttribute, Object> map = new Hash table<TextAttribute, Object>();407 Map<TextAttribute, Object> map = new HashMap<TextAttribute, Object>(); 408 408 map.put(TextAttribute.FAMILY, "Serif"); 409 409 map.put(TextAttribute.SIZE, new Float(18.0)); -
trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
r8602 r8851 118 118 @Override 119 119 public String nameSupportedProjections() { 120 StringBu ffer ret = new StringBuffer();120 StringBuilder ret = new StringBuilder(); 121 121 for (String e: supportedProjections) { 122 122 ret.append(e).append(", ");
Note:
See TracChangeset
for help on using the changeset viewer.