ConflictEditor: log

age	author	description
2011-09-18	dirk	wire up the current value, conflict value and preview buttons
2011-09-18	dirk	pull the buttons into their own panel so they can be activated/deactivated in a single operation
2011-09-18	dirk	change column names
2011-09-18	dirk	do not use findValue as it searches recursively. This is not what we want in all the cases findValue was used before.
2011-09-18	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.
2011-09-17	dirk	toString of Difference should properly quote the values and not quote null fields.
2011-09-17	dirk	helper class for playing around with JSON
2011-09-17	dirk	better assertions
2011-09-17	dirk	implement hashCode and equals for Difference
2011-09-17	dirk	tighten up checks
2011-09-17	dirk	clean code!
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

Mercurial > hg > ConflictEditor