Package | Description |
---|---|
org.openstreetmap.josm.command.conflict |
Provides commands for handling conflicts.
|
org.openstreetmap.josm.gui.conflict.pair |
Provides the classes for displaying conflicts as pair of lists.
|
org.openstreetmap.josm.gui.conflict.pair.properties |
Provides the classes for displaying conflicts in OSM primitive properties.
|
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 MergeDecisionType |
DeletedStateConflictResolveCommand.decision
the merge decision
|
private MergeDecisionType |
CoordinateConflictResolveCommand.decision
the merge decision
|
Constructor and Description |
---|
CoordinateConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict,
MergeDecisionType decision)
constructor for coordinate conflict
|
DeletedStateConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict,
MergeDecisionType decision)
Constructs a new
DeletedStateConflictResolveCommand . |
Modifier and Type | Method and Description |
---|---|
static MergeDecisionType |
MergeDecisionType.valueOf(java.lang.String name)
Returns the enum constant of this type with the specified name.
|
static MergeDecisionType[] |
MergeDecisionType.values()
Returns an array containing the constants of this enum type, in
the order they are declared.
|
Modifier and Type | Method and Description |
---|---|
void |
AbstractListMerger.decideRemaining(MergeDecisionType decision) |
void |
ConflictResolver.decideRemaining(MergeDecisionType decision)
Decides/resolves undecided conflicts to the given decision type |
void |
IConflictResolver.decideRemaining(MergeDecisionType decision) |
Modifier and Type | Field and Description |
---|---|
private MergeDecisionType |
PropertiesMergeModel.coordMergeDecision |
private MergeDecisionType |
PropertiesMergeModel.deletedMergeDecision |
Modifier and Type | Method and Description |
---|---|
void |
PropertiesMergeModel.decideCoordsConflict(MergeDecisionType decision)
Decides a conflict between local and server coordinates
|
void |
PropertiesMergeModel.decideDeletedStateConflict(MergeDecisionType decision)
decides the conflict between two deleted states
|
void |
PropertiesMerger.decideRemaining(MergeDecisionType decision) |
private boolean |
PropertiesMergeModel.getMergedDeletedState(MergeDecisionType decision) |
boolean |
PropertiesMergeModel.isCoordMergeDecision(MergeDecisionType decision)
replies true if the current decision for the coordinate conflict is
decision |
boolean |
PropertiesMergeModel.isDeletedStateDecision(MergeDecisionType decision)
replies true if the current decision for the deleted state conflict is
decision |
Modifier and Type | Field and Description |
---|---|
private MergeDecisionType |
TagMergeItem.mergeDecision |
Modifier and Type | Method and Description |
---|---|
MergeDecisionType |
TagMergeItem.getMergeDecision() |
Modifier and Type | Method and Description |
---|---|
void |
TagMergeModel.decide(int[] rows,
MergeDecisionType decision)
|
void |
TagMergeModel.decide(int row,
MergeDecisionType decision)
|
void |
TagMergeItem.decide(MergeDecisionType decision)
applies a merge decision to this merge item
|
void |
TagMergeModel.decideRemaining(MergeDecisionType decision) |
void |
TagMerger.decideRemaining(MergeDecisionType decision) |
protected void |
TagMergeModel.rememberDecision(int row,
MergeDecisionType decision) |
Modifier and Type | Field and Description |
---|---|
private MergeDecisionType |
ConflictDialog.ResolveToAction.type |
Constructor and Description |
---|
ResolveToAction(java.lang.String name,
java.lang.String description,
MergeDecisionType type) |