Moving utility method isScriptFile to the only class where it is needed

Author: barancev

Diff for: java/client/src/org/openqa/selenium/browserlaunchers/LauncherUtils.java

@@ -22,14 +22,12 @@
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.io.FileHandler;
-import org.openqa.selenium.io.IOUtils;
 import org.openqa.selenium.net.Urls;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
@@ -172,25 +170,6 @@ private static InputStream getSeleniumResourceAsStream(String resourceFile) {
     return LauncherUtils.class.getResourceAsStream(resourceFile);
   }
 
-  public static boolean isScriptFile(File aFile) {
-    final char firstTwoChars[] = new char[2];
-    FileReader reader = null;
-    int charsRead;
-
-    try {
-      reader = new FileReader(aFile);
-      charsRead = reader.read(firstTwoChars);
-      if (2 != charsRead) {
-        return false;
-      }
-      return (firstTwoChars[0] == '#' && firstTwoChars[1] == '!');
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    } finally {
-      IOUtils.closeQuietly(reader);
-    }
-  }
-
   // TODO(simon): Replace with something not in LauncherUtils
   public static void copySingleFile(File sourceFile, File destFile) {
     copySingleFileWithOverwrite(sourceFile, destFile, false);

Diff for: java/client/src/org/openqa/selenium/browserlaunchers/locators/FirefoxLocator.java

@@ -21,7 +21,6 @@
 import com.google.common.collect.ImmutableList;
 
 import org.openqa.selenium.Platform;
-import org.openqa.selenium.browserlaunchers.LauncherUtils;
 import org.openqa.selenium.os.CommandLine;
 import org.openqa.selenium.os.WindowsUtils;
 import org.openqa.selenium.remote.BrowserType;
@@ -163,7 +162,7 @@ public BrowserInstallation findBrowserLocation() {
         continue;
       }
 
-      if (LauncherUtils.isScriptFile(new File(executable))) {
+      if (isScriptFile(new File(executable))) {
         LOGGER.warning("Caution: '" + executable + "': file is a script file, not a real executable." +
                        " The browser environment is no longer fully under RC control");
       }

Diff for: java/client/src/org/openqa/selenium/browserlaunchers/locators/SingleBrowserLocator.java

@@ -18,11 +18,13 @@
 
 package org.openqa.selenium.browserlaunchers.locators;
 
-import org.openqa.selenium.browserlaunchers.LauncherUtils;
+import org.openqa.selenium.io.IOUtils;
 import org.openqa.selenium.os.CommandLine;
 import org.openqa.selenium.os.WindowsUtils;
 
 import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
 import java.util.logging.Logger;
 
 /**
@@ -163,7 +165,7 @@ protected BrowserInstallation retrieveValidInstallationPath(File launcher) {
       return null;
     }
 
-    if (LauncherUtils.isScriptFile(launcher)) {
+    if (isScriptFile(launcher)) {
       log.warning("Caution: '" +
           launcher.getAbsolutePath() +
           "': file is a script file, not a real executable.  The browser environment is no longer fully under RC control");
@@ -189,4 +191,23 @@ public String computeLibraryPath(File launcherPath) {
     return currentLibraryPath + File.pathSeparator + launcherPath.getParent();
   }
 
+  protected boolean isScriptFile(File aFile) {
+    final char firstTwoChars[] = new char[2];
+    FileReader reader = null;
+    int charsRead;
+
+    try {
+      reader = new FileReader(aFile);
+      charsRead = reader.read(firstTwoChars);
+      if (2 != charsRead) {
+        return false;
+      }
+      return (firstTwoChars[0] == '#' && firstTwoChars[1] == '!');
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    } finally {
+      IOUtils.closeQuietly(reader);
+    }
+  }
+
 }