No logical changes: moving method invocation in JsonToWebElementConve…

…rter
babymechanic · Apr 3, 2017 · 9a7082b · 9a7082b
1 parent 48a1c7b
commit 9a7082b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java b/java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java
@@ -426,7 +426,9 @@ protected WebElement findElement(String by, String using) {
 
   protected void setFoundBy(SearchContext context, WebElement element, String by, String using) {
     if (element instanceof RemoteWebElement) {
-      ((RemoteWebElement) element).setFoundBy(context, by, using);
+      RemoteWebElement remoteElement = (RemoteWebElement) element;
+      remoteElement.setFoundBy(context, by, using);
+      remoteElement.setFileDetector(getFileDetector());
     }
   }
 

diff --git a/java/client/src/org/openqa/selenium/remote/internal/JsonToWebElementConverter.java b/java/client/src/org/openqa/selenium/remote/internal/JsonToWebElementConverter.java
@@ -53,12 +53,10 @@ public Object apply(Object result) {
       if (resultAsMap.containsKey(Dialect.OSS.getEncodedElementKey())) {
         RemoteWebElement element = newRemoteWebElement();
         element.setId(String.valueOf(resultAsMap.get(Dialect.OSS.getEncodedElementKey())));
-        element.setFileDetector(driver.getFileDetector());
         return element;
       } else if (resultAsMap.containsKey(Dialect.W3C.getEncodedElementKey())) {
         RemoteWebElement element = newRemoteWebElement();
         element.setId(String.valueOf(resultAsMap.get(Dialect.W3C.getEncodedElementKey())));
-        element.setFileDetector(driver.getFileDetector());
         return element;
       } else {
         return Maps.transformValues(resultAsMap, this);
@@ -75,9 +73,10 @@ public Object apply(Object result) {
     return result;
   }
 
-  protected RemoteWebElement newRemoteWebElement() {
+  private RemoteWebElement newRemoteWebElement() {
     RemoteWebElement toReturn = new RemoteWebElement();
     toReturn.setParent(driver);
+    toReturn.setFileDetector(driver.getFileDetector());
     return toReturn;
   }
 }