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.properties.PropertiesMerger

All Implemented Interfaces:

ImageObserver, MenuContainer, Serializable, Observer, Accessible, IConflictResolver

public class PropertiesMerger
extends JPanel
implements Observer, IConflictResolver

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

See Also:

Serialized Form

Nested Class Summary

Nested Classes

Modifier and Type	Class and Description
(package private) class	PropertiesMerger.KeepMyCoordinatesAction
(package private) class	PropertiesMerger.KeepMyDeletedStateAction
(package private) class	PropertiesMerger.KeepTheirCoordinatesAction
(package private) class	PropertiesMerger.KeepTheirDeletedStateAction
(package private) class	PropertiesMerger.UndecideCoordinateConflictAction
(package private) class	PropertiesMerger.UndecideDeletedStateConflictAction

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

JPanel.AccessibleJPanel

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

JComponent.AccessibleJComponent

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

Container.AccessibleAWTContainer

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

Component.AccessibleAWTComponent, Component.BaselineResizeBehavior, Component.BltBufferStrategy, Component.FlipBufferStrategy

Field Summary

Fields

Modifier and Type	Field and Description
private static DecimalFormat	COORD_FORMATTER
private JLabel	lblMergedCoordinates
private JLabel	lblMergedDeletedState
private JLabel	lblMyCoordinates
private JLabel	lblMyDeletedState
private JLabel	lblMyReferrers
private JLabel	lblTheirCoordinates
private JLabel	lblTheirDeletedState
private JLabel	lblTheirReferrers
private PropertiesMergeModel	model

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()

Method Summary

Modifier and Type	Method and Description
protected void	build()
protected void	buildCoordinateConflictRows()
protected void	buildDeletedStateConflictRows()
protected void	buildHeaderRow()
protected void	buildReferrersRow()
protected JLabel	buildValueLabel(String name)
String	coordToString(LatLon coord)
String	deletedStateToString(Boolean deleted)
void	deletePrimitive(boolean deleted)
PropertiesMergeModel	getModel()
void	populate(Conflict<? extends OsmPrimitive> conflict)
String	referrersToString(List<OsmPrimitive> referrers)
void	update(Observable o, Object arg)
protected void	updateCoordinates()
protected void	updateDeletedState()
protected void	updateReferrers()

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 DecimalFormat COORD_FORMATTER

lblMyCoordinates

private JLabel lblMyCoordinates

lblMergedCoordinates

private JLabel lblMergedCoordinates

lblTheirCoordinates

private JLabel lblTheirCoordinates

lblMyDeletedState

private JLabel lblMyDeletedState

lblMergedDeletedState

private JLabel lblMergedDeletedState

lblTheirDeletedState

private JLabel lblTheirDeletedState

lblMyReferrers

private JLabel lblMyReferrers

lblTheirReferrers

private JLabel lblTheirReferrers

model

private final PropertiesMergeModel model

Constructor Detail

PropertiesMerger

public PropertiesMerger()

Method Detail

buildValueLabel

protected JLabel buildValueLabel(String name)

buildHeaderRow

protected void buildHeaderRow()

buildCoordinateConflictRows

protected void buildCoordinateConflictRows()

buildDeletedStateConflictRows

protected void buildDeletedStateConflictRows()

buildReferrersRow

protected void buildReferrersRow()

build

protected void build()

coordToString

public String coordToString(LatLon coord)

deletedStateToString

public String deletedStateToString(Boolean deleted)

referrersToString

public String referrersToString(List<OsmPrimitive> referrers)

updateCoordinates

protected void updateCoordinates()

updateDeletedState

protected void updateDeletedState()

updateReferrers

protected void updateReferrers()

update

public void update(Observable o,
                   Object arg)

Specified by:

update in interface Observer

getModel

public PropertiesMergeModel getModel()

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