ConflictEditor: revision graph

graph

less more | rev 15: (0) -10 -8 +8 +10 tip

generate differences for missing keys either in the original document or in the conflicting document.
2011-09-16, by dirk
implement a test case for DocumentMatcher that covers the currently implemented cases
2011-09-16, by dirk
add button panel
2011-09-13, by Dirk Olmes
clean code: pull build/create methods apart
2011-09-13, by Dirk Olmes
switch to GridBagLayout
2011-09-13, 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.
2011-09-13, by Dirk Olmes
Clean up connecting the widgets
2011-09-13, by Dirk Olmes
rename the button to find conflicts
2011-09-13, by Dirk Olmes

less more | rev 15: (0) -10 -8 +8 +10 tip