#362 fix

google-style.xml

@@ -42,7 +42,7 @@
             <property name="allowNonPrintableEscapes" value="true"/>
         </module>
         <module name="LineLength">
-            <property name="max" value="100"/>
+            <property name="max" value="120"/>
             <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
         </module>
         <module name="AvoidStarImport">
@@ -181,9 +181,12 @@
             <property name="allowSamelineMultipleAnnotations" value="true"/>
         </module>
         <module name="NonEmptyAtclauseDescription"/>
-        <module name="JavadocTagContinuationIndentation"/>
+        <module name="JavadocTagContinuationIndentation">
+			<property name="severity" value="warning"/>
+		</module>
         <module name="SummaryJavadoc">
             <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
+			<property name="severity" value="warning"/>
         </module>
         <module name="JavadocParagraph">
 			<property name="severity" value="warning"/>

src/main/java/io/appium/java_client/AppiumDriver.java

@@ -261,7 +261,7 @@ public List<T> findElementsByXPath(String using) {
     }
 
     @Override public List<T> findElementsByAccessibilityId(String using) {
-        return (List<T>) findElements("accessibility id", using);
+        return super.findElementsByAccessibilityId(using);
     }
 
     @Override protected Response execute(String command) {

src/main/java/io/appium/java_client/DefaultGenericMobileDriver.java

@@ -16,15 +16,6 @@
 
 package io.appium.java_client;
 
-import io.appium.java_client.generic.searchcontext.GenericFindsByClassName;
-import io.appium.java_client.generic.searchcontext.GenericFindsByCssSelector;
-import io.appium.java_client.generic.searchcontext.GenericFindsById;
-import io.appium.java_client.generic.searchcontext.GenericFindsByLinkText;
-import io.appium.java_client.generic.searchcontext.GenericFindsByName;
-import io.appium.java_client.generic.searchcontext.GenericFindsByTagName;
-import io.appium.java_client.generic.searchcontext.GenericFindsByXPath;
-import io.appium.java_client.generic.searchcontext.GenericSearchContext;
-
 import org.openqa.selenium.By;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriverException;
@@ -39,9 +30,7 @@
 
 @SuppressWarnings({"unchecked", "rawtypes"})
 abstract class DefaultGenericMobileDriver<T extends WebElement> extends RemoteWebDriver
-    implements GenericSearchContext<T>, GenericFindsById<T>, GenericFindsByXPath<T>,
-    GenericFindsByLinkText<T>, GenericFindsByTagName<T>, GenericFindsByClassName<T>,
-    GenericFindsByCssSelector<T>, GenericFindsByName<T>, MobileDriver {
+    implements MobileDriver<T> {
 
     public DefaultGenericMobileDriver(CommandExecutor executor, Capabilities desiredCapabilities) {
         super(executor, desiredCapabilities);

src/main/java/io/appium/java_client/DefaultGenericMobileElement.java

@@ -16,16 +16,6 @@
 
 package io.appium.java_client;
 
-import io.appium.java_client.generic.searchcontext.GenericFindsByClassName;
-import io.appium.java_client.generic.searchcontext.GenericFindsByCssSelector;
-import io.appium.java_client.generic.searchcontext.GenericFindsById;
-import io.appium.java_client.generic.searchcontext.GenericFindsByLinkText;
-import io.appium.java_client.generic.searchcontext.GenericFindsByName;
-import io.appium.java_client.generic.searchcontext.GenericFindsByTagName;
-import io.appium.java_client.generic.searchcontext.GenericFindsByXPath;
-import io.appium.java_client.generic.searchcontext.GenericSearchContext;
-
-
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.WebElement;
@@ -37,10 +27,7 @@
 
 @SuppressWarnings({"unchecked", "rawtypes"})
 abstract class DefaultGenericMobileElement<T extends WebElement> extends RemoteWebElement
-    implements GenericSearchContext<T>, GenericFindsById<T>, GenericFindsByXPath<T>,
-    GenericFindsByLinkText<T>, GenericFindsByTagName<T>, GenericFindsByClassName<T>,
-    GenericFindsByCssSelector<T>, GenericFindsByName<T>, FindsByAccessibilityId<T>,
-    TouchableElement {
+    implements FindsByAccessibilityId<T>, TouchableElement<T> {
 
     @Override public Response execute(String driverCommand, Map<String, ?> parameters) {
         return super.execute(driverCommand, parameters);
@@ -50,10 +37,18 @@ abstract class DefaultGenericMobileElement<T extends WebElement> extends RemoteW
         return super.findElements(by);
     }
 
+    @Override public List findElements(String by, String using) {
+        return super.findElements(by, using);
+    }
+
     @Override public T findElement(By by) {
         return (T) super.findElement(by);
     }
 
+    @Override public T findElement(String by, String using) {
+        return (T) super.findElement(by, using);
+    }
+
     @Override public List findElementsById(String id) {
         return super.findElementsById(id);
     }

src/main/java/io/appium/java_client/MobileDriver.java

@@ -16,17 +16,64 @@
 
 package io.appium.java_client;
 
+import org.openqa.selenium.By;
 import org.openqa.selenium.ContextAware;
 import org.openqa.selenium.Rotatable;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.html5.LocationContext;
+import org.openqa.selenium.internal.FindsByClassName;
+import org.openqa.selenium.internal.FindsByCssSelector;
+import org.openqa.selenium.internal.FindsById;
+import org.openqa.selenium.internal.FindsByLinkText;
+import org.openqa.selenium.internal.FindsByName;
+import org.openqa.selenium.internal.FindsByTagName;
+import org.openqa.selenium.internal.FindsByXPath;
 import org.openqa.selenium.remote.Response;
 
+import java.util.List;
 import java.util.Map;
 
-public interface MobileDriver extends WebDriver, PerformsTouchActions, ContextAware, Rotatable,
-    FindsByAccessibilityId<WebElement>, LocationContext, DeviceActionShortcuts, TouchShortcuts,
-    InteractsWithFiles, InteractsWithApps, HasAppStrings {
+public interface MobileDriver<T extends WebElement> extends WebDriver, PerformsTouchActions, ContextAware, Rotatable,
+    FindsByAccessibilityId<T>, LocationContext, DeviceActionShortcuts, TouchShortcuts,
+    InteractsWithFiles, InteractsWithApps, HasAppStrings, FindsByClassName, FindsByCssSelector, FindsById,
+        FindsByLinkText, FindsByName, FindsByTagName, FindsByXPath {
+
     Response execute(String driverCommand, Map<String, ?> parameters);
+
+    List<T> findElements(By by);
+
+    T findElement(By by);
+
+    T findElementByClassName(String className);
+
+    List<T> findElementsByClassName(String className);
+
+    T findElementByCssSelector(String cssSelector);
+
+    List<T> findElementsByCssSelector(String cssSelector);
+
+    T findElementById(String id);
+
+    List<T> findElementsById(String id);
+
+    T findElementByLinkText(String linkText);
+
+    List<T> findElementsByLinkText(String linkText);
+
+    T findElementByPartialLinkText(String partialLinkText);
+
+    List<T> findElementsByPartialLinkText(String partialLinkText);
+
+    T findElementByName(String name);
+
+    List<T> findElementsByName(String name);
+
+    T findElementByTagName(String tagName);
+
+    List<T> findElementsByTagName(String tagName);
+
+    T findElementByXPath(String xPath);
+
+    List<T> findElementsByXPath(String xPath);
 }

src/main/java/io/appium/java_client/MobileElement.java

@@ -19,10 +19,8 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.Point;
-import org.openqa.selenium.WebElement;
 import org.openqa.selenium.remote.FileDetector;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @SuppressWarnings({"unchecked"})
@@ -69,6 +67,10 @@ public Point getCenter() {
         return super.findElements(by);
     }
 
+    @Override public List<MobileElement> findElements(String by, String using) {
+        return super.findElements(by, using);
+    }
+
     @Override public List<MobileElement> findElementsById(String id) {
         return super.findElementsById(id);
     }
@@ -102,11 +104,6 @@ public List<MobileElement> findElementsByXPath(String using) {
     }
 
     @Override public List<MobileElement> findElementsByAccessibilityId(String using) {
-        List<MobileElement> result = new ArrayList<MobileElement>();
-        List<WebElement> found = findElements("accessibility id", using);
-        for (WebElement e : found) {
-            result.add((MobileElement) e);
-        }
-        return result;
+        return super.findElementsByAccessibilityId(using);
     }
 }

src/main/java/io/appium/java_client/TouchableElement.java

@@ -16,13 +16,61 @@
 
 package io.appium.java_client;
 
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
+import org.openqa.selenium.internal.FindsByClassName;
+import org.openqa.selenium.internal.FindsByCssSelector;
+import org.openqa.selenium.internal.FindsById;
+import org.openqa.selenium.internal.FindsByLinkText;
+import org.openqa.selenium.internal.FindsByName;
+import org.openqa.selenium.internal.FindsByTagName;
+import org.openqa.selenium.internal.FindsByXPath;
+
+import java.util.List;
 
 /**
  * It supposed that mobile elements could be tappable, swipeable, zoomable and so on.
  * This interface extends {@link WebElement} and describes this behavior.
  */
-public interface TouchableElement extends WebElement {
+public interface TouchableElement<T extends WebElement> extends WebElement, FindsByClassName,
+        FindsByCssSelector, FindsById,
+        FindsByLinkText, FindsByName, FindsByTagName, FindsByXPath {
+
+    List<T> findElements(By by);
+
+    T findElement(By by);
+
+    T findElementByClassName(String className);
+
+    List<T> findElementsByClassName(String className);
+
+    T findElementByCssSelector(String cssSelector);
+
+    List<T> findElementsByCssSelector(String cssSelector);
+
+    T findElementById(String id);
+
+    List<T> findElementsById(String id);
+
+    T findElementByLinkText(String linkText);
+
+    List<T> findElementsByLinkText(String linkText);
+
+    T findElementByPartialLinkText(String partialLinkText);
+
+    List<T> findElementsByPartialLinkText(String partialLinkText);
+
+    T findElementByName(String name);
+
+    List<T> findElementsByName(String name);
+
+    T findElementByTagName(String tagName);
+
+    List<T> findElementsByTagName(String tagName);
+
+    T findElementByXPath(String xPath);
+
+    List<T> findElementsByXPath(String xPath);
 
     /**
      * Convenience method for pinching the given element.

src/main/java/io/appium/java_client/android/AndroidElement.java

@@ -23,9 +23,7 @@
 import io.appium.java_client.MobileElement;
 
 import org.openqa.selenium.WebDriverException;
-import org.openqa.selenium.WebElement;
 
-import java.util.ArrayList;
 import java.util.List;
 
 
@@ -37,20 +35,15 @@ public class AndroidElement extends MobileElement
      */
     @Override public MobileElement findElementByAndroidUIAutomator(String using)
         throws WebDriverException {
-        return (MobileElement) findElement("-android uiautomator", using);
+        return findElement("-android uiautomator", using);
     }
 
     /**
      * @throws WebDriverException This method is not applicable with browser/webview UI.
      */
     @Override public List<MobileElement> findElementsByAndroidUIAutomator(String using)
         throws WebDriverException {
-        List<MobileElement> result = new ArrayList<MobileElement>();
-        List<WebElement> found = findElements("-android uiautomator", using);
-        for (WebElement e : found) {
-            result.add((AndroidElement) e);
-        }
-        return result;
+        return findElements("-android uiautomator", using);
     }
 
     /**

src/main/java/io/appium/java_client/generic/searchcontext/GenericFindsByClassName.java

@@ -20,6 +20,12 @@
 
 import java.util.List;
 
+@Deprecated
+/**
+ * This interface became deprecated. Use
+ * {@link org.openqa.selenium.internal.FindsByClassName}
+ * instead.
+ */
 public interface GenericFindsByClassName<T extends WebElement> {
     T findElementByClassName(String className);
 

src/main/java/io/appium/java_client/generic/searchcontext/GenericFindsByCssSelector.java

@@ -20,6 +20,12 @@
 
 import java.util.List;
 
+@Deprecated
+/**
+ * This interface became deprecated. Use
+ * {@link org.openqa.selenium.internal.FindsByCssSelector}
+ * instead.
+ */
 public interface GenericFindsByCssSelector<T extends WebElement> {
     T findElementByCssSelector(String cssSelector);
 

src/main/java/io/appium/java_client/generic/searchcontext/GenericFindsById.java

@@ -20,6 +20,12 @@
 
 import java.util.List;
 
+@Deprecated
+/**
+ * This interface became deprecated. Use
+ * {@link org.openqa.selenium.internal.FindsById}
+ * instead.
+ */
 public interface GenericFindsById<T extends WebElement> {
     T findElementById(String id);
 

src/main/java/io/appium/java_client/generic/searchcontext/GenericFindsByLinkText.java

@@ -20,6 +20,12 @@
 
 import java.util.List;
 
+@Deprecated
+/**
+ * This interface became deprecated. Use
+ * {@link org.openqa.selenium.internal.FindsByLinkText}
+ * instead.
+ */
 public interface GenericFindsByLinkText<T extends WebElement> {
     T findElementByLinkText(String linkText);
 

src/main/java/io/appium/java_client/generic/searchcontext/GenericFindsByName.java

@@ -20,6 +20,12 @@
 
 import java.util.List;
 
+@Deprecated
+/**
+ * This interface became deprecated. Use
+ * {@link org.openqa.selenium.internal.FindsByName}
+ * instead.
+ */
 public interface GenericFindsByName<T extends WebElement> {
     T findElementByName(String name);
 

src/main/java/io/appium/java_client/generic/searchcontext/GenericFindsByTagName.java

@@ -20,6 +20,12 @@
 
 import java.util.List;
 
+@Deprecated
+/**
+ * This interface became deprecated. Use
+ * {@link org.openqa.selenium.internal.FindsByTagName}
+ * instead.
+ */
 public interface GenericFindsByTagName<T extends WebElement> {
     T findElementByTagName(String tagName);
 

src/main/java/io/appium/java_client/generic/searchcontext/GenericFindsByXPath.java

@@ -20,6 +20,12 @@
 
 import java.util.List;
 
+@Deprecated
+/**
+ * This interface became deprecated. Use
+ * {@link org.openqa.selenium.internal.FindsByXPath}
+ * instead.
+ */
 public interface GenericFindsByXPath<T extends WebElement> {
     T findElementByXPath(String xPath);