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