For #401, apply a consistent copyright notice to the java/ tree.

Uses a line-comment format rather than block comments for consistency
across languages.

Author: jleyba

Diff for: java/client/src/com/thoughtworks/selenium/BrowserConfigurationOptions.java

@@ -1,19 +1,19 @@
-/*
-Copyright 2012 Selenium committers
-Copyright 2012 Software Freedom Conservancy
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 
 package com.thoughtworks.selenium;
@@ -23,12 +23,12 @@
 
 /**
  * Contains parameters for a single Selenium browser session.
- * 
+ *
  * BrowserConfigurationOptions is used as an argument to {@code Selenium.start()}. The parameters
  * set within will override any command-line parameters set for the same option.
- * 
+ *
  * @author jbevan, chandrap
- * 
+ *
  */
 public class BrowserConfigurationOptions {
   public static final String PROXY_CONFIG = "proxy";
@@ -53,7 +53,7 @@ public BrowserConfigurationOptions() {
 
   /**
    * Returns true if any options are set in this instance.
-   * 
+   *
    * @return true if any options are set in this instance.
    */
   public boolean hasOptions() {
@@ -62,7 +62,7 @@ public boolean hasOptions() {
 
   /**
    * Serializes to the format "name=value;name=value".
-   * 
+   *
    * @return String with the above format.
    */
   public String serialize() {
@@ -82,7 +82,7 @@ public String serialize() {
   /**
    * Sets the name of the profile, which must exist in the -profilesLocation directory, to use for
    * this browser session.
-   * 
+   *
    * @param profile the name of the profile.
    * @return this BrowserConfigurationOptions object.
    */
@@ -98,7 +98,7 @@ protected String getProfile() {
 
   /**
    * Returns true if the {@code SINGLE_WINDOW} field is set.
-   * 
+   *
    * @return true if {@code SINGLE_WINDOW} is set.
    */
   protected boolean isSingleWindow() {
@@ -110,7 +110,7 @@ protected boolean isSingleWindow() {
 
   /**
    * Returns true if the {@code MULTI_WINDOW} field is set.
-   * 
+   *
    * @return true if {@code MULTI_WINDOW} is set.
    */
   protected boolean isMultiWindow() {
@@ -149,7 +149,7 @@ protected String getBrowserExecutablePath() {
 
   /**
    * Sets the full path for the browser executable.
-   * 
+   *
    * @param executablePath the full path for the browser executable.
    */
   public BrowserConfigurationOptions setBrowserExecutablePath(String executablePath) {
@@ -159,7 +159,7 @@ public BrowserConfigurationOptions setBrowserExecutablePath(String executablePat
 
   /**
    * Sets the timeout, in seconds, for all commands.
-   * 
+   *
    * @param timeout the timeout for all commands
    * @return this BrowserConfigurationOptions instance.
    */
@@ -176,15 +176,15 @@ protected int getTimeoutInSeconds() {
 
   /**
    * Sets the "mode" for the browser.
-   * 
+   *
    * Historically, the 'browser' argument for getNewBrowserSession implied the mode for the browser.
    * For example, *iehta indicated HTA mode for IE, whereas *iexplore indicated the default user
    * mode. Using this method allows a browser mode to be specified independently of the base
    * browser, eg. "HTA" or "PROXY".
-   * 
+   *
    * Note that absolutely no publication nor synchronization of these hard-coded strings such as
    * "HTA" has yet been done. Use at your own risk until this is rectified.
-   * 
+   *
    * @param mode
    */
   public BrowserConfigurationOptions setBrowserMode(String mode) {
@@ -231,7 +231,7 @@ public String get(String key) {
   /**
    * Sets the given key to the given value unless the value is null. In that case, no entry for the
    * key is made.
-   * 
+   *
    * @param key the name of the key
    * @param value the value for the key
    */

Diff for: java/client/src/com/thoughtworks/selenium/CommandProcessor.java

@@ -1,27 +1,27 @@
-/*
- * Copyright 2011 Software Freedom Conservancy.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 package com.thoughtworks.selenium;
 
 /**
  * <p>
  * Provides a <code>doCommand</code> method, which sends the command to the browser to be performed.
  * </p>
- * 
+ *
  *
  * @author Paul Hammant
  * @version $Revision$
@@ -32,14 +32,14 @@ public interface CommandProcessor {
 
   /**
    * The URL that the RemoteControl instance is allegedly running on
-   * 
+   *
    * @return the URL
    */
   String getRemoteControlServerLocation();
 
   /**
    * Send the specified remote command to the browser to be performed
-   * 
+   *
    * @param command - the remote command verb
    * @param args - the arguments to the remote command (depends on the verb)
    * @return - the command result, defined by the remote JavaScript. "getX" style commands may

Diff for: java/client/src/com/thoughtworks/selenium/DefaultRemoteCommand.java

@@ -1,27 +1,27 @@
-/*
- * Copyright 2011 Software Freedom Conservancy.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 package com.thoughtworks.selenium;
 
 import org.openqa.selenium.net.Urls;
 
 /**
  * The default implementation of the RemoteCommand interface
- * 
+ *
  * @see com.thoughtworks.selenium.RemoteCommand
  * @author Paul Hammant
  * @version $Revision$

Diff for: java/client/src/com/thoughtworks/selenium/DefaultSelenium.java

@@ -1,19 +1,19 @@
-/*
- * Copyright 2011 Software Freedom Conservancy.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 package com.thoughtworks.selenium;
 
@@ -33,7 +33,7 @@ public class DefaultSelenium implements Selenium {
   /**
    * Uses a CommandBridgeClient, specifying a server host/port, a command to launch the browser, and
    * a starting URL for the browser.
-   * 
+   *
    * <p>
    * <i>browserStartCommand</i> may be any one of the following:
    * <ul>
@@ -59,7 +59,7 @@ public class DefaultSelenium implements Selenium {
    * up to you to configure it correctly. At a minimum, you'll need to configure your browser to use
    * the Selenium Server as a proxy, and disable all browser-specific prompting.
    * </ul>
-   * 
+   *
    * @param serverHost the host name on which the Selenium Server resides
    * @param serverPort the port on which the Selenium Server is listening
    * @param browserStartCommand the command string used to launch the browser, e.g. "*firefox",
@@ -89,7 +89,7 @@ public DefaultSelenium(CommandProcessor processor) {
    * will be in-play the next time a session is created; that is, typically the next time
    * <code>start()</code> is invoked (and <code>getNewBrowserSession</code> is sent to the RC under
    * the sheets).
-   * 
+   *
    * @param extensionJs a string representing the extra extension javascript to include in the
    *        browser session. This is in addition to any specified via the -userExtensions switch
    *        when starting the RC.