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

Class PropertiesMerger

java.lang.Object

java.awt.Component

java.awt.Container

javax.swing.JComponent

javax.swing.JPanel

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

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

All Implemented Interfaces:

java.awt.image.ImageObserver, java.awt.MenuContainer, java.io.Serializable, java.util.EventListener, javax.accessibility.Accessible, javax.swing.event.ChangeListener, IConflictResolver

public class PropertiesMerger
extends AbstractMergePanel
implements javax.swing.event.ChangeListener, IConflictResolver

This class represents a UI component for resolving conflicts in some properties of OsmPrimitive.

Since:

1654

See Also:

Serialized Form

Nested Class Summary

Nested Classes

Modifier and Type	Class and Description
private static class	PropertiesMerger.EmptyFillRow
(package private) class	PropertiesMerger.KeepMyCoordinatesAction
(package private) class	PropertiesMerger.KeepMyDeletedStateAction
(package private) class	PropertiesMerger.KeepTheirCoordinatesAction
(package private) class	PropertiesMerger.KeepTheirDeletedStateAction
private class	PropertiesMerger.MergeCoordinatesRow
private class	PropertiesMerger.MergeDeletedStateRow
private class	PropertiesMerger.ReferrersRow
(package private) class	PropertiesMerger.UndecideCoordinateConflictAction
private class	PropertiesMerger.UndecideCoordinatesRow
(package private) class	PropertiesMerger.UndecideDeletedStateConflictAction
private class	PropertiesMerger.UndecideDeletedStateRow
private class	PropertiesMerger.VersionInfoRow

Nested classes/interfaces inherited from class org.openstreetmap.josm.gui.conflict.pair.AbstractMergePanel

AbstractMergePanel.AbstractUndecideRow, AbstractMergePanel.MergeRow, AbstractMergePanel.MergeRowWithoutButton, AbstractMergePanel.TitleRow

Nested classes/interfaces inherited from class javax.swing.JPanel

javax.swing.JPanel.AccessibleJPanel

Nested classes/interfaces inherited from class javax.swing.JComponent

javax.swing.JComponent.AccessibleJComponent

Nested classes/interfaces inherited from class java.awt.Container

java.awt.Container.AccessibleAWTContainer

Nested classes/interfaces inherited from class java.awt.Component

java.awt.Component.AccessibleAWTComponent, java.awt.Component.BaselineResizeBehavior, java.awt.Component.BltBufferStrategy, java.awt.Component.FlipBufferStrategy

Field Summary

Fields

Modifier and Type	Field and Description
private static java.text.DecimalFormat	COORD_FORMATTER
private javax.swing.JLabel	lblMergedCoordinates
private javax.swing.JLabel	lblMergedDeletedState
private javax.swing.JLabel	lblMyCoordinates
private javax.swing.JLabel	lblMyDeletedState
private javax.swing.JLabel	lblMyReferrers
private javax.swing.JLabel	lblTheirCoordinates
private javax.swing.JLabel	lblTheirDeletedState
private javax.swing.JLabel	lblTheirReferrers
private VersionInfoPanel	mineVersionInfo
private PropertiesMergeModel	model
private VersionInfoPanel	theirVersionInfo

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

currentRow

Fields inherited from class javax.swing.JComponent

listenerList, TOOL_TIP_TEXT_KEY, ui, UNDEFINED_CONDITION, WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, WHEN_FOCUSED, WHEN_IN_FOCUSED_WINDOW

Fields inherited from class java.awt.Component

accessibleContext, BOTTOM_ALIGNMENT, CENTER_ALIGNMENT, LEFT_ALIGNMENT, RIGHT_ALIGNMENT, TOP_ALIGNMENT

Fields inherited from interface java.awt.image.ImageObserver

ABORT, ALLBITS, ERROR, FRAMEBITS, HEIGHT, PROPERTIES, SOMEBITS, WIDTH

Constructor Summary

Constructors

Constructor and Description
PropertiesMerger() Constructs a new PropertiesMerger.

Method Summary

Modifier and Type	Method and Description
protected static javax.swing.JLabel	buildValueLabel(java.lang.String name)
protected static java.lang.String	coordToString(LatLon coord)
void	decideRemaining(MergeDecisionType decision)
protected static java.lang.String	deletedStateToString(java.lang.Boolean deleted)
void	deletePrimitive(boolean deleted)
PropertiesMergeModel	getModel() Returns properties merge model.
protected java.util.List<? extends AbstractMergePanel.MergeRow>	getRows() Gets the rows.
void	populate(Conflict<? extends OsmPrimitive> conflict)
protected static java.lang.String	referrersToString(java.util.List<OsmPrimitive> referrers)
void	stateChanged(javax.swing.event.ChangeEvent e)
protected void	updateCoordinates()
protected void	updateDeletedState()
protected void	updateReferrers()

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

buildRows

Methods inherited from class javax.swing.JPanel

getAccessibleContext, getUI, getUIClassID, paramString, setUI, updateUI

Methods inherited from class javax.swing.JComponent

addAncestorListener, addNotify, addVetoableChangeListener, computeVisibleRect, contains, createToolTip, disable, enable, firePropertyChange, firePropertyChange, firePropertyChange, fireVetoableChange, getActionForKeyStroke, getActionMap, getAlignmentX, getAlignmentY, getAncestorListeners, getAutoscrolls, getBaseline, getBaselineResizeBehavior, getBorder, getBounds, getClientProperty, getComponentGraphics, getComponentPopupMenu, getConditionForKeyStroke, getDebugGraphicsOptions, getDefaultLocale, getFontMetrics, getGraphics, getHeight, getInheritsPopupMenu, getInputMap, getInputMap, getInputVerifier, getInsets, getInsets, getListeners, getLocation, getMaximumSize, getMinimumSize, getNextFocusableComponent, getPopupLocation, getPreferredSize, getRegisteredKeyStrokes, getRootPane, getSize, getToolTipLocation, getToolTipText, getToolTipText, getTopLevelAncestor, getTransferHandler, getVerifyInputWhenFocusTarget, getVetoableChangeListeners, getVisibleRect, getWidth, getX, getY, grabFocus, hide, isDoubleBuffered, isLightweightComponent, isManagingFocus, isOpaque, isOptimizedDrawingEnabled, isPaintingForPrint, isPaintingOrigin, isPaintingTile, isRequestFocusEnabled, isValidateRoot, paint, paintBorder, paintChildren, paintComponent, paintImmediately, paintImmediately, print, printAll, printBorder, printChildren, printComponent, processComponentKeyEvent, processKeyBinding, processKeyEvent, processMouseEvent, processMouseMotionEvent, putClientProperty, registerKeyboardAction, registerKeyboardAction, removeAncestorListener, removeNotify, removeVetoableChangeListener, repaint, repaint, requestDefaultFocus, requestFocus, requestFocus, requestFocusInWindow, requestFocusInWindow, resetKeyboardActions, reshape, revalidate, scrollRectToVisible, setActionMap, setAlignmentX, setAlignmentY, setAutoscrolls, setBackground, setBorder, setComponentPopupMenu, setDebugGraphicsOptions, setDefaultLocale, setDoubleBuffered, setEnabled, setFocusTraversalKeys, setFont, setForeground, setInheritsPopupMenu, setInputMap, setInputVerifier, setMaximumSize, setMinimumSize, setNextFocusableComponent, setOpaque, setPreferredSize, setRequestFocusEnabled, setToolTipText, setTransferHandler, setUI, setVerifyInputWhenFocusTarget, setVisible, unregisterKeyboardAction, update

Methods inherited from class java.awt.Container

add, add, add, add, add, addContainerListener, addImpl, addPropertyChangeListener, addPropertyChangeListener, applyComponentOrientation, areFocusTraversalKeysSet, countComponents, deliverEvent, doLayout, findComponentAt, findComponentAt, getComponent, getComponentAt, getComponentAt, getComponentCount, getComponents, getComponentZOrder, getContainerListeners, getFocusTraversalKeys, getFocusTraversalPolicy, getLayout, getMousePosition, insets, invalidate, isAncestorOf, isFocusCycleRoot, isFocusCycleRoot, isFocusTraversalPolicyProvider, isFocusTraversalPolicySet, layout, list, list, locate, minimumSize, paintComponents, preferredSize, printComponents, processContainerEvent, processEvent, remove, remove, removeAll, removeContainerListener, setComponentZOrder, setFocusCycleRoot, setFocusTraversalPolicy, setFocusTraversalPolicyProvider, setLayout, transferFocusDownCycle, validate, validateTree

Methods inherited from class java.awt.Component

action, add, addComponentListener, addFocusListener, addHierarchyBoundsListener, addHierarchyListener, addInputMethodListener, addKeyListener, addMouseListener, addMouseMotionListener, addMouseWheelListener, bounds, checkImage, checkImage, coalesceEvents, contains, createImage, createImage, createVolatileImage, createVolatileImage, disableEvents, dispatchEvent, enable, enableEvents, enableInputMethods, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, getBackground, getBounds, getColorModel, getComponentListeners, getComponentOrientation, getCursor, getDropTarget, getFocusCycleRootAncestor, getFocusListeners, getFocusTraversalKeysEnabled, getFont, getForeground, getGraphicsConfiguration, getHierarchyBoundsListeners, getHierarchyListeners, getIgnoreRepaint, getInputContext, getInputMethodListeners, getInputMethodRequests, getKeyListeners, getLocale, getLocation, getLocationOnScreen, getMouseListeners, getMouseMotionListeners, getMousePosition, getMouseWheelListeners, getName, getParent, getPeer, getPropertyChangeListeners, getPropertyChangeListeners, getSize, getToolkit, getTreeLock, gotFocus, handleEvent, hasFocus, imageUpdate, inside, isBackgroundSet, isCursorSet, isDisplayable, isEnabled, isFocusable, isFocusOwner, isFocusTraversable, isFontSet, isForegroundSet, isLightweight, isMaximumSizeSet, isMinimumSizeSet, isPreferredSizeSet, isShowing, isValid, isVisible, keyDown, keyUp, list, list, list, location, lostFocus, mouseDown, mouseDrag, mouseEnter, mouseExit, mouseMove, mouseUp, move, nextFocus, paintAll, postEvent, prepareImage, prepareImage, processComponentEvent, processFocusEvent, processHierarchyBoundsEvent, processHierarchyEvent, processInputMethodEvent, processMouseWheelEvent, remove, removeComponentListener, removeFocusListener, removeHierarchyBoundsListener, removeHierarchyListener, removeInputMethodListener, removeKeyListener, removeMouseListener, removeMouseMotionListener, removeMouseWheelListener, removePropertyChangeListener, removePropertyChangeListener, repaint, repaint, repaint, resize, resize, setBounds, setBounds, setComponentOrientation, setCursor, setDropTarget, setFocusable, setFocusTraversalKeysEnabled, setIgnoreRepaint, setLocale, setLocation, setLocation, setName, setSize, setSize, show, show, size, toString, transferFocus, transferFocusBackward, transferFocusUpCycle

Methods inherited from class java.lang.Object

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

Field Detail

COORD_FORMATTER

private static final java.text.DecimalFormat COORD_FORMATTER

lblMyCoordinates

private final javax.swing.JLabel lblMyCoordinates

lblMergedCoordinates

private final javax.swing.JLabel lblMergedCoordinates

lblTheirCoordinates

private final javax.swing.JLabel lblTheirCoordinates

lblMyDeletedState

private final javax.swing.JLabel lblMyDeletedState

lblMergedDeletedState

private final javax.swing.JLabel lblMergedDeletedState

lblTheirDeletedState

private final javax.swing.JLabel lblTheirDeletedState

lblMyReferrers

private final javax.swing.JLabel lblMyReferrers

lblTheirReferrers

private final javax.swing.JLabel lblTheirReferrers

model

private final transient PropertiesMergeModel model

mineVersionInfo

private final VersionInfoPanel mineVersionInfo

theirVersionInfo

private final VersionInfoPanel theirVersionInfo

Constructor Detail

PropertiesMerger

public PropertiesMerger()

Constructs a new PropertiesMerger.

Method Detail

getRows

protected java.util.List<? extends AbstractMergePanel.MergeRow> getRows()

Description copied from class: AbstractMergePanel

Gets the rows.

Specified by:

getRows in class AbstractMergePanel

Returns:

A list of rows that should be displayed in this dialog.

buildValueLabel

protected static javax.swing.JLabel buildValueLabel(java.lang.String name)

coordToString

protected static java.lang.String coordToString(LatLon coord)

deletedStateToString

protected static java.lang.String deletedStateToString(java.lang.Boolean deleted)

referrersToString

protected static java.lang.String referrersToString(java.util.List<OsmPrimitive> referrers)

updateCoordinates

protected void updateCoordinates()

updateDeletedState

protected void updateDeletedState()

updateReferrers

protected void updateReferrers()

stateChanged

public void stateChanged(javax.swing.event.ChangeEvent e)

Specified by:

stateChanged in interface javax.swing.event.ChangeListener

getModel

public PropertiesMergeModel getModel()

Returns properties merge model.

Returns:

properties merge model

deletePrimitive

public void deletePrimitive(boolean deleted)

Specified by:

deletePrimitive in interface IConflictResolver

populate

public void populate(Conflict<? extends OsmPrimitive> conflict)

Specified by:

populate in interface IConflictResolver

decideRemaining

public void decideRemaining(MergeDecisionType decision)

Specified by:

decideRemaining in interface IConflictResolver