WebSVN - OpenConcerto - Diff - Rev 17 and 180 - /trunk/OpenConcerto/src/org/openconcerto/utils/Base64.java

  * consolidated and cleaner. The code now detects when data that's being decoded is gzip-compressed
  * and will decompress it automatically. Generally things are cleaner. You'll probably have to
  * change some method calls that you were making to support the new options format (<tt>int</tt>s
  * that you "OR" together).</li>
  * <li>v1.5.1 - Fixed bug when decompressing and decoding to a byte[] using
- * <tt>decode( String s, boolean gzipCompressed )</tt>. Added the ability to "suspend" encoding
+ * <tt>decode( String s, boolean gzipCompressed )</tt>. Added the ability to "suspend" encoding in
- * in the Output Stream so you can turn on and off the encoding if you need to embed base64 data in
+ * the Output Stream so you can turn on and off the encoding if you need to embed base64 data in an
- * an otherwise "normal" stream (like an XML file).</li>
+ * otherwise "normal" stream (like an XML file).</li>
- * <li>v1.5 - Output stream pases on flush() command but doesn't do anything itself. This helps
+ * <li>v1.5 - Output stream pases on flush() command but doesn't do anything itself. This helps when
- * when using GZIP streams. Added the ability to GZip-compress objects before encoding them.</li>
+ * using GZIP streams. Added the ability to GZip-compress objects before encoding them.</li>
  * <li>v1.4 - Added helper methods to read/write files.</li>
  * <li>v1.3.6 - Fixed OutputStream.flush() so that 'position' is reset.</li>
  * <li>v1.3.5 - Added flag to turn on and off line breaks. Fixed bug in input stream where last
  * buffer being read, if not completely full, was not returned.</li>
  * <li>v1.3.4 - Fixed when "improperly padded stream" error was thrown at the wrong time.</li>
  * <li>v1.3.3 - Fixed I/O streams which were totally messed up.</li>
  * </ul>
+ *
  * <p>
  * I am placing this code in the Public Domain. Do with it as you will. This software comes with no
- * guarantees or warranties but with plenty of well-wishing instead! Please visit <a
+ * guarantees or warranties but with plenty of well-wishing instead! Please visit
- * href="http://iharder.net/base64">http://iharder.net/base64</a> periodically to check for updates
+ * <a href="http://iharder.net/base64">http://iharder.net/base64</a> periodically to check for
- * or to contribute improvements.
+ * updates or to contribute improvements.
  * </p>
+ *
  * @author Robert Harder
  * @author rob@iharder.net
  * @version 2.1
     private final static String PREFERRED_ENCODING = "UTF-8";
     /** The 64 valid Base64 values. */
     private final static byte[] ALPHABET;
     private final static byte[] _NATIVE_ALPHABET = /* May be something funny like EBCDIC */
-    { (byte) 'A', (byte) 'B', (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F', (byte) 'G', (byte) 'H', (byte) 'I', (byte) 'J', (byte) 'K', (byte) 'L', (byte) 'M', (byte) 'N', (byte) 'O', (byte) 'P',
+            { (byte) 'A', (byte) 'B', (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F', (byte) 'G', (byte) 'H', (byte) 'I', (byte) 'J', (byte) 'K', (byte) 'L', (byte) 'M', (byte) 'N', (byte) 'O',
-            (byte) 'Q', (byte) 'R', (byte) 'S', (byte) 'T', (byte) 'U', (byte) 'V', (byte) 'W', (byte) 'X', (byte) 'Y', (byte) 'Z', (byte) 'a', (byte) 'b', (byte) 'c', (byte) 'd', (byte) 'e',
+                    (byte) 'P', (byte) 'Q', (byte) 'R', (byte) 'S', (byte) 'T', (byte) 'U', (byte) 'V', (byte) 'W', (byte) 'X', (byte) 'Y', (byte) 'Z', (byte) 'a', (byte) 'b', (byte) 'c', (byte) 'd',
-            (byte) 'f', (byte) 'g', (byte) 'h', (byte) 'i', (byte) 'j', (byte) 'k', (byte) 'l', (byte) 'm', (byte) 'n', (byte) 'o', (byte) 'p', (byte) 'q', (byte) 'r', (byte) 's', (byte) 't',
+                    (byte) 'e', (byte) 'f', (byte) 'g', (byte) 'h', (byte) 'i', (byte) 'j', (byte) 'k', (byte) 'l', (byte) 'm', (byte) 'n', (byte) 'o', (byte) 'p', (byte) 'q', (byte) 'r', (byte) 's',
-            (byte) 'u', (byte) 'v', (byte) 'w', (byte) 'x', (byte) 'y', (byte) 'z', (byte) '0', (byte) '1', (byte) '2', (byte) '3', (byte) '4', (byte) '5', (byte) '6', (byte) '7', (byte) '8',
+                    (byte) 't', (byte) 'u', (byte) 'v', (byte) 'w', (byte) 'x', (byte) 'y', (byte) 'z', (byte) '0', (byte) '1', (byte) '2', (byte) '3', (byte) '4', (byte) '5', (byte) '6', (byte) '7',
-            (byte) '9', (byte) '+', (byte) '/' };
+                    (byte) '8', (byte) '9', (byte) '+', (byte) '/' };
     /** Determine which ALPHABET to use. */
     static {
         byte[] __bytes;
         try {
     /**
      * Encodes up to the first three bytes of array <var>threeBytes</var> and returns a four-byte
      * array in Base64 notation. The actual number of significant bytes in your array is given by
      * <var>numSigBytes</var>. The array <var>threeBytes</var> needs only be as big as
-     * <var>numSigBytes</var>. Code can reuse a byte array by passing a four-byte array as <var>b4</var>.
+     * <var>numSigBytes</var>. Code can reuse a byte array by passing a four-byte array as
+     * <var>b4</var>.
+     *
      * @param b4 A reusable byte array to reduce array instantiation
      * @param threeBytes the array to convert
      * @param numSigBytes the number of significant bytes in your array
      * @return four byte array in Base64 notation.
         encode3to4(threeBytes, 0, numSigBytes, b4, 0);
         return b4;
     } // end encode3to4
     /**
-     * Encodes up to three bytes of the array <var>source</var> and writes the resulting four
+     * Encodes up to three bytes of the array <var>source</var> and writes the resulting four Base64
-     * Base64 bytes to <var>destination</var>. The source and destination arrays can be manipulated
+     * bytes to <var>destination</var>. The source and destination arrays can be manipulated
      * anywhere along their length by specifying <var>srcOffset</var> and <var>destOffset</var>.
      * This method does not check to make sure your arrays are large enough to accomodate
-     * <var>srcOffset</var> + 3 for the <var>source</var> array or <var>destOffset</var> + 4 for
+     * <var>srcOffset</var> + 3 for the <var>source</var> array or <var>destOffset</var> + 4 for the
-     * the <var>destination</var> array. The actual number of significant bytes in your array is
+     * <var>destination</var> array. The actual number of significant bytes in your array is given
-     * given by <var>numSigBytes</var>.
+     * by <var>numSigBytes</var>.
+     *
      * @param source the array to convert
      * @param srcOffset the index where conversion begins
      * @param numSigBytes the number of significant bytes in your array
      * @param destination the array to hold the conversion
+     *
      * @param source The data to convert
      * @since 1.4
      */
     public static String encodeBytes(byte[] source) {
-        return encodeBytes(source, 0, source.length, NO_OPTIONS);
+        return encodeBytes(source, 0, source.length, DONT_BREAK_LINES);
     } // end encodeBytes
+    public static String encodeBytesBreakLines(byte[] source) {
+        return encodeBytes(source, NO_OPTIONS);
+    }
     /**
      * Encodes a byte array into Base64 notation.
      * <p>
      * Valid options:
+     *
      * @param off Offset in array where conversion should begin
      * @param len Length of data to convert
      * @since 1.4
      */
     public static String encodeBytes(byte[] source, int off, int len) {
-        return encodeBytes(source, off, len, NO_OPTIONS);
+        return encodeBytes(source, off, len, DONT_BREAK_LINES);
     } // end encodeBytes
+    public static String encodeBytesBreakLines(byte[] source, int off, int len) {
+        return encodeBytes(source, off, len, NO_OPTIONS);
+    }
     /**
      * Encodes a byte array into Base64 notation.
      * <p>
      * Valid options:
+     *
     /**
      * Decodes four bytes from array <var>source</var> and writes the resulting bytes (up to three
      * of them) to <var>destination</var>. The source and destination arrays can be manipulated
      * anywhere along their length by specifying <var>srcOffset</var> and <var>destOffset</var>.
      * This method does not check to make sure your arrays are large enough to accomodate
-     * <var>srcOffset</var> + 4 for the <var>source</var> array or <var>destOffset</var> + 3 for
+     * <var>srcOffset</var> + 4 for the <var>source</var> array or <var>destOffset</var> + 3 for the
-     * the <var>destination</var> array. This method returns the actual number of bytes that were
+     * <var>destination</var> array. This method returns the actual number of bytes that were
      * converted from the Base64 encoding.
+     *
+     *
      * @param source the array to convert
      * @param srcOffset the index where conversion begins
         return bytes;
     } // end decode
     /**
-     * Attempts to decode Base64 data and deserialize a Java Object within. Returns <tt>null</tt>
+     * Attempts to decode Base64 data and deserialize a Java Object within. Returns <tt>null</tt> if
-     * if there was an error.
+     * there was an error.
+     *
      * @param encodedObject The Base64 data to decode
      * @return The decoded and deserialized object
      * @since 1.5
      */
     } // end encodeFromFile
     /* ******** I N N E R C L A S S I N P U T S T R E A M ******** */
     /**
-     * A {@link Base64.InputStream} will read data from another <tt>java.io.InputStream</tt>,
+     * A {@link Base64.InputStream} will read data from another <tt>java.io.InputStream</tt>, given
-     * given in the constructor, and encode/decode to/from Base64 notation on the fly.
+     * in the constructor, and encode/decode to/from Base64 notation on the fly.
+     *
      * @see Base64
      * @since 1.3
      */
     public static class InputStream extends java.io.FilterInputStream {
     } // end inner class InputStream
     /* ******** I N N E R C L A S S O U T P U T S T R E A M ******** */
     /**
-     * A {@link Base64.OutputStream} will write data to another <tt>java.io.OutputStream</tt>,
+     * A {@link Base64.OutputStream} will write data to another <tt>java.io.OutputStream</tt>, given
-     * given in the constructor, and encode/decode to/from Base64 notation on the fly.
+     * in the constructor, and encode/decode to/from Base64 notation on the fly.
+     *
      * @see Base64
      * @since 1.3
      */
     public static class OutputStream extends java.io.FilterOutputStream {

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/utils/Base64.java - Rev 17 → 180