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

Class PropertiesMerger.MergeCoordinatesRow

java.lang.Object

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

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

Enclosing class:

PropertiesMerger

private final class PropertiesMerger.MergeCoordinatesRow
extends AbstractMergePanel.MergeRow

Field Summary

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

marginTop

Constructor Summary

Constructors

Modifier	Constructor and Description
private	MergeCoordinatesRow()

Method Summary

Modifier and Type	Method and Description
protected javax.swing.JComponent	merged()
protected javax.swing.JComponent	mineButton()
protected javax.swing.JComponent	mineField()
protected javax.swing.JComponent	rowTitle()
protected javax.swing.JComponent	theirsButton()
protected javax.swing.JComponent	theirsField()

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

addConstraints, getColumns

Methods inherited from class java.lang.Object

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

Constructor Detail

MergeCoordinatesRow

private MergeCoordinatesRow()

Method Detail

rowTitle

protected javax.swing.JComponent rowTitle()

Overrides:

rowTitle in class AbstractMergePanel.MergeRow

mineField

protected javax.swing.JComponent mineField()

Overrides:

mineField in class AbstractMergePanel.MergeRow

mineButton

protected javax.swing.JComponent mineButton()

Overrides:

mineButton in class AbstractMergePanel.MergeRow

merged

protected javax.swing.JComponent merged()

Overrides:

merged in class AbstractMergePanel.MergeRow

theirsButton

protected javax.swing.JComponent theirsButton()

Overrides:

theirsButton in class AbstractMergePanel.MergeRow

theirsField

protected javax.swing.JComponent theirsField()

Overrides:

theirsField in class AbstractMergePanel.MergeRow