| Package | Description |
|---|---|
| org.openstreetmap.josm.command.conflict |
Provides commands for handling conflicts.
|
| org.openstreetmap.josm.gui.conflict.pair | |
| org.openstreetmap.josm.gui.conflict.pair.nodes | |
| org.openstreetmap.josm.gui.conflict.pair.properties | |
| org.openstreetmap.josm.gui.conflict.pair.relation | |
| org.openstreetmap.josm.gui.conflict.pair.tags | |
| org.openstreetmap.josm.gui.dialogs |
| Class and Description |
|---|
| MergeDecisionType |
| Class and Description |
|---|
| ComparePairType
Enumeration of the possible comparison pairs
|
| IConflictResolver |
| ListMergeModel
ListMergeModel is a model for interactively comparing and merging two list of entries
of type T.
|
| ListMergeModel.ComparePairListModel |
| ListMergeModel.EntriesSelectionModel
This is the selection model to be used in a
JTable which displays
an entry list managed by ListMergeModel. |
| ListMergeModel.EntriesTableModel
This an adapter between a
JTable and one of the three entry lists
in the role ListRole managed by the ListMergeModel. |
| ListMerger.CopyAction
Base class of all other Copy* inner classes.
|
| ListMerger.CopyAfterCurrentLeftAction
Action for copying selected nodes in the list of my nodes to the list of merged
nodes.
|
| ListMerger.CopyAfterCurrentRightAction |
| ListMerger.CopyAllLeft |
| ListMerger.CopyAllRight |
| ListMerger.CopyBeforeCurrentLeftAction
Action for copying selected nodes in the list of my nodes to the list of merged
nodes.
|
| ListMerger.CopyBeforeCurrentRightAction |
| ListMerger.CopyEndLeftAction
Action for copying selected nodes in the list of my nodes to the list of merged
nodes.
|
| ListMerger.CopyEndRightAction |
| ListMerger.CopyStartLeftAction
Action for copying selected nodes in the list of my nodes to the list of merged
nodes.
|
| ListMerger.CopyStartRightAction |
| ListMerger.FreezeAction
Action for freezing the current state of the list merger
|
| ListMerger.FreezeActionProperties |
| ListMerger.MoveDownMergedAction
Action for moving the currently selected entries in the list of merged entries
one position down
|
| ListMerger.MoveUpMergedAction |
| ListMerger.RemoveMergedAction
Action for removing the selected entries in the list of merged entries
from the list of merged entries.
|
| ListRole
Enumeration of roles entry lists play in
ListMergeModel |
| MergeDecisionType |
| Class and Description |
|---|
| IConflictResolver |
| ListMergeModel
ListMergeModel is a model for interactively comparing and merging two list of entries
of type T.
|
| ListMergeModel.EntriesTableModel
This an adapter between a
JTable and one of the three entry lists
in the role ListRole managed by the ListMergeModel. |
| ListMerger
A UI component for resolving conflicts in two lists of entries of type T.
|
| PairTable |
| Class and Description |
|---|
| IConflictResolver |
| MergeDecisionType |
| Class and Description |
|---|
| IConflictResolver |
| ListMergeModel
ListMergeModel is a model for interactively comparing and merging two list of entries
of type T.
|
| ListMergeModel.EntriesTableModel
This an adapter between a
JTable and one of the three entry lists
in the role ListRole managed by the ListMergeModel. |
| ListMerger
A UI component for resolving conflicts in two lists of entries of type T.
|
| PairTable |
| Class and Description |
|---|
| IConflictResolver |
| MergeDecisionType |
| Class and Description |
|---|
| ConflictResolver
An UI component for resolving conflicts between two
OsmPrimitives. |