log
graph
tags
bookmarks
branches
changeset
browse
zip
help
Mercurial
>
hg
>
ConflictEditor
log
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
less
more
| rev 15:
(0)
tip
age
author
description
2011-09-16
dirk
generate differences for missing keys either in the original document or in the conflicting document.
2011-09-16
dirk
implement a test case for DocumentMatcher that covers the currently implemented cases
2011-09-13
Dirk Olmes
add button panel
2011-09-13
Dirk Olmes
clean code: pull build/create methods apart
2011-09-13
Dirk Olmes
switch to GridBagLayout
2011-09-13
Dirk Olmes
clean up: ConflictEditor should only contain code that mediates between the various GUI elements. The logic for dealing with conflicts moves to ConflictEditorController.
2011-09-13
Dirk Olmes
Clean up connecting the widgets
2011-09-13
Dirk Olmes
rename the button to find conflicts
2011-09-12
Dirk Olmes
ignore unwanted files
2011-09-12
Dirk Olmes
use a special table cell renderer that displays otherwise hidden special characters (\n for now)
2011-09-12
Dirk Olmes
group the conflicts list and the differences table in a split view
2011-09-12
Dirk Olmes
implement exception handling listeners, when selecting a conflict document, display all differences
2011-09-12
Dirk Olmes
retrieve conflicts and show them in a very simple form in a JList
2011-09-12
Dirk Olmes
basic GUI (not yet connected) for connecting to a DB and showing conflicts
2011-09-12
Dirk Olmes
use a Difference object to describe the diff
2011-09-12
Dirk Olmes
first drop of the conflict editor - mostly model work
less
more
| rev 15:
(0)
tip