|
||||||||||
PREV NEXT | FRAMES NO FRAMES |
Uses of Conflict in org.openstreetmap.josm.command |
---|
Fields in org.openstreetmap.josm.command declared as Conflict | |
---|---|
private Conflict<Way> |
WayNodesConflictResolverCommand.conflict
the conflict to resolve |
private Conflict<? extends OsmPrimitive> |
ModifiedConflictResolveCommand.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> |
VersionConflictResolveCommand.conflict
the conflict to resolve |
private Conflict<? extends OsmPrimitive> |
ConflictAddCommand.conflict
|
private Conflict<? extends OsmPrimitive> |
TagConflictResolveCommand.conflict
the conflict to resolve |
Methods in org.openstreetmap.josm.command with parameters of type Conflict | |
---|---|
protected void |
ConflictResolveCommand.rememberConflict(Conflict<?> c)
remembers a conflict in the internal list of remembered conflicts |
Constructors in org.openstreetmap.josm.command with parameters of type Conflict | |
---|---|
ConflictAddCommand(OsmDataLayer layer,
Conflict<? extends OsmPrimitive> conflict)
|
|
CoordinateConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict,
MergeDecisionType decision)
constructor |
|
DeletedStateConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict,
MergeDecisionType decision)
constructor |
|
ModifiedConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict)
constructor |
|
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)
|
Uses of Conflict in org.openstreetmap.josm.data |
---|
Methods in org.openstreetmap.josm.data with parameters of type Conflict | |
---|---|
boolean |
APIDataSet.participatesInConflict(Conflict<?> conflict)
Replies true if one of the primitives to be updated or to be deleted participates in the conflict conflict |
Uses of Conflict in org.openstreetmap.josm.data.conflict |
---|
Fields in org.openstreetmap.josm.data.conflict with type parameters of type Conflict | |
---|---|
private java.util.List<Conflict<? extends OsmPrimitive>> |
ConflictCollection.conflicts
|
Methods in org.openstreetmap.josm.data.conflict that return Conflict | |
---|---|
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. |
Methods in org.openstreetmap.josm.data.conflict that return types with arguments of type Conflict | |
---|---|
java.util.List<Conflict<?>> |
ConflictCollection.get()
Replies the conflicts as list. |
java.util.Iterator<Conflict<?>> |
ConflictCollection.iterator()
Replies the iterator for this collection. |
Methods in org.openstreetmap.josm.data.conflict with parameters of type Conflict | |
---|---|
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 |
Method parameters in org.openstreetmap.josm.data.conflict with type arguments of type Conflict | |
---|---|
void |
ConflictCollection.add(java.util.Collection<Conflict<?>> otherConflicts)
Add the conflicts in otherConflicts to this collection of conflicts |
Uses of Conflict in org.openstreetmap.josm.data.osm |
---|
Methods in org.openstreetmap.josm.data.osm with parameters of type Conflict | |
---|---|
protected void |
DataSetMerger.addConflict(Conflict<?> c)
|
Uses of Conflict in org.openstreetmap.josm.gui.conflict.pair |
---|
Fields in org.openstreetmap.josm.gui.conflict.pair declared as Conflict | |
---|---|
private Conflict<? extends OsmPrimitive> |
ConflictResolver.conflict
|
Methods in org.openstreetmap.josm.gui.conflict.pair with parameters of type Conflict | |
---|---|
void |
IConflictResolver.populate(Conflict<? extends OsmPrimitive> conflict)
|
void |
ConflictResolver.populate(Conflict<? extends OsmPrimitive> conflict)
populates the conflict resolver with the conflicts between my and their |
Uses of Conflict in org.openstreetmap.josm.gui.conflict.pair.nodes |
---|
Methods in org.openstreetmap.josm.gui.conflict.pair.nodes with parameters of type Conflict | |
---|---|
WayNodesConflictResolverCommand |
NodeListMergeModel.buildResolveCommand(Conflict<? extends OsmPrimitive> conflict)
Builds the command to resolve conflicts in the node list of a way |
void |
NodeListMerger.populate(Conflict<? extends OsmPrimitive> conflict)
|
Uses of Conflict in org.openstreetmap.josm.gui.conflict.pair.properties |
---|
Methods in org.openstreetmap.josm.gui.conflict.pair.properties with parameters of type Conflict | |
---|---|
java.util.List<Command> |
PropertiesMergeModel.buildResolveCommand(Conflict<? extends OsmPrimitive> conflict)
Builds the command(s) to apply the conflict resolutions to my primitive |
void |
PropertiesMergeModel.populate(Conflict<? extends OsmPrimitive> conflict)
Populates the model with the differences between local and server version |
void |
PropertiesMerger.populate(Conflict<? extends OsmPrimitive> conflict)
|
Uses of Conflict in org.openstreetmap.josm.gui.conflict.pair.relation |
---|
Methods in org.openstreetmap.josm.gui.conflict.pair.relation with parameters of type Conflict | |
---|---|
void |
RelationMemberMerger.populate(Conflict<? extends OsmPrimitive> conflict)
|
Uses of Conflict in org.openstreetmap.josm.gui.conflict.pair.tags |
---|
Methods in org.openstreetmap.josm.gui.conflict.pair.tags with parameters of type Conflict | |
---|---|
TagConflictResolveCommand |
TagMergeModel.buildResolveCommand(Conflict<? extends OsmPrimitive> conflict)
|
void |
TagMerger.populate(Conflict<? extends OsmPrimitive> conflict)
|
Uses of Conflict in org.openstreetmap.josm.gui.dialogs |
---|
Methods in org.openstreetmap.josm.gui.dialogs that return Conflict | |
---|---|
Conflict<? extends OsmPrimitive> |
ConflictDialog.getSelectedConflict()
returns the first selected item of the conflicts list |
|
||||||||||
PREV NEXT | FRAMES NO FRAMES |