From 9ab2b45ec8531658e3acf0b96b11a214ce8d3b60 Mon Sep 17 00:00:00 2001 From: "JesusFreke@JesusFreke.com" Date: Wed, 23 Dec 2009 05:26:13 +0000 Subject: [PATCH] whitespace fixes git-svn-id: https://smali.googlecode.com/svn/trunk@501 55b6fa8a-2a1e-11de-a435-ffa8d773f76a --- .../jf/dexlib/AnnotationDirectoryItem.java | 4 +- .../EncodedValue/AnnotationEncodedValue.java | 2 +- .../EncodedValue/BooleanEncodedValue.java | 6 +-- .../dexlib/EncodedValue/ByteEncodedValue.java | 4 +- .../EncodedValue/DoubleEncodedValue.java | 2 +- .../jf/dexlib/EncodedValue/EncodedValue.java | 4 +- .../EncodedValue/FloatEncodedValue.java | 2 +- .../dexlib/EncodedValue/IntEncodedValue.java | 2 +- .../dexlib/EncodedValue/NullEncodedValue.java | 2 +- .../EncodedValue/ShortEncodedValue.java | 2 +- .../dexlib/Util/ByteArrayAnnotatedOutput.java | 46 +++++++++---------- .../org/jf/dexlib/Util/ByteArrayOutput.java | 44 +++++++++--------- 12 files changed, 60 insertions(+), 60 deletions(-) diff --git a/dexlib/src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java b/dexlib/src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java index 38fdbe69..7b40f53d 100644 --- a/dexlib/src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java +++ b/dexlib/src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java @@ -322,7 +322,7 @@ public class AnnotationDirectoryItem extends Item { } /** - * Iterates over the field annotations, calling delegate.processFieldAnnotations for each + * Iterates over the field annotations, calling delegate.processFieldAnnotations for each * @param delegate the delegate to call */ public void iterateFieldAnnotations(FieldAnnotationIteratorDelegate delegate) { @@ -364,7 +364,7 @@ public class AnnotationDirectoryItem extends Item { } /** - * Iterates over the parameter annotations, calling delegate.processParameterAnnotations for each + * Iterates over the parameter annotations, calling delegate.processParameterAnnotations for each * @param delegate the delegate to call */ public void iterateParameterAnnotations(ParameterAnnotationIteratorDelegate delegate) { diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/AnnotationEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/AnnotationEncodedValue.java index 39490fbc..e203f73f 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/AnnotationEncodedValue.java +++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/AnnotationEncodedValue.java @@ -47,7 +47,7 @@ public class AnnotationEncodedValue extends AnnotationEncodedSubValue { /** * Constructs a new AnnotationEncodedValue with the given values. names and values must be the same - * length, and must be sorted according to the name + * length, and must be sorted according to the name * @param annotationType The type of the annotation * @param names An array of the names of the elements of the annotation * @param values An array of the values of the elements on the annotation diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/BooleanEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/BooleanEncodedValue.java index ac11c5f2..af837059 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/BooleanEncodedValue.java +++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/BooleanEncodedValue.java @@ -32,7 +32,7 @@ import org.jf.dexlib.Util.AnnotatedOutput; public class BooleanEncodedValue extends EncodedValue { /** - * The dupliton values + * The dupliton values */ public static final BooleanEncodedValue TrueValue = new BooleanEncodedValue(true); public static final BooleanEncodedValue FalseValue = new BooleanEncodedValue(false); @@ -51,7 +51,7 @@ public class BooleanEncodedValue extends EncodedValue { * Gets the BooleanEncodedValue for the given valueArg value. The high 3 bits of the first byte should * be passed as the valueArg parameter * @param valueArg The high 3 bits of the first byte of this encoded value - * @return the BooleanEncodedValue for the given valueArg value + * @return the BooleanEncodedValue for the given valueArg value */ protected static BooleanEncodedValue getBooleanEncodedValue(byte valueArg) { if (valueArg == 0) { @@ -59,7 +59,7 @@ public class BooleanEncodedValue extends EncodedValue { } else if (valueArg == 1) { return TrueValue; } - throw new RuntimeException("valueArg must be either 0 or 1"); + throw new RuntimeException("valueArg must be either 0 or 1"); } /** diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValue.java index 2a329330..d254e23c 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValue.java +++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValue.java @@ -41,7 +41,7 @@ public class ByteEncodedValue extends EncodedValue { * @param in The Input object to read from */ protected ByteEncodedValue(Input in) { - value = (byte)EncodedValueUtils.decodeSignedIntegralValue(in.readBytes(1)); + value = (byte)EncodedValueUtils.decodeSignedIntegralValue(in.readBytes(1)); } /** @@ -59,7 +59,7 @@ public class ByteEncodedValue extends EncodedValue { out.annotate(1, "value: 0x" + Integer.toHexString(value) + " (" + value + ")"); } out.writeByte(ValueType.VALUE_BYTE.value); - out.writeByte(value); + out.writeByte(value); } /** {@inheritDoc} */ diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/DoubleEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/DoubleEncodedValue.java index 3d7e09b9..09ee1c55 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/DoubleEncodedValue.java +++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/DoubleEncodedValue.java @@ -44,7 +44,7 @@ public class DoubleEncodedValue extends EncodedValue { */ protected DoubleEncodedValue(Input in, byte valueArg) { long longValue = EncodedValueUtils.decodeRightZeroExtendedValue(in.readBytes(valueArg + 1)); - value = Double.longBitsToDouble(longValue); + value = Double.longBitsToDouble(longValue); } /** diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedValue.java index 67a9a5ca..2291807f 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedValue.java +++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedValue.java @@ -100,9 +100,9 @@ public abstract class EncodedValue implements Comparable { /** * Compare the value of this EncodedValue against the value of the given , which - * is guaranteed to be of the same type as this EncodedValue + * is guaranteed to be of the same type as this EncodedValue * @param o The EncodedValue to compare against - * @return A standard comparison integer value + * @return A standard comparison integer value */ protected abstract int compareValue(EncodedValue o); diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/FloatEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/FloatEncodedValue.java index 0a2a41ff..495305fb 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/FloatEncodedValue.java +++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/FloatEncodedValue.java @@ -44,7 +44,7 @@ public class FloatEncodedValue extends EncodedValue { */ protected FloatEncodedValue(Input in, byte valueArg) { long longValue = EncodedValueUtils.decodeRightZeroExtendedValue(in.readBytes(valueArg + 1)); - value = Float.intBitsToFloat((int)((longValue >> 32) & 0xFFFFFFFFL)); + value = Float.intBitsToFloat((int)((longValue >> 32) & 0xFFFFFFFFL)); } /** diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValue.java index 1e96a7a3..0e30d61c 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValue.java +++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValue.java @@ -43,7 +43,7 @@ public class IntEncodedValue extends EncodedValue { * @param valueArg The high 3 bits of the first byte of this encoded value */ protected IntEncodedValue(Input in, byte valueArg) { - value = (int)EncodedValueUtils.decodeSignedIntegralValue(in.readBytes(valueArg+1)); + value = (int)EncodedValueUtils.decodeSignedIntegralValue(in.readBytes(valueArg+1)); } /** diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/NullEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/NullEncodedValue.java index 3b9d647f..1d13cebe 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/NullEncodedValue.java +++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/NullEncodedValue.java @@ -46,7 +46,7 @@ public class NullEncodedValue extends EncodedValue { public void writeValue(AnnotatedOutput out) { if (out.annotates()) { out.annotate("value_type=" + ValueType.VALUE_NULL.name() + ",value_arg=0"); - } + } out.writeByte(ValueType.VALUE_NULL.value); } diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValue.java index e038ed23..56345a22 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValue.java +++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValue.java @@ -43,7 +43,7 @@ public class ShortEncodedValue extends EncodedValue { * @param valueArg The high 3 bits of the first byte of this encoded value */ protected ShortEncodedValue(Input in, byte valueArg) { - value = (short) EncodedValueUtils.decodeSignedIntegralValue(in.readBytes(valueArg+1)); + value = (short) EncodedValueUtils.decodeSignedIntegralValue(in.readBytes(valueArg+1)); } /** diff --git a/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayAnnotatedOutput.java b/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayAnnotatedOutput.java index 6edcce54..67d46f5a 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayAnnotatedOutput.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayAnnotatedOutput.java @@ -35,7 +35,7 @@ import java.util.ArrayList; /** * Implementation of {@link AnnotatedOutput} which stores the written data * into a byte[]. - * + * *

Note: As per the {@link Output} interface, multi-byte * writes all use little-endian order.

*/ @@ -43,7 +43,7 @@ public final class ByteArrayAnnotatedOutput implements AnnotatedOutput { /** default size for stretchy instances */ private static final int DEFAULT_SIZE = 1000; - + /** * whether the instance is stretchy, that is, whether its array * may be resized to increase capacity @@ -61,7 +61,7 @@ public final class ByteArrayAnnotatedOutput /** * null-ok; list of annotations, or null if this instance - * isn't keeping them + * isn't keeping them */ private ArrayList annotations; @@ -70,7 +70,7 @@ public final class ByteArrayAnnotatedOutput /** * >= 8 (if used); the number of bytes of hex output to use - * in annotations + * in annotations */ private int hexCols; @@ -83,7 +83,7 @@ public final class ByteArrayAnnotatedOutput * particular, no reallocation will occur in order to expand the * capacity of the resulting instance. Also, the constructed * instance does not keep annotations by default. - * + * * @param data non-null; data array to use for output */ public ByteArrayAnnotatedOutput(byte[] data) { @@ -101,7 +101,7 @@ public final class ByteArrayAnnotatedOutput /** * Internal constructor. - * + * * @param data non-null; data array to use for output * @param stretchy whether the instance is to be stretchy */ @@ -122,9 +122,9 @@ public final class ByteArrayAnnotatedOutput /** * Gets the underlying byte[] of this instance, which * may be larger than the number of bytes written - * + * * @see #toByteArray - * + * * @return non-null; the byte[] */ public byte[] getArray() { @@ -135,9 +135,9 @@ public final class ByteArrayAnnotatedOutput * Constructs and returns a new byte[] that contains * the written contents exactly (that is, with no extra unwritten * bytes at the end). - * + * * @see #getArray - * + * * @return non-null; an appropriately-constructed array */ public byte[] toByteArray() { @@ -274,7 +274,7 @@ public final class ByteArrayAnnotatedOutput return count; } - + /** {@inheritDoc} */ public void write(ByteArray bytes) { int blen = bytes.size(); @@ -301,7 +301,7 @@ public final class ByteArrayAnnotatedOutput // twos-complement math trick: ((x < 0) || (y < 0)) <=> ((x|y) < 0) if (((offset | length | end) < 0) || (bytesEnd > bytes.length)) { throw new IndexOutOfBoundsException("bytes.length " + - bytes.length + "; " + + bytes.length + "; " + offset + "..!" + end); } @@ -449,7 +449,7 @@ public final class ByteArrayAnnotatedOutput * Indicates that this instance should keep annotations. This method may * be called only once per instance, and only before any data has been * written to the it. - * + * * @param annotationWidth >= 40; the desired maximum annotation width * @param verbose whether or not to indicate verbose annotations */ @@ -504,7 +504,7 @@ public final class ByteArrayAnnotatedOutput /** * Writes the annotated content of this instance to the given writer. - * + * * @param out non-null; where to write to */ public void writeAnnotationsTo(Writer out) throws IOException { @@ -573,7 +573,7 @@ public final class ByteArrayAnnotatedOutput /** * Reallocates the underlying array if necessary. Calls to this method * should be guarded by a test of {@link #stretchy}. - * + * * @param desiredSize >= 0; the desired minimum total size of the array */ private void ensureCapacity(int desiredSize) { @@ -593,7 +593,7 @@ public final class ByteArrayAnnotatedOutput /** * >= 0; end of annotated range (exclusive); - * Integer.MAX_VALUE if unclosed + * Integer.MAX_VALUE if unclosed */ private int end; @@ -604,7 +604,7 @@ public final class ByteArrayAnnotatedOutput /** * Constructs an instance. - * + * * @param start >= 0; start of annotated range * @param end >= start; end of annotated range (exclusive) or * Integer.MAX_VALUE if unclosed @@ -619,7 +619,7 @@ public final class ByteArrayAnnotatedOutput /** * Constructs an instance. It is initally unclosed. - * + * * @param start >= 0; start of annotated range * @param text non-null; annotation text */ @@ -630,7 +630,7 @@ public final class ByteArrayAnnotatedOutput /** * Sets the end as given, but only if the instance is unclosed; * otherwise, do nothing. - * + * * @param end >= start; the end */ public void setEndIfUnset(int end) { @@ -641,7 +641,7 @@ public final class ByteArrayAnnotatedOutput /** * Sets the end as given. - * + * * @param end >= start; the end */ public void setEnd(int end) { @@ -650,7 +650,7 @@ public final class ByteArrayAnnotatedOutput /** * Gets the start. - * + * * @return the start */ public int getStart() { @@ -659,7 +659,7 @@ public final class ByteArrayAnnotatedOutput /** * Gets the end. - * + * * @return the end */ public int getEnd() { @@ -668,7 +668,7 @@ public final class ByteArrayAnnotatedOutput /** * Gets the text. - * + * * @return non-null; the text */ public String getText() { diff --git a/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayOutput.java b/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayOutput.java index 8111f2d6..5150142f 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayOutput.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayOutput.java @@ -21,7 +21,7 @@ import java.util.ArrayList; /** * Implementation of {@link AnnotatedOutput} which stores the written data * into a byte[]. - * + * *

Note: As per the {@link Output} interface, multi-byte * writes all use little-endian order.

*/ @@ -29,7 +29,7 @@ public final class ByteArrayOutput implements Output { /** default size for stretchy instances */ private static final int DEFAULT_SIZE = 1000; - + /** * whether the instance is stretchy, that is, whether its array * may be resized to increase capacity @@ -47,7 +47,7 @@ public final class ByteArrayOutput implements Output /** * null-ok; list of annotations, or null if this instance - * isn't keeping them + * isn't keeping them */ private ArrayList annotations; @@ -56,7 +56,7 @@ public final class ByteArrayOutput implements Output /** * >= 8 (if used); the number of bytes of hex output to use - * in annotations + * in annotations */ private int hexCols; @@ -66,7 +66,7 @@ public final class ByteArrayOutput implements Output * particular, no reallocation will occur in order to expand the * capacity of the resulting instance. Also, the constructed * instance does not keep annotations by default. - * + * * @param data non-null; data array to use for output */ public ByteArrayOutput(byte[] data) { @@ -84,7 +84,7 @@ public final class ByteArrayOutput implements Output /** * Internal constructor. - * + * * @param data non-null; data array to use for output * @param stretchy whether the instance is to be stretchy */ @@ -105,9 +105,9 @@ public final class ByteArrayOutput implements Output /** * Gets the underlying byte[] of this instance, which * may be larger than the number of bytes written - * + * * @see #toByteArray - * + * * @return non-null; the byte[] */ public byte[] getArray() { @@ -118,9 +118,9 @@ public final class ByteArrayOutput implements Output * Constructs and returns a new byte[] that contains * the written contents exactly (that is, with no extra unwritten * bytes at the end). - * + * * @see #getArray - * + * * @return non-null; an appropriately-constructed array */ public byte[] toByteArray() { @@ -256,7 +256,7 @@ public final class ByteArrayOutput implements Output return count; } - + /** {@inheritDoc} */ public void write(ByteArray bytes) { int blen = bytes.size(); @@ -283,7 +283,7 @@ public final class ByteArrayOutput implements Output // twos-complement math trick: ((x < 0) || (y < 0)) <=> ((x|y) < 0) if (((offset | length | end) < 0) || (bytesEnd > bytes.length)) { throw new IndexOutOfBoundsException("bytes.length " + - bytes.length + "; " + + bytes.length + "; " + offset + "..!" + end); } @@ -404,7 +404,7 @@ public final class ByteArrayOutput implements Output * Indicates that this instance should keep annotations. This method may * be called only once per instance, and only before any data has been * written to the it. - * + * * @param annotationWidth >= 40; the desired maximum annotation width * @param verbose whether or not to indicate verbose annotations */ @@ -468,7 +468,7 @@ public final class ByteArrayOutput implements Output /** * Reallocates the underlying array if necessary. Calls to this method * should be guarded by a test of {@link #stretchy}. - * + * * @param desiredSize >= 0; the desired minimum total size of the array */ private void ensureCapacity(int desiredSize) { @@ -488,7 +488,7 @@ public final class ByteArrayOutput implements Output /** * >= 0; end of annotated range (exclusive); - * Integer.MAX_VALUE if unclosed + * Integer.MAX_VALUE if unclosed */ private int end; @@ -497,7 +497,7 @@ public final class ByteArrayOutput implements Output /** * Constructs an instance. - * + * * @param start >= 0; start of annotated range * @param end >= start; end of annotated range (exclusive) or * Integer.MAX_VALUE if unclosed @@ -511,7 +511,7 @@ public final class ByteArrayOutput implements Output /** * Constructs an instance. It is initally unclosed. - * + * * @param start >= 0; start of annotated range * @param text non-null; annotation text */ @@ -522,7 +522,7 @@ public final class ByteArrayOutput implements Output /** * Sets the end as given, but only if the instance is unclosed; * otherwise, do nothing. - * + * * @param end >= start; the end */ public void setEndIfUnset(int end) { @@ -533,7 +533,7 @@ public final class ByteArrayOutput implements Output /** * Sets the end as given. - * + * * @param end >= start; the end */ public void setEnd(int end) { @@ -542,7 +542,7 @@ public final class ByteArrayOutput implements Output /** * Gets the start. - * + * * @return the start */ public int getStart() { @@ -551,7 +551,7 @@ public final class ByteArrayOutput implements Output /** * Gets the end. - * + * * @return the end */ public int getEnd() { @@ -560,7 +560,7 @@ public final class ByteArrayOutput implements Output /** * Gets the text. - * + * * @return non-null; the text */ public String getText() {