Merge remote-tracking branch 'origin/6.8'

Conflicts:
	src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
	tests/test.xml

6 files changed, 309 insertions, 20 deletions

diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index 22ad356338..3350a0d215 100644
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -13,7 +13,7 @@
 	<fail unless="test.integration.antfile" message="test.integration.antfile must be set for integration tests to run" />
 
 	<!-- Test with these browsers -->
-	<property name="test_browsers" value="winxp-firefox9" />
+	<property name="test_browsers" value="winxp-firefox10" />
 
 	<!-- Path to key file. Default value -->
 	<property name="sshkey.file" value="id_dsa" />
diff --git a/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java b/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java
index 5d39472712..3115ce49c8 100644
--- a/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java
+++ b/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java
@@ -4,6 +4,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.HashSet;
+import java.util.Set;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
@@ -23,6 +24,13 @@ public class SourceFileChecker extends TestCase {
             + "tests/server-side";
     public static final String CLIENTSIDE_SRC_DIR = getBaseDir()
             + "tests/client-side";
+    private String externalJavaFiles = "com/vaadin/external";
+    private String buildFiles = "build";
+    private Set<String> alwaysIgnore = new HashSet<String>();
+    {
+        alwaysIgnore.add(".settings");
+        alwaysIgnore.add("eclipse");
+    }
 
     public static String getBaseDir() {
         if (baseDirectory != null) {
@@ -37,7 +45,7 @@ public class SourceFileChecker extends TestCase {
             }
         }
 
-        baseDirectory = "";
+        baseDirectory = "./";
         return baseDirectory;
     }
 
@@ -45,14 +53,31 @@ public class SourceFileChecker extends TestCase {
             TESTBENCH_SRC_DIR, SERVERSIDE_SRC_DIR, CLIENTSIDE_SRC_DIR };
 
     public void testJavaFilesContainsLicense() throws IOException {
-        validateJavaFiles(SRC_DIR, new LicenseChecker(),
-                "The following files are missing license information:\n{0}");
+        Set<String> ignore = new HashSet<String>(alwaysIgnore);
+        ignore.add(externalJavaFiles);
+        validateFiles(SRC_DIR, new LicenseChecker(), ignore,
+                "The following files are missing license information:\n{0}",
+                ".java");
+    }
+
+    public void testNonJavaFilesUseUnixNewline() throws IOException {
+        Set<String> ignore = new HashSet<String>(alwaysIgnore);
+        ignore.add(buildFiles);
+
+        for (String suffix : new String[] { ".html", ".css", ".xml" }) {
+            validateFiles(getBaseDir(), new DosNewlineDetector(), ignore,
+                    "The following files contain CRLF instead of LF:\n{0}",
+                    suffix);
+        }
     }
 
     public void testJavaFilesUseUnixNewline() throws IOException {
+        Set<String> ignore = new HashSet<String>(alwaysIgnore);
+        ignore.add(externalJavaFiles);
         for (String dir : ALL_SRC_DIRS) {
-            validateJavaFiles(dir, new DosNewlineDetector(),
-                    "The following files contain CRLF instead of LF:\n{0}");
+            validateFiles(dir, new DosNewlineDetector(), ignore,
+                    "The following files contain CRLF instead of LF:\n{0}",
+                    ".java");
         }
     }
 
@@ -60,27 +85,45 @@ public class SourceFileChecker extends TestCase {
         void validateFile(File f) throws Exception;
     }
 
-    private void validateJavaFiles(String directory, FileValidator validator,
-            String errorMessage) {
+    private void validateFiles(String directory, FileValidator validator,
+            Set<String> ignore, String errorMessage, String ending) {
         File srcDir = new File(directory);
-        System.out.println(new File(".").getAbsolutePath());
         HashSet<String> missing = new HashSet<String>();
-        validateFiles(srcDir, missing, validator, ".java");
+        validateFiles(directory, srcDir, missing, validator, ending, ignore);
         if (!missing.isEmpty()) {
-            throw new RuntimeException(errorMessage.replace("{0}",
-                    missing.toString()));
+            throw new RuntimeException(errorMessage.replace("{0}", missing
+                    .toString().replace(',', '\n')));
         }
 
     }
 
-    private void validateFiles(File srcDir, HashSet<String> missing,
-            FileValidator validator, String suffix) {
-        Assert.assertTrue("Directory " + srcDir + " does not exist",
-                srcDir.exists());
+    private void validateFiles(String baseDirectory, File directory,
+            HashSet<String> missing, FileValidator validator, String suffix,
+            Set<String> ignores) {
+        Assert.assertTrue("Directory " + directory + " does not exist",
+                directory.exists());
+
+        File[] files = directory.listFiles();
+        if (files == null) {
+            throw new RuntimeException("Listing of directory "
+                    + directory.getPath() + " failed");
+        }
+        for (File f : files) {
+            boolean ignoreThis = false;
+            for (String ignore : ignores) {
+                if (new File(baseDirectory, ignore).equals(f)) {
+                    ignoreThis = true;
+                    continue;
+                }
+            }
+
+            if (ignoreThis) {
+                continue;
+            }
 
-        for (File f : srcDir.listFiles()) {
             if (f.isDirectory()) {
-                validateFiles(f, missing, validator, suffix);
+                validateFiles(baseDirectory, f, missing, validator, suffix,
+                        ignores);
             } else if (f.getName().endsWith(suffix)) {
                 try {
                     validator.validateFile(f);
diff --git a/tests/test.xml b/tests/test.xml
index 9d060c9a29..2baa26218a 100644
--- a/tests/test.xml
+++ b/tests/test.xml
@@ -11,7 +11,7 @@
 	<!-- Configuration                                                      -->
 	<!-- ================================================================== -->
 	<!-- Browsers to use for testing -->
-	<property name="browsers-windows" value="winxp-ie8,win7-ie9,winxp-firefox9,winxp-safari5,winxp-googlechrome-stable,winxp-opera11" />
+	<property name="browsers-windows" value="winxp-ie8,win7-ie9,winxp-firefox10,winxp-safari5,winxp-googlechrome-stable,winxp-opera11" />
 	<property name="browsers-linux" value="linux-firefox3,linux-opera10,linux-googlechrome8" />
 	<property name="browsers-mac" value="osx-firefox3,osx-opera10,osx-googlechrome8,osx-safari4,osx-safari5" />
 
diff --git a/tests/testbench/com/vaadin/launcher/DevelopmentServerLauncher.java b/tests/testbench/com/vaadin/launcher/DevelopmentServerLauncher.java
index 0fb346736e..b3a7af42b9 100644
--- a/tests/testbench/com/vaadin/launcher/DevelopmentServerLauncher.java
+++ b/tests/testbench/com/vaadin/launcher/DevelopmentServerLauncher.java
@@ -64,7 +64,7 @@ public class DevelopmentServerLauncher {
         try {
             url = runServer(serverArgs, "Development Server Mode");
             // Start Browser
-            if (!serverArgs.containsKey("nogui") && url != null) {
+            if (serverArgs.containsKey("gui") && url != null) {
                 System.out.println("Starting Web Browser.");
 
                 // Open browser into application URL
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html b/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html
new file mode 100644
index 0000000000..dfd001bf5c
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">New Test</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.table.HeaderFooterClickLeftRightMiddle?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td>59,8</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::PID_SLog_row_0</td>
+	<td>1. Click on header col1 using left</td>
+</tr>
+<tr>
+	<td>mouseDownRight</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseUpRight</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::PID_SLog_row_0</td>
+	<td>2. Click on header col1 using right</td>
+</tr>
+<tr>
+	<td>doubleClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::PID_SLog_row_0</td>
+	<td>3. Double click on header col1 using*</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VScrollTable[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]</td>
+	<td>59,8</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::PID_SLog_row_0</td>
+	<td>4. Click on footer col2 using left</td>
+</tr>
+<tr>
+	<td>mouseDownRight</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VScrollTable[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseUpRight</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VScrollTable[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::PID_SLog_row_0</td>
+	<td>5. Click on footer col2 using right</td>
+</tr>
+<tr>
+	<td>doubleClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VScrollTable[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::PID_SLog_row_0</td>
+	<td>6. Double click on footer col2 using*</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java b/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java
new file mode 100644
index 0000000000..642067d826
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java
@@ -0,0 +1,154 @@
+package com.vaadin.tests.components.table;
+
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.tests.util.Log;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Table.FooterClickEvent;
+import com.vaadin.ui.Table.FooterClickListener;
+import com.vaadin.ui.Table.HeaderClickEvent;
+import com.vaadin.ui.Table.HeaderClickListener;
+
+public class HeaderFooterClickLeftRightMiddle extends TestBase {
+
+    private Log log = new Log(10);
+
+    @Override
+    protected void setup() {
+        final Table table = new Table();
+        table.setColumnReorderingAllowed(true);
+        table.setContainerDataSource(createContainer());
+        table.setWidth("400px");
+        table.setHeight("400px");
+        table.setImmediate(true);
+        table.setFooterVisible(true);
+
+        CheckBox immediateCheckbox = new CheckBox("Immediate");
+        immediateCheckbox.setImmediate(true);
+        immediateCheckbox.setValue(table.isImmediate());
+        immediateCheckbox.addListener(new ClickListener() {
+
+            public void buttonClick(ClickEvent event) {
+                table.setImmediate(event.getButton().booleanValue());
+            }
+        });
+
+        CheckBox headerClickListenerCheckbox = new CheckBox(
+                "Header click listener");
+        headerClickListenerCheckbox.setImmediate(true);
+        headerClickListenerCheckbox.addListener(new ValueChangeListener() {
+
+            private HeaderClickListener headerClickListener = new HeaderClickListener() {
+
+                public void headerClick(HeaderClickEvent event) {
+                    String type = event.isDoubleClick() ? "Double click"
+                            : "Click";
+                    log.log(type + " on header "
+                            + event.getPropertyId().toString() + " using "
+                            + event.getButtonName());
+                }
+
+            };
+
+            public void valueChange(ValueChangeEvent event) {
+                if (table.getListeners(HeaderClickEvent.class).isEmpty()) {
+                    table.addListener(headerClickListener);
+                } else {
+                    table.removeListener(headerClickListener);
+                }
+            }
+        });
+        headerClickListenerCheckbox.setValue(true);
+
+        CheckBox footerClickListenerCheckbox = new CheckBox(
+                "Footer click listener");
+        footerClickListenerCheckbox.setImmediate(true);
+        footerClickListenerCheckbox.addListener(new ValueChangeListener() {
+
+            private FooterClickListener footerClickListener = new FooterClickListener() {
+
+                public void footerClick(FooterClickEvent event) {
+                    String type = event.isDoubleClick() ? "Double click"
+                            : "Click";
+                    log.log(type + " on footer "
+                            + event.getPropertyId().toString() + " using "
+                            + event.getButtonName());
+                }
+            };
+
+            public void valueChange(ValueChangeEvent event) {
+                if (table.getListeners(FooterClickEvent.class).isEmpty()) {
+                    table.addListener(footerClickListener);
+                } else {
+                    table.removeListener(footerClickListener);
+                }
+            }
+        });
+        footerClickListenerCheckbox.setValue(true);
+
+        CheckBox sortEnabledCheckbox = new CheckBox("Sortable");
+        sortEnabledCheckbox.setImmediate(true);
+        sortEnabledCheckbox.setValue(!table.isSortDisabled());
+        sortEnabledCheckbox.addListener(new ClickListener() {
+
+            public void buttonClick(ClickEvent event) {
+                table.setSortDisabled(!event.getButton().booleanValue());
+            }
+        });
+
+        CheckBox columnReorderingCheckbox = new CheckBox(
+                "Column reordering allowed");
+        columnReorderingCheckbox.setImmediate(true);
+        columnReorderingCheckbox.setValue(table.isColumnReorderingAllowed());
+        columnReorderingCheckbox.addListener(new ClickListener() {
+
+            public void buttonClick(ClickEvent event) {
+                table.setColumnReorderingAllowed(event.getButton()
+                        .booleanValue());
+            }
+        });
+
+        addComponent(immediateCheckbox);
+        addComponent(headerClickListenerCheckbox);
+        addComponent(footerClickListenerCheckbox);
+        addComponent(sortEnabledCheckbox);
+        addComponent(columnReorderingCheckbox);
+        addComponent(table);
+        addComponent(log);
+
+    }
+
+    @Override
+    protected String getDescription() {
+        return "Tests the header click listener";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 4515;
+    }
+
+    private Container createContainer() {
+        IndexedContainer container = new IndexedContainer();
+        container.addContainerProperty("col1", String.class, "");
+        container.addContainerProperty("col2", String.class, "");
+        container.addContainerProperty("col3", String.class, "");
+
+        for (int i = 0; i < 100; i++) {
+            Item item = container.addItem("item " + i);
+            item.getItemProperty("col1").setValue("first" + i);
+            item.getItemProperty("col2").setValue("middle" + i);
+            item.getItemProperty("col3").setValue("last" + i);
+        }
+
+        return container;
+    }
+
+}

path: root/tests