Merge "Formatting fixes to RPC directory (1/2)"
diff --git a/Common/src/com/googlecode/android_scripting/rpc/Converter.java b/Common/src/com/googlecode/android_scripting/rpc/Converter.java
index ff44a21..e82ea2a 100644
--- a/Common/src/com/googlecode/android_scripting/rpc/Converter.java
+++ b/Common/src/com/googlecode/android_scripting/rpc/Converter.java
@@ -19,10 +19,9 @@
/**
* A converter can take a String and turn it into an instance of type T (the type parameter to the
* converter).
- *
*/
public interface Converter<T> {
- /** Convert a string into type T. */
- T convert(String value);
+ /** Convert a string into type T. */
+ T convert(String value);
}
diff --git a/Common/src/com/googlecode/android_scripting/rpc/ParameterDescriptor.java b/Common/src/com/googlecode/android_scripting/rpc/ParameterDescriptor.java
index 90009f1..a619642 100644
--- a/Common/src/com/googlecode/android_scripting/rpc/ParameterDescriptor.java
+++ b/Common/src/com/googlecode/android_scripting/rpc/ParameterDescriptor.java
@@ -20,22 +20,21 @@
/**
* RPC parameter description.
- *
*/
public final class ParameterDescriptor {
- private final String value;
- private final Type type;
+ private final String value;
+ private final Type type;
- public ParameterDescriptor(String value, Type type) {
- this.value = value;
- this.type = type;
- }
+ public ParameterDescriptor(String value, Type type) {
+ this.value = value;
+ this.type = type;
+ }
- public String getValue() {
- return value;
- }
+ public String getValue() {
+ return value;
+ }
- public Type getType() {
- return type;
- }
+ public Type getType() {
+ return type;
+ }
}
diff --git a/Common/src/com/googlecode/android_scripting/rpc/Rpc.java b/Common/src/com/googlecode/android_scripting/rpc/Rpc.java
index 2156bbd..d175c0a 100644
--- a/Common/src/com/googlecode/android_scripting/rpc/Rpc.java
+++ b/Common/src/com/googlecode/android_scripting/rpc/Rpc.java
@@ -31,13 +31,13 @@
@Target(ElementType.METHOD)
@Documented
public @interface Rpc {
- /**
- * Returns brief description of the function. Should be limited to one or two sentences.
- */
- String description();
+ /**
+ * Returns brief description of the function. Should be limited to one or two sentences.
+ */
+ String description();
- /**
- * Gives a brief description of the functions return value (and the underlying data structure).
- */
- String returns() default "";
+ /**
+ * Gives a brief description of the functions return value (and the underlying data structure).
+ */
+ String returns() default "";
}
diff --git a/Common/src/com/googlecode/android_scripting/rpc/RpcDefault.java b/Common/src/com/googlecode/android_scripting/rpc/RpcDefault.java
index 1c0eaa9..3dacfb4 100644
--- a/Common/src/com/googlecode/android_scripting/rpc/RpcDefault.java
+++ b/Common/src/com/googlecode/android_scripting/rpc/RpcDefault.java
@@ -24,15 +24,14 @@
/**
* Use this annotation to mark an RPC parameter that have a default value.
- *
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.PARAMETER)
@Documented
public @interface RpcDefault {
- /** The default value of the RPC parameter. */
- public String value();
+ /** The default value of the RPC parameter. */
+ public String value();
- @SuppressWarnings("rawtypes")
- public Class<? extends Converter> converter() default Converter.class;
+ @SuppressWarnings("rawtypes")
+ public Class<? extends Converter> converter() default Converter.class;
}
diff --git a/Common/src/com/googlecode/android_scripting/rpc/RpcDeprecated.java b/Common/src/com/googlecode/android_scripting/rpc/RpcDeprecated.java
index d8b7b75..884372a 100644
--- a/Common/src/com/googlecode/android_scripting/rpc/RpcDeprecated.java
+++ b/Common/src/com/googlecode/android_scripting/rpc/RpcDeprecated.java
@@ -29,9 +29,9 @@
@Target(ElementType.METHOD)
@Documented
public @interface RpcDeprecated {
- /** The method that replaced this one. */
- public String value();
+ /** The method that replaced this one. */
+ public String value();
- /** Release of SL4A when deprecation occurred. */
- public String release() default "r4";
+ /** Release of SL4A when deprecation occurred. */
+ public String release() default "r4";
}
diff --git a/Common/src/com/googlecode/android_scripting/rpc/RpcError.java b/Common/src/com/googlecode/android_scripting/rpc/RpcError.java
index 198c4cf..e1ea078 100644
--- a/Common/src/com/googlecode/android_scripting/rpc/RpcError.java
+++ b/Common/src/com/googlecode/android_scripting/rpc/RpcError.java
@@ -19,8 +19,8 @@
@SuppressWarnings("serial")
public class RpcError extends Exception {
- public RpcError(String message) {
- super(message);
- }
+ public RpcError(String message) {
+ super(message);
+ }
}
diff --git a/Common/src/com/googlecode/android_scripting/rpc/RpcMinSdk.java b/Common/src/com/googlecode/android_scripting/rpc/RpcMinSdk.java
index bf5486a..8e226c0 100644
--- a/Common/src/com/googlecode/android_scripting/rpc/RpcMinSdk.java
+++ b/Common/src/com/googlecode/android_scripting/rpc/RpcMinSdk.java
@@ -22,11 +22,10 @@
/**
* Use this annotation to specify minimum SDK level (if higher than 3).
- *
*/
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface RpcMinSdk {
- /** Minimum SDK Level. */
- public int value();
+ /** Minimum SDK Level. */
+ public int value();
}
diff --git a/Common/src/com/googlecode/android_scripting/rpc/RpcName.java b/Common/src/com/googlecode/android_scripting/rpc/RpcName.java
index bb7aa07..ecd3332 100644
--- a/Common/src/com/googlecode/android_scripting/rpc/RpcName.java
+++ b/Common/src/com/googlecode/android_scripting/rpc/RpcName.java
@@ -24,12 +24,11 @@
/**
* Use this annotation to mark an RPC parameter that have a default value.
- *
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
@Documented
public @interface RpcName {
- /** The default value of the RPC parameter. */
- public String name();
+ /** The default value of the RPC parameter. */
+ public String name();
}
diff --git a/Common/src/com/googlecode/android_scripting/rpc/RpcParameter.java b/Common/src/com/googlecode/android_scripting/rpc/RpcParameter.java
index 2ccef67..76421e7 100644
--- a/Common/src/com/googlecode/android_scripting/rpc/RpcParameter.java
+++ b/Common/src/com/googlecode/android_scripting/rpc/RpcParameter.java
@@ -24,21 +24,19 @@
/**
* An annotation that is used to document the parameters of an RPC.
- *
- *
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.PARAMETER)
@Documented
public @interface RpcParameter {
- /**
- * The name of the formal parameter. This should be in agreement with the java code.
- */
- public String name();
+ /**
+ * The name of the formal parameter. This should be in agreement with the java code.
+ */
+ public String name();
- /**
- * Description of the RPC. This should be a short descriptive statement without a full stop, such
- * as 'disables the WiFi mode'.
- */
- public String description() default "";
+ /**
+ * Description of the RPC. This should be a short descriptive statement without a full stop, such
+ * as 'disables the WiFi mode'.
+ */
+ public String description() default "";
}
diff --git a/Common/src/com/googlecode/android_scripting/rpc/RpcStartEvent.java b/Common/src/com/googlecode/android_scripting/rpc/RpcStartEvent.java
index b412c75..049c252 100644
--- a/Common/src/com/googlecode/android_scripting/rpc/RpcStartEvent.java
+++ b/Common/src/com/googlecode/android_scripting/rpc/RpcStartEvent.java
@@ -24,12 +24,11 @@
/**
* Use this annotation to mark an RPC as one that starts generating events.
- *
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
@Documented
public @interface RpcStartEvent {
- /** The name of the event that is generated. */
- public String value();
+ /** The name of the event that is generated. */
+ public String value();
}
diff --git a/Common/src/com/googlecode/android_scripting/rpc/RpcStopEvent.java b/Common/src/com/googlecode/android_scripting/rpc/RpcStopEvent.java
index 5a82fa3..1acf52d 100644
--- a/Common/src/com/googlecode/android_scripting/rpc/RpcStopEvent.java
+++ b/Common/src/com/googlecode/android_scripting/rpc/RpcStopEvent.java
@@ -24,12 +24,11 @@
/**
* Use this annotation to mark an RPC as one that stops generating events.
- *
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
@Documented
public @interface RpcStopEvent {
- /** The name of the event that stops being generated. */
- public String value();
+ /** The name of the event that stops being generated. */
+ public String value();
}
