Package org.openstreetmap.josm.gui.conflict.pair.properties

Class PropertiesMerger.EmptyFillRow

java.lang.Object

org.openstreetmap.josm.gui.conflict.pair.AbstractMergePanel.MergeRow

org.openstreetmap.josm.gui.conflict.pair.properties.PropertiesMerger.EmptyFillRow

Enclosing class:

PropertiesMerger

private static final class PropertiesMerger.EmptyFillRow
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	EmptyFillRow()

Method Summary

Modifier and Type	Method	Description
protected void	addConstraints(GBC constraints, int columnIndex)
protected javax.swing.JComponent	merged()

Methods inherited from class org.openstreetmap.josm.gui.conflict.pair.AbstractMergePanel.MergeRow

getColumns, mineButton, mineField, rowTitle, theirsButton, theirsField

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Detail

EmptyFillRow

private EmptyFillRow()

Method Detail

merged

protected javax.swing.JComponent merged()

Overrides:

merged in class AbstractMergePanel.MergeRow

addConstraints

protected void addConstraints(GBC constraints,
                              int columnIndex)

Overrides:

addConstraints in class AbstractMergePanel.MergeRow