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

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 and Description
private	VersionInfoRow()

Method Summary

Modifier and Type	Method and Description
protected javax.swing.JComponent	mineField()
protected javax.swing.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

Methods inherited from class java.lang.Object

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

Constructor Detail

VersionInfoRow

private VersionInfoRow()

Method Detail

mineField

protected javax.swing.JComponent mineField()

Overrides:

mineField in class AbstractMergePanel.MergeRow

theirsField

protected javax.swing.JComponent theirsField()

Overrides:

theirsField in class AbstractMergePanel.MergeRow