Skip to content

Commit eeb7eb4

Browse files
committed
Base64 is available in JDK 8
1 parent 65cd080 commit eeb7eb4

File tree

2 files changed

+5
-264
lines changed

2 files changed

+5
-264
lines changed

visualvm/core/src/com/sun/tools/visualvm/core/datasupport/Base64.java

Lines changed: 0 additions & 260 deletions
This file was deleted.

visualvm/core/src/com/sun/tools/visualvm/core/datasupport/Utils.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import java.io.FileOutputStream;
3636
import java.io.InputStream;
3737
import java.util.ArrayList;
38+
import java.util.Base64;
3839
import java.util.Collection;
3940
import java.util.Collections;
4041
import java.util.Enumeration;
@@ -431,7 +432,7 @@ public static File extractArchive(File archive, File destination) {
431432
* @return encoded String.
432433
*/
433434
public static String encodePassword(String value) {
434-
return Base64.byteArrayToBase64(value.getBytes());
435+
return Base64.getEncoder().encodeToString(value.getBytes());
435436
}
436437

437438
/**
@@ -441,7 +442,7 @@ public static String encodePassword(String value) {
441442
* @return decoded String.
442443
*/
443444
public static String decodePassword(String value) {
444-
return new String(Base64.base64ToByteArray(value));
445+
return new String(Base64.getDecoder().decode(value));
445446
}
446447

447448
/**
@@ -456,7 +457,7 @@ public static String decodePassword(String value) {
456457
*/
457458
public static String imageToString(Image image, String format) {
458459
byte[] imageBytes = imageToBytes(image, format);
459-
return imageBytes != null ? Base64.byteArrayToBase64(imageBytes) : null;
460+
return imageBytes != null ? Base64.getEncoder().encodeToString(imageBytes) : null;
460461
}
461462

462463
/**
@@ -466,7 +467,7 @@ public static String imageToString(Image image, String format) {
466467
* @return decoded Image.
467468
*/
468469
public static Image stringToImage(String string) {
469-
return Toolkit.getDefaultToolkit().createImage(Base64.base64ToByteArray(string));
470+
return Toolkit.getDefaultToolkit().createImage(Base64.getDecoder().decode(string));
470471
}
471472

472473
private static BufferedImage imageToBuffered(Image image) {

0 commit comments

Comments
 (0)