public class ConflictResolver extends JPanel implements PropertyChangeListener
OsmPrimitive
s.
This component emits PropertyChangeEvent
s for three properties:
RESOLVED_COMPLETELY_PROP
- new value is true
, if the conflict is
completely resolvedMY_PRIMITIVE_PROP
- new value is the OsmPrimitive
in the role of
my primitiveTHEIR_PRIMITIVE_PROP
- new value is the OsmPrimitive
in the role of
their primitiveJPanel.AccessibleJPanel
JComponent.AccessibleJComponent
Container.AccessibleAWTContainer
Component.AccessibleAWTComponent, Component.BaselineResizeBehavior, Component.BltBufferStrategy, Component.FlipBufferStrategy
Modifier and Type | Field and Description |
---|---|
private Conflict<? extends OsmPrimitive> |
conflict |
private List<IConflictResolver> |
conflictResolvers |
private ImageIcon |
mergeComplete |
private ImageIcon |
mergeIncomplete |
private OsmPrimitive |
my |
static String |
MY_PRIMITIVE_PROP
name of the property for the
OsmPrimitive in the role "my" |
private NodeListMerger |
nodeListMerger |
private PropertiesMerger |
propertiesMerger |
private RelationMemberMerger |
relationMemberMerger |
static String |
RESOLVED_COMPLETELY_PROP
name of the property indicating whether all conflicts are resolved,
isResolvedCompletely() |
private boolean |
resolvedCompletely
indicates whether the current conflict is resolved completely
|
private JTabbedPane |
tabbedPane |
private TagMerger |
tagMerger |
private OsmPrimitive |
their |
static String |
THEIR_PRIMITIVE_PROP
name of the property for the
OsmPrimitive in the role "my" |
listenerList, TOOL_TIP_TEXT_KEY, ui, UNDEFINED_CONDITION, WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, WHEN_FOCUSED, WHEN_IN_FOCUSED_WINDOW
accessibleContext, BOTTOM_ALIGNMENT, CENTER_ALIGNMENT, LEFT_ALIGNMENT, RIGHT_ALIGNMENT, TOP_ALIGNMENT
ABORT, ALLBITS, ERROR, FRAMEBITS, HEIGHT, PROPERTIES, SOMEBITS, WIDTH
Constructor and Description |
---|
ConflictResolver()
constructor
|
Modifier and Type | Method and Description |
---|---|
protected void |
build()
builds the UI
|
Command |
buildResolveCommand()
Builds the resolution command(s) for the resolved conflicts in this
ConflictResolver
|
boolean |
isResolvedCompletely()
Replies true all differences in this conflicts are resolved
|
protected void |
loadIcons()
loads the required icons
|
void |
populate(Conflict<? extends OsmPrimitive> conflict)
populates the conflict resolver with the conflicts between my and their
|
void |
propertyChange(PropertyChangeEvent evt)
handles property change events
|
void |
selectFirstTabWithConflicts() |
protected void |
setMy(OsmPrimitive my)
Sets the
OsmPrimitive in the role "my" |
protected void |
setTheir(OsmPrimitive their)
Sets the
OsmPrimitive in the role "their". |
void |
unregisterListeners() |
protected void |
updateResolvedCompletely()
Updates the state of the property
RESOLVED_COMPLETELY_PROP |
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
public static final String RESOLVED_COMPLETELY_PROP
isResolvedCompletely()
public static final String MY_PRIMITIVE_PROP
OsmPrimitive
in the role "my"public static final String THEIR_PRIMITIVE_PROP
OsmPrimitive
in the role "my"private JTabbedPane tabbedPane
private NodeListMerger nodeListMerger
private RelationMemberMerger relationMemberMerger
private PropertiesMerger propertiesMerger
private final List<IConflictResolver> conflictResolvers
private OsmPrimitive my
private OsmPrimitive their
private Conflict<? extends OsmPrimitive> conflict
private ImageIcon mergeComplete
private ImageIcon mergeIncomplete
private boolean resolvedCompletely
public ConflictResolver()
protected void loadIcons()
protected void build()
protected void setMy(OsmPrimitive my)
OsmPrimitive
in the role "my"my
- the primitive in the role "my"protected void setTheir(OsmPrimitive their)
OsmPrimitive
in the role "their".their
- the primitive in the role "their"public void propertyChange(PropertyChangeEvent evt)
propertyChange
in interface PropertyChangeListener
evt
- the eventTagMergeModel
,
ListMergeModel
,
PropertiesMergeModel
public void populate(Conflict<? extends OsmPrimitive> conflict)
conflict
- the conflict data setpublic void selectFirstTabWithConflicts()
public Command buildResolveCommand()
protected void updateResolvedCompletely()
RESOLVED_COMPLETELY_PROP
public boolean isResolvedCompletely()
public void unregisterListeners()