Serialized Form
lineChangesVisible
boolean lineChangesVisible
- Whether or not the line changes should be displayed.
nextBlockChange
BlockChange nextBlockChange
- Pointer to the next block change in the link list or null.
prevBlockChange
BlockChange prevBlockChange
- Pointer to the previous block change in the link list or null.
next
Change next
- Pointer to the next Change in the list or null.
prev
Change prev
- Pointer to the previous Change in the list or null.
parent
Change parent
- Pointer to the parent Change.
For a CharChange this points to the LineChange that covers the
CharChange and for a LineChange the parent is the BlockChange
that contains the specific line. For a BlockChange this is
always null.
deleted
int deleted
- The number of lines or characters of the old text changed here.
- See Also:
Change.getDeleted()
,
Change.setDeleted(int)
inserted
int inserted
- The number of lines or characters of the new text changed here.
- See Also:
Change.getInserted()
,
Change.setInserted(int)
deletedOffset
int deletedOffset
- Offset of the first deleted item in the old text.
- See Also:
Change.getDeletedOffset()
,
Change.setDeletedOffset(int)
,
Diff.Change.line0
insertedOffset
int insertedOffset
- Offset of the first inserted item in the new text.
- See Also:
Change.getInsertedOffset()
,
Change.setInsertedOffset(int)
,
Diff.Change.line1
whichVersion
int whichVersion
- Which Version was was merged. Use OLDFILE or NEWFILE
charChangesVisible
boolean charChangesVisible
- Whether or not char changes are displayed for this line change.
nextLineChange
LineChange nextLineChange
- Points to the next line change within this block change or null.
A value of null indicates that there a no more line changes in
the block change after this line change.
prevLineChange
LineChange prevLineChange
- Points to the previous line change within this change or null.
A value of null indicates that there a no more line changes
in the block change before this line change.
mainPanel
JPanel mainPanel
borderLayout1
BorderLayout borderLayout1
spacerLeft
JPanel spacerLeft
spacerRight
JPanel spacerRight
spacerNorth
JPanel spacerNorth
spacerSouth
JPanel spacerSouth
panelContent
JPanel panelContent
jPanelOK
JPanel jPanelOK
borderLayout2
BorderLayout borderLayout2
okButton
JButton okButton
aboutLabel
JLabel aboutLabel
content
JLabel content
catalog
Catalog catalog
frame
JFrame frame
mainPanel
JPanel mainPanel
borderLayout1
BorderLayout borderLayout1
spacerLeft
JPanel spacerLeft
spacerRight
JPanel spacerRight
spacerNorth
JPanel spacerNorth
spacerSouth
JPanel spacerSouth
panelContent
JPanel panelContent
jPanelOK
JPanel jPanelOK
borderLayout2
BorderLayout borderLayout2
okButton
JButton okButton
aboutLabel
JLabel aboutLabel
content
JLabel content
catalog
Catalog catalog
firstFileField
JTextField firstFileField
secondFileField
JTextField secondFileField
openFirstButton
JButton openFirstButton
openSecondButton
JButton openSecondButton
hiddenFilesCheckbox
JCheckBox hiddenFilesCheckbox
okButton
JButton okButton
cancelButton
JButton cancelButton
cancelled
boolean cancelled
- Indicates whether the operation was cancelled.
languageLoader
LanguageLoader languageLoader
colorChooser
ColorChooserA colorChooser
filterChooser
FilterChooser filterChooser
jScrollPane1
JScrollPane jScrollPane1
jPanel1
JPanel jPanel1
jTextPane1
JTextPane jTextPane1
jTextPane2
JTextPane jTextPane2
jScrollPane2
JScrollPane jScrollPane2
datei1
String datei1
datei2
String datei2
mainBorderLayout
BorderLayout mainBorderLayout
borderLayoutPanelOld
BorderLayout borderLayoutPanelOld
borderLayoutPanelNew
BorderLayout borderLayoutPanelNew
mergeBorderLayout
BorderLayout mergeBorderLayout
innerMergeBorderLayout
BorderLayout innerMergeBorderLayout
borderLayoutToolbarPanel
BorderLayout borderLayoutToolbarPanel
borderLayoutStatusBar
BorderLayout borderLayoutStatusBar
flowLayoutToolbarPanel
FlowLayout flowLayoutToolbarPanel
mergePanelGrid
GridLayout mergePanelGrid
diffPanel
JPanel diffPanel
mergePanel
JPanel mergePanel
panelOld
JPanel panelOld
panelNew
JPanel panelNew
mergeInnerPanel
JPanel mergeInnerPanel
barPanel
JPanel barPanel
toolbarPanel
JPanel toolbarPanel
statusBarPanel
JPanel statusBarPanel
statusBarLabel
JLabel statusBarLabel
mainSplitPane
JSplitPane mainSplitPane
scrollPaneOld
JScrollPane scrollPaneOld
scrollPaneNew
JScrollPane scrollPaneNew
scrollPaneMerge
JScrollPane scrollPaneMerge
textPaneOld
JTextPane textPaneOld
textPaneMerge
JTextPane textPaneMerge
textPaneNew
JTextPane textPaneNew
linePaneOld
JTextPane linePaneOld
linePaneNew
JTextPane linePaneNew
linePaneMerge
JTextPane linePaneMerge
textOldName
JLabel textOldName
textNewName
JLabel textNewName
toolBarFile
JToolBar toolBarFile
toolBarEdit
JToolBar toolBarEdit
toolBarProject
JToolBar toolBarProject
toolBarMerge
JToolBar toolBarMerge
toolBarGC
JToolBar toolBarGC
menuBar
JMenuBar menuBar
menuFile
JMenu menuFile
menuEdit
JMenu menuEdit
menuProject
JMenu menuProject
menuHelp
JMenu menuHelp
menuItemOpen
JMenuItem menuItemOpen
menuItemSave
JMenuItem menuItemSave
menuItemQuit
JMenuItem menuItemQuit
menuItemCut
JMenuItem menuItemCut
menuItemCopy
JMenuItem menuItemCopy
menuItemPaste
JMenuItem menuItemPaste
menuItemDiff
JMenuItem menuItemDiff
menuItemMerge
JMenuItem menuItemMerge
menuItemOptions
JMenuItem menuItemOptions
menuItemAbout
JMenuItem menuItemAbout
buttonOpen
JButton buttonOpen
buttonSave
JButton buttonSave
buttonPaste
JButton buttonPaste
buttonCopy
JButton buttonCopy
buttonCut
JButton buttonCut
buttonManDiff
JButton buttonManDiff
buttonMerge
JButton buttonMerge
buttonPrev
JButton buttonPrev
buttonNext
JButton buttonNext
buttonKeepLeft
JButton buttonKeepLeft
buttonKeepRight
JButton buttonKeepRight
buttonCloser
JButton buttonCloser
buttonUndoCloser
JButton buttonUndoCloser
buttonTogetherScrolling
JToggleButton buttonTogetherScrolling
progressGC
JProgressBar progressGC
buttonGC
JButton buttonGC
visualDiff
VisualDiff visualDiff
actionAdapter
UpidiffGUI.ActionAdapter actionAdapter
catalog
Catalog catalog
lock
Object lock
ispressedToggelButton
boolean ispressedToggelButton
scrollBarOld
JScrollBar scrollBarOld
scrollBarNew
JScrollBar scrollBarNew