| Fri, 07 Oct 2011 05:41:53 +0200 |
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 03:58:41 +0200 |
dirk |
replace the text field for the db url with a combo box that is populated from the preferences.
|
| Tue, 20 Sep 2011 17:47:59 +0200 |
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:21:03 +0200 |
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:00:45 +0200 |
dirk |
Implement HttpAccess using Apache's HTTP components. This works much better in conjunction with UTF-8 encoded JSON
|
| Tue, 20 Sep 2011 16:18:42 +0200 |
dirk |
as per Jackson recommendation, don't use Reader objects but instead use just plain input stream
|
| Sun, 18 Sep 2011 19:06:59 +0200 |
dirk |
implement resolving the conflict
|
| Sun, 18 Sep 2011 11:28:20 +0200 |
dirk |
fix a bug with selection in the differences table
|
| Sun, 18 Sep 2011 11:27:55 +0200 |
dirk |
the current conflict is an ObjectNode now so there's less need for casts
|
| Sun, 18 Sep 2011 11:00:16 +0200 |
dirk |
wire up the current value, conflict value and preview buttons
|
| Sun, 18 Sep 2011 10:13:48 +0200 |
dirk |
pull the buttons into their own panel so they can be activated/deactivated in a single operation
|
| Sun, 18 Sep 2011 09:40:58 +0200 |
dirk |
change column names
|
| Sun, 18 Sep 2011 09:37:40 +0200 |
dirk |
do not use findValue as it searches recursively. This is not what we want in all the cases findValue was used before.
|
| Sun, 18 Sep 2011 09:35:43 +0200 |
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.
|
