|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
java.lang.Object | +--org.sourcejammer.client.gui.merge.MergeViewVisitor
Field Summary | |
static java.awt.Color |
ADDED_COLOR
|
static java.awt.Color |
ANCESTOR_HIGHLIGHT_COLOR
|
private javax.swing.JTextArea |
ancestorArea
|
private javax.swing.plaf.basic.BasicTextUI.BasicHighlighter |
ancestorHighLighter
|
static java.awt.Color |
CHANGED_COLOR
|
private java.util.ArrayList |
changePoints
|
private javax.swing.JTextArea |
checkingInArea
|
private javax.swing.plaf.basic.BasicTextUI.BasicHighlighter |
checkingInHighLighter
|
private boolean |
continueVisit
|
private javax.swing.JTextArea |
currVerArea
|
private javax.swing.plaf.basic.BasicTextUI.BasicHighlighter |
currVerHighLighter
|
static java.awt.Color |
DELETED_COLOR
|
private static java.lang.String |
EOL
|
private int |
linesAddedToAncestor
|
private int |
linesAddedToCheckingIn
|
private int |
linesAddedToCurrVer
|
static javax.swing.text.DefaultHighlighter.DefaultHighlightPainter |
painterAdded
|
static javax.swing.text.DefaultHighlighter.DefaultHighlightPainter |
painterAncestor
|
static javax.swing.text.DefaultHighlighter.DefaultHighlightPainter |
painterDeleted
|
static javax.swing.text.DefaultHighlighter.DefaultHighlightPainter |
painterModified
|
Constructor Summary | |
MergeViewVisitor(javax.swing.JTextArea ancestorArea,
javax.swing.JTextArea currVerArea,
javax.swing.JTextArea checkingInArea)
|
Method Summary | |
private void |
addHighLighter(int start,
int end,
javax.swing.text.DefaultHighlighter.DefaultHighlightPainter painter,
javax.swing.plaf.basic.BasicTextUI.BasicHighlighter highlighter)
|
private void |
balanceViews(JLibDiff.Hunk3 hunk)
Add lines to the text areas as necessary so that they balance. |
boolean |
continueVisit()
|
private int |
getAncestorEndLineNum(JLibDiff.Hunk3 hunk)
Returns adjusted end line of ancestor version of this hunk. |
private int |
getAncestorStartLineNum(JLibDiff.Hunk3 hunk)
|
private int |
getCheckingInEndLineNum(JLibDiff.Hunk3 hunk)
Returns adjusted end line of checking in version of this hunk. |
private int |
getCheckingInStartLineNum(JLibDiff.Hunk3 hunk)
|
private int |
getCurrVersionEndLineNum(JLibDiff.Hunk3 hunk)
Returns adjusted end line of current version of this hunk. |
private int |
getCurrVersionStartLineNum(JLibDiff.Hunk3 hunk)
|
private int |
getOffsetEOL(int linenumber,
javax.swing.JTextArea area)
Return character index of end of specified line in buffer. |
private int |
getOffsetSOL(int linenumber,
javax.swing.JTextArea area)
|
private void |
highlightAncestor(JLibDiff.Hunk3 hunk)
|
private void |
highlightCheckingIn(JLibDiff.Hunk3 hunk)
|
private void |
highlightCurrentVersion(JLibDiff.Hunk3 hunk)
|
void |
setContinueVisit(boolean b)
|
void |
visitHunk3(JLibDiff.Hunk3 hunk3)
Ancestor is 0. Current Version is 1. Checking In Version is 2. |
Methods inherited from class java.lang.Object |
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
Field Detail |
public static java.awt.Color ANCESTOR_HIGHLIGHT_COLOR
public static java.awt.Color ADDED_COLOR
public static java.awt.Color CHANGED_COLOR
public static java.awt.Color DELETED_COLOR
public static javax.swing.text.DefaultHighlighter.DefaultHighlightPainter painterAdded
public static javax.swing.text.DefaultHighlighter.DefaultHighlightPainter painterDeleted
public static javax.swing.text.DefaultHighlighter.DefaultHighlightPainter painterModified
public static javax.swing.text.DefaultHighlighter.DefaultHighlightPainter painterAncestor
private boolean continueVisit
private javax.swing.JTextArea ancestorArea
private javax.swing.JTextArea currVerArea
private javax.swing.JTextArea checkingInArea
private javax.swing.plaf.basic.BasicTextUI.BasicHighlighter ancestorHighLighter
private javax.swing.plaf.basic.BasicTextUI.BasicHighlighter currVerHighLighter
private javax.swing.plaf.basic.BasicTextUI.BasicHighlighter checkingInHighLighter
private java.util.ArrayList changePoints
private static final java.lang.String EOL
private int linesAddedToAncestor
private int linesAddedToCurrVer
private int linesAddedToCheckingIn
Constructor Detail |
public MergeViewVisitor(javax.swing.JTextArea ancestorArea, javax.swing.JTextArea currVerArea, javax.swing.JTextArea checkingInArea)
Method Detail |
public void visitHunk3(JLibDiff.Hunk3 hunk3)
visitHunk3
in interface JLibDiff.Hunk3Visitor
private void highlightAncestor(JLibDiff.Hunk3 hunk)
private void highlightCurrentVersion(JLibDiff.Hunk3 hunk)
private void highlightCheckingIn(JLibDiff.Hunk3 hunk)
public boolean continueVisit()
continueVisit
in interface JLibDiff.Hunk3Visitor
Hunk3Visitor.continueVisit()
public void setContinueVisit(boolean b)
setContinueVisit
in interface JLibDiff.Hunk3Visitor
Hunk3Visitor.setContinueVisit(boolean)
private void balanceViews(JLibDiff.Hunk3 hunk)
private int getAncestorStartLineNum(JLibDiff.Hunk3 hunk)
private int getAncestorEndLineNum(JLibDiff.Hunk3 hunk)
private int getCurrVersionStartLineNum(JLibDiff.Hunk3 hunk)
private int getCurrVersionEndLineNum(JLibDiff.Hunk3 hunk)
private int getCheckingInStartLineNum(JLibDiff.Hunk3 hunk)
private int getCheckingInEndLineNum(JLibDiff.Hunk3 hunk)
private int getOffsetSOL(int linenumber, javax.swing.JTextArea area)
private int getOffsetEOL(int linenumber, javax.swing.JTextArea area)
private void addHighLighter(int start, int end, javax.swing.text.DefaultHighlighter.DefaultHighlightPainter painter, javax.swing.plaf.basic.BasicTextUI.BasicHighlighter highlighter)
|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |