Remove unneeded 'else' (#2142)

Author: asashour

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

@@ -73,16 +73,13 @@ private String simulateStringDotFormatMethod(String message, Object[] args) {
         }
       }
       throw new RuntimeException("String.format(..) can't be that hard to call");
-    } else {
-      String msg = "";
-      msg = message;
-      for (int i = 0; i < args.length; i++) {
-        msg = msg + " " + args[i];
-      }
-      return msg;
-
     }
-
+    String msg = "";
+    msg = message;
+    for (int i = 0; i < args.length; i++) {
+      msg = msg + " " + args[i];
+    }
+    return msg;
   }
 
   // drop these for var-args in another year.

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

@@ -49,8 +49,7 @@ public Text(String expectedText, String locator) {
   public boolean isTrue(ConditionRunner.Context context) {
     if (null == locator) {
       return context.getSelenium().isTextPresent(expectedText);
-    } else {
-      return context.getSelenium().getText(locator).equalsIgnoreCase(expectedText);
     }
+    return context.getSelenium().getText(locator).equalsIgnoreCase(expectedText);
   }
 }

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

@@ -95,10 +95,9 @@ public void start(Object o) {
     if (driver != null) {
       if (maker != null) {
         throw new SeleniumException("You may not start more than one session at a time");
-      } else {
-        // The command processor was instantiated with an already started driver
-        return;
       }
+      // The command processor was instantiated with an already started driver
+      return;
     }
 
     driver = maker.get();

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

@@ -30,8 +30,7 @@ protected String handleSeleneseCommand(WebDriver driver, String locator, String
     if (driver instanceof TakesScreenshot) {
       TakesScreenshot tsDriver = (TakesScreenshot) driver;
       return tsDriver.getScreenshotAs(OutputType.BASE64);
-    } else {
-      throw new UnsupportedOperationException("WebDriver does not implement TakeScreenshot");
     }
+    throw new UnsupportedOperationException("WebDriver does not implement TakeScreenshot");
   }
 }

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

@@ -42,9 +42,8 @@ protected String handleSeleneseCommand(WebDriver driver, String locator, String
     {
       if (element.getAttribute("checked") == null) {
         return "off";
-      } else {
-        return "on";
       }
+      return "on";
     }
 
     return element.getAttribute("value");

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

@@ -228,11 +228,10 @@ private static final CommandExecutor createCommandExecutor(Capabilities desiredC
     Object marionette = desiredCapabilities.getCapability(MARIONETTE);
     if (marionette instanceof Boolean && !(Boolean) marionette) {
       return new LazyCommandExecutor(binary, profile);
-    } else {
-      GeckoDriverService.Builder builder = new GeckoDriverService.Builder();
-      builder.usingPort(0);
-      return new DriverCommandExecutor(builder.build());
     }
+    GeckoDriverService.Builder builder = new GeckoDriverService.Builder();
+    builder.usingPort(0);
+    return new DriverCommandExecutor(builder.build());
   }
 
   @Override

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

@@ -181,10 +181,8 @@ public void writeTo(Writer writer) throws IOException {
   private String valueAsPreference(Object value) {
     if (value instanceof String) {
       return "\"" + escapeValueAsPreference((String) value) + "\"";
-    } else {
-      return escapeValueAsPreference(String.valueOf(value));
     }
-
+    return escapeValueAsPreference(String.valueOf(value));
   }
 
   private String escapeValueAsPreference(String value) {

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

@@ -133,9 +133,8 @@ public Collection<WebElement> findFrom(WebDriver context) {
           Iterator<WebElement> iter = collection.iterator();
           iter.hasNext();
           return Collections.singletonList(iter.next());
-        } else {
-          return collection;
         }
+        return collection;
       }
 
       @Override

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

@@ -39,9 +39,8 @@ public Collection<S> findFrom(T context) {
 
     if (matchers.isEmpty()) {
       return found;
-    } else {
-      return allMatching(matchers, found);
     }
+    return allMatching(matchers, found);
   }
 
   public Finder<S, T> with(Matcher<S> matcher) {

java/client/src/org/openqa/selenium/os/ProcessUtils.java

@@ -79,9 +79,8 @@ private static int waitForProcessDeath(Process p, long timeout) {
   public static int killProcess(Process process) {
     if (thisIsWindows()) {
       return killWinProcess(process);
-    } else {
-      return killUnixProcess(process);
     }
+    return killUnixProcess(process);
   }
 
   private static int killUnixProcess(Process process) {