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 ofOsmPrimitive.- Since:
- 1654
- See Also:
- Serialized Form
-
-
Nested Class Summary
Nested Classes Modifier and Type Class Description private static classPropertiesMerger.EmptyFillRow(package private) classPropertiesMerger.KeepMyCoordinatesAction(package private) classPropertiesMerger.KeepMyDeletedStateAction(package private) classPropertiesMerger.KeepTheirCoordinatesAction(package private) classPropertiesMerger.KeepTheirDeletedStateActionprivate classPropertiesMerger.MergeCoordinatesRowprivate classPropertiesMerger.MergeDeletedStateRowprivate classPropertiesMerger.ReferrersRow(package private) classPropertiesMerger.UndecideCoordinateConflictActionprivate classPropertiesMerger.UndecideCoordinatesRow(package private) classPropertiesMerger.UndecideDeletedStateConflictActionprivate classPropertiesMerger.UndecideDeletedStateRowprivate classPropertiesMerger.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
-
-
Field Summary
Fields Modifier and Type Field Description private static java.text.DecimalFormatCOORD_FORMATTERprivate javax.swing.JLabellblMergedCoordinatesprivate javax.swing.JLabellblMergedDeletedStateprivate javax.swing.JLabellblMyCoordinatesprivate javax.swing.JLabellblMyDeletedStateprivate javax.swing.JLabellblMyReferrersprivate javax.swing.JLabellblTheirCoordinatesprivate javax.swing.JLabellblTheirDeletedStateprivate javax.swing.JLabellblTheirReferrersprivate VersionInfoPanelmineVersionInfoprivate PropertiesMergeModelmodelprivate VersionInfoPaneltheirVersionInfo-
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
-
-
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 javax.swing.JLabelbuildValueLabel(java.lang.String name)protected static java.lang.StringcoordToString(LatLon coord)voiddecideRemaining(MergeDecisionType decision)protected static java.lang.StringdeletedStateToString(java.lang.Boolean deleted)voiddeletePrimitive(boolean deleted)PropertiesMergeModelgetModel()Returns properties merge model.protected java.util.List<? extends AbstractMergePanel.MergeRow>getRows()Gets the rows.voidpopulate(Conflict<? extends OsmPrimitive> conflict)protected static java.lang.StringreferrersToString(java.util.List<OsmPrimitive> referrers)voidstateChanged(javax.swing.event.ChangeEvent e)protected voidupdateCoordinates()protected voidupdateDeletedState()protected voidupdateReferrers()-
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 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 newPropertiesMerger.
-
-
Method Detail
-
getRows
protected java.util.List<? extends AbstractMergePanel.MergeRow> getRows()
Description copied from class:AbstractMergePanelGets the rows.- Specified by:
getRowsin classAbstractMergePanel- 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:
stateChangedin interfacejavax.swing.event.ChangeListener
-
getModel
public PropertiesMergeModel getModel()
Returns properties merge model.- Returns:
- properties merge model
-
deletePrimitive
public void deletePrimitive(boolean deleted)
- Specified by:
deletePrimitivein interfaceIConflictResolver
-
populate
public void populate(Conflict<? extends OsmPrimitive> conflict)
- Specified by:
populatein interfaceIConflictResolver
-
decideRemaining
public void decideRemaining(MergeDecisionType decision)
- Specified by:
decideRemainingin interfaceIConflictResolver
-
-