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

Class AbstractMergePanel.MergeRowWithoutButton

java.lang.Object

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

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

Direct Known Subclasses:

PropertiesMerger.VersionInfoRow

Enclosing class:

AbstractMergePanel

protected static class AbstractMergePanel.MergeRowWithoutButton
extends AbstractMergePanel.MergeRow

A row that does not contain the merge buttons. Fields in this row fill both the button and filed area.

Field Summary

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

marginTop

Constructor Summary

Constructors

Modifier	Constructor	Description
protected	MergeRowWithoutButton()

Method Summary

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

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

addTo, merged, 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

MergeRowWithoutButton

protected MergeRowWithoutButton()

Method Detail

getColumns

protected javax.swing.JComponent[] getColumns()

Overrides:

getColumns in class AbstractMergePanel.MergeRow

addConstraints

protected void addConstraints(GBC constraints,
                              int columnIndex)

Overrides:

addConstraints in class AbstractMergePanel.MergeRow