Mercurial > hg > ConflictEditor
graph
-
helper class for playing around with JSONSat, 17 Sep 2011 09:22:30 +0200, by dirk
-
better assertionsSat, 17 Sep 2011 07:10:23 +0200, by dirk
-
implement hashCode and equals for DifferenceSat, 17 Sep 2011 07:05:41 +0200, by dirk
-
tighten up checksSat, 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 casesFri, 16 Sep 2011 11:38:15 +0200, by dirk
-
add button panelTue, 13 Sep 2011 08:24:35 +0200, by Dirk Olmes
-
clean code: pull build/create methods apartTue, 13 Sep 2011 04:10:29 +0200, by Dirk Olmes
-
switch to GridBagLayoutTue, 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 widgetsTue, 13 Sep 2011 02:20:11 +0200, by Dirk Olmes
-
rename the button to find conflictsTue, 13 Sep 2011 02:07:14 +0200, by Dirk Olmes
-
ignore unwanted filesTue, 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 viewMon, 12 Sep 2011 15:50:00 +0200, by Dirk Olmes