Clean up import statements. No logical changes.

Done by running "optimize imports" in IJ CE.

Author: shs96c

java/client/src/com/thoughtworks/selenium/condition/JUnitConditionRunner.java

@@ -17,10 +17,10 @@
 
 package com.thoughtworks.selenium.condition;
 
-import com.thoughtworks.selenium.Selenium;
-
 import static org.junit.Assert.fail;
 
+import com.thoughtworks.selenium.Selenium;
+
 /**
  * This class throws an {@link junit.framework.AssertionFailedError} when the condition is not met.
  */

java/client/src/com/thoughtworks/selenium/webdriven/CompoundMutator.java

@@ -20,12 +20,6 @@
 
 import com.google.common.collect.Lists;
 
-import com.thoughtworks.selenium.webdriven.FunctionDeclaration;
-import com.thoughtworks.selenium.webdriven.JavascriptLibrary;
-import com.thoughtworks.selenium.webdriven.ScriptMutator;
-import com.thoughtworks.selenium.webdriven.SeleniumMutator;
-import com.thoughtworks.selenium.webdriven.VariableDeclaration;
-
 import java.util.List;
 
 /**

java/client/src/com/thoughtworks/selenium/webdriven/FunctionDeclaration.java

@@ -18,8 +18,6 @@
 
 package com.thoughtworks.selenium.webdriven;
 
-import com.thoughtworks.selenium.webdriven.ScriptMutator;
-
 import java.util.regex.Pattern;
 
 /**

java/client/src/com/thoughtworks/selenium/webdriven/SeleniumMutator.java

@@ -18,8 +18,6 @@
 
 package com.thoughtworks.selenium.webdriven;
 
-import com.thoughtworks.selenium.webdriven.ScriptMutator;
-
 import java.util.regex.Pattern;
 
 /**

java/client/src/com/thoughtworks/selenium/webdriven/VariableDeclaration.java

@@ -18,8 +18,6 @@
 
 package com.thoughtworks.selenium.webdriven;
 
-import com.thoughtworks.selenium.webdriven.ScriptMutator;
-
 import java.util.regex.Pattern;
 
 /**

java/client/src/com/thoughtworks/selenium/webdriven/commands/SetCursorPosition.java

@@ -23,7 +23,6 @@
 
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.WebElement;
 
 public class SetCursorPosition extends SeleneseCommand<Void> {

java/client/src/org/openqa/selenium/WebDriver.java

@@ -17,8 +17,8 @@
 
 package org.openqa.selenium;
 
-import org.openqa.selenium.logging.Logs;
 import org.openqa.selenium.logging.LoggingPreferences;
+import org.openqa.selenium.logging.Logs;
 
 import java.net.URL;
 import java.util.List;

java/client/src/org/openqa/selenium/chrome/ChromeDriver.java

@@ -19,6 +19,7 @@
 package org.openqa.selenium.chrome;
 
 import com.google.common.collect.ImmutableMap;
+
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebDriverException;

java/client/src/org/openqa/selenium/chrome/ChromeDriverCommandExecutor.java

@@ -21,7 +21,6 @@
 
 import org.openqa.selenium.remote.CommandInfo;
 import org.openqa.selenium.remote.http.HttpMethod;
-
 import org.openqa.selenium.remote.service.DriverCommandExecutor;
 import org.openqa.selenium.remote.service.DriverService;
 

java/client/src/org/openqa/selenium/edge/EdgeDriver.java

@@ -18,8 +18,6 @@
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.edge.EdgeDriverService;
-import org.openqa.selenium.edge.EdgeOptions;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.openqa.selenium.remote.service.DriverCommandExecutor;
 

java/client/src/org/openqa/selenium/edge/EdgeOptions.java

@@ -19,13 +19,13 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.io.IOException;
-
 import com.google.gson.JsonObject;
 
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
+import java.io.IOException;
+
 
 /**
  * Class to manage options specific to {@link EdgeDriver}.

java/client/src/org/openqa/selenium/firefox/FirefoxBinary.java

@@ -33,9 +33,7 @@
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.firefox.internal.Executable;
-import org.openqa.selenium.io.CircularOutputStream;
 import org.openqa.selenium.io.FileHandler;
-import org.openqa.selenium.io.MultiOutputStream;
 import org.openqa.selenium.os.CommandLine;
 import org.openqa.selenium.os.ExecutableFinder;
 

java/client/src/org/openqa/selenium/firefox/internal/FileExtension.java

@@ -20,7 +20,6 @@
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.io.FileHandler;
 import org.openqa.selenium.io.TemporaryFilesystem;
-
 import org.openqa.selenium.io.Zip;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;

java/client/src/org/openqa/selenium/firefox/internal/ProfilesIni.java

@@ -17,6 +17,9 @@
 
 package org.openqa.selenium.firefox.internal;
 
+import static org.openqa.selenium.Platform.MAC;
+import static org.openqa.selenium.Platform.WINDOWS;
+
 import com.google.common.collect.Maps;
 
 import org.openqa.selenium.Platform;
@@ -32,9 +35,6 @@
 import java.text.MessageFormat;
 import java.util.Map;
 
-import static org.openqa.selenium.Platform.WINDOWS;
-import static org.openqa.selenium.Platform.MAC;
-
 public class ProfilesIni {
   private Map<String, File> profiles = Maps.newHashMap();
 

java/client/src/org/openqa/selenium/internal/HasIdentity.java

@@ -17,8 +17,6 @@
 
 package org.openqa.selenium.internal;
 
-import org.openqa.selenium.interactions.internal.Coordinates;
-
 public interface HasIdentity {
   String getId();
 }

java/client/src/org/openqa/selenium/io/FileHandler.java

@@ -22,9 +22,9 @@
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.OutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.List;

java/client/src/org/openqa/selenium/lift/BUCK

@@ -2,8 +2,8 @@ java_library(name = 'lift',
   srcs = glob(['**/*.java']),
   deps = [
     '//java/client/src/org/openqa/selenium:selenium',
-    '//java/client/src/org/openqa/selenium/support/ui:wait',
     '//java/client/src/org/openqa/selenium/support/ui:clock',
+    '//java/client/src/org/openqa/selenium/support/ui:wait',
     '//third_party/java/guava:guava',
     '//third_party/java/hamcrest:hamcrest',
     '//third_party/java/junit:junit',

java/client/src/org/openqa/selenium/lift/Finders.java

@@ -18,13 +18,12 @@
 // Generated source.
 package org.openqa.selenium.lift;
 
+import org.hamcrest.Description;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.lift.find.BaseFinder;
 import org.openqa.selenium.lift.find.Finder;
 
-import org.hamcrest.Description;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;

java/client/src/org/openqa/selenium/lift/HamcrestWebDriverTestCase.java

@@ -20,13 +20,13 @@
 import static org.openqa.selenium.lift.match.NumericalMatchers.exactly;
 import static org.openqa.selenium.lift.match.SelectionMatcher.selection;
 
+import junit.framework.TestCase;
+
+import org.hamcrest.Matcher;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.lift.find.Finder;
 
-import junit.framework.TestCase;
-import org.hamcrest.Matcher;
-
 /**
  * Base class for tests using the LiFT style API to driver WebDriver.
  */

java/client/src/org/openqa/selenium/lift/TestContext.java

@@ -17,12 +17,11 @@
 
 package org.openqa.selenium.lift;
 
+import org.hamcrest.Matcher;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.lift.find.Finder;
 
-import org.hamcrest.Matcher;
-
 /**
  * Interface for objects that provide a context (maintaining any state) for web tests.
  */

java/client/src/org/openqa/selenium/lift/WebDriverTestContext.java

@@ -19,6 +19,9 @@
 
 import static org.openqa.selenium.lift.match.NumericalMatchers.atLeast;
 
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.StringDescription;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.lift.find.Finder;
@@ -30,10 +33,6 @@
 import org.openqa.selenium.support.ui.Wait;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.StringDescription;
-
 import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 

java/client/src/org/openqa/selenium/lift/find/DivFinder.java

@@ -17,9 +17,8 @@
 
 package org.openqa.selenium.lift.find;
 
-import static org.openqa.selenium.lift.match.AttributeMatcher.attribute;
-
 import static org.hamcrest.Matchers.equalTo;
+import static org.openqa.selenium.lift.match.AttributeMatcher.attribute;
 
 import org.hamcrest.Factory;
 

java/client/src/org/openqa/selenium/lift/find/HtmlTagFinder.java

@@ -17,13 +17,12 @@
 
 package org.openqa.selenium.lift.find;
 
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-
 import java.util.Collection;
 
 /**

java/client/src/org/openqa/selenium/lift/find/InputFinder.java

@@ -17,11 +17,10 @@
 
 package org.openqa.selenium.lift.find;
 
+import static org.hamcrest.Matchers.equalTo;
 import static org.openqa.selenium.lift.Matchers.attribute;
 import static org.openqa.selenium.lift.Matchers.value;
 
-import static org.hamcrest.Matchers.equalTo;
-
 import org.hamcrest.Factory;
 
 /**

java/client/src/org/openqa/selenium/lift/find/LinkFinder.java

@@ -21,9 +21,8 @@
  * A {@link Finder} for HTML anchor tags, "links".
  */
 
-import static org.openqa.selenium.lift.match.TextMatcher.text;
-
 import static org.hamcrest.Matchers.equalTo;
+import static org.openqa.selenium.lift.match.TextMatcher.text;
 
 import org.hamcrest.Factory;
 

java/client/src/org/openqa/selenium/lift/find/PageTitleFinder.java

@@ -20,9 +20,8 @@
  */
 package org.openqa.selenium.lift.find;
 
-import static org.openqa.selenium.lift.match.TextMatcher.text;
-
 import static org.hamcrest.Matchers.equalTo;
+import static org.openqa.selenium.lift.match.TextMatcher.text;
 
 import org.hamcrest.Factory;
 

java/client/src/org/openqa/selenium/lift/find/XPathFinder.java

@@ -16,12 +16,11 @@
 // under the License.
 package org.openqa.selenium.lift.find;
 
+import org.hamcrest.Description;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 
-import org.hamcrest.Description;
-
 import java.util.Collection;
 
 /**

java/client/src/org/openqa/selenium/lift/match/AttributeMatcher.java

@@ -17,12 +17,11 @@
 
 package org.openqa.selenium.lift.match;
 
-import org.openqa.selenium.WebElement;
-
 import org.hamcrest.Description;
 import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
+import org.openqa.selenium.WebElement;
 
 /**
  * hamcrest matcher for attributes of {@link WebElement}s.

java/client/src/org/openqa/selenium/lift/match/SelectionMatcher.java

@@ -18,12 +18,11 @@
 
 package org.openqa.selenium.lift.match;
 
-import org.openqa.selenium.WebElement;
-
 import org.hamcrest.Description;
 import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
+import org.openqa.selenium.WebElement;
 
 /**
  * Matcher to match a selected element (e.g. a radio button).

java/client/src/org/openqa/selenium/lift/match/TextMatcher.java

@@ -17,12 +17,11 @@
 
 package org.openqa.selenium.lift.match;
 
-import org.openqa.selenium.WebElement;
-
 import org.hamcrest.Description;
 import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
+import org.openqa.selenium.WebElement;
 
 /**
  * {@link Matcher} for matching text content within {@link WebElement}s.

java/client/src/org/openqa/selenium/lift/match/ValueMatcher.java

@@ -18,12 +18,11 @@
 
 package org.openqa.selenium.lift.match;
 
-import org.openqa.selenium.WebElement;
-
 import org.hamcrest.Description;
 import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
+import org.openqa.selenium.WebElement;
 
 /**
  * Matches the value of an element, for example an input field.

java/client/src/org/openqa/selenium/logging/BUCK

@@ -21,8 +21,8 @@ java_library(name = 'logging',
   deps = [
     ':api',
     '//java/client/src/org/openqa/selenium:beta',
-    '//third_party/java/guava:guava',
     '//third_party/java/gson:gson',
+    '//third_party/java/guava:guava',
   ],
   visibility = [
     '//java/client/src/org/openqa/selenium:selenium'