public class PropertiesMerger extends javax.swing.JPanel implements javax.swing.event.ChangeListener, IConflictResolver
OsmPrimitive
.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 |
javax.swing.JPanel.AccessibleJPanel
javax.swing.JComponent.AccessibleJComponent
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 |
listenerList, TOOL_TIP_TEXT_KEY, ui, UNDEFINED_CONDITION, WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, WHEN_FOCUSED, WHEN_IN_FOCUSED_WINDOW
Constructor and Description |
---|
PropertiesMerger()
Constructs a new
PropertiesMerger . |
Modifier and Type | Method and Description |
---|---|
protected void |
build() |
protected void |
buildCoordinateConflictRows() |
protected void |
buildDeletedStateConflictRows() |
protected void |
buildHeaderRow() |
protected void |
buildReferrersRow() |
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.
|
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() |
getAccessibleContext, getUI, getUIClassID, paramString, setUI, updateUI
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
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
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
private static final java.text.DecimalFormat COORD_FORMATTER
private final javax.swing.JLabel lblMyCoordinates
private final javax.swing.JLabel lblMergedCoordinates
private final javax.swing.JLabel lblTheirCoordinates
private final javax.swing.JLabel lblMyDeletedState
private final javax.swing.JLabel lblMergedDeletedState
private final javax.swing.JLabel lblTheirDeletedState
private final javax.swing.JLabel lblMyReferrers
private final javax.swing.JLabel lblTheirReferrers
private final transient PropertiesMergeModel model
private final VersionInfoPanel mineVersionInfo
private final VersionInfoPanel theirVersionInfo
public PropertiesMerger()
PropertiesMerger
.protected static javax.swing.JLabel buildValueLabel(java.lang.String name)
protected void buildHeaderRow()
protected void buildCoordinateConflictRows()
protected void buildDeletedStateConflictRows()
protected void buildReferrersRow()
protected final void build()
protected static java.lang.String coordToString(LatLon coord)
protected static java.lang.String deletedStateToString(java.lang.Boolean deleted)
protected static java.lang.String referrersToString(java.util.List<OsmPrimitive> referrers)
protected void updateCoordinates()
protected void updateDeletedState()
protected void updateReferrers()
public void stateChanged(javax.swing.event.ChangeEvent e)
stateChanged
in interface javax.swing.event.ChangeListener
public PropertiesMergeModel getModel()
public void deletePrimitive(boolean deleted)
deletePrimitive
in interface IConflictResolver
public void populate(Conflict<? extends OsmPrimitive> conflict)
populate
in interface IConflictResolver
public void decideRemaining(MergeDecisionType decision)
decideRemaining
in interface IConflictResolver