- Timestamp:
- 2015-03-22T23:16:08+01:00 (10 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/com/kitfox/svg/SVGUniverse.java
r8084 r8149 62 62 import java.util.zip.GZIPInputStream; 63 63 import javax.imageio.ImageIO; 64 import javax.xml.bind.DatatypeConverter; 64 65 import org.xml.sax.EntityResolver; 65 66 import org.xml.sax.InputSource; … … 191 192 if (content.startsWith("base64")) 192 193 { 193 content = content.substring(6);194 194 try 195 195 { 196 byte[] buf = new sun.misc.BASE64Decoder().decodeBuffer(content);196 byte[] buf = DatatypeConverter.parseBase64Binary(content.substring(6)); 197 197 ByteArrayInputStream bais = new ByteArrayInputStream(buf); 198 198 BufferedImage img = ImageIO.read(bais); … … 214 214 215 215 return url; 216 } catch (IOException ex) 216 } 217 catch (IOException | IllegalArgumentException ex) 217 218 { 218 219 Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, -
trunk/src/com/kitfox/svg/app/data/Handler.java
r8084 r8149 45 45 import java.util.logging.Logger; 46 46 47 import javax.xml.bind.DatatypeConverter; 48 47 49 /** 48 50 * … … 67 69 if (content.startsWith("base64,")) 68 70 { 69 content = content.substring(7);70 71 try 71 72 { 72 buf = new sun.misc.BASE64Decoder().decodeBuffer(content);73 buf = DatatypeConverter.parseBase64Binary(content.substring(7)); 73 74 } 74 catch (I OException e)75 catch (IllegalArgumentException e) 75 76 { 76 77 Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e); -
trunk/src/oauth/signpost/signature/OAuthMessageSigner.java
r4231 r8149 17 17 import java.io.IOException; 18 18 import java.io.Serializable; 19 import javax.xml.bind.DatatypeConverter; 19 20 20 21 import oauth.signpost.exception.OAuthMessageSignerException; … … 22 23 import oauth.signpost.http.HttpParameters; 23 24 24 import org.apache.commons.codec.binary.Base64;25 26 25 public abstract class OAuthMessageSigner implements Serializable { 27 26 28 27 private static final long serialVersionUID = 4445779788786131202L; 29 30 private transient Base64 base64;31 28 32 29 private String consumerSecret; … … 34 31 private String tokenSecret; 35 32 36 public OAuthMessageSigner() {37 this.base64 = new Base64();38 }39 33 40 34 public abstract String sign(HttpRequest request, HttpParameters requestParameters) … … 60 54 61 55 protected byte[] decodeBase64(String s) { 62 return base64.decode(s.getBytes());56 return DatatypeConverter.parseBase64Binary(s); 63 57 } 64 58 65 59 protected String base64Encode(byte[] b) { 66 return new String(base64.encode(b));60 return DatatypeConverter.printBase64Binary(b); 67 61 } 68 62 … … 70 64 throws IOException, ClassNotFoundException { 71 65 stream.defaultReadObject(); 72 this.base64 = new Base64();73 66 } 74 67 } -
trunk/src/org/apache/commons
- Property svn:externals deleted
-
trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
r8126 r8149 57 57 import javax.swing.Icon; 58 58 import javax.swing.ImageIcon; 59 60 import org.apache.commons.codec.binary.Base64; 59 import javax.xml.bind.DatatypeConverter; 60 61 61 import org.openstreetmap.josm.Main; 62 62 import org.openstreetmap.josm.data.osm.OsmPrimitiveType; … … 824 824 byte[] bytes; 825 825 if (";base64".equals(base64)) { 826 bytes = Base64.decodeBase64(data);826 bytes = DatatypeConverter.parseBase64Binary(data); 827 827 } else { 828 828 try {
Note:
See TracChangeset
for help on using the changeset viewer.