Bug#745080: cadencii: FTBFS with Java 8: reference to Base64 is ambiguous

[Emmanuel Bourg]

Control: tags -1 patch

Here is a patch fixing this issue.


Description: Fix a build failure with Java 8
Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: no
--- a/Cadencii/ClipboardModel.cs
+++ b/Cadencii/ClipboardModel.cs
@@ -70,7 +70,7 @@
 
                     byte[] arr = outputStream.toByteArray();
 #if JAVA
-                    str = CLIP_PREFIX + ":" + obj.getClass().getName() + ":" + 
Base64.encode( arr );
+                    str = CLIP_PREFIX + ":" + obj.getClass().getName() + ":" + 
org.kbinani.Base64.encode( arr );
 #else
                     str = CLIP_PREFIX + ":" + obj.GetType().FullName + ":" + 
Base64.encode( arr );
 #endif
@@ -91,7 +91,7 @@
                         Object ret = null;
                         try
                         {
-                            ByteArrayInputStream bais = new 
ByteArrayInputStream( Base64.decode( str.sub( s, index + 1 ) ) );
+                            ByteArrayInputStream bais = new 
ByteArrayInputStream( org.kbinani.Base64.decode( str.sub( s, index + 1 ) ) );
                             ObjectInputStream ois = new ObjectInputStream( 
bais );
                             ret = ois.readObject();
                         }

signature.asc
Description: OpenPGP digital signature