git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compat fix for Java 1.6 (unused "import")
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
utils
/
StringUtils.java
diff --git
a/src/be/nikiroo/utils/StringUtils.java
b/src/be/nikiroo/utils/StringUtils.java
index 993f62b386f2c32da01e4987ed0aa47d5b28aae0..ed3c630e94b076d9e1a6d32fe0a7016130530af0 100644
(file)
--- a/
src/be/nikiroo/utils/StringUtils.java
+++ b/
src/be/nikiroo/utils/StringUtils.java
@@
-15,7
+15,6
@@
import java.text.Normalizer;
import java.text.Normalizer.Form;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.text.Normalizer.Form;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.Base64;
import java.util.Date;
import java.util.regex.Pattern;
import java.util.Date;
import java.util.regex.Pattern;
@@
-222,7
+221,7
@@
public class StringUtils {
ImageIO.write(image, "jpeg", out);
byte[] imageBytes = out.toByteArray();
ImageIO.write(image, "jpeg", out);
byte[] imageBytes = out.toByteArray();
- imageString = new String(Base64.
getEncoder().encode
(imageBytes));
+ imageString = new String(Base64.
encodeBytes
(imageBytes));
out.close();
out.close();
@@
-254,7
+253,7
@@
public class StringUtils {
out.flush();
in.close();
out.flush();
in.close();
- fileString = new String(Base64.
getEncoder().encode
(out.toByteArray()));
+ fileString = new String(Base64.
encodeBytes
(out.toByteArray()));
out.close();
return fileString;
out.close();
return fileString;
@@
-273,8
+272,8
@@
public class StringUtils {
* in case of IO error
*/
static public BufferedImage toImage(String b64data) throws IOException {
* in case of IO error
*/
static public BufferedImage toImage(String b64data) throws IOException {
- ByteArrayInputStream in = new ByteArrayInputStream(
Base64.getDecoder()
- .decode(b64data));
+ ByteArrayInputStream in = new ByteArrayInputStream(
+
Base64
.decode(b64data));
return toImage(in);
}
return toImage(in);
}