ConflictEditor: revision graph

graph

less more | rev 39: (0) -14 tip

add a module that generates a webstart package
Sun, 09 Oct 2011 08:15:11 +0200, by Dirk Olmes
add a toplevel pom, make this a reactor build
Sun, 09 Oct 2011 07:29:59 +0200, by Dirk Olmes
add a comment why we discard the index here
Fri, 07 Oct 2011 05:59:38 +0200, 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.
Fri, 07 Oct 2011 05:55:30 +0200, 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.
Fri, 07 Oct 2011 05:41:53 +0200, by dirk
replace the text field for the db url with a combo box that is populated from the preferences.
Fri, 07 Oct 2011 03:58:41 +0200, by dirk
remove the selected conflict after saving - does not fully work yet, e.g. does not proplerly reset the differences table
Tue, 20 Sep 2011 17:47:59 +0200, by dirk
do not blindly cast to Component ... the source of the event may be some arbitrary object (e.g. a model)
Tue, 20 Sep 2011 17:21:03 +0200, by dirk
Implement HttpAccess using Apache's HTTP components. This works much better in conjunction with UTF-8 encoded JSON
Tue, 20 Sep 2011 17:00:45 +0200, by dirk
as per Jackson recommendation, don't use Reader objects but instead use just plain input stream
Tue, 20 Sep 2011 16:18:42 +0200, by dirk
implement resolving the conflict
Sun, 18 Sep 2011 19:06:59 +0200, by dirk
fix a bug with selection in the differences table
Sun, 18 Sep 2011 11:28:20 +0200, by dirk
the current conflict is an ObjectNode now so there's less need for casts
Sun, 18 Sep 2011 11:27:55 +0200, by dirk
wire up the current value, conflict value and preview buttons
Sun, 18 Sep 2011 11:00:16 +0200, by dirk

less more | rev 39: (0) -14 tip