Changeset 8149 in josm for trunk/src

Timestamp:

2015-03-22T23:16:08+01:00 (9 years ago)

Author:

stoecker

Message:

fix #11257 - Remove apache.commons.codecs - patch by Florian Schaefer

Location:

trunk/src

Files:

• com/kitfox/svg/SVGUniverse.java (modified) (3 diffs)
• com/kitfox/svg/app/data/Handler.java (modified) (2 diffs)
• oauth/signpost/signature/OAuthMessageSigner.java (modified) (5 diffs)
• org/apache/commons (modified) (1 prop)
• org/openstreetmap/josm/tools/ImageProvider.java (modified) (2 diffs)

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

@@ -62 +62 @@
 import java.util.zip.GZIPInputStream;
 import javax.imageio.ImageIO;
+import javax.xml.bind.DatatypeConverter;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
@@ -191 +192 @@
             if (content.startsWith("base64"))
             {
-                content = content.substring(6);
                 try
                 {
-                    byte[] buf = new sun.misc.BASE64Decoder().decodeBuffer(content);
+                    byte[] buf = DatatypeConverter.parseBase64Binary(content.substring(6));
                     ByteArrayInputStream bais = new ByteArrayInputStream(buf);
                     BufferedImage img = ImageIO.read(bais);
@@ -214 +214 @@
 
                     return url;
-                } catch (IOException ex)
+                }
+                catch (IOException | IllegalArgumentException ex)
                 {
                     Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING,

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

@@ -45 +45 @@
 import java.util.logging.Logger;
 
+import javax.xml.bind.DatatypeConverter;
+
 /**
  *
@@ -67 +69 @@
             if (content.startsWith("base64,"))
             {
-                content = content.substring(7);
                 try
                 {
-                    buf = new sun.misc.BASE64Decoder().decodeBuffer(content);
+                    buf = DatatypeConverter.parseBase64Binary(content.substring(7));
                 }
-                catch (IOException e)
+                catch (IllegalArgumentException e)
                 {
                     Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e);

trunk/src/oauth/signpost/signature/OAuthMessageSigner.java

@@ -17 +17 @@
 import java.io.IOException;
 import java.io.Serializable;
+import javax.xml.bind.DatatypeConverter;
 
 import oauth.signpost.exception.OAuthMessageSignerException;
@@ -22 +23 @@
 import oauth.signpost.http.HttpParameters;
 
-import org.apache.commons.codec.binary.Base64;
-
 public abstract class OAuthMessageSigner implements Serializable {
 
     private static final long serialVersionUID = 4445779788786131202L;
-
-    private transient Base64 base64;
 
     private String consumerSecret;
@@ -34 +31 @@
     private String tokenSecret;
 
-    public OAuthMessageSigner() {
-        this.base64 = new Base64();
-    }
 
     public abstract String sign(HttpRequest request, HttpParameters requestParameters)
@@ -60 +54 @@
 
     protected byte[] decodeBase64(String s) {
-        return base64.decode(s.getBytes());
+        return DatatypeConverter.parseBase64Binary(s);
     }
 
     protected String base64Encode(byte[] b) {
-        return new String(base64.encode(b));
+        return DatatypeConverter.printBase64Binary(b);
     }
 
@@ -70 +64 @@
             throws IOException, ClassNotFoundException {
         stream.defaultReadObject();
-        this.base64 = new Base64();
     }
 }

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -57 +57 @@
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
-
-import org.apache.commons.codec.binary.Base64;
+import javax.xml.bind.DatatypeConverter;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -824 +824 @@
                 byte[] bytes;
                 if (";base64".equals(base64)) {
-                    bytes = Base64.decodeBase64(data);
+                    bytes = DatatypeConverter.parseBase64Binary(data);
                 } else {
                     try {