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:
ImageObserver
,MenuContainer
,Serializable
,EventListener
,Accessible
,ChangeListener
,IConflictResolver
public class PropertiesMerger extends AbstractMergePanel implements ChangeListener, IConflictResolver
This class represents a UI component for resolving conflicts in some properties ofOsmPrimitive
.- Since:
- 1654
- See Also:
- Serialized Form
-
-
Nested Class Summary
Nested Classes Modifier and Type Class 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
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 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 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 Description PropertiesMerger()
Constructs a newPropertiesMerger
.
-
Method Summary
All Methods Static Methods Instance Methods Concrete Methods Modifier and Type Method Description protected static JLabel
buildValueLabel(String name)
protected static String
coordToString(LatLon coord)
void
decideRemaining(MergeDecisionType decision)
protected static String
deletedStateToString(Boolean deleted)
void
deletePrimitive(boolean deleted)
PropertiesMergeModel
getModel()
Returns properties merge model.protected List<? extends AbstractMergePanel.MergeRow>
getRows()
Gets the rows.void
populate(Conflict<? extends OsmPrimitive> conflict)
protected static String
referrersToString(List<OsmPrimitive> referrers)
void
stateChanged(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, 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, requestFocus, requestFocus, requestFocusInWindow, resize, resize, setBounds, setBounds, setComponentOrientation, setCursor, setDropTarget, setFocusable, setFocusTraversalKeysEnabled, setIgnoreRepaint, setLocale, setLocation, setLocation, setMixingCutoutShape, setName, setSize, setSize, show, show, size, toString, transferFocus, transferFocusBackward, transferFocusUpCycle
-
-
-
-
Field Detail
-
COORD_FORMATTER
private static final DecimalFormat COORD_FORMATTER
-
lblMyCoordinates
private final JLabel lblMyCoordinates
-
lblMergedCoordinates
private final JLabel lblMergedCoordinates
-
lblTheirCoordinates
private final JLabel lblTheirCoordinates
-
lblMyDeletedState
private final JLabel lblMyDeletedState
-
lblMergedDeletedState
private final JLabel lblMergedDeletedState
-
lblTheirDeletedState
private final JLabel lblTheirDeletedState
-
lblMyReferrers
private final JLabel lblMyReferrers
-
lblTheirReferrers
private final 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 newPropertiesMerger
.
-
-
Method Detail
-
getRows
protected List<? extends AbstractMergePanel.MergeRow> getRows()
Description copied from class:AbstractMergePanel
Gets the rows.- Specified by:
getRows
in classAbstractMergePanel
- Returns:
- A list of rows that should be displayed in this dialog.
-
buildValueLabel
protected static JLabel buildValueLabel(String name)
-
coordToString
protected static String coordToString(LatLon coord)
-
deletedStateToString
protected static String deletedStateToString(Boolean deleted)
-
referrersToString
protected static String referrersToString(List<OsmPrimitive> referrers)
-
updateCoordinates
protected void updateCoordinates()
-
updateDeletedState
protected void updateDeletedState()
-
updateReferrers
protected void updateReferrers()
-
stateChanged
public void stateChanged(ChangeEvent e)
- Specified by:
stateChanged
in interfaceChangeListener
-
getModel
public PropertiesMergeModel getModel()
Returns properties merge model.- Returns:
- properties merge model
-
deletePrimitive
public void deletePrimitive(boolean deleted)
- Specified by:
deletePrimitive
in interfaceIConflictResolver
-
populate
public void populate(Conflict<? extends OsmPrimitive> conflict)
- Specified by:
populate
in interfaceIConflictResolver
-
decideRemaining
public void decideRemaining(MergeDecisionType decision)
- Specified by:
decideRemaining
in interfaceIConflictResolver
-
-