Re: [jopendocument] ant build fails with name clash on debian

2014-06-20 Thread Sylvain Cuaz

Le 17/06/2014 17:15, Manfred Hanke a écrit :


Hi,

I also got that error and once resolved it with the following patch:


Hi,

I've also renamed it in the trunk, it will be in the next release.

Cheers,
Sylvain


--

--- 
You received this message because you are subscribed to the Google Groups jOpenDocument group.

To unsubscribe from this group and stop receiving emails from it, send an email 
to jopendocument+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[jopendocument] ant build fails with name clash on debian

2014-06-17 Thread Pirate Praveen
Hi,

We are packaging jOpenDocument for debian and got this build error. Can
you help fixing this?

Thanks
Praveen

 javac -version
javac 1.7.0_55

junit is 4.11, ant is 1.9.4

[javac]
/home/pravi/forge/gnukhata/tmp/jOpenDocument/src/org/jopendocument/dom/Library.java:649:
error: name clash: VcanBeMerged(MapString,V,MapString,V) in
EmbeddedLibrary and canBeMerged(MapString,Library,MapString,Library)
in Library have the same erasure, yet neither hides the other
[javac] static private final V boolean canBeMerged(final
MapString, V m1, final MapString, V m2) {
[javac]  ^
[javac]   where V is a type-variable:
[javac] V extends Object declared in method
VcanBeMerged(MapString,V,MapString,V)



signature.asc
Description: OpenPGP digital signature


Re: [jopendocument] ant build fails with name clash on debian

2014-06-17 Thread Manfred Hanke
Hi,

I also got that error and once resolved it with the following patch:

--- a/src/org/jopendocument/dom/Library.java
+++ b/src/org/jopendocument/dom/Library.java
@@ -643,10 +643,10 @@ public abstract class Library {
 final EmbeddedLibrary other = (EmbeddedLibrary) obj;
 if (this.passwordProtected != other.passwordProtected)
 return false;
-return canBeMerged(this.modules, other.modules) 
canBeMerged(this.dialogs, other.dialogs);
+return canBeMerged2(this.modules, other.modules) 
canBeMerged2(this.dialogs, other.dialogs);
 }

-static private final V boolean canBeMerged(final
MapString, V m1, final MapString, V m2) {
+static private final V boolean canBeMerged2(final
MapString, V m1, final MapString, V m2) {
 final SetString duplicateKeys =
CollectionUtils.inter(m1.keySet(), m2.keySet());
 for (final String key : duplicateKeys) {
 final V v1 = m1.get(key);



Cheers,

Manfred


On 17.06.2014 16:13, Pirate Praveen wrote:
 Hi,
 
 We are packaging jOpenDocument for debian and got this build error.
 Can you help fixing this?
 
 Thanks Praveen
 
 javac -version javac 1.7.0_55
 
 junit is 4.11, ant is 1.9.4
 
 [javac] 
 /home/pravi/forge/gnukhata/tmp/jOpenDocument/src/org/jopendocument/dom/Library.java:649:

 
error: name clash: VcanBeMerged(MapString,V,MapString,V) in
 EmbeddedLibrary and
 canBeMerged(MapString,Library,MapString,Library) in Library
 have the same erasure, yet neither hides the other [javac]
 static private final V boolean canBeMerged(final MapString, V
 m1, final MapString, V m2) { [javac]
 ^ [javac]   where V is a type-variable: [javac] V extends
 Object declared in method 
 VcanBeMerged(MapString,V,MapString,V)
 

-- 
Dr. Manfred Hanke * manfred.ha...@tngtech.com * +49-176-17654618
TNG Technology Consulting GmbH, Betastr. 13a, 85774 Unterföhring
Geschäftsführer: Henrik Klagges, Gerhard Müller, Christoph Stock
Sitz: Unterföhring * Amtsgericht München * HRB 135082

-- 

--- 
You received this message because you are subscribed to the Google Groups 
jOpenDocument group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to jopendocument+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.