Moved Locable to the interactions package

shs96c · shs96c · commit b37c27b4c62c · 2017-09-03T16:15:38.000+01:00
Where it belongs.
diff --git a/java/client/src/org/openqa/selenium/BUCK b/java/client/src/org/openqa/selenium/BUCK
@@ -50,7 +50,6 @@ java_library(name = 'core',
     'WebElement.java',
     'internal/ElementScrollBehavior.java',
     'internal/HasIdentity.java',
-    'internal/Locatable.java',
     'internal/Lock.java',
     'internal/SocketLock.java',
     'internal/WrapsDriver.java',
diff --git a/java/client/src/org/openqa/selenium/interactions/Actions.java b/java/client/src/org/openqa/selenium/interactions/Actions.java
@@ -31,7 +31,7 @@
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.PointerInput.Origin;
 import org.openqa.selenium.interactions.internal.MouseAction.Button;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 
 import java.time.Duration;
 import java.util.Arrays;
diff --git a/java/client/src/org/openqa/selenium/interactions/BUCK b/java/client/src/org/openqa/selenium/interactions/BUCK
@@ -36,6 +36,7 @@ java_library(name = 'core',
     'SourceType.java',
     'TouchScreen.java',
     'internal/Coordinates.java',
+    'internal/Locatable.java',
   ],
   deps = [
     '//java/client/src/org/openqa/selenium:primitives',
diff --git a/java/client/src/org/openqa/selenium/interactions/ButtonReleaseAction.java b/java/client/src/org/openqa/selenium/interactions/ButtonReleaseAction.java
@@ -20,7 +20,7 @@
 import com.google.common.collect.ImmutableList;
 
 import org.openqa.selenium.interactions.internal.MouseAction;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 
 import java.util.List;
 
diff --git a/java/client/src/org/openqa/selenium/interactions/ClickAction.java b/java/client/src/org/openqa/selenium/interactions/ClickAction.java
@@ -21,7 +21,7 @@
 
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.internal.MouseAction;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 
 import java.util.List;
 
diff --git a/java/client/src/org/openqa/selenium/interactions/ClickAndHoldAction.java b/java/client/src/org/openqa/selenium/interactions/ClickAndHoldAction.java
@@ -21,7 +21,7 @@
 
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.internal.MouseAction;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 
 import java.util.List;
 
diff --git a/java/client/src/org/openqa/selenium/interactions/ContextClickAction.java b/java/client/src/org/openqa/selenium/interactions/ContextClickAction.java
@@ -21,7 +21,7 @@
 
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.internal.MouseAction;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 
 import java.util.List;
 
diff --git a/java/client/src/org/openqa/selenium/interactions/DoubleClickAction.java b/java/client/src/org/openqa/selenium/interactions/DoubleClickAction.java
@@ -21,7 +21,7 @@
 
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.internal.MouseAction;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 
 import java.util.List;
 
diff --git a/java/client/src/org/openqa/selenium/interactions/KeyDownAction.java b/java/client/src/org/openqa/selenium/interactions/KeyDownAction.java
@@ -22,7 +22,7 @@
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.internal.SingleKeyAction;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 
 import java.util.List;
 
diff --git a/java/client/src/org/openqa/selenium/interactions/KeyUpAction.java b/java/client/src/org/openqa/selenium/interactions/KeyUpAction.java
@@ -21,7 +21,7 @@
 
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.internal.SingleKeyAction;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 
 import java.util.List;
 
diff --git a/java/client/src/org/openqa/selenium/interactions/MoveMouseAction.java b/java/client/src/org/openqa/selenium/interactions/MoveMouseAction.java
@@ -21,7 +21,7 @@
 
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.internal.MouseAction;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 
 import java.util.List;
 
diff --git a/java/client/src/org/openqa/selenium/interactions/MoveToOffsetAction.java b/java/client/src/org/openqa/selenium/interactions/MoveToOffsetAction.java
@@ -22,7 +22,7 @@
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.PointerInput.Origin;
 import org.openqa.selenium.interactions.internal.MouseAction;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 
 import java.time.Duration;
 import java.util.List;
diff --git a/java/client/src/org/openqa/selenium/interactions/SendKeysAction.java b/java/client/src/org/openqa/selenium/interactions/SendKeysAction.java
@@ -21,7 +21,7 @@
 
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.internal.KeysRelatedAction;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 
 import java.util.List;
 
diff --git a/java/client/src/org/openqa/selenium/interactions/internal/BaseAction.java b/java/client/src/org/openqa/selenium/interactions/internal/BaseAction.java
@@ -20,7 +20,6 @@
 import com.google.common.base.Preconditions;
 
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.internal.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,8 +17,6 @@
 
 package org.openqa.selenium.interactions.internal;
 
-import org.openqa.selenium.internal.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
@@ -27,7 +27,6 @@
 import org.openqa.selenium.interactions.PointerInput;
 import org.openqa.selenium.interactions.PointerInput.MouseButton;
 import org.openqa.selenium.interactions.PointerInput.Origin;
-import org.openqa.selenium.internal.Locatable;
 
 import java.time.Duration;
 import java.util.Optional;
diff --git a/java/client/src/org/openqa/selenium/interactions/internal/Locatable.java b/java/client/src/org/openqa/selenium/interactions/internal/Locatable.java
@@ -15,9 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.internal;
-
-import org.openqa.selenium.interactions.internal.Coordinates;
+package org.openqa.selenium.interactions.internal;
 
 public interface Locatable {
   Coordinates getCoordinates();
diff --git a/java/client/src/org/openqa/selenium/interactions/internal/MouseAction.java b/java/client/src/org/openqa/selenium/interactions/internal/MouseAction.java
@@ -26,7 +26,6 @@
 import org.openqa.selenium.interactions.Mouse;
 import org.openqa.selenium.interactions.PointerInput;
 import org.openqa.selenium.interactions.PointerInput.Origin;
-import org.openqa.selenium.internal.Locatable;
 
 import java.time.Duration;
 import java.util.Optional;
diff --git a/java/client/src/org/openqa/selenium/interactions/internal/SingleKeyAction.java b/java/client/src/org/openqa/selenium/interactions/internal/SingleKeyAction.java
@@ -20,7 +20,6 @@
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.Keyboard;
 import org.openqa.selenium.interactions.Mouse;
-import org.openqa.selenium.internal.Locatable;
 
 /**
  * Used both by KeyDownAction and KeyUpAction
diff --git a/java/client/src/org/openqa/selenium/interactions/internal/TouchAction.java b/java/client/src/org/openqa/selenium/interactions/internal/TouchAction.java
@@ -18,7 +18,6 @@
 package org.openqa.selenium.interactions.internal;
 
 import org.openqa.selenium.interactions.TouchScreen;
-import org.openqa.selenium.internal.Locatable;
 
 /**
  * Base class for all touch screen-related actions
diff --git a/java/client/src/org/openqa/selenium/interactions/touch/DoubleTapAction.java b/java/client/src/org/openqa/selenium/interactions/touch/DoubleTapAction.java
@@ -20,7 +20,7 @@
 import org.openqa.selenium.interactions.Action;
 import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.interactions.internal.TouchAction;
-import org.openqa.selenium.internal.Locatable;
+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
@@ -20,7 +20,7 @@
 import org.openqa.selenium.interactions.Action;
 import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.interactions.internal.TouchAction;
-import org.openqa.selenium.internal.Locatable;
+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
@@ -20,7 +20,7 @@
 import org.openqa.selenium.interactions.Action;
 import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.interactions.internal.TouchAction;
-import org.openqa.selenium.internal.Locatable;
+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
@@ -20,7 +20,7 @@
 import org.openqa.selenium.interactions.Action;
 import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.interactions.internal.TouchAction;
-import org.openqa.selenium.internal.Locatable;
+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
@@ -20,7 +20,7 @@
 import org.openqa.selenium.interactions.Action;
 import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.interactions.internal.TouchAction;
-import org.openqa.selenium.internal.Locatable;
+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
@@ -24,7 +24,7 @@
 import org.openqa.selenium.interactions.HasTouchScreen;
 import org.openqa.selenium.interactions.Keyboard;
 import org.openqa.selenium.interactions.TouchScreen;
-import org.openqa.selenium.internal.Locatable;
+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/remote/RemoteWebElement.java b/java/client/src/org/openqa/selenium/remote/RemoteWebElement.java
@@ -39,7 +39,7 @@
 import org.openqa.selenium.internal.FindsByTagName;
 import org.openqa.selenium.internal.FindsByXPath;
 import org.openqa.selenium.internal.HasIdentity;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 import org.openqa.selenium.internal.WrapsDriver;
 import org.openqa.selenium.internal.WrapsElement;
 import org.openqa.selenium.io.Zip;
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,7 +36,7 @@
 import org.openqa.selenium.interactions.Mouse;
 import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.interactions.internal.Coordinates;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 import org.openqa.selenium.internal.WrapsDriver;
 import org.openqa.selenium.internal.WrapsElement;
 import org.openqa.selenium.logging.Logs;
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,7 +18,7 @@
 package org.openqa.selenium.support.pagefactory;
 
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 import org.openqa.selenium.internal.WrapsElement;
 import org.openqa.selenium.support.FindAll;
 import org.openqa.selenium.support.FindBy;
diff --git a/java/client/test/org/openqa/selenium/JavascriptEnabledDriverTest.java b/java/client/test/org/openqa/selenium/JavascriptEnabledDriverTest.java
@@ -34,7 +34,7 @@
 
 import org.hamcrest.Matchers;
 import org.junit.Test;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JUnit4TestBase;
diff --git a/java/client/test/org/openqa/selenium/PositionAndSizeTest.java b/java/client/test/org/openqa/selenium/PositionAndSizeTest.java
@@ -35,10 +35,9 @@
 import static org.openqa.selenium.testing.Driver.SAFARI;
 
 import org.junit.Test;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JUnit4TestBase;
-import org.openqa.selenium.testing.NotYetImplemented;
 import org.openqa.selenium.testing.SwitchToTopAfterTest;
 import org.openqa.selenium.testing.TestUtilities;
 
diff --git a/java/client/test/org/openqa/selenium/interactions/ActionsTest.java b/java/client/test/org/openqa/selenium/interactions/ActionsTest.java
@@ -37,7 +37,7 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.internal.Coordinates;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/java/client/test/org/openqa/selenium/interactions/IndividualKeyboardActionsTest.java b/java/client/test/org/openqa/selenium/interactions/IndividualKeyboardActionsTest.java
@@ -31,7 +31,7 @@
 import org.mockito.MockitoAnnotations;
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.internal.Coordinates;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 
 /**
  * Unit test for all simple keyboard actions.
diff --git a/java/client/test/org/openqa/selenium/interactions/IndividualMouseActionsTest.java b/java/client/test/org/openqa/selenium/interactions/IndividualMouseActionsTest.java
@@ -28,7 +28,7 @@
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.openqa.selenium.interactions.internal.Coordinates;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 
 /**
  * Unit test for all simple keyboard actions.
diff --git a/java/client/test/org/openqa/selenium/interactions/touch/TouchDoubleTapTest.java b/java/client/test/org/openqa/selenium/interactions/touch/TouchDoubleTapTest.java
@@ -24,7 +24,7 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Action;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 
 /**
  * Tests the basic double tap operations.
diff --git a/java/client/test/org/openqa/selenium/interactions/touch/TouchLongPressTest.java b/java/client/test/org/openqa/selenium/interactions/touch/TouchLongPressTest.java
@@ -30,7 +30,7 @@
 import org.mockito.MockitoAnnotations;
 import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.interactions.internal.Coordinates;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 
 /**
  * Tests the long press action.
diff --git a/java/client/test/org/openqa/selenium/support/pagefactory/DefaultFieldDecoratorTest.java b/java/client/test/org/openqa/selenium/support/pagefactory/DefaultFieldDecoratorTest.java
@@ -40,7 +40,7 @@
 import org.openqa.selenium.internal.FindsByLinkText;
 import org.openqa.selenium.internal.FindsByName;
 import org.openqa.selenium.internal.FindsByXPath;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 import org.openqa.selenium.internal.WrapsElement;
 import org.openqa.selenium.support.FindAll;
 import org.openqa.selenium.support.FindBy;
diff --git a/java/server/src/org/openqa/selenium/remote/server/KnownElements.java b/java/server/src/org/openqa/selenium/remote/server/KnownElements.java
@@ -21,7 +21,7 @@
 import com.google.common.collect.HashBiMap;
 
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 import org.openqa.selenium.internal.WrapsElement;
 
 import java.lang.reflect.InvocationHandler;
diff --git a/java/server/src/org/openqa/selenium/remote/server/handler/GetElementLocationInView.java b/java/server/src/org/openqa/selenium/remote/server/handler/GetElementLocationInView.java
@@ -18,7 +18,7 @@
 package org.openqa.selenium.remote.server.handler;
 
 import org.openqa.selenium.Point;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 import org.openqa.selenium.remote.server.Session;
 
 public class GetElementLocationInView extends WebElementHandler<Point> {
diff --git a/java/server/src/org/openqa/selenium/remote/server/handler/interactions/MouseMoveToLocation.java b/java/server/src/org/openqa/selenium/remote/server/handler/interactions/MouseMoveToLocation.java
@@ -22,7 +22,7 @@
 import org.openqa.selenium.interactions.HasInputDevices;
 import org.openqa.selenium.interactions.Mouse;
 import org.openqa.selenium.interactions.internal.Coordinates;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 import org.openqa.selenium.remote.server.JsonParametersAware;
 import org.openqa.selenium.remote.server.Session;
 import org.openqa.selenium.remote.server.handler.WebDriverHandler;
diff --git a/java/server/src/org/openqa/selenium/remote/server/handler/interactions/touch/DoubleTapOnElement.java b/java/server/src/org/openqa/selenium/remote/server/handler/interactions/touch/DoubleTapOnElement.java
@@ -21,7 +21,7 @@
 import org.openqa.selenium.interactions.HasTouchScreen;
 import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.interactions.internal.Coordinates;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 import org.openqa.selenium.remote.server.JsonParametersAware;
 import org.openqa.selenium.remote.server.Session;
 import org.openqa.selenium.remote.server.handler.WebElementHandler;
diff --git a/java/server/src/org/openqa/selenium/remote/server/handler/interactions/touch/Flick.java b/java/server/src/org/openqa/selenium/remote/server/handler/interactions/touch/Flick.java
@@ -22,7 +22,7 @@
 import org.openqa.selenium.interactions.HasTouchScreen;
 import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.interactions.internal.Coordinates;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 import org.openqa.selenium.remote.server.JsonParametersAware;
 import org.openqa.selenium.remote.server.Session;
 import org.openqa.selenium.remote.server.handler.WebElementHandler;
diff --git a/java/server/src/org/openqa/selenium/remote/server/handler/interactions/touch/LongPressOnElement.java b/java/server/src/org/openqa/selenium/remote/server/handler/interactions/touch/LongPressOnElement.java
@@ -21,7 +21,7 @@
 import org.openqa.selenium.interactions.HasTouchScreen;
 import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.interactions.internal.Coordinates;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 import org.openqa.selenium.remote.server.JsonParametersAware;
 import org.openqa.selenium.remote.server.Session;
 import org.openqa.selenium.remote.server.handler.WebElementHandler;
diff --git a/java/server/src/org/openqa/selenium/remote/server/handler/interactions/touch/Scroll.java b/java/server/src/org/openqa/selenium/remote/server/handler/interactions/touch/Scroll.java
@@ -22,7 +22,7 @@
 import org.openqa.selenium.interactions.HasTouchScreen;
 import org.openqa.selenium.interactions.TouchScreen;
 import org.openqa.selenium.interactions.internal.Coordinates;
-import org.openqa.selenium.internal.Locatable;
+import org.openqa.selenium.interactions.internal.Locatable;
 import org.openqa.selenium.remote.server.JsonParametersAware;
 import org.openqa.selenium.remote.server.Session;
 import org.openqa.selenium.remote.server.handler.WebElementHandler;
diff --git a/java/server/src/org/openqa/selenium/remote/server/handler/interactions/touch/SingleTapOnElement.java b/java/server/src/org/openqa/selenium/remote/server/handler/interactions/touch/SingleTapOnElement.java
