org.jeditor.diff

Class JDiffTextPanel

java.lang.Object

java.awt.Component

java.awt.Container

javax.swing.JComponent

org.jeditor.diff.JDiffTextPanel

All Implemented Interfaces:

java.awt.image.ImageObserver, java.awt.MenuContainer, java.io.Serializable, DiffAlgorithm, DiffEngine

public class JDiffTextPanel
extends javax.swing.JComponent
implements DiffEngine

A Panel showing the differences between two text files.

See Also:

Serialized Form

Nested Class Summary

Nested classes/interfaces inherited from class javax.swing.JComponent

javax.swing.JComponent.AccessibleJComponent

Nested classes/interfaces inherited from class java.awt.Container

java.awt.Container.AccessibleAWTContainer

Nested classes/interfaces inherited from class java.awt.Component

java.awt.Component.AccessibleAWTComponent, java.awt.Component.BaselineResizeBehavior, java.awt.Component.BltBufferStrategy, java.awt.Component.FlipBufferStrategy

Nested classes/interfaces inherited from interface org.jeditor.diff.DiffEngine

DiffEngine.DiffLine

Field Summary

Fields

Modifier and Type	Field and Description
protected CodeEditorDefaults	defaults The text editors default.
protected CodeEditorHighlighter	leftHL The left editor highlighter.
protected JEditor	leftText The left text editor.
protected java.util.List<java.lang.String>	leftV The left text as a list.
protected CodeEditorHighlighter	rightHL The right editor highlighter.
protected JEditor	rightText The right text editor.
protected java.util.List<java.lang.String>	rightV The right text as a list.

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 org.jeditor.diff.DiffEngine

DELETED, NEW, UNCHANGED, UPDATED

Fields inherited from interface org.jeditor.diff.DiffAlgorithm

TYPE_FULL_LINES, TYPE_WITHIN_LINES_BASIC, TYPE_WITHIN_LINES_DIFF

Fields inherited from interface java.awt.image.ImageObserver

ABORT, ALLBITS, ERROR, FRAMEBITS, HEIGHT, PROPERTIES, SOMEBITS, WIDTH

Constructor Summary

Constructors

Constructor and Description
JDiffTextPanel()
JDiffTextPanel(java.util.List<java.lang.String> leftV, java.util.List<java.lang.String> rightV) Constructor.
JDiffTextPanel(java.util.List<java.lang.String> leftV, java.util.List<java.lang.String> rightV, CodeEditorDefaults defaults) Constructor.
JDiffTextPanel(java.util.List<java.lang.String> leftV, java.util.List<java.lang.String> rightV, CodeEditorDefaults defaults, short diffAlgorithm) Constructor.
JDiffTextPanel(java.util.List<java.lang.String> leftV, java.util.List<java.lang.String> rightV, short diffAlgorithm) Constructor.
JDiffTextPanel(java.lang.Object[] leftO, java.lang.Object[] rightO) Constructor.
JDiffTextPanel(java.lang.Object[] leftO, java.lang.Object[] rightO, CodeEditorDefaults defaults) Constructor.
JDiffTextPanel(java.lang.Object[] leftO, java.lang.Object[] rightO, CodeEditorDefaults defaults, short diffAlgorithm) Constructor.
JDiffTextPanel(java.lang.Object[] leftO, java.lang.Object[] rightO, short diffAlgorithm) Constructor.

Method Summary

Modifier and Type	Method and Description
void	createPanel(javax.swing.JComponent leftC, javax.swing.JComponent rightC, int dist)
protected void	createPanelImpl(javax.swing.JComponent leftC, javax.swing.JComponent rightC, int dist)
short	getDiffAlgorithm() Return the diff algorithm
JEditor	getLeftEditor() Return the left editor.
java.util.List<java.lang.String>	getLeftText() Return the left text.
JEditor	getRightEditor() Return the right editor.
java.util.List<java.lang.String>	getRightText() Return the right text.
static void	main(java.lang.String[] argv)
void	populate(DiffBase diffbase) Populate the content of the diff.
protected void	populatePanel(java.util.List<Change> changes) Populate the panel.
void	setCodeEditorDefaults(CodeEditorDefaults defaults)
void	setColors(java.awt.Color updated, java.awt.Color addedBefore, java.awt.Color addedAfter) Set the Colors.
void	setComparables(java.util.List<java.lang.String> leftV, java.util.List<java.lang.String> rightV)
void	setComparables(java.lang.Object[] leftO, java.lang.Object[] rightO)
void	setDefaultKeymap()
void	setDiffAlgorithm(short diffAlgorithm) Set the diff algorithm.
void	setEditable(boolean editable) Sets if this component is editable.
void	setScrollLink(boolean link)
void	setStyles(CodeEditorDefaults defaults)
void	setTokenMarker(TokenMarker marker) Set the TokenMarker to use on both the left and the right lines.
protected void	showPanel()

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, getUIClassID, getVerifyInputWhenFocusTarget, getVetoableChangeListeners, getVisibleRect, getWidth, getX, getY, grabFocus, hide, isDoubleBuffered, isLightweightComponent, isManagingFocus, isOpaque, isOptimizedDrawingEnabled, isPaintingForPrint, isPaintingOrigin, isPaintingTile, isRequestFocusEnabled, isValidateRoot, paint, paintBorder, paintChildren, paintComponent, paintImmediately, paintImmediately, paramString, 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, updateUI

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, getAccessibleContext, 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

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait

Methods inherited from interface org.jeditor.diff.DiffEngine

createDiffResult, getNewLine, populate

Field Detail

rightText

protected JEditor rightText

The right text editor.

leftText

protected JEditor leftText

The left text editor.

defaults

protected CodeEditorDefaults defaults

The text editors default.

leftHL

protected CodeEditorHighlighter leftHL

The left editor highlighter.

rightHL

protected CodeEditorHighlighter rightHL

The right editor highlighter.

rightV

protected java.util.List<java.lang.String> rightV

The right text as a list.

leftV

protected java.util.List<java.lang.String> leftV

The left text as a list.

Constructor Detail

JDiffTextPanel

public JDiffTextPanel()

JDiffTextPanel

public JDiffTextPanel(java.util.List<java.lang.String> leftV,
                      java.util.List<java.lang.String> rightV)

Constructor.

Parameters:

leftV - the left lines

rightV - the right lines

JDiffTextPanel

public JDiffTextPanel(java.util.List<java.lang.String> leftV,
                      java.util.List<java.lang.String> rightV,
                      short diffAlgorithm)

Constructor.

Parameters:

leftV - the left lines

rightV - the right lines

diffAlgorithm - the diff algorithm used to know how differences within lines are shown

JDiffTextPanel

public JDiffTextPanel(java.lang.Object[] leftO,
                      java.lang.Object[] rightO)

Constructor.

Parameters:

leftO - the left lines

rightO - the right lines

JDiffTextPanel

public JDiffTextPanel(java.lang.Object[] leftO,
                      java.lang.Object[] rightO,
                      short diffAlgorithm)

Constructor.

Parameters:

leftO - the left lines

rightO - the right lines

diffAlgorithm - the diff algorithm used to specify how differences within lines are shown

See Also:

DiffAlgorithm

JDiffTextPanel

public JDiffTextPanel(java.util.List<java.lang.String> leftV,
                      java.util.List<java.lang.String> rightV,
                      CodeEditorDefaults defaults,
                      short diffAlgorithm)

Constructor.

Parameters:

leftV - the left lines

rightV - the right lines

defaults - the defaults

diffAlgorithm - the diff algorithm used to specify how differences within lines are shown

See Also:

DiffAlgorithm

JDiffTextPanel

public JDiffTextPanel(java.util.List<java.lang.String> leftV,
                      java.util.List<java.lang.String> rightV,
                      CodeEditorDefaults defaults)

Constructor.

Parameters:

leftV - the left lines

rightV - the right lines

defaults - the defaults

JDiffTextPanel

public JDiffTextPanel(java.lang.Object[] leftO,
                      java.lang.Object[] rightO,
                      CodeEditorDefaults defaults,
                      short diffAlgorithm)

Constructor.

Parameters:

leftO - the left lines

rightO - the right lines

defaults - the defaults

diffAlgorithm - the diff algorithm used to specify how differences within lines are shown

See Also:

DiffAlgorithm

JDiffTextPanel

public JDiffTextPanel(java.lang.Object[] leftO,
                      java.lang.Object[] rightO,
                      CodeEditorDefaults defaults)

Constructor.

Parameters:

leftO - the left lines

rightO - the right lines

defaults - the defaults

Method Detail

getLeftText

public java.util.List<java.lang.String> getLeftText()

Return the left text.

Specified by:

getLeftText in interface DiffEngine

Returns:

the left text

getRightText

public java.util.List<java.lang.String> getRightText()

Return the right text.

Specified by:

getRightText in interface DiffEngine

Returns:

the right text

setCodeEditorDefaults

public void setCodeEditorDefaults(CodeEditorDefaults defaults)

setComparables

public void setComparables(java.util.List<java.lang.String> leftV,
                           java.util.List<java.lang.String> rightV)

setComparables

public void setComparables(java.lang.Object[] leftO,
                           java.lang.Object[] rightO)

createPanel

public void createPanel(javax.swing.JComponent leftC,
                        javax.swing.JComponent rightC,
                        int dist)

createPanelImpl

protected void createPanelImpl(javax.swing.JComponent leftC,
                               javax.swing.JComponent rightC,
                               int dist)

setStyles

public void setStyles(CodeEditorDefaults defaults)

setEditable

public final void setEditable(boolean editable)

Sets if this component is editable. By default the panel is not editable

Parameters:

editable - True if this component is editable

setDiffAlgorithm

public void setDiffAlgorithm(short diffAlgorithm)

Set the diff algorithm.

Specified by:

setDiffAlgorithm in interface DiffEngine

Parameters:

diffAlgorithm - the diff algorithm

getDiffAlgorithm

public short getDiffAlgorithm()

Return the diff algorithm

Specified by:

getDiffAlgorithm in interface DiffEngine

Returns:

the diff algorithm

setScrollLink

public void setScrollLink(boolean link)

getLeftEditor

public JEditor getLeftEditor()

Return the left editor.

Returns:

the left editor

getRightEditor

public JEditor getRightEditor()

Return the right editor.

Returns:

the right editor

setTokenMarker

public void setTokenMarker(TokenMarker marker)

Set the TokenMarker to use on both the left and the right lines.

Parameters:

marker - the TokenMarker

setDefaultKeymap

public void setDefaultKeymap()

setColors

public void setColors(java.awt.Color updated,
                      java.awt.Color addedBefore,
                      java.awt.Color addedAfter)

Set the Colors.

Parameters:

updated - the updated color

addedBefore - the added before color (used for lines which are only on the left panel)

addedAfter - the added after color (used for lines which are only on the right panel)

populate

public void populate(DiffBase diffbase)

Populate the content of the diff.

Specified by:

populate in interface DiffEngine

Parameters:

diffbase - the DiffBase

populatePanel

protected void populatePanel(java.util.List<Change> changes)

Populate the panel.

Parameters:

changes - the list of changes

showPanel

protected void showPanel()

main

public static void main(java.lang.String[] argv)
                 throws java.io.IOException

Throws:

java.io.IOException