Johannes/gson-comments
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

renamed JsonArray.contains() to has() to be consistent with JsonObject.has()

Browse Source
This commit is contained in:
Inderjeet Singh 2014-07-03 17:31:07 +00:00
parent 06282a4d13
commit 94e21eca21
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gson/src/main/java/com/google/gson/JsonArray.java
View File

@ -87,6 +87,7 @@ public final class JsonArray extends JsonElement implements Iterable<JsonElement
* If the array does not contain the element, it is unchanged. * If the array does not contain the element, it is unchanged.
* @param element element to be removed from this array, if present * @param element element to be removed from this array, if present
* @return true if this array contained the specified element, false otherwise * @return true if this array contained the specified element, false otherwise
* @since 2.3
*/ */
public boolean remove(JsonElement element) { public boolean remove(JsonElement element) {
return elements.remove(element); return elements.remove(element);
@ -99,6 +100,7 @@ public final class JsonArray extends JsonElement implements Iterable<JsonElement
* @param index index the index of the element to be removed * @param index index the index of the element to be removed
* @return the element previously at the specified position * @return the element previously at the specified position
* @throws IndexOutOfBoundsException if the specified index is outside the array bounds * @throws IndexOutOfBoundsException if the specified index is outside the array bounds
* @since 2.3
*/ */
public JsonElement remove(int index) { public JsonElement remove(int index) {
return elements.remove(index); return elements.remove(index);
@ -108,8 +110,9 @@ public final class JsonArray extends JsonElement implements Iterable<JsonElement
* Returns true if this array contains the specified element. * Returns true if this array contains the specified element.
* @return true if this array contains the specified element. * @return true if this array contains the specified element.
* @param element whose presence in this array is to be tested * @param element whose presence in this array is to be tested
* @since 2.3
*/ */
public boolean contains(JsonElement element) { public boolean has(JsonElement element) {
return elements.contains(element); return elements.contains(element);
} }

4
gson/src/test/java/com/google/gson/JsonArrayTest.java
View File

@ -60,12 +60,12 @@ public final class JsonArrayTest extends TestCase {
JsonPrimitive a = new JsonPrimitive("a"); JsonPrimitive a = new JsonPrimitive("a");
array.add(a); array.add(a);
assertTrue(array.remove(a)); assertTrue(array.remove(a));
assertFalse(array.contains(a)); assertFalse(array.has(a));
array.add(a); array.add(a);
array.add(new JsonPrimitive("b")); array.add(new JsonPrimitive("b"));
assertEquals("b", array.remove(1).getAsString()); assertEquals("b", array.remove(1).getAsString());
assertEquals(1, array.size()); assertEquals(1, array.size());
assertTrue(array.contains(a)); assertTrue(array.has(a));
} }
public void testSet() { public void testSet() {