| Package | Description |
|---|---|
| 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.
|
| Modifier and Type | Method and Description |
|---|---|
(package private) void |
AbstractMergePanel.MergeRow.addTo(AbstractMergePanel panel) |
| Modifier and Type | Class and Description |
|---|---|
class |
PropertiesMerger
This class represents a UI component for resolving conflicts in some properties of
OsmPrimitive. |
| Modifier and Type | Class and Description |
|---|---|
class |
TagMerger
UI component for resolving conflicts in the tag sets of two
OsmPrimitives. |