- Timestamp:
- 2016-08-06T16:52:01+02:00 (8 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/build.xml
r10730 r10746 403 403 <junit printsummary="yes" fork="true" forkmode="once"> 404 404 <jvmarg value="-Dfile.encoding=UTF-8"/> 405 <jvmarg line="-addmods java.xml.bind" if:set="isJava9" />406 405 <jvmarg value="-XaddExports:java.base/sun.security.util=ALL-UNNAMED" if:set="isJava9" /> 407 406 <jvmarg value="-XaddExports:java.base/sun.security.x509=ALL-UNNAMED" if:set="isJava9" /> 408 <jvmarg value="-XaddExports:java.xml.bind/javax.xml.bind=ALL-UNNAMED" if:set="isJava9" />409 407 <sysproperty key="josm.home" value="${test.dir}/config/@{testfamily}-josm.home"/> 410 408 <sysproperty key="josm.test.data" value="${test.dir}/data"/> -
trunk/src/com/kitfox/svg/SVGUniverse.java
r10741 r10746 56 56 import java.net.URL; 57 57 import java.util.ArrayList; 58 import java.util.Base64; 58 59 import java.util.HashMap; 59 60 import java.util.Iterator; … … 62 63 import java.util.zip.GZIPInputStream; 63 64 import javax.imageio.ImageIO; 64 import javax.xml.bind.DatatypeConverter;65 65 import javax.xml.parsers.ParserConfigurationException; 66 66 import javax.xml.parsers.SAXParserFactory; … … 195 195 try 196 196 { 197 byte[] buf = DatatypeConverter.parseBase64Binary(content.substring(6));197 byte[] buf = Base64.getDecoder().decode(content.substring(6)); 198 198 ByteArrayInputStream bais = new ByteArrayInputStream(buf); 199 199 BufferedImage img = ImageIO.read(bais); -
trunk/src/com/kitfox/svg/app/data/Handler.java
r8149 r10746 42 42 import java.net.URLConnection; 43 43 import java.net.URLStreamHandler; 44 import java.util.Base64; 44 45 import java.util.logging.Level; 45 46 import java.util.logging.Logger; 46 47 import javax.xml.bind.DatatypeConverter;48 47 49 48 /** … … 71 70 try 72 71 { 73 buf = DatatypeConverter.parseBase64Binary(content.substring(7));72 buf = Base64.getDecoder().decode(content.substring(7)); 74 73 } 75 74 catch (IllegalArgumentException e) -
trunk/src/oauth/signpost/signature/OAuthMessageSigner.java
r8149 r10746 17 17 import java.io.IOException; 18 18 import java.io.Serializable; 19 import java x.xml.bind.DatatypeConverter;19 import java.util.Base64; 20 20 21 21 import oauth.signpost.exception.OAuthMessageSignerException; … … 54 54 55 55 protected byte[] decodeBase64(String s) { 56 return DatatypeConverter.parseBase64Binary(s);56 return Base64.getDecoder().decode(s); 57 57 } 58 58 59 59 protected String base64Encode(byte[] b) { 60 return DatatypeConverter.printBase64Binary(b);60 return Base64.getEncoder().encodeToString(b); 61 61 } 62 62 -
trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
r10741 r10746 32 32 import java.util.ArrayList; 33 33 import java.util.Arrays; 34 import java.util.Base64; 34 35 import java.util.Collection; 35 36 import java.util.HashMap; … … 55 56 import javax.imageio.stream.ImageInputStream; 56 57 import javax.swing.ImageIcon; 57 import javax.xml.bind.DatatypeConverter;58 58 import javax.xml.parsers.ParserConfigurationException; 59 59 … … 951 951 byte[] bytes; 952 952 if (";base64".equals(base64)) { 953 bytes = DatatypeConverter.parseBase64Binary(data);953 bytes = Base64.getDecoder().decode(data); 954 954 } else { 955 955 try {
Note:
See TracChangeset
for help on using the changeset viewer.