Changeset 1898 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
- Timestamp:
- 2009-08-03T21:18:50+02:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r1814 r1898 55 55 * This dialog displays the {@see ConflictCollection} of the active {@see OsmDataLayer} in a toggle 56 56 * dialog on the right of the main frame. 57 * 57 * 58 58 */ 59 59 public final class ConflictDialog extends ToggleDialog implements LayerChangeListener, IConflictListener, SelectionChangedListener{ … … 128 128 /** 129 129 * Launches a conflict resolution dialog for the first selected conflict 130 * 130 * 131 131 */ 132 132 private final void resolve() { … … 180 180 public void visit(Way w) { 181 181 Node lastN = null; 182 for (Node n : w. nodes) {182 for (Node n : w.getNodes()) { 183 183 if (lastN == null) { 184 184 lastN = n; … … 206 206 /** 207 207 * replies the conflict collection currently held by this dialog; may be null 208 * 208 * 209 209 * @return the conflict collection currently held by this dialog; may be null 210 210 */
Note:
See TracChangeset
for help on using the changeset viewer.