ConflictEditor: revision graph

graph

less more | rev 42: (0) tip

bring up a message dialog if the selected database did not contain any conflicts default tip
2012-01-05, by dirk
add a site
2011-10-10, by Dirk Olmes
remove commented stuff
2011-10-09, by Dirk Olmes
add a module that generates a webstart package
2011-10-09, by Dirk Olmes
add a toplevel pom, make this a reactor build
2011-10-09, by Dirk Olmes
add a comment why we discard the index here
2011-10-07, by 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, by 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, by dirk
replace the text field for the db url with a combo box that is populated from the preferences.
2011-10-07, by dirk
remove the selected conflict after saving - does not fully work yet, e.g. does not proplerly reset the differences table
2011-09-20, by dirk
do not blindly cast to Component ... the source of the event may be some arbitrary object (e.g. a model)
2011-09-20, by dirk
Implement HttpAccess using Apache's HTTP components. This works much better in conjunction with UTF-8 encoded JSON
2011-09-20, by dirk
as per Jackson recommendation, don't use Reader objects but instead use just plain input stream
2011-09-20, by dirk
implement resolving the conflict
2011-09-18, by dirk
fix a bug with selection in the differences table
2011-09-18, by dirk
the current conflict is an ObjectNode now so there's less need for casts
2011-09-18, by dirk
wire up the current value, conflict value and preview buttons
2011-09-18, by dirk
pull the buttons into their own panel so they can be activated/deactivated in a single operation
2011-09-18, by dirk
change column names
2011-09-18, by 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, 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.
2011-09-18, by dirk
toString of Difference should properly quote the values and not quote null fields.
2011-09-17, by dirk
helper class for playing around with JSON
2011-09-17, by dirk
better assertions
2011-09-17, by dirk
implement hashCode and equals for Difference
2011-09-17, by dirk
tighten up checks
2011-09-17, by dirk
clean code!
2011-09-17, by dirk
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
ignore unwanted files
2011-09-12, by Dirk Olmes
use a special table cell renderer that displays otherwise hidden special characters (\n for now)
2011-09-12, by Dirk Olmes
group the conflicts list and the differences table in a split view
2011-09-12, by Dirk Olmes
implement exception handling listeners, when selecting a conflict document, display all differences
2011-09-12, by Dirk Olmes
retrieve conflicts and show them in a very simple form in a JList
2011-09-12, by Dirk Olmes
basic GUI (not yet connected) for connecting to a DB and showing conflicts
2011-09-12, by Dirk Olmes
use a Difference object to describe the diff
2011-09-12, by Dirk Olmes
first drop of the conflict editor - mostly model work
2011-09-12, by Dirk Olmes

less more | rev 42: (0) tip