Merge branch 'master' into 4.0.x (Unbreak unit tests)

Conflicts:
	test/src/org/apache/cordova/test/junit/GapClientTest.java
	test/src/org/apache/cordova/test/userwebview.java
	test/src/org/apache/cordova/test/whitelist.java
This commit is contained in:
Andrew Grieve
2014-07-10 10:30:05 -04:00
23 changed files with 57 additions and 156 deletions
@@ -40,6 +40,18 @@ public class CordovaPreferences {
prefs.put(name.toLowerCase(Locale.ENGLISH), value);
}
public void set(String name, boolean value) {
set(name, "" + value);
}
public void set(String name, int value) {
set(name, "" + value);
}
public void set(String name, double value) {
set(name, "" + value);
}
public Map<String, String> getAll() {
return prefs;
}