Undo changeset 19049 (several files committed by accident) except for the mergeinfo...

svn changeset:19050/svn branch:6.6

diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png
index 515f64155d0abd10fe56a8dc2ac864359c511407..90a73be23fc9cc8ca0f0b171688dcb0d130c7b72 100644 (file)
Binary files a/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png and b/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png
index 662dc4c66139d5351c46f51ac35c865b547a4a9a..8ccaa56edd0aeac98ac2c966ac25c6490b6ad1a4 100644 (file)
Binary files a/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png and b/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png
index 0a7bd350e5324e4500f945831543ad64d34ed6a4..84c52dbf4c09df07f12d2d951c9e4706c441941b 100644 (file)
Binary files a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png and b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/common/img/horizontal-sprites.png b/WebContent/VAADIN/themes/reindeer/common/img/horizontal-sprites.png
index 3f107c2c319c19d48dc2592a91fbc872fa663f8c..7980a5aa188df8bf69ab8399ea845792768fb4ac 100644 (file)
Binary files a/WebContent/VAADIN/themes/reindeer/common/img/horizontal-sprites.png and b/WebContent/VAADIN/themes/reindeer/common/img/horizontal-sprites.png differ

diff --git a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png
index 4387eb3f6364e6b70c70533476cdc4199428754f..a7ace8b1317d8321e7fc2fd7742e0f7da978c6b5 100644 (file)
Binary files a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png and b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png differ

diff --git a/src/com/vaadin/launcher/DevelopmentServerLauncher.java b/src/com/vaadin/launcher/DevelopmentServerLauncher.java
index 38222324d37fa2af12a73c7d9eebadbf7ced1d66..256712c9635f9d6a6683d1bbff5015249aba669e 100644 (file)
--- a/src/com/vaadin/launcher/DevelopmentServerLauncher.java
+++ b/src/com/vaadin/launcher/DevelopmentServerLauncher.java
@@ -14,6 +14,8 @@ import org.mortbay.jetty.nio.SelectChannelConnector;
 import org.mortbay.jetty.security.SslSocketConnector;\r
 import org.mortbay.jetty.webapp.WebAppContext;\r
 \r
+import com.vaadin.launcher.util.BrowserLauncher;\r
+\r
 /**\r
  * Class for running Jetty servlet container within Eclipse project.\r
  * \r
@@ -47,7 +49,7 @@ public class DevelopmentServerLauncher {
                 System.out.println("Starting Web Browser.");\r
 \r
                 // Open browser into application URL\r
-                // BrowserLauncher.openBrowser(url);\r
+                BrowserLauncher.openBrowser(url);\r
             }\r
         } catch (Exception e) {\r
             // NOP exception already on console by jetty\r

diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index 5f596ca39873c5c5b566772df81fd3c52966c0f3..738f9c53c501699f6fd0b8cdbbf6df2425d7b6e3 100644 (file)
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -985,7 +985,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Gets the icon Resource for the specified column.
      * 
      * @param propertyId
-     *            the propertyId identifying the column.
+     *            the propertyId indentifying the column.
      * @return the icon for the specified column; null if the column has no icon
      *         set, or if the column is not visible.
      */

diff --git a/tests/eclipse-run-selected-test.properties b/tests/eclipse-run-selected-test.properties
index 2fd04854037883bf1176606858f48bc1e3d7fe60..49925925bc9502fdc5ccf088bad595ceab20df79 100644 (file)
--- a/tests/eclipse-run-selected-test.properties
+++ b/tests/eclipse-run-selected-test.properties
@@ -1,12 +1,12 @@
 ; Location where vaadin-testbench jar can be found\r
-com.vaadin.testbench.lib.dir=/home/hesara/dev/software/testbench/vaadin-testbench-2.2.0\r
+com.vaadin.testbench.lib.dir=<enter location of testbench here>\r
 \r
 ; Deployment url to use for testing. Context path must be /  \r
-com.vaadin.testbench.deployment.url=http://192.168.2.215:8888/\r
+com.vaadin.testbench.deployment.url=http://<enter your ip here>:8888/\r
 \r
 ; Location of the screenshot directory. \r
 ; This is the directory that contains the "references" directory\r
-com.vaadin.testbench.screenshot.directory=/home/hesara/dev/workspaces/helios_sr1_jee_vaadin/v66_screenshots\r
+com.vaadin.testbench.screenshot.directory=<enter the full path to the screenshots directory, parent of "references" directory>\r
 \r
 ; Run the whole test even if \r
 com.vaadin.testbench.screenshot.softfail=true\r
@@ -21,9 +21,9 @@ com.vaadin.testbench.screenshot.cursor=true
 ; testfiles=${resource_loc}\r
 \r
 ; Uncomment to limit to certain browsers or override in launch configuration\r
-; browsers=winxp-googlechrome-stable\r
+; browsers=winxp-opera10\r
 \r
-; Claim that the server has started successfully. Needed for the tests to run\r
+; Claim that the server has started succesfully. Needed for the tests to run\r
 server.start.succeeded=1\r
 \r
-test-output-dir=../build/test-output\r
+test-output-dir=../build/test-output
\ No newline at end of file

diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxes2.java b/tests/src/com/vaadin/tests/components/combobox/ComboBoxes2.java
index bea3a449c7ac7426eacd9bba29b77e45716e3726..f41176c6caf27308e244b970f754247670d4af90 100644 (file)
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxes2.java
+++ b/tests/src/com/vaadin/tests/components/combobox/ComboBoxes2.java
@@ -2,7 +2,6 @@ package com.vaadin.tests.components.combobox;
 
 import java.util.LinkedHashMap;
 
-import com.vaadin.data.Container;
 import com.vaadin.terminal.Resource;
 import com.vaadin.tests.components.select.SelectTest;
 import com.vaadin.ui.ComboBox;
@@ -73,10 +72,4 @@ public class ComboBoxes2 extends SelectTest<ComboBox> {
                 });
     }
 
-    @Override
-    protected void setContainer(Container newContainer) {
-        super.setContainer(newContainer);
-        // getComponent().setItemCaptionPropertyId("Property 1");
-    }
-
 }