30 May
2012
30 May
'12
2:32 p.m.
On May 30, 2012, at 2:28 PM, Vincent Massol wrote:
On May 30, 2012, at 2:18 PM, Eduard Moraru wrote:
Sorry, just realized you wrote "but not limited to" ;)
I'll let Thomas reply since I don't know this diff api yet….
Sorry for the noise
-Vincent
Hi Thomas,
On Tue, May 29, 2012 at 5:07 PM, Thomas Mortagne
<thomas.mortagne(a)xwiki.com>wrote;wrote:
Thomas is proposing a Java API here AFAIK. For Velocity we never expose java API
directly; we use Script Services for that. Hi devs,
As I said in another mail I'm working on a diff/merge module to use in
XWiki, the first target being Extension Manager and document history
(since both are going to use the same code, see Marius mails).
You can see the detail on https://github.com/xwiki/xwiki-commons/pull/2.
TODO/QUESTIONS:
* improve the generic 3 ways merge to be at least as good as the
List<String> 3 ways merge and get rid of JDiff
* not sure where/if I should put String related helpers (things that
do a diff on two String instead of having to cut List<String> or
List<Character> and call the diff API etc.)
This looks a bit awkward to use, specially from (but not limited to)
Velocity. When I think of a diff service API, I imagine passing Strings,
not lists of composing strings or list of characters.
Thanks
-Vincent
PS: FTR I'm a big -1 to model our Java APIs to be easily usable from Velocity since
that means having suboptimal APIs for the wrong reason ;)
> Also, I don`t quite understand the List<String> approach. I can imagine the
> List<Character> version by breaking a string into characters, but what
> would you do for List<String>? You would split a String using "\s" as
a
> separator?
>
> Can you please mention a use case where a list oriented API is better than
> a string based one?
>
> Thanks,
> Eduard
>
>>
>> I'm ready to merge it into master so I'm waiting your vote.
>>
>> Caleb is it OK to put new stuff in master already or should I wait the
>> complete release to be done ?
>>
>> Here is my +1.
>>
>> Thanks,
>> --
>> Thomas Mortagne