null the
- * {@link #DEFAULT_CONTENT_TYPE default} is used
- * @param charset the charset encoding for this part, if null the
- * {@link #DEFAULT_CHARSET default} is used
- */
- public BitCometFilePart(String name, PartSource partSource, String contentType, String charset) {
-
- super(
- name,
- contentType == null ? DEFAULT_CONTENT_TYPE : contentType,
- charset == null ? "ISO-8859-1" : charset,
- null
- );
-
- if (partSource == null) {
- throw new IllegalArgumentException("Source may not be null");
- }
- this.source = partSource;
- }
-
- /**
- * FilePart Constructor.
- *
- * @param name the name for this part
- * @param partSource the source for this part
- */
- public BitCometFilePart(String name, PartSource partSource) {
- this(name, partSource, null, null);
- }
-
- /**
- * FilePart Constructor.
- *
- * @param name the name of the file part
- * @param file the file to post
- *
- * @throws FileNotFoundException if the file is not a normal
- * file or if it is not readable.
- */
- public BitCometFilePart(String name, File file)
- throws FileNotFoundException {
- this(name, new FilePartSource(file), null, null);
- }
-
- /**
- * FilePart Constructor.
- *
- * @param name the name of the file part
- * @param file the file to post
- * @param contentType the content type for this part, if null the
- * {@link #DEFAULT_CONTENT_TYPE default} is used
- * @param charset the charset encoding for this part, if null the
- * {@link #DEFAULT_CHARSET default} is used
- *
- * @throws FileNotFoundException if the file is not a normal
- * file or if it is not readable.
- */
- public BitCometFilePart(String name, File file, String contentType, String charset)
- throws FileNotFoundException {
- this(name, new FilePartSource(file), contentType, charset);
- }
-
- /**
- * FilePart Constructor.
- *
- * @param name the name of the file part
- * @param fileName the file name
- * @param file the file to post
- *
- * @throws FileNotFoundException if the file is not a normal
- * file or if it is not readable.
- */
- public BitCometFilePart(String name, String fileName, File file)
- throws FileNotFoundException {
- this(name, new FilePartSource(fileName, file), null, null);
- }
-
- /**
- * FilePart Constructor.
- *
- * @param name the name of the file part
- * @param fileName the file name
- * @param file the file to post
- * @param contentType the content type for this part, if null the
- * {@link #DEFAULT_CONTENT_TYPE default} is used
- * @param charset the charset encoding for this part, if null the
- * {@link #DEFAULT_CHARSET default} is used
- *
- * @throws FileNotFoundException if the file is not a normal
- * file or if it is not readable.
- */
- public BitCometFilePart(String name, String fileName, File file, String contentType, String charset)
- throws FileNotFoundException {
- this(name, new FilePartSource(fileName, file), contentType, charset);
- }
-
- /**
- * Write the disposition header to the output stream
- * @param out The output stream
- * @throws IOException If an IO problem occurs
- * @see Part#sendDispositionHeader(OutputStream)
- */
- @Override
- protected void sendDispositionHeader(OutputStream out)
- throws IOException {
- super.sendDispositionHeader(out);
- String filename = this.source.getFileName();
- if (filename != null) {
- out.write(FILE_NAME_BYTES);
- out.write(QUOTE_BYTES);
- out.write(EncodingUtils.getAsciiBytes(filename));
- out.write(QUOTE_BYTES);
- }
- }
-
- /**
- * Write the data in "source" to the specified stream.
- * @param out The output stream.
- * @throws IOException if an IO problem occurs.
- * @see Part#sendData(OutputStream)
- */
- @Override
- protected void sendData(OutputStream out) throws IOException {
- if (lengthOfData() == 0) {
-
- // this file contains no data, so there is nothing to send.
- // we don't want to create a zero length buffer as this will
- // cause an infinite loop when reading.
- return;
- }
-
- byte[] tmp = new byte[4096];
- InputStream instream = source.createInputStream();
- try {
- int len;
- while ((len = instream.read(tmp)) >= 0) {
- out.write(tmp, 0, len);
- }
- } finally {
- // we're done with the stream, close it
- instream.close();
- }
- }
-
- /**
- * Returns the source of the file part.
- *
- * @return The source.
- */
- protected PartSource getSource() {
- return this.source;
- }
-
- /**
- * Return the length of the data.
- * @return The length.
- * @see Part#lengthOfData()
- */
- @Override
- protected long lengthOfData() {
- return source.getLength();
- }
-
-}
+/*
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//httpclient/src/java/org/apache/commons/httpclient/methods/multipart/FilePart.java,v 1.19 2004/04/18 23:51:37 jsdever Exp $
+ * $Revision: 480424 $
+ * $Date: 2006-11-29 06:56:49 +0100 (Wed, 29 Nov 2006) $
+ *
+ * ====================================================================
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * null the
+ * {@link #DEFAULT_CONTENT_TYPE default} is used
+ * @param charset the charset encoding for this part, if null the
+ * {@link #DEFAULT_CHARSET default} is used
+ */
+ public BitCometFilePart(String name, PartSource partSource, String contentType, String charset) {
+
+ super(
+ name,
+ contentType == null ? DEFAULT_CONTENT_TYPE : contentType,
+ charset == null ? "ISO-8859-1" : charset,
+ null
+ );
+
+ if (partSource == null) {
+ throw new IllegalArgumentException("Source may not be null");
+ }
+ this.source = partSource;
+ }
+
+ /**
+ * FilePart Constructor.
+ *
+ * @param name the name for this part
+ * @param partSource the source for this part
+ */
+ public BitCometFilePart(String name, PartSource partSource) {
+ this(name, partSource, null, null);
+ }
+
+ /**
+ * FilePart Constructor.
+ *
+ * @param name the name of the file part
+ * @param file the file to post
+ *
+ * @throws FileNotFoundException if the file is not a normal
+ * file or if it is not readable.
+ */
+ public BitCometFilePart(String name, File file)
+ throws FileNotFoundException {
+ this(name, new FilePartSource(file), null, null);
+ }
+
+ /**
+ * FilePart Constructor.
+ *
+ * @param name the name of the file part
+ * @param file the file to post
+ * @param contentType the content type for this part, if null the
+ * {@link #DEFAULT_CONTENT_TYPE default} is used
+ * @param charset the charset encoding for this part, if null the
+ * {@link #DEFAULT_CHARSET default} is used
+ *
+ * @throws FileNotFoundException if the file is not a normal
+ * file or if it is not readable.
+ */
+ public BitCometFilePart(String name, File file, String contentType, String charset)
+ throws FileNotFoundException {
+ this(name, new FilePartSource(file), contentType, charset);
+ }
+
+ /**
+ * FilePart Constructor.
+ *
+ * @param name the name of the file part
+ * @param fileName the file name
+ * @param file the file to post
+ *
+ * @throws FileNotFoundException if the file is not a normal
+ * file or if it is not readable.
+ */
+ public BitCometFilePart(String name, String fileName, File file)
+ throws FileNotFoundException {
+ this(name, new FilePartSource(fileName, file), null, null);
+ }
+
+ /**
+ * FilePart Constructor.
+ *
+ * @param name the name of the file part
+ * @param fileName the file name
+ * @param file the file to post
+ * @param contentType the content type for this part, if null the
+ * {@link #DEFAULT_CONTENT_TYPE default} is used
+ * @param charset the charset encoding for this part, if null the
+ * {@link #DEFAULT_CHARSET default} is used
+ *
+ * @throws FileNotFoundException if the file is not a normal
+ * file or if it is not readable.
+ */
+ public BitCometFilePart(String name, String fileName, File file, String contentType, String charset)
+ throws FileNotFoundException {
+ this(name, new FilePartSource(fileName, file), contentType, charset);
+ }
+
+ /**
+ * Write the disposition header to the output stream
+ * @param out The output stream
+ * @throws IOException If an IO problem occurs
+ * @see Part#sendDispositionHeader(OutputStream)
+ */
+ @Override
+ protected void sendDispositionHeader(OutputStream out)
+ throws IOException {
+ super.sendDispositionHeader(out);
+ String filename = this.source.getFileName();
+ if (filename != null) {
+ out.write(FILE_NAME_BYTES);
+ out.write(QUOTE_BYTES);
+ out.write(EncodingUtils.getAsciiBytes(filename));
+ out.write(QUOTE_BYTES);
+ }
+ }
+
+ /**
+ * Write the data in "source" to the specified stream.
+ * @param out The output stream.
+ * @throws IOException if an IO problem occurs.
+ * @see Part#sendData(OutputStream)
+ */
+ @Override
+ protected void sendData(OutputStream out) throws IOException {
+ if (lengthOfData() == 0) {
+
+ // this file contains no data, so there is nothing to send.
+ // we don't want to create a zero length buffer as this will
+ // cause an infinite loop when reading.
+ return;
+ }
+
+ byte[] tmp = new byte[4096];
+ InputStream instream = source.createInputStream();
+ try {
+ int len;
+ while ((len = instream.read(tmp)) >= 0) {
+ out.write(tmp, 0, len);
+ }
+ } finally {
+ // we're done with the stream, close it
+ instream.close();
+ }
+ }
+
+ /**
+ * Returns the source of the file part.
+ *
+ * @return The source.
+ */
+ protected PartSource getSource() {
+ return this.source;
+ }
+
+ /**
+ * Return the length of the data.
+ * @return The length.
+ * @see Part#lengthOfData()
+ */
+ @Override
+ protected long lengthOfData() {
+ return source.getLength();
+ }
+
+}
diff --git a/lib/src/com/android/internalcopy/http/multipart/ByteArrayPartSource.java b/lib/src/com/android/internalcopy/http/multipart/ByteArrayPartSource.java
index b143b57e..7834d868 100644
--- a/lib/src/com/android/internalcopy/http/multipart/ByteArrayPartSource.java
+++ b/lib/src/com/android/internalcopy/http/multipart/ByteArrayPartSource.java
@@ -36,10 +36,10 @@ import java.io.InputStream;
/**
* A PartSource that reads from a byte array. This class should be used when
* the data to post is already loaded into memory.
- *
+ *
* @author Michael Becke
- *
- * @since 2.0
+ *
+ * @since 2.0
*/
public class ByteArrayPartSource implements PartSource {
@@ -51,7 +51,7 @@ public class ByteArrayPartSource implements PartSource {
/**
* Constructor for ByteArrayPartSource.
- *
+ *
* @param fileName the name of the file these bytes represent
* @param bytes the content of this part
*/
diff --git a/lib/src/com/android/internalcopy/http/multipart/FilePart.java b/lib/src/com/android/internalcopy/http/multipart/FilePart.java
index 43f050c1..261ba8af 100644
--- a/lib/src/com/android/internalcopy/http/multipart/FilePart.java
+++ b/lib/src/com/android/internalcopy/http/multipart/FilePart.java
@@ -39,7 +39,7 @@ import org.apache.http.util.EncodingUtils;
/**
* This class implements a part of a Multipart post object that
- * consists of a file.
+ * consists of a file.
*
* @author Matthew Albright
* @author Jeff Dever
@@ -48,8 +48,8 @@ import org.apache.http.util.EncodingUtils;
* @author Mark Diggory
* @author Mike Bowler
* @author Oleg Kalnichevski
- *
- * @since 2.0
+ *
+ * @since 2.0
*
*/
public class FilePart extends PartBase {
@@ -67,7 +67,7 @@ public class FilePart extends PartBase {
protected static final String FILE_NAME = "; filename=";
/** Attachment's file name as a byte array */
- private static final byte[] FILE_NAME_BYTES =
+ private static final byte[] FILE_NAME_BYTES =
EncodingUtils.getAsciiBytes(FILE_NAME);
/** Source of the file part. */
@@ -78,17 +78,17 @@ public class FilePart extends PartBase {
*
* @param name the name for this part
* @param partSource the source for this part
- * @param contentType the content type for this part, if null the
+ * @param contentType the content type for this part, if null the
* {@link #DEFAULT_CONTENT_TYPE default} is used
- * @param charset the charset encoding for this part, if null the
+ * @param charset the charset encoding for this part, if null the
* {@link #DEFAULT_CHARSET default} is used
*/
public FilePart(String name, PartSource partSource, String contentType, String charset) {
-
+
super(
- name,
- contentType == null ? DEFAULT_CONTENT_TYPE : contentType,
- charset == null ? "ISO-8859-1" : charset,
+ name,
+ contentType == null ? DEFAULT_CONTENT_TYPE : contentType,
+ charset == null ? "ISO-8859-1" : charset,
DEFAULT_TRANSFER_ENCODING
);
@@ -97,7 +97,7 @@ public class FilePart extends PartBase {
}
this.source = partSource;
}
-
+
/**
* FilePart Constructor.
*
@@ -117,7 +117,7 @@ public class FilePart extends PartBase {
* @throws FileNotFoundException if the file is not a normal
* file or if it is not readable.
*/
- public FilePart(String name, File file)
+ public FilePart(String name, File file)
throws FileNotFoundException {
this(name, new FilePartSource(file), null, null);
}
@@ -127,15 +127,15 @@ public class FilePart extends PartBase {
*
* @param name the name of the file part
* @param file the file to post
- * @param contentType the content type for this part, if null the
+ * @param contentType the content type for this part, if null the
* {@link #DEFAULT_CONTENT_TYPE default} is used
- * @param charset the charset encoding for this part, if null the
+ * @param charset the charset encoding for this part, if null the
* {@link #DEFAULT_CHARSET default} is used
*
* @throws FileNotFoundException if the file is not a normal
* file or if it is not readable.
*/
- public FilePart(String name, File file, String contentType, String charset)
+ public FilePart(String name, File file, String contentType, String charset)
throws FileNotFoundException {
this(name, new FilePartSource(file), contentType, charset);
}
@@ -144,36 +144,36 @@ public class FilePart extends PartBase {
* FilePart Constructor.
*
* @param name the name of the file part
- * @param fileName the file name
+ * @param fileName the file name
* @param file the file to post
*
* @throws FileNotFoundException if the file is not a normal
* file or if it is not readable.
*/
- public FilePart(String name, String fileName, File file)
+ public FilePart(String name, String fileName, File file)
throws FileNotFoundException {
this(name, new FilePartSource(fileName, file), null, null);
}
-
+
/**
* FilePart Constructor.
*
* @param name the name of the file part
- * @param fileName the file name
+ * @param fileName the file name
* @param file the file to post
- * @param contentType the content type for this part, if null the
+ * @param contentType the content type for this part, if null the
* {@link #DEFAULT_CONTENT_TYPE default} is used
- * @param charset the charset encoding for this part, if null the
+ * @param charset the charset encoding for this part, if null the
* {@link #DEFAULT_CHARSET default} is used
*
* @throws FileNotFoundException if the file is not a normal
* file or if it is not readable.
*/
- public FilePart(String name, String fileName, File file, String contentType, String charset)
+ public FilePart(String name, String fileName, File file, String contentType, String charset)
throws FileNotFoundException {
this(name, new FilePartSource(fileName, file), contentType, charset);
}
-
+
/**
* Write the disposition header to the output stream
* @param out The output stream
@@ -181,7 +181,7 @@ public class FilePart extends PartBase {
* @see Part#sendDispositionHeader(OutputStream)
*/
@Override
- protected void sendDispositionHeader(OutputStream out)
+ protected void sendDispositionHeader(OutputStream out)
throws IOException {
super.sendDispositionHeader(out);
String filename = this.source.getFileName();
@@ -192,7 +192,7 @@ public class FilePart extends PartBase {
out.write(QUOTE_BYTES);
}
}
-
+
/**
* Write the data in "source" to the specified stream.
* @param out The output stream.
@@ -202,13 +202,13 @@ public class FilePart extends PartBase {
@Override
protected void sendData(OutputStream out) throws IOException {
if (lengthOfData() == 0) {
-
+
// this file contains no data, so there is nothing to send.
// we don't want to create a zero length buffer as this will
// cause an infinite loop when reading.
return;
}
-
+
byte[] tmp = new byte[4096];
InputStream instream = source.createInputStream();
try {
@@ -222,9 +222,9 @@ public class FilePart extends PartBase {
}
}
- /**
+ /**
* Returns the source of the file part.
- *
+ *
* @return The source.
*/
protected PartSource getSource() {
@@ -235,10 +235,10 @@ public class FilePart extends PartBase {
* Return the length of the data.
* @return The length.
* @see Part#lengthOfData()
- */
+ */
@Override
protected long lengthOfData() {
return source.getLength();
- }
+ }
}
diff --git a/lib/src/com/android/internalcopy/http/multipart/FilePartSource.java b/lib/src/com/android/internalcopy/http/multipart/FilePartSource.java
index 813ccbf3..4ac80c76 100644
--- a/lib/src/com/android/internalcopy/http/multipart/FilePartSource.java
+++ b/lib/src/com/android/internalcopy/http/multipart/FilePartSource.java
@@ -39,12 +39,12 @@ import java.io.InputStream;
/**
* A PartSource that reads from a File.
- *
+ *
* @author Michael Becke
* @author Mark Diggory
* @author Mike Bowler
- *
- * @since 2.0
+ *
+ * @since 2.0
*/
public class FilePartSource implements PartSource {
@@ -53,13 +53,13 @@ public class FilePartSource implements PartSource {
/** File part file name. */
private String fileName = null;
-
+
/**
* Constructor for FilePartSource.
- *
- * @param file the FilePart source File.
*
- * @throws FileNotFoundException if the file does not exist or
+ * @param file the FilePart source File.
+ *
+ * @throws FileNotFoundException if the file does not exist or
* cannot be read
*/
public FilePartSource(File file) throws FileNotFoundException {
@@ -71,27 +71,27 @@ public class FilePartSource implements PartSource {
if (!file.canRead()) {
throw new FileNotFoundException("File is not readable.");
}
- this.fileName = file.getName();
+ this.fileName = file.getName();
}
}
/**
* Constructor for FilePartSource.
- *
+ *
* @param fileName the file name of the FilePart
* @param file the source File for the FilePart
*
- * @throws FileNotFoundException if the file does not exist or
+ * @throws FileNotFoundException if the file does not exist or
* cannot be read
*/
- public FilePartSource(String fileName, File file)
+ public FilePartSource(String fileName, File file)
throws FileNotFoundException {
this(file);
if (fileName != null) {
this.fileName = fileName;
}
}
-
+
/**
* Return the length of the file
* @return the length of the file.
diff --git a/lib/src/com/android/internalcopy/http/multipart/MultipartEntity.java b/lib/src/com/android/internalcopy/http/multipart/MultipartEntity.java
index 9af47175..f179b0b8 100644
--- a/lib/src/com/android/internalcopy/http/multipart/MultipartEntity.java
+++ b/lib/src/com/android/internalcopy/http/multipart/MultipartEntity.java
@@ -51,16 +51,16 @@ import org.apache.http.util.EncodingUtils;
* RFC1867:
* * The media-type multipart/form-data follows the rules of all multipart - * MIME data streams as outlined in RFC 1521. The multipart/form-data contains - * a series of parts. Each part is expected to contain a content-disposition - * header where the value is "form-data" and a name attribute specifies - * the field name within the form, e.g., 'content-disposition: form-data; + * MIME data streams as outlined in RFC 1521. The multipart/form-data contains + * a series of parts. Each part is expected to contain a content-disposition + * header where the value is "form-data" and a name attribute specifies + * the field name within the form, e.g., 'content-disposition: form-data; * name="xxxxx"', where xxxxx is the field name corresponding to that field. - * Field names originally in non-ASCII character sets may be encoded using + * Field names originally in non-ASCII character sets may be encoded using * the method outlined in RFC 1522. ** - *
This entity is designed to be used in conjunction with the + *
This entity is designed to be used in conjunction with the * {@link org.apache.http.HttpRequest} to provide * multipart posts. Example usage:
*@@ -76,14 +76,14 @@ import org.apache.http.util.EncodingUtils; * HttpClient client = new HttpClient(); * int status = client.executeMethod(filePost); *- * + * * @since 3.0 */ public class MultipartEntity extends AbstractHttpEntity { /** The Content-Type for multipart/form-data. */ private static final String MULTIPART_FORM_CONTENT_TYPE = "multipart/form-data"; - + /** * Sets the value to use as the multipart boundary. *
@@ -91,13 +91,13 @@ public class MultipartEntity extends AbstractHttpEntity { *
*/ public static final String MULTIPART_BOUNDARY = "http.method.multipart.boundary"; - + /** * The pool of ASCII chars to be used for generating a multipart boundary. */ private static byte[] MULTIPART_CHARS = EncodingUtils.getAsciiBytes( "-_1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"); - + /** * Generates a random multipart boundary string. */ @@ -109,22 +109,22 @@ public class MultipartEntity extends AbstractHttpEntity { } return bytes; } - + /** The MIME parts as set by the constructor */ protected Part[] parts; - + private byte[] multipartBoundary; - + private HttpParams params; - + private boolean contentConsumed = false; - + /** * Creates a new multipart entity containing the given parts. * @param parts The parts to include. * @param params The params of the HttpMethod using this entity. */ - public MultipartEntity(Part[] parts, HttpParams params) { + public MultipartEntity(Part[] parts, HttpParams params) { if (parts == null) { throw new IllegalArgumentException("parts cannot be null"); } @@ -134,7 +134,7 @@ public class MultipartEntity extends AbstractHttpEntity { this.parts = parts; this.params = params; } - + public MultipartEntity(Part[] parts) { setContentType(MULTIPART_FORM_CONTENT_TYPE); if (parts == null) { @@ -143,14 +143,14 @@ public class MultipartEntity extends AbstractHttpEntity { this.parts = parts; this.params = null; } - + /** * Returns the MIME boundary string that is used to demarcate boundaries of * this part. The first call to this method will implicitly create a new - * boundary string. To create a boundary string first the - * HttpMethodParams.MULTIPART_BOUNDARY parameter is considered. Otherwise + * boundary string. To create a boundary string first the + * HttpMethodParams.MULTIPART_BOUNDARY parameter is considered. Otherwise * a random one is generated. - * + * * @return The boundary string of this entity in ASCII encoding. */ protected byte[] getMultipartBoundary() { @@ -201,24 +201,24 @@ public class MultipartEntity extends AbstractHttpEntity { */ public long getContentLength() { try { - return Part.getLengthOfParts(parts, getMultipartBoundary()); + return Part.getLengthOfParts(parts, getMultipartBoundary()); } catch (Exception e) { return 0; } - } - + } + public InputStream getContent() throws IOException, IllegalStateException { if(!isRepeatable() && this.contentConsumed ) { throw new IllegalStateException("Content has been consumed"); } this.contentConsumed = true; - + ByteArrayOutputStream baos = new ByteArrayOutputStream(); Part.sendParts(baos, this.parts, this.multipartBoundary); ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); return bais; } - + public boolean isStreaming() { return false; } diff --git a/lib/src/com/android/internalcopy/http/multipart/Part.java b/lib/src/com/android/internalcopy/http/multipart/Part.java index aa667715..8fbe0974 100644 --- a/lib/src/com/android/internalcopy/http/multipart/Part.java +++ b/lib/src/com/android/internalcopy/http/multipart/Part.java @@ -49,13 +49,13 @@ import org.apache.http.util.EncodingUtils; */ public abstract class Part { - /** - * The boundary + /** + * The boundary * @deprecated use {@link org.apache.http.client.methods.multipart#MULTIPART_BOUNDARY} */ protected static final String BOUNDARY = "----------------314159265358979323846"; - - /** + + /** * The boundary as a byte array. * @deprecated */ @@ -65,54 +65,54 @@ public abstract class Part { * The default boundary to be used if {@link #setPartBoundary(byte[])} has not * been called. */ - private static final byte[] DEFAULT_BOUNDARY_BYTES = BOUNDARY_BYTES; - + private static final byte[] DEFAULT_BOUNDARY_BYTES = BOUNDARY_BYTES; + /** Carriage return/linefeed */ protected static final String CRLF = "\r\n"; - + /** Carriage return/linefeed as a byte array */ protected static final byte[] CRLF_BYTES = EncodingUtils.getAsciiBytes(CRLF); - + /** Content dispostion characters */ protected static final String QUOTE = "\""; - + /** Content dispostion as a byte array */ - protected static final byte[] QUOTE_BYTES = + protected static final byte[] QUOTE_BYTES = EncodingUtils.getAsciiBytes(QUOTE); /** Extra characters */ protected static final String EXTRA = "--"; - + /** Extra characters as a byte array */ - protected static final byte[] EXTRA_BYTES = + protected static final byte[] EXTRA_BYTES = EncodingUtils.getAsciiBytes(EXTRA); - + /** Content dispostion characters */ protected static final String CONTENT_DISPOSITION = "Content-Disposition: form-data; name="; - + /** Content dispostion as a byte array */ - protected static final byte[] CONTENT_DISPOSITION_BYTES = + protected static final byte[] CONTENT_DISPOSITION_BYTES = EncodingUtils.getAsciiBytes(CONTENT_DISPOSITION); /** Content type header */ protected static final String CONTENT_TYPE = "Content-Type: "; /** Content type header as a byte array */ - protected static final byte[] CONTENT_TYPE_BYTES = + protected static final byte[] CONTENT_TYPE_BYTES = EncodingUtils.getAsciiBytes(CONTENT_TYPE); /** Content charset */ protected static final String CHARSET = "; charset="; /** Content charset as a byte array */ - protected static final byte[] CHARSET_BYTES = + protected static final byte[] CHARSET_BYTES = EncodingUtils.getAsciiBytes(CHARSET); /** Content type header */ protected static final String CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding: "; /** Content type header as a byte array */ - protected static final byte[] CONTENT_TRANSFER_ENCODING_BYTES = + protected static final byte[] CONTENT_TRANSFER_ENCODING_BYTES = EncodingUtils.getAsciiBytes(CONTENT_TRANSFER_ENCODING); /** @@ -128,13 +128,13 @@ public abstract class Part { * The ASCII bytes to use as the multipart boundary. */ private byte[] boundaryBytes; - + /** * Return the name of this part. * @return The name. */ public abstract String getName(); - + /** * Returns the content type of this part. * @return the content type, ornull to exclude the content type header
@@ -143,7 +143,7 @@ public abstract class Part {
/**
* Return the character encoding of this part.
- * @return the character encoding, or null to exclude the character
+ * @return the character encoding, or null to exclude the character
* encoding header
*/
public abstract String getCharSet();
@@ -157,7 +157,7 @@ public abstract class Part {
/**
* Gets the part boundary to be used.
* @return the part boundary as an array of bytes.
- *
+ *
* @since 3.0
*/
protected byte[] getPartBoundary() {
@@ -165,12 +165,12 @@ public abstract class Part {
// custom boundary bytes have not been set, use the default.
return DEFAULT_BOUNDARY_BYTES;
} else {
- return boundaryBytes;
+ return boundaryBytes;
}
}
-
+
/**
- * Sets the part boundary. Only meant to be used by
+ * Sets the part boundary. Only meant to be used by
* {@link Part#sendParts(OutputStream, Part[], byte[])}
* and {@link Part#getLengthOfParts(Part[], byte[])}
* @param boundaryBytes An array of ASCII bytes.
@@ -179,17 +179,17 @@ public abstract class Part {
void setPartBoundary(byte[] boundaryBytes) {
this.boundaryBytes = boundaryBytes;
}
-
+
/**
* Tests if this part can be sent more than once.
- * @return true if {@link #sendData(OutputStream)} can be successfully called
+ * @return true if {@link #sendData(OutputStream)} can be successfully called
* more than once.
* @since 3.0
*/
public boolean isRepeatable() {
return true;
}
-
+
/**
* Write the start to the specified output stream
* @param out The output stream
@@ -200,10 +200,10 @@ public abstract class Part {
out.write(getPartBoundary());
out.write(CRLF_BYTES);
}
-
+
/**
* Write the content disposition header to the specified output stream
- *
+ *
* @param out The output stream
* @throws IOException If an IO problem occurs.
*/
@@ -213,7 +213,7 @@ public abstract class Part {
out.write(EncodingUtils.getAsciiBytes(getName()));
out.write(QUOTE_BYTES);
}
-
+
/**
* Write the content type header to the specified output stream
* @param out The output stream
@@ -234,9 +234,9 @@ public abstract class Part {
}
/**
- * Write the content transfer encoding header to the specified
+ * Write the content transfer encoding header to the specified
* output stream
- *
+ *
* @param out The output stream
* @throws IOException If an IO problem occurs.
*/
@@ -258,22 +258,22 @@ public abstract class Part {
out.write(CRLF_BYTES);
out.write(CRLF_BYTES);
}
-
+
/**
* Write the data to the specified output stream
* @param out The output stream
* @throws IOException If an IO problem occurs.
*/
protected abstract void sendData(OutputStream out) throws IOException;
-
+
/**
* Return the length of the main content
- *
+ *
* @return long The length.
* @throws IOException If an IO problem occurs
*/
protected abstract long lengthOfData() throws IOException;
-
+
/**
* Write the end data to the output stream.
* @param out The output stream
@@ -282,12 +282,12 @@ public abstract class Part {
protected void sendEnd(OutputStream out) throws IOException {
out.write(CRLF_BYTES);
}
-
+
/**
* Write all the data to the output stream.
- * If you override this method make sure to override
+ * If you override this method make sure to override
* #length() as well
- *
+ *
* @param out The output stream
* @throws IOException If an IO problem occurs.
*/
@@ -304,9 +304,9 @@ public abstract class Part {
/**
* Return the full length of all the data.
- * If you override this method make sure to override
+ * If you override this method make sure to override
* #send(OutputStream) as well
- *
+ *
* @return long The length.
* @throws IOException If an IO problem occurs
*/
@@ -328,7 +328,7 @@ public abstract class Part {
* Return a string representation of this object.
* @return A string representation of this object.
* @see java.lang.Object#toString()
- */
+ */
@Override
public String toString() {
return this.getName();
@@ -336,10 +336,10 @@ public abstract class Part {
/**
* Write all parts and the last boundary to the specified output stream.
- *
+ *
* @param out The stream to write to.
* @param parts The parts to write.
- *
+ *
* @throws IOException If an I/O error occurs while writing the parts.
*/
public static void sendParts(OutputStream out, final Part[] parts)
@@ -349,20 +349,20 @@ public abstract class Part {
/**
* Write all parts and the last boundary to the specified output stream.
- *
+ *
* @param out The stream to write to.
* @param parts The parts to write.
* @param partBoundary The ASCII bytes to use as the part boundary.
- *
+ *
* @throws IOException If an I/O error occurs while writing the parts.
- *
+ *
* @since 3.0
*/
public static void sendParts(OutputStream out, Part[] parts, byte[] partBoundary)
throws IOException {
-
+
if (parts == null) {
- throw new IllegalArgumentException("Parts may not be null");
+ throw new IllegalArgumentException("Parts may not be null");
}
if (partBoundary == null || partBoundary.length == 0) {
throw new IllegalArgumentException("partBoundary may not be empty");
@@ -377,34 +377,34 @@ public abstract class Part {
out.write(EXTRA_BYTES);
out.write(CRLF_BYTES);
}
-
+
/**
* Return the total sum of all parts and that of the last boundary
- *
+ *
* @param parts The parts.
* @return The total length
- *
+ *
* @throws IOException If an I/O error occurs while writing the parts.
*/
public static long getLengthOfParts(Part[] parts)
throws IOException {
return getLengthOfParts(parts, DEFAULT_BOUNDARY_BYTES);
}
-
+
/**
* Gets the length of the multipart message including the given parts.
- *
+ *
* @param parts The parts.
* @param partBoundary The ASCII bytes to use as the part boundary.
* @return The total length
- *
+ *
* @throws IOException If an I/O error occurs while writing the parts.
- *
+ *
* @since 3.0
*/
public static long getLengthOfParts(Part[] parts, byte[] partBoundary) throws IOException {
if (parts == null) {
- throw new IllegalArgumentException("Parts may not be null");
+ throw new IllegalArgumentException("Parts may not be null");
}
long total = 0;
for (int i = 0; i < parts.length; i++) {
@@ -421,5 +421,5 @@ public abstract class Part {
total += EXTRA_BYTES.length;
total += CRLF_BYTES.length;
return total;
- }
+ }
}
diff --git a/lib/src/com/android/internalcopy/http/multipart/PartBase.java b/lib/src/com/android/internalcopy/http/multipart/PartBase.java
index 82896472..da2359b3 100644
--- a/lib/src/com/android/internalcopy/http/multipart/PartBase.java
+++ b/lib/src/com/android/internalcopy/http/multipart/PartBase.java
@@ -33,29 +33,29 @@ package com.android.internalcopy.http.multipart;
/**
* Provides setters and getters for the basic Part properties.
- *
+ *
* @author Michael Becke
*/
public abstract class PartBase extends Part {
/** Name of the file part. */
private String name;
-
+
/** Content type of the file part. */
private String contentType;
/** Content encoding of the file part. */
private String charSet;
-
+
/** The transfer encoding. */
private String transferEncoding;
/**
* Constructor.
- *
+ *
* @param name The name of the part
* @param contentType The content type, or null
- * @param charSet The character encoding, or null
+ * @param charSet The character encoding, or null
* @param transferEncoding The transfer encoding, or null
*/
public PartBase(String name, String contentType, String charSet, String transferEncoding) {
@@ -75,8 +75,8 @@ public abstract class PartBase extends Part {
* @see Part#getName()
*/
@Override
- public String getName() {
- return this.name;
+ public String getName() {
+ return this.name;
}
/**
@@ -108,8 +108,8 @@ public abstract class PartBase extends Part {
/**
* Sets the character encoding.
- *
- * @param charSet the character encoding, or null to exclude the character
+ *
+ * @param charSet the character encoding, or null to exclude the character
* encoding header
*/
public void setCharSet(String charSet) {
@@ -118,7 +118,7 @@ public abstract class PartBase extends Part {
/**
* Sets the content type.
- *
+ *
* @param contentType the content type, or null to exclude the content type header
*/
public void setContentType(String contentType) {
@@ -127,7 +127,7 @@ public abstract class PartBase extends Part {
/**
* Sets the part name.
- *
+ *
* @param name
*/
public void setName(String name) {
@@ -139,8 +139,8 @@ public abstract class PartBase extends Part {
/**
* Sets the transfer encoding.
- *
- * @param transferEncoding the transfer encoding, or null to exclude the
+ *
+ * @param transferEncoding the transfer encoding, or null to exclude the
* transfer encoding header
*/
public void setTransferEncoding(String transferEncoding) {
diff --git a/lib/src/com/android/internalcopy/http/multipart/PartSource.java b/lib/src/com/android/internalcopy/http/multipart/PartSource.java
index 8fec3aa9..4324e7f8 100644
--- a/lib/src/com/android/internalcopy/http/multipart/PartSource.java
+++ b/lib/src/com/android/internalcopy/http/multipart/PartSource.java
@@ -35,36 +35,36 @@ import java.io.InputStream;
/**
* An interface for providing access to data when posting MultiPart messages.
- *
+ *
* @see FilePart
- *
+ *
* @author Michael Becke
- *
- * @since 2.0
+ *
+ * @since 2.0
*/
public interface PartSource {
/**
* Gets the number of bytes contained in this source.
- *
+ *
* @return a value >= 0
*/
long getLength();
-
+
/**
* Gets the name of the file this source represents.
- *
+ *
* @return the fileName used for posting a MultiPart file part
*/
String getFileName();
-
+
/**
- * Gets a new InputStream for reading this source. This method can be
+ * Gets a new InputStream for reading this source. This method can be
* called more than once and should therefore return a new stream every
* time.
- *
+ *
* @return a new InputStream
- *
+ *
* @throws IOException if an error occurs when creating the InputStream
*/
InputStream createInputStream() throws IOException;
diff --git a/lib/src/com/android/internalcopy/http/multipart/StringPart.java b/lib/src/com/android/internalcopy/http/multipart/StringPart.java
index c613c771..08f81bac 100644
--- a/lib/src/com/android/internalcopy/http/multipart/StringPart.java
+++ b/lib/src/com/android/internalcopy/http/multipart/StringPart.java
@@ -58,7 +58,7 @@ public class StringPart extends PartBase {
/** Contents of this StringPart. */
private byte[] content;
-
+
/** The String value of this part. */
private String value;
@@ -67,11 +67,11 @@ public class StringPart extends PartBase {
*
* @param name The name of the part
* @param value the string to post
- * @param charset the charset to be used to encode the string, if null
+ * @param charset the charset to be used to encode the string, if null
* the {@link #DEFAULT_CHARSET default} is used
*/
public StringPart(String name, String value, String charset) {
-
+
super(
name,
DEFAULT_CONTENT_TYPE,
@@ -97,11 +97,11 @@ public class StringPart extends PartBase {
public StringPart(String name, String value) {
this(name, value, null);
}
-
+
/**
* Gets the content in bytes. Bytes are lazily created to allow the charset to be changed
* after the part is created.
- *
+ *
* @return the content in bytes
*/
private byte[] getContent() {
@@ -110,7 +110,7 @@ public class StringPart extends PartBase {
}
return content;
}
-
+
/**
* Writes the data to the given OutputStream.
* @param out the OutputStream to write to
@@ -120,7 +120,7 @@ public class StringPart extends PartBase {
protected void sendData(OutputStream out) throws IOException {
out.write(getContent());
}
-
+
/**
* Return the length of the data.
* @return The length of the data.
@@ -130,7 +130,7 @@ public class StringPart extends PartBase {
protected long lengthOfData() {
return getContent().length;
}
-
+
/* (non-Javadoc)
* @see org.apache.commons.httpclient.methods.multipart.BasePart#setCharSet(java.lang.String)
*/
diff --git a/lib/src/com/android/internalcopy/http/multipart/Utf8StringPart.java b/lib/src/com/android/internalcopy/http/multipart/Utf8StringPart.java
index 3a2f28ba..dfcf51bf 100644
--- a/lib/src/com/android/internalcopy/http/multipart/Utf8StringPart.java
+++ b/lib/src/com/android/internalcopy/http/multipart/Utf8StringPart.java
@@ -1,43 +1,43 @@
-package com.android.internalcopy.http.multipart;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.http.util.EncodingUtils;
-
-public class Utf8StringPart extends PartBase {
-
- /** Contents of this StringPart. */
- private byte[] content;
-
- /** The String value of this part. */
- private String value;
-
- public Utf8StringPart(String name, String value) {
- super(name, null, null, null);
- this.value = value;
- }
-
- /**
- * Gets the content in bytes. Bytes are lazily created to allow the charset to be changed
- * after the part is created.
- *
- * @return the content in bytes
- */
- private byte[] getContent() {
- if (content == null) {
- content = EncodingUtils.getBytes(value, "utf-8");
- }
- return content;
- }
-
- @Override
- protected void sendData(OutputStream out) throws IOException {
- out.write(getContent());
- }
-
- @Override
- protected long lengthOfData() throws IOException {
- return getContent().length;
- }
-}
+package com.android.internalcopy.http.multipart;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.apache.http.util.EncodingUtils;
+
+public class Utf8StringPart extends PartBase {
+
+ /** Contents of this StringPart. */
+ private byte[] content;
+
+ /** The String value of this part. */
+ private String value;
+
+ public Utf8StringPart(String name, String value) {
+ super(name, null, null, null);
+ this.value = value;
+ }
+
+ /**
+ * Gets the content in bytes. Bytes are lazily created to allow the charset to be changed
+ * after the part is created.
+ *
+ * @return the content in bytes
+ */
+ private byte[] getContent() {
+ if (content == null) {
+ content = EncodingUtils.getBytes(value, "utf-8");
+ }
+ return content;
+ }
+
+ @Override
+ protected void sendData(OutputStream out) throws IOException {
+ out.write(getContent());
+ }
+
+ @Override
+ protected long lengthOfData() throws IOException {
+ return getContent().length;
+ }
+}
diff --git a/lib/src/de/timroes/axmlrpc/ResponseParser.java b/lib/src/de/timroes/axmlrpc/ResponseParser.java
index b0968963..717a7e89 100644
--- a/lib/src/de/timroes/axmlrpc/ResponseParser.java
+++ b/lib/src/de/timroes/axmlrpc/ResponseParser.java
@@ -79,7 +79,7 @@ class ResponseParser {
/**
* This method takes an element (must be a param or fault element) and
* returns the deserialized object of this param tag.
- *
+ *
* @param element An param element.
* @return The deserialized object within the given param element.
* @throws XMLRPCException Will be thrown when the structure of the document
diff --git a/lib/src/de/timroes/axmlrpc/XMLRPCClient.java b/lib/src/de/timroes/axmlrpc/XMLRPCClient.java
index 9a6b8f44..3479b1db 100644
--- a/lib/src/de/timroes/axmlrpc/XMLRPCClient.java
+++ b/lib/src/de/timroes/axmlrpc/XMLRPCClient.java
@@ -139,7 +139,7 @@ public class XMLRPCClient {
private final int flags;
private DefaultHttpClient httpclient;
-
+
private String url;
private MapEncodes and decodes to and from Base64 notation. Released as Public Domain software.
*Homepage: http://iharder.net/base64.
- * + * *Example:
- * + * *String encoded = Base64.encode( myByteArray );
* byte[] myByteArray = Base64.decode( encoded );
*
- * The options parameter, which appears in a few places, is used to pass - * several pieces of information to the encoder. In the "higher level" methods such as - * encodeBytes( bytes, options ) the options parameter can be used to indicate such + *
The options parameter, which appears in a few places, is used to pass + * several pieces of information to the encoder. In the "higher level" methods such as + * encodeBytes( bytes, options ) the options parameter can be used to indicate such * things as first gzipping the bytes before encoding them, not inserting linefeeds, * and encoding using the URL-safe and Ordered dialects.
* @@ -21,7 +21,7 @@ package org.base64.android; * to do so. I've got Base64 set to this behavior now, although earlier versions * broke lines by default. * - *The constants defined in Base64 can be OR-ed together to combine options, so you + *
The constants defined in Base64 can be OR-ed together to combine options, so you * might make a call like this:
* *String encoded = Base64.encodeBytes( mybytes, Base64.GZIP | Base64.DO_BREAK_LINES );
@@ -50,7 +50,7 @@ package org.base64.android;
* Encodes up to three bytes of the array source * and writes the resulting four Base64 bytes to destination. * The source and destination arrays can be manipulated - * anywhere along their length by specifying + * anywhere along their length by specifying * srcOffset and destOffset. * This method does not check to make sure your arrays * are large enough to accomodate srcOffset + 3 for @@ -471,19 +471,19 @@ public class Base64 * @return the destination array * @since 1.3 */ - private static byte[] encode3to4( + private static byte[] encode3to4( byte[] source, int srcOffset, int numSigBytes, byte[] destination, int destOffset, int options ) { - - byte[] ALPHABET = getAlphabet( options ); - - // 1 2 3 + + byte[] ALPHABET = getAlphabet( options ); + + // 1 2 3 // 01234567890123456789012345678901 Bit position // --------000000001111111122222222 Array position from threeBytes // --------| || || || | Six bit groups to index ALPHABET // >>18 >>12 >> 6 >> 0 Right shift necessary // 0x3f 0x3f 0x3f Additional AND - + // Create buffer with zero-padding if there are only one or two // significant bytes passed in the array. // We have to shift left 24 in order to flush out the 1's that appear @@ -500,21 +500,21 @@ public class Base64 destination[ destOffset + 2 ] = ALPHABET[ (inBuff >>> 6) & 0x3f ]; destination[ destOffset + 3 ] = ALPHABET[ (inBuff ) & 0x3f ]; return destination; - + case 2: destination[ destOffset ] = ALPHABET[ (inBuff >>> 18) ]; destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ]; destination[ destOffset + 2 ] = ALPHABET[ (inBuff >>> 6) & 0x3f ]; destination[ destOffset + 3 ] = EQUALS_SIGN; return destination; - + case 1: destination[ destOffset ] = ALPHABET[ (inBuff >>> 18) ]; destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ]; destination[ destOffset + 2 ] = EQUALS_SIGN; destination[ destOffset + 3 ] = EQUALS_SIGN; return destination; - + default: return destination; } // end switch @@ -572,18 +572,18 @@ public class Base64 } - - + + /** * Serializes an object and returns the Base64-encoded - * version of that serialized object. - * + * version of that serialized object. + * *
As of v 2.3, if the object * cannot be serialized or there is another error, * the method will throw an java.io.IOException. This is new to v2.3! * In earlier versions, it just returned a null value, but * in retrospect that's a pretty poor way to handle it.
- * + * * The object is not GZip-compressed before being encoded. * * @param serializableObject The object to encode @@ -596,19 +596,19 @@ public class Base64 throws java.io.IOException { return encodeObject( serializableObject, NO_OPTIONS ); } // end encodeObject - + /** * Serializes an object and returns the Base64-encoded * version of that serialized object. - * + * *As of v 2.3, if the object * cannot be serialized or there is another error, * the method will throw an java.io.IOException. This is new to v2.3! * In earlier versions, it just returned a null value, but * in retrospect that's a pretty poor way to handle it.
- * + * * The object is not GZip-compressed before being encoded. ** Example options:
@@ -634,13 +634,13 @@ public class Base64
if( serializableObject == null ){
throw new NullPointerException( "Cannot serialize a null object." );
} // end if: null
-
+
// Streams
- java.io.ByteArrayOutputStream baos = null;
- java.io.OutputStream b64os = null;
- java.io.ObjectOutputStream oos = null;
-
-
+ java.io.ByteArrayOutputStream baos = null;
+ java.io.OutputStream b64os = null;
+ java.io.ObjectOutputStream oos = null;
+
+
try {
// ObjectOutputStream -> (GZIP) -> Base64 -> ByteArrayOutputStream
// Note that the optional GZIPping is handled by Base64.OutputStream.
@@ -659,7 +659,7 @@ public class Base64
try{ b64os.close(); } catch( Exception e ){}
try{ baos.close(); } catch( Exception e ){}
} // end finally
-
+
// Return value according to relevant encoding.
try {
return new String( baos.toByteArray(), PREFERRED_ENCODING );
@@ -668,15 +668,15 @@ public class Base64
// Fall back to some Java default
return new String( baos.toByteArray() );
} // end catch
-
+
} // end encode
-
-
+
+
/**
* Encodes a byte array into Base64 notation.
* Does not GZip-compress data.
- *
+ *
* @param source The data to convert
* @return The data in Base64-encoded form
* @throws NullPointerException if source array is null
@@ -695,7 +695,7 @@ public class Base64
assert encoded != null;
return encoded;
} // end encodeBytes
-
+
/**
@@ -711,12 +711,12 @@ public class Base64
*
* Example: encodeBytes( myData, Base64.GZIP | Base64.DO_BREAK_LINES )
*
- *
+ *
*
As of v 2.3, if there is an error with the GZIP stream,
* the method will throw an java.io.IOException. This is new to v2.3!
* In earlier versions, it just returned a null value, but
* in retrospect that's a pretty poor way to handle it.
- *
+ *
*
* @param source The data to convert
* @param options Specified options
@@ -730,17 +730,17 @@ public class Base64
public static String encodeBytes( byte[] source, int options ) throws java.io.IOException {
return encodeBytes( source, 0, source.length, options );
} // end encodeBytes
-
-
+
+
/**
* Encodes a byte array into Base64 notation.
* Does not GZip-compress data.
- *
+ *
* As of v 2.3, if there is an error,
* the method will throw an java.io.IOException. This is new to v2.3!
* In earlier versions, it just returned a null value, but
* in retrospect that's a pretty poor way to handle it.
- *
+ *
*
* @param source The data to convert
* @param off Offset in array where conversion should begin
@@ -763,8 +763,8 @@ public class Base64
assert encoded != null;
return encoded;
} // end encodeBytes
-
-
+
+
/**
* Encodes a byte array into Base64 notation.
@@ -779,12 +779,12 @@ public class Base64
*
* Example: encodeBytes( myData, Base64.GZIP | Base64.DO_BREAK_LINES )
*
- *
+ *
*
As of v 2.3, if there is an error with the GZIP stream,
* the method will throw an java.io.IOException. This is new to v2.3!
* In earlier versions, it just returned a null value, but
* in retrospect that's a pretty poor way to handle it.
- *
+ *
*
* @param source The data to convert
* @param off Offset in array where conversion should begin
@@ -808,7 +808,7 @@ public class Base64
catch (java.io.UnsupportedEncodingException uue) {
return new String( encoded );
} // end catch
-
+
} // end encodeBytes
@@ -954,34 +954,34 @@ public class Base64
//System.err.println("No need to resize array.");
return outBuff;
}
-
+
} // end else: don't compress
} // end encodeBytesToBytes
-
-
-
-
+
+
+
+
/* ******** D E C O D I N G M E T H O D S ******** */
-
-
+
+
/**
* Decodes four bytes from array source
* and writes the resulting bytes (up to three of them)
* to destination.
* The source and destination arrays can be manipulated
- * anywhere along their length by specifying
+ * anywhere along their length by specifying
* srcOffset and destOffset.
* This method does not check to make sure your arrays
* are large enough to accomodate srcOffset + 4 for
* the source array or destOffset + 3 for
* the destination array.
- * This method returns the actual number of bytes that
+ * This method returns the actual number of bytes that
* were converted from the Base64 encoding.
* This is the lowest level of the decoding methods with
* all possible parameters.
- *
+ *
*
* @param source the array to convert
* @param srcOffset the index where conversion begins
@@ -994,10 +994,10 @@ public class Base64
* or there is not enough room in the array.
* @since 1.3
*/
- private static int decode4to3(
- byte[] source, int srcOffset,
+ private static int decode4to3(
+ byte[] source, int srcOffset,
byte[] destination, int destOffset, int options ) {
-
+
// Lots of error checking and exception throwing
if( source == null ){
throw new NullPointerException( "Source array was null." );
@@ -1013,10 +1013,10 @@ public class Base64
throw new IllegalArgumentException( String.format(
"Destination array with length %d cannot have offset of %d and still store three bytes.", destination.length, destOffset ) );
} // end if
-
-
- byte[] DECODABET = getDecodabet( options );
-
+
+
+ byte[] DECODABET = getDecodabet( options );
+
// Example: Dk==
if( source[ srcOffset + 2] == EQUALS_SIGN ) {
// Two ways to do the same thing. Don't know which way I like best.
@@ -1024,11 +1024,11 @@ public class Base64
// | ( ( DECODABET[ source[ srcOffset + 1] ] << 24 ) >>> 12 );
int outBuff = ( ( DECODABET[ source[ srcOffset ] ] & 0xFF ) << 18 )
| ( ( DECODABET[ source[ srcOffset + 1] ] & 0xFF ) << 12 );
-
+
destination[ destOffset ] = (byte)( outBuff >>> 16 );
return 1;
}
-
+
// Example: DkL=
else if( source[ srcOffset + 3 ] == EQUALS_SIGN ) {
// Two ways to do the same thing. Don't know which way I like best.
@@ -1038,12 +1038,12 @@ public class Base64
int outBuff = ( ( DECODABET[ source[ srcOffset ] ] & 0xFF ) << 18 )
| ( ( DECODABET[ source[ srcOffset + 1 ] ] & 0xFF ) << 12 )
| ( ( DECODABET[ source[ srcOffset + 2 ] ] & 0xFF ) << 6 );
-
+
destination[ destOffset ] = (byte)( outBuff >>> 16 );
destination[ destOffset + 1 ] = (byte)( outBuff >>> 8 );
return 2;
}
-
+
// Example: DkLE
else {
// Two ways to do the same thing. Don't know which way I like best.
@@ -1056,7 +1056,7 @@ public class Base64
| ( ( DECODABET[ source[ srcOffset + 2 ] ] & 0xFF ) << 6)
| ( ( DECODABET[ source[ srcOffset + 3 ] ] & 0xFF ) );
-
+
destination[ destOffset ] = (byte)( outBuff >> 16 );
destination[ destOffset + 1 ] = (byte)( outBuff >> 8 );
destination[ destOffset + 2 ] = (byte)( outBuff );
@@ -1064,7 +1064,7 @@ public class Base64
return 3;
}
} // end decodeToBytes
-
+
@@ -1092,8 +1092,8 @@ public class Base64
return decoded;
}
-
-
+
+
/**
* Low-level access to decoding ASCII characters in
* the form of a byte array. Ignores GUNZIP option, if
@@ -1113,7 +1113,7 @@ public class Base64
*/
public static byte[] decode( byte[] source, int off, int len, int options )
throws java.io.IOException {
-
+
// Lots of error checking and exception throwing
if( source == null ){
throw new NullPointerException( "Cannot decode null source array." );
@@ -1122,31 +1122,31 @@ public class Base64
throw new IllegalArgumentException( String.format(
"Source array with length %d cannot have offset of %d and process %d bytes.", source.length, off, len ) );
} // end if
-
+
if( len == 0 ){
return new byte[0];
}else if( len < 4 ){
- throw new IllegalArgumentException(
+ throw new IllegalArgumentException(
"Base64-encoded string must have at least four characters, but length specified was " + len );
} // end if
-
+
byte[] DECODABET = getDecodabet( options );
-
+
int len34 = len * 3 / 4; // Estimate on array size
byte[] outBuff = new byte[ len34 ]; // Upper limit on size of output
int outBuffPosn = 0; // Keep track of where we're writing
-
+
byte[] b4 = new byte[4]; // Four byte buffer from source, eliminating white space
int b4Posn = 0; // Keep track of four byte input buffer
int i = 0; // Source array counter
byte sbiCrop = 0; // Low seven bits (ASCII) of input
byte sbiDecode = 0; // Special value from DECODABET
-
+
for( i = off; i < off+len; i++ ) { // Loop through source
-
+
sbiCrop = (byte)(source[i] & 0x7f); // Only the low seven bits
sbiDecode = DECODABET[ sbiCrop ]; // Special value
-
+
// White space, Equals sign, or legit Base64 character
// Note the values such as -5 and -9 in the
// DECODABETs at the top of the file.
@@ -1156,7 +1156,7 @@ public class Base64
if( b4Posn > 3 ) { // Time to decode?
outBuffPosn += decode4to3( b4, 0, outBuff, outBuffPosn, options );
b4Posn = 0;
-
+
// If that was the equals sign, break out of 'for' loop
if( sbiCrop == EQUALS_SIGN ) {
break;
@@ -1168,17 +1168,17 @@ public class Base64
// There's a bad input character in the Base64 stream.
throw new java.io.IOException( String.format(
"Bad Base64 input character '%c' in array position %d", source[i], i ) );
- } // end else:
+ } // end else:
} // each input character
-
+
byte[] out = new byte[ outBuffPosn ];
- System.arraycopy( outBuff, 0, out, 0, outBuffPosn );
+ System.arraycopy( outBuff, 0, out, 0, outBuffPosn );
return out;
} // end decode
-
-
-
-
+
+
+
+
/**
* Decodes data from Base64 notation, automatically
* detecting gzip-compressed data and decompressing it.
@@ -1192,8 +1192,8 @@ public class Base64
return decode( s, NO_OPTIONS );
}
-
-
+
+
/**
* Decodes data from Base64 notation, automatically
* detecting gzip-compressed data and decompressing it.
@@ -1206,11 +1206,11 @@ public class Base64
* @since 1.4
*/
public static byte[] decode( String s, int options ) throws java.io.IOException {
-
+
if( s == null ){
throw new NullPointerException( "Input string was null." );
} // end if
-
+
byte[] bytes;
try {
bytes = s.getBytes( PREFERRED_ENCODING );
@@ -1219,16 +1219,16 @@ public class Base64
bytes = s.getBytes();
} // end catch
//
-
+
// Decode
bytes = decode( bytes, 0, bytes.length, options );
-
-
+
+
// Check to see if it's gzip-compressed
// GZIP Magic Two-Byte Number: 0x8b1f (35615)
if( bytes != null && bytes.length >= 4 ) {
-
- int head = ((int)bytes[0] & 0xff) | ((bytes[1] << 8) & 0xff00);
+
+ int head = ((int)bytes[0] & 0xff) | ((bytes[1] << 8) & 0xff00);
if( java.util.zip.GZIPInputStream.GZIP_MAGIC == head ) {
java.io.ByteArrayInputStream bais = null;
java.util.zip.GZIPInputStream gzis = null;
@@ -1260,11 +1260,11 @@ public class Base64
} // end if: gzipped
} // end if: bytes.length >= 2
-
+
return bytes;
} // end decode
-
+
/**
* Attempts to decode Base64 data and deserialize a Java
@@ -1274,24 +1274,24 @@ public class Base64
* @return The decoded and deserialized object
* @throws NullPointerException if encodedObject is null
* @throws java.io.IOException if there is a general error
- * @throws ClassNotFoundException if the decoded object is of a
+ * @throws ClassNotFoundException if the decoded object is of a
* class that cannot be found by the JVM
* @since 1.5
*/
public static Object decodeToObject( String encodedObject )
throws java.io.IOException, java.lang.ClassNotFoundException {
-
+
// Decode and gunzip if necessary
byte[] objBytes = decode( encodedObject );
-
+
java.io.ByteArrayInputStream bais = null;
java.io.ObjectInputStream ois = null;
Object obj = null;
-
+
try {
bais = new java.io.ByteArrayInputStream( objBytes );
ois = new java.io.ObjectInputStream( bais );
-
+
obj = ois.readObject();
} // end try
catch( java.io.IOException e ) {
@@ -1304,12 +1304,12 @@ public class Base64
try{ bais.close(); } catch( Exception e ){}
try{ ois.close(); } catch( Exception e ){}
} // end finally
-
+
return obj;
} // end decodeObject
-
-
-
+
+
+
/**
* Convenience method for encoding data to a file.
*
@@ -1317,7 +1317,7 @@ public class Base64
* the method will throw an java.io.IOException. This is new to v2.3!
* In earlier versions, it just returned false, but
* in retrospect that's a pretty poor way to handle it.
- *
+ *
* @param dataToEncode byte array of data to encode in base64 form
* @param filename Filename for saving encoded data
* @throws java.io.IOException if there is an error
@@ -1326,14 +1326,14 @@ public class Base64
*/
public static void encodeToFile( byte[] dataToEncode, String filename )
throws java.io.IOException {
-
+
if( dataToEncode == null ){
throw new NullPointerException( "Data to encode was null." );
} // end iff
-
+
Base64.OutputStream bos = null;
try {
- bos = new Base64.OutputStream(
+ bos = new Base64.OutputStream(
new java.io.FileOutputStream( filename ), Base64.ENCODE );
bos.write( dataToEncode );
} // end try
@@ -1343,10 +1343,10 @@ public class Base64
finally {
try{ bos.close(); } catch( Exception e ){}
} // end finally
-
+
} // end encodeToFile
-
-
+
+
/**
* Convenience method for decoding data to a file.
*
@@ -1354,7 +1354,7 @@ public class Base64
* the method will throw an java.io.IOException. This is new to v2.3!
* In earlier versions, it just returned false, but
* in retrospect that's a pretty poor way to handle it.
- *
+ *
* @param dataToDecode Base64-encoded data as a string
* @param filename Filename for saving decoded data
* @throws java.io.IOException if there is an error
@@ -1362,10 +1362,10 @@ public class Base64
*/
public static void decodeToFile( String dataToDecode, String filename )
throws java.io.IOException {
-
+
Base64.OutputStream bos = null;
try{
- bos = new Base64.OutputStream(
+ bos = new Base64.OutputStream(
new java.io.FileOutputStream( filename ), Base64.DECODE );
bos.write( dataToDecode.getBytes( PREFERRED_ENCODING ) );
} // end try
@@ -1375,12 +1375,12 @@ public class Base64
finally {
try{ bos.close(); } catch( Exception e ){}
} // end finally
-
+
} // end decodeToFile
-
-
-
-
+
+
+
+
/**
* Convenience method for reading a base64-encoded
* file and decoding it.
@@ -1389,7 +1389,7 @@ public class Base64
* the method will throw an java.io.IOException. This is new to v2.3!
* In earlier versions, it just returned false, but
* in retrospect that's a pretty poor way to handle it.
- *
+ *
* @param filename Filename for reading encoded data
* @return decoded byte array
* @throws java.io.IOException if there is an error
@@ -1397,7 +1397,7 @@ public class Base64
*/
public static byte[] decodeFromFile( String filename )
throws java.io.IOException {
-
+
byte[] decodedData = null;
Base64.InputStream bis = null;
try
@@ -1407,28 +1407,28 @@ public class Base64
byte[] buffer = null;
int length = 0;
int numBytes = 0;
-
+
// Check for size of file
if( file.length() > Integer.MAX_VALUE )
{
throw new java.io.IOException( "File is too big for this convenience method (" + file.length() + " bytes)." );
} // end if: file too big for int index
buffer = new byte[ (int)file.length() ];
-
+
// Open a stream
- bis = new Base64.InputStream(
- new java.io.BufferedInputStream(
+ bis = new Base64.InputStream(
+ new java.io.BufferedInputStream(
new java.io.FileInputStream( file ) ), Base64.DECODE );
-
+
// Read until done
while( ( numBytes = bis.read( buffer, length, 4096 ) ) >= 0 ) {
length += numBytes;
} // end while
-
+
// Save in a variable to return
decodedData = new byte[ length ];
System.arraycopy( buffer, 0, decodedData, 0, length );
-
+
} // end try
catch( java.io.IOException e ) {
throw e; // Catch and release to execute finally{}
@@ -1436,12 +1436,12 @@ public class Base64
finally {
try{ bis.close(); } catch( Exception e) {}
} // end finally
-
+
return decodedData;
} // end decodeFromFile
-
-
-
+
+
+
/**
* Convenience method for reading a binary file
* and base64-encoding it.
@@ -1450,7 +1450,7 @@ public class Base64
* the method will throw an java.io.IOException. This is new to v2.3!
* In earlier versions, it just returned false, but
* in retrospect that's a pretty poor way to handle it.
- *
+ *
* @param filename Filename for reading binary data
* @return base64-encoded string
* @throws java.io.IOException if there is an error
@@ -1458,7 +1458,7 @@ public class Base64
*/
public static String encodeFromFile( String filename )
throws java.io.IOException {
-
+
String encodedData = null;
Base64.InputStream bis = null;
try
@@ -1468,20 +1468,20 @@ public class Base64
byte[] buffer = new byte[ Math.max((int)(file.length() * 1.4),40) ]; // Need max() for math on small files (v2.2.1)
int length = 0;
int numBytes = 0;
-
+
// Open a stream
- bis = new Base64.InputStream(
- new java.io.BufferedInputStream(
+ bis = new Base64.InputStream(
+ new java.io.BufferedInputStream(
new java.io.FileInputStream( file ) ), Base64.ENCODE );
-
+
// Read until done
while( ( numBytes = bis.read( buffer, length, 4096 ) ) >= 0 ) {
length += numBytes;
} // end while
-
+
// Save in a variable to return
encodedData = new String( buffer, 0, length, Base64.PREFERRED_ENCODING );
-
+
} // end try
catch( java.io.IOException e ) {
throw e; // Catch and release to execute finally{}
@@ -1489,10 +1489,10 @@ public class Base64
finally {
try{ bis.close(); } catch( Exception e) {}
} // end finally
-
+
return encodedData;
} // end encodeFromFile
-
+
/**
* Reads infile and encodes it to outfile.
*
@@ -1503,7 +1503,7 @@ public class Base64
*/
public static void encodeFileToFile( String infile, String outfile )
throws java.io.IOException {
-
+
String encoded = Base64.encodeFromFile( infile );
java.io.OutputStream out = null;
try{
@@ -1517,7 +1517,7 @@ public class Base64
finally {
try { out.close(); }
catch( Exception ex ){}
- } // end finally
+ } // end finally
} // end encodeFileToFile
@@ -1531,7 +1531,7 @@ public class Base64
*/
public static void decodeFileToFile( String infile, String outfile )
throws java.io.IOException {
-
+
byte[] decoded = Base64.decodeFromFile( infile );
java.io.OutputStream out = null;
try{
@@ -1545,14 +1545,14 @@ public class Base64
finally {
try { out.close(); }
catch( Exception ex ){}
- } // end finally
+ } // end finally
} // end decodeFileToFile
-
-
+
+
/* ******** 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
* java.io.InputStream, given in the constructor,
@@ -1562,7 +1562,7 @@ public class Base64
* @since 1.3
*/
public static class InputStream extends java.io.FilterInputStream {
-
+
private boolean encode; // Encoding or decoding
private int position; // Current position in the buffer
private byte[] buffer; // Small buffer holding converted data
@@ -1572,8 +1572,8 @@ public class Base64
private boolean breakLines; // Break lines at less than 80 characters
private int options; // Record options used to create the stream.
private byte[] decodabet; // Local copies to avoid extra method calls
-
-
+
+
/**
* Constructs a {@link Base64.InputStream} in DECODE mode.
*
@@ -1583,8 +1583,8 @@ public class Base64
public InputStream( java.io.InputStream in ) {
this( in, DECODE );
} // end constructor
-
-
+
+
/**
* Constructs a {@link Base64.InputStream} in
* either ENCODE or DECODE mode.
@@ -1606,7 +1606,7 @@ public class Base64
* @since 2.0
*/
public InputStream( java.io.InputStream in, int options ) {
-
+
super( in );
this.options = options; // Record for later
this.breakLines = (options & DO_BREAK_LINES) > 0;
@@ -1617,7 +1617,7 @@ public class Base64
this.lineLength = 0;
this.decodabet = getDecodabet(options);
} // end constructor
-
+
/**
* Reads enough of the input stream to convert
* to/from Base64 and returns the next byte.
@@ -1627,7 +1627,7 @@ public class Base64
*/
@Override
public int read() throws java.io.IOException {
-
+
// Do we need to get data?
if( position < 0 ) {
if( encode ) {
@@ -1643,9 +1643,9 @@ public class Base64
} else {
break; // out of for loop
} // end else: end of stream
-
+
} // end for: each needed input byte
-
+
if( numBinaryBytes > 0 ) {
encode3to4( b3, 0, numBinaryBytes, buffer, 0, options );
position = 0;
@@ -1655,7 +1655,7 @@ public class Base64
return -1; // Must be end of stream
} // end else
} // end if: encoding
-
+
// Else decoding
else {
byte[] b4 = new byte[4];
@@ -1665,14 +1665,14 @@ public class Base64
int b = 0;
do{ b = in.read(); }
while( b >= 0 && decodabet[ b & 0x7f ] <= WHITE_SPACE_ENC );
-
+
if( b < 0 ) {
break; // Reads a -1 if end of stream
} // end if: end of stream
-
+
b4[i] = (byte)b;
} // end for: each needed input byte
-
+
if( i == 4 ) {
numSigBytes = decode4to3( b4, 0, buffer, 0, options );
position = 0;
@@ -1683,18 +1683,18 @@ public class Base64
else {
// Must have broken out from above.
throw new java.io.IOException( "Improperly padded Base64 input." );
- } // end
-
+ } // end
+
} // end else: decode
} // end else: get data
-
+
// Got data?
if( position >= 0 ) {
// End of relevant data?
if( /*!encode &&*/ position >= numSigBytes ){
return -1;
} // end if: got data
-
+
if( encode && breakLines && lineLength >= MAX_LINE_LENGTH ) {
lineLength = 0;
return '\n';
@@ -1703,7 +1703,7 @@ public class Base64
lineLength++; // This isn't important when decoding
// but throwing an extra "if" seems
// just as wasteful.
-
+
int b = buffer[ position++ ];
if( position >= bufferLength ) {
@@ -1714,14 +1714,14 @@ public class Base64
// intended to be unsigned.
} // end else
} // end if: position >= 0
-
+
// Else error
else {
throw new java.io.IOException( "Error in Base64 code reading stream." );
} // end else
} // end read
-
-
+
+
/**
* Calls {@link #read()} repeatedly until the end of stream
* is reached or len bytes are read.
@@ -1735,13 +1735,13 @@ public class Base64
* @since 1.3
*/
@Override
- public int read( byte[] dest, int off, int len )
+ public int read( byte[] dest, int off, int len )
throws java.io.IOException {
int i;
int b;
for( i = 0; i < len; i++ ) {
b = read();
-
+
if( b >= 0 ) {
dest[off + i] = (byte) b;
}
@@ -1754,18 +1754,18 @@ public class Base64
} // end for: each byte read
return i;
} // end read
-
+
} // 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
* java.io.OutputStream, given in the constructor,
@@ -1775,7 +1775,7 @@ public class Base64
* @since 1.3
*/
public static class OutputStream extends java.io.FilterOutputStream {
-
+
private boolean encode;
private int position;
private byte[] buffer;
@@ -1786,7 +1786,7 @@ public class Base64
private boolean suspendEncoding;
private int options; // Record for later
private byte[] decodabet; // Local copies to avoid extra method calls
-
+
/**
* Constructs a {@link Base64.OutputStream} in ENCODE mode.
*
@@ -1796,8 +1796,8 @@ public class Base64
public OutputStream( java.io.OutputStream out ) {
this( out, ENCODE );
} // end constructor
-
-
+
+
/**
* Constructs a {@link Base64.OutputStream} in
* either ENCODE or DECODE mode.
@@ -1830,8 +1830,8 @@ public class Base64
this.options = options;
this.decodabet = getDecodabet(options);
} // end constructor
-
-
+
+
/**
* Writes the byte to the output stream after
* converting to/from Base64 notation.
@@ -1845,19 +1845,19 @@ public class Base64
* @since 1.3
*/
@Override
- public void write(int theByte)
+ public void write(int theByte)
throws java.io.IOException {
// Encoding suspended?
if( suspendEncoding ) {
super.out.write( theByte );
return;
} // end if: supsended
-
+
// Encode?
if( encode ) {
buffer[ position++ ] = (byte)theByte;
if( position >= bufferLength ) { // Enough to encode.
-
+
out.write( encode3to4( b4, buffer, bufferLength, options ) );
lineLength += 4;
@@ -1876,7 +1876,7 @@ public class Base64
if( decodabet[ theByte & 0x7f ] > WHITE_SPACE_ENC ) {
buffer[ position++ ] = (byte)theByte;
if( position >= bufferLength ) { // Enough to output.
-
+
int len = Base64.decode4to3( buffer, 0, b4, 0, options );
out.write( b4, 0, len );
position = 0;
@@ -1887,11 +1887,11 @@ public class Base64
} // end else: not white space either
} // end else: decoding
} // end write
-
-
-
+
+
+
/**
- * Calls {@link #write(int)} repeatedly until len
+ * Calls {@link #write(int)} repeatedly until len
* bytes are written.
*
* @param theBytes array from which to read bytes
@@ -1900,22 +1900,22 @@ public class Base64
* @since 1.3
*/
@Override
- public void write( byte[] theBytes, int off, int len )
+ public void write( byte[] theBytes, int off, int len )
throws java.io.IOException {
// Encoding suspended?
if( suspendEncoding ) {
super.out.write( theBytes, off, len );
return;
} // end if: supsended
-
+
for( int i = 0; i < len; i++ ) {
write( theBytes[ off + i ] );
} // end for: each byte written
-
+
} // end write
-
-
-
+
+
+
/**
* Method added by PHIL. [Thanks, PHIL. -Rob]
* This pads the buffer without closing the stream.
@@ -1944,9 +1944,9 @@ public class Base64
flushBase64();
super.flush();
}
-
- /**
- * Flushes and closes (I think, in the superclass) the stream.
+
+ /**
+ * Flushes and closes (I think, in the superclass) the stream.
*
* @since 1.3
*/
@@ -1958,13 +1958,13 @@ public class Base64
// 2. Actually close the stream
// Base class both flushes and closes.
super.close();
-
+
buffer = null;
out = null;
} // end close
-
-
-
+
+
+
/**
* Suspends encoding of the stream.
* May be helpful if you need to embed a piece of
@@ -1977,8 +1977,8 @@ public class Base64
flushBase64();
this.suspendEncoding = true;
} // end suspendEncoding
-
-
+
+
/**
* Resumes encoding of the stream.
* May be helpful if you need to embed a piece of
@@ -1989,10 +1989,10 @@ public class Base64
public void resumeEncoding() {
this.suspendEncoding = false;
} // end resumeEncoding
-
-
-
+
+
+
} // end inner class OutputStream
-
-
+
+
} // end class Base64
diff --git a/lib/src/org/transdroid/daemon/AlphanumComparator.java b/lib/src/org/transdroid/daemon/AlphanumComparator.java
index d4db86dc..63e51b2d 100644
--- a/lib/src/org/transdroid/daemon/AlphanumComparator.java
+++ b/lib/src/org/transdroid/daemon/AlphanumComparator.java
@@ -6,8 +6,8 @@ package org.transdroid.daemon;
* a standard sort, this algorithm sorts numbers in numeric order.
*
* The Alphanum Algorithm is discussed at http://www.DaveKoelle.com
- *
- * This is an updated version with enhancements made by Daniel Migowski,
+ *
+ * This is an updated version with enhancements made by Daniel Migowski,
* Andre Bogus, and David Koelle
*
* This library is free software; you can redistribute it and/or
diff --git a/lib/src/org/transdroid/daemon/BitComet/BitCometAdapter.java b/lib/src/org/transdroid/daemon/BitComet/BitCometAdapter.java
index 1043d171..9d2cb46c 100644
--- a/lib/src/org/transdroid/daemon/BitComet/BitCometAdapter.java
+++ b/lib/src/org/transdroid/daemon/BitComet/BitCometAdapter.java
@@ -1,19 +1,19 @@
/*
* This file is part of Transdroid
- *
+ *
* Transdroid is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* Transdroid is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with Transdroid. If not, see params = new ArrayList();
params.add(new BasicNameValuePair("url", url));
- params.add(new BasicNameValuePair("save_path", defaultPath));
+ params.add(new BasicNameValuePair("save_path", defaultPath));
params.add(new BasicNameValuePair("connection", "5"));
params.add(new BasicNameValuePair("ReferPage", ""));
params.add(new BasicNameValuePair("textSpeedLimit", "0"));
httppost.setEntity(new UrlEncodedFormEntity(params, HTTP.UTF_8));
-
+
// Make the request
response = httpclient.execute(httppost);
-
+
entity = response.getEntity();
if (entity != null) {
// Check BitComet response
@@ -370,7 +370,7 @@ public class BitCometAdapter implements IDaemonAdapter {
throw new Exception("Adding URL failed");
}
}
-
+
return response.getStatusLine().getStatusCode() == HttpStatus.SC_OK;
}
return false;
@@ -381,42 +381,42 @@ public class BitCometAdapter implements IDaemonAdapter {
}
/**
- * Parse BitComet HTML page (http response)
+ * Parse BitComet HTML page (http response)
* @param response
* @return
* @throws DaemonException
*/
private ArrayList parseHttpTorrents(String response) throws DaemonException {
-
+
ArrayList torrents = new ArrayList();
-
+
try {
-
- // Find, prepare and split substring with HTML tag TABLE
+
+ // Find, prepare and split substring with HTML tag TABLE
String[] parts = response.substring(response.indexOf("")).replaceAll("", "").replaceAll("", "").replaceAll("\n", "").split("");
-
+
for (int i=2; i", "")+1, name.indexOf("<"));
TorrentStatus status = convertStatus(subParts[3]);
String percenDoneStr = subParts[6];
String downloadRateStr = subParts[7];
String uploadRateStr = subParts[8];
-
+
long size = convertSize(subParts[5]);
float percentDone = Float.parseFloat(percenDoneStr.substring(0, percenDoneStr.indexOf("%")));
long sizeDone = (long) (size * percentDone / 100 );
-
- int rateUp = 1000 * Integer.parseInt(uploadRateStr.substring(0, uploadRateStr.indexOf("kB/s")));
+
+ int rateUp = 1000 * Integer.parseInt(uploadRateStr.substring(0, uploadRateStr.indexOf("kB/s")));
int rateDown = 1000 * Integer.parseInt(downloadRateStr.substring(0, downloadRateStr.indexOf("kB/s")));
- // Unfortunately, there is no info for above values providing by BitComet now,
+ // Unfortunately, there is no info for above values providing by BitComet now,
// so we may only send additional request for that
int leechers = 0;
int seeders = 0;
@@ -426,21 +426,21 @@ public class BitCometAdapter implements IDaemonAdapter {
long sizeUp = 0;
String comment = "";
Date dateAdded = new Date();
-
- // Comment code below to speedup torrent listing
+
+ // Comment code below to speedup torrent listing
// P.S. feature request to extend torrents info is already sent to the BitComet developers
//*
try {
// Lets make summary request and parse details
String summary = makeRequest("/panel/task_detail", new BasicNameValuePair("id", ""+(i-2)), new BasicNameValuePair("show", "summary"));
-
+
String[] sumParts = summary.substring(summary.indexOf("Value")).split("");
comment = sumParts[7].substring(sumParts[7].indexOf(" ")+4, sumParts[7].indexOf(" ")+4, sumParts[idx].indexOf(" ")));
//sizeDone = convertSize(sumParts[sizeIdx].substring(sumParts[sizeIdx].indexOf("")+4, sumParts[sizeIdx].indexOf(" (")));
@@ -457,7 +457,7 @@ public class BitCometAdapter implements IDaemonAdapter {
}
catch (Exception e) {}
//*
-
+
// Add the parsed torrent to the list
torrents.add(new Torrent(
(long)i-2,
@@ -488,19 +488,19 @@ public class BitCometAdapter implements IDaemonAdapter {
catch (Exception e) {
throw new DaemonException(ExceptionType.UnexpectedResponse, "Invalid BitComet HTTP response.");
}
-
+
return torrents;
}
/**
- * Parse BitComet AJAX response
- * that code was copy-pasted and slightly modified from \Ktorrent\StatsParser.java
+ * Parse BitComet AJAX response
+ * that code was copy-pasted and slightly modified from \Ktorrent\StatsParser.java
* @param response
* @return
* @throws DaemonException
*/
private ArrayList parseXmlTorrents(String response) throws DaemonException {
-
+
ArrayList torrents = new ArrayList();
try {
@@ -526,45 +526,45 @@ public class BitCometAdapter implements IDaemonAdapter {
float progress = 0;
String label = "";
Date dateAdded = new Date();
-
+
// Start pulling
int next = xpp.nextTag();
String tagName = xpp.getName();
-
+
while (next != XmlPullParser.END_DOCUMENT) {
-
+
if (next == XmlPullParser.END_TAG && tagName.equals("task")) {
-
+
// End of a 'transfer' item, add gathered torrent data
sizeDone = (long) (totalSize * progress);
torrents.add(new Torrent(
- id,
+ id,
null, // hash, // we suppose to use simple integer IDs
- name,
- status,
- null,
- rateDown,
- rateUp,
- seeders,
- seedersTotal,
- leechers,
- leechersTotal,
+ name,
+ status,
+ null,
+ rateDown,
+ rateUp,
+ seeders,
+ seedersTotal,
+ leechers,
+ leechersTotal,
(int) ((status == TorrentStatus.Downloading && rateDown != 0)? (totalSize - sizeDone) / rateDown: -1), // eta (in seconds) = (total_size_in_btes - bytes_already_downloaded) / bytes_per_second
- sizeDone,
- sizeUp,
- totalSize,
- progress,
+ sizeDone,
+ sizeUp,
+ totalSize,
+ progress,
0f,
label,
dateAdded,
null,
null, // Not supported in the web interface
settings.getType()));
-
+
id++; // Stop/start/etc. requests are made by ID, which is the order number in the returned XML list :-S
-
+
} else if (next == XmlPullParser.START_TAG && tagName.equals("task")){
-
+
// Start of a new 'transfer' item; reset gathered torrent data
name = "";
//hash = "";
@@ -581,9 +581,9 @@ public class BitCometAdapter implements IDaemonAdapter {
progress = 0;
label = "";
dateAdded = new Date();
-
+
} else if (next == XmlPullParser.START_TAG){
-
+
// Probably encountered a torrent property, i.e. 'BT '
next = xpp.next();
if (next == XmlPullParser.TEXT) {
@@ -620,13 +620,13 @@ public class BitCometAdapter implements IDaemonAdapter {
}
}
}
-
+
next = xpp.next();
if (next == XmlPullParser.START_TAG || next == XmlPullParser.END_TAG) {
tagName = xpp.getName();
}
}
-
+
} catch (XmlPullParserException e) {
throw new DaemonException(ExceptionType.ParsingFailed, e.toString());
} catch (Exception e) {
@@ -635,33 +635,33 @@ public class BitCometAdapter implements IDaemonAdapter {
return torrents;
}
-
+
/**
- * Parse BitComet HTML page (HTTP response)
+ * Parse BitComet HTML page (HTTP response)
* @param response
* @return
* @throws DaemonException
*/
private ArrayList parseHttpTorrentFiles(String response, String hash) throws DaemonException {
-
+
// Parse response
ArrayList torrentfiles = new ArrayList();
-
- try {
-
+
+ try {
+
String[] files = response.substring(response.indexOf("Operation Method")+27, response.lastIndexOf("")).replaceAll(" ", "").replaceAll("", "").split("");
-
+
for (int i = 1; i < files.length; i++) {
-
+
String[] fileDetails = files[i].replace(">","").split("
- *
+ *
* Transdroid is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* Transdroid is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with Transdroid. If not, see
- *
+ *
* Transdroid is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* Transdroid is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with Transdroid. If not, see
- *
+ *
* Transdroid is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* Transdroid is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with Transdroid. If not, see
- *
+ *
*/
public class DLinkRouterBTAdapter implements IDaemonAdapter {
@@ -301,7 +301,7 @@ public class DLinkRouterBTAdapter implements IDaemonAdapter {
/**
* Instantiates an HTTP client with proper credentials that can be used for all Transmission requests.
- *
+ *
* @param connectionTimeout
* The connection timeout in milliseconds
* @throws DaemonException
@@ -313,7 +313,7 @@ public class DLinkRouterBTAdapter implements IDaemonAdapter {
/**
* Build the URL of the Transmission web UI from the user settings.
- *
+ *
* @return The URL of the RPC API
*/
private String buildWebUIUrl() {
@@ -355,23 +355,23 @@ public class DLinkRouterBTAdapter implements IDaemonAdapter {
eta = -1;
Torrent new_t = new Torrent(
- i,
- tor.getString(BT_HASH),
- tor.getString(BT_CAPTION),
+ i,
+ tor.getString(BT_HASH),
+ tor.getString(BT_CAPTION),
status,
null, // Not supported?
- tor.getInt(BT_DOWNLOAD_RATE),
- tor.getInt(BT_UPLOAD_RATE),
- tor.getInt(BT_PEERS_CONNECTED),
- tor.getInt(BT_PEERS_TOTAL),
- tor.getInt(BT_SEEDS_CONNECTED),
+ tor.getInt(BT_DOWNLOAD_RATE),
+ tor.getInt(BT_UPLOAD_RATE),
+ tor.getInt(BT_PEERS_CONNECTED),
+ tor.getInt(BT_PEERS_TOTAL),
+ tor.getInt(BT_SEEDS_CONNECTED),
tor.getInt(BT_SEEDS_TOTAL),
- (int) ((tor.getLong(BT_SIZE) - tor.getLong(BT_DONE)) / (tor.getInt(BT_DOWNLOAD_RATE) + 1)),
- tor.getLong(BT_DONE),
- tor.getLong(BT_PAYLOAD_UPLOAD),
- tor.getLong(BT_SIZE),
- (float) (tor.getLong(BT_DONE) / (float) tor.getLong(BT_SIZE)),
- Float.parseFloat(tor.getString(BT_COPYS)),
+ (int) ((tor.getLong(BT_SIZE) - tor.getLong(BT_DONE)) / (tor.getInt(BT_DOWNLOAD_RATE) + 1)),
+ tor.getLong(BT_DONE),
+ tor.getLong(BT_PAYLOAD_UPLOAD),
+ tor.getLong(BT_SIZE),
+ (float) (tor.getLong(BT_DONE) / (float) tor.getLong(BT_SIZE)),
+ Float.parseFloat(tor.getString(BT_COPYS)),
null,
null,
null,
@@ -396,13 +396,13 @@ public class DLinkRouterBTAdapter implements IDaemonAdapter {
for (int i = 0; i < files.length(); i++) {
JSONObject file = files.getJSONObject(i);
torrentfiles.add(new TorrentFile(
- i + "",
+ i + "",
// TODO: How is an individual file identified? Index in the array?
- file.getString(BT_FILE_NAME),
- file.getString(BT_FILE_NAME),
+ file.getString(BT_FILE_NAME),
+ file.getString(BT_FILE_NAME),
null, // Not supported?
- file.getLong(BT_FILE_SIZE),
- file.getLong(BT_FILE_DONE),
+ file.getLong(BT_FILE_SIZE),
+ file.getLong(BT_FILE_DONE),
convertTransmissionPriority(file.getInt(BT_FILE_PRIORITY))));
}
}
diff --git a/lib/src/org/transdroid/daemon/Daemon.java b/lib/src/org/transdroid/daemon/Daemon.java
index e6369b76..1d60a72d 100644
--- a/lib/src/org/transdroid/daemon/Daemon.java
+++ b/lib/src/org/transdroid/daemon/Daemon.java
@@ -1,19 +1,19 @@
/*
* This file is part of Transdroid
- *
+ *
* Transdroid is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* Transdroid is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with Transdroid. If not, see ' that represents the daemon's enum value
@@ -297,14 +297,14 @@ public enum Daemon {
}
public static boolean supportsAddByFile(Daemon type) {
- // Supported by every client except Bitflu
+ // Supported by every client except Bitflu
return type != Bitflu;
}
public static boolean supportsAddByMagnetUrl(Daemon type) {
return type == uTorrent || type == BitTorrent || type == Transmission || type == Synology || type == Deluge || type == Bitflu || type == KTorrent || type == rTorrent || type == qBittorrent || type == BitComet || type == Dummy;
}
-
+
public static boolean supportsRemoveWithData(Daemon type) {
return type == uTorrent || type == Vuze || type == Transmission || type == Deluge || type == BitTorrent || type == Tfb4rt || type == DLinkRouterBT || type == Bitflu || type == qBittorrent || type == BuffaloNas || type == BitComet || type == rTorrent || type == Dummy;
}
@@ -312,7 +312,7 @@ public enum Daemon {
public static boolean supportsFilePrioritySetting(Daemon type) {
return type == BitTorrent || type == uTorrent || type == Transmission || type == KTorrent || type == rTorrent || type == Vuze || type == Deluge || type == qBittorrent || type == Dummy;
}
-
+
public static boolean supportsDateAdded(Daemon type) {
return type == Vuze || type == Transmission || type == rTorrent || type == Bitflu || type == BitComet || type == uTorrent || type == BitTorrent || type == Deluge || type == Dummy;
}
diff --git a/lib/src/org/transdroid/daemon/DaemonException.java b/lib/src/org/transdroid/daemon/DaemonException.java
index f2d721c7..c152c146 100644
--- a/lib/src/org/transdroid/daemon/DaemonException.java
+++ b/lib/src/org/transdroid/daemon/DaemonException.java
@@ -1,36 +1,36 @@
/*
* This file is part of Transdroid
- *
+ *
* Transdroid is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* Transdroid is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with Transdroid. If not, see
- *
+ *
* Transdroid is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* Transdroid is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with Transdroid. If not, see
- *
+ *
* Transdroid is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* Transdroid is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with Transdroid. If not, see
- *
+ *
* Transdroid is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* Transdroid is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with Transdroid. If not, see pfiles = parseJsonFileListing(pinfo.getJSONObject(RPC_RESULT), prioTask.getTargetTorrent());
-
+
// Now prepare the new list of priorities
params = new JSONArray();
params.put(task.getTargetTorrent().getUniqueID()); // torrent_id
@@ -347,13 +347,13 @@ public class DelugeAdapter implements IDaemonAdapter {
pfields.put(convertPriority(newPriority));
}
params.put(pfields); // keys
-
+
// Make a single call to set the priorities on all files at once
makeRequest(buildRequest(RPC_METHOD_SETFILE, params));
return new DaemonTaskSuccessResult(task);
-
+
case SetDownloadLocation:
-
+
// Set the download location of some torrent
SetDownloadLocationTask sdlTask = (SetDownloadLocationTask) task;
// This works, but does not move the torrent
@@ -363,7 +363,7 @@ public class DelugeAdapter implements IDaemonAdapter {
params.put(sdlTask.getNewLocation());
makeRequest(buildRequest(RPC_METHOD_MOVESTORAGE, params));
return new DaemonTaskSuccessResult(task);
-
+
case SetTransferRates:
// Request to set the maximum transfer rates
@@ -407,7 +407,7 @@ public class DelugeAdapter implements IDaemonAdapter {
makeRequest(buildRequest(RPC_METHOD_FORCERECHECK,
((new JSONArray()).put((new JSONArray()).put(task.getTargetTorrent().getUniqueID())))));
return new DaemonTaskSuccessResult(task);
-
+
default:
return new DaemonTaskFailureResult(task, new DaemonException(ExceptionType.MethodUnsupported, task.getMethod() + " is not supported by " + getType()));
}
@@ -421,7 +421,7 @@ public class DelugeAdapter implements IDaemonAdapter {
return new DaemonTaskFailureResult(task, new DaemonException(ExceptionType.FileAccessError, e.toString()));
}
}
-
+
/*private JSONArray buildSetTorrentOptions(String torrent, String key, String value) throws JSONException {
JSONArray params = new JSONArray();
params.put(new JSONArray().put(torrent)); // torrent_id
@@ -493,21 +493,21 @@ public class DelugeAdapter implements IDaemonAdapter {
request.put(RPC_PARAMS, (params == null) ? new JSONArray() : params);
request.put(RPC_ID, 2);
return request;
-
+
}
-
+
private synchronized JSONObject makeRequest(JSONObject data) throws DaemonException {
try {
-
+
// Initialise the HTTP client
if (httpclient == null) {
initialise();
}
-
+
// Login first?
if (sessionCookie == null) {
-
+
// Build login object
String extraPass = settings.getExtraPassword();
if (extraPass == null) {
@@ -536,7 +536,7 @@ public class DelugeAdapter implements IDaemonAdapter {
}
}
}
-
+
// Still no session cookie?
if (sessionCookie == null) {
// Set error message and cancel the action that was requested
@@ -563,7 +563,7 @@ public class DelugeAdapter implements IDaemonAdapter {
if (!cookiePresent) {
httpclient.getCookieStore().addCookie(sessionCookie);
}
-
+
// Execute
HttpResponse response = httpclient.execute(httppost);
@@ -577,7 +577,7 @@ public class DelugeAdapter implements IDaemonAdapter {
instream.close();
DLog.d(LOG_NAME, "Success: " + (result.length() > 300? result.substring(0, 300) + "... (" + result.length() + " chars)": result));
-
+
// Return JSON object
return json;
@@ -593,7 +593,7 @@ public class DelugeAdapter implements IDaemonAdapter {
DLog.d(LOG_NAME, "Error: " + e.toString());
throw new DaemonException(ExceptionType.ConnectionError, e.toString());
}
-
+
}
/**
@@ -606,7 +606,7 @@ public class DelugeAdapter implements IDaemonAdapter {
httpclient = HttpHelper.createStandardHttpClient(settings, settings.getUsername() != null && settings.getUsername() != "");
httpclient.addRequestInterceptor(HttpHelper.gzipRequestInterceptor);
httpclient.addResponseInterceptor(HttpHelper.gzipResponseInterceptor);
-
+
}
/**
@@ -628,7 +628,7 @@ public class DelugeAdapter implements IDaemonAdapter {
JSONArray names = objects.names();
if (names != null) {
for (int j = 0; j < names.length(); j++) {
-
+
JSONObject tor = objects.getJSONObject(names.getString(j));
// Add the parsed torrent to the list
TorrentStatus status = convertDelugeState(tor.getString(RPC_STATUS));
@@ -637,21 +637,21 @@ public class DelugeAdapter implements IDaemonAdapter {
error += (error.length() > 0? "\n": "") + tor.getString(RPC_TRACKER_STATUS);
//status = TorrentStatus.Error; // Don't report this as blocking error
}
- torrents.add(new Torrent(j,
- names.getString(j),
- tor.getString(RPC_NAME),
+ torrents.add(new Torrent(j,
+ names.getString(j),
+ tor.getString(RPC_NAME),
status,
tor.getString(RPC_SAVEPATH) + settings.getOS().getPathSeperator(),
- tor.getInt(RPC_RATEDOWNLOAD),
- tor.getInt(RPC_RATEUPLOAD),
- tor.getInt(RPC_NUMSEEDS),
- tor.getInt(RPC_TOTALSEEDS),
- tor.getInt(RPC_NUMPEERS),
- tor.getInt(RPC_TOTALPEERS),
+ tor.getInt(RPC_RATEDOWNLOAD),
+ tor.getInt(RPC_RATEUPLOAD),
+ tor.getInt(RPC_NUMSEEDS),
+ tor.getInt(RPC_TOTALSEEDS),
+ tor.getInt(RPC_NUMPEERS),
+ tor.getInt(RPC_TOTALPEERS),
tor.getInt(RPC_ETA),
- tor.getLong(RPC_DOWNLOADEDEVER),
- tor.getLong(RPC_UPLOADEDEVER),
- tor.getLong(RPC_TOTALSIZE),
+ tor.getLong(RPC_DOWNLOADEDEVER),
+ tor.getLong(RPC_UPLOADEDEVER),
+ tor.getLong(RPC_TOTALSIZE),
((float) tor.getDouble(RPC_PARTDONE)) / 100f, // Percentage to [0..1]
0f, // Not available
tor.has(RPC_LABEL)? tor.getString(RPC_LABEL): null,
@@ -686,7 +686,7 @@ public class DelugeAdapter implements IDaemonAdapter {
allLabels.add(new Label(labelAndCount.getString(0), labelAndCount.getInt(1)));
}
return allLabels;
-
+
}
private ArrayList parseJsonFileListing(JSONObject response, Torrent torrent) throws JSONException {
@@ -698,7 +698,7 @@ public class DelugeAdapter implements IDaemonAdapter {
JSONArray priorities = response.getJSONArray(RPC_FILEPRIORITIES);
if (objects != null) {
for (int j = 0; j < objects.length(); j++) {
-
+
JSONObject file = objects.getJSONObject(j);
// Add the parsed torrent to the list
files.add(new TorrentFile(
@@ -814,5 +814,5 @@ public class DelugeAdapter implements IDaemonAdapter {
public DaemonSettings getSettings() {
return this.settings;
}
-
+
}
diff --git a/lib/src/org/transdroid/daemon/DummyAdapter.java b/lib/src/org/transdroid/daemon/DummyAdapter.java
index d2ecc06c..dde6b1ef 100644
--- a/lib/src/org/transdroid/daemon/DummyAdapter.java
+++ b/lib/src/org/transdroid/daemon/DummyAdapter.java
@@ -1,19 +1,19 @@
/*
* This file is part of Transdroid
- *
+ *
* Transdroid is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* Transdroid is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with Transdroid. If not, see