Class PropertiesMerger.VersionInfoRow
- java.lang.Object
-
- org.openstreetmap.josm.gui.conflict.pair.AbstractMergePanel.MergeRow
-
- org.openstreetmap.josm.gui.conflict.pair.AbstractMergePanel.MergeRowWithoutButton
-
- org.openstreetmap.josm.gui.conflict.pair.properties.PropertiesMerger.VersionInfoRow
-
- Enclosing class:
- PropertiesMerger
private final class PropertiesMerger.VersionInfoRow extends AbstractMergePanel.MergeRowWithoutButton
-
-
Field Summary
-
Fields inherited from class org.openstreetmap.josm.gui.conflict.pair.AbstractMergePanel.MergeRow
marginTop
-
-
Constructor Summary
Constructors Modifier Constructor Description private
VersionInfoRow()
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description protected JComponent
mineField()
protected JComponent
theirsField()
-
Methods inherited from class org.openstreetmap.josm.gui.conflict.pair.AbstractMergePanel.MergeRowWithoutButton
addConstraints, getColumns
-
Methods inherited from class org.openstreetmap.josm.gui.conflict.pair.AbstractMergePanel.MergeRow
merged, mineButton, rowTitle, theirsButton
-
-
-
-
Constructor Detail
-
VersionInfoRow
private VersionInfoRow()
-
-
Method Detail
-
mineField
protected JComponent mineField()
- Overrides:
mineField
in classAbstractMergePanel.MergeRow
-
theirsField
protected JComponent theirsField()
- Overrides:
theirsField
in classAbstractMergePanel.MergeRow
-
-