Changeset 16436 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs
- Timestamp:
- 2020-05-17T12:08:17+02:00 (4 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/dialogs
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
r15706 r16436 19 19 import java.util.concurrent.ExecutionException; 20 20 import java.util.concurrent.Future; 21 import java.util.stream.Collectors; 21 22 22 23 import javax.swing.AbstractAction; … … 305 306 if (ds == null || ids == null) 306 307 return; 307 Set<OsmPrimitive> sel = new HashSet<>(); 308 for (OsmPrimitive p: ds.allPrimitives()) { 309 if (ids.contains(p.getChangesetId())) { 310 sel.add(p); 311 } 312 } 308 Set<OsmPrimitive> sel = ds.allPrimitives().stream() 309 .filter(p -> ids.contains(p.getChangesetId())) 310 .collect(Collectors.toSet()); 313 311 ds.setSelected(sel); 314 312 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
r16433 r16436 18 18 import java.awt.event.WindowEvent; 19 19 import java.util.Collection; 20 import java.util.HashSet;21 20 import java.util.List; 22 21 import java.util.Objects; … … 739 738 return; 740 739 } 741 Set<Changeset> toSelect = new HashSet<>();742 740 ChangesetCache cc = ChangesetCache.getInstance(); 743 for (int id: ids) { 744 if (cc.contains(id)) { 745 toSelect.add(cc.get(id)); 746 } 747 } 741 Set<Changeset> toSelect = ids.stream() 742 .filter(cc::contains) 743 .map(cc::get) 744 .collect(Collectors.toSet()); 748 745 setSelectedChangesets(toSelect); 749 746 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java
r16121 r16436 7 7 import java.util.Collection; 8 8 import java.util.Comparator; 9 import java.util.HashSet;10 9 import java.util.List; 11 10 import java.util.Set; 11 import java.util.stream.Collectors; 12 12 13 13 import javax.swing.DefaultListSelectionModel; … … 102 102 */ 103 103 public Set<Integer> getSelectedChangesetIds() { 104 Set<Integer> ret = new HashSet<>(); 105 for (Changeset cs: getSelectedChangesets()) { 106 ret.add(cs.getId()); 107 } 108 return ret; 104 return getSelectedChangesets().stream().map(Changeset::getId).collect(Collectors.toSet()); 109 105 } 110 106 -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
r16216 r16436 12 12 import java.beans.PropertyChangeEvent; 13 13 import java.beans.PropertyChangeListener; 14 import java.util.ArrayList;15 14 import java.util.Collection; 16 15 import java.util.Collections; … … 263 262 264 263 protected List<HistoryOsmPrimitive> filterPrimitivesWithUnloadedHistory(Collection<HistoryOsmPrimitive> primitives) { 265 List<HistoryOsmPrimitive> ret = new ArrayList<>(primitives.size()); 266 for (HistoryOsmPrimitive p: primitives) { 267 if (HistoryDataSet.getInstance().getHistory(p.getPrimitiveId()) == null) { 268 ret.add(p); 269 } 270 } 271 return ret; 264 return primitives.stream() 265 .filter(p -> HistoryDataSet.getInstance().getHistory(p.getPrimitiveId()) == null) 266 .collect(Collectors.toList()); 272 267 } 273 268 -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java
r16218 r16436 3 3 4 4 import java.util.ArrayList; 5 import java.util. HashSet;5 import java.util.Arrays; 6 6 import java.util.Iterator; 7 7 import java.util.List; 8 8 import java.util.Set; 9 import java.util.stream.Collectors; 9 10 10 11 import javax.swing.DefaultListSelectionModel; … … 65 66 */ 66 67 public Set<HistoryOsmPrimitive> getSelectedPrimitives(JTable table) { 67 Set<HistoryOsmPrimitive> ret = new HashSet<>();68 68 int[] selection = table.getSelectedRows(); 69 for (int i = 0; i < selection.length; i++) { 70 ret.add(data.get(table.convertRowIndexToModel(selection[i])).getPrimitive()); 71 } 72 return ret; 69 return Arrays.stream(selection) 70 .mapToObj(i -> data.get(table.convertRowIndexToModel(i)).getPrimitive()) 71 .collect(Collectors.toSet()); 73 72 } 74 73 -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
r16305 r16436 16 16 import java.util.Collections; 17 17 import java.util.Date; 18 import java.util.HashSet;19 18 import java.util.Set; 19 import java.util.stream.Collectors; 20 20 21 21 import javax.swing.AbstractAction; … … 372 372 return; 373 373 } 374 Set<OsmPrimitive> target = new HashSet<>(); 375 for (OsmPrimitive p: ds.allPrimitives()) { 376 if (p.isUsable() && p.getChangesetId() == currentChangeset.getId()) { 377 target.add(p); 378 } 379 } 374 Set<OsmPrimitive> target = ds.allPrimitives().stream() 375 .filter(p -> p.isUsable() && p.getChangesetId() == currentChangeset.getId()) 376 .collect(Collectors.toSet()); 380 377 if (target.isEmpty()) { 381 378 alertNoPrimitivesToSelect(); … … 431 428 return; 432 429 } 433 Set<OsmPrimitive> target = new HashSet<>(); 434 for (OsmPrimitive p: ds.allPrimitives()) { 435 if (p.isUsable() && p.getChangesetId() == currentChangeset.getId()) { 436 target.add(p); 437 } 438 } 430 Set<OsmPrimitive> target = ds.allPrimitives().stream() 431 .filter(p -> p.isUsable() && p.getChangesetId() == currentChangeset.getId()) 432 .collect(Collectors.toSet()); 439 433 if (target.isEmpty()) { 440 434 alertNoPrimitivesToZoomTo(); -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java
r14344 r16436 5 5 import java.util.Collection; 6 6 import java.util.Comparator; 7 import java.util.HashSet;8 7 import java.util.List; 9 8 import java.util.Set; 9 import java.util.stream.Collectors; 10 import java.util.stream.IntStream; 10 11 11 12 import javax.swing.DefaultListModel; 12 13 import javax.swing.DefaultListSelectionModel; 13 14 15 import org.openstreetmap.josm.data.osm.AbstractPrimitive; 14 16 import org.openstreetmap.josm.data.osm.Changeset; 15 17 import org.openstreetmap.josm.data.osm.ChangesetCache; … … 42 44 */ 43 45 public synchronized Set<Changeset> getSelectedChangesets() { 44 Set<Changeset> ret = new HashSet<>(); 45 for (int i = 0; i < getSize(); i++) { 46 if (selectionModel.isSelectedIndex(i)) { 47 ret.add(data.get(i)); 48 } 49 } 50 return ret; 46 return IntStream.range(0, getSize()).filter(selectionModel::isSelectedIndex) 47 .mapToObj(data::get).collect(Collectors.toSet()); 51 48 } 52 49 … … 56 53 */ 57 54 public synchronized Set<Integer> getSelectedChangesetIds() { 58 Set<Integer> ret = new HashSet<>(); 59 for (int i = 0; i < getSize(); i++) { 60 if (selectionModel.isSelectedIndex(i)) { 61 ret.add(data.get(i).getId()); 62 } 63 } 64 return ret; 55 return IntStream.range(0, getSize()).filter(selectionModel::isSelectedIndex) 56 .mapToObj(data::get).map(Changeset::getId).collect(Collectors.toSet()); 65 57 } 66 58 … … 115 107 return; 116 108 } 117 Set<Changeset> changesets = new HashSet<>(ids.size()); 118 for (int id: ids) { 119 if (id <= 0) { 120 continue; 121 } 122 changesets.add(new Changeset(id)); 123 } 109 Set<Changeset> changesets = ids.stream().mapToInt(id -> id) 110 .filter(id -> id > 0).mapToObj(Changeset::new).collect(Collectors.toSet()); 124 111 setChangesets(changesets); 125 112 } … … 134 121 return; 135 122 } 136 Set<Changeset> changesets = new HashSet<>(); 137 for (OsmPrimitive p: primitives) { 138 if (p.getChangesetId() <= 0) { 139 continue; 140 } 141 changesets.add(new Changeset(p.getChangesetId())); 142 } 143 setChangesets(changesets); 123 initFromChangesetIds(primitives.stream().map(AbstractPrimitive::getChangesetId).collect(Collectors.toList())); 144 124 } 145 125 … … 153 133 return; 154 134 } 155 Set<Changeset> changesets = new HashSet<>(); 156 for (OsmPrimitive p: ds.allPrimitives()) { 157 if (p.getChangesetId() <= 0) { 158 continue; 159 } 160 changesets.add(new Changeset(p.getChangesetId())); 161 } 162 setChangesets(changesets); 135 initFromChangesetIds(ds.allPrimitives().stream().map(AbstractPrimitive::getChangesetId).collect(Collectors.toList())); 163 136 } 164 137 … … 192 165 */ 193 166 public synchronized List<Changeset> getSelectedOpenChangesets() { 194 List<Changeset> ret = new ArrayList<>(); 195 for (int i = 0; i < getSize(); i++) { 196 if (selectionModel.isSelectedIndex(i)) { 197 Changeset cs = data.get(i); 198 if (cs.isOpen()) { 199 ret.add(cs); 200 } 201 } 202 } 203 return ret; 167 return IntStream.range(0, getSize()) 168 .filter(selectionModel::isSelectedIndex) 169 .mapToObj(data::get) 170 .filter(Changeset::isOpen) 171 .collect(Collectors.toList()); 204 172 } 205 173 -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java
r16075 r16436 10 10 import java.awt.event.ItemEvent; 11 11 import java.awt.event.ItemListener; 12 import java.util.Arrays; 12 13 import java.util.EnumMap; 13 14 import java.util.Map; … … 178 179 179 180 protected BasicQuery getSelectedQuery() { 180 for (BasicQuery q : BasicQuery.values()) { 181 if (rbQueries.get(q).isSelected()) 182 return q; 183 } 184 return null; 181 return Arrays.stream(BasicQuery.values()) 182 .filter(q -> rbQueries.get(q).isSelected()) 183 .findFirst().orElse(null); 185 184 } 186 185 -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
r16189 r16436 14 14 import java.io.IOException; 15 15 import java.util.Arrays; 16 import java.util.HashSet;17 16 import java.util.List; 18 17 import java.util.Set; … … 302 301 if (selection == null || selection.length == 0) 303 302 return; 304 Set<Relation> relations = new HashSet<>(); 305 for (TreePath aSelection : selection) { 306 relations.add((Relation) aSelection.getLastPathComponent()); 307 } 303 Set<Relation> relations = Arrays.stream(selection) 304 .map(s -> (Relation) s.getLastPathComponent()) 305 .collect(Collectors.toSet()); 308 306 MainApplication.worker.submit(new DownloadRelationSetTask(getParentDialog(), relations)); 309 307 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
r15696 r16436 479 479 */ 480 480 public int getNumMembersWithPrimitive(OsmPrimitive primitive) { 481 int count = 0; 482 for (RelationMember member : members) { 483 if (member.getMember().equals(primitive)) { 484 count++; 485 } 486 } 487 return count; 481 return (int) members.stream().filter(member -> member.getMember().equals(primitive)).count(); 488 482 } 489 483
Note:
See TracChangeset
for help on using the changeset viewer.