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 | Class and Description |
---|---|
protected static class |
AbstractMergePanel.AbstractUndecideRow
Add the undecide button to the middle of the merged row.
|
protected static class |
AbstractMergePanel.MergeRowWithoutButton
A row that does not contain the merge buttons.
|
protected static class |
AbstractMergePanel.TitleRow
The title for the rows (mine, merged, theirs)
|
Modifier and Type | Method and Description |
---|---|
protected abstract java.util.List<? extends AbstractMergePanel.MergeRow> |
AbstractMergePanel.getRows()
Gets the rows.
|
Modifier and Type | Class and Description |
---|---|
private static class |
PropertiesMerger.EmptyFillRow |
private class |
PropertiesMerger.MergeCoordinatesRow |
private class |
PropertiesMerger.MergeDeletedStateRow |
private class |
PropertiesMerger.ReferrersRow |
private class |
PropertiesMerger.UndecideCoordinatesRow |
private class |
PropertiesMerger.UndecideDeletedStateRow |
private class |
PropertiesMerger.VersionInfoRow |
Modifier and Type | Method and Description |
---|---|
protected java.util.List<? extends AbstractMergePanel.MergeRow> |
PropertiesMerger.getRows() |
Modifier and Type | Class and Description |
---|---|
private class |
TagMerger.TagTableRow |
private class |
TagMerger.UndecidedRow |
Modifier and Type | Method and Description |
---|---|
protected java.util.List<? extends AbstractMergePanel.MergeRow> |
TagMerger.getRows() |