Changeset 10618 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2016-07-23T23:54:27+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390 - Java 8: use java.util.Base64

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• Base64.java (deleted)
• bugreport/BugReportSender.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java

@@ -10 +10 @@
 import java.net.URL;
 import java.net.URLEncoder;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 
 import javax.swing.JOptionPane;
@@ -27 +25 @@
 import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
 import org.openstreetmap.josm.gui.widgets.UrlLabel;
-import org.openstreetmap.josm.tools.Base64;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.HttpClient;
@@ -84 +81 @@
         try {
             String text = Utils.strip(statusText);
-            ByteBuffer buffer = Charset.forName("UTF-8").encode(CharBuffer.wrap(text));
-            String pdata = Base64.encode(buffer, false);
+            String pdata = Base64.getEncoder().encodeToString(text.getBytes(StandardCharsets.UTF_8));
             String postQuery = "pdata=" + URLEncoder.encode(pdata, "UTF-8");
             HttpClient client = HttpClient.create(new URL(getJOSMTicketURL()), "POST")