Changeset 17093 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2020-10-07T19:44:51+02:00 (4 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java
r16953 r17093 299 299 Set<String> results = instantiateSortedSet(); 300 300 for (String value: values) { 301 for (String part: value.split(Pattern.quote(separator), -1)) { 302 results.add(part); 303 } 301 String[] parts = value.split(Pattern.quote(separator), -1); 302 results.addAll(Arrays.asList(parts)); 304 303 } 305 304 return String.join(separator, results); -
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r16967 r17093 483 483 Collection<OsmPrimitive> sel = new LinkedList<>(); 484 484 synchronized (this) { 485 for (OsmPrimitive o : lstConflicts.getSelectedValuesList()) { 486 sel.add(o); 487 } 485 sel.addAll(lstConflicts.getSelectedValuesList()); 488 486 } 489 487 DataSet ds = MainApplication.getLayerManager().getEditDataSet(); -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java
r16601 r17093 172 172 public void changesetCacheUpdated(ChangesetCacheEvent event) { 173 173 List<Changeset> selected = getSelectedChangesets(); 174 for (Changeset cs: event.getAddedChangesets()) { 175 data.add(cs); 176 } 177 for (Changeset cs: event.getRemovedChangesets()) { 178 data.remove(cs); 179 } 174 data.addAll(event.getAddedChangesets()); 175 data.removeAll(event.getRemovedChangesets()); 180 176 for (Changeset cs: event.getUpdatedChangesets()) { 181 177 int idx = data.indexOf(cs); -
trunk/src/org/openstreetmap/josm/gui/layer/AutosaveTask.java
r17047 r17093 15 15 import java.nio.file.Path; 16 16 import java.util.ArrayList; 17 import java.util.Arrays; 17 18 import java.util.Collections; 18 19 import java.util.Date; … … 149 150 File[] files = deletedLayersDir.listFiles(); 150 151 if (files != null) { 151 for (File f: files) { 152 deletedLayers.add(f); // FIXME: sort by mtime 153 } 152 // FIXME: sort by mtime 153 deletedLayers.addAll(Arrays.asList(files)); 154 154 } 155 155
Note:
See TracChangeset
for help on using the changeset viewer.