svn commit: r1765528 - /poi/trunk/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java

[onealj]

Author: onealj
Date: Wed Oct 19 05:00:07 2016
New Revision: 1765528

URL: http://svn.apache.org/viewvc?rev=1765528&view=rev
Log:
remove java.nio.charset.StandardCharsets which is not available until Java 7

Modified:
    poi/trunk/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java

Modified: poi/trunk/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java?rev=1765528&r1=1765527&r2=1765528&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java 
(original)
+++ poi/trunk/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java Wed Oct 
19 05:00:07 2016
@@ -29,7 +29,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.PushbackInputStream;
 import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.zip.ZipEntry;
@@ -55,6 +54,8 @@ import org.apache.poi.util.RLEDecompress
 public class VBAMacroReader implements Closeable {
     protected static final String VBA_PROJECT_OOXML = "vbaProject.bin";
     protected static final String VBA_PROJECT_POIFS = "VBA";
+    // FIXME: When minimum supported version is Java 7, replace with 
java.nio.charset.StandardCharsets.UTF_16LE
+    private static final UTF_16LE = Charset.forName("UTF-16LE");
     
     private NPOIFSFileSystem fs;
     
@@ -350,6 +351,6 @@ public class VBAMacroReader implements C
     private String readUnicodeString(RLEDecompressingInputStream in, int 
unicodeNameRecordLength) throws IOException {
         byte[] buffer = new byte[unicodeNameRecordLength];
         IOUtils.readFully(in, buffer);
-        return new String(buffer, Charset.forName("UTF-16LE"));
+        return new String(buffer, UTF_16LE);
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org