Mercurial > hg > ConflictEditor
log
| age | author | description |
|---|---|---|
| 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 |