Static type check for int params + migrate colorInt to just int.

Differential Revision: D2475618

committer: Service User <svcscm@fb.com>
This commit is contained in:
Krzysztof Magiera
2015-09-24 03:02:33 -07:00
committed by facebook-github-bot-9
parent 944fa4d635
commit 6c3fb77f30
17 changed files with 78 additions and 221 deletions

View File

@@ -20,8 +20,6 @@ public interface ReadableArray {
boolean getBoolean(int index);
double getDouble(int index);
int getInt(int index);
// Check CatalystStylesDiffMap#getColorInt() to see why this is needed
int getColorInt(int index);
String getString(int index);
ReadableArray getArray(int index);
ReadableMap getMap(int index);

View File

@@ -20,8 +20,6 @@ public interface ReadableMap {
boolean getBoolean(String name);
double getDouble(String name);
int getInt(String name);
// Check CatalystStylesDiffMap#getColorInt() to see why this is needed
int getColorInt(String name);
String getString(String name);
ReadableArray getArray(String name);
ReadableMap getMap(String name);

View File

@@ -32,6 +32,8 @@ public class ReadableNativeArray extends NativeArray implements ReadableArray {
@Override
public native double getDouble(int index);
@Override
public native int getInt(int index);
@Override
public native String getString(int index);
@Override
public native ReadableNativeArray getArray(int index);
@@ -39,15 +41,4 @@ public class ReadableNativeArray extends NativeArray implements ReadableArray {
public native ReadableNativeMap getMap(int index);
@Override
public native ReadableType getType(int index);
@Override
public int getInt(int index) {
return (int) getDouble(index);
}
// Check CatalystStylesDiffMap#getColorInt() to see why this is needed
@Override
public int getColorInt(int index) {
return (int) (long) getDouble(index);
}
}

View File

@@ -33,6 +33,8 @@ public class ReadableNativeMap extends NativeMap implements ReadableMap {
@Override
public native double getDouble(String name);
@Override
public native int getInt(String name);
@Override
public native String getString(String name);
@Override
public native ReadableNativeArray getArray(String name);
@@ -46,16 +48,6 @@ public class ReadableNativeMap extends NativeMap implements ReadableMap {
return new ReadableNativeMapKeySeyIterator(this);
}
@Override
public int getInt(String name) {
return (int) getDouble(name);
}
// Check CatalystStylesDiffMap#getColorInt() to see why this is needed
@Override
public int getColorInt(String name) {
return (int) (long) getDouble(name);
}
/**
* Implementation of a {@link ReadableNativeMap} iterator in native memory.
*/

View File

@@ -32,12 +32,9 @@ public class WritableNativeArray extends ReadableNativeArray implements Writable
@Override
public native void pushDouble(double value);
@Override
public native void pushString(String value);
public native void pushInt(int value);
@Override
public void pushInt(int value) {
pushDouble(value);
}
public native void pushString(String value);
// Note: this consumes the map so do not reuse it.
@Override

View File

@@ -30,15 +30,12 @@ public class WritableNativeMap extends ReadableNativeMap implements WritableMap
@Override
public native void putDouble(String key, double value);
@Override
public native void putInt(String key, int value);
@Override
public native void putString(String key, String value);
@Override
public native void putNull(String key);
@Override
public void putInt(String key, int value) {
putDouble(key, value);
}
// Note: this consumes the map so do not reuse it.
@Override
public void putMap(String key, WritableMap value) {