Page factory. Fixes

TikhomirovSergey · TikhomirovSergey · commit fe34ab141602 · 2014-08-07T23:38:41.000+04:00
diff --git a/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java b/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java
@@ -92,7 +92,7 @@ private WebDriver unpackWebDriverFromSearchContext(){
 			while (element instanceof WrapsElement){
 				element = ((WrapsElement) element).getWrappedElement();
 			}
-			driver = ((WrapsDriver) searchContext).getWrappedDriver();
+			driver = ((WrapsDriver) element).getWrappedDriver();
 		}
 		return driver;
 	}
diff --git a/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java b/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java
@@ -92,8 +92,12 @@ private boolean isDecoratableList(Field field) {
 	}
 
 	private Object proxyForLocator(Field field, ElementLocator locator) {
+		Class<?> type = field.getType();
+		if (type.equals(WebElement.class)){
+			type = RemoteWebElement.class;
+		}
 		ElementInterceptor elementInterceptor = new ElementInterceptor(locator);
-		return ProxyFactory.getEnhancedProxy(field.getType(),
+		return ProxyFactory.getEnhancedProxy(type,
 				elementInterceptor);
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ private WebDriver unpackWebDriverFromSearchContext(){`
`92`	`92`	`while (element instanceof WrapsElement){`
`93`	`93`	`element = ((WrapsElement) element).getWrappedElement();`
`94`	`94`	`}`
`95`		`- driver = ((WrapsDriver) searchContext).getWrappedDriver();`
	`95`	`+ driver = ((WrapsDriver) element).getWrappedDriver();`
`96`	`96`	`}`
`97`	`97`	`return driver;`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,12 @@ private boolean isDecoratableList(Field field) {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`private Object proxyForLocator(Field field, ElementLocator locator) {`
	`95`	`+ Class<?> type = field.getType();`
	`96`	`+ if (type.equals(WebElement.class)){`
	`97`	`+ type = RemoteWebElement.class;`
	`98`	`+ }`
`95`	`99`	`ElementInterceptor elementInterceptor = new ElementInterceptor(locator);`
`96`		`- return ProxyFactory.getEnhancedProxy(field.getType(),`
	`100`	`+ return ProxyFactory.getEnhancedProxy(type,`
`97`	`101`	`elementInterceptor);`
`98`	`102`	`}`
`99`	`103`