| Tue, 13 Sep 2011 08:24:35 +0200 |
Dirk Olmes |
add button panel
|
| Tue, 13 Sep 2011 04:10:29 +0200 |
Dirk Olmes |
clean code: pull build/create methods apart
|
| Tue, 13 Sep 2011 03:29:11 +0200 |
Dirk Olmes |
switch to GridBagLayout
|
| Tue, 13 Sep 2011 02:33:01 +0200 |
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.
|
| Tue, 13 Sep 2011 02:20:11 +0200 |
Dirk Olmes |
Clean up connecting the widgets
|
| Tue, 13 Sep 2011 02:07:14 +0200 |
Dirk Olmes |
rename the button to find conflicts
|
| Tue, 13 Sep 2011 01:55:28 +0200 |
Dirk Olmes |
ignore unwanted files
|
| Mon, 12 Sep 2011 15:58:20 +0200 |
Dirk Olmes |
use a special table cell renderer that displays otherwise hidden special characters (\n for now)
|
| Mon, 12 Sep 2011 15:50:00 +0200 |
Dirk Olmes |
group the conflicts list and the differences table in a split view
|
| Mon, 12 Sep 2011 14:27:04 +0200 |
Dirk Olmes |
implement exception handling listeners, when selecting a conflict document, display all differences
|
| Mon, 12 Sep 2011 13:49:42 +0200 |
Dirk Olmes |
retrieve conflicts and show them in a very simple form in a JList
|
| Mon, 12 Sep 2011 13:31:59 +0200 |
Dirk Olmes |
basic GUI (not yet connected) for connecting to a DB and showing conflicts
|
| Mon, 12 Sep 2011 12:03:28 +0200 |
Dirk Olmes |
use a Difference object to describe the diff
|
| Mon, 12 Sep 2011 11:47:48 +0200 |
Dirk Olmes |
first drop of the conflict editor - mostly model work
|
