Revert "just to save works"

This reverts commit 8a55450d62.
This commit is contained in:
hyb1996
2017-10-31 14:07:37 +08:00
parent 8a55450d62
commit a30019ab77
14 changed files with 34 additions and 247 deletions

View File

@@ -351,19 +351,13 @@ public class UiGlobalSelector {
return this;
}
/**
* Note: The method use a dirty template to make its child class can
* change the type of return value.
*/
@SuppressWarnings("unchecked")
public <T> T findOf(UiObject node) {
public UiObjectCollection findOf(UiObject node) {
List<UiObject> list = new ArrayList<>();
list.add(node);
for (ListFilter filter : mFilters) {
list = filter.filter(list);
}
return (T) UiObjectCollection.of(list);
return UiObjectCollection.of(list);
}
@Nullable

View File

@@ -97,7 +97,7 @@ public class UiObject extends AccessibilityNodeInfoCompat {
}
}
public <T> T find(UiGlobalSelector selector) {
public UiObjectCollection find(UiGlobalSelector selector) {
return selector.findOf(this);
}
@@ -105,13 +105,12 @@ public class UiObject extends AccessibilityNodeInfoCompat {
return selector.findOneOf(this);
}
@SuppressWarnings("unchecked")
public <T> T children() {
public UiObjectCollection children() {
ArrayList<AccessibilityNodeInfoCompat> list = new ArrayList<>(getChildCount());
for (int i = 0; i < getChildCount(); i++) {
list.add(getChild(i));
}
return (T) UiObjectCollection.ofCompat(list);
return UiObjectCollection.ofCompat(list);
}
public int childCount() {

View File

@@ -2,7 +2,6 @@ package com.stardust.automator;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
import android.view.accessibility.AccessibilityNodeInfo;
@@ -11,11 +10,8 @@ import com.stardust.util.Consumer;
import com.stardust.util.Func1;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.*;
import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_CONTEXT_CLICK;
@@ -31,7 +27,7 @@ import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.
* Created by Stardust on 2017/3/9.
*/
public class UiObjectCollection implements List<UiObject> {
public class UiObjectCollection {
public static final UiObjectCollection EMPTY = UiObjectCollection.of(Collections.<UiObject>emptyList());
@@ -53,7 +49,7 @@ public class UiObjectCollection implements List<UiObject> {
private List<UiObject> mNodes;
protected UiObjectCollection(List<UiObject> list) {
private UiObjectCollection(List<UiObject> list) {
mNodes = list;
}
@@ -193,126 +189,14 @@ public class UiObjectCollection implements List<UiObject> {
new ActionArgument.IntActionArgument(ACTION_ARGUMENT_COLUMN_INT, column));
}
@Override
public UiObject get(int i) {
return mNodes.get(i);
}
@Override
public UiObject set(int index, UiObject element) {
return mNodes.set(index, element);
}
@Override
public void add(int index, UiObject element) {
mNodes.add(index, element);
}
@Override
public UiObject remove(int index) {
return mNodes.remove(index);
}
@Override
public int indexOf(Object o) {
return mNodes.indexOf(o);
}
@Override
public int lastIndexOf(Object o) {
return mNodes.lastIndexOf(o);
}
@NonNull
@Override
public ListIterator<UiObject> listIterator() {
return mNodes.listIterator();
}
@NonNull
@Override
public ListIterator<UiObject> listIterator(int index) {
return mNodes.listIterator(index);
}
@NonNull
@Override
public UiObjectCollection subList(int fromIndex, int toIndex) {
return UiObjectCollection.of(mNodes.subList(fromIndex, toIndex));
}
public int size() {
return mNodes.size();
}
@Override
public boolean isEmpty() {
return mNodes.isEmpty();
}
@Override
public boolean contains(Object o) {
return mNodes.contains(o);
}
@NonNull
@Override
public Iterator<UiObject> iterator() {
return mNodes.iterator();
}
@NonNull
@Override
public Object[] toArray() {
return mNodes.toArray();
}
@NonNull
@Override
public <T> T[] toArray(@NonNull T[] a) {
return mNodes.toArray(a);
}
@Override
public boolean add(UiObject uiObject) {
return mNodes.add(uiObject);
}
@Override
public boolean remove(Object o) {
return mNodes.remove(o);
}
@Override
public boolean containsAll(@NonNull Collection<?> c) {
return mNodes.containsAll(c);
}
@Override
public boolean addAll(@NonNull Collection<? extends UiObject> c) {
return mNodes.addAll(c);
}
@Override
public boolean addAll(int index, @NonNull Collection<? extends UiObject> c) {
return mNodes.addAll(index, c);
}
@Override
public boolean removeAll(@NonNull Collection<?> c) {
return mNodes.retainAll(c);
}
@Override
public boolean retainAll(@NonNull Collection<?> c) {
return mNodes.retainAll(c);
}
@Override
public void clear() {
mNodes.clear();
}
public UiObjectCollection each(Consumer<UiObject> consumer) {
for (UiObject uiObject : mNodes) {
consumer.accept(uiObject);
@@ -332,7 +216,7 @@ public class UiObjectCollection implements List<UiObject> {
public UiObjectCollection find(UiGlobalSelector selector) {
List<UiObject> list = new ArrayList<>();
for (UiObject object : mNodes) {
list.addAll(((UiObjectCollection) selector.findOf(object)).mNodes);
list.addAll(selector.findOf(object).mNodes);
}
return of(list);
}
@@ -348,11 +232,11 @@ public class UiObjectCollection implements List<UiObject> {
}
public boolean empty() {
return isEmpty();
return size() == 0;
}
public boolean nonEmpty() {
return !isEmpty();
return size() != 0;
}
}