From 5f90e8036db9c5354bb9671518aa3402dec75854 Mon Sep 17 00:00:00 2001 From: Jonatan Kronqvist Date: Wed, 24 Aug 2011 12:07:41 +0000 Subject: [PATCH] Made the LicenseInJavaFiles test pass svn changeset:20616/svn branch:6.7 --- .../gwt/dom/client/VaadinDOMImplSafari.java | 3 +++ src/com/vaadin/data/util/AbstractContainer.java | 3 +++ .../data/util/AbstractInMemoryContainer.java | 3 +++ src/com/vaadin/data/util/AbstractProperty.java | 3 +++ src/com/vaadin/data/util/BeanContainer.java | 3 +++ .../data/util/MethodPropertyDescriptor.java | 3 +++ .../vaadin/data/util/NestedMethodProperty.java | 3 +++ .../data/util/NestedPropertyDescriptor.java | 3 +++ .../data/util/VaadinPropertyDescriptor.java | 3 +++ .../data/util/filter/AbstractJunctionFilter.java | 3 +++ src/com/vaadin/data/util/filter/And.java | 3 +++ src/com/vaadin/data/util/filter/Between.java | 3 +++ src/com/vaadin/data/util/filter/Compare.java | 3 +++ src/com/vaadin/data/util/filter/IsNull.java | 3 +++ src/com/vaadin/data/util/filter/Like.java | 3 +++ src/com/vaadin/data/util/filter/Not.java | 3 +++ src/com/vaadin/data/util/filter/Or.java | 3 +++ .../data/util/filter/SimpleStringFilter.java | 3 +++ .../util/filter/UnsupportedFilterException.java | 3 +++ .../util/sqlcontainer/CacheFlushNotifier.java | 5 ++++- .../vaadin/data/util/sqlcontainer/CacheMap.java | 3 +++ .../data/util/sqlcontainer/ColumnProperty.java | 3 +++ .../sqlcontainer/OptimisticLockException.java | 3 +++ .../data/util/sqlcontainer/ReadOnlyRowId.java | 3 +++ .../vaadin/data/util/sqlcontainer/Reference.java | 3 +++ src/com/vaadin/data/util/sqlcontainer/RowId.java | 3 +++ .../vaadin/data/util/sqlcontainer/RowItem.java | 3 +++ .../data/util/sqlcontainer/SQLContainer.java | 5 ++++- .../vaadin/data/util/sqlcontainer/SQLUtil.java | 7 +++++-- .../data/util/sqlcontainer/TemporaryRowId.java | 3 +++ .../connection/J2EEConnectionPool.java | 3 +++ .../connection/JDBCConnectionPool.java | 3 +++ .../connection/SimpleJDBCConnectionPool.java | 3 +++ .../util/sqlcontainer/query/FreeformQuery.java | 3 +++ .../sqlcontainer/query/FreeformQueryDelegate.java | 3 +++ .../query/FreeformStatementDelegate.java | 3 +++ .../data/util/sqlcontainer/query/OrderBy.java | 3 +++ .../util/sqlcontainer/query/QueryDelegate.java | 3 +++ .../data/util/sqlcontainer/query/TableQuery.java | 5 ++++- .../query/generator/DefaultSQLGenerator.java | 3 +++ .../query/generator/MSSQLGenerator.java | 12 ++++++------ .../query/generator/OracleGenerator.java | 3 +++ .../query/generator/SQLGenerator.java | 3 +++ .../query/generator/StatementHelper.java | 5 ++++- .../query/generator/filter/AndTranslator.java | 7 +++++-- .../query/generator/filter/BetweenTranslator.java | 6 ++++-- .../query/generator/filter/CompareTranslator.java | 3 +++ .../query/generator/filter/FilterTranslator.java | 3 +++ .../query/generator/filter/IsNullTranslator.java | 3 +++ .../query/generator/filter/LikeTranslator.java | 9 +++++---- .../query/generator/filter/NotTranslator.java | 9 +++++---- .../query/generator/filter/OrTranslator.java | 7 +++++-- .../query/generator/filter/QueryBuilder.java | 5 ++++- .../generator/filter/SimpleStringTranslator.java | 3 +++ .../query/generator/filter/StringDecorator.java | 5 ++++- src/com/vaadin/event/ActionManager.java | 3 +++ src/com/vaadin/event/ShortcutListener.java | 3 +++ src/com/vaadin/terminal/StreamVariable.java | 3 +++ .../vaadin/terminal/gwt/client/ComputedStyle.java | 3 +++ .../vaadin/terminal/gwt/client/EventHelper.java | 3 +++ src/com/vaadin/terminal/gwt/client/EventId.java | 3 +++ .../terminal/gwt/client/SynchronousXHR.java | 3 +++ .../terminal/gwt/client/VBrowserDetails.java | 3 +++ src/com/vaadin/terminal/gwt/client/VConsole.java | 3 +++ .../terminal/gwt/client/VSchedulerImpl.java | 3 +++ .../terminal/gwt/client/WidgetInstantiator.java | 3 +++ .../vaadin/terminal/gwt/client/WidgetLoader.java | 3 +++ .../terminal/gwt/client/ui/FocusElementPanel.java | 3 +++ .../gwt/client/ui/FocusableFlexTable.java | 3 +++ .../gwt/client/ui/FocusableFlowPanel.java | 3 +++ .../gwt/client/ui/FocusableScrollPanel.java | 3 +++ .../gwt/client/ui/SimpleFocusablePanel.java | 3 +++ .../gwt/client/ui/TouchScrollDelegate.java | 15 +++++++++------ .../gwt/client/ui/UploadIFrameOnloadStrategy.java | 3 +++ .../client/ui/UploadIFrameOnloadStrategyIE.java | 3 +++ .../terminal/gwt/client/ui/VLazyExecutor.java | 3 +++ .../vaadin/terminal/gwt/client/ui/dd/DDUtil.java | 3 +++ .../terminal/gwt/client/ui/dd/VHtml5File.java | 3 +++ .../gwt/server/AbstractStreamingEvent.java | 3 +++ .../gwt/server/NoInputStreamException.java | 3 +++ .../gwt/server/NoOutputStreamException.java | 3 +++ .../gwt/server/StreamingEndEventImpl.java | 3 +++ .../gwt/server/StreamingErrorEventImpl.java | 3 +++ .../gwt/server/StreamingProgressEventImpl.java | 3 +++ .../gwt/server/StreamingStartEventImpl.java | 3 +++ .../terminal/gwt/server/UploadException.java | 3 +++ src/com/vaadin/ui/HorizontalSplitPanel.java | 3 +++ src/com/vaadin/ui/Html5File.java | 10 ++++++---- src/com/vaadin/ui/VerticalSplitPanel.java | 3 +++ src/com/vaadin/ui/themes/LiferayTheme.java | 3 +++ src/com/vaadin/ui/treetable/Collapsible.java | 3 +++ .../HierarchicalContainerOrderedWrapper.java | 4 +++- 92 files changed, 305 insertions(+), 39 deletions(-) diff --git a/src/com/google/gwt/dom/client/VaadinDOMImplSafari.java b/src/com/google/gwt/dom/client/VaadinDOMImplSafari.java index c68f80595d..1f6c600ca8 100644 --- a/src/com/google/gwt/dom/client/VaadinDOMImplSafari.java +++ b/src/com/google/gwt/dom/client/VaadinDOMImplSafari.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.google.gwt.dom.client; /** diff --git a/src/com/vaadin/data/util/AbstractContainer.java b/src/com/vaadin/data/util/AbstractContainer.java index eed58c578a..a1d964704c 100644 --- a/src/com/vaadin/data/util/AbstractContainer.java +++ b/src/com/vaadin/data/util/AbstractContainer.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util; import java.io.Serializable; diff --git a/src/com/vaadin/data/util/AbstractInMemoryContainer.java b/src/com/vaadin/data/util/AbstractInMemoryContainer.java index 3a9a0a8987..d3e981231f 100644 --- a/src/com/vaadin/data/util/AbstractInMemoryContainer.java +++ b/src/com/vaadin/data/util/AbstractInMemoryContainer.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util; import java.util.Collection; diff --git a/src/com/vaadin/data/util/AbstractProperty.java b/src/com/vaadin/data/util/AbstractProperty.java index 953ab664a3..2c1204438d 100644 --- a/src/com/vaadin/data/util/AbstractProperty.java +++ b/src/com/vaadin/data/util/AbstractProperty.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util; import java.util.Collection; diff --git a/src/com/vaadin/data/util/BeanContainer.java b/src/com/vaadin/data/util/BeanContainer.java index f74b2bfb24..6dd9915b9e 100644 --- a/src/com/vaadin/data/util/BeanContainer.java +++ b/src/com/vaadin/data/util/BeanContainer.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util; import java.util.Collection; diff --git a/src/com/vaadin/data/util/MethodPropertyDescriptor.java b/src/com/vaadin/data/util/MethodPropertyDescriptor.java index 4f366d1e1d..1d7944dc6c 100644 --- a/src/com/vaadin/data/util/MethodPropertyDescriptor.java +++ b/src/com/vaadin/data/util/MethodPropertyDescriptor.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util; import java.io.IOException; diff --git a/src/com/vaadin/data/util/NestedMethodProperty.java b/src/com/vaadin/data/util/NestedMethodProperty.java index 3d400d7d02..41d743aa11 100644 --- a/src/com/vaadin/data/util/NestedMethodProperty.java +++ b/src/com/vaadin/data/util/NestedMethodProperty.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util; import java.io.IOException; diff --git a/src/com/vaadin/data/util/NestedPropertyDescriptor.java b/src/com/vaadin/data/util/NestedPropertyDescriptor.java index cbe800dff3..b452fdbc49 100644 --- a/src/com/vaadin/data/util/NestedPropertyDescriptor.java +++ b/src/com/vaadin/data/util/NestedPropertyDescriptor.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util; import com.vaadin.data.Property; diff --git a/src/com/vaadin/data/util/VaadinPropertyDescriptor.java b/src/com/vaadin/data/util/VaadinPropertyDescriptor.java index b6ae89f41e..37f030bbc2 100644 --- a/src/com/vaadin/data/util/VaadinPropertyDescriptor.java +++ b/src/com/vaadin/data/util/VaadinPropertyDescriptor.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util; import java.io.Serializable; diff --git a/src/com/vaadin/data/util/filter/AbstractJunctionFilter.java b/src/com/vaadin/data/util/filter/AbstractJunctionFilter.java index f6464763c4..a3514aa353 100644 --- a/src/com/vaadin/data/util/filter/AbstractJunctionFilter.java +++ b/src/com/vaadin/data/util/filter/AbstractJunctionFilter.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.filter; import java.util.Arrays; diff --git a/src/com/vaadin/data/util/filter/And.java b/src/com/vaadin/data/util/filter/And.java index 6183531ea1..8611a71e65 100644 --- a/src/com/vaadin/data/util/filter/And.java +++ b/src/com/vaadin/data/util/filter/And.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.filter; import com.vaadin.data.Container.Filter; diff --git a/src/com/vaadin/data/util/filter/Between.java b/src/com/vaadin/data/util/filter/Between.java index a44995b24a..6ee6e6f330 100644 --- a/src/com/vaadin/data/util/filter/Between.java +++ b/src/com/vaadin/data/util/filter/Between.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.filter; import com.vaadin.data.Container.Filter; diff --git a/src/com/vaadin/data/util/filter/Compare.java b/src/com/vaadin/data/util/filter/Compare.java index 34d21a8823..754c119812 100644 --- a/src/com/vaadin/data/util/filter/Compare.java +++ b/src/com/vaadin/data/util/filter/Compare.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.filter; import com.vaadin.data.Container.Filter; diff --git a/src/com/vaadin/data/util/filter/IsNull.java b/src/com/vaadin/data/util/filter/IsNull.java index c0a7151b27..6fc959f310 100644 --- a/src/com/vaadin/data/util/filter/IsNull.java +++ b/src/com/vaadin/data/util/filter/IsNull.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.filter; import com.vaadin.data.Container.Filter; diff --git a/src/com/vaadin/data/util/filter/Like.java b/src/com/vaadin/data/util/filter/Like.java index a3cee49f26..243b66555b 100644 --- a/src/com/vaadin/data/util/filter/Like.java +++ b/src/com/vaadin/data/util/filter/Like.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.filter; import com.vaadin.data.Container.Filter; diff --git a/src/com/vaadin/data/util/filter/Not.java b/src/com/vaadin/data/util/filter/Not.java index b219542685..edd78091f4 100644 --- a/src/com/vaadin/data/util/filter/Not.java +++ b/src/com/vaadin/data/util/filter/Not.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.filter; import com.vaadin.data.Container.Filter; diff --git a/src/com/vaadin/data/util/filter/Or.java b/src/com/vaadin/data/util/filter/Or.java index 4cd7f2558a..56605e972b 100644 --- a/src/com/vaadin/data/util/filter/Or.java +++ b/src/com/vaadin/data/util/filter/Or.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.filter; import com.vaadin.data.Container.Filter; diff --git a/src/com/vaadin/data/util/filter/SimpleStringFilter.java b/src/com/vaadin/data/util/filter/SimpleStringFilter.java index c487d9fe0f..6a1d75eab8 100644 --- a/src/com/vaadin/data/util/filter/SimpleStringFilter.java +++ b/src/com/vaadin/data/util/filter/SimpleStringFilter.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.filter; import com.vaadin.data.Container.Filter; diff --git a/src/com/vaadin/data/util/filter/UnsupportedFilterException.java b/src/com/vaadin/data/util/filter/UnsupportedFilterException.java index b6b1074024..bc4fa2f152 100644 --- a/src/com/vaadin/data/util/filter/UnsupportedFilterException.java +++ b/src/com/vaadin/data/util/filter/UnsupportedFilterException.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.filter; import java.io.Serializable; diff --git a/src/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java b/src/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java index 5ce84ba8b1..b457d4e70b 100644 --- a/src/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java +++ b/src/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer; import java.io.Serializable; @@ -14,7 +17,7 @@ import com.vaadin.data.util.sqlcontainer.query.TableQuery; * CacheFlushNotifier is a simple static notification mechanism to inform other * SQLContainers that the contents of their caches may have become stale. */ -class CacheFlushNotifier implements Serializable{ +class CacheFlushNotifier implements Serializable { /* * SQLContainer instance reference list and dead reference queue. Used for * the cache flush notification feature. diff --git a/src/com/vaadin/data/util/sqlcontainer/CacheMap.java b/src/com/vaadin/data/util/sqlcontainer/CacheMap.java index ef173c74a9..acff6ccd0c 100644 --- a/src/com/vaadin/data/util/sqlcontainer/CacheMap.java +++ b/src/com/vaadin/data/util/sqlcontainer/CacheMap.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer; import java.util.LinkedHashMap; diff --git a/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java b/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java index 02246efaaa..60e81f2e44 100644 --- a/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java +++ b/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer; import java.lang.reflect.Constructor; diff --git a/src/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java b/src/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java index 9c6f8051dd..ecf7c5b0ad 100644 --- a/src/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java +++ b/src/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer; /** diff --git a/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java b/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java index 4604d2772e..124a1726f2 100644 --- a/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java +++ b/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer; public class ReadOnlyRowId extends RowId { diff --git a/src/com/vaadin/data/util/sqlcontainer/Reference.java b/src/com/vaadin/data/util/sqlcontainer/Reference.java index 5b5744f718..55940d8415 100644 --- a/src/com/vaadin/data/util/sqlcontainer/Reference.java +++ b/src/com/vaadin/data/util/sqlcontainer/Reference.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer; import java.io.Serializable; diff --git a/src/com/vaadin/data/util/sqlcontainer/RowId.java b/src/com/vaadin/data/util/sqlcontainer/RowId.java index 33ef273f63..028bbaeb88 100644 --- a/src/com/vaadin/data/util/sqlcontainer/RowId.java +++ b/src/com/vaadin/data/util/sqlcontainer/RowId.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer; import java.io.Serializable; diff --git a/src/com/vaadin/data/util/sqlcontainer/RowItem.java b/src/com/vaadin/data/util/sqlcontainer/RowItem.java index 46aefd2fc9..fa0c3c418e 100644 --- a/src/com/vaadin/data/util/sqlcontainer/RowItem.java +++ b/src/com/vaadin/data/util/sqlcontainer/RowItem.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer; import java.util.ArrayList; diff --git a/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java b/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java index bbaa871f06..8d00d6f495 100644 --- a/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java +++ b/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer; import java.io.IOException; @@ -35,7 +38,7 @@ public class SQLContainer implements Container, Container.Filterable, private static final Logger logger = Logger.getLogger(SQLContainer.class .getName()); - + /** Query delegate */ private QueryDelegate delegate; /** Auto commit mode, default = false */ diff --git a/src/com/vaadin/data/util/sqlcontainer/SQLUtil.java b/src/com/vaadin/data/util/sqlcontainer/SQLUtil.java index 57ef96503d..d36a114e69 100644 --- a/src/com/vaadin/data/util/sqlcontainer/SQLUtil.java +++ b/src/com/vaadin/data/util/sqlcontainer/SQLUtil.java @@ -1,9 +1,12 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer; import java.io.Serializable; -public class SQLUtil implements Serializable{ - /** +public class SQLUtil implements Serializable { + /** * Escapes different special characters in strings that are passed to SQL. * Replaces the following: * diff --git a/src/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java b/src/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java index 2ff187e40c..f748b715f3 100644 --- a/src/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java +++ b/src/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer; public class TemporaryRowId extends RowId { diff --git a/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java b/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java index 65a6bc6f39..09c9cc1b1b 100644 --- a/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java +++ b/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.connection; import java.sql.Connection; diff --git a/src/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java b/src/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java index cc7916aa55..c765c26de5 100644 --- a/src/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java +++ b/src/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.connection; import java.io.Serializable; diff --git a/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java b/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java index 2c1a0499db..d39f06739d 100644 --- a/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java +++ b/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.connection; import java.io.IOException; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java b/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java index 26434b70bd..5fa3d7be54 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.query; import java.io.IOException; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java b/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java index 443483da64..cbfb0f149f 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.query; import java.io.Serializable; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java b/src/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java index 67b0213dfe..6cb66f79ad 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.query; import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/OrderBy.java b/src/com/vaadin/data/util/sqlcontainer/query/OrderBy.java index 439e905a13..87046c2711 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/OrderBy.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/OrderBy.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.query; import java.io.Serializable; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java b/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java index 6949fa0350..6ff3dc9999 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.query; import java.io.Serializable; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java b/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java index a88267745a..624eba9b55 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.query; import java.io.IOException; @@ -111,7 +114,7 @@ public class TableQuery implements QueryDelegate, * * @see com.vaadin.addon.sqlcontainer.query.QueryDelegate#getCount() */ - public int getCount() throws SQLException { + public int getCount() throws SQLException { logger.log(Level.FINE, "Fetching count..."); StatementHelper sh = sqlGenerator.generateSelectQuery(tableName, filters, null, 0, 0, "COUNT(*)"); diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java index 08881b0c63..740501c714 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.query.generator; import java.util.HashMap; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java index 98f474a9b7..5083959f28 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.query.generator; import java.util.List; @@ -56,8 +59,7 @@ public class MSSQLGenerator extends DefaultSQLGenerator { "SELECT COUNT(*) AS %s FROM (SELECT * FROM %s", QueryBuilder.quote("rowcount"), tableName)); if (filters != null && !filters.isEmpty()) { - query.append(QueryBuilder.getWhereStringForFilters( - filters, sh)); + query.append(QueryBuilder.getWhereStringForFilters(filters, sh)); } query.append(") AS t"); sh.setQueryString(query.toString()); @@ -69,8 +71,7 @@ public class MSSQLGenerator extends DefaultSQLGenerator { query.append("SELECT ").append(toSelect).append(" FROM ") .append(tableName); if (filters != null) { - query.append(QueryBuilder.getWhereStringForFilters( - filters, sh)); + query.append(QueryBuilder.getWhereStringForFilters(filters, sh)); } if (orderBys != null) { for (OrderBy o : orderBys) { @@ -90,8 +91,7 @@ public class MSSQLGenerator extends DefaultSQLGenerator { } query.append(") AS rownum, " + toSelect + " FROM ").append(tableName); if (filters != null) { - query.append(QueryBuilder.getWhereStringForFilters( - filters, sh)); + query.append(QueryBuilder.getWhereStringForFilters(filters, sh)); } query.append(") AS a WHERE a.rownum BETWEEN ").append(offset) .append(" AND ").append(Integer.toString(offset + pagelength)); diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java index 223211b36e..3d435456bc 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.query.generator; import java.util.List; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java index 97c104100b..eb269fb443 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.query.generator; import java.io.Serializable; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java index d6952d446e..696aa086f6 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.query.generator; import java.io.Serializable; @@ -22,7 +25,7 @@ import java.util.Map; * This class will also fill the values with correct setters into the * PreparedStatement on request. */ -public class StatementHelper implements Serializable{ +public class StatementHelper implements Serializable { private String queryString; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java index edc38955db..320d3ffa48 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.query.generator.filter; import com.vaadin.data.Container.Filter; @@ -11,8 +14,8 @@ public class AndTranslator implements FilterTranslator { } public String getWhereStringForFilter(Filter filter, StatementHelper sh) { - return QueryBuilder.group(QueryBuilder - .getJoinedFilterString(((And) filter).getFilters(), "AND", sh)); + return QueryBuilder.group(QueryBuilder.getJoinedFilterString( + ((And) filter).getFilters(), "AND", sh)); } } diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java index 55e7ab740c..64a61cfad9 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.query.generator.filter; import com.vaadin.data.Container.Filter; @@ -14,8 +17,7 @@ public class BetweenTranslator implements FilterTranslator { Between between = (Between) filter; sh.addParameterValue(between.getStartValue()); sh.addParameterValue(between.getEndValue()); - return QueryBuilder.quote(between.getPropertyId()) - + " BETWEEN ? AND ?"; + return QueryBuilder.quote(between.getPropertyId()) + " BETWEEN ? AND ?"; } } diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java index 07cdb11153..74795dbf5b 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.query.generator.filter; import com.vaadin.data.Container.Filter; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java index e0b9c81b1d..b459d2db3e 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.query.generator.filter; import java.io.Serializable; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java index 0a5392c13e..e8fdc8e57e 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.query.generator.filter; import com.vaadin.data.Container.Filter; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java index 7146ff6cd2..7203305fa3 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.query.generator.filter; import com.vaadin.data.Container.Filter; @@ -14,12 +17,10 @@ public class LikeTranslator implements FilterTranslator { Like like = (Like) filter; if (like.isCaseSensitive()) { sh.addParameterValue(like.getValue()); - return QueryBuilder.quote(like.getPropertyId()) - + " LIKE ?"; + return QueryBuilder.quote(like.getPropertyId()) + " LIKE ?"; } else { sh.addParameterValue(like.getValue().toUpperCase()); - return "UPPER(" - + QueryBuilder.quote(like.getPropertyId()) + return "UPPER(" + QueryBuilder.quote(like.getPropertyId()) + ") LIKE ?"; } } diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java index def6e540da..62162c39dc 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.query.generator.filter; import com.vaadin.data.Container.Filter; @@ -15,12 +18,10 @@ public class NotTranslator implements FilterTranslator { Not not = (Not) filter; if (not.getFilter() instanceof IsNull) { IsNull in = (IsNull) not.getFilter(); - return QueryBuilder.quote(in.getPropertyId()) - + " IS NOT NULL"; + return QueryBuilder.quote(in.getPropertyId()) + " IS NOT NULL"; } return "NOT " - + QueryBuilder.getWhereStringForFilter( - not.getFilter(), sh); + + QueryBuilder.getWhereStringForFilter(not.getFilter(), sh); } } diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java index 880e711468..83c5080aae 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.query.generator.filter; import com.vaadin.data.Container.Filter; @@ -11,8 +14,8 @@ public class OrTranslator implements FilterTranslator { } public String getWhereStringForFilter(Filter filter, StatementHelper sh) { - return QueryBuilder.group(QueryBuilder - .getJoinedFilterString(((Or) filter).getFilters(), "OR", sh)); + return QueryBuilder.group(QueryBuilder.getJoinedFilterString( + ((Or) filter).getFilters(), "OR", sh)); } } diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java index a29e4bcb61..7cda2a967c 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.query.generator.filter; import java.io.Serializable; @@ -8,7 +11,7 @@ import java.util.List; import com.vaadin.data.Container.Filter; import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; -public class QueryBuilder implements Serializable{ +public class QueryBuilder implements Serializable { private static ArrayList filterTranslators = new ArrayList(); private static StringDecorator stringDecorator = new StringDecorator("\"", diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java index 96b64dd110..624b216991 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.query.generator.filter; import com.vaadin.data.Container.Filter; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java index d82af80bf9..d1294330b3 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.data.util.sqlcontainer.query.generator.filter; import java.io.Serializable; @@ -12,7 +15,7 @@ import java.io.Serializable; * * @author Vaadin Ltd */ -public class StringDecorator implements Serializable{ +public class StringDecorator implements Serializable { private final String quoteStart; private final String quoteEnd; diff --git a/src/com/vaadin/event/ActionManager.java b/src/com/vaadin/event/ActionManager.java index e3d579f4ef..46ba235041 100644 --- a/src/com/vaadin/event/ActionManager.java +++ b/src/com/vaadin/event/ActionManager.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.event; import java.util.HashSet; diff --git a/src/com/vaadin/event/ShortcutListener.java b/src/com/vaadin/event/ShortcutListener.java index 7e041de47a..a21dacd730 100644 --- a/src/com/vaadin/event/ShortcutListener.java +++ b/src/com/vaadin/event/ShortcutListener.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.event; import com.vaadin.event.Action.Listener; diff --git a/src/com/vaadin/terminal/StreamVariable.java b/src/com/vaadin/terminal/StreamVariable.java index 6c49a3f385..d786415124 100644 --- a/src/com/vaadin/terminal/StreamVariable.java +++ b/src/com/vaadin/terminal/StreamVariable.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal; import java.io.OutputStream; diff --git a/src/com/vaadin/terminal/gwt/client/ComputedStyle.java b/src/com/vaadin/terminal/gwt/client/ComputedStyle.java index 1dd53fa98f..1e014fd905 100644 --- a/src/com/vaadin/terminal/gwt/client/ComputedStyle.java +++ b/src/com/vaadin/terminal/gwt/client/ComputedStyle.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.client; import com.google.gwt.core.client.JavaScriptObject; diff --git a/src/com/vaadin/terminal/gwt/client/EventHelper.java b/src/com/vaadin/terminal/gwt/client/EventHelper.java index 0b2f6ef4df..e4fbbb7ea3 100644 --- a/src/com/vaadin/terminal/gwt/client/EventHelper.java +++ b/src/com/vaadin/terminal/gwt/client/EventHelper.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.client; import static com.vaadin.terminal.gwt.client.EventId.BLUR; diff --git a/src/com/vaadin/terminal/gwt/client/EventId.java b/src/com/vaadin/terminal/gwt/client/EventId.java index 077564e846..822d2fdc86 100644 --- a/src/com/vaadin/terminal/gwt/client/EventId.java +++ b/src/com/vaadin/terminal/gwt/client/EventId.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.client; public interface EventId { diff --git a/src/com/vaadin/terminal/gwt/client/SynchronousXHR.java b/src/com/vaadin/terminal/gwt/client/SynchronousXHR.java index 991b256794..3a50516146 100644 --- a/src/com/vaadin/terminal/gwt/client/SynchronousXHR.java +++ b/src/com/vaadin/terminal/gwt/client/SynchronousXHR.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.client; import com.google.gwt.xhr.client.XMLHttpRequest; diff --git a/src/com/vaadin/terminal/gwt/client/VBrowserDetails.java b/src/com/vaadin/terminal/gwt/client/VBrowserDetails.java index 2b55c96125..3778579b99 100644 --- a/src/com/vaadin/terminal/gwt/client/VBrowserDetails.java +++ b/src/com/vaadin/terminal/gwt/client/VBrowserDetails.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.client; import java.io.Serializable; diff --git a/src/com/vaadin/terminal/gwt/client/VConsole.java b/src/com/vaadin/terminal/gwt/client/VConsole.java index ca3a4fa4dc..aecb2bb5bd 100644 --- a/src/com/vaadin/terminal/gwt/client/VConsole.java +++ b/src/com/vaadin/terminal/gwt/client/VConsole.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.client; import java.util.Set; diff --git a/src/com/vaadin/terminal/gwt/client/VSchedulerImpl.java b/src/com/vaadin/terminal/gwt/client/VSchedulerImpl.java index 2b7f12e105..9888809952 100644 --- a/src/com/vaadin/terminal/gwt/client/VSchedulerImpl.java +++ b/src/com/vaadin/terminal/gwt/client/VSchedulerImpl.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.client; import com.google.gwt.core.client.impl.SchedulerImpl; diff --git a/src/com/vaadin/terminal/gwt/client/WidgetInstantiator.java b/src/com/vaadin/terminal/gwt/client/WidgetInstantiator.java index 3a18da9632..d7fc777ced 100644 --- a/src/com/vaadin/terminal/gwt/client/WidgetInstantiator.java +++ b/src/com/vaadin/terminal/gwt/client/WidgetInstantiator.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.client; /** diff --git a/src/com/vaadin/terminal/gwt/client/WidgetLoader.java b/src/com/vaadin/terminal/gwt/client/WidgetLoader.java index c6271063a4..70f0bc95aa 100644 --- a/src/com/vaadin/terminal/gwt/client/WidgetLoader.java +++ b/src/com/vaadin/terminal/gwt/client/WidgetLoader.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.client; import com.google.gwt.core.client.RunAsyncCallback; diff --git a/src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java b/src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java index fe4b483798..04fc34b769 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.client.ui; import com.google.gwt.dom.client.DivElement; diff --git a/src/com/vaadin/terminal/gwt/client/ui/FocusableFlexTable.java b/src/com/vaadin/terminal/gwt/client/ui/FocusableFlexTable.java index a966aa8a16..2810d62a2c 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/FocusableFlexTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/FocusableFlexTable.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.client.ui; import com.google.gwt.event.dom.client.BlurEvent; diff --git a/src/com/vaadin/terminal/gwt/client/ui/FocusableFlowPanel.java b/src/com/vaadin/terminal/gwt/client/ui/FocusableFlowPanel.java index 0a5ad22ee1..c7ef5ae918 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/FocusableFlowPanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/FocusableFlowPanel.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.client.ui; import com.google.gwt.event.dom.client.BlurEvent; diff --git a/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java b/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java index 24a98ee3ef..74823ce75b 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.client.ui; import com.google.gwt.core.client.Scheduler; diff --git a/src/com/vaadin/terminal/gwt/client/ui/SimpleFocusablePanel.java b/src/com/vaadin/terminal/gwt/client/ui/SimpleFocusablePanel.java index 25c10ae1bb..aa096d08a2 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/SimpleFocusablePanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/SimpleFocusablePanel.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.client.ui; import com.google.gwt.event.dom.client.BlurEvent; diff --git a/src/com/vaadin/terminal/gwt/client/ui/TouchScrollDelegate.java b/src/com/vaadin/terminal/gwt/client/ui/TouchScrollDelegate.java index 7f00d184f1..7352d927fc 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/TouchScrollDelegate.java +++ b/src/com/vaadin/terminal/gwt/client/ui/TouchScrollDelegate.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.client.ui; import java.util.ArrayList; @@ -186,10 +189,10 @@ public class TouchScrollDelegate implements NativePreviewHandler { private int getAnimationTimeForDistance(int dist) { return 350; // 350ms seems to work quite fine for all distances -// if (dist < 0) { -// dist = -dist; -// } -// return MAX_DURATION * dist / (scrolledElement.getClientHeight() * 3); + // if (dist < 0) { + // dist = -dist; + // } + // return MAX_DURATION * dist / (scrolledElement.getClientHeight() * 3); } /** @@ -376,7 +379,7 @@ public class TouchScrollDelegate implements NativePreviewHandler { moveTransformationToScrolloffset(); return; } - + int translateY = -finalY + origScrollTop; translateTo(duration, translateY); } @@ -438,7 +441,7 @@ public class TouchScrollDelegate implements NativePreviewHandler { } public void onPreviewNativeEvent(NativePreviewEvent event) { - if(transitionOn) { + if (transitionOn) { /* * TODO allow starting new events. See issue in onTouchStart */ diff --git a/src/com/vaadin/terminal/gwt/client/ui/UploadIFrameOnloadStrategy.java b/src/com/vaadin/terminal/gwt/client/ui/UploadIFrameOnloadStrategy.java index a79d1cd685..afe22887bf 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/UploadIFrameOnloadStrategy.java +++ b/src/com/vaadin/terminal/gwt/client/ui/UploadIFrameOnloadStrategy.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.client.ui; public class UploadIFrameOnloadStrategy { diff --git a/src/com/vaadin/terminal/gwt/client/ui/UploadIFrameOnloadStrategyIE.java b/src/com/vaadin/terminal/gwt/client/ui/UploadIFrameOnloadStrategyIE.java index 698d630b4f..e267baac2d 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/UploadIFrameOnloadStrategyIE.java +++ b/src/com/vaadin/terminal/gwt/client/ui/UploadIFrameOnloadStrategyIE.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.client.ui; import com.google.gwt.dom.client.Element; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VLazyExecutor.java b/src/com/vaadin/terminal/gwt/client/ui/VLazyExecutor.java index 8fe8a96ca2..879380fea9 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VLazyExecutor.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VLazyExecutor.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.client.ui; import com.google.gwt.core.client.Scheduler.ScheduledCommand; diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/DDUtil.java b/src/com/vaadin/terminal/gwt/client/ui/dd/DDUtil.java index 4907713bf0..5b312bb3d2 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/DDUtil.java +++ b/src/com/vaadin/terminal/gwt/client/ui/dd/DDUtil.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.client.ui.dd; import com.google.gwt.dom.client.NativeEvent; diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VHtml5File.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VHtml5File.java index 756d102690..0a74fa22a2 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VHtml5File.java +++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VHtml5File.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.client.ui.dd; import com.google.gwt.core.client.JavaScriptObject; diff --git a/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java b/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java index 83ba45789d..4279adf476 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.server; import com.vaadin.terminal.StreamVariable.StreamingEvent; diff --git a/src/com/vaadin/terminal/gwt/server/NoInputStreamException.java b/src/com/vaadin/terminal/gwt/server/NoInputStreamException.java index 72b99342cf..4447fb888d 100644 --- a/src/com/vaadin/terminal/gwt/server/NoInputStreamException.java +++ b/src/com/vaadin/terminal/gwt/server/NoInputStreamException.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.server; @SuppressWarnings("serial") diff --git a/src/com/vaadin/terminal/gwt/server/NoOutputStreamException.java b/src/com/vaadin/terminal/gwt/server/NoOutputStreamException.java index 6c33dab33e..f502750bc4 100644 --- a/src/com/vaadin/terminal/gwt/server/NoOutputStreamException.java +++ b/src/com/vaadin/terminal/gwt/server/NoOutputStreamException.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.server; @SuppressWarnings("serial") diff --git a/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java b/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java index e6290cbf9a..1fb7db6a6f 100644 --- a/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java +++ b/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.server; import com.vaadin.terminal.StreamVariable.StreamingEndEvent; diff --git a/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java b/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java index 367b4be277..087572b6a1 100644 --- a/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java +++ b/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.server; import com.vaadin.terminal.StreamVariable.StreamingErrorEvent; diff --git a/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java b/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java index a6308f67a1..230065337a 100644 --- a/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java +++ b/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.server; import com.vaadin.terminal.StreamVariable.StreamingProgressEvent; diff --git a/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java b/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java index 113c69cc08..d0d167efa7 100644 --- a/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java +++ b/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.server; import com.vaadin.terminal.StreamVariable.StreamingStartEvent; diff --git a/src/com/vaadin/terminal/gwt/server/UploadException.java b/src/com/vaadin/terminal/gwt/server/UploadException.java index ef3b2554d2..47e6b5f44a 100644 --- a/src/com/vaadin/terminal/gwt/server/UploadException.java +++ b/src/com/vaadin/terminal/gwt/server/UploadException.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.terminal.gwt.server; @SuppressWarnings("serial") diff --git a/src/com/vaadin/ui/HorizontalSplitPanel.java b/src/com/vaadin/ui/HorizontalSplitPanel.java index 946825152b..381678dfed 100644 --- a/src/com/vaadin/ui/HorizontalSplitPanel.java +++ b/src/com/vaadin/ui/HorizontalSplitPanel.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.ui; import com.vaadin.terminal.gwt.client.ui.VSplitPanelHorizontal; diff --git a/src/com/vaadin/ui/Html5File.java b/src/com/vaadin/ui/Html5File.java index 1eb048783c..760855aca1 100644 --- a/src/com/vaadin/ui/Html5File.java +++ b/src/com/vaadin/ui/Html5File.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.ui; import java.io.Serializable; @@ -11,7 +14,7 @@ import com.vaadin.terminal.StreamVariable; * information about dragged file on server side. */ public class Html5File implements Serializable { - + private String name; private long size; private StreamVariable streamVariable; @@ -39,8 +42,8 @@ public class Html5File implements Serializable { * Sets the {@link StreamVariable} that into which the file contents will be * written. Usage of StreamVariable is similar to {@link Upload} component. *

- * If the {@link StreamVariable} is not set in the {@link DropHandler} the file - * contents will not be sent to server. + * If the {@link StreamVariable} is not set in the {@link DropHandler} the + * file contents will not be sent to server. *

* Note! receiving file contents is experimental feature depending * on HTML 5 API's. It is supported only by modern web browsers like Firefox @@ -59,5 +62,4 @@ public class Html5File implements Serializable { return streamVariable; } - } \ No newline at end of file diff --git a/src/com/vaadin/ui/VerticalSplitPanel.java b/src/com/vaadin/ui/VerticalSplitPanel.java index a7d9edda31..bb4edc4c2c 100644 --- a/src/com/vaadin/ui/VerticalSplitPanel.java +++ b/src/com/vaadin/ui/VerticalSplitPanel.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.ui; import com.vaadin.terminal.gwt.client.ui.VSplitPanelVertical; diff --git a/src/com/vaadin/ui/themes/LiferayTheme.java b/src/com/vaadin/ui/themes/LiferayTheme.java index a90520726a..458a6af784 100644 --- a/src/com/vaadin/ui/themes/LiferayTheme.java +++ b/src/com/vaadin/ui/themes/LiferayTheme.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.ui.themes; public class LiferayTheme extends BaseTheme { diff --git a/src/com/vaadin/ui/treetable/Collapsible.java b/src/com/vaadin/ui/treetable/Collapsible.java index 649687716c..e14192ccf5 100644 --- a/src/com/vaadin/ui/treetable/Collapsible.java +++ b/src/com/vaadin/ui/treetable/Collapsible.java @@ -1,3 +1,6 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.ui.treetable; import com.vaadin.data.Container; diff --git a/src/com/vaadin/ui/treetable/HierarchicalContainerOrderedWrapper.java b/src/com/vaadin/ui/treetable/HierarchicalContainerOrderedWrapper.java index 0c00027f26..73bc8ee07c 100644 --- a/src/com/vaadin/ui/treetable/HierarchicalContainerOrderedWrapper.java +++ b/src/com/vaadin/ui/treetable/HierarchicalContainerOrderedWrapper.java @@ -1,8 +1,10 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ package com.vaadin.ui.treetable; import java.util.Collection; -import com.vaadin.data.Container; import com.vaadin.data.Container.Hierarchical; import com.vaadin.data.util.ContainerOrderedWrapper; -- 2.39.5