Remove the deprecated Locatable interface. Cause carnage

SeleniumHQ · Aug 7, 2018 · 20e8ee0 · 20e8ee0
1 parent bfe567d
commit 20e8ee0
Show file tree

Hide file tree

Showing 54 changed files with 55 additions and 92 deletions.
diff --git a/java/client/src/org/openqa/selenium/interactions/Actions.java b/java/client/src/org/openqa/selenium/interactions/Actions.java
@@ -26,7 +26,6 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.PointerInput.Origin;
-import org.openqa.selenium.interactions.internal.Locatable;
 import org.openqa.selenium.interactions.internal.MouseAction.Button;
 
 import java.time.Duration;

diff --git a/java/client/src/org/openqa/selenium/interactions/ButtonReleaseAction.java b/java/client/src/org/openqa/selenium/interactions/ButtonReleaseAction.java
@@ -18,7 +18,6 @@
 package org.openqa.selenium.interactions;
 
 import org.openqa.selenium.interactions.internal.MouseAction;
-import org.openqa.selenium.interactions.internal.Locatable;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/java/client/src/org/openqa/selenium/interactions/ClickAction.java b/java/client/src/org/openqa/selenium/interactions/ClickAction.java
@@ -18,7 +18,6 @@
 package org.openqa.selenium.interactions;
 
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.interactions.internal.Locatable;
 import org.openqa.selenium.interactions.internal.MouseAction;
 
 import java.util.ArrayList;

diff --git a/java/client/src/org/openqa/selenium/interactions/ClickAndHoldAction.java b/java/client/src/org/openqa/selenium/interactions/ClickAndHoldAction.java
@@ -18,7 +18,6 @@
 package org.openqa.selenium.interactions;
 
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.interactions.internal.Locatable;
 import org.openqa.selenium.interactions.internal.MouseAction;
 
 import java.util.ArrayList;

diff --git a/java/client/src/org/openqa/selenium/interactions/ContextClickAction.java b/java/client/src/org/openqa/selenium/interactions/ContextClickAction.java
@@ -19,7 +19,6 @@
 
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.internal.MouseAction;
-import org.openqa.selenium.interactions.internal.Locatable;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/...um/interactions/internal/Coordinates.java → ...qa/selenium/interactions/Coordinates.java b/...um/interactions/internal/Coordinates.java → ...qa/selenium/interactions/Coordinates.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.interactions.internal;
+package org.openqa.selenium.interactions;
 
 import org.openqa.selenium.Point;
 

diff --git a/java/client/src/org/openqa/selenium/interactions/DoubleClickAction.java b/java/client/src/org/openqa/selenium/interactions/DoubleClickAction.java
@@ -18,7 +18,6 @@
 package org.openqa.selenium.interactions;
 
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.interactions.internal.Locatable;
 import org.openqa.selenium.interactions.internal.MouseAction;
 
 import java.util.ArrayList;

diff --git a/java/client/src/org/openqa/selenium/interactions/KeyDownAction.java b/java/client/src/org/openqa/selenium/interactions/KeyDownAction.java
@@ -20,7 +20,6 @@
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.internal.SingleKeyAction;
-import org.openqa.selenium.interactions.internal.Locatable;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/java/client/src/org/openqa/selenium/interactions/KeyUpAction.java b/java/client/src/org/openqa/selenium/interactions/KeyUpAction.java
@@ -18,7 +18,6 @@
 package org.openqa.selenium.interactions;
 
 import org.openqa.selenium.Keys;
-import org.openqa.selenium.interactions.internal.Locatable;
 import org.openqa.selenium.interactions.internal.SingleKeyAction;
 
 import java.util.ArrayList;

diff --git a/java/client/src/org/openqa/selenium/interactions/Locatable.java b/java/client/src/org/openqa/selenium/interactions/Locatable.java
@@ -17,8 +17,6 @@
 
 package org.openqa.selenium.interactions;
 
-import org.openqa.selenium.interactions.internal.Coordinates;
-
 public interface Locatable {
   Coordinates getCoordinates();
 }
diff --git a/java/client/src/org/openqa/selenium/interactions/Mouse.java b/java/client/src/org/openqa/selenium/interactions/Mouse.java
@@ -17,8 +17,6 @@
 
 package org.openqa.selenium.interactions;
 
-import org.openqa.selenium.interactions.internal.Coordinates;
-
 /**
  * Interface representing basic mouse operations.
  */

diff --git a/java/client/src/org/openqa/selenium/interactions/MoveMouseAction.java b/java/client/src/org/openqa/selenium/interactions/MoveMouseAction.java
@@ -19,7 +19,6 @@
 
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.internal.MouseAction;
-import org.openqa.selenium.interactions.internal.Locatable;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/java/client/src/org/openqa/selenium/interactions/MoveToOffsetAction.java b/java/client/src/org/openqa/selenium/interactions/MoveToOffsetAction.java
@@ -19,7 +19,6 @@
 
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.PointerInput.Origin;
-import org.openqa.selenium.interactions.internal.Locatable;
 import org.openqa.selenium.interactions.internal.MouseAction;
 
 import java.time.Duration;

diff --git a/java/client/src/org/openqa/selenium/interactions/SendKeysAction.java b/java/client/src/org/openqa/selenium/interactions/SendKeysAction.java
@@ -19,7 +19,6 @@
 
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.internal.KeysRelatedAction;
-import org.openqa.selenium.interactions.internal.Locatable;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/java/client/src/org/openqa/selenium/interactions/TouchScreen.java b/java/client/src/org/openqa/selenium/interactions/TouchScreen.java
@@ -17,8 +17,6 @@
 
 package org.openqa.selenium.interactions;
 
-import org.openqa.selenium.interactions.internal.Coordinates;
-
 /**
  * Interface representing basic touch screen operations.
  */

diff --git a/java/client/src/org/openqa/selenium/interactions/internal/BaseAction.java b/java/client/src/org/openqa/selenium/interactions/internal/BaseAction.java
@@ -18,6 +18,7 @@
 package org.openqa.selenium.interactions.internal;
 
 import org.openqa.selenium.WebElement;
+import org.openqa.selenium.interactions.Locatable;
 
 import java.util.Optional;
 

diff --git a/java/client/src/org/openqa/selenium/interactions/internal/DisplayAction.java b/java/client/src/org/openqa/selenium/interactions/internal/DisplayAction.java
@@ -17,6 +17,9 @@
 
 package org.openqa.selenium.interactions.internal;
 
+import org.openqa.selenium.interactions.Coordinates;
+import org.openqa.selenium.interactions.Locatable;
+
 /**
  * This class represents an abstraction of devices that can execute an action within a display area.
  */

diff --git a/java/client/src/org/openqa/selenium/interactions/internal/KeysRelatedAction.java b/java/client/src/org/openqa/selenium/interactions/internal/KeysRelatedAction.java
@@ -21,6 +21,7 @@
 import org.openqa.selenium.interactions.Interaction;
 import org.openqa.selenium.interactions.IsInteraction;
 import org.openqa.selenium.interactions.Keyboard;
+import org.openqa.selenium.interactions.Locatable;
 import org.openqa.selenium.interactions.Mouse;
 import org.openqa.selenium.interactions.PointerInput;
 import org.openqa.selenium.interactions.PointerInput.MouseButton;

diff --git a/java/client/src/org/openqa/selenium/interactions/internal/Locatable.java b/java/client/src/org/openqa/selenium/interactions/internal/Locatable.java
diff --git a/java/client/src/org/openqa/selenium/interactions/internal/MouseAction.java b/java/client/src/org/openqa/selenium/interactions/internal/MouseAction.java
@@ -18,8 +18,10 @@
 package org.openqa.selenium.interactions.internal;
 
 import org.openqa.selenium.WebElement;
+import org.openqa.selenium.interactions.Coordinates;
 import org.openqa.selenium.interactions.Interaction;
 import org.openqa.selenium.interactions.IsInteraction;
+import org.openqa.selenium.interactions.Locatable;
 import org.openqa.selenium.interactions.Mouse;
 import org.openqa.selenium.interactions.PointerInput;
 import org.openqa.selenium.interactions.PointerInput.Origin;

diff --git a/java/client/src/org/openqa/selenium/interactions/internal/SingleKeyAction.java b/java/client/src/org/openqa/selenium/interactions/internal/SingleKeyAction.java
@@ -19,6 +19,7 @@
 
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.Keyboard;
+import org.openqa.selenium.interactions.Locatable;
 import org.openqa.selenium.interactions.Mouse;
 
 /**

diff --git a/java/client/src/org/openqa/selenium/interactions/internal/TouchAction.java b/java/client/src/org/openqa/selenium/interactions/internal/TouchAction.java
@@ -17,6 +17,7 @@
 
 package org.openqa.selenium.interactions.internal;
 
+import org.openqa.selenium.interactions.Locatable;
 import org.openqa.selenium.interactions.TouchScreen;
 
 /**

diff --git a/java/client/src/org/openqa/selenium/interactions/touch/DoubleTapAction.java b/java/client/src/org/openqa/selenium/interactions/touch/DoubleTapAction.java
@@ -18,9 +18,9 @@
 package org.openqa.selenium.interactions.touch;
 
 import org.openqa.selenium.interactions.Action;
+import org.openqa.selenium.interactions.Locatable;
 import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.interactions.internal.TouchAction;
-import org.openqa.selenium.interactions.internal.Locatable;
 
 /**
  * Creates a double tap gesture on a touch screen.

diff --git a/java/client/src/org/openqa/selenium/interactions/touch/FlickAction.java b/java/client/src/org/openqa/selenium/interactions/touch/FlickAction.java
@@ -18,9 +18,9 @@
 package org.openqa.selenium.interactions.touch;
 
 import org.openqa.selenium.interactions.Action;
+import org.openqa.selenium.interactions.Locatable;
 import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.interactions.internal.TouchAction;
-import org.openqa.selenium.interactions.internal.Locatable;
 
 /**
  * Creates a flick gesture.

diff --git a/java/client/src/org/openqa/selenium/interactions/touch/LongPressAction.java b/java/client/src/org/openqa/selenium/interactions/touch/LongPressAction.java
@@ -18,9 +18,9 @@
 package org.openqa.selenium.interactions.touch;
 
 import org.openqa.selenium.interactions.Action;
+import org.openqa.selenium.interactions.Locatable;
 import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.interactions.internal.TouchAction;
-import org.openqa.selenium.interactions.internal.Locatable;
 
 /**
  * Creates a long press gesture.

diff --git a/java/client/src/org/openqa/selenium/interactions/touch/ScrollAction.java b/java/client/src/org/openqa/selenium/interactions/touch/ScrollAction.java
@@ -18,9 +18,9 @@
 package org.openqa.selenium.interactions.touch;
 
 import org.openqa.selenium.interactions.Action;
+import org.openqa.selenium.interactions.Locatable;
 import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.interactions.internal.TouchAction;
-import org.openqa.selenium.interactions.internal.Locatable;
 
 /**
  * Creates a scroll gesture.

diff --git a/java/client/src/org/openqa/selenium/interactions/touch/SingleTapAction.java b/java/client/src/org/openqa/selenium/interactions/touch/SingleTapAction.java
@@ -18,9 +18,9 @@
 package org.openqa.selenium.interactions.touch;
 
 import org.openqa.selenium.interactions.Action;
+import org.openqa.selenium.interactions.Locatable;
 import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.interactions.internal.TouchAction;
-import org.openqa.selenium.interactions.internal.Locatable;
 
 /**
  * Creates a single tap gesture on a touch screen

diff --git a/java/client/src/org/openqa/selenium/interactions/touch/TouchActions.java b/java/client/src/org/openqa/selenium/interactions/touch/TouchActions.java
@@ -23,8 +23,8 @@
 import org.openqa.selenium.interactions.HasInputDevices;
 import org.openqa.selenium.interactions.HasTouchScreen;
 import org.openqa.selenium.interactions.Keyboard;
+import org.openqa.selenium.interactions.Locatable;
 import org.openqa.selenium.interactions.TouchScreen;
-import org.openqa.selenium.interactions.internal.Locatable;
 
 /**
  * Implements actions for touch enabled devices, reusing the available composite and builder design

diff --git a/java/client/src/org/openqa/selenium/internal/Locatable.java b/java/client/src/org/openqa/selenium/internal/Locatable.java
@@ -21,6 +21,7 @@
  * @deprecated Use {@link org.openqa.selenium.interactions.internal.Locatable} instead.
  */
 @Deprecated
-public interface Locatable extends org.openqa.selenium.interactions.internal.Locatable {
+public interface Locatable extends
+                           org.openqa.selenium.interactions.Locatable {
 
 }
diff --git a/java/client/src/org/openqa/selenium/module-info.txt b/java/client/src/org/openqa/selenium/module-info.txt
@@ -21,7 +21,6 @@ module org.openqa.selenium.core {
     exports org.openqa.selenium;
     exports org.openqa.selenium.html5;
     exports org.openqa.selenium.interactions;
-    exports org.openqa.selenium.interactions.internal;
     exports org.openqa.selenium.interactions.touch;
     exports org.openqa.selenium.internal;
     exports org.openqa.selenium.logging;

diff --git a/java/client/src/org/openqa/selenium/remote/RemoteMouse.java b/java/client/src/org/openqa/selenium/remote/RemoteMouse.java
@@ -20,7 +20,7 @@
 import com.google.common.collect.ImmutableMap;
 
 import org.openqa.selenium.interactions.Mouse;
-import org.openqa.selenium.interactions.internal.Coordinates;
+import org.openqa.selenium.interactions.Coordinates;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/java/client/src/org/openqa/selenium/remote/RemoteTouchScreen.java b/java/client/src/org/openqa/selenium/remote/RemoteTouchScreen.java
@@ -18,7 +18,7 @@
 package org.openqa.selenium.remote;
 
 import org.openqa.selenium.interactions.TouchScreen;
-import org.openqa.selenium.interactions.internal.Coordinates;
+import org.openqa.selenium.interactions.Coordinates;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/java/client/src/org/openqa/selenium/remote/RemoteWebElement.java b/java/client/src/org/openqa/selenium/remote/RemoteWebElement.java
@@ -30,7 +30,7 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.interactions.internal.Coordinates;
+import org.openqa.selenium.interactions.Coordinates;
 import org.openqa.selenium.internal.FindsByClassName;
 import org.openqa.selenium.internal.FindsByCssSelector;
 import org.openqa.selenium.internal.FindsById;
@@ -39,7 +39,6 @@
 import org.openqa.selenium.internal.FindsByTagName;
 import org.openqa.selenium.internal.FindsByXPath;
 import org.openqa.selenium.internal.HasIdentity;
-import org.openqa.selenium.interactions.internal.Locatable;
 import org.openqa.selenium.WrapsDriver;
 import org.openqa.selenium.WrapsElement;
 import org.openqa.selenium.io.Zip;
@@ -52,8 +51,9 @@
 
 public class RemoteWebElement implements WebElement, FindsByLinkText, FindsById, FindsByName,
                                          FindsByTagName, FindsByClassName, FindsByCssSelector,
-                                         FindsByXPath, WrapsDriver, Locatable, HasIdentity,
-                                         TakesScreenshot {
+                                         FindsByXPath, WrapsDriver, HasIdentity,
+                                         TakesScreenshot,
+                                         org.openqa.selenium.interactions.Locatable {
   private String foundBy;
   protected String id;
   protected RemoteWebDriver parent;

diff --git a/java/client/src/org/openqa/selenium/support/events/EventFiringWebDriver.java b/java/client/src/org/openqa/selenium/support/events/EventFiringWebDriver.java
@@ -36,11 +36,11 @@
 import org.openqa.selenium.interactions.HasTouchScreen;
 import org.openqa.selenium.interactions.Interactive;
 import org.openqa.selenium.interactions.Keyboard;
+import org.openqa.selenium.interactions.Locatable;
 import org.openqa.selenium.interactions.Mouse;
 import org.openqa.selenium.interactions.Sequence;
 import org.openqa.selenium.interactions.TouchScreen;
-import org.openqa.selenium.interactions.internal.Coordinates;
-import org.openqa.selenium.interactions.internal.Locatable;
+import org.openqa.selenium.interactions.Coordinates;
 import org.openqa.selenium.WrapsDriver;
 import org.openqa.selenium.WrapsElement;
 import org.openqa.selenium.logging.Logs;
@@ -386,7 +386,8 @@ public Capabilities getCapabilities() {
   }
 
 
-  private class EventFiringWebElement implements WebElement, WrapsElement, WrapsDriver, Locatable {
+  private class EventFiringWebElement implements WebElement, WrapsElement, WrapsDriver,
+                                                 org.openqa.selenium.interactions.Locatable {
 
     private final WebElement element;
     private final WebElement underlyingElement;

diff --git a/java/client/src/org/openqa/selenium/support/events/internal/EventFiringMouse.java b/java/client/src/org/openqa/selenium/support/events/internal/EventFiringMouse.java
@@ -20,7 +20,7 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.interactions.HasInputDevices;
 import org.openqa.selenium.interactions.Mouse;
-import org.openqa.selenium.interactions.internal.Coordinates;
+import org.openqa.selenium.interactions.Coordinates;
 import org.openqa.selenium.support.events.WebDriverEventListener;
 
 /**

diff --git a/java/client/src/org/openqa/selenium/support/events/internal/EventFiringTouch.java b/java/client/src/org/openqa/selenium/support/events/internal/EventFiringTouch.java
@@ -20,7 +20,7 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.interactions.HasTouchScreen;
 import org.openqa.selenium.interactions.TouchScreen;
-import org.openqa.selenium.interactions.internal.Coordinates;
+import org.openqa.selenium.interactions.Coordinates;
 import org.openqa.selenium.support.events.WebDriverEventListener;
 
 /**

diff --git a/java/client/src/org/openqa/selenium/support/pagefactory/DefaultFieldDecorator.java b/java/client/src/org/openqa/selenium/support/pagefactory/DefaultFieldDecorator.java
@@ -18,8 +18,8 @@
 package org.openqa.selenium.support.pagefactory;
 
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.interactions.internal.Locatable;
 import org.openqa.selenium.WrapsElement;
+import org.openqa.selenium.interactions.Locatable;
 import org.openqa.selenium.support.FindAll;
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.FindBys;

diff --git a/java/client/test/org/openqa/selenium/JavascriptEnabledDriverTest.java b/java/client/test/org/openqa/selenium/JavascriptEnabledDriverTest.java
@@ -33,7 +33,7 @@
 
 import org.hamcrest.Matchers;
 import org.junit.Test;
-import org.openqa.selenium.interactions.internal.Locatable;
+import org.openqa.selenium.interactions.Locatable;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.testing.JUnit4TestBase;
 import org.openqa.selenium.testing.NeedsFreshDriver;
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,8 +17,6 @@ @@
     package org.openqa.selenium.interactions;
-    import org.openqa.selenium.interactions.internal.Coordinates;
     /**
      * Interface representing basic mouse operations.
      */
@@ Expand Down @@