Class TagMerger
- 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.tags.TagMerger
-
- All Implemented Interfaces:
ImageObserver
,MenuContainer
,Serializable
,Accessible
,IConflictResolver
public class TagMerger extends AbstractMergePanel implements IConflictResolver
UI component for resolving conflicts in the tag sets of twoOsmPrimitive
s.- Since:
- 1622
- See Also:
- Serialized Form
-
-
Nested Class Summary
Nested Classes Modifier and Type Class Description (package private) static class
TagMerger.AdjustmentSynchronizer
Synchronizes scrollbar adjustments between a set ofAdjustable
s.(package private) class
TagMerger.DoubleClickAdapter
Handler for double clicks on entries in the three tag tables.(package private) class
TagMerger.KeepMineAction
Keeps the currently selected tags in my table in the list of merged tags.(package private) class
TagMerger.KeepTheirAction
Keeps the currently selected tags in their table in the list of merged tags.private class
TagMerger.TagTableRow
(package private) class
TagMerger.UndecideAction
Sets the currently selected tags in the table of merged tags to stateMergeDecisionType.UNDECIDED
private class
TagMerger.UndecidedRow
-
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 String[]
KEY_VALUE
private JTable
mergedTable
the table for the merged tag setprivate JTable
mineTable
the table for my tag setprivate TagMergeModel
model
private JTable
theirTable
the table for their tag set-
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 TagMerger()
Constructs a newTagMerger
.
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description void
decideRemaining(MergeDecisionType decision)
void
deletePrimitive(boolean deleted)
private JTable
generateTable(TagMergeTableCellRenderer renderer)
TagMergeModel
getModel()
replies the model used by this tag mergerprotected List<? extends AbstractMergePanel.MergeRow>
getRows()
Gets the rows.void
populate(Conflict<? extends OsmPrimitive> conflict)
private void
selectNextConflict(int... rows)
-
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
-
model
private final TagMergeModel model
-
mergedTable
private final JTable mergedTable
the table for the merged tag set
-
theirTable
private final JTable theirTable
the table for their tag set
-
-
Constructor Detail
-
TagMerger
public TagMerger()
Constructs a newTagMerger
.
-
-
Method Detail
-
generateTable
private JTable generateTable(TagMergeTableCellRenderer renderer)
-
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.
-
getModel
public TagMergeModel getModel()
replies the model used by this tag merger- Returns:
- the model
-
selectNextConflict
private void selectNextConflict(int... rows)
-
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
-
-