Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1046880 - Throw custom exception when a property does not exist or has the wrong type; r=blassey

Browse Source
This commit is contained in:
Jim Chen 2014-08-06 14:38:29 -04:00
parent 239833cc61
commit 2c9c0f8dad
2 changed files with 85 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
mobile/android/base/util/NativeJSObject.java
View File

@ -16,6 +16,14 @@ import android.os.Bundle;
@JNITarget
public class NativeJSObject
{
@SuppressWarnings("serial")
@JNITarget
public static final class InvalidPropertyException extends RuntimeException {
public InvalidPropertyException(final String msg) {
super(msg);
}
}
private final NativeJSContainer mContainer;
private final int mObjectIndex;
@ -35,9 +43,11 @@ public class NativeJSObject
* @param name
* Property name
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property does not exist or if its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -53,9 +63,11 @@ public class NativeJSObject
* @param fallback
* Value to return if property does not exist
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property exists and its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -69,9 +81,11 @@ public class NativeJSObject
* @param name
* Property name
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property does not exist or if its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -87,9 +101,11 @@ public class NativeJSObject
* @param fallback
* Value to return if property does not exist
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property exists and its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -103,9 +119,11 @@ public class NativeJSObject
* @param name
* Property name
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property does not exist or if its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -121,9 +139,11 @@ public class NativeJSObject
* @param fallback
* Value to return if property does not exist
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property exists and its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -137,9 +157,11 @@ public class NativeJSObject
* @param name
* Property name
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property does not exist or if its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -155,9 +177,11 @@ public class NativeJSObject
* @param fallback
* Value to return if property does not exist
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property exists and its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -171,9 +195,11 @@ public class NativeJSObject
* @param name
* Property name
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property does not exist or if its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -189,9 +215,11 @@ public class NativeJSObject
* @param fallback
* Value to return if property does not exist
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property exists and its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -205,9 +233,11 @@ public class NativeJSObject
* @param name
* Property name
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property does not exist or if its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -223,9 +253,11 @@ public class NativeJSObject
* @param fallback
* Value to return if property does not exist
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property exists and its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -239,9 +271,11 @@ public class NativeJSObject
* @param name
* Property name
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property does not exist or if its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -257,9 +291,11 @@ public class NativeJSObject
* @param fallback
* Value to return if property does not exist
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property exists and its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -273,9 +309,11 @@ public class NativeJSObject
* @param name
* Property name
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property does not exist or if its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -291,9 +329,11 @@ public class NativeJSObject
* @param fallback
* Value to return if property does not exist
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property exists and its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -307,9 +347,11 @@ public class NativeJSObject
* @param name
* Property name
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property does not exist or if its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -325,9 +367,11 @@ public class NativeJSObject
* @param fallback
* Value to return if property does not exist
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property exists and its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -341,9 +385,11 @@ public class NativeJSObject
* @param name
* Property name
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property does not exist or if its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -359,9 +405,11 @@ public class NativeJSObject
* @param fallback
* Value to return if property does not exist
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property exists and its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -375,9 +423,11 @@ public class NativeJSObject
* @param name
* Property name
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property does not exist or if its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -393,9 +443,11 @@ public class NativeJSObject
* @param fallback
* Value to return if property does not exist
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property exists and its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -409,9 +461,11 @@ public class NativeJSObject
* @param name
* Property name
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property does not exist or if its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -427,9 +481,11 @@ public class NativeJSObject
* @param fallback
* Value to return if property does not exist
* @throws IllegalArgumentException
* If name is null
* @throws InvalidPropertyException
* If the property exists and its type does not match the return type
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException
@ -442,8 +498,10 @@ public class NativeJSObject
*
* @param name
* Property name
* @throws IllegalArgumentException
* If name is null
* @throws NullPointerException
* If name is null or if this JS object has been disposed
* If this JS object has been disposed
* @throws IllegalThreadStateException
* If not called on the thread this object is attached to
* @throws UnsupportedOperationException

4
widget/android/NativeJSContainer.cpp
View File

@ -407,7 +407,7 @@ template <bool (*InValue)(JSContext*, JS::HandleValue)> bool
CheckProperty(JNIEnv* env, JSContext* cx, JS::HandleValue val) {
if (!(*InValue)(cx, val)) {
AndroidBridge::ThrowException(env,
"java/lang/IllegalArgumentException",
"org/mozilla/gecko/util/NativeJSObject$InvalidPropertyException",
"Property type mismatch");
return false;
}
@ -678,7 +678,7 @@ GetProperty(JNIEnv* env, jobject instance, jstring name,
if (val.isUndefined() || val.isNull()) {
if (option == FallbackOption::THROW) {
AndroidBridge::ThrowException(env,
"java/lang/IllegalArgumentException",
"org/mozilla/gecko/util/NativeJSObject$InvalidPropertyException",
"Property does not exist");
}
return fallback;