Changeset 10746 in josm for trunk/src/com/kitfox

Timestamp:

2016-08-06T16:52:01+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390, see #11924 - replace javax.xml.bind.DatatypeConverter (not visible by default in Java 9) by java.util.Base64 (new in Java 8)

Location:

trunk/src/com/kitfox/svg

Files:

• SVGUniverse.java (modified) (3 diffs)
• app/data/Handler.java (modified) (2 diffs)

trunk/src/com/kitfox/svg/SVGUniverse.java

@@ -56 +56 @@
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -62 +63 @@
 import java.util.zip.GZIPInputStream;
 import javax.imageio.ImageIO;
-import javax.xml.bind.DatatypeConverter;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
@@ -195 +195 @@
                 try
                 {
-                    byte[] buf = DatatypeConverter.parseBase64Binary(content.substring(6));
+                    byte[] buf = Base64.getDecoder().decode(content.substring(6));
                     ByteArrayInputStream bais = new ByteArrayInputStream(buf);
                     BufferedImage img = ImageIO.read(bais);

trunk/src/com/kitfox/svg/app/data/Handler.java

@@ -42 +42 @@
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
+import java.util.Base64;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
-import javax.xml.bind.DatatypeConverter;
 
 /**
@@ -71 +70 @@
                 try
                 {
-                    buf = DatatypeConverter.parseBase64Binary(content.substring(7));
+                    buf = Base64.getDecoder().decode(content.substring(7));
                 }
                 catch (IllegalArgumentException e)