Mercurial > hg > ConflictEditor

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 42: (0) -30 tip
age author description
2012-01-05 dirk bring up a message dialog if the selected database did not contain any conflicts default tip
2011-10-10 Dirk Olmes add a site
2011-10-09 Dirk Olmes remove commented stuff
2011-10-09 Dirk Olmes add a module that generates a webstart package
2011-10-09 Dirk Olmes add a toplevel pom, make this a reactor build
2011-10-07 dirk add a comment why we discard the index here
2011-10-07 dirk do not use the selection index in conflict list from the event, get it from the list instead. If the selection is cleared in the list, the event will report a wrong index.
2011-10-07 dirk do not use a custom combo box model, instead fill a default one from preferences and attach an action listener to the combo that ensures that yet unknown database URLs will be stored in preferences.
2011-10-07 dirk replace the text field for the db url with a combo box that is populated from the preferences.
2011-09-20 dirk remove the selected conflict after saving - does not fully work yet, e.g. does not proplerly reset the differences table
2011-09-20 dirk do not blindly cast to Component ... the source of the event may be some arbitrary object (e.g. a model)
2011-09-20 dirk Implement HttpAccess using Apache's HTTP components. This works much better in conjunction with UTF-8 encoded JSON
2011-09-20 dirk as per Jackson recommendation, don't use Reader objects but instead use just plain input stream
2011-09-18 dirk implement resolving the conflict
2011-09-18 dirk fix a bug with selection in the differences table
2011-09-18 dirk the current conflict is an ObjectNode now so there's less need for casts
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
less more | rev 42: (0) -30 tip