Moving Timer and Windows classes to webdriven api, they are not commands

Vishwajeet-Mishra · Mar 14, 2014 · 05af3e1 · 05af3e1
1 parent 0ed66ea
commit 05af3e1
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 27 deletions.
diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/BUCK b/java/client/src/com/thoughtworks/selenium/webdriven/BUCK
@@ -46,6 +46,8 @@ java_library(name = 'emulation-api',
     'JavascriptLibrary.java',
     'ScriptMutator.java',
     'SeleneseCommand.java',
+    'Timer.java',
+    'Windows.java',
   ],
   deps = [
     '//java/client/src/com/thoughtworks/selenium:api',

diff --git a/...ks/selenium/webdriven/commands/Timer.java → ...houghtworks/selenium/webdriven/Timer.java b/...ks/selenium/webdriven/commands/Timer.java → ...houghtworks/selenium/webdriven/Timer.java
@@ -14,10 +14,9 @@
 limitations under the License.
  */
 
-package com.thoughtworks.selenium.webdriven.commands;
+package com.thoughtworks.selenium.webdriven;
 
 import com.thoughtworks.selenium.SeleniumException;
-import com.thoughtworks.selenium.webdriven.SeleneseCommand;
 
 import org.openqa.selenium.WebDriver;
 

diff --git a/.../selenium/webdriven/commands/Windows.java → ...ughtworks/selenium/webdriven/Windows.java b/.../selenium/webdriven/commands/Windows.java → ...ughtworks/selenium/webdriven/Windows.java
@@ -14,7 +14,7 @@
 limitations under the License.
  */
 
-package com.thoughtworks.selenium.webdriven.commands;
+package com.thoughtworks.selenium.webdriven;
 
 import com.google.common.collect.Maps;
 

diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/build.desc b/java/client/src/com/thoughtworks/selenium/webdriven/build.desc
@@ -38,7 +38,9 @@ java_library(name = "emulation-api",
     "ScriptMutator.java",
     "SeleneseCommand.java",
     "SeleniumMutator.java",
+    "Timer.java",
     "VariableDeclaration.java",
+    "Windows.java",
   ],
   deps = [
     "//java/client/src/com/thoughtworks/selenium:api",

diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/commands/BUCK b/java/client/src/com/thoughtworks/selenium/webdriven/commands/BUCK
@@ -1,19 +1,6 @@
 
-java_library(name = 'timer',
-  srcs = [ 'Timer.java' ],
-  deps = [
-    '//java/client/src/com/thoughtworks/selenium:api',
-    '//java/client/src/com/thoughtworks/selenium/webdriven:emulation-api',
-    '//java/client/src/org/openqa/selenium:webdriver-api',
-  ],
-)
-
-
 java_library(name = 'commands',
-  srcs = glob(['*.java'], excludes = ['Timer.java']),
-  exported_deps = [
-    ':timer',
-  ],
+  srcs = glob(['*.java']),
   deps = [
     '//java/client/src/com/thoughtworks/selenium:api',
     '//java/client/src/com/thoughtworks/selenium/webdriven:emulation-api',

diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/commands/DeselectPopUp.java b/java/client/src/com/thoughtworks/selenium/webdriven/commands/DeselectPopUp.java
@@ -17,6 +17,7 @@
 package com.thoughtworks.selenium.webdriven.commands;
 
 import com.thoughtworks.selenium.webdriven.SeleneseCommand;
+import com.thoughtworks.selenium.webdriven.Windows;
 
 import org.openqa.selenium.WebDriver;
 

diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/commands/SelectFrame.java b/java/client/src/com/thoughtworks/selenium/webdriven/commands/SelectFrame.java
@@ -17,6 +17,7 @@
 package com.thoughtworks.selenium.webdriven.commands;
 
 import com.thoughtworks.selenium.webdriven.SeleneseCommand;
+import com.thoughtworks.selenium.webdriven.Windows;
 
 import org.openqa.selenium.WebDriver;
 

diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/commands/SelectPopUp.java b/java/client/src/com/thoughtworks/selenium/webdriven/commands/SelectPopUp.java
@@ -17,6 +17,7 @@
 package com.thoughtworks.selenium.webdriven.commands;
 
 import com.thoughtworks.selenium.webdriven.SeleneseCommand;
+import com.thoughtworks.selenium.webdriven.Windows;
 
 import org.openqa.selenium.WebDriver;
 

diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/commands/SelectWindow.java b/java/client/src/com/thoughtworks/selenium/webdriven/commands/SelectWindow.java
@@ -17,6 +17,7 @@
 package com.thoughtworks.selenium.webdriven.commands;
 
 import com.thoughtworks.selenium.webdriven.SeleneseCommand;
+import com.thoughtworks.selenium.webdriven.Windows;
 
 import org.openqa.selenium.WebDriver;
 

diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/commands/SetTimeout.java b/java/client/src/com/thoughtworks/selenium/webdriven/commands/SetTimeout.java
@@ -17,6 +17,7 @@
 package com.thoughtworks.selenium.webdriven.commands;
 
 import com.thoughtworks.selenium.webdriven.SeleneseCommand;
+import com.thoughtworks.selenium.webdriven.Timer;
 
 import org.openqa.selenium.WebDriver;
 

diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/commands/WaitForPopup.java b/java/client/src/com/thoughtworks/selenium/webdriven/commands/WaitForPopup.java
@@ -19,6 +19,7 @@
 import com.thoughtworks.selenium.SeleniumException;
 import com.thoughtworks.selenium.Wait;
 import com.thoughtworks.selenium.webdriven.SeleneseCommand;
+import com.thoughtworks.selenium.webdriven.Windows;
 
 import org.openqa.selenium.WebDriver;
 

diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/commands/build.desc b/java/client/src/com/thoughtworks/selenium/webdriven/commands/build.desc
@@ -1,20 +1,11 @@
 
-java_library(name = "api",
-  srcs = [
-    "Timer.java",
-  ],
-  deps = [
-    "//java/client/src/com/thoughtworks/selenium/webdriven:emulation-api",
-  ])
-
-
 java_library(name = "commands",
   srcs = [
     "*.java",
   ],
   deps = [
-    ":api",
     "//java/client/src/com/thoughtworks/selenium:wait",
+    "//java/client/src/com/thoughtworks/selenium/webdriven:emulation-api",
     "//java/client/src/org/openqa/selenium:webdriver-api",
     "//java/client/src/org/openqa/selenium/interactions",
     "//java/client/src/org/openqa/selenium/io",