Package | Description |
---|---|
org.openstreetmap.josm.command.conflict |
Provides commands for handling conflicts.
|
org.openstreetmap.josm.data.conflict |
Provides the classes for edition
conflicts
between OsmPrimitive s |
org.openstreetmap.josm.data.osm |
Provides the classes for OSM data:
Primitives :
Node ,
Way ,
Relation
Users
Tags
Changesets
Utilities classes
|
org.openstreetmap.josm.gui.conflict.pair |
Provides the classes for displaying conflicts as pair of lists.
|
org.openstreetmap.josm.gui.conflict.pair.nodes |
Provides the classes for displaying conflicts in ways list of nodes.
|
org.openstreetmap.josm.gui.conflict.pair.properties |
Provides the classes for displaying conflicts in OSM primitive properties.
|
org.openstreetmap.josm.gui.conflict.pair.relation |
Provides the classes for displaying conflicts in OSM primitive relation memberships.
|
org.openstreetmap.josm.gui.conflict.pair.tags |
Provides the classes for displaying conflicts in OSM primitive tags.
|
org.openstreetmap.josm.gui.dialogs |
Provides three kinds of dialogs:
Toggle dialogs on the right side of the GUI, that can be turned on, off, attached or detached from the GUI
Changeset dialog based on a standalone implementation, dedicated to OSM changesets management
Extended dialogs for everything else
|
Modifier and Type | Field and Description |
---|---|
private Conflict<Way> |
WayNodesConflictResolverCommand.conflict
the conflict to resolve
|
private Conflict<? extends OsmPrimitive> |
TagConflictResolveCommand.conflict
the conflict to resolve
|
private Conflict<? extends OsmPrimitive> |
VersionConflictResolveCommand.conflict
the conflict to resolve
|
private Conflict<Relation> |
RelationMemberConflictResolverCommand.conflict
the conflict to resolve
|
private Conflict<? extends OsmPrimitive> |
DeletedStateConflictResolveCommand.conflict
the conflict to resolve
|
private Conflict<? extends OsmPrimitive> |
CoordinateConflictResolveCommand.conflict
the conflict to resolve
|
private Conflict<? extends OsmPrimitive> |
ModifiedConflictResolveCommand.conflict
the conflict to resolve
|
private Conflict<? extends OsmPrimitive> |
ConflictAddCommand.conflict |
Modifier and Type | Method and Description |
---|---|
protected void |
ConflictResolveCommand.rememberConflict(Conflict<?> c)
remembers a conflict in the internal list of remembered conflicts
|
Constructor and Description |
---|
ConflictAddCommand(OsmDataLayer layer,
Conflict<? extends OsmPrimitive> conflict)
Constructs a new
ConflictAddCommand . |
CoordinateConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict,
MergeDecisionType decision)
constructor for coordinate conflict
|
DeletedStateConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict,
MergeDecisionType decision)
Constructs a new
DeletedStateConflictResolveCommand . |
ModifiedConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict)
constructor
|
RelationMemberConflictResolverCommand(Conflict<? extends OsmPrimitive> conflict,
java.util.List<RelationMember> mergedMembers)
Constructs a new
RelationMemberConflictResolverCommand . |
TagConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict,
java.util.List<TagMergeItem> mergeItems)
constructor
|
VersionConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict)
constructor
|
WayNodesConflictResolverCommand(Conflict<? extends OsmPrimitive> conflict,
java.util.List<Node> mergedNodeList) |
Modifier and Type | Field and Description |
---|---|
private java.util.List<Conflict<? extends OsmPrimitive>> |
ConflictCollection.conflicts |
Modifier and Type | Method and Description |
---|---|
Conflict<?> |
ConflictCollection.get(int idx)
Replies the conflict at position
idx |
Conflict<?> |
ConflictCollection.getConflictForMy(OsmPrimitive my)
Replies the conflict for the
OsmPrimitive my , null
if no such conflict exists. |
Conflict<?> |
ConflictCollection.getConflictForTheir(OsmPrimitive their)
Replies the conflict for the
OsmPrimitive their , null
if no such conflict exists. |
Modifier and Type | Method and Description |
---|---|
java.util.List<Conflict<?>> |
ConflictCollection.get()
Replies the conflicts as list.
|
java.util.Collection<Conflict<? extends OsmPrimitive>> |
ConflictCollection.getNodeConflicts()
Returns the list of conflicts involving nodes.
|
java.util.Collection<Conflict<? extends OsmPrimitive>> |
ConflictCollection.getRelationConflicts()
Returns the list of conflicts involving nodes.
|
java.util.Collection<Conflict<? extends OsmPrimitive>> |
ConflictCollection.getWayConflicts()
Returns the list of conflicts involving nodes.
|
java.util.Iterator<Conflict<?>> |
ConflictCollection.iterator()
Replies the iterator for this collection.
|
Modifier and Type | Method and Description |
---|---|
void |
ConflictCollection.add(Conflict<?> conflict)
Adds a conflict to the collection of conflicts.
|
protected void |
ConflictCollection.addConflict(Conflict<?> conflict)
Adds a conflict to the collection
|
boolean |
ConflictCollection.hasConflict(Conflict<?> c)
Replies true, if this collection includes a given conflict
|
void |
ConflictCollection.remove(Conflict<?> conflict)
removes a conflict from this collection
|
Modifier and Type | Method and Description |
---|---|
void |
ConflictCollection.add(java.util.Collection<Conflict<?>> otherConflicts)
Add the conflicts in
otherConflicts to this collection of conflicts |
Modifier and Type | Method and Description |
---|---|
protected void |
DataSetMerger.addConflict(Conflict<?> c) |
Modifier and Type | Field and Description |
---|---|
private Conflict<? extends OsmPrimitive> |
ConflictResolver.conflict |
Modifier and Type | Method and Description |
---|---|
abstract C |
AbstractListMergeModel.buildResolveCommand(Conflict<? extends OsmPrimitive> conflict)
Builds the command to resolve conflicts in the list.
|
void |
ConflictResolver.populate(Conflict<? extends OsmPrimitive> conflict)
populates the conflict resolver with the conflicts between my and their
|
void |
IConflictResolver.populate(Conflict<? extends OsmPrimitive> conflict) |
Modifier and Type | Method and Description |
---|---|
WayNodesConflictResolverCommand |
NodeListMergeModel.buildResolveCommand(Conflict<? extends OsmPrimitive> conflict) |
void |
NodeListMerger.populate(Conflict<? extends OsmPrimitive> conflict) |
Modifier and Type | Method and Description |
---|---|
java.util.List<Command> |
PropertiesMergeModel.buildResolveCommand(Conflict<? extends OsmPrimitive> conflict)
Builds the command(s) to apply the conflict resolutions to my primitive
|
void |
PropertiesMerger.populate(Conflict<? extends OsmPrimitive> conflict) |
void |
PropertiesMergeModel.populate(Conflict<? extends OsmPrimitive> conflict)
Populates the model with the differences between local and server version
|
Modifier and Type | Method and Description |
---|---|
RelationMemberConflictResolverCommand |
RelationMemberListMergeModel.buildResolveCommand(Conflict<? extends OsmPrimitive> conflict) |
void |
RelationMemberMerger.populate(Conflict<? extends OsmPrimitive> conflict) |
Modifier and Type | Method and Description |
---|---|
TagConflictResolveCommand |
TagMergeModel.buildResolveCommand(Conflict<? extends OsmPrimitive> conflict) |
void |
TagMerger.populate(Conflict<? extends OsmPrimitive> conflict) |
Modifier and Type | Method and Description |
---|---|
Conflict<? extends OsmPrimitive> |
ConflictDialog.getSelectedConflict()
returns the first selected item of the conflicts list
|