Package | Description |
---|---|
org.openstreetmap.josm.command | |
org.openstreetmap.josm.command.conflict |
Provides commands for handling conflicts.
|
org.openstreetmap.josm.data | |
org.openstreetmap.josm.data.conflict | |
org.openstreetmap.josm.data.osm | |
org.openstreetmap.josm.gui.dialogs | |
org.openstreetmap.josm.gui.layer |
Modifier and Type | Field and Description |
---|---|
protected ConflictCollection |
PurgeCommand.purgedConflicts |
Modifier and Type | Field and Description |
---|---|
private ConflictCollection |
ConflictResolveCommand.resolvedConflicts
the list of resolved conflicts
|
Modifier and Type | Method and Description |
---|---|
boolean |
APIDataSet.participatesInConflict(ConflictCollection conflicts)
Replies true if one of the primitives to be updated or to be deleted
participates in at least one conflict in
conflicts |
Modifier and Type | Method and Description |
---|---|
void |
ConflictCollection.add(ConflictCollection other)
Adds all conflicts from another collection.
|
void |
IConflictListener.onConflictsAdded(ConflictCollection conflicts) |
void |
IConflictListener.onConflictsRemoved(ConflictCollection conflicts) |
Modifier and Type | Field and Description |
---|---|
private ConflictCollection |
DataSetMerger.conflicts
the collection of conflicts created during merging
|
Modifier and Type | Method and Description |
---|---|
ConflictCollection |
DataSetMerger.getConflicts()
replies the map of conflicts
|
Modifier and Type | Field and Description |
---|---|
private ConflictCollection |
ConflictDialog.conflicts
the collection of conflicts displayed by this conflict dialog
|
Modifier and Type | Method and Description |
---|---|
ConflictCollection |
ConflictDialog.getConflicts()
replies the conflict collection currently held by this dialog; may be null
|
Modifier and Type | Method and Description |
---|---|
void |
ConflictDialog.onConflictsAdded(ConflictCollection conflicts) |
void |
ConflictDialog.onConflictsRemoved(ConflictCollection conflicts) |
Modifier and Type | Field and Description |
---|---|
private ConflictCollection |
OsmDataLayer.conflicts
the collection of conflicts detected in this layer
|
Modifier and Type | Method and Description |
---|---|
ConflictCollection |
OsmDataLayer.getConflicts()
replies the set of conflicts currently managed in this layer
|