Skip to content

Commit

Permalink
DouniaBerrada: Cleanup in AndroidDriver.java
Browse files Browse the repository at this point in the history
r15198
  • Loading branch information
Dounia Berrada committed Dec 15, 2011
1 parent 6465313 commit b11b956
Showing 1 changed file with 25 additions and 13 deletions.
38 changes: 25 additions & 13 deletions android/app/src/java/org/openqa/selenium/android/AndroidDriver.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,29 @@

package org.openqa.selenium.android;

import org.openqa.selenium.By;
import org.openqa.selenium.OutputType;
import org.openqa.selenium.ScreenOrientation;
import org.openqa.selenium.WebDriver;

import org.openqa.selenium.WebDriverException;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.android.AndroidWebDriver;
import org.openqa.selenium.HasTouchScreen;
import org.openqa.selenium.html5.BrowserConnection;
import org.openqa.selenium.html5.LocalStorage;
import org.openqa.selenium.html5.Location;
import org.openqa.selenium.html5.LocationContext;
import org.openqa.selenium.html5.SessionStorage;
import org.openqa.selenium.html5.WebStorage;
import org.openqa.selenium.JavascriptExecutor;
import org.openqa.selenium.Rotatable;
import org.openqa.selenium.TakesScreenshot;
import org.openqa.selenium.android.app.MainActivity;
import org.openqa.selenium.logging.Logs;

import java.util.List;
import java.util.Set;

public class AndroidDriver implements BrowserConnection, HasTouchScreen, JavascriptExecutor,
LocationContext, Rotatable, TakesScreenshot, WebDriver, WebStorage{
Expand All @@ -49,11 +61,11 @@ public String getTitle() {
return driver.getTitle();
}

public java.util.List<org.openqa.selenium.WebElement> findElements(org.openqa.selenium.By by) {
public List<WebElement> findElements(By by) {
return driver.findElements(by);
}

public org.openqa.selenium.WebElement findElement(org.openqa.selenium.By by) {
public WebElement findElement(By by) {
return driver.findElement(by);
}

Expand All @@ -69,23 +81,23 @@ public void quit() {
driver.quit();
}

public java.util.Set<String> getWindowHandles() {
public Set<String> getWindowHandles() {
return driver.getWindowHandles();
}

public String getWindowHandle() {
return driver.getWindowHandle();
}

public org.openqa.selenium.WebDriver.TargetLocator switchTo() {
public TargetLocator switchTo() {
return driver.switchTo();
}

public org.openqa.selenium.WebDriver.Navigation navigate() {
public Navigation navigate() {
return driver.navigate();
}

public org.openqa.selenium.WebDriver.Options manage() {
public Options manage() {
return driver.manage();
}

Expand All @@ -101,7 +113,7 @@ public boolean isOnline() {
return driver.isOnline();
}

public void setOnline(boolean online) throws org.openqa.selenium.WebDriverException {
public void setOnline(boolean online) throws WebDriverException {
driver.setOnline(online);
}

Expand All @@ -113,28 +125,28 @@ public org.openqa.selenium.html5.Location location() {
return driver.location();
}

public void setLocation(org.openqa.selenium.html5.Location location) {
public void setLocation(Location location) {
driver.setLocation(location);
}

public void rotate(org.openqa.selenium.ScreenOrientation orientation) {
public void rotate(ScreenOrientation orientation) {
driver.rotate(orientation);
}

public org.openqa.selenium.ScreenOrientation getOrientation() {
public ScreenOrientation getOrientation() {
return driver.getOrientation();
}

public <X> X getScreenshotAs(org.openqa.selenium.OutputType<X> target)
public <X> X getScreenshotAs(OutputType<X> target)
throws org.openqa.selenium.WebDriverException {
return driver.getScreenshotAs(target);
}

public org.openqa.selenium.html5.LocalStorage getLocalStorage() {
public LocalStorage getLocalStorage() {
return driver.getLocalStorage();
}

public org.openqa.selenium.html5.SessionStorage getSessionStorage() {
public SessionStorage getSessionStorage() {
return driver.getSessionStorage();
}
}

0 comments on commit b11b956

Please sign in to comment.