1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
Description: Fix a build failure with Java 8
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
Index: cadencii-3.3.9+svn20110818.r1732/Cadencii/ClipboardModel.cs
===================================================================
--- cadencii-3.3.9+svn20110818.r1732.orig/Cadencii/ClipboardModel.cs
+++ cadencii-3.3.9+svn20110818.r1732/Cadencii/ClipboardModel.cs
@@ -70,7 +70,7 @@ namespace org
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 @@ namespace org
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();
}
|
