ConflictEditor: revision graph

graph

less more | rev 29: (0) tip

implement resolving the conflict
Sun, 18 Sep 2011 19:06:59 +0200, by dirk
fix a bug with selection in the differences table
Sun, 18 Sep 2011 11:28:20 +0200, by dirk
the current conflict is an ObjectNode now so there's less need for casts
Sun, 18 Sep 2011 11:27:55 +0200, by dirk
wire up the current value, conflict value and preview buttons
Sun, 18 Sep 2011 11:00:16 +0200, by dirk
pull the buttons into their own panel so they can be activated/deactivated in a single operation
Sun, 18 Sep 2011 10:13:48 +0200, by dirk
change column names
Sun, 18 Sep 2011 09:40:58 +0200, by dirk
do not use findValue as it searches recursively. This is not what we want in all the cases findValue was used before.
Sun, 18 Sep 2011 09:37:40 +0200, by dirk
directly compare the JsonNode objects that are returned as values for a given field name. Difference needs to preserve them so that the JsonNodes can be used when merging conflict JSON documents later.
Sun, 18 Sep 2011 09:35:43 +0200, by dirk
toString of Difference should properly quote the values and not quote null fields.
Sat, 17 Sep 2011 09:28:13 +0200, by dirk
helper class for playing around with JSON
Sat, 17 Sep 2011 09:22:30 +0200, by dirk
better assertions
Sat, 17 Sep 2011 07:10:23 +0200, by dirk
implement hashCode and equals for Difference
Sat, 17 Sep 2011 07:05:41 +0200, by dirk
tighten up checks
Sat, 17 Sep 2011 06:55:38 +0200, by dirk
clean code!
Sat, 17 Sep 2011 06:49:13 +0200, by dirk
generate differences for missing keys either in the original document or in the conflicting document.
Fri, 16 Sep 2011 17:03:57 +0200, by dirk
implement a test case for DocumentMatcher that covers the currently implemented cases
Fri, 16 Sep 2011 11:38:15 +0200, by dirk
add button panel
Tue, 13 Sep 2011 08:24:35 +0200, by Dirk Olmes
clean code: pull build/create methods apart
Tue, 13 Sep 2011 04:10:29 +0200, by Dirk Olmes
switch to GridBagLayout
Tue, 13 Sep 2011 03:29:11 +0200, by 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:33:01 +0200, by Dirk Olmes
Clean up connecting the widgets
Tue, 13 Sep 2011 02:20:11 +0200, by Dirk Olmes
rename the button to find conflicts
Tue, 13 Sep 2011 02:07:14 +0200, by Dirk Olmes
ignore unwanted files
Tue, 13 Sep 2011 01:55:28 +0200, by Dirk Olmes
use a special table cell renderer that displays otherwise hidden special characters (\n for now)
Mon, 12 Sep 2011 15:58:20 +0200, by Dirk Olmes
group the conflicts list and the differences table in a split view
Mon, 12 Sep 2011 15:50:00 +0200, by Dirk Olmes
implement exception handling listeners, when selecting a conflict document, display all differences
Mon, 12 Sep 2011 14:27:04 +0200, by Dirk Olmes
retrieve conflicts and show them in a very simple form in a JList
Mon, 12 Sep 2011 13:49:42 +0200, by Dirk Olmes
basic GUI (not yet connected) for connecting to a DB and showing conflicts
Mon, 12 Sep 2011 13:31:59 +0200, by Dirk Olmes
use a Difference object to describe the diff
Mon, 12 Sep 2011 12:03:28 +0200, by Dirk Olmes
first drop of the conflict editor - mostly model work
Mon, 12 Sep 2011 11:47:48 +0200, by Dirk Olmes

less more | rev 29: (0) tip