diff options
1091 files changed, 14794 insertions, 4090 deletions
diff --git a/build/build.xml b/build/build.xml index 5349dcf126..ba9b93a2ab 100644 --- a/build/build.xml +++ b/build/build.xml @@ -26,10 +26,12 @@ <target name="init-deps" depends="common.init-deps" > <property name="ivy.resolved" value="1" /> - <ivy:resolve file="build/ivy/ivy.xml" resolveid="common" conf="ss.compile, cs.compile, ss.test.compile"/> - <ivy:cachepath pathid="ivy.compile.classpath.server-side" conf="ss.compile"/> - <ivy:cachepath pathid="ivy.compile.classpath.client-side" conf="cs.compile"/> - <ivy:cachepath pathid="ivy.compile.classpath.server-side-tests" conf="ss.test.compile"/> + <ivy:resolve file="build/ivy/ivy.xml" resolveid="common" conf="server.extdep, shared.extdep, client.extdep, client-compiler.extdep, server.tests.extdep,client-compiler.extdep"/> + <ivy:cachepath pathid="ivy.compile.classpath.server" conf="server.extdep"/> + <ivy:cachepath pathid="ivy.compile.classpath.shared" conf="shared.extdep"/> + <ivy:cachepath pathid="ivy.compile.classpath.client" conf="client.extdep"/> + <ivy:cachepath pathid="ivy.compile.classpath.client-compiler" conf="client-compiler.extdep"/> + <ivy:cachepath pathid="ivy.compile.classpath.server-tests" conf="server.tests.extdep"/> <ivy:cachepath pathid="buildhelpers.dependencies" resolveId="buildhelpers" conf="compile" file="build/ivy/buildhelpers-ivy.xml"/> @@ -55,50 +57,43 @@ <property name="gwt.user.dir" value="${gwt.root}/user"/> <property name="gwt.user.bin" value="${gwt.build.dir}/out/user/bin"/> - <property name="jarjar-jar" value="${gwt.tools.lib}/tonicsystems/jarjar-1.0rc8.jar"/> - - <path id="compile.classpath.server-side"> - <path refid="additional.jar.path" /> - <!-- GWT --> + <path id="gwt.dev.user.jars"> <pathelement location="${gwt.user.jar}" /> <pathelement location="${gwt.dev.jar}" /> - - <path refid="ivy.compile.classpath.server-side" /> </path> - <path id="compile.classpath.client-side"> + <path id="compile.classpath.server"> <path refid="additional.jar.path" /> - - <!-- GWT user --> - <!-- - <pathelement path="${gwt.user.dir}/src" /> - <pathelement path="${gwt.user.dir}/super" /> - <pathelement path="${gwt.user.dir}/out/user/bin"/> - --> - <!-- GWT --> - <pathelement location="${gwt.user.jar}" /> - <pathelement location="${gwt.dev.jar}" /> - - <path refid="ivy.compile.classpath.client-side" /> + <path refid="ivy.compile.classpath.server" /> </path> - <path id="compile.classpath.server-side-tests"> + <path id="compile.classpath.shared"> <path refid="additional.jar.path" /> - - <!-- GWT --> - <pathelement location="${gwt.user.jar}" /> - <!-- needed at least for Apache Commons --> - <pathelement location="${gwt.dev.jar}" /> - - <path refid="ivy.compile.classpath.server-side-tests" /> + <path refid="ivy.compile.classpath.shared" /> + </path> + <path id="compile.classpath.client"> + <path refid="additional.jar.path" /> + <path refid="gwt.dev.user.jars"/> + <path refid="ivy.compile.classpath.client" /> + </path> + <path id="compile.classpath.client-compiler"> + <path refid="additional.jar.path" /> + <path refid="gwt.dev.user.jars"/> + <path refid="ivy.compile.classpath.client-compiler" /> + </path> + <path id="compile.classpath.sass"> + <path refid="additional.jar.path" /> + <path refid="ivy.compile.classpath.server" /> + <path refid="gwt.dev.user.jars"/> + </path> + <path id="compile.classpath.server-tests"> + <path refid="additional.jar.path" /> + <path refid="gwt.dev.user.jars"/> + <path refid="ivy.compile.classpath.server-tests" /> </path> <path id="compile.classpath.buildhelpers"> <path refid="additional.jar.path" /> - - <!-- GWT --> - <pathelement location="${gwt.user.jar}" /> - <pathelement location="${gwt.dev.jar}" /> - + <path refid="gwt.dev.user.jars"/> <path refid="buildhelpers.dependencies" /> </path> </target> @@ -117,26 +112,41 @@ <property file="build/GWT-VERSION.properties" /> <!-- result source and classes folders --> - <property name="result-src-core" value="${result-path}/src/core"/> + <property name="result-src-server" value="${result-path}/src/server"/> + <property name="result-src-client" value="${result-path}/src/client"/> + <property name="result-src-client-compiler" value="${result-path}/src/client-compiler"/> + <property name="result-src-shared" value="${result-path}/src/shared"/> <property name="result-src-junit" value="${result-path}/src/junit"/> <property name="result-src-testbench" value="${result-path}/src/testbench"/> <property name="result-src-sass" value="${result-path}/src/sass"/> <property name="result-src-sass-junit" value="${result-path}/src/sass-junit"/> - <property name="result-classes-core" value="${result-path}/classes/core"/> + <property name="result-classes-server" value="${result-path}/classes/server"/> + <property name="result-classes-client" value="${result-path}/classes/client"/> + <property name="result-classes-client-compiler" value="${result-path}/classes/client-compiler"/> + <property name="result-classes-shared" value="${result-path}/classes/shared"/> <property name="result-classes-junit" value="${result-path}/classes/junit"/> <property name="result-classes-testbench" value="${result-path}/classes/testbench"/> <property name="result-classes-sass" value="${result-path}/classes/sass"/> <property name="result-classes-sass-junit" value="${result-path}/classes/sass-junit"/> <property name="result-precompiled-widgetsets" value="${result-path}/classes/widgetsets"/> - <!-- Folder where Emma instrumented classes are placed (if Emma is used)--> - <property name="result-classes-core-for-emma-war" value="${result-path}/classes/emma-war"/> - <property name="result-classes-core-for-emma-junit" value="${result-path}/classes/emma-junit"/> <!-- Default classpath for building widgetsets, overridden for testing widgetset --> <path id="compile.classpath.widgetset"> - <path refid="compile.classpath.client-side" /> - <pathelement location="${result-classes-core}" /> - <pathelement location="${result-src-core}" /> + <path refid="compile.classpath.client" /> + <!-- Needed to resolve classes which @Connect refers to --> + <pathelement location="${result-src-server}" /> + <!-- Needed to resolve imports in connector classes --> + <pathelement location="${result-classes-server}" /> + + <!-- The actual sources we want to compile --> + <pathelement location="${result-src-client}" /> + <pathelement location="${result-src-shared}" /> + <!-- Contains compiled generators --> + <pathelement location="${result-classes-client-compiler}" /> + <!-- Generators depend on shared and client interfaces --> + <pathelement location="${result-classes-shared}" /> + <pathelement location="${result-classes-client}" /> + <pathelement location="${result-precompiled-widgetsets}" /> </path> </target> @@ -196,11 +206,6 @@ <!-- Create result dir unless already exists --> <mkdir dir="${result-path}" /> - <!-- Create dirs that might be used by the test coverage generation --> - <mkdir dir="${result-classes-core-for-emma-war}" /> - <mkdir dir="${result-classes-core-for-emma-junit}" /> - <mkdir dir="${result-path}/coverage" /> - <echo>We are using gwt version ${gwt-version}.</echo> <!-- Destination files --> @@ -250,9 +255,9 @@ <include name="${vaadin-package}/tests/**/*" /> <include name="${vaadin-package}/launcher/**" /> </fileset> - <fileset dir="${result-classes-junit}"> - <!-- VaadinClasses and data classes are used by TestBench tests also --> - </fileset> + <fileset dir="${result-classes-shared}" /> + <!-- VaadinClasses and data classes are used by TestBench tests also --> + <fileset dir="${result-classes-junit}" /> <!-- test resources --> <fileset dir="tests/testbench"> <include name="${vaadin-package}/tests/**/*" /> @@ -331,7 +336,7 @@ description="Build package required files, without packing them."> </target> - <target name="compile-server-side" depends="compile-gwt, compile-core, webcontent"/> + <target name="compile-server-side" depends="compile-gwt, compile-server, compile-client, webcontent"/> <!-- Copy and preprocess sources for packaging NOTE: Replaces <version></version> tags with build version tag for some "textual" files @@ -365,7 +370,10 @@ <mkdir dir="${result-path}/src" /> <mkdir dir="${result-src-sass}/src" /> - <mkdir dir="${result-src-core}" /> + <mkdir dir="${result-src-server}" /> + <mkdir dir="${result-src-client}" /> + <mkdir dir="${result-src-client-compiler}" /> + <mkdir dir="${result-src-shared}" /> <mkdir dir="${result-src-testbench}" /> <mkdir dir="${result-src-junit}" /> <mkdir dir="${result-src-sass-junit}" /> @@ -395,10 +403,31 @@ <echo>Copying src directory and processing copied files.</echo> <echo>Replacing <version> tag with build version for java/html/css/xml files.</echo> - <copy todir="${result-src-core}" overwrite="yes"> + <copy todir="${result-src-server}" overwrite="yes"> + <filterset refid="version-and-license"/> + <filterset refid="pre-css-style"/> + <fileset dir="server/src"> + <patternset refid="preprocessable-files" /> + </fileset> + </copy> + <copy todir="${result-src-shared}" overwrite="yes"> + <filterset refid="version-and-license"/> + <filterset refid="pre-css-style"/> + <fileset dir="shared/src"> + <patternset refid="preprocessable-files" /> + </fileset> + </copy> + <copy todir="${result-src-client}" overwrite="yes"> <filterset refid="version-and-license"/> <filterset refid="pre-css-style"/> - <fileset dir="src"> + <fileset dir="client/src"> + <patternset refid="preprocessable-files" /> + </fileset> + </copy> + <copy todir="${result-src-client-compiler}" overwrite="yes"> + <filterset refid="version-and-license"/> + <filterset refid="pre-css-style"/> + <fileset dir="client-compiler/src"> <patternset refid="preprocessable-files" /> </fileset> </copy> @@ -435,11 +464,30 @@ <!-- Add other files such as images, these are not filtered or processed by fixcrlf task --> <echo>Copying non java/html/css/xml files such as images.</echo> - <copy todir="${result-src-core}"> - <fileset dir="src"> + <copy todir="${result-src-server}"> + <fileset dir="server/src"> + <patternset refid="non-preprocessable-files" /> + </fileset> + </copy> + + <copy todir="${result-src-shared}"> + <fileset dir="shared/src"> + <patternset refid="non-preprocessable-files" /> + </fileset> + </copy> + + <copy todir="${result-src-client}"> + <fileset dir="client/src"> + <patternset refid="non-preprocessable-files" /> + </fileset> + </copy> + + <copy todir="${result-src-client-compiler}"> + <fileset dir="client-compiler/src"> <patternset refid="non-preprocessable-files" /> </fileset> </copy> + <copy todir="${result-src-sass}"> <fileset dir="${sass-src}"> <patternset refid="non-preprocessable-files" /> @@ -529,28 +577,63 @@ </copy> </target> - <target name="compile-core" depends="init, preprocess-src"> - <echo>Compiling src (server-side)</echo> + <target name="compile-server" depends="init, preprocess-src, compile-shared"> + <echo>Compiling server/src</echo> + <!-- Compile core sources first as the other sources depend on these --> + <mkdir dir="${result-classes-server}" /> + <javac destdir="${result-classes-server}" source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server" debug="true" encoding="UTF-8" includeantruntime="false"> + <classpath location="${result-classes-shared}"></classpath> + <src path="${result-src-server}"/> + </javac> + </target> + + <target name="compile-client" depends="init, preprocess-src, compile-server, compile-shared"> + <echo>Compiling client/src</echo> + <!-- Compile core sources first as the other sources depend on these --> + <mkdir dir="${result-classes-client}" /> + <javac destdir="${result-classes-client}" source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.client" debug="true" encoding="UTF-8" includeantruntime="false"> + <classpath location="${result-classes-shared}"></classpath> + <classpath location="${result-classes-server}"></classpath> + <src path="${result-src-client}"/> + </javac> + </target> + + <target name="compile-client-compiler" depends="init, preprocess-src, compile-client, compile-server, compile-shared"> + <echo>Compiling client-compiler/src</echo> + <mkdir dir="${result-classes-client-compiler}" /> + <javac destdir="${result-classes-client-compiler}" source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.client-compiler" debug="true" encoding="UTF-8" includeantruntime="false"> + <src path="${result-src-client-compiler}"/> + <!-- These could be removed by using class names instead of class references in generators --> + <classpath location="${result-classes-shared}"></classpath> + <classpath location="${result-classes-client}"></classpath> + <classpath location="${result-classes-server}"></classpath> + </javac> + </target> + + <target name="compile-shared" depends="init, preprocess-src"> + <echo>Compiling shared/src</echo> <!-- Compile core sources first as the other sources depend on these --> - <mkdir dir="${result-classes-core}" /> - <javac source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server-side" destdir="${result-classes-core}" debug="true" encoding="UTF-8" includeantruntime="false"> - <src path="${result-src-core}"/> + <mkdir dir="${result-classes-shared}" /> + <javac destdir="${result-classes-shared}" source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.shared" debug="true" encoding="UTF-8" includeantruntime="false"> + <src path="${result-src-shared}"/> </javac> </target> - <target name="compile-tests" depends="compile-core"> + <target name="compile-tests" depends="compile-server,compile-client,compile-sass"> <echo>Compiling src (Server and client side JUnit tests)</echo> <!-- Compile server and client side JUnit tests --> <mkdir dir="${result-classes-junit}" /> - <javac source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server-side-tests" destdir="${result-classes-junit}" debug="true" encoding="UTF-8" includeantruntime="false"> - <classpath path="${result-classes-core}"></classpath> + <javac source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server-tests" destdir="${result-classes-junit}" debug="true" encoding="UTF-8" includeantruntime="false"> + <classpath path="${result-classes-shared}"></classpath> + <classpath path="${result-classes-server}"></classpath> + <classpath path="${result-classes-client}"></classpath> <src path="${result-src-junit}"/> </javac> <echo>Compiling SASS JUnit tests</echo> <!-- Compile server and client side JUnit tests --> <mkdir dir="${result-classes-sass-junit}" /> - <javac source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server-side-tests" destdir="${result-classes-sass-junit}" debug="true" encoding="UTF-8" includeantruntime="false"> + <javac source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server-tests" destdir="${result-classes-sass-junit}" debug="true" encoding="UTF-8" includeantruntime="false"> <classpath path="${result-classes-sass}"></classpath> <src path="${result-src-sass-junit}"/> </javac> @@ -558,9 +641,12 @@ <echo>Compiling src (TestBench tests)</echo> <!-- Compile TestBench tests --> <mkdir dir="${result-classes-testbench}" /> - <javac source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server-side" destdir="${result-classes-testbench}" debug="true" encoding="UTF-8" includeantruntime="false"> + <javac source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server" destdir="${result-classes-testbench}" debug="true" encoding="UTF-8" includeantruntime="false"> <classpath path="${result-classes-junit}"></classpath> - <classpath path="${result-classes-core}"></classpath> + <classpath path="${result-classes-server}"></classpath> + <classpath path="${result-classes-shared}"></classpath> + <classpath path="${result-classes-client}"></classpath> + <classpath refid="gwt.dev.user.jars"/> <src path="${result-src-testbench}"/> </javac> @@ -580,7 +666,7 @@ <!-- TODO also perform javacc compilation of the parser --> <mkdir dir="${result-classes-sass}" /> <javac source="${required.java.version}" target="${required.java.version}" includeantruntime="false" srcdir="${result-src-sass}" - classpathref="compile.classpath.server-side" destdir="${result-classes-sass}" debug="true" encoding="UTF-8" /> + classpathref="compile.classpath.sass" destdir="${result-classes-sass}" debug="true" encoding="UTF-8" /> </target> <target name="defaulttheme" depends="init, compile-sass, compile-helpers" description="Compile all included themes"> @@ -624,10 +710,11 @@ </target> <!-- The widgetset generator is currently compiled along with rest of server-side Java. --> - <target name="compile-widgetset-generator" depends="compile-core"/> + <target name="compile-widgetset-generator" depends="compile-server,compile-client, compile-client-compiler"/> <!-- Compiles the widgetset given as the first parameter --> - <target name="compile-widgetset" depends="init-deps"> + <!-- Caller must ensure necessary classes have been compiled --> + <target name="compile-widgetset"> <fail unless="widgetset" message="No widgetset parameter set"/> <property name="widgetset-style" value="OBF" /> <property name="widgetset-localWorkers" value="2" /> @@ -681,7 +768,7 @@ </target> <target name="compile-widgetset-testing"> - <!-- Crate a path reference containing default widgetset classpath + testbench files --> + <!-- Create a path reference containing default widgetset classpath + testbench files --> <path id="compile.classpath.testingwidgetset"> <path refid="compile.classpath.widgetset" /> <pathelement location="${result-classes-testbench}" /> @@ -703,7 +790,7 @@ <!-- Compiles all widgetsets. --> <!-- This is called when building packages and when compiling all --> <!-- widgetsets, but not when compiling individual widgetsets. --> - <target name="compile-client-side" depends="compile-gwt, compile-server-side, compile-tests"> + <target name="compile-client-side" depends="compile-gwt, compile-server-side, compile-tests, compile-client-compiler"> <echo>Compiling widget sets in parallel.</echo> <parallel threadsperprocessor="1"> <antcall inheritrefs="true" target="compile-widgetset-default"/> @@ -717,7 +804,7 @@ <!-- Definitions for building the client-side. --> <property name="widgetsets-output-dir" value="WebContent/VAADIN/widgetsets" /> - <echo>We are using ${lib-gwt-dev}.</echo> + <echo>We are using ${gwt.dev.jar}.</echo> <echo>Widget sets output dir: ${widgetsets-output-dir}</echo> </target> @@ -761,21 +848,6 @@ <mkdir dir="${output-dir}/META-INF"/> <echo file="${output-dir}/META-INF/VERSION">${version.full}</echo> - <emma enabled="${emma.enabled}" > - <instr instrpath="${result-classes-core}" - destdir="${result-classes-core-for-emma-war}" - mode="copy" - metadatafile="${result-path}/war.es" - merge="false" - > - <filter includes="com.vaadin.*" /> - <filter excludes="com.vaadin.terminal.gwt.*" /> - </instr> - </emma> - - <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" - classpath="${jarjar-jar}"/> - <jarjar jarfile="${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name}" compress="true" manifest="build/package/META-INF/MANIFEST.MF" duplicate="preserve" index="true"> <metainf dir="${output-dir}/META-INF"/> @@ -790,13 +862,17 @@ <attribute name="GWT-Version-Dependencies" value="${gwt-version-dependencies}" /> <attribute name="Bundle-Version" value="${version.full}" /> </manifest> - <!-- Include any instrumented class files before the normal classes --> - <fileset dir="${result-classes-core-for-emma-war}" /> - <fileset dir="${result-classes-core}"/> + <fileset dir="${result-classes-server}"/> + <fileset dir="${result-classes-client}"/> + <fileset dir="${result-classes-shared}"/> <fileset dir="${result-classes-sass}"/> + <fileset dir="${result-classes-client-compiler}"/> <!-- add sources --> - <fileset dir="${result-src-core}"/> + <fileset dir="${result-src-server}"/> + <fileset dir="${result-src-client}"/> + <fileset dir="${result-src-shared}"/> <fileset dir="${result-src-sass}"/> + <fileset dir="${result-src-client-compiler}"/> <fileset dir="${output-dir}/WebContent"> <patternset> <include name="VAADIN/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/**/*" /> @@ -912,7 +988,17 @@ <target name="vaadin-sources.jar" depends="init"> <jar file="${result-path}/${lib-sources-jar-name}" compress="true"> - <fileset dir="${result-src-core}"> + <fileset dir="${result-src-server}"> + <patternset> + <include name="**/*.java" /> + </patternset> + </fileset> + <fileset dir="${result-src-shared}"> + <patternset> + <include name="**/*.java" /> + </patternset> + </fileset> + <fileset dir="${result-src-client}"> <patternset> <include name="**/*.java" /> </patternset> @@ -943,8 +1029,10 @@ <target name="javadoc" depends="init, preprocess-src"> <property name="javadoc.destdir" value="${output-dir}/WebContent/docs/api"/> - <javadoc destdir="${javadoc.destdir}" author="true" version="true" use="true" windowtitle="${product-name}" classpathref="compile.classpath.client-side"> - <packageset dir="${result-src-core}"/> + <javadoc destdir="${javadoc.destdir}" author="true" version="true" use="true" windowtitle="${product-name}" classpathref="compile.classpath.client"> + <packageset dir="${result-src-server}"/> + <packageset dir="${result-src-client}"/> + <packageset dir="${result-src-shared}"/> <doctitle>${javadoc.doctitle}</doctitle> <!-- <header><![CDATA[<script type="text/javascript" src=".html-style/style.js"></script>]]></header> --> <bottom>${javadoc.bottom}</bottom> @@ -1180,65 +1268,23 @@ <antcall inheritrefs="true" inheritall="true" target="server-side-tests"></antcall> <antcall inheritrefs="true" inheritall="true" target="sass-tests"></antcall> </parallel> - - <!-- Create a combined report from each test's sub report --> - <emma enabled="${emma.enabled}" > - <merge file="${result-path}/combined.es"> - <fileset dir="${result-path}" > - <include name="*.ec" /> - <include name="*.em" /> - </fileset> - </merge> - <report sourcepath="${result-src-core}" > - <fileset dir="${result-path}" > - <include name="combined.es" /> - </fileset> - - <txt outfile="../${result-path}/coverage/coverage-combined/coverage.txt" /> - <html outfile="../${result-path}/coverage/coverage-combined/coverage.html" /> - </report> - </emma> - <echo>##teamcity[publishArtifacts '${result-path}/coverage']</echo> </target> <!-- Assumes java classes have been compiled but depends does not work out well as this is run from a <parallel> task--> <target name="server-side-tests" unless="tests.serverside.skip" depends="compile-tests"> - <emma enabled="${emma.enabled}" > - <instr instrpath="${result-classes-core}" - destdir="${result-classes-core-for-emma-junit}" - mode="copy" - metadatafile="${result-path}/unittests.em" - merge="false" - > - <filter includes="com.vaadin.*" /> - <filter excludes="com.vaadin.terminal.gwt.*" /> - </instr> - </emma> <junit printsummary="yes"> <classpath> - <pathelement path="${result-classes-core-for-emma-junit}" /> - <pathelement path="${result-classes-core}" /> + <pathelement path="${result-classes-server}" /> + <pathelement path="${result-classes-shared}" /> <pathelement path="${result-classes-junit}" /> - <path refid="compile.classpath.server-side-tests"></path> + <path refid="compile.classpath.server-tests"></path> </classpath> - <jvmarg value="-Demma.coverage.out.file=../${result-path}/unittests.ec" /> <batchtest fork="yes"> <fileset dir="tests/server-side" includes="**/*.java" excludes="**/Abstract*.java,com/vaadin/tests/data/bean/*.java,com/vaadin/tests/util/*.java,**/VaadinClasses.java" /> <fileset dir="tests/client-side" includes="**/*.java" excludes="**/Abstract*.java" /> </batchtest> </junit> - <emma enabled="${emma.enabled}" > - <report sourcepath="${result-src-core}" > - <fileset dir="${result-path}" > - <include name="unittests.*" /> - </fileset> - - <txt outfile="../${result-path}/coverage/coverage-unittests/unittests_coverage.txt" /> - <html outfile="../${result-path}/coverage/coverage-unittests/unittests_coverage.html" /> - </report> - </emma> - <echo>##teamcity[publishArtifacts '${result-path}/coverage']</echo> </target> <!-- Assumes java classes have been compiled but depends does not work out well as this is run from a <parallel> task--> @@ -1248,7 +1294,7 @@ <pathelement path="${result-src-sass-junit}" /> <pathelement path="${result-classes-sass}" /> <pathelement path="${result-classes-sass-junit}" /> - <path refid="compile.classpath.server-side-tests"></path> + <path refid="compile.classpath.server-tests"></path> </classpath> <batchtest fork="yes"> @@ -1299,17 +1345,6 @@ </ant> - <emma enabled="${emma.enabled}" > - <report sourcepath="${result-src-core}" > - <fileset dir="${result-path}" > - <include name="war.*" /> - </fileset> - - <txt outfile="../${result-path}/coverage/coverage-testbench/testbench_coverage.txt" /> - <html outfile="../${result-path}/coverage/coverage-testbench/testbench_coverage.html" /> - </report> - </emma> - <echo>##teamcity[publishArtifacts '${result-path}/coverage/']</echo> </target> <!-- Assumes java classes have been compiled but depends does not work out well as this is run from a <parallel> task--> diff --git a/build/common.xml b/build/common.xml index 2886a1698f..1fc6349a46 100644 --- a/build/common.xml +++ b/build/common.xml @@ -49,7 +49,12 @@ <!-- ant contrib for Maven integration --> <taskdef resource="org/apache/maven/artifact/ant/antlib.xml" - uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" /> + uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" /> + + <!-- jarjar --> + <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" + classpathref="taskdefs.classpath"/> + </target> </project> diff --git a/build/ivy/ivy.xml b/build/ivy/ivy.xml index fb94277434..4231633e98 100644 --- a/build/ivy/ivy.xml +++ b/build/ivy/ivy.xml @@ -3,14 +3,16 @@ xsi:noNamespaceSchemaLocation= "http://ant.apache.org/ivy/schemas/ivy.xsd"> <info organisation="com.vaadin" module="vaadin"/> - <configurations > - <conf name="ss.compile" extends="cs.compile" description="Server side compilation dependencies" visibility="private"/> - <conf name="cs.compile" description="Client side compilation dependencies" visibility="private"/> - <conf name="ss.test.compile" extends="ss.compile" description="Test compilation dependencies" visibility="private"/> + <configurations> + <conf name="server.extdep" extends="client.extdep" description="Server side compilation dependencies" visibility="private"/> + <conf name="shared.extdep" extends="server.extdep" description="Shared compilation dependencies" visibility="private"/> + <conf name="client.extdep" description="Client side compilation dependencies" visibility="private"/> + <conf name="client-compiler.extdep" description="Client side compilation dependencies" visibility="private"/> + <conf name="server.tests.extdep" extends="server.extdep" description="Test compilation dependencies" visibility="private"/> <conf name="taskdefs" description="Ant task definitions" visibility="private" /> </configurations> <publications /> - <dependencies defaultconf="ss.compile" defaultconfmapping="ss.compile->master"> + <dependencies defaultconf="server.extdep" defaultconfmapping="server.extdep->master"> <!--Servlet API version 2.5 --> <dependency org="javax.servlet" name="servlet-api" rev="2.5" /> @@ -23,31 +25,32 @@ <dependency org="com.google.appengine" name="appengine-api-1.0-sdk" rev="1.2.1" /> <!-- GWT dependencies (validation-api) --> - <dependency org="javax.validation" name="validation-api" rev="1.0.0.GA" conf="cs.compile->master,sources" /> + <dependency org="javax.validation" name="validation-api" rev="1.0.0.GA" conf="client.extdep->master,sources" /> <!-- Test frameworks & related --> - <dependency org="junit" name="junit" rev="4.5" conf="ss.test.compile -> master"/> - <dependency org="org.easymock" name="easymock" rev="3.0" conf="ss.test.compile -> master, runtime(*)"/> - <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6" conf="ss.test.compile -> master, runtime(*)"/> + <dependency org="junit" name="junit" rev="4.5" conf="server.tests.extdep -> master"/> + <dependency org="org.easymock" name="easymock" rev="3.0" conf="server.tests.extdep -> master, runtime(*)"/> + <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6" conf="server.tests.extdep -> master, runtime(*)"/> <!-- Additional libraries used by tests - also included from GWT --> - <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.26" conf="ss.test.compile -> master"/> - <dependency org="org.mortbay.jetty" name="jetty-util" rev="6.1.26" conf="ss.test.compile -> master"/> - <dependency org="commons-lang" name="commons-lang" rev="2.6" conf="ss.test.compile -> master"/> - <dependency org="commons-io" name="commons-io" rev="2.3" conf="ss.test.compile -> master"/> - <dependency org="commons-codec" name="commons-codec" rev="1.6" conf="ss.test.compile -> master"/> + <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.26" conf="server.tests.extdep -> master"/> + <dependency org="org.mortbay.jetty" name="jetty-util" rev="6.1.26" conf="server.tests.extdep -> master"/> + <dependency org="commons-lang" name="commons-lang" rev="2.6" conf="server.tests.extdep -> master"/> + <dependency org="commons-io" name="commons-io" rev="2.3" conf="server.tests.extdep -> master"/> + <dependency org="commons-codec" name="commons-codec" rev="1.6" conf="server.tests.extdep -> master"/> <!-- Ant tasks --> <dependency org="ant-contrib" name="ant-contrib" rev="1.0b3" conf="taskdefs ->master"/> <dependency org="org.apache.maven" name="maven-ant-tasks" rev="2.0.10" conf="taskdefs ->master"/> + <dependency org="com.googlecode.jarjar" name="jarjar" rev="1.3" conf="taskdefs ->master"/> <!-- Emma --> - <dependency org="emma" name="emma_ant" rev="2.0.5312" conf="ss.test.compile,taskdefs ->master"/> - <dependency org="emma" name="emma" rev="2.0.5312-patched" conf="ss.test.compile,taskdefs ->*"/> + <dependency org="emma" name="emma_ant" rev="2.0.5312" conf="server.tests.extdep,taskdefs ->master"/> + <dependency org="emma" name="emma" rev="2.0.5312-patched" conf="server.tests.extdep,taskdefs ->*"/> <!-- Bean Validation implementation --> - <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" conf="ss.test.compile -> default"/> - <dependency org="org.hibernate" name="hibernate-validator" rev="4.2.0.Final" conf="ss.test.compile -> default"/> + <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" conf="server.tests.extdep -> default"/> + <dependency org="org.hibernate" name="hibernate-validator" rev="4.2.0.Final" conf="server.tests.extdep -> default"/> </dependencies> </ivy-module>
\ No newline at end of file diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/AbstractConnectorClassBasedFactoryGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/AbstractConnectorClassBasedFactoryGenerator.java index 3a13fceece..78579b7e54 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/AbstractConnectorClassBasedFactoryGenerator.java +++ b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/AbstractConnectorClassBasedFactoryGenerator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.widgetsetutils; diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriteriaFactoryGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriteriaFactoryGenerator.java index e5e2ee1f2c..0af1dca8bc 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriteriaFactoryGenerator.java +++ b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriteriaFactoryGenerator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.widgetsetutils; diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java index 6ee30183c1..f57a58a557 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java +++ b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.widgetsetutils; diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorStateFactoryGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorStateFactoryGenerator.java index 33406ef85f..136ea3360e 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorStateFactoryGenerator.java +++ b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorStateFactoryGenerator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.widgetsetutils; diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorWidgetFactoryGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorWidgetFactoryGenerator.java index 55a2857ce0..32693369f2 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorWidgetFactoryGenerator.java +++ b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorWidgetFactoryGenerator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.widgetsetutils; diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/CustomWidgetMapGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/CustomWidgetMapGenerator.java index 89045c63b2..7025393fe2 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/CustomWidgetMapGenerator.java +++ b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/CustomWidgetMapGenerator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.widgetsetutils; diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/EagerWidgetMapGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/EagerWidgetMapGenerator.java index 4ff0592ede..00efcbd25c 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/EagerWidgetMapGenerator.java +++ b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/EagerWidgetMapGenerator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.widgetsetutils; diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/GeneratedRpcMethodProviderGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/GeneratedRpcMethodProviderGenerator.java index e11a12a3b5..47062d9abb 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/GeneratedRpcMethodProviderGenerator.java +++ b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/GeneratedRpcMethodProviderGenerator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.widgetsetutils; diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java new file mode 100644 index 0000000000..3906c10eda --- /dev/null +++ b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java @@ -0,0 +1,35 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.widgetsetutils; + +import com.vaadin.shared.ui.Connect.LoadStyle; +import com.vaadin.terminal.gwt.client.ServerConnector; + +/** + * WidgetMap generator that builds a widgetset that optimizes the transferred + * data. Widgets are loaded only when used if the widgetset is built with this + * generator. + * + * @see WidgetMapGenerator + * + */ +public class LazyWidgetMapGenerator extends WidgetMapGenerator { + @Override + protected LoadStyle getLoadStyle(Class<? extends ServerConnector> connector) { + return LoadStyle.LAZY; + } + +} diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyCreatorGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyCreatorGenerator.java index 8a6c374187..eccc6461c9 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyCreatorGenerator.java +++ b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyCreatorGenerator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.widgetsetutils; diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyGenerator.java index 7a908e5b4d..a54798e5d6 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyGenerator.java +++ b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyGenerator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.widgetsetutils; diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java index 1951f8ba40..2fc9645940 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java +++ b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.widgetsetutils; diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerMapGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerMapGenerator.java index 3f1ad24066..9e91763b9f 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerMapGenerator.java +++ b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerMapGenerator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.widgetsetutils; diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java index 0d062ec4ff..dae6f2821e 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java +++ b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.widgetsetutils; diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetSetBuilder.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetSetBuilder.java index 4c6e334a33..bcfa9990ec 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetSetBuilder.java +++ b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetSetBuilder.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.widgetsetutils; diff --git a/src/com/vaadin/tools/WidgetsetCompiler.java b/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java index ecc1946e60..7e06dfc205 100644..100755 --- a/src/com/vaadin/tools/WidgetsetCompiler.java +++ b/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tools; diff --git a/src/com/vaadin/Vaadin.gwt.xml b/client/src/com/vaadin/Vaadin.gwt.xml index 07d7c941e6..07d7c941e6 100644 --- a/src/com/vaadin/Vaadin.gwt.xml +++ b/client/src/com/vaadin/Vaadin.gwt.xml diff --git a/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml b/client/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml index 278d92f38f..278d92f38f 100644 --- a/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml +++ b/client/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml diff --git a/src/com/vaadin/terminal/gwt/VaadinBrowserSpecificOverrides.gwt.xml b/client/src/com/vaadin/terminal/gwt/VaadinBrowserSpecificOverrides.gwt.xml index b5ab61df64..04d2c18060 100644 --- a/src/com/vaadin/terminal/gwt/VaadinBrowserSpecificOverrides.gwt.xml +++ b/client/src/com/vaadin/terminal/gwt/VaadinBrowserSpecificOverrides.gwt.xml @@ -44,10 +44,4 @@ </any> </replace-with> - <!-- Workaround for #6682. Remove when fixed in GWT. --> - <replace-with class="com.google.gwt.dom.client.VaadinDOMImplSafari"> - <when-type-is class="com.google.gwt.dom.client.DOMImpl" /> - <when-property-is name="user.agent" value="safari" /> - </replace-with> - </module> diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/client/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java index 71707e723a..eea60b04ea 100644 --- a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java +++ b/client/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; @@ -19,12 +31,11 @@ import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Window; +import com.vaadin.shared.ApplicationConstants; import com.vaadin.terminal.gwt.client.ui.UnknownComponentConnector; public class ApplicationConfiguration implements EntryPoint { - public static final String PORTLET_RESOUCE_URL_BASE = "portletAppURLBase"; - /** * Helper class for reading configuration options from the bootstap * javascript @@ -183,20 +194,6 @@ public class ApplicationConfiguration implements EntryPoint { }-*/; } - /** - * Builds number. For example 0-custom_tag in 5.0.0-custom_tag. - */ - public static final String VERSION; - - /* Initialize version numbers from string replaced by build-script. */ - static { - if ("@VERSION@".equals("@" + "VERSION" + "@")) { - VERSION = "9.9.9.INTERNAL-DEBUG-BUILD"; - } else { - VERSION = "@VERSION@"; - } - } - private static WidgetSet widgetSet = GWT.create(WidgetSet.class); private String id; @@ -230,8 +227,8 @@ public class ApplicationConfiguration implements EntryPoint { } public String getPortletResourceUrl() { - return getJsoConfiguration(id) - .getConfigString(PORTLET_RESOUCE_URL_BASE); + return getJsoConfiguration(id).getConfigString( + ApplicationConstants.PORTLET_RESOUCE_URL_BASE); } public String getRootPanelId() { diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java index d757bf89a2..a8852fe9fa 100644 --- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java +++ b/client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; @@ -39,7 +51,9 @@ import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.HasWidgets; import com.google.gwt.user.client.ui.Widget; +import com.vaadin.shared.ApplicationConstants; import com.vaadin.shared.ComponentState; +import com.vaadin.shared.Version; import com.vaadin.shared.communication.MethodInvocation; import com.vaadin.shared.communication.SharedState; import com.vaadin.shared.communication.UidlValue; @@ -61,12 +75,11 @@ import com.vaadin.terminal.gwt.client.ui.notification.VNotification; import com.vaadin.terminal.gwt.client.ui.notification.VNotification.HideEvent; import com.vaadin.terminal.gwt.client.ui.root.RootConnector; import com.vaadin.terminal.gwt.client.ui.window.WindowConnector; -import com.vaadin.terminal.gwt.server.AbstractCommunicationManager; /** * This is the client side communication "engine", managing client-server * communication with its server side counterpart - * {@link AbstractCommunicationManager}. + * com.vaadin.terminal.gwt.server.AbstractCommunicationManager. * * Client-side connectors receive updates from the corresponding server-side * connector (typically component) as state updates or RPC calls. The connector @@ -78,21 +91,6 @@ import com.vaadin.terminal.gwt.server.AbstractCommunicationManager; * Entry point classes (widgetsets) define <code>onModuleLoad()</code>. */ public class ApplicationConnection { - public static final String APP_REQUEST_PATH = "APP/"; - - public static final String UIDL_REQUEST_PATH = "UIDL/"; - - public static final String APP_PROTOCOL_PREFIX = "app://"; - - public static final String V_RESOURCE_PATH = "v-resourcePath"; - - public static final String CONNECTOR_PROTOCOL_PREFIX = "connector://"; - - public static final String CONNECTOR_RESOURCE_PREFIX = APP_REQUEST_PATH - + "CONNECTOR"; - - // This indicates the whole page is generated by us (not embedded) - public static final String GENERATED_BODY_CLASSNAME = "v-generated-body"; public static final String MODIFIED_CLASSNAME = "v-modified"; @@ -102,28 +100,10 @@ public class ApplicationConnection { public static final String ERROR_CLASSNAME_EXT = "-error"; - public static final String UPDATE_VARIABLE_INTERFACE = "v"; - public static final String UPDATE_VARIABLE_METHOD = "v"; - public static final char VAR_BURST_SEPARATOR = '\u001d'; public static final char VAR_ESCAPE_CHARACTER = '\u001b'; - public static final String UIDL_SECURITY_TOKEN_ID = "Vaadin-Security-Key"; - - /** - * Name of the parameter used to transmit root ids back and forth - */ - public static final String ROOT_ID_PARAMETER = "rootId"; - - /** - * @deprecated use UIDL_SECURITY_TOKEN_ID instead - */ - @Deprecated - public static final String UIDL_SECURITY_HEADER = UIDL_SECURITY_TOKEN_ID; - - public static final String PARAM_UNLOADBURST = "onunloadburst"; - private static SerializerMap serializerMap; /** @@ -229,7 +209,7 @@ public class ApplicationConnection { + cnf.getServletVersion()); VConsole.log("Application version: " + cnf.getApplicationVersion()); - if (!cnf.getServletVersion().equals(ApplicationConfiguration.VERSION)) { + if (!cnf.getServletVersion().equals(Version.getFullVersion())) { VConsole.error("Warning: your widget set seems to be built with a different " + "version than the one used on server. Unexpected " + "behavior may occur."); @@ -520,13 +500,14 @@ public class ApplicationConnection { final String payload = uidlSecurityKey + VAR_BURST_SEPARATOR + requestData; VConsole.log("Making UIDL Request with params: " + payload); - String uri = translateVaadinUri(APP_PROTOCOL_PREFIX + UIDL_REQUEST_PATH); + String uri = translateVaadinUri(ApplicationConstants.APP_PROTOCOL_PREFIX + + ApplicationConstants.UIDL_REQUEST_PATH); if (extraParams != null && extraParams.length() > 0) { uri = addGetParameters(uri, extraParams); } - uri = addGetParameters(uri, - ROOT_ID_PARAMETER + "=" + configuration.getRootId()); + uri = addGetParameters(uri, ApplicationConstants.ROOT_ID_PARAMETER + + "=" + configuration.getRootId()); doUidlRequest(uri, payload, forceSync); @@ -651,8 +632,8 @@ public class ApplicationConnection { } else { // Synchronized call, discarded response (leaving the page) SynchronousXHR syncXHR = (SynchronousXHR) SynchronousXHR.create(); - syncXHR.synchronousPost(uri + "&" + PARAM_UNLOADBURST + "=1", - payload); + syncXHR.synchronousPost(uri + "&" + + ApplicationConstants.PARAM_UNLOADBURST + "=1", payload); /* * Although we are in theory leaving the page, the page may still * stay open. End request properly here too. See #3289 @@ -1046,8 +1027,9 @@ public class ApplicationConnection { final MultiStepDuration handleUIDLDuration = new MultiStepDuration(); // Get security key - if (json.containsKey(UIDL_SECURITY_TOKEN_ID)) { - uidlSecurityKey = json.getString(UIDL_SECURITY_TOKEN_ID); + if (json.containsKey(ApplicationConstants.UIDL_SECURITY_TOKEN_ID)) { + uidlSecurityKey = json + .getString(ApplicationConstants.UIDL_SECURITY_TOKEN_ID); } VConsole.log(" * Handling resources from server"); @@ -1714,8 +1696,9 @@ public class ApplicationConnection { // note that type is now deduced from value // TODO could eliminate invocations of same shared variable setter addMethodInvocationToQueue(new MethodInvocation(connectorId, - UPDATE_VARIABLE_INTERFACE, UPDATE_VARIABLE_METHOD, - new Object[] { variableName, new UidlValue(value) }), immediate); + ApplicationConstants.UPDATE_VARIABLE_INTERFACE, + ApplicationConstants.UPDATE_VARIABLE_METHOD, new Object[] { + variableName, new UidlValue(value) }), immediate); } /** @@ -1848,7 +1831,7 @@ public class ApplicationConnection { if (!extraParams.isEmpty()) { extraParams += "&"; } - String widgetsetVersion = ApplicationConfiguration.VERSION; + String widgetsetVersion = Version.getFullVersion(); extraParams += "wsver=" + widgetsetVersion; getConfiguration().setWidgetsetVersionSent(); @@ -1857,9 +1840,9 @@ public class ApplicationConnection { } private boolean isLegacyVariableChange(MethodInvocation invocation) { - return ApplicationConnection.UPDATE_VARIABLE_METHOD.equals(invocation + return ApplicationConstants.UPDATE_VARIABLE_METHOD.equals(invocation .getInterfaceName()) - && ApplicationConnection.UPDATE_VARIABLE_METHOD + && ApplicationConstants.UPDATE_VARIABLE_METHOD .equals(invocation.getMethodName()); } @@ -2304,17 +2287,21 @@ public class ApplicationConnection { uidlUri = themeUri + uidlUri.substring(7); } - if (uidlUri.startsWith(CONNECTOR_PROTOCOL_PREFIX)) { + if (uidlUri.startsWith(ApplicationConstants.CONNECTOR_PROTOCOL_PREFIX)) { // getAppUri *should* always end with / // substring *should* always start with / (connector:///foo.bar // without connector://) - uidlUri = APP_PROTOCOL_PREFIX + CONNECTOR_RESOURCE_PREFIX - + uidlUri.substring(CONNECTOR_PROTOCOL_PREFIX.length()); + uidlUri = ApplicationConstants.APP_PROTOCOL_PREFIX + + ApplicationConstants.CONNECTOR_RESOURCE_PREFIX + + uidlUri + .substring(ApplicationConstants.CONNECTOR_PROTOCOL_PREFIX + .length()); // Let translation of app:// urls take care of the rest } - if (uidlUri.startsWith(APP_PROTOCOL_PREFIX)) { + if (uidlUri.startsWith(ApplicationConstants.APP_PROTOCOL_PREFIX)) { String relativeUrl = uidlUri - .substring(APP_PROTOCOL_PREFIX.length()); + .substring(ApplicationConstants.APP_PROTOCOL_PREFIX + .length()); if (getConfiguration().usePortletURLs()) { // Should put path in v-resourcePath parameter and append query // params to base portlet url @@ -2332,7 +2319,7 @@ public class ApplicationConnection { if (!path.startsWith("/")) { path = '/' + path; } - String pathParam = V_RESOURCE_PATH + "=" + String pathParam = ApplicationConstants.V_RESOURCE_PATH + "=" + URL.encodeQueryString(path); url = addGetParameters(url, pathParam); uidlUri = url; diff --git a/src/com/vaadin/terminal/gwt/client/BrowserInfo.java b/client/src/com/vaadin/terminal/gwt/client/BrowserInfo.java index 32bb0b8eed..de2d9a9cd8 100644 --- a/src/com/vaadin/terminal/gwt/client/BrowserInfo.java +++ b/client/src/com/vaadin/terminal/gwt/client/BrowserInfo.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/CSSRule.java b/client/src/com/vaadin/terminal/gwt/client/CSSRule.java index c36b0611e8..1571e9bdf0 100644 --- a/src/com/vaadin/terminal/gwt/client/CSSRule.java +++ b/client/src/com/vaadin/terminal/gwt/client/CSSRule.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/client/src/com/vaadin/terminal/gwt/client/ClientExceptionHandler.java b/client/src/com/vaadin/terminal/gwt/client/ClientExceptionHandler.java new file mode 100644 index 0000000000..d8c7e67638 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ClientExceptionHandler.java @@ -0,0 +1,42 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client; + +import com.google.gwt.core.client.GWT; + +@Deprecated +public class ClientExceptionHandler { + + public static void displayError(Throwable e) { + displayError(e.getClass().getName() + ": " + e.getMessage()); + + GWT.log(e.getMessage(), e); + } + + @Deprecated + public static void displayError(String msg) { + VConsole.error(msg); + GWT.log(msg); + } + + @Deprecated + public static void displayError(String msg, Throwable e) { + displayError(msg); + displayError(e); + + } + +} diff --git a/src/com/vaadin/terminal/gwt/client/ComponentConnector.java b/client/src/com/vaadin/terminal/gwt/client/ComponentConnector.java index e57a188b47..066e609d2c 100644 --- a/src/com/vaadin/terminal/gwt/client/ComponentConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ComponentConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/ComponentContainerConnector.java b/client/src/com/vaadin/terminal/gwt/client/ComponentContainerConnector.java index 08ce3d31dc..b74e77d01f 100644 --- a/src/com/vaadin/terminal/gwt/client/ComponentContainerConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ComponentContainerConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/ComponentDetail.java b/client/src/com/vaadin/terminal/gwt/client/ComponentDetail.java index 686cb640a4..cd7ad0178f 100644 --- a/src/com/vaadin/terminal/gwt/client/ComponentDetail.java +++ b/client/src/com/vaadin/terminal/gwt/client/ComponentDetail.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/ComponentDetailMap.java b/client/src/com/vaadin/terminal/gwt/client/ComponentDetailMap.java index dfbcf9d38b..3566d4e86f 100644 --- a/src/com/vaadin/terminal/gwt/client/ComponentDetailMap.java +++ b/client/src/com/vaadin/terminal/gwt/client/ComponentDetailMap.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/ComponentLocator.java b/client/src/com/vaadin/terminal/gwt/client/ComponentLocator.java index 28252a9efb..959f03e46d 100644 --- a/src/com/vaadin/terminal/gwt/client/ComponentLocator.java +++ b/client/src/com/vaadin/terminal/gwt/client/ComponentLocator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/ComputedStyle.java b/client/src/com/vaadin/terminal/gwt/client/ComputedStyle.java index 29b02b4dde..7662ba634b 100644 --- a/src/com/vaadin/terminal/gwt/client/ComputedStyle.java +++ b/client/src/com/vaadin/terminal/gwt/client/ComputedStyle.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/ConnectorHierarchyChangeEvent.java b/client/src/com/vaadin/terminal/gwt/client/ConnectorHierarchyChangeEvent.java index aa41caf75d..6abaa89891 100644 --- a/src/com/vaadin/terminal/gwt/client/ConnectorHierarchyChangeEvent.java +++ b/client/src/com/vaadin/terminal/gwt/client/ConnectorHierarchyChangeEvent.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; @@ -18,7 +30,6 @@ import com.vaadin.terminal.gwt.client.communication.AbstractServerConnectorEvent * completed. * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 * */ diff --git a/src/com/vaadin/terminal/gwt/client/ConnectorMap.java b/client/src/com/vaadin/terminal/gwt/client/ConnectorMap.java index 8bc4a4aacf..8202ef7d17 100644 --- a/src/com/vaadin/terminal/gwt/client/ConnectorMap.java +++ b/client/src/com/vaadin/terminal/gwt/client/ConnectorMap.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/Console.java b/client/src/com/vaadin/terminal/gwt/client/Console.java index 64b2646201..4f292e4e28 100644 --- a/src/com/vaadin/terminal/gwt/client/Console.java +++ b/client/src/com/vaadin/terminal/gwt/client/Console.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/ContainerResizedListener.java b/client/src/com/vaadin/terminal/gwt/client/ContainerResizedListener.java index 569080d9ad..01ece2ed80 100644 --- a/src/com/vaadin/terminal/gwt/client/ContainerResizedListener.java +++ b/client/src/com/vaadin/terminal/gwt/client/ContainerResizedListener.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/DateTimeService.java b/client/src/com/vaadin/terminal/gwt/client/DateTimeService.java index 45ba4a7452..8cce0846ac 100644 --- a/src/com/vaadin/terminal/gwt/client/DateTimeService.java +++ b/client/src/com/vaadin/terminal/gwt/client/DateTimeService.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/client/src/com/vaadin/terminal/gwt/client/DirectionalManagedLayout.java b/client/src/com/vaadin/terminal/gwt/client/DirectionalManagedLayout.java new file mode 100644 index 0000000000..323fc5bdf2 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/DirectionalManagedLayout.java @@ -0,0 +1,24 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client; + +import com.vaadin.terminal.gwt.client.ui.ManagedLayout; + +public interface DirectionalManagedLayout extends ManagedLayout { + public void layoutVertically(); + + public void layoutHorizontally(); +}
\ No newline at end of file diff --git a/src/com/vaadin/terminal/gwt/client/EventHelper.java b/client/src/com/vaadin/terminal/gwt/client/EventHelper.java index 208768a0c1..8d09094c1f 100644 --- a/src/com/vaadin/terminal/gwt/client/EventHelper.java +++ b/client/src/com/vaadin/terminal/gwt/client/EventHelper.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/FastStringSet.java b/client/src/com/vaadin/terminal/gwt/client/FastStringSet.java index 05ed8addc8..d88f56ed61 100644 --- a/src/com/vaadin/terminal/gwt/client/FastStringSet.java +++ b/client/src/com/vaadin/terminal/gwt/client/FastStringSet.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/client/src/com/vaadin/terminal/gwt/client/Focusable.java b/client/src/com/vaadin/terminal/gwt/client/Focusable.java new file mode 100644 index 0000000000..fe468a0548 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/Focusable.java @@ -0,0 +1,31 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client; + +/** + * GWT's HasFocus is way too overkill for just receiving focus in simple + * components. Vaadin uses this interface in addition to GWT's HasFocus to pass + * focus requests from server to actual ui widgets in browsers. + * + * So in to make your server side focusable component receive focus on client + * side it must either implement this or HasFocus interface. + */ +public interface Focusable { + /** + * Sets focus to this widget. + */ + public void focus(); +} diff --git a/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java b/client/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java index 47dd2df5b2..98c014b5ec 100644 --- a/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java +++ b/client/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/JavaScriptExtension.java b/client/src/com/vaadin/terminal/gwt/client/JavaScriptExtension.java index a2170b9ab9..e94e0a739b 100644 --- a/src/com/vaadin/terminal/gwt/client/JavaScriptExtension.java +++ b/client/src/com/vaadin/terminal/gwt/client/JavaScriptExtension.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/LayoutManager.java b/client/src/com/vaadin/terminal/gwt/client/LayoutManager.java index 74586a6def..c95860a029 100644 --- a/src/com/vaadin/terminal/gwt/client/LayoutManager.java +++ b/client/src/com/vaadin/terminal/gwt/client/LayoutManager.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/LayoutManagerIE8.java b/client/src/com/vaadin/terminal/gwt/client/LayoutManagerIE8.java index ea130779ea..3e47865cdc 100644 --- a/src/com/vaadin/terminal/gwt/client/LayoutManagerIE8.java +++ b/client/src/com/vaadin/terminal/gwt/client/LayoutManagerIE8.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/client/src/com/vaadin/terminal/gwt/client/LocaleNotLoadedException.java b/client/src/com/vaadin/terminal/gwt/client/LocaleNotLoadedException.java new file mode 100644 index 0000000000..a2d6bdc860 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/LocaleNotLoadedException.java @@ -0,0 +1,25 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.client; + +@SuppressWarnings("serial") +public class LocaleNotLoadedException extends Exception { + + public LocaleNotLoadedException(String locale) { + super(locale); + } +} diff --git a/src/com/vaadin/terminal/gwt/client/LocaleService.java b/client/src/com/vaadin/terminal/gwt/client/LocaleService.java index 0f22ae705b..15a3230c58 100644 --- a/src/com/vaadin/terminal/gwt/client/LocaleService.java +++ b/client/src/com/vaadin/terminal/gwt/client/LocaleService.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/MeasuredSize.java b/client/src/com/vaadin/terminal/gwt/client/MeasuredSize.java index 97822fa8ec..ff8b591461 100644 --- a/src/com/vaadin/terminal/gwt/client/MeasuredSize.java +++ b/client/src/com/vaadin/terminal/gwt/client/MeasuredSize.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/MouseEventDetailsBuilder.java b/client/src/com/vaadin/terminal/gwt/client/MouseEventDetailsBuilder.java index d39f98a024..51af1a73a9 100644 --- a/src/com/vaadin/terminal/gwt/client/MouseEventDetailsBuilder.java +++ b/client/src/com/vaadin/terminal/gwt/client/MouseEventDetailsBuilder.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; @@ -13,7 +25,6 @@ import com.vaadin.shared.MouseEventDetails; * {@link NativeEvent}. * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 * */ diff --git a/src/com/vaadin/terminal/gwt/client/NullConsole.java b/client/src/com/vaadin/terminal/gwt/client/NullConsole.java index aba301d18d..b17eaddd9f 100644 --- a/src/com/vaadin/terminal/gwt/client/NullConsole.java +++ b/client/src/com/vaadin/terminal/gwt/client/NullConsole.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/client/src/com/vaadin/terminal/gwt/client/Paintable.java b/client/src/com/vaadin/terminal/gwt/client/Paintable.java new file mode 100644 index 0000000000..739f9d6594 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/Paintable.java @@ -0,0 +1,31 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.client; + +/** + * An interface used by client-side widgets or paintable parts to receive + * updates from the corresponding server-side components in the form of + * {@link UIDL}. + * + * Updates can be sent back to the server using the + * {@link ApplicationConnection#updateVariable()} methods. + */ +@Deprecated +public interface Paintable { + + public void updateFromUIDL(UIDL uidl, ApplicationConnection client); +} diff --git a/src/com/vaadin/terminal/gwt/client/RenderInformation.java b/client/src/com/vaadin/terminal/gwt/client/RenderInformation.java index 83d8abfd2f..0fef0a9d65 100644 --- a/src/com/vaadin/terminal/gwt/client/RenderInformation.java +++ b/client/src/com/vaadin/terminal/gwt/client/RenderInformation.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/RenderSpace.java b/client/src/com/vaadin/terminal/gwt/client/RenderSpace.java index fa28b0de95..e92a72de86 100644 --- a/src/com/vaadin/terminal/gwt/client/RenderSpace.java +++ b/client/src/com/vaadin/terminal/gwt/client/RenderSpace.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/ResourceLoader.java b/client/src/com/vaadin/terminal/gwt/client/ResourceLoader.java index 21577ce87e..57083641ba 100644 --- a/src/com/vaadin/terminal/gwt/client/ResourceLoader.java +++ b/client/src/com/vaadin/terminal/gwt/client/ResourceLoader.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; @@ -32,7 +44,6 @@ import com.google.gwt.user.client.Timer; * while still controlling in which order e.g. scripts are executed. * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ public class ResourceLoader { diff --git a/src/com/vaadin/terminal/gwt/client/ServerConnector.java b/client/src/com/vaadin/terminal/gwt/client/ServerConnector.java index ce46a3fb5e..ff37f04f04 100644 --- a/src/com/vaadin/terminal/gwt/client/ServerConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ServerConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; @@ -18,7 +30,6 @@ import com.vaadin.terminal.gwt.client.communication.StateChangeEvent.StateChange * framework when needed and have the ability to communicate with the server. * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ public interface ServerConnector extends Connector { diff --git a/src/com/vaadin/terminal/gwt/client/SimpleTree.java b/client/src/com/vaadin/terminal/gwt/client/SimpleTree.java index 506d990aac..d5d81d7e44 100644 --- a/src/com/vaadin/terminal/gwt/client/SimpleTree.java +++ b/client/src/com/vaadin/terminal/gwt/client/SimpleTree.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/client/src/com/vaadin/terminal/gwt/client/StyleConstants.java b/client/src/com/vaadin/terminal/gwt/client/StyleConstants.java new file mode 100644 index 0000000000..b4955ccd14 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/StyleConstants.java @@ -0,0 +1,29 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.client; + +public class StyleConstants { + + public static final String MARGIN_TOP = "margin-top"; + public static final String MARGIN_RIGHT = "margin-right"; + public static final String MARGIN_BOTTOM = "margin-bottom"; + public static final String MARGIN_LEFT = "margin-left"; + + public static final String VERTICAL_SPACING = "vspacing"; + public static final String HORIZONTAL_SPACING = "hspacing"; + +} diff --git a/src/com/vaadin/terminal/gwt/client/SuperDevMode.java b/client/src/com/vaadin/terminal/gwt/client/SuperDevMode.java index e435b3c6ed..200ceb730a 100644 --- a/src/com/vaadin/terminal/gwt/client/SuperDevMode.java +++ b/client/src/com/vaadin/terminal/gwt/client/SuperDevMode.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; @@ -18,7 +30,6 @@ import com.vaadin.terminal.gwt.client.ui.notification.VNotification.HideEvent; * Class that enables SuperDevMode using a ?superdevmode parameter in the url. * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0 * */ diff --git a/src/com/vaadin/terminal/gwt/client/SynchronousXHR.java b/client/src/com/vaadin/terminal/gwt/client/SynchronousXHR.java index 6d9ad4a083..a0a399842a 100644 --- a/src/com/vaadin/terminal/gwt/client/SynchronousXHR.java +++ b/client/src/com/vaadin/terminal/gwt/client/SynchronousXHR.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/TooltipInfo.java b/client/src/com/vaadin/terminal/gwt/client/TooltipInfo.java index 712d263695..e0a398b90d 100644 --- a/src/com/vaadin/terminal/gwt/client/TooltipInfo.java +++ b/client/src/com/vaadin/terminal/gwt/client/TooltipInfo.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/UIDL.java b/client/src/com/vaadin/terminal/gwt/client/UIDL.java index e662e08b3f..9032a04e24 100644 --- a/src/com/vaadin/terminal/gwt/client/UIDL.java +++ b/client/src/com/vaadin/terminal/gwt/client/UIDL.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/Util.java b/client/src/com/vaadin/terminal/gwt/client/Util.java index a27c77fa45..571258dbe3 100644 --- a/src/com/vaadin/terminal/gwt/client/Util.java +++ b/client/src/com/vaadin/terminal/gwt/client/Util.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; @@ -27,6 +39,7 @@ import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.HasWidgets; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.Widget; +import com.vaadin.shared.ApplicationConstants; import com.vaadin.shared.ComponentState; import com.vaadin.shared.communication.MethodInvocation; import com.vaadin.terminal.gwt.client.RenderInformation.FloatSize; @@ -841,7 +854,7 @@ public class Util { for (MethodInvocation invocation : invocations) { Object[] parameters = invocation.getParameters(); String formattedParams = null; - if (ApplicationConnection.UPDATE_VARIABLE_METHOD.equals(invocation + if (ApplicationConstants.UPDATE_VARIABLE_METHOD.equals(invocation .getMethodName()) && parameters.length == 2) { // name, value Object value = parameters[1]; diff --git a/src/com/vaadin/terminal/gwt/client/VCaption.java b/client/src/com/vaadin/terminal/gwt/client/VCaption.java index 85acc215b7..d6da84eb8c 100644 --- a/src/com/vaadin/terminal/gwt/client/VCaption.java +++ b/client/src/com/vaadin/terminal/gwt/client/VCaption.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/VCaptionWrapper.java b/client/src/com/vaadin/terminal/gwt/client/VCaptionWrapper.java index a8dabb8652..f3e1802689 100644 --- a/src/com/vaadin/terminal/gwt/client/VCaptionWrapper.java +++ b/client/src/com/vaadin/terminal/gwt/client/VCaptionWrapper.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/VConsole.java b/client/src/com/vaadin/terminal/gwt/client/VConsole.java index 02fc61626d..73427c5beb 100644 --- a/src/com/vaadin/terminal/gwt/client/VConsole.java +++ b/client/src/com/vaadin/terminal/gwt/client/VConsole.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/VDebugConsole.java b/client/src/com/vaadin/terminal/gwt/client/VDebugConsole.java index 5753e032d4..1e2a3062f1 100644 --- a/src/com/vaadin/terminal/gwt/client/VDebugConsole.java +++ b/client/src/com/vaadin/terminal/gwt/client/VDebugConsole.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; @@ -55,6 +67,7 @@ import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; +import com.vaadin.shared.Version; import com.vaadin.terminal.gwt.client.ui.VLazyExecutor; import com.vaadin.terminal.gwt.client.ui.VOverlay; import com.vaadin.terminal.gwt.client.ui.notification.VNotification; @@ -851,13 +864,11 @@ public class VDebugConsole extends VOverlay implements Console { log("Starting Vaadin client side engine. Widgetset: " + GWT.getModuleName()); - log("Widget set is built on version: " - + ApplicationConfiguration.VERSION); + log("Widget set is built on version: " + Version.getFullVersion()); logToDebugWindow("<div class=\"v-theme-version v-theme-version-" - + ApplicationConfiguration.VERSION.replaceAll("\\.", "_") - + "\">Warning: widgetset version " - + ApplicationConfiguration.VERSION + + Version.getFullVersion().replaceAll("\\.", "_") + + "\">Warning: widgetset version " + Version.getFullVersion() + " does not seem to match theme version </div>", true); } diff --git a/src/com/vaadin/terminal/gwt/client/VErrorMessage.java b/client/src/com/vaadin/terminal/gwt/client/VErrorMessage.java index add6ee4780..af94241361 100644 --- a/src/com/vaadin/terminal/gwt/client/VErrorMessage.java +++ b/client/src/com/vaadin/terminal/gwt/client/VErrorMessage.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/VSchedulerImpl.java b/client/src/com/vaadin/terminal/gwt/client/VSchedulerImpl.java index 6f5e5854b2..56dec16289 100644 --- a/src/com/vaadin/terminal/gwt/client/VSchedulerImpl.java +++ b/client/src/com/vaadin/terminal/gwt/client/VSchedulerImpl.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/VTooltip.java b/client/src/com/vaadin/terminal/gwt/client/VTooltip.java index a3523c2013..1b9321fb16 100644 --- a/src/com/vaadin/terminal/gwt/client/VTooltip.java +++ b/client/src/com/vaadin/terminal/gwt/client/VTooltip.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/VUIDLBrowser.java b/client/src/com/vaadin/terminal/gwt/client/VUIDLBrowser.java index f7d43a1a12..3cdc03ee86 100644 --- a/src/com/vaadin/terminal/gwt/client/VUIDLBrowser.java +++ b/client/src/com/vaadin/terminal/gwt/client/VUIDLBrowser.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ /** * diff --git a/src/com/vaadin/terminal/gwt/client/ValueMap.java b/client/src/com/vaadin/terminal/gwt/client/ValueMap.java index 5deb5feb55..bade480e7c 100644 --- a/src/com/vaadin/terminal/gwt/client/ValueMap.java +++ b/client/src/com/vaadin/terminal/gwt/client/ValueMap.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ /** * diff --git a/client/src/com/vaadin/terminal/gwt/client/WidgetInstantiator.java b/client/src/com/vaadin/terminal/gwt/client/WidgetInstantiator.java new file mode 100644 index 0000000000..347a8dd631 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/WidgetInstantiator.java @@ -0,0 +1,23 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client; + +/** + * A helper class used by WidgetMap implementation. Used by the generated code. + */ +interface WidgetInstantiator { + public ServerConnector get(); +} diff --git a/client/src/com/vaadin/terminal/gwt/client/WidgetLoader.java b/client/src/com/vaadin/terminal/gwt/client/WidgetLoader.java new file mode 100644 index 0000000000..e98aa031c4 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/WidgetLoader.java @@ -0,0 +1,35 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client; + +import com.google.gwt.core.client.RunAsyncCallback; + +/** A helper class used by WidgetMap implementation. Used by the generated code. */ +abstract class WidgetLoader implements RunAsyncCallback { + + @Override + public void onFailure(Throwable reason) { + ApplicationConfiguration.endDependencyLoading(); + } + + @Override + public void onSuccess() { + addInstantiator(); + ApplicationConfiguration.endDependencyLoading(); + } + + abstract void addInstantiator(); +} diff --git a/src/com/vaadin/terminal/gwt/client/WidgetMap.java b/client/src/com/vaadin/terminal/gwt/client/WidgetMap.java index b770414457..4c929714c3 100644 --- a/src/com/vaadin/terminal/gwt/client/WidgetMap.java +++ b/client/src/com/vaadin/terminal/gwt/client/WidgetMap.java @@ -1,19 +1,28 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; import java.util.HashMap; -import com.vaadin.terminal.gwt.widgetsetutils.WidgetMapGenerator; - /** * Abstract class mapping between {@link ComponentConnector} instances and their * instances. * - * A concrete implementation of this class is generated by - * {@link WidgetMapGenerator} or one of its subclasses during widgetset - * compilation. + * A concrete implementation of this class is generated by WidgetMapGenerator or + * one of its subclasses during widgetset compilation. */ abstract class WidgetMap { diff --git a/src/com/vaadin/terminal/gwt/client/WidgetSet.java b/client/src/com/vaadin/terminal/gwt/client/WidgetSet.java index 3d7e838c62..fbcfbb68d9 100644 --- a/src/com/vaadin/terminal/gwt/client/WidgetSet.java +++ b/client/src/com/vaadin/terminal/gwt/client/WidgetSet.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client; diff --git a/src/com/vaadin/terminal/gwt/client/communication/AbstractServerConnectorEvent.java b/client/src/com/vaadin/terminal/gwt/client/communication/AbstractServerConnectorEvent.java index b465e3ad7e..7b4114ec07 100644 --- a/src/com/vaadin/terminal/gwt/client/communication/AbstractServerConnectorEvent.java +++ b/client/src/com/vaadin/terminal/gwt/client/communication/AbstractServerConnectorEvent.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.communication; diff --git a/client/src/com/vaadin/terminal/gwt/client/communication/DiffJSONSerializer.java b/client/src/com/vaadin/terminal/gwt/client/communication/DiffJSONSerializer.java new file mode 100644 index 0000000000..a3b96a6cb2 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/communication/DiffJSONSerializer.java @@ -0,0 +1,31 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client.communication; + +import com.google.gwt.json.client.JSONValue; +import com.vaadin.terminal.gwt.client.ApplicationConnection; + +public interface DiffJSONSerializer<T> extends JSONSerializer<T> { + /** + * Update the target object in place based on the passed JSON data. + * + * @param target + * @param jsonValue + * @param connection + */ + public void update(T target, Type type, JSONValue jsonValue, + ApplicationConnection connection); +} diff --git a/client/src/com/vaadin/terminal/gwt/client/communication/GeneratedRpcMethodProvider.java b/client/src/com/vaadin/terminal/gwt/client/communication/GeneratedRpcMethodProvider.java new file mode 100644 index 0000000000..e865dbc1b1 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/communication/GeneratedRpcMethodProvider.java @@ -0,0 +1,32 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client.communication; + +import java.util.Collection; + +/** + * Provides runtime data about client side RPC calls received from the server to + * the client-side code. + * + * A GWT generator is used to create an implementation of this class at + * run-time. + * + * @since 7.0 + */ +public interface GeneratedRpcMethodProvider { + + public Collection<RpcMethod> getGeneratedRpcMethods(); +} diff --git a/client/src/com/vaadin/terminal/gwt/client/communication/HasJavaScriptConnectorHelper.java b/client/src/com/vaadin/terminal/gwt/client/communication/HasJavaScriptConnectorHelper.java new file mode 100644 index 0000000000..1c8a96a814 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/communication/HasJavaScriptConnectorHelper.java @@ -0,0 +1,23 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.client.communication; + +import com.vaadin.terminal.gwt.client.JavaScriptConnectorHelper; + +public interface HasJavaScriptConnectorHelper { + public JavaScriptConnectorHelper getJavascriptConnectorHelper(); +} diff --git a/src/com/vaadin/terminal/gwt/client/communication/InitializableServerRpc.java b/client/src/com/vaadin/terminal/gwt/client/communication/InitializableServerRpc.java index f1b6b44b7d..65887bf62e 100644 --- a/src/com/vaadin/terminal/gwt/client/communication/InitializableServerRpc.java +++ b/client/src/com/vaadin/terminal/gwt/client/communication/InitializableServerRpc.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.communication; diff --git a/src/com/vaadin/terminal/gwt/client/communication/JSONSerializer.java b/client/src/com/vaadin/terminal/gwt/client/communication/JSONSerializer.java index 9820b6a895..a8fe2c7ccc 100644 --- a/src/com/vaadin/terminal/gwt/client/communication/JSONSerializer.java +++ b/client/src/com/vaadin/terminal/gwt/client/communication/JSONSerializer.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.communication; @@ -8,7 +20,6 @@ import com.google.gwt.json.client.JSONObject; import com.google.gwt.json.client.JSONValue; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.ConnectorMap; -import com.vaadin.terminal.gwt.server.JsonCodec; /** * Implementors of this interface knows how to serialize an Object of a given @@ -28,9 +39,8 @@ public interface JSONSerializer<T> { /** * Creates and deserializes an object received from the server. Must be * compatible with {@link #serialize(Object, ConnectorMap)} and also with - * the server side - * {@link JsonCodec#encode(Object, com.vaadin.terminal.gwt.server.PaintableIdMapper)} - * . + * the server side JsonCodec.encode(Object, + * com.vaadin.terminal.gwt.server.PaintableIdMapper) . * * @param jsonValue * JSON map from property name to property value @@ -42,8 +52,8 @@ public interface JSONSerializer<T> { /** * Serialize the given object into JSON. Must be compatible with * {@link #deserialize(JSONObject, ConnectorMap)} and also with the server - * side - * {@link JsonCodec#decode(com.vaadin.external.json.JSONArray, com.vaadin.terminal.gwt.server.PaintableIdMapper)} + * side JsonCodec.decode(com.vaadin.external.json.JSONArray, + * com.vaadin.terminal.gwt.server.PaintableIdMapper) * * @param value * The object to serialize diff --git a/src/com/vaadin/terminal/gwt/client/communication/JsonDecoder.java b/client/src/com/vaadin/terminal/gwt/client/communication/JsonDecoder.java index 7268acdfc5..7d2046982c 100644 --- a/src/com/vaadin/terminal/gwt/client/communication/JsonDecoder.java +++ b/client/src/com/vaadin/terminal/gwt/client/communication/JsonDecoder.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.communication; diff --git a/src/com/vaadin/terminal/gwt/client/communication/JsonEncoder.java b/client/src/com/vaadin/terminal/gwt/client/communication/JsonEncoder.java index 404f1238e0..3730cad4c3 100644 --- a/src/com/vaadin/terminal/gwt/client/communication/JsonEncoder.java +++ b/client/src/com/vaadin/terminal/gwt/client/communication/JsonEncoder.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.communication; @@ -18,6 +30,7 @@ import com.google.gwt.json.client.JSONObject; import com.google.gwt.json.client.JSONString; import com.google.gwt.json.client.JSONValue; import com.vaadin.shared.Connector; +import com.vaadin.shared.JsonConstants; import com.vaadin.shared.communication.UidlValue; import com.vaadin.terminal.gwt.client.ApplicationConnection; @@ -34,20 +47,6 @@ import com.vaadin.terminal.gwt.client.ApplicationConnection; */ public class JsonEncoder { - public static final String VTYPE_CONNECTOR = "c"; - public static final String VTYPE_BOOLEAN = "b"; - public static final String VTYPE_DOUBLE = "d"; - public static final String VTYPE_FLOAT = "f"; - public static final String VTYPE_LONG = "l"; - public static final String VTYPE_INTEGER = "i"; - public static final String VTYPE_STRING = "s"; - public static final String VTYPE_ARRAY = "a"; - public static final String VTYPE_STRINGARRAY = "S"; - public static final String VTYPE_MAP = "m"; - public static final String VTYPE_LIST = "L"; - public static final String VTYPE_SET = "q"; - public static final String VTYPE_NULL = "n"; - /** * Encode a value to a JSON representation for transport from the client to * the server. @@ -252,34 +251,34 @@ public class JsonEncoder { */ private static String getTransportType(Object value) { if (value == null) { - return VTYPE_NULL; + return JsonConstants.VTYPE_NULL; } else if (value instanceof String) { - return VTYPE_STRING; + return JsonConstants.VTYPE_STRING; } else if (value instanceof Connector) { - return VTYPE_CONNECTOR; + return JsonConstants.VTYPE_CONNECTOR; } else if (value instanceof Boolean) { - return VTYPE_BOOLEAN; + return JsonConstants.VTYPE_BOOLEAN; } else if (value instanceof Integer) { - return VTYPE_INTEGER; + return JsonConstants.VTYPE_INTEGER; } else if (value instanceof Float) { - return VTYPE_FLOAT; + return JsonConstants.VTYPE_FLOAT; } else if (value instanceof Double) { - return VTYPE_DOUBLE; + return JsonConstants.VTYPE_DOUBLE; } else if (value instanceof Long) { - return VTYPE_LONG; + return JsonConstants.VTYPE_LONG; } else if (value instanceof List) { - return VTYPE_LIST; + return JsonConstants.VTYPE_LIST; } else if (value instanceof Set) { - return VTYPE_SET; + return JsonConstants.VTYPE_SET; } else if (value instanceof String[]) { - return VTYPE_STRINGARRAY; + return JsonConstants.VTYPE_STRINGARRAY; } else if (value instanceof Object[]) { - return VTYPE_ARRAY; + return JsonConstants.VTYPE_ARRAY; } else if (value instanceof Map) { - return VTYPE_MAP; + return JsonConstants.VTYPE_MAP; } else if (value instanceof Enum<?>) { // Enum value is processed as a string - return VTYPE_STRING; + return JsonConstants.VTYPE_STRING; } return null; } diff --git a/src/com/vaadin/terminal/gwt/client/communication/RpcManager.java b/client/src/com/vaadin/terminal/gwt/client/communication/RpcManager.java index b1c91fe049..04d0e3f56f 100644 --- a/src/com/vaadin/terminal/gwt/client/communication/RpcManager.java +++ b/client/src/com/vaadin/terminal/gwt/client/communication/RpcManager.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.communication; diff --git a/src/com/vaadin/terminal/gwt/client/communication/RpcMethod.java b/client/src/com/vaadin/terminal/gwt/client/communication/RpcMethod.java index ce9c5b468b..a47fa5eab2 100644 --- a/src/com/vaadin/terminal/gwt/client/communication/RpcMethod.java +++ b/client/src/com/vaadin/terminal/gwt/client/communication/RpcMethod.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.communication; diff --git a/src/com/vaadin/terminal/gwt/client/communication/RpcProxy.java b/client/src/com/vaadin/terminal/gwt/client/communication/RpcProxy.java index 996c148f4f..226594adc6 100644 --- a/src/com/vaadin/terminal/gwt/client/communication/RpcProxy.java +++ b/client/src/com/vaadin/terminal/gwt/client/communication/RpcProxy.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.communication; diff --git a/src/com/vaadin/terminal/gwt/client/communication/SerializerMap.java b/client/src/com/vaadin/terminal/gwt/client/communication/SerializerMap.java index 0750474d24..77df4c7b08 100644 --- a/src/com/vaadin/terminal/gwt/client/communication/SerializerMap.java +++ b/client/src/com/vaadin/terminal/gwt/client/communication/SerializerMap.java @@ -1,17 +1,27 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.communication; -import com.vaadin.terminal.gwt.widgetsetutils.SerializerMapGenerator; - /** * Provide a mapping from a type (communicated between the server and the * client) and a {@link JSONSerializer} instance. * * An implementation of this class is created at GWT compilation time by - * {@link SerializerMapGenerator}, so this interface can be instantiated with + * SerializerMapGenerator, so this interface can be instantiated with * GWT.create(). * * @since 7.0 diff --git a/src/com/vaadin/terminal/gwt/client/communication/StateChangeEvent.java b/client/src/com/vaadin/terminal/gwt/client/communication/StateChangeEvent.java index 39ecbc022c..e1847bdab7 100644 --- a/src/com/vaadin/terminal/gwt/client/communication/StateChangeEvent.java +++ b/client/src/com/vaadin/terminal/gwt/client/communication/StateChangeEvent.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.communication; diff --git a/src/com/vaadin/terminal/gwt/client/communication/Type.java b/client/src/com/vaadin/terminal/gwt/client/communication/Type.java index dc33f760ff..ff93234a1d 100644 --- a/src/com/vaadin/terminal/gwt/client/communication/Type.java +++ b/client/src/com/vaadin/terminal/gwt/client/communication/Type.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.communication; diff --git a/src/com/vaadin/terminal/gwt/client/communication/URLReference_Serializer.java b/client/src/com/vaadin/terminal/gwt/client/communication/URLReference_Serializer.java index f39cad1899..f77553d3c0 100644 --- a/src/com/vaadin/terminal/gwt/client/communication/URLReference_Serializer.java +++ b/client/src/com/vaadin/terminal/gwt/client/communication/URLReference_Serializer.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.communication; diff --git a/src/com/vaadin/terminal/gwt/client/extensions/AbstractExtensionConnector.java b/client/src/com/vaadin/terminal/gwt/client/extensions/AbstractExtensionConnector.java index 408f03f6cb..dabbfe22f0 100644 --- a/src/com/vaadin/terminal/gwt/client/extensions/AbstractExtensionConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/extensions/AbstractExtensionConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.extensions; diff --git a/src/com/vaadin/terminal/gwt/client/extensions/javascriptmanager/JavaScriptManagerConnector.java b/client/src/com/vaadin/terminal/gwt/client/extensions/javascriptmanager/JavaScriptManagerConnector.java index d5849096fa..5cc5911bb1 100644 --- a/src/com/vaadin/terminal/gwt/client/extensions/javascriptmanager/JavaScriptManagerConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/extensions/javascriptmanager/JavaScriptManagerConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.extensions.javascriptmanager; diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractClickEventHandler.java b/client/src/com/vaadin/terminal/gwt/client/ui/AbstractClickEventHandler.java index 9de465e4a5..e7060f1c6d 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/AbstractClickEventHandler.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/AbstractClickEventHandler.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java index ba3a53691a..48842e29a0 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentContainerConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentContainerConnector.java index 6b294e65b8..16eab60a75 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentContainerConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentContainerConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/AbstractConnector.java index 1a504b7a75..514f63fdd8 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/AbstractConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/AbstractConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; @@ -26,7 +38,6 @@ import com.vaadin.terminal.gwt.client.communication.StateChangeEvent.StateChange * An abstract implementation of Connector. * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 * */ diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractFieldConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/AbstractFieldConnector.java index 4611b5a4ed..c007eb8529 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/AbstractFieldConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/AbstractFieldConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/AbstractLayoutConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/AbstractLayoutConnector.java new file mode 100644 index 0000000000..b8a16d697d --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/AbstractLayoutConnector.java @@ -0,0 +1,27 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client.ui; + +import com.vaadin.shared.ui.AbstractLayoutState; + +public abstract class AbstractLayoutConnector extends + AbstractComponentContainerConnector { + + @Override + public AbstractLayoutState getState() { + return (AbstractLayoutState) super.getState(); + } +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/Action.java b/client/src/com/vaadin/terminal/gwt/client/ui/Action.java index 1a92e30f3f..b97599c872 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/Action.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/Action.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/ActionOwner.java b/client/src/com/vaadin/terminal/gwt/client/ui/ActionOwner.java new file mode 100644 index 0000000000..bb714d1081 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/ActionOwner.java @@ -0,0 +1,31 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client.ui; + +import com.vaadin.terminal.gwt.client.ApplicationConnection; + +public interface ActionOwner { + + /** + * @return Array of IActions + */ + public Action[] getActions(); + + public ApplicationConnection getClient(); + + public String getPaintableId(); + +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/CalendarEntry.java b/client/src/com/vaadin/terminal/gwt/client/ui/CalendarEntry.java index 1577d60ab7..72c7bea806 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/CalendarEntry.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/CalendarEntry.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/ClickEventHandler.java b/client/src/com/vaadin/terminal/gwt/client/ui/ClickEventHandler.java index b7b6b13d3c..5614837615 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/ClickEventHandler.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/ClickEventHandler.java @@ -1,19 +1,30 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; import com.google.gwt.dom.client.NativeEvent; +import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; import com.vaadin.terminal.gwt.client.ComponentConnector; import com.vaadin.terminal.gwt.client.MouseEventDetailsBuilder; public abstract class ClickEventHandler extends AbstractClickEventHandler { - public static final String CLICK_EVENT_IDENTIFIER = "click"; - public ClickEventHandler(ComponentConnector connector) { - this(connector, CLICK_EVENT_IDENTIFIER); + this(connector, EventId.CLICK_EVENT_IDENTIFIER); } public ClickEventHandler(ComponentConnector connector, diff --git a/src/com/vaadin/terminal/gwt/client/ui/ConnectorClassBasedFactory.java b/client/src/com/vaadin/terminal/gwt/client/ui/ConnectorClassBasedFactory.java index 79dc138df9..698d8e6e61 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/ConnectorClassBasedFactory.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/ConnectorClassBasedFactory.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/ConnectorStateFactory.java b/client/src/com/vaadin/terminal/gwt/client/ui/ConnectorStateFactory.java index 535fd29dfe..b04daa6910 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/ConnectorStateFactory.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/ConnectorStateFactory.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/ConnectorWidgetFactory.java b/client/src/com/vaadin/terminal/gwt/client/ui/ConnectorWidgetFactory.java index 03d2069a94..073e36cabb 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/ConnectorWidgetFactory.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/ConnectorWidgetFactory.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/Field.java b/client/src/com/vaadin/terminal/gwt/client/ui/Field.java new file mode 100644 index 0000000000..b81e365608 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/Field.java @@ -0,0 +1,28 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +/** + * + */ +package com.vaadin.terminal.gwt.client.ui; + +/** + * This interface indicates that the component is a Field (serverside), and + * wants (for instance) to automatically get the v-modified classname. + * + */ +public interface Field { + +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java b/client/src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java index 4984c4ce3b..6a86ab5679 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/FocusableFlexTable.java b/client/src/com/vaadin/terminal/gwt/client/ui/FocusableFlexTable.java index 2fac234587..8ad7002a79 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/FocusableFlexTable.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/FocusableFlexTable.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/FocusableFlowPanel.java b/client/src/com/vaadin/terminal/gwt/client/ui/FocusableFlowPanel.java index 258fe441af..c162a750ce 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/FocusableFlowPanel.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/FocusableFlowPanel.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java b/client/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java index 0ba42eb861..d20b3e9e65 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/Icon.java b/client/src/com/vaadin/terminal/gwt/client/ui/Icon.java index b64605aac9..21ee5bea93 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/Icon.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/Icon.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/JavaScriptComponentConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/JavaScriptComponentConnector.java index 380d96115c..4ab7c45161 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/JavaScriptComponentConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/JavaScriptComponentConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/JavaScriptWidget.java b/client/src/com/vaadin/terminal/gwt/client/ui/JavaScriptWidget.java index e6c3323893..8e59115671 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/JavaScriptWidget.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/JavaScriptWidget.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/LayoutClickEventHandler.java b/client/src/com/vaadin/terminal/gwt/client/ui/LayoutClickEventHandler.java index 9aafaa0bbf..63c3c84ce4 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/LayoutClickEventHandler.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/LayoutClickEventHandler.java @@ -1,10 +1,23 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; import com.google.gwt.dom.client.NativeEvent; import com.google.gwt.user.client.Element; +import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.LayoutClickRpc; import com.vaadin.terminal.gwt.client.ComponentConnector; @@ -12,10 +25,8 @@ import com.vaadin.terminal.gwt.client.MouseEventDetailsBuilder; public abstract class LayoutClickEventHandler extends AbstractClickEventHandler { - public static final String LAYOUT_CLICK_EVENT_IDENTIFIER = "lClick"; - public LayoutClickEventHandler(ComponentConnector connector) { - this(connector, LAYOUT_CLICK_EVENT_IDENTIFIER); + this(connector, EventId.LAYOUT_CLICK_EVENT_IDENTIFIER); } public LayoutClickEventHandler(ComponentConnector connector, diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/ManagedLayout.java b/client/src/com/vaadin/terminal/gwt/client/ui/ManagedLayout.java new file mode 100644 index 0000000000..bdb01113d6 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/ManagedLayout.java @@ -0,0 +1,22 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client.ui; + +import com.vaadin.terminal.gwt.client.ComponentConnector; + +public interface ManagedLayout extends ComponentConnector { + +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/MediaBaseConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/MediaBaseConnector.java index ccf90b2285..2f52971aeb 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/MediaBaseConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/MediaBaseConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/PostLayoutListener.java b/client/src/com/vaadin/terminal/gwt/client/ui/PostLayoutListener.java new file mode 100644 index 0000000000..a56c464ad2 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/PostLayoutListener.java @@ -0,0 +1,20 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client.ui; + +public interface PostLayoutListener { + public void postLayout(); +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java b/client/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java index 40454345bc..65ea7579fd 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/SimpleFocusablePanel.java b/client/src/com/vaadin/terminal/gwt/client/ui/SimpleFocusablePanel.java index ec62b82ce1..d76d6c14f3 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/SimpleFocusablePanel.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/SimpleFocusablePanel.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/SimpleManagedLayout.java b/client/src/com/vaadin/terminal/gwt/client/ui/SimpleManagedLayout.java new file mode 100644 index 0000000000..1b404b5fb0 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/SimpleManagedLayout.java @@ -0,0 +1,20 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client.ui; + +public interface SimpleManagedLayout extends ManagedLayout { + public void layout(); +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/SubPartAware.java b/client/src/com/vaadin/terminal/gwt/client/ui/SubPartAware.java index e7fcf8d424..145d03287f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/SubPartAware.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/SubPartAware.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/TouchScrollDelegate.java b/client/src/com/vaadin/terminal/gwt/client/ui/TouchScrollDelegate.java index 16c32acecc..4838576c41 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/TouchScrollDelegate.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/TouchScrollDelegate.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/TreeAction.java b/client/src/com/vaadin/terminal/gwt/client/ui/TreeAction.java index 9efe369644..9cf63a609c 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/TreeAction.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/TreeAction.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/TreeImages.java b/client/src/com/vaadin/terminal/gwt/client/ui/TreeImages.java index 221a409511..9b03c03794 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/TreeImages.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/TreeImages.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/UnknownComponentConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/UnknownComponentConnector.java index 83ac97458e..aaf37d0345 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/UnknownComponentConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/UnknownComponentConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java b/client/src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java index 607abe893a..cf4f772bc9 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VLazyExecutor.java b/client/src/com/vaadin/terminal/gwt/client/ui/VLazyExecutor.java index aac8ca5ee7..85ee27a36a 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VLazyExecutor.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/VLazyExecutor.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMediaBase.java b/client/src/com/vaadin/terminal/gwt/client/ui/VMediaBase.java index 40696ccec5..9d83dde3d6 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VMediaBase.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/VMediaBase.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java b/client/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java index d5ae77b442..aef21ac737 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VUnknownComponent.java b/client/src/com/vaadin/terminal/gwt/client/ui/VUnknownComponent.java index 7bcdcec660..f4c925a313 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VUnknownComponent.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/VUnknownComponent.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/Vaadin6Connector.java b/client/src/com/vaadin/terminal/gwt/client/ui/Vaadin6Connector.java new file mode 100644 index 0000000000..8d743bb10b --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/Vaadin6Connector.java @@ -0,0 +1,30 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client.ui; + +import com.vaadin.terminal.gwt.client.ApplicationConnection; +import com.vaadin.terminal.gwt.client.Paintable; +import com.vaadin.terminal.gwt.client.UIDL; + +public abstract class Vaadin6Connector extends AbstractComponentConnector + implements Paintable { + + @Override + public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { + ((Paintable) getWidget()).updateFromUIDL(uidl, client); + } + +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java index 188d464b84..85de558f98 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.absolutelayout; diff --git a/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/VAbsoluteLayout.java b/client/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/VAbsoluteLayout.java index e2cb629d68..8c572417df 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/VAbsoluteLayout.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/VAbsoluteLayout.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.absolutelayout; diff --git a/src/com/vaadin/terminal/gwt/client/ui/accordion/AccordionConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/accordion/AccordionConnector.java index 7ff1257da3..b107f41285 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/accordion/AccordionConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/accordion/AccordionConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.accordion; diff --git a/src/com/vaadin/terminal/gwt/client/ui/accordion/VAccordion.java b/client/src/com/vaadin/terminal/gwt/client/ui/accordion/VAccordion.java index d9320787e8..d911dc66f3 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/accordion/VAccordion.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/accordion/VAccordion.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.accordion; @@ -15,6 +27,7 @@ import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Event; import com.google.gwt.user.client.ui.ComplexPanel; import com.google.gwt.user.client.ui.Widget; +import com.vaadin.shared.ui.tabsheet.TabsheetBaseConstants; import com.vaadin.terminal.gwt.client.ComponentConnector; import com.vaadin.terminal.gwt.client.ConnectorMap; import com.vaadin.terminal.gwt.client.UIDL; @@ -22,7 +35,6 @@ import com.vaadin.terminal.gwt.client.Util; import com.vaadin.terminal.gwt.client.VCaption; import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate; import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate.TouchScrollHandler; -import com.vaadin.terminal.gwt.client.ui.tabsheet.TabsheetBaseConnector; import com.vaadin.terminal.gwt.client.ui.tabsheet.VTabsheetBase; public class VAccordion extends VTabsheetBase { @@ -442,11 +454,11 @@ public class VAccordion extends VTabsheetBase { public void updateCaption(UIDL uidl) { // TODO need to call this because the caption does not have an owner caption.updateCaptionWithoutOwner( - uidl.getStringAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_CAPTION), - uidl.hasAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_DISABLED), - uidl.hasAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_DESCRIPTION), - uidl.hasAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_ERROR_MESSAGE), - uidl.getStringAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_ICON)); + uidl.getStringAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_CAPTION), + uidl.hasAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_DISABLED), + uidl.hasAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_DESCRIPTION), + uidl.hasAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_ERROR_MESSAGE), + uidl.getStringAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_ICON)); } public int getWidgetWidth() { diff --git a/src/com/vaadin/terminal/gwt/client/ui/audio/AudioConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/audio/AudioConnector.java index 6b713c229c..df08e44f16 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/audio/AudioConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/audio/AudioConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.audio; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/audio/VAudio.java b/client/src/com/vaadin/terminal/gwt/client/ui/audio/VAudio.java new file mode 100644 index 0000000000..121ad3cc94 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/audio/VAudio.java @@ -0,0 +1,34 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.client.ui.audio; + +import com.google.gwt.dom.client.AudioElement; +import com.google.gwt.dom.client.Document; +import com.vaadin.terminal.gwt.client.ui.VMediaBase; + +public class VAudio extends VMediaBase { + private static String CLASSNAME = "v-audio"; + + private AudioElement audio; + + public VAudio() { + audio = Document.get().createAudioElement(); + setMediaElement(audio); + setStyleName(CLASSNAME); + } + +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/button/ButtonConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/button/ButtonConnector.java index 0cec6ce96b..59e187014c 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/button/ButtonConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/button/ButtonConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.button; diff --git a/src/com/vaadin/terminal/gwt/client/ui/button/VButton.java b/client/src/com/vaadin/terminal/gwt/client/ui/button/VButton.java index 3232338f62..baacac08ed 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/button/VButton.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/button/VButton.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.button; diff --git a/src/com/vaadin/terminal/gwt/client/ui/checkbox/CheckBoxConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/checkbox/CheckBoxConnector.java index c7e827bc74..7968a04b5e 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/checkbox/CheckBoxConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/checkbox/CheckBoxConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.checkbox; diff --git a/src/com/vaadin/terminal/gwt/client/ui/checkbox/VCheckBox.java b/client/src/com/vaadin/terminal/gwt/client/ui/checkbox/VCheckBox.java index a6eec2de8a..c796b440f3 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/checkbox/VCheckBox.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/checkbox/VCheckBox.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.checkbox; diff --git a/src/com/vaadin/terminal/gwt/client/ui/combobox/ComboBoxConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/combobox/ComboBoxConnector.java index 0fa71bb7a6..7be8a1e139 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/combobox/ComboBoxConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/combobox/ComboBoxConnector.java @@ -1,11 +1,24 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.combobox; import java.util.Iterator; import com.vaadin.shared.ui.Connect; +import com.vaadin.shared.ui.combobox.ComboBoxConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.Paintable; import com.vaadin.terminal.gwt.client.UIDL; @@ -46,8 +59,8 @@ public class ComboBoxConnector extends AbstractFieldConnector implements // Inverse logic here to make the default case (text input enabled) // work without additional UIDL messages boolean noTextInput = uidl - .hasAttribute(VFilterSelect.ATTR_NO_TEXT_INPUT) - && uidl.getBooleanAttribute(VFilterSelect.ATTR_NO_TEXT_INPUT); + .hasAttribute(ComboBoxConstants.ATTR_NO_TEXT_INPUT) + && uidl.getBooleanAttribute(ComboBoxConstants.ATTR_NO_TEXT_INPUT); getWidget().setTextInputEnabled(!noTextInput); // not a FocusWidget -> needs own tabindex handling @@ -72,10 +85,10 @@ public class ComboBoxConnector extends AbstractFieldConnector implements getWidget().pageLength = uidl.getIntAttribute("pagelength"); } - if (uidl.hasAttribute(VFilterSelect.ATTR_INPUTPROMPT)) { + if (uidl.hasAttribute(ComboBoxConstants.ATTR_INPUTPROMPT)) { // input prompt changed from server getWidget().inputPrompt = uidl - .getStringAttribute(VFilterSelect.ATTR_INPUTPROMPT); + .getStringAttribute(ComboBoxConstants.ATTR_INPUTPROMPT); } else { getWidget().inputPrompt = ""; } diff --git a/src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java b/client/src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java index 6e24a74e04..5f5826526c 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.combobox; @@ -919,8 +931,6 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, // shown in unfocused empty field, disappears on focus (e.g "Search here") private static final String CLASSNAME_PROMPT = "prompt"; - protected static final String ATTR_INPUTPROMPT = "prompt"; - public static final String ATTR_NO_TEXT_INPUT = "noInput"; protected String inputPrompt = ""; protected boolean prompting = false; @@ -1688,9 +1698,9 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, @Override public Element getSubPartElement(String subPart) { if ("textbox".equals(subPart)) { - return this.tb.getElement(); + return tb.getElement(); } else if ("button".equals(subPart)) { - return this.popupOpener.getElement(); + return popupOpener.getElement(); } return null; } diff --git a/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java index 7d07172cd1..47c2049a67 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.csslayout; diff --git a/src/com/vaadin/terminal/gwt/client/ui/csslayout/VCssLayout.java b/client/src/com/vaadin/terminal/gwt/client/ui/csslayout/VCssLayout.java index 53f8ca6c8a..813e95e3ed 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/csslayout/VCssLayout.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/csslayout/VCssLayout.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.csslayout; diff --git a/src/com/vaadin/terminal/gwt/client/ui/customcomponent/CustomComponentConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/customcomponent/CustomComponentConnector.java index f7740a9205..0557b10437 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/customcomponent/CustomComponentConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/customcomponent/CustomComponentConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.customcomponent; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/customcomponent/VCustomComponent.java b/client/src/com/vaadin/terminal/gwt/client/ui/customcomponent/VCustomComponent.java new file mode 100644 index 0000000000..854f7c161e --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/customcomponent/VCustomComponent.java @@ -0,0 +1,30 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.client.ui.customcomponent; + +import com.google.gwt.user.client.ui.SimplePanel; + +public class VCustomComponent extends SimplePanel { + + private static final String CLASSNAME = "v-customcomponent"; + + public VCustomComponent() { + super(); + setStyleName(CLASSNAME); + } + +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/customfield/CustomFieldConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/customfield/CustomFieldConnector.java index b4f42c36aa..4120168f62 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/customfield/CustomFieldConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/customfield/CustomFieldConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.customfield; diff --git a/src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutConnector.java index 9d973227d1..1e5cbd0502 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.customlayout; diff --git a/src/com/vaadin/terminal/gwt/client/ui/customlayout/VCustomLayout.java b/client/src/com/vaadin/terminal/gwt/client/ui/customlayout/VCustomLayout.java index b4194c40a6..6fd8b19e7c 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/customlayout/VCustomLayout.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/customlayout/VCustomLayout.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.customlayout; diff --git a/src/com/vaadin/terminal/gwt/client/ui/datefield/AbstractDateFieldConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/datefield/AbstractDateFieldConnector.java index 159b5bc414..791849b067 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/datefield/AbstractDateFieldConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/datefield/AbstractDateFieldConnector.java @@ -1,10 +1,23 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.datefield; import java.util.Date; +import com.vaadin.shared.ui.datefield.DateFieldConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.LocaleNotLoadedException; import com.vaadin.terminal.gwt.client.Paintable; @@ -46,7 +59,7 @@ public class AbstractDateFieldConnector extends AbstractFieldConnector // We show week numbers only if the week starts with Monday, as ISO 8601 // specifies getWidget().showISOWeekNumbers = uidl - .getBooleanAttribute(VDateField.WEEK_NUMBERS) + .getBooleanAttribute(DateFieldConstants.ATTR_WEEK_NUMBERS) && getWidget().dts.getFirstDayOfWeek() == 1; int newResolution; diff --git a/src/com/vaadin/terminal/gwt/client/ui/datefield/InlineDateFieldConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/datefield/InlineDateFieldConnector.java index 304c75322a..52f10348b7 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/datefield/InlineDateFieldConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/datefield/InlineDateFieldConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.datefield; diff --git a/src/com/vaadin/terminal/gwt/client/ui/datefield/PopupDateFieldConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/datefield/PopupDateFieldConnector.java index a8c8ada1d9..6c4ec40694 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/datefield/PopupDateFieldConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/datefield/PopupDateFieldConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.datefield; diff --git a/src/com/vaadin/terminal/gwt/client/ui/datefield/TextualDateConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/datefield/TextualDateConnector.java index 32af4024cb..01c1529429 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/datefield/TextualDateConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/datefield/TextualDateConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.datefield; diff --git a/src/com/vaadin/terminal/gwt/client/ui/datefield/VCalendarPanel.java b/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VCalendarPanel.java index e4e25a5a2e..b61ce5dbf3 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/datefield/VCalendarPanel.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VCalendarPanel.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.datefield; diff --git a/src/com/vaadin/terminal/gwt/client/ui/datefield/VDateField.java b/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VDateField.java index 614c4febdd..a339fb36d0 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/datefield/VDateField.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VDateField.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.datefield; @@ -28,8 +40,6 @@ public class VDateField extends FlowPanel implements Field { public static final int RESOLUTION_MIN = 16; public static final int RESOLUTION_SEC = 32; - public static final String WEEK_NUMBERS = "wn"; - static String resolutionToString(int res) { if (res > RESOLUTION_DAY) { return "full"; diff --git a/src/com/vaadin/terminal/gwt/client/ui/datefield/VDateFieldCalendar.java b/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VDateFieldCalendar.java index e411fb3013..42640f0c0b 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/datefield/VDateFieldCalendar.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VDateFieldCalendar.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.datefield; diff --git a/src/com/vaadin/terminal/gwt/client/ui/datefield/VPopupCalendar.java b/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VPopupCalendar.java index de6ebf29af..b7e0a2fb4e 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/datefield/VPopupCalendar.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VPopupCalendar.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.datefield; diff --git a/src/com/vaadin/terminal/gwt/client/ui/datefield/VTextualDate.java b/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VTextualDate.java index 8c252ddc69..4e82058f68 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/datefield/VTextualDate.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VTextualDate.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.datefield; diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/DDUtil.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/DDUtil.java index f9ec8a2f48..b6012eded1 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/DDUtil.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/DDUtil.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.dd; diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VAbstractDropHandler.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAbstractDropHandler.java index ce0533ac1f..bf0ab24c32 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VAbstractDropHandler.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAbstractDropHandler.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.dd; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptAll.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptAll.java new file mode 100644 index 0000000000..661e47c506 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptAll.java @@ -0,0 +1,32 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +/** + * + */ +package com.vaadin.terminal.gwt.client.ui.dd; + +import com.vaadin.event.dd.acceptcriteria.AcceptAll; +import com.vaadin.shared.ui.dd.AcceptCriterion; +import com.vaadin.terminal.gwt.client.UIDL; + +@AcceptCriterion(AcceptAll.class) +final public class VAcceptAll extends VAcceptCriterion { + + @Override + protected boolean accept(VDragEvent drag, UIDL configuration) { + return true; + } +}
\ No newline at end of file diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCallback.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCallback.java new file mode 100644 index 0000000000..a8b3518406 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCallback.java @@ -0,0 +1,29 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client.ui.dd; + +public interface VAcceptCallback { + + /** + * This method is called by {@link VDragAndDropManager} if the + * {@link VDragEvent} is still active. Developer can update for example drag + * icon or empahsis the target if the target accepts the transferable. If + * the drag and drop operation ends or the {@link VAbstractDropHandler} has + * changed before response arrives, the method is never called. + */ + public void accepted(VDragEvent event); + +} diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriteria.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriteria.java new file mode 100644 index 0000000000..05330c2187 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriteria.java @@ -0,0 +1,34 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client.ui.dd; + +import com.google.gwt.core.client.GWT; + +/** + * A class via all AcceptCriteria instances are fetched by an identifier. + */ +public class VAcceptCriteria { + private static VAcceptCriterionFactory impl; + + static { + impl = GWT.create(VAcceptCriterionFactory.class); + } + + public static VAcceptCriterion get(String name) { + return impl.get(name); + } + +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterion.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterion.java index b1a88166ec..6d3bda9676 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterion.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterion.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.dd; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterionFactory.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterionFactory.java new file mode 100644 index 0000000000..a0ff9ecfdf --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterionFactory.java @@ -0,0 +1,25 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client.ui.dd; + +/** + * Generated by + * {@link com.vaadin.terminal.gwt.widgetsetutils.AcceptCriteriaFactoryGenerator} + */ +public abstract class VAcceptCriterionFactory { + + public abstract VAcceptCriterion get(String name); +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VAnd.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAnd.java index 2f0cdc2a80..8eb72712ef 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VAnd.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAnd.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ /** * diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VContainsDataFlavor.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VContainsDataFlavor.java new file mode 100644 index 0000000000..f06aa7eb15 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VContainsDataFlavor.java @@ -0,0 +1,33 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +/** + * + */ +package com.vaadin.terminal.gwt.client.ui.dd; + +import com.vaadin.event.dd.acceptcriteria.ContainsDataFlavor; +import com.vaadin.shared.ui.dd.AcceptCriterion; +import com.vaadin.terminal.gwt.client.UIDL; + +@AcceptCriterion(ContainsDataFlavor.class) +final public class VContainsDataFlavor extends VAcceptCriterion { + + @Override + protected boolean accept(VDragEvent drag, UIDL configuration) { + String name = configuration.getStringAttribute("p"); + return drag.getTransferable().getDataFlavors().contains(name); + } +}
\ No newline at end of file diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java index bc98860716..82592d1846 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.dd; @@ -22,6 +34,7 @@ import com.google.gwt.user.client.Event.NativePreviewHandler; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.Widget; +import com.vaadin.shared.ApplicationConstants; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.dd.DragEventType; import com.vaadin.terminal.gwt.client.ApplicationConnection; @@ -225,8 +238,6 @@ public class VDragAndDropManager { } - public static final String DD_SERVICE = "DD"; - private static VDragAndDropManager instance; private HandlerRegistration handlerRegistration; private VDragEvent currentDrag; @@ -598,17 +609,20 @@ public class VDragAndDropManager { * Transferable is sent on each request) */ visitId++; - client.updateVariable(DD_SERVICE, "visitId", visitId, false); - client.updateVariable(DD_SERVICE, "eventId", currentDrag.getEventId(), - false); - client.updateVariable(DD_SERVICE, "dhowner", paintable, false); + client.updateVariable(ApplicationConstants.DRAG_AND_DROP_CONNECTOR_ID, + "visitId", visitId, false); + client.updateVariable(ApplicationConstants.DRAG_AND_DROP_CONNECTOR_ID, + "eventId", currentDrag.getEventId(), false); + client.updateVariable(ApplicationConstants.DRAG_AND_DROP_CONNECTOR_ID, + "dhowner", paintable, false); VTransferable transferable = currentDrag.getTransferable(); - client.updateVariable(DD_SERVICE, "component", - transferable.getDragSource(), false); + client.updateVariable(ApplicationConstants.DRAG_AND_DROP_CONNECTOR_ID, + "component", transferable.getDragSource(), false); - client.updateVariable(DD_SERVICE, "type", drop.ordinal(), false); + client.updateVariable(ApplicationConstants.DRAG_AND_DROP_CONNECTOR_ID, + "type", drop.ordinal(), false); if (currentDrag.getCurrentGwtEvent() != null) { try { @@ -624,11 +638,11 @@ public class VDragAndDropManager { } else { currentDrag.getDropDetails().put("mouseEvent", null); } - client.updateVariable(DD_SERVICE, "evt", currentDrag.getDropDetails(), - false); + client.updateVariable(ApplicationConstants.DRAG_AND_DROP_CONNECTOR_ID, + "evt", currentDrag.getDropDetails(), false); - client.updateVariable(DD_SERVICE, "tra", transferable.getVariableMap(), - true); + client.updateVariable(ApplicationConstants.DRAG_AND_DROP_CONNECTOR_ID, + "tra", transferable.getVariableMap(), true); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragEvent.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VDragEvent.java index cece2720d0..7b3950f64f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragEvent.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VDragEvent.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.dd; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VDragEventServerCallback.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VDragEventServerCallback.java new file mode 100644 index 0000000000..00fe2d2659 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VDragEventServerCallback.java @@ -0,0 +1,24 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client.ui.dd; + +import com.vaadin.terminal.gwt.client.UIDL; + +public interface VDragEventServerCallback { + + public void handleResponse(boolean accepted, UIDL response); + +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragSourceIs.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VDragSourceIs.java index ffb923f3e0..e812ca8117 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragSourceIs.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VDragSourceIs.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.dd; diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VDropHandler.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VDropHandler.java index 92bd6abe61..ddc3af9931 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VDropHandler.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VDropHandler.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.dd; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VHasDropHandler.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VHasDropHandler.java new file mode 100644 index 0000000000..01c57741d8 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VHasDropHandler.java @@ -0,0 +1,29 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client.ui.dd; + +import com.vaadin.terminal.gwt.client.ComponentConnector; + +/** + * Used to detect Widget from widget tree that has {@link #getDropHandler()} + * + * Decide whether to get rid of this class. If so, {@link VAbstractDropHandler} + * must extend {@link ComponentConnector}. + * + */ +public interface VHasDropHandler { + public VDropHandler getDropHandler(); +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VHtml5DragEvent.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VHtml5DragEvent.java index 7bdb291e44..32abc787da 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VHtml5DragEvent.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VHtml5DragEvent.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.dd; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VHtml5File.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VHtml5File.java new file mode 100644 index 0000000000..961008c860 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VHtml5File.java @@ -0,0 +1,43 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client.ui.dd; + +import com.google.gwt.core.client.JavaScriptObject; + +/** + * Wrapper for html5 File object. + */ +public class VHtml5File extends JavaScriptObject { + + protected VHtml5File() { + }; + + public native final String getName() + /*-{ + return this.name; + }-*/; + + public native final String getType() + /*-{ + return this.type; + }-*/; + + public native final int getSize() + /*-{ + return this.size ? this.size : 0; + }-*/; + +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VIsOverId.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VIsOverId.java index d0055d48dd..c9bf630658 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VIsOverId.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VIsOverId.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ /** * diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VItemIdIs.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VItemIdIs.java index 67f323a950..4f6aca082b 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VItemIdIs.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VItemIdIs.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ /** * diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VLazyInitItemIdentifiers.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VLazyInitItemIdentifiers.java index bfda603d58..ad028b7198 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VLazyInitItemIdentifiers.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VLazyInitItemIdentifiers.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ /** * diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VNot.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VNot.java index 8355afc625..662b1c2da2 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VNot.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VNot.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ /** * diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VOr.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VOr.java index 46bf28b42a..b51800e31f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VOr.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VOr.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ /** * diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VOverTreeNode.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VOverTreeNode.java new file mode 100644 index 0000000000..77fd89c123 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VOverTreeNode.java @@ -0,0 +1,31 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +/** + * + */ +package com.vaadin.terminal.gwt.client.ui.dd; + +import com.vaadin.terminal.gwt.client.UIDL; + +final public class VOverTreeNode extends VAcceptCriterion { + + @Override + protected boolean accept(VDragEvent drag, UIDL configuration) { + Boolean containsKey = (Boolean) drag.getDropDetails().get( + "itemIdOverIsNode"); + return containsKey != null && containsKey.booleanValue(); + } +}
\ No newline at end of file diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VServerAccept.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VServerAccept.java index 42d4d90ae4..eee0f47a91 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VServerAccept.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VServerAccept.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ /** * diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VSourceIsTarget.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VSourceIsTarget.java index dcb2f405fa..21e6ab130a 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VSourceIsTarget.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VSourceIsTarget.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ /** * diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VTargetDetailIs.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VTargetDetailIs.java index e67d81387c..8c6c522be4 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VTargetDetailIs.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VTargetDetailIs.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ /** * diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VTargetInSubtree.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VTargetInSubtree.java index 14bca0ed91..56421a6ed7 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VTargetInSubtree.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VTargetInSubtree.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ /** * diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VTransferable.java b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VTransferable.java index f87da378d7..12cd1ed598 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VTransferable.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/dd/VTransferable.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.dd; diff --git a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_alignment.png b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_alignment.png Binary files differindex 49b918ec0c..49b918ec0c 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_alignment.png +++ b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_alignment.png diff --git a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_component_handles_the_caption.png b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_component_handles_the_caption.png Binary files differindex 9fd6635765..9fd6635765 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_component_handles_the_caption.png +++ b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_component_handles_the_caption.png diff --git a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_h150.png b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_h150.png Binary files differindex 7cd07369dc..7cd07369dc 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_h150.png +++ b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_h150.png diff --git a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_horizontal.png b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_horizontal.png Binary files differindex c2e1f49efe..c2e1f49efe 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_horizontal.png +++ b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_horizontal.png diff --git a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_horizontal_spacing.png b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_horizontal_spacing.png Binary files differindex 417c9aecfd..417c9aecfd 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_horizontal_spacing.png +++ b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_horizontal_spacing.png diff --git a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_margin.png b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_margin.png Binary files differindex 2f1e461b0a..2f1e461b0a 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_margin.png +++ b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_margin.png diff --git a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_no_caption.png b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_no_caption.png Binary files differindex 63984cdee7..63984cdee7 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_no_caption.png +++ b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_no_caption.png diff --git a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_normal_caption.png b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_normal_caption.png Binary files differindex 1e730c072b..1e730c072b 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_normal_caption.png +++ b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_normal_caption.png diff --git a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_special-margin.png b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_special-margin.png Binary files differindex 34e47d1551..34e47d1551 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_special-margin.png +++ b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_special-margin.png diff --git a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_vertical.png b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_vertical.png Binary files differindex 99e3709acc..99e3709acc 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_vertical.png +++ b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_vertical.png diff --git a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_vertical_spacing.png b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_vertical_spacing.png Binary files differindex be9a4cd8c5..be9a4cd8c5 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_vertical_spacing.png +++ b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_vertical_spacing.png diff --git a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_w300.png b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_w300.png Binary files differindex 0b555ad1e7..0b555ad1e7 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_w300.png +++ b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_w300.png diff --git a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_w300_h150.png b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_w300_h150.png Binary files differindex 8ff42ed0f4..8ff42ed0f4 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_w300_h150.png +++ b/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_w300_h150.png diff --git a/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java index 6914b451fa..7542754e58 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.draganddropwrapper; @@ -7,6 +19,7 @@ import java.util.HashMap; import java.util.Set; import com.vaadin.shared.ui.Connect; +import com.vaadin.shared.ui.draganddropwrapper.DragAndDropWrapperConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.Paintable; import com.vaadin.terminal.gwt.client.UIDL; @@ -54,10 +67,10 @@ public class DragAndDropWrapperConnector extends CustomComponentConnector getWidget().startNextUpload(); getWidget().dragStartMode = uidl - .getIntAttribute(VDragAndDropWrapper.DRAG_START_MODE); + .getIntAttribute(DragAndDropWrapperConstants.DRAG_START_MODE); getWidget().initDragStartMode(); getWidget().html5DataFlavors = uidl - .getMapAttribute(VDragAndDropWrapper.HTML5_DATA_FLAVORS); + .getMapAttribute(DragAndDropWrapperConstants.HTML5_DATA_FLAVORS); // Used to prevent wrapper from stealing tooltips when not defined getWidget().hasTooltip = getState().hasDescription(); diff --git a/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java b/client/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java index e77055764e..7d38624f22 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.draganddropwrapper; @@ -53,8 +65,6 @@ import com.vaadin.terminal.gwt.client.ui.dd.VTransferable; */ public class VDragAndDropWrapper extends VCustomComponent implements VHasDropHandler { - public static final String DRAG_START_MODE = "dragStartMode"; - public static final String HTML5_DATA_FLAVORS = "html5-data-flavors"; private static final String CLASSNAME = "v-ddwrapper"; protected static final String DRAGGABLE = "draggable"; diff --git a/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapperIE.java b/client/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapperIE.java index bb511524e5..fc9829d387 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapperIE.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapperIE.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.draganddropwrapper; diff --git a/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java index a1851d9c84..5c95f9f554 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.embedded; @@ -17,6 +29,7 @@ import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Event; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.Connect; +import com.vaadin.shared.ui.embedded.EmbeddedConstants; import com.vaadin.shared.ui.embedded.EmbeddedServerRpc; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.Paintable; @@ -32,8 +45,6 @@ import com.vaadin.ui.Embedded; public class EmbeddedConnector extends AbstractComponentConnector implements Paintable { - public static final String ALTERNATE_TEXT = "alt"; - EmbeddedServerRpc rpc; @Override @@ -96,9 +107,10 @@ public class EmbeddedConnector extends AbstractComponentConnector implements DOM.setElementProperty(el, "src", getWidget().getSrc(uidl, client)); - if (uidl.hasAttribute(ALTERNATE_TEXT)) { - el.setPropertyString(ALTERNATE_TEXT, - uidl.getStringAttribute(ALTERNATE_TEXT)); + if (uidl.hasAttribute(EmbeddedConstants.ALTERNATE_TEXT)) { + el.setPropertyString( + EmbeddedConstants.ALTERNATE_TEXT, + uidl.getStringAttribute(EmbeddedConstants.ALTERNATE_TEXT)); } if (created) { @@ -188,8 +200,9 @@ public class EmbeddedConnector extends AbstractComponentConnector implements uidl.getStringAttribute("standby")); } getWidget().getElement().appendChild(obj); - if (uidl.hasAttribute(ALTERNATE_TEXT)) { - obj.setInnerText(uidl.getStringAttribute(ALTERNATE_TEXT)); + if (uidl.hasAttribute(EmbeddedConstants.ALTERNATE_TEXT)) { + obj.setInnerText(uidl + .getStringAttribute(EmbeddedConstants.ALTERNATE_TEXT)); } } else { VConsole.log("Unknown Embedded mimetype '" + mime + "'"); diff --git a/src/com/vaadin/terminal/gwt/client/ui/embedded/VEmbedded.java b/client/src/com/vaadin/terminal/gwt/client/ui/embedded/VEmbedded.java index 1d2a5a156a..dca4686a5c 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/embedded/VEmbedded.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/embedded/VEmbedded.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.embedded; @@ -12,6 +24,7 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Event; import com.google.gwt.user.client.ui.HTML; +import com.vaadin.shared.ui.embedded.EmbeddedConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.ComponentConnector; @@ -153,9 +166,9 @@ public class VEmbedded extends HTML { // End embed tag html.append("></embed>"); - if (uidl.hasAttribute(EmbeddedConnector.ALTERNATE_TEXT)) { + if (uidl.hasAttribute(EmbeddedConstants.ALTERNATE_TEXT)) { html.append(uidl - .getStringAttribute(EmbeddedConnector.ALTERNATE_TEXT)); + .getStringAttribute(EmbeddedConstants.ALTERNATE_TEXT)); } // End object tag diff --git a/src/com/vaadin/terminal/gwt/client/ui/form/FormConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/form/FormConnector.java index e31de1f85d..a38a67f84b 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/form/FormConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/form/FormConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.form; diff --git a/src/com/vaadin/terminal/gwt/client/ui/form/VForm.java b/client/src/com/vaadin/terminal/gwt/client/ui/form/VForm.java index 823b0e83ae..8cd7139eed 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/form/VForm.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/form/VForm.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.form; diff --git a/src/com/vaadin/terminal/gwt/client/ui/formlayout/FormLayoutConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/formlayout/FormLayoutConnector.java index 567513d7fe..7d5edfadf5 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/formlayout/FormLayoutConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/formlayout/FormLayoutConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.formlayout; diff --git a/src/com/vaadin/terminal/gwt/client/ui/formlayout/VFormLayout.java b/client/src/com/vaadin/terminal/gwt/client/ui/formlayout/VFormLayout.java index 9ecab6352c..d3ce6f3d3f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/formlayout/VFormLayout.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/formlayout/VFormLayout.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.formlayout; diff --git a/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java index 07e481d31d..520afb778d 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.gridlayout; diff --git a/src/com/vaadin/terminal/gwt/client/ui/gridlayout/VGridLayout.java b/client/src/com/vaadin/terminal/gwt/client/ui/gridlayout/VGridLayout.java index 1ea84d46cd..25d7de6ee6 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/gridlayout/VGridLayout.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/gridlayout/VGridLayout.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.gridlayout; diff --git a/src/com/vaadin/terminal/gwt/client/ui/label/LabelConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/label/LabelConnector.java index 4c6c71e037..4280db8bc9 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/label/LabelConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/label/LabelConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.label; diff --git a/src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java b/client/src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java index f0c170c6b0..dc23807166 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.label; diff --git a/src/com/vaadin/terminal/gwt/client/ui/layout/ComponentConnectorLayoutSlot.java b/client/src/com/vaadin/terminal/gwt/client/ui/layout/ComponentConnectorLayoutSlot.java index d479e8da9d..b1f381c33d 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/layout/ComponentConnectorLayoutSlot.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/layout/ComponentConnectorLayoutSlot.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.layout; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/layout/ElementResizeEvent.java b/client/src/com/vaadin/terminal/gwt/client/ui/layout/ElementResizeEvent.java new file mode 100644 index 0000000000..d9733875f3 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/layout/ElementResizeEvent.java @@ -0,0 +1,37 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client.ui.layout; + +import com.google.gwt.dom.client.Element; +import com.vaadin.terminal.gwt.client.LayoutManager; + +public class ElementResizeEvent { + private final Element element; + private final LayoutManager layoutManager; + + public ElementResizeEvent(LayoutManager layoutManager, Element element) { + this.layoutManager = layoutManager; + this.element = element; + } + + public Element getElement() { + return element; + } + + public LayoutManager getLayoutManager() { + return layoutManager; + } +} diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/layout/ElementResizeListener.java b/client/src/com/vaadin/terminal/gwt/client/ui/layout/ElementResizeListener.java new file mode 100644 index 0000000000..15b3a5517d --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/layout/ElementResizeListener.java @@ -0,0 +1,21 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.client.ui.layout; + +public interface ElementResizeListener { + public void onElementResize(ElementResizeEvent e); +}
\ No newline at end of file diff --git a/src/com/vaadin/terminal/gwt/client/ui/layout/LayoutDependencyTree.java b/client/src/com/vaadin/terminal/gwt/client/ui/layout/LayoutDependencyTree.java index cb0ed697c9..2bf789fd50 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/layout/LayoutDependencyTree.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/layout/LayoutDependencyTree.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.layout; diff --git a/src/com/vaadin/terminal/gwt/client/ui/layout/Margins.java b/client/src/com/vaadin/terminal/gwt/client/ui/layout/Margins.java index 37ca7fef37..21e35409a0 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/layout/Margins.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/layout/Margins.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.layout; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/layout/MayScrollChildren.java b/client/src/com/vaadin/terminal/gwt/client/ui/layout/MayScrollChildren.java new file mode 100644 index 0000000000..336021dbf4 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/layout/MayScrollChildren.java @@ -0,0 +1,22 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client.ui.layout; + +import com.vaadin.terminal.gwt.client.ComponentContainerConnector; + +public interface MayScrollChildren extends ComponentContainerConnector { + +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/layout/VLayoutSlot.java b/client/src/com/vaadin/terminal/gwt/client/ui/layout/VLayoutSlot.java index 5b2b1fc49b..715a24749e 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/layout/VLayoutSlot.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/layout/VLayoutSlot.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.layout; diff --git a/src/com/vaadin/terminal/gwt/client/ui/link/LinkConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/link/LinkConnector.java index 5ef641470d..c4bbcd34f7 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/link/LinkConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/link/LinkConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.link; diff --git a/src/com/vaadin/terminal/gwt/client/ui/link/VLink.java b/client/src/com/vaadin/terminal/gwt/client/ui/link/VLink.java index 4df3220ef1..e312d4d489 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/link/VLink.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/link/VLink.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.link; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/listselect/ListSelectConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/listselect/ListSelectConnector.java new file mode 100644 index 0000000000..4d34c21546 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/listselect/ListSelectConnector.java @@ -0,0 +1,30 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.client.ui.listselect; + +import com.vaadin.shared.ui.Connect; +import com.vaadin.terminal.gwt.client.ui.optiongroup.OptionGroupBaseConnector; +import com.vaadin.ui.ListSelect; + +@Connect(ListSelect.class) +public class ListSelectConnector extends OptionGroupBaseConnector { + + @Override + public VListSelect getWidget() { + return (VListSelect) super.getWidget(); + } +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/listselect/VListSelect.java b/client/src/com/vaadin/terminal/gwt/client/ui/listselect/VListSelect.java index 6f3f876fb7..06099d296c 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/listselect/VListSelect.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/listselect/VListSelect.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.listselect; diff --git a/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBar.java b/client/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBar.java index 5cb3fb83b4..c69845d33b 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBar.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBar.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.menubar; diff --git a/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBarConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBarConnector.java index 2a8923bbc0..372a420203 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBarConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBarConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.menubar; @@ -11,6 +23,7 @@ import com.google.gwt.dom.client.Element; import com.google.gwt.user.client.Command; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; +import com.vaadin.shared.ui.menubar.MenuBarConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.Paintable; import com.vaadin.terminal.gwt.client.TooltipInfo; @@ -19,11 +32,11 @@ import com.vaadin.terminal.gwt.client.Util; import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector; import com.vaadin.terminal.gwt.client.ui.Icon; import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout; -import com.vaadin.terminal.gwt.client.ui.menubar.VMenuBar.CustomMenuItem; @Connect(value = com.vaadin.ui.MenuBar.class, loadStyle = LoadStyle.LAZY) public class MenuBarConnector extends AbstractComponentConnector implements Paintable, SimpleManagedLayout { + /** * This method must be implemented to update the client-side component from * UIDL data received from server. @@ -38,10 +51,10 @@ public class MenuBarConnector extends AbstractComponentConnector implements } getWidget().htmlContentAllowed = uidl - .hasAttribute(VMenuBar.HTML_CONTENT_ALLOWED); + .hasAttribute(MenuBarConstants.HTML_CONTENT_ALLOWED); getWidget().openRootOnHover = uidl - .getBooleanAttribute(VMenuBar.OPEN_ROOT_MENU_ON_HOWER); + .getBooleanAttribute(MenuBarConstants.OPEN_ROOT_MENU_ON_HOWER); getWidget().enabled = isEnabled(); @@ -74,7 +87,7 @@ public class MenuBarConnector extends AbstractComponentConnector implements } itemHTML.append(moreItemText); - getWidget().moreItem = GWT.create(CustomMenuItem.class); + getWidget().moreItem = GWT.create(VMenuBar.CustomMenuItem.class); getWidget().moreItem.setHTML(itemHTML.toString()); getWidget().moreItem.setCommand(VMenuBar.emptyCommand); @@ -92,13 +105,13 @@ public class MenuBarConnector extends AbstractComponentConnector implements while (itr.hasNext()) { UIDL item = (UIDL) itr.next(); - CustomMenuItem currentItem = null; + VMenuBar.CustomMenuItem currentItem = null; final int itemId = item.getIntAttribute("id"); boolean itemHasCommand = item.hasAttribute("command"); boolean itemIsCheckable = item - .hasAttribute(VMenuBar.ATTRIBUTE_CHECKED); + .hasAttribute(MenuBarConstants.ATTRIBUTE_CHECKED); String itemHTML = getWidget().buildItemHTML(item); @@ -138,7 +151,7 @@ public class MenuBarConnector extends AbstractComponentConnector implements while (!itr.hasNext() && !iteratorStack.empty()) { boolean hasCheckableItem = false; - for (CustomMenuItem menuItem : currentMenu.getItems()) { + for (VMenuBar.CustomMenuItem menuItem : currentMenu.getItems()) { hasCheckableItem = hasCheckableItem || menuItem.isCheckable(); } @@ -174,7 +187,7 @@ public class MenuBarConnector extends AbstractComponentConnector implements // Check content of widget to find tooltip for element if (element != getWidget().getElement()) { - CustomMenuItem item = getWidget().getMenuItemWithElement( + VMenuBar.CustomMenuItem item = getWidget().getMenuItemWithElement( (com.google.gwt.user.client.Element) element); if (item != null) { info = item.getTooltip(); diff --git a/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuItem.java b/client/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuItem.java index 7f150d9a5f..9579f5a9b0 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuItem.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuItem.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.menubar; diff --git a/src/com/vaadin/terminal/gwt/client/ui/menubar/VMenuBar.java b/client/src/com/vaadin/terminal/gwt/client/ui/menubar/VMenuBar.java index 47bda81362..9f17b81691 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/menubar/VMenuBar.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/menubar/VMenuBar.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.menubar; @@ -30,6 +42,7 @@ import com.google.gwt.user.client.ui.HasHTML; import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.Widget; +import com.vaadin.shared.ui.menubar.MenuBarConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.LayoutManager; @@ -66,16 +79,6 @@ public class VMenuBar extends SimpleFocusablePanel implements // associated protected static final Command emptyCommand = null; - public static final String OPEN_ROOT_MENU_ON_HOWER = "ormoh"; - - public static final String ATTRIBUTE_CHECKED = "checked"; - public static final String ATTRIBUTE_ITEM_DESCRIPTION = "description"; - public static final String ATTRIBUTE_ITEM_ICON = "icon"; - public static final String ATTRIBUTE_ITEM_DISABLED = "disabled"; - public static final String ATTRIBUTE_ITEM_STYLE = "style"; - - public static final String HTML_CONTENT_ALLOWED = "usehtml"; - /** Widget fields **/ protected boolean subMenu; protected ArrayList<CustomMenuItem> items; @@ -905,26 +908,29 @@ public class VMenuBar extends SimpleFocusablePanel implements public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { setSeparator(uidl.hasAttribute("separator")); - setEnabled(!uidl.hasAttribute(ATTRIBUTE_ITEM_DISABLED)); + setEnabled(!uidl + .hasAttribute(MenuBarConstants.ATTRIBUTE_ITEM_DISABLED)); - if (!isSeparator() && uidl.hasAttribute(ATTRIBUTE_CHECKED)) { + if (!isSeparator() + && uidl.hasAttribute(MenuBarConstants.ATTRIBUTE_CHECKED)) { // if the selected attribute is present (either true or false), // the item is selectable setCheckable(true); - setChecked(uidl.getBooleanAttribute(ATTRIBUTE_CHECKED)); + setChecked(uidl + .getBooleanAttribute(MenuBarConstants.ATTRIBUTE_CHECKED)); } else { setCheckable(false); } - if (uidl.hasAttribute(ATTRIBUTE_ITEM_STYLE)) { + if (uidl.hasAttribute(MenuBarConstants.ATTRIBUTE_ITEM_STYLE)) { String itemStyle = uidl - .getStringAttribute(ATTRIBUTE_ITEM_STYLE); + .getStringAttribute(MenuBarConstants.ATTRIBUTE_ITEM_STYLE); addStyleDependentName(itemStyle); } - if (uidl.hasAttribute(ATTRIBUTE_ITEM_DESCRIPTION)) { + if (uidl.hasAttribute(MenuBarConstants.ATTRIBUTE_ITEM_DESCRIPTION)) { description = uidl - .getStringAttribute(ATTRIBUTE_ITEM_DESCRIPTION); + .getStringAttribute(MenuBarConstants.ATTRIBUTE_ITEM_DESCRIPTION); } } diff --git a/src/com/vaadin/terminal/gwt/client/ui/nativebutton/NativeButtonConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/nativebutton/NativeButtonConnector.java index 73de87c276..2f2c66d1ed 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/nativebutton/NativeButtonConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/nativebutton/NativeButtonConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.nativebutton; diff --git a/src/com/vaadin/terminal/gwt/client/ui/nativebutton/VNativeButton.java b/client/src/com/vaadin/terminal/gwt/client/ui/nativebutton/VNativeButton.java index d58fd2a995..1ab16eccc4 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/nativebutton/VNativeButton.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/nativebutton/VNativeButton.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.nativebutton; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/nativeselect/NativeSelectConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/nativeselect/NativeSelectConnector.java new file mode 100644 index 0000000000..e88ed8b2f3 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/nativeselect/NativeSelectConnector.java @@ -0,0 +1,30 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.client.ui.nativeselect; + +import com.vaadin.shared.ui.Connect; +import com.vaadin.terminal.gwt.client.ui.optiongroup.OptionGroupBaseConnector; +import com.vaadin.ui.NativeSelect; + +@Connect(NativeSelect.class) +public class NativeSelectConnector extends OptionGroupBaseConnector { + + @Override + public VNativeSelect getWidget() { + return (VNativeSelect) super.getWidget(); + } +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/nativeselect/VNativeSelect.java b/client/src/com/vaadin/terminal/gwt/client/ui/nativeselect/VNativeSelect.java index ea5292724d..eb77f5f113 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/nativeselect/VNativeSelect.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/nativeselect/VNativeSelect.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.nativeselect; diff --git a/src/com/vaadin/terminal/gwt/client/ui/notification/VNotification.java b/client/src/com/vaadin/terminal/gwt/client/ui/notification/VNotification.java index 1309155443..451e6badbe 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/notification/VNotification.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/notification/VNotification.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.notification; @@ -17,12 +29,12 @@ import com.google.gwt.user.client.Event; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.Widget; +import com.vaadin.shared.ui.root.RootConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.Util; import com.vaadin.terminal.gwt.client.ui.VOverlay; -import com.vaadin.terminal.gwt.client.ui.root.VRoot; public class VNotification extends VOverlay { @@ -60,13 +72,6 @@ public class VNotification extends VOverlay { private ArrayList<EventListener> listeners; private static final int TOUCH_DEVICE_IDLE_DELAY = 1000; - public static final String ATTRIBUTE_NOTIFICATION_STYLE = "style"; - public static final String ATTRIBUTE_NOTIFICATION_CAPTION = "caption"; - public static final String ATTRIBUTE_NOTIFICATION_MESSAGE = "message"; - public static final String ATTRIBUTE_NOTIFICATION_ICON = "icon"; - public static final String ATTRIBUTE_NOTIFICATION_POSITION = "position"; - public static final String ATTRIBUTE_NOTIFICATION_DELAY = "delay"; - /** * Default constructor. You should use GWT.create instead. */ @@ -378,25 +383,29 @@ public class VNotification extends VOverlay { public static void showNotification(ApplicationConnection client, final UIDL notification) { boolean onlyPlainText = notification - .hasAttribute(VRoot.NOTIFICATION_HTML_CONTENT_NOT_ALLOWED); + .hasAttribute(RootConstants.NOTIFICATION_HTML_CONTENT_NOT_ALLOWED); String html = ""; - if (notification.hasAttribute(ATTRIBUTE_NOTIFICATION_ICON)) { - final String parsedUri = client.translateVaadinUri(notification - .getStringAttribute(ATTRIBUTE_NOTIFICATION_ICON)); + if (notification + .hasAttribute(RootConstants.ATTRIBUTE_NOTIFICATION_ICON)) { + final String parsedUri = client + .translateVaadinUri(notification + .getStringAttribute(RootConstants.ATTRIBUTE_NOTIFICATION_ICON)); html += "<img src=\"" + Util.escapeAttribute(parsedUri) + "\" />"; } - if (notification.hasAttribute(ATTRIBUTE_NOTIFICATION_CAPTION)) { + if (notification + .hasAttribute(RootConstants.ATTRIBUTE_NOTIFICATION_CAPTION)) { String caption = notification - .getStringAttribute(ATTRIBUTE_NOTIFICATION_CAPTION); + .getStringAttribute(RootConstants.ATTRIBUTE_NOTIFICATION_CAPTION); if (onlyPlainText) { caption = Util.escapeHTML(caption); caption = caption.replaceAll("\\n", "<br />"); } html += "<h1>" + caption + "</h1>"; } - if (notification.hasAttribute(ATTRIBUTE_NOTIFICATION_MESSAGE)) { + if (notification + .hasAttribute(RootConstants.ATTRIBUTE_NOTIFICATION_MESSAGE)) { String message = notification - .getStringAttribute(ATTRIBUTE_NOTIFICATION_MESSAGE); + .getStringAttribute(RootConstants.ATTRIBUTE_NOTIFICATION_MESSAGE); if (onlyPlainText) { message = Util.escapeHTML(message); message = message.replaceAll("\\n", "<br />"); @@ -405,12 +414,13 @@ public class VNotification extends VOverlay { } final String style = notification - .hasAttribute(ATTRIBUTE_NOTIFICATION_STYLE) ? notification - .getStringAttribute(ATTRIBUTE_NOTIFICATION_STYLE) : null; + .hasAttribute(RootConstants.ATTRIBUTE_NOTIFICATION_STYLE) ? notification + .getStringAttribute(RootConstants.ATTRIBUTE_NOTIFICATION_STYLE) + : null; final int position = notification - .getIntAttribute(ATTRIBUTE_NOTIFICATION_POSITION); + .getIntAttribute(RootConstants.ATTRIBUTE_NOTIFICATION_POSITION); final int delay = notification - .getIntAttribute(ATTRIBUTE_NOTIFICATION_DELAY); + .getIntAttribute(RootConstants.ATTRIBUTE_NOTIFICATION_DELAY); createNotification(delay).show(html, position, style); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupBaseConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupBaseConnector.java index a4dd72906d..4eabdabb36 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupBaseConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupBaseConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.optiongroup; diff --git a/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupConnector.java index caf85348d4..a15ad3b163 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.optiongroup; @@ -11,6 +23,7 @@ import com.google.gwt.user.client.ui.CheckBox; import com.google.gwt.user.client.ui.Widget; import com.vaadin.shared.EventId; import com.vaadin.shared.ui.Connect; +import com.vaadin.shared.ui.optiongroup.OptionGroupConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.ui.OptionGroup; @@ -21,7 +34,7 @@ public class OptionGroupConnector extends OptionGroupBaseConnector { @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { getWidget().htmlContentAllowed = uidl - .hasAttribute(VOptionGroup.HTML_CONTENT_ALLOWED); + .hasAttribute(OptionGroupConstants.HTML_CONTENT_ALLOWED); super.updateFromUIDL(uidl, client); diff --git a/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroup.java b/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroup.java index a6cdf7e888..710a1c8e63 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroup.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroup.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.optiongroup; @@ -26,6 +38,7 @@ import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.RadioButton; import com.google.gwt.user.client.ui.Widget; import com.vaadin.shared.EventId; +import com.vaadin.shared.ui.optiongroup.OptionGroupConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.Util; @@ -35,12 +48,8 @@ import com.vaadin.terminal.gwt.client.ui.checkbox.VCheckBox; public class VOptionGroup extends VOptionGroupBase implements FocusHandler, BlurHandler { - public static final String HTML_CONTENT_ALLOWED = "usehtml"; - public static final String CLASSNAME = "v-select-optiongroup"; - public static final String ATTRIBUTE_OPTION_DISABLED = "disabled"; - protected final Panel panel; private final Map<CheckBox, String> optionsToKeys; @@ -112,7 +121,7 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler, op.addStyleName(CLASSNAME_OPTION); op.setValue(opUidl.getBooleanAttribute("selected")); boolean enabled = !opUidl - .getBooleanAttribute(ATTRIBUTE_OPTION_DISABLED) + .getBooleanAttribute(OptionGroupConstants.ATTRIBUTE_OPTION_DISABLED) && !isReadonly() && !isDisabled(); op.setEnabled(enabled); setStyleName(op.getElement(), diff --git a/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroupBase.java b/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroupBase.java index d128d7deb1..e416e85696 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroupBase.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroupBase.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.optiongroup; diff --git a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java index e1bf217691..5da01bf127 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.orderedlayout; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/HorizontalLayoutConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/HorizontalLayoutConnector.java new file mode 100644 index 0000000000..195622854d --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/HorizontalLayoutConnector.java @@ -0,0 +1,30 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client.ui.orderedlayout; + +import com.vaadin.shared.ui.Connect; +import com.vaadin.shared.ui.Connect.LoadStyle; +import com.vaadin.ui.HorizontalLayout; + +@Connect(value = HorizontalLayout.class, loadStyle = LoadStyle.EAGER) +public class HorizontalLayoutConnector extends AbstractOrderedLayoutConnector { + + @Override + public VHorizontalLayout getWidget() { + return (VHorizontalLayout) super.getWidget(); + } + +} diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VHorizontalLayout.java b/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VHorizontalLayout.java new file mode 100644 index 0000000000..917384e72d --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VHorizontalLayout.java @@ -0,0 +1,26 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client.ui.orderedlayout; + +public class VHorizontalLayout extends VMeasuringOrderedLayout { + + public static final String CLASSNAME = "v-horizontallayout"; + + public VHorizontalLayout() { + super(CLASSNAME, false); + } + +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VMeasuringOrderedLayout.java b/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VMeasuringOrderedLayout.java index 4bb1c66e86..ec2c4afa97 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VMeasuringOrderedLayout.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VMeasuringOrderedLayout.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.orderedlayout; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VVerticalLayout.java b/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VVerticalLayout.java new file mode 100644 index 0000000000..5c396882f9 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VVerticalLayout.java @@ -0,0 +1,26 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client.ui.orderedlayout; + +public class VVerticalLayout extends VMeasuringOrderedLayout { + + public static final String CLASSNAME = "v-verticallayout"; + + public VVerticalLayout() { + super(CLASSNAME, true); + } + +} diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VerticalLayoutConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VerticalLayoutConnector.java new file mode 100644 index 0000000000..441ba9c156 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VerticalLayoutConnector.java @@ -0,0 +1,30 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client.ui.orderedlayout; + +import com.vaadin.shared.ui.Connect; +import com.vaadin.shared.ui.Connect.LoadStyle; +import com.vaadin.ui.VerticalLayout; + +@Connect(value = VerticalLayout.class, loadStyle = LoadStyle.EAGER) +public class VerticalLayoutConnector extends AbstractOrderedLayoutConnector { + + @Override + public VVerticalLayout getWidget() { + return (VVerticalLayout) super.getWidget(); + } + +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java index fd4761de5e..c6a695bc2e 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.panel; diff --git a/src/com/vaadin/terminal/gwt/client/ui/panel/VPanel.java b/client/src/com/vaadin/terminal/gwt/client/ui/panel/VPanel.java index 8764d61c3a..b7a9f3f7c2 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/panel/VPanel.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/panel/VPanel.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.panel; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/passwordfield/PasswordFieldConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/passwordfield/PasswordFieldConnector.java new file mode 100644 index 0000000000..e8aa32f78b --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/passwordfield/PasswordFieldConnector.java @@ -0,0 +1,30 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.client.ui.passwordfield; + +import com.vaadin.shared.ui.Connect; +import com.vaadin.terminal.gwt.client.ui.textfield.TextFieldConnector; +import com.vaadin.ui.PasswordField; + +@Connect(PasswordField.class) +public class PasswordFieldConnector extends TextFieldConnector { + + @Override + public VPasswordField getWidget() { + return (VPasswordField) super.getWidget(); + } +} diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/passwordfield/VPasswordField.java b/client/src/com/vaadin/terminal/gwt/client/ui/passwordfield/VPasswordField.java new file mode 100644 index 0000000000..fc131909b2 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/passwordfield/VPasswordField.java @@ -0,0 +1,34 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.client.ui.passwordfield; + +import com.google.gwt.user.client.DOM; +import com.vaadin.terminal.gwt.client.ui.textfield.VTextField; + +/** + * This class represents a password field. + * + * @author Vaadin Ltd. + * + */ +public class VPasswordField extends VTextField { + + public VPasswordField() { + super(DOM.createInputPassword()); + } + +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/popupview/PopupViewConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/popupview/PopupViewConnector.java index 19b35821c7..398e257375 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/popupview/PopupViewConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/popupview/PopupViewConnector.java @@ -1,5 +1,17 @@ /* - @VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.popupview; diff --git a/src/com/vaadin/terminal/gwt/client/ui/popupview/VPopupView.java b/client/src/com/vaadin/terminal/gwt/client/ui/popupview/VPopupView.java index 6efcd8f417..df373c59ba 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/popupview/VPopupView.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/popupview/VPopupView.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.popupview; diff --git a/src/com/vaadin/terminal/gwt/client/ui/progressindicator/ProgressIndicatorConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/progressindicator/ProgressIndicatorConnector.java index cdb0174a49..e99a03f01d 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/progressindicator/ProgressIndicatorConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/progressindicator/ProgressIndicatorConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.progressindicator; diff --git a/src/com/vaadin/terminal/gwt/client/ui/progressindicator/VProgressIndicator.java b/client/src/com/vaadin/terminal/gwt/client/ui/progressindicator/VProgressIndicator.java index bc64efb60a..5d39389d5b 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/progressindicator/VProgressIndicator.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/progressindicator/VProgressIndicator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.progressindicator; diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/RichTextAreaConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/RichTextAreaConnector.java index 66781eb645..9726d43297 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/RichTextAreaConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/RichTextAreaConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.richtextarea; diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java index f9b399caac..cdd5025e64 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.richtextarea; diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar$Strings.properties b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar$Strings.properties index 363b704584..363b704584 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar$Strings.properties +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar$Strings.properties diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java index d86c7a4bf5..3128b4d842 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ /* * Copyright 2007 Google Inc. diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/backColors.gif b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/backColors.gif Binary files differindex ddfc1cea2c..ddfc1cea2c 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/backColors.gif +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/backColors.gif diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/bold.gif b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/bold.gif Binary files differindex 7c22eaac68..7c22eaac68 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/bold.gif +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/bold.gif diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/createLink.gif b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/createLink.gif Binary files differindex 1a1412fe0e..1a1412fe0e 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/createLink.gif +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/createLink.gif diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/fontSizes.gif b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/fontSizes.gif Binary files differindex c2f4c8cb21..c2f4c8cb21 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/fontSizes.gif +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/fontSizes.gif diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/fonts.gif b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/fonts.gif Binary files differindex 1629cabb78..1629cabb78 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/fonts.gif +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/fonts.gif diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/foreColors.gif b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/foreColors.gif Binary files differindex 2bb89ef189..2bb89ef189 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/foreColors.gif +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/foreColors.gif diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/gwtLogo.png b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/gwtLogo.png Binary files differindex 80728186d8..80728186d8 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/gwtLogo.png +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/gwtLogo.png diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/hr.gif b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/hr.gif Binary files differindex d507082cf1..d507082cf1 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/hr.gif +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/hr.gif diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/indent.gif b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/indent.gif Binary files differindex 905421ed76..905421ed76 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/indent.gif +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/indent.gif diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/insertImage.gif b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/insertImage.gif Binary files differindex 394ec432a5..394ec432a5 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/insertImage.gif +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/insertImage.gif diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/italic.gif b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/italic.gif Binary files differindex ffe0e97284..ffe0e97284 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/italic.gif +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/italic.gif diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyCenter.gif b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyCenter.gif Binary files differindex f7d4c4693d..f7d4c4693d 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyCenter.gif +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyCenter.gif diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyLeft.gif b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyLeft.gif Binary files differindex bc37a3ed5a..bc37a3ed5a 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyLeft.gif +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyLeft.gif diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyRight.gif b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyRight.gif Binary files differindex 892d569384..892d569384 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyRight.gif +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyRight.gif diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/ol.gif b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/ol.gif Binary files differindex 54f8e4f551..54f8e4f551 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/ol.gif +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/ol.gif diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/outdent.gif b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/outdent.gif Binary files differindex 78fd1b5722..78fd1b5722 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/outdent.gif +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/outdent.gif diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/removeFormat.gif b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/removeFormat.gif Binary files differindex cf92c9774f..cf92c9774f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/removeFormat.gif +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/removeFormat.gif diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/removeLink.gif b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/removeLink.gif Binary files differindex 40721a7bca..40721a7bca 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/removeLink.gif +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/removeLink.gif diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/strikeThrough.gif b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/strikeThrough.gif Binary files differindex a7a233c023..a7a233c023 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/strikeThrough.gif +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/strikeThrough.gif diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/subscript.gif b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/subscript.gif Binary files differindex 58b6fbb816..58b6fbb816 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/subscript.gif +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/subscript.gif diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/superscript.gif b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/superscript.gif Binary files differindex a6270f6e21..a6270f6e21 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/superscript.gif +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/superscript.gif diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/ul.gif b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/ul.gif Binary files differindex 83f1562bcb..83f1562bcb 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/ul.gif +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/ul.gif diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/underline.gif b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/underline.gif Binary files differindex 06f0200fdd..06f0200fdd 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/underline.gif +++ b/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/underline.gif diff --git a/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java index a4740bdc64..0a0e0e5082 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.root; @@ -29,6 +41,7 @@ import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.shared.ui.root.PageClientRpc; +import com.vaadin.shared.ui.root.RootConstants; import com.vaadin.shared.ui.root.RootServerRpc; import com.vaadin.shared.ui.root.RootState; import com.vaadin.terminal.gwt.client.ApplicationConnection; @@ -96,7 +109,7 @@ public class RootConnector extends AbstractComponentContainerConnector getWidget().connection = client; getWidget().immediate = getState().isImmediate(); - getWidget().resizeLazy = uidl.hasAttribute(VRoot.RESIZE_LAZY); + getWidget().resizeLazy = uidl.hasAttribute(RootConstants.RESIZE_LAZY); String newTheme = uidl.getStringAttribute("theme"); if (getWidget().theme != null && !newTheme.equals(getWidget().theme)) { // Complete page refresh is needed due css can affect layout @@ -252,9 +265,9 @@ public class RootConnector extends AbstractComponentContainerConnector scrollIntoView(connector); } - if (uidl.hasAttribute(VRoot.FRAGMENT_VARIABLE)) { + if (uidl.hasAttribute(RootConstants.FRAGMENT_VARIABLE)) { getWidget().currentFragment = uidl - .getStringAttribute(VRoot.FRAGMENT_VARIABLE); + .getStringAttribute(RootConstants.FRAGMENT_VARIABLE); if (!getWidget().currentFragment.equals(History.getToken())) { History.newItem(getWidget().currentFragment, true); } @@ -264,7 +277,8 @@ public class RootConnector extends AbstractComponentContainerConnector getWidget().currentFragment = History.getToken(); // Include current fragment in the next request - client.updateVariable(getWidget().id, VRoot.FRAGMENT_VARIABLE, + client.updateVariable(getWidget().id, + RootConstants.FRAGMENT_VARIABLE, getWidget().currentFragment, false); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java b/client/src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java index fddb76e755..a473bf4846 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.root; @@ -19,6 +31,8 @@ import com.google.gwt.user.client.History; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.SimplePanel; +import com.vaadin.shared.ApplicationConstants; +import com.vaadin.shared.ui.root.RootConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.ComponentConnector; @@ -38,16 +52,8 @@ import com.vaadin.terminal.gwt.client.ui.textfield.VTextField; public class VRoot extends SimplePanel implements ResizeHandler, Window.ClosingHandler, ShortcutActionHandlerOwner, Focusable { - public static final String FRAGMENT_VARIABLE = "fragment"; - - public static final String BROWSER_HEIGHT_VAR = "browserHeight"; - - public static final String BROWSER_WIDTH_VAR = "browserWidth"; - private static final String CLASSNAME = "v-view"; - public static final String NOTIFICATION_HTML_CONTENT_NOT_ALLOWED = "useplain"; - private static int MONITOR_PARENT_TIMER_INTERVAL = 1000; String theme; @@ -73,9 +79,6 @@ public class VRoot extends SimplePanel implements ResizeHandler, ApplicationConnection connection; - /** Identifies the click event */ - public static final String CLICK_EVENT_ID = "click"; - /** * Keep track of possible parent size changes when an embedded application. * @@ -102,11 +105,6 @@ public class VRoot extends SimplePanel implements ResizeHandler, boolean resizeLazy = false; - /** - * Attribute name for the lazy resize setting . - */ - public static final String RESIZE_LAZY = "rL"; - private HandlerRegistration historyHandlerRegistration; private TouchScrollHandler touchScrollHandler; @@ -130,8 +128,8 @@ public class VRoot extends SimplePanel implements ResizeHandler, // Send the new fragment to the server if it has changed if (!newFragment.equals(currentFragment) && connection != null) { currentFragment = newFragment; - connection.updateVariable(id, FRAGMENT_VARIABLE, newFragment, - true); + connection.updateVariable(id, RootConstants.FRAGMENT_VARIABLE, + newFragment, true); } } }; @@ -311,7 +309,7 @@ public class VRoot extends SimplePanel implements ResizeHandler, */ public boolean isEmbedded() { return !getElement().getOwnerDocument().getBody().getClassName() - .contains(ApplicationConnection.GENERATED_BODY_CLASSNAME); + .contains(ApplicationConstants.GENERATED_BODY_CLASSNAME); } /** @@ -409,9 +407,10 @@ public class VRoot extends SimplePanel implements ResizeHandler, int windowWidth = Window.getClientWidth(); int windowHeight = Window.getClientHeight(); - connection.updateVariable(id, BROWSER_WIDTH_VAR, windowWidth, false); - connection.updateVariable(id, BROWSER_HEIGHT_VAR, windowHeight, - immediate); + connection.updateVariable(id, RootConstants.BROWSER_WIDTH_VAR, + windowWidth, false); + connection.updateVariable(id, RootConstants.BROWSER_HEIGHT_VAR, + windowHeight, immediate); } public native static void goTo(String url) @@ -458,4 +457,5 @@ public class VRoot extends SimplePanel implements ResizeHandler, } touchScrollHandler.addElement(getElement()); } + } diff --git a/src/com/vaadin/terminal/gwt/client/ui/slider/SliderConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/slider/SliderConnector.java index f8588dbf3f..7e0617b7dc 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/slider/SliderConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/slider/SliderConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.slider; diff --git a/src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java b/client/src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java index 06608c95fe..9667522eb3 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ // package com.vaadin.terminal.gwt.client.ui.slider; diff --git a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelConnector.java index f82718e4ea..9f4df02380 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.splitpanel; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/HorizontalSplitPanelConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/HorizontalSplitPanelConnector.java new file mode 100644 index 0000000000..3165e13407 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/HorizontalSplitPanelConnector.java @@ -0,0 +1,30 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client.ui.splitpanel; + +import com.vaadin.shared.ui.Connect; +import com.vaadin.shared.ui.Connect.LoadStyle; +import com.vaadin.ui.HorizontalSplitPanel; + +@Connect(value = HorizontalSplitPanel.class, loadStyle = LoadStyle.EAGER) +public class HorizontalSplitPanelConnector extends AbstractSplitPanelConnector { + + @Override + public VSplitPanelHorizontal getWidget() { + return (VSplitPanelHorizontal) super.getWidget(); + } + +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java b/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java index a20c0476a5..b83108b34c 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.splitpanel; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelHorizontal.java b/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelHorizontal.java new file mode 100644 index 0000000000..7016620e2d --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelHorizontal.java @@ -0,0 +1,24 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.client.ui.splitpanel; + +public class VSplitPanelHorizontal extends VAbstractSplitPanel { + + public VSplitPanelHorizontal() { + super(VAbstractSplitPanel.ORIENTATION_HORIZONTAL); + } +} diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelVertical.java b/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelVertical.java new file mode 100644 index 0000000000..02397ea4c6 --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelVertical.java @@ -0,0 +1,24 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.client.ui.splitpanel; + +public class VSplitPanelVertical extends VAbstractSplitPanel { + + public VSplitPanelVertical() { + super(VAbstractSplitPanel.ORIENTATION_VERTICAL); + } +} diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VerticalSplitPanelConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VerticalSplitPanelConnector.java new file mode 100644 index 0000000000..ab4ea350ce --- /dev/null +++ b/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VerticalSplitPanelConnector.java @@ -0,0 +1,31 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.client.ui.splitpanel; + +import com.google.gwt.core.client.GWT; +import com.vaadin.shared.ui.Connect; +import com.vaadin.shared.ui.Connect.LoadStyle; +import com.vaadin.ui.VerticalSplitPanel; + +@Connect(value = VerticalSplitPanel.class, loadStyle = LoadStyle.EAGER) +public class VerticalSplitPanelConnector extends AbstractSplitPanelConnector { + + @Override + public VSplitPanelVertical getWidget() { + return (VSplitPanelVertical) super.getWidget(); + } + +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java index 7721a3d763..77d3fa61d5 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.table; @@ -13,6 +25,7 @@ import com.google.gwt.user.client.Command; import com.google.gwt.user.client.ui.Widget; import com.vaadin.shared.AbstractFieldState; import com.vaadin.shared.ui.Connect; +import com.vaadin.shared.ui.table.TableConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.ComponentConnector; @@ -53,11 +66,11 @@ public class TableConnector extends AbstractComponentContainerConnector // required. ContextMenuDetails contextMenuBeforeUpdate = getWidget().contextMenu; - if (uidl.hasAttribute(VScrollTable.ATTRIBUTE_PAGEBUFFER_FIRST)) { + if (uidl.hasAttribute(TableConstants.ATTRIBUTE_PAGEBUFFER_FIRST)) { getWidget().serverCacheFirst = uidl - .getIntAttribute(VScrollTable.ATTRIBUTE_PAGEBUFFER_FIRST); + .getIntAttribute(TableConstants.ATTRIBUTE_PAGEBUFFER_FIRST); getWidget().serverCacheLast = uidl - .getIntAttribute(VScrollTable.ATTRIBUTE_PAGEBUFFER_LAST); + .getIntAttribute(TableConstants.ATTRIBUTE_PAGEBUFFER_LAST); } else { getWidget().serverCacheFirst = -1; getWidget().serverCacheLast = -1; @@ -255,8 +268,8 @@ public class TableConnector extends AbstractComponentContainerConnector * be cleared a little later when the row focus has been restored. * (#8584) */ - if (uidl.hasAttribute(VScrollTable.ATTRIBUTE_KEY_MAPPER_RESET) - && uidl.getBooleanAttribute(VScrollTable.ATTRIBUTE_KEY_MAPPER_RESET) + if (uidl.hasAttribute(TableConstants.ATTRIBUTE_KEY_MAPPER_RESET) + && uidl.getBooleanAttribute(TableConstants.ATTRIBUTE_KEY_MAPPER_RESET) && getWidget().selectionRangeStart != null) { assert !getWidget().selectionRangeStart.isAttached(); getWidget().selectionRangeStart = getWidget().focusedRow; diff --git a/src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java b/client/src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java index 8a58c28c5b..aa7da488d8 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.table; @@ -63,6 +75,7 @@ import com.google.gwt.user.client.ui.Widget; import com.vaadin.shared.ComponentState; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.dd.VerticalDropLocation; +import com.vaadin.shared.ui.table.TableConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.ComponentConnector; @@ -131,26 +144,11 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } } - /** - * Tell the client that old keys are no longer valid because the server has - * cleared its key map. - */ - public static final String ATTRIBUTE_KEY_MAPPER_RESET = "clearKeyMap"; - private static final String ROW_HEADER_COLUMN_KEY = "0"; public static final String CLASSNAME = "v-table"; public static final String CLASSNAME_SELECTION_FOCUS = CLASSNAME + "-focus"; - public static final String ATTRIBUTE_PAGEBUFFER_FIRST = "pb-ft"; - public static final String ATTRIBUTE_PAGEBUFFER_LAST = "pb-l"; - - public static final String ITEM_CLICK_EVENT_ID = "itemClick"; - public static final String HEADER_CLICK_EVENT_ID = "handleHeaderClick"; - public static final String FOOTER_CLICK_EVENT_ID = "handleFooterClick"; - public static final String COLUMN_RESIZE_EVENT_ID = "columnResize"; - public static final String COLUMN_REORDER_EVENT_ID = "columnReorder"; - private static final double CACHE_RATE_DEFAULT = 2; /** @@ -1624,7 +1622,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } } client.updateVariable(paintableId, "columnorder", columnOrder, false); - if (client.hasEventListeners(this, COLUMN_REORDER_EVENT_ID)) { + if (client.hasEventListeners(this, + TableConstants.COLUMN_REORDER_EVENT_ID)) { client.sendPendingVariableChanges(); } } @@ -2324,7 +2323,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, boolean stopPropagation = true; if (event.getTypeInt() == Event.ONCONTEXTMENU && !client.hasEventListeners(VScrollTable.this, - HEADER_CLICK_EVENT_ID)) { + TableConstants.HEADER_CLICK_EVENT_ID)) { // Prevent showing the browser's context menu only when // there is a header click listener. stopPropagation = false; @@ -2377,7 +2376,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, */ private void fireHeaderClickedEvent(Event event) { if (client.hasEventListeners(VScrollTable.this, - HEADER_CLICK_EVENT_ID)) { + TableConstants.HEADER_CLICK_EVENT_ID)) { MouseEventDetails details = MouseEventDetailsBuilder .buildMouseEventDetails(event); client.updateVariable(paintableId, "headerClickEvent", @@ -3424,7 +3423,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, boolean stopPropagation = true; if (event.getTypeInt() == Event.ONCONTEXTMENU && !client.hasEventListeners(VScrollTable.this, - FOOTER_CLICK_EVENT_ID)) { + TableConstants.FOOTER_CLICK_EVENT_ID)) { // Show browser context menu if a footer click listener is // not present stopPropagation = false; @@ -3458,7 +3457,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, */ private void fireFooterClickedEvent(Event event) { if (client.hasEventListeners(VScrollTable.this, - FOOTER_CLICK_EVENT_ID)) { + TableConstants.FOOTER_CLICK_EVENT_ID)) { MouseEventDetails details = MouseEventDetailsBuilder .buildMouseEventDetails(event); client.updateVariable(paintableId, "footerClickEvent", @@ -4786,7 +4785,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, private boolean handleClickEvent(Event event, Element targetTdOrTr, boolean immediate) { if (!client.hasEventListeners(VScrollTable.this, - ITEM_CLICK_EVENT_ID)) { + TableConstants.ITEM_CLICK_EVENT_ID)) { // Don't send an event if nobody is listening return false; } @@ -4960,8 +4959,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets, showContextMenu(event); if (enabled && (actionKeys != null || client - .hasEventListeners(VScrollTable.this, - ITEM_CLICK_EVENT_ID))) { + .hasEventListeners( + VScrollTable.this, + TableConstants.ITEM_CLICK_EVENT_ID))) { /* * Prevent browser context menu only if there are * action handlers or item click listeners diff --git a/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetBaseConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetBaseConnector.java index ea0bea6b04..e8a1c709c4 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetBaseConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetBaseConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.tabsheet; @@ -7,6 +19,7 @@ import java.util.ArrayList; import java.util.Iterator; import com.google.gwt.user.client.ui.Widget; +import com.vaadin.shared.ui.tabsheet.TabsheetBaseConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.ComponentConnector; import com.vaadin.terminal.gwt.client.Paintable; @@ -16,12 +29,6 @@ import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector; public abstract class TabsheetBaseConnector extends AbstractComponentContainerConnector implements Paintable { - public static final String ATTRIBUTE_TAB_DISABLED = "disabled"; - public static final String ATTRIBUTE_TAB_DESCRIPTION = "description"; - public static final String ATTRIBUTE_TAB_ERROR_MESSAGE = "error"; - public static final String ATTRIBUTE_TAB_CAPTION = "caption"; - public static final String ATTRIBUTE_TAB_ICON = "icon"; - @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { getWidget().client = client; @@ -55,7 +62,7 @@ public abstract class TabsheetBaseConnector extends final boolean selected = tab.getBooleanAttribute("selected"); final boolean hidden = tab.getBooleanAttribute("hidden"); - if (tab.getBooleanAttribute(ATTRIBUTE_TAB_DISABLED)) { + if (tab.getBooleanAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_DISABLED)) { getWidget().disabledTabKeys.add(key); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetConnector.java index ce19f1e02a..76c56ba2ed 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.tabsheet; @@ -19,6 +31,7 @@ import com.vaadin.ui.TabSheet; public class TabsheetConnector extends TabsheetBaseConnector implements SimpleManagedLayout, MayScrollChildren { + // Can't use "style" as it's already in use @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java b/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java index 1f6314050e..bec36aed4b 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.tabsheet; @@ -36,6 +48,8 @@ import com.google.gwt.user.client.ui.Widget; import com.google.gwt.user.client.ui.impl.FocusImpl; import com.vaadin.shared.ComponentState; import com.vaadin.shared.EventId; +import com.vaadin.shared.ui.tabsheet.TabsheetBaseConstants; +import com.vaadin.shared.ui.tabsheet.TabsheetConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.ComponentConnector; @@ -187,7 +201,8 @@ public class VTabsheet extends VTabsheetBase implements Focusable, tabCaption.updateCaption(tabUidl); // Apply the styleName set for the tab - String newStyleName = tabUidl.getStringAttribute(TAB_STYLE_NAME); + String newStyleName = tabUidl + .getStringAttribute(TabsheetConstants.TAB_STYLE_NAME); // Find the nth td element if (newStyleName != null && newStyleName.length() != 0) { if (!newStyleName.equals(styleName)) { @@ -250,10 +265,10 @@ public class VTabsheet extends VTabsheetBase implements Focusable, } public boolean updateCaption(UIDL uidl) { - if (uidl.hasAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_DESCRIPTION)) { + if (uidl.hasAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_DESCRIPTION)) { setTooltipInfo(new TooltipInfo( - uidl.getStringAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_DESCRIPTION), - uidl.getStringAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_ERROR_MESSAGE))); + uidl.getStringAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_DESCRIPTION), + uidl.getStringAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_ERROR_MESSAGE))); } else { setTooltipInfo(null); } @@ -261,11 +276,11 @@ public class VTabsheet extends VTabsheetBase implements Focusable, // TODO need to call this instead of super because the caption does // not have an owner boolean ret = updateCaptionWithoutOwner( - uidl.getStringAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_CAPTION), - uidl.hasAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_DISABLED), - uidl.hasAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_DESCRIPTION), - uidl.hasAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_ERROR_MESSAGE), - uidl.getStringAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_ICON)); + uidl.getStringAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_CAPTION), + uidl.hasAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_DISABLED), + uidl.hasAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_DESCRIPTION), + uidl.hasAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_ERROR_MESSAGE), + uidl.getStringAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_ICON)); setClosable(uidl.hasAttribute("closable")); @@ -541,9 +556,6 @@ public class VTabsheet extends VTabsheetBase implements Focusable, public static final String TABS_CLASSNAME = "v-tabsheet-tabcontainer"; public static final String SCROLLER_CLASSNAME = "v-tabsheet-scroller"; - // Can't use "style" as it's already in use - public static final String TAB_STYLE_NAME = "tabstyle"; - final Element tabs; // tabbar and 'scroller' container Tab focusedTab; /** diff --git a/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheetBase.java b/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheetBase.java index ed9883dd35..b9a68dc4af 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheetBase.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheetBase.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.tabsheet; diff --git a/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheetPanel.java b/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheetPanel.java index bd6cddb682..e48f7ffa1f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheetPanel.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheetPanel.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.tabsheet; diff --git a/src/com/vaadin/terminal/gwt/client/ui/textarea/TextAreaConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/textarea/TextAreaConnector.java index cdf648d3ec..5fb7f97044 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/textarea/TextAreaConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/textarea/TextAreaConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.textarea; diff --git a/src/com/vaadin/terminal/gwt/client/ui/textarea/VTextArea.java b/client/src/com/vaadin/terminal/gwt/client/ui/textarea/VTextArea.java index c0f6deab53..e061cda1fa 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/textarea/VTextArea.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/textarea/VTextArea.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.textarea; diff --git a/src/com/vaadin/terminal/gwt/client/ui/textfield/TextFieldConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/textfield/TextFieldConnector.java index d98d27942a..d16c01bd27 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/textfield/TextFieldConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/textfield/TextFieldConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.textfield; @@ -10,6 +22,7 @@ import com.google.gwt.user.client.Event; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.shared.ui.textfield.AbstractTextFieldState; +import com.vaadin.shared.ui.textfield.TextFieldConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.Paintable; import com.vaadin.terminal.gwt.client.UIDL; @@ -45,13 +58,13 @@ public class TextFieldConnector extends AbstractFieldConnector implements getWidget().listenTextChangeEvents = hasEventListener("ie"); if (getWidget().listenTextChangeEvents) { getWidget().textChangeEventMode = uidl - .getStringAttribute(VTextField.ATTR_TEXTCHANGE_EVENTMODE); + .getStringAttribute(TextFieldConstants.ATTR_TEXTCHANGE_EVENTMODE); if (getWidget().textChangeEventMode - .equals(VTextField.TEXTCHANGE_MODE_EAGER)) { + .equals(TextFieldConstants.TEXTCHANGE_MODE_EAGER)) { getWidget().textChangeEventTimeout = 1; } else { getWidget().textChangeEventTimeout = uidl - .getIntAttribute(VTextField.ATTR_TEXTCHANGE_TIMEOUT); + .getIntAttribute(TextFieldConstants.ATTR_TEXTCHANGE_TIMEOUT); if (getWidget().textChangeEventTimeout < 1) { // Sanitize and allow lazy/timeout with timeout set to 0 to // work as eager @@ -72,7 +85,7 @@ public class TextFieldConnector extends AbstractFieldConnector implements * value). */ if (!(uidl - .getBooleanAttribute(VTextField.ATTR_NO_VALUE_CHANGE_BETWEEN_PAINTS) + .getBooleanAttribute(TextFieldConstants.ATTR_NO_VALUE_CHANGE_BETWEEN_PAINTS) && getWidget().valueBeforeEdit != null && text .equals(getWidget().valueBeforeEdit))) { getWidget().updateFieldContent(text); diff --git a/src/com/vaadin/terminal/gwt/client/ui/textfield/VTextField.java b/client/src/com/vaadin/terminal/gwt/client/ui/textfield/VTextField.java index 7f8e549550..b00210cdd2 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/textfield/VTextField.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/textfield/VTextField.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.textfield; @@ -19,6 +31,7 @@ import com.google.gwt.user.client.Event; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.TextBoxBase; import com.vaadin.shared.EventId; +import com.vaadin.shared.ui.textfield.TextFieldConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.Util; @@ -33,9 +46,6 @@ import com.vaadin.terminal.gwt.client.ui.Field; public class VTextField extends TextBoxBase implements Field, ChangeHandler, FocusHandler, BlurHandler, KeyDownHandler { - public static final String VAR_CUR_TEXT = "curText"; - - public static final String ATTR_NO_VALUE_CHANGE_BETWEEN_PAINTS = "nvc"; /** * The input node CSS classname. */ @@ -62,10 +72,6 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler, private int maxLength = -1; private static final String CLASSNAME_PROMPT = "prompt"; - public static final String ATTR_TEXTCHANGE_TIMEOUT = "iet"; - public static final String VAR_CURSOR = "c"; - public static final String ATTR_TEXTCHANGE_EVENTMODE = "iem"; - protected static final String TEXTCHANGE_MODE_EAGER = "EAGER"; private static final String TEXTCHANGE_MODE_TIMEOUT = "TIMEOUT"; private String inputPrompt = null; @@ -142,7 +148,8 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler, client.sendPendingVariableChanges(); } else { // Default case - just send an immediate text change message - client.updateVariable(paintableId, VAR_CUR_TEXT, text, true); + client.updateVariable(paintableId, + TextFieldConstants.VAR_CUR_TEXT, text, true); // Shouldn't investigate valueBeforeEdit to avoid duplicate text // change events as the states are not in sync any more @@ -334,7 +341,8 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler, if (Util.isAttachedAndDisplayed(this)) { int cursorPos = getCursorPos(); if (lastCursorPos != cursorPos) { - client.updateVariable(paintableId, VAR_CURSOR, cursorPos, false); + client.updateVariable(paintableId, + TextFieldConstants.VAR_CURSOR, cursorPos, false); lastCursorPos = cursorPos; return true; } diff --git a/src/com/vaadin/terminal/gwt/client/ui/tree/TreeConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/tree/TreeConnector.java index def63edae9..a97a4b521f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/tree/TreeConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/tree/TreeConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.tree; @@ -10,6 +22,7 @@ import java.util.Map; import com.google.gwt.dom.client.Element; import com.vaadin.shared.AbstractFieldState; import com.vaadin.shared.ui.Connect; +import com.vaadin.shared.ui.tree.TreeConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.Paintable; @@ -24,13 +37,6 @@ import com.vaadin.ui.Tree; public class TreeConnector extends AbstractComponentConnector implements Paintable { - public static final String ATTRIBUTE_NODE_STYLE = "style"; - public static final String ATTRIBUTE_NODE_CAPTION = "caption"; - public static final String ATTRIBUTE_NODE_ICON = "icon"; - - public static final String ATTRIBUTE_ACTION_CAPTION = "caption"; - public static final String ATTRIBUTE_ACTION_ICON = ATTRIBUTE_NODE_ICON; - protected final Map<TreeNode, TooltipInfo> tooltipMap = new HashMap<TreeNode, TooltipInfo>(); @Override @@ -165,11 +171,12 @@ public class TreeConnector extends AbstractComponentConnector implements final UIDL action = (UIDL) it.next(); final String key = action.getStringAttribute("key"); final String caption = action - .getStringAttribute(ATTRIBUTE_ACTION_CAPTION); + .getStringAttribute(TreeConstants.ATTRIBUTE_ACTION_CAPTION); String iconUrl = null; - if (action.hasAttribute(ATTRIBUTE_ACTION_ICON)) { - iconUrl = getConnection().translateVaadinUri( - action.getStringAttribute(ATTRIBUTE_ACTION_ICON)); + if (action.hasAttribute(TreeConstants.ATTRIBUTE_ACTION_ICON)) { + iconUrl = getConnection() + .translateVaadinUri( + action.getStringAttribute(TreeConstants.ATTRIBUTE_ACTION_ICON)); } getWidget().registerAction(key, caption, iconUrl); } @@ -178,7 +185,8 @@ public class TreeConnector extends AbstractComponentConnector implements public void updateNodeFromUIDL(TreeNode treeNode, UIDL uidl) { String nodeKey = uidl.getStringAttribute("key"); - treeNode.setText(uidl.getStringAttribute(ATTRIBUTE_NODE_CAPTION)); + treeNode.setText(uidl + .getStringAttribute(TreeConstants.ATTRIBUTE_NODE_CAPTION)); treeNode.key = nodeKey; getWidget().registerNode(treeNode); @@ -197,9 +205,9 @@ public class TreeConnector extends AbstractComponentConnector implements } else { treeNode.addStyleName(TreeNode.CLASSNAME + "-leaf"); } - if (uidl.hasAttribute(ATTRIBUTE_NODE_STYLE)) { + if (uidl.hasAttribute(TreeConstants.ATTRIBUTE_NODE_STYLE)) { treeNode.setNodeStyleName(uidl - .getStringAttribute(ATTRIBUTE_NODE_STYLE)); + .getStringAttribute(TreeConstants.ATTRIBUTE_NODE_STYLE)); } String description = uidl.getStringAttribute("descr"); @@ -218,7 +226,8 @@ public class TreeConnector extends AbstractComponentConnector implements getWidget().selectedIds.add(nodeKey); } - treeNode.setIcon(uidl.getStringAttribute(ATTRIBUTE_NODE_ICON)); + treeNode.setIcon(uidl + .getStringAttribute(TreeConstants.ATTRIBUTE_NODE_ICON)); } void renderChildNodes(TreeNode containerNode, Iterator<UIDL> i) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/tree/VTree.java b/client/src/com/vaadin/terminal/gwt/client/ui/tree/VTree.java index f5fe6bce1a..9fbaa1d8bf 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/tree/VTree.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/tree/VTree.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.tree; @@ -39,6 +51,7 @@ import com.google.gwt.user.client.ui.UIObject; import com.google.gwt.user.client.ui.Widget; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.dd.VerticalDropLocation; +import com.vaadin.shared.ui.tree.TreeConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.ComponentConnector; @@ -71,8 +84,6 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, public static final String CLASSNAME = "v-tree"; - public static final String ITEM_CLICK_EVENT_ID = "itemClick"; - /** * Click selects the current node, ctrl/shift toggles multi selection */ @@ -663,8 +674,8 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, final boolean inCaption = isCaptionElement(target); if (inCaption - && client - .hasEventListeners(VTree.this, ITEM_CLICK_EVENT_ID) + && client.hasEventListeners(VTree.this, + TreeConstants.ITEM_CLICK_EVENT_ID) && (type == Event.ONDBLCLICK || type == Event.ONMOUSEUP)) { fireClick(event); diff --git a/src/com/vaadin/terminal/gwt/client/ui/treetable/TreeTableConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/treetable/TreeTableConnector.java index 06e916fbc9..21f78c2356 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/treetable/TreeTableConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/treetable/TreeTableConnector.java @@ -1,9 +1,22 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.treetable; import com.vaadin.shared.ui.Connect; +import com.vaadin.shared.ui.treetable.TreeTableConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.ui.FocusableScrollPanel; @@ -14,7 +27,6 @@ import com.vaadin.ui.TreeTable; @Connect(TreeTable.class) public class TreeTableConnector extends TableConnector { - public static final String ATTRIBUTE_HIERARCHY_COLUMN_INDEX = "hci"; @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { @@ -26,8 +38,9 @@ public class TreeTableConnector extends TableConnector { } getWidget().animationsEnabled = uidl.getBooleanAttribute("animate"); getWidget().colIndexOfHierarchy = uidl - .hasAttribute(ATTRIBUTE_HIERARCHY_COLUMN_INDEX) ? uidl - .getIntAttribute(ATTRIBUTE_HIERARCHY_COLUMN_INDEX) : 0; + .hasAttribute(TreeTableConstants.ATTRIBUTE_HIERARCHY_COLUMN_INDEX) ? uidl + .getIntAttribute(TreeTableConstants.ATTRIBUTE_HIERARCHY_COLUMN_INDEX) + : 0; int oldTotalRows = getWidget().getTotalRows(); super.updateFromUIDL(uidl, client); if (getWidget().collapseRequest) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/treetable/VTreeTable.java b/client/src/com/vaadin/terminal/gwt/client/ui/treetable/VTreeTable.java index c03dff9507..a8621190ae 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/treetable/VTreeTable.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/treetable/VTreeTable.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.treetable; diff --git a/src/com/vaadin/terminal/gwt/client/ui/twincolselect/TwinColSelectConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/twincolselect/TwinColSelectConnector.java index 2ce6bf2129..c4a5437149 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/twincolselect/TwinColSelectConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/twincolselect/TwinColSelectConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.twincolselect; diff --git a/src/com/vaadin/terminal/gwt/client/ui/twincolselect/VTwinColSelect.java b/client/src/com/vaadin/terminal/gwt/client/ui/twincolselect/VTwinColSelect.java index 1a2deae3b4..fef44eb502 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/twincolselect/VTwinColSelect.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/twincolselect/VTwinColSelect.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.twincolselect; @@ -26,6 +38,7 @@ import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.ListBox; import com.google.gwt.user.client.ui.Panel; +import com.vaadin.shared.ui.twincolselect.TwinColSelectConstants; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.Util; import com.vaadin.terminal.gwt.client.ui.SubPartAware; @@ -36,8 +49,6 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, MouseDownHandler, DoubleClickHandler, SubPartAware { private static final String CLASSNAME = "v-select-twincol"; - public static final String ATTRIBUTE_LEFT_CAPTION = "lc"; - public static final String ATTRIBUTE_RIGHT_CAPTION = "rc"; private static final int VISIBLE_COUNT = 10; @@ -157,10 +168,14 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, } protected void updateCaptions(UIDL uidl) { - String leftCaption = (uidl.hasAttribute(ATTRIBUTE_LEFT_CAPTION) ? uidl - .getStringAttribute(ATTRIBUTE_LEFT_CAPTION) : null); - String rightCaption = (uidl.hasAttribute(ATTRIBUTE_RIGHT_CAPTION) ? uidl - .getStringAttribute(ATTRIBUTE_RIGHT_CAPTION) : null); + String leftCaption = (uidl + .hasAttribute(TwinColSelectConstants.ATTRIBUTE_LEFT_CAPTION) ? uidl + .getStringAttribute(TwinColSelectConstants.ATTRIBUTE_LEFT_CAPTION) + : null); + String rightCaption = (uidl + .hasAttribute(TwinColSelectConstants.ATTRIBUTE_RIGHT_CAPTION) ? uidl + .getStringAttribute(TwinColSelectConstants.ATTRIBUTE_RIGHT_CAPTION) + : null); boolean hasCaptions = (leftCaption != null || rightCaption != null); diff --git a/src/com/vaadin/terminal/gwt/client/ui/upload/UploadConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/upload/UploadConnector.java index af31491060..83be123eb9 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/upload/UploadConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/upload/UploadConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.upload; diff --git a/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategy.java b/client/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategy.java index 174a4b88ca..e81b4909ba 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategy.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategy.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.upload; diff --git a/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategyIE.java b/client/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategyIE.java index 17a7e46bd5..0f885261e3 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategyIE.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategyIE.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.upload; diff --git a/src/com/vaadin/terminal/gwt/client/ui/upload/VUpload.java b/client/src/com/vaadin/terminal/gwt/client/ui/upload/VUpload.java index 5cf2f2fe25..759236ea7f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/upload/VUpload.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/upload/VUpload.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.upload; diff --git a/src/com/vaadin/terminal/gwt/client/ui/video/VVideo.java b/client/src/com/vaadin/terminal/gwt/client/ui/video/VVideo.java index a2a4cd0ce3..5f8d1ee574 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/video/VVideo.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/video/VVideo.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.video; diff --git a/src/com/vaadin/terminal/gwt/client/ui/video/VideoConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/video/VideoConnector.java index d0c126832a..2b228d14ea 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/video/VideoConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/video/VideoConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.video; diff --git a/src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java b/client/src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java index 8ac0d0662b..1660eee246 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.window; diff --git a/src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java index bae4f804fc..a1bab91618 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.client.ui.window; diff --git a/src/com/vaadin/terminal/gwt/public/ie6pngfix/blank.gif b/client/src/com/vaadin/terminal/gwt/public/ie6pngfix/blank.gif Binary files differindex 3776af0784..3776af0784 100644 --- a/src/com/vaadin/terminal/gwt/public/ie6pngfix/blank.gif +++ b/client/src/com/vaadin/terminal/gwt/public/ie6pngfix/blank.gif diff --git a/sass/src/com/vaadin/sass/SassCompiler.java b/sass/src/com/vaadin/sass/SassCompiler.java index b1d779569b..8e4df2a62e 100644 --- a/sass/src/com/vaadin/sass/SassCompiler.java +++ b/sass/src/com/vaadin/sass/SassCompiler.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass; diff --git a/sass/src/com/vaadin/sass/ScssServlet.java b/sass/src/com/vaadin/sass/ScssServlet.java index 0eb03dd3ad..d85237aff2 100644 --- a/sass/src/com/vaadin/sass/ScssServlet.java +++ b/sass/src/com/vaadin/sass/ScssServlet.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass; diff --git a/sass/src/com/vaadin/sass/ScssStylesheet.java b/sass/src/com/vaadin/sass/ScssStylesheet.java index 44e329a6cd..b5e744afc4 100644 --- a/sass/src/com/vaadin/sass/ScssStylesheet.java +++ b/sass/src/com/vaadin/sass/ScssStylesheet.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass; diff --git a/sass/src/com/vaadin/sass/handler/SCSSDocumentHandler.java b/sass/src/com/vaadin/sass/handler/SCSSDocumentHandler.java index 0e882c0f4f..3da3efd39b 100644 --- a/sass/src/com/vaadin/sass/handler/SCSSDocumentHandler.java +++ b/sass/src/com/vaadin/sass/handler/SCSSDocumentHandler.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.handler; diff --git a/sass/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java b/sass/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java index 857c302f2d..33ff273412 100644 --- a/sass/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java +++ b/sass/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.handler; diff --git a/sass/src/com/vaadin/sass/selector/CompositeSelector.java b/sass/src/com/vaadin/sass/selector/CompositeSelector.java index c873619eb1..f187cf8f6b 100644 --- a/sass/src/com/vaadin/sass/selector/CompositeSelector.java +++ b/sass/src/com/vaadin/sass/selector/CompositeSelector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.selector; diff --git a/sass/src/com/vaadin/sass/selector/SelectorUtil.java b/sass/src/com/vaadin/sass/selector/SelectorUtil.java index 01ca215c14..d93f37c175 100644 --- a/sass/src/com/vaadin/sass/selector/SelectorUtil.java +++ b/sass/src/com/vaadin/sass/selector/SelectorUtil.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.selector; diff --git a/sass/src/com/vaadin/sass/tree/BlockNode.java b/sass/src/com/vaadin/sass/tree/BlockNode.java index cbb09b63c1..2879cd57ea 100644 --- a/sass/src/com/vaadin/sass/tree/BlockNode.java +++ b/sass/src/com/vaadin/sass/tree/BlockNode.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.tree; diff --git a/sass/src/com/vaadin/sass/tree/CommentNode.java b/sass/src/com/vaadin/sass/tree/CommentNode.java index 3bdb563312..5fb438bb08 100644 --- a/sass/src/com/vaadin/sass/tree/CommentNode.java +++ b/sass/src/com/vaadin/sass/tree/CommentNode.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.tree; diff --git a/sass/src/com/vaadin/sass/tree/EachNode.java b/sass/src/com/vaadin/sass/tree/EachNode.java index 986e7e563d..f7a90c2f02 100644 --- a/sass/src/com/vaadin/sass/tree/EachNode.java +++ b/sass/src/com/vaadin/sass/tree/EachNode.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.tree; diff --git a/sass/src/com/vaadin/sass/tree/ExtendNode.java b/sass/src/com/vaadin/sass/tree/ExtendNode.java index b7fb7715ac..65ecb254bb 100644 --- a/sass/src/com/vaadin/sass/tree/ExtendNode.java +++ b/sass/src/com/vaadin/sass/tree/ExtendNode.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.tree; diff --git a/sass/src/com/vaadin/sass/tree/ForNode.java b/sass/src/com/vaadin/sass/tree/ForNode.java index dba5b22d84..7c0239aa60 100644 --- a/sass/src/com/vaadin/sass/tree/ForNode.java +++ b/sass/src/com/vaadin/sass/tree/ForNode.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.tree; diff --git a/sass/src/com/vaadin/sass/tree/FunctionNode.java b/sass/src/com/vaadin/sass/tree/FunctionNode.java index bb27f7d020..90b5458235 100644 --- a/sass/src/com/vaadin/sass/tree/FunctionNode.java +++ b/sass/src/com/vaadin/sass/tree/FunctionNode.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.tree; diff --git a/sass/src/com/vaadin/sass/tree/IfNode.java b/sass/src/com/vaadin/sass/tree/IfNode.java index 022b38bf71..e425538104 100644 --- a/sass/src/com/vaadin/sass/tree/IfNode.java +++ b/sass/src/com/vaadin/sass/tree/IfNode.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.tree; diff --git a/sass/src/com/vaadin/sass/tree/ImportNode.java b/sass/src/com/vaadin/sass/tree/ImportNode.java index 1d25d2583f..ac070d6ffc 100644 --- a/sass/src/com/vaadin/sass/tree/ImportNode.java +++ b/sass/src/com/vaadin/sass/tree/ImportNode.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.tree; diff --git a/sass/src/com/vaadin/sass/tree/MediaNode.java b/sass/src/com/vaadin/sass/tree/MediaNode.java index 85b222eaf5..00a7442a24 100644 --- a/sass/src/com/vaadin/sass/tree/MediaNode.java +++ b/sass/src/com/vaadin/sass/tree/MediaNode.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.tree; diff --git a/sass/src/com/vaadin/sass/tree/MixinDefNode.java b/sass/src/com/vaadin/sass/tree/MixinDefNode.java index 5671a19cc8..b888d01971 100644 --- a/sass/src/com/vaadin/sass/tree/MixinDefNode.java +++ b/sass/src/com/vaadin/sass/tree/MixinDefNode.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.tree; diff --git a/sass/src/com/vaadin/sass/tree/MixinNode.java b/sass/src/com/vaadin/sass/tree/MixinNode.java index c45d468de1..0267b88e2d 100644 --- a/sass/src/com/vaadin/sass/tree/MixinNode.java +++ b/sass/src/com/vaadin/sass/tree/MixinNode.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.tree; diff --git a/sass/src/com/vaadin/sass/tree/NestPropertiesNode.java b/sass/src/com/vaadin/sass/tree/NestPropertiesNode.java index c74e88cabc..306a73ba87 100644 --- a/sass/src/com/vaadin/sass/tree/NestPropertiesNode.java +++ b/sass/src/com/vaadin/sass/tree/NestPropertiesNode.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.tree; diff --git a/sass/src/com/vaadin/sass/tree/Node.java b/sass/src/com/vaadin/sass/tree/Node.java index 12c70ed618..817327502b 100644 --- a/sass/src/com/vaadin/sass/tree/Node.java +++ b/sass/src/com/vaadin/sass/tree/Node.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.tree; diff --git a/sass/src/com/vaadin/sass/tree/RuleNode.java b/sass/src/com/vaadin/sass/tree/RuleNode.java index 2334a7d980..3b51468e1d 100644 --- a/sass/src/com/vaadin/sass/tree/RuleNode.java +++ b/sass/src/com/vaadin/sass/tree/RuleNode.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.tree; diff --git a/sass/src/com/vaadin/sass/tree/VariableNode.java b/sass/src/com/vaadin/sass/tree/VariableNode.java index 9df34e8e64..db014ae616 100644 --- a/sass/src/com/vaadin/sass/tree/VariableNode.java +++ b/sass/src/com/vaadin/sass/tree/VariableNode.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.tree; diff --git a/sass/src/com/vaadin/sass/tree/WhileNode.java b/sass/src/com/vaadin/sass/tree/WhileNode.java index 9c873a18a8..465fec061d 100644 --- a/sass/src/com/vaadin/sass/tree/WhileNode.java +++ b/sass/src/com/vaadin/sass/tree/WhileNode.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.tree; diff --git a/sass/src/com/vaadin/sass/util/ColorUtil.java b/sass/src/com/vaadin/sass/util/ColorUtil.java index fe3f8f6e9b..25e29ff9a2 100644 --- a/sass/src/com/vaadin/sass/util/ColorUtil.java +++ b/sass/src/com/vaadin/sass/util/ColorUtil.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.util; diff --git a/sass/src/com/vaadin/sass/util/DeepCopy.java b/sass/src/com/vaadin/sass/util/DeepCopy.java index 74845bb234..712b8ecc11 100644 --- a/sass/src/com/vaadin/sass/util/DeepCopy.java +++ b/sass/src/com/vaadin/sass/util/DeepCopy.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.util; diff --git a/sass/src/com/vaadin/sass/util/FastByteArrayInputStream.java b/sass/src/com/vaadin/sass/util/FastByteArrayInputStream.java index ba9acadee6..1b3d0ea0f7 100644 --- a/sass/src/com/vaadin/sass/util/FastByteArrayInputStream.java +++ b/sass/src/com/vaadin/sass/util/FastByteArrayInputStream.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.util; diff --git a/sass/src/com/vaadin/sass/util/FastByteArrayOutputStream.java b/sass/src/com/vaadin/sass/util/FastByteArrayOutputStream.java index 44edd1cffa..24b386686f 100644 --- a/sass/src/com/vaadin/sass/util/FastByteArrayOutputStream.java +++ b/sass/src/com/vaadin/sass/util/FastByteArrayOutputStream.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.util; diff --git a/sass/src/com/vaadin/sass/util/StringUtil.java b/sass/src/com/vaadin/sass/util/StringUtil.java index f7f4136c03..bd39f1d41a 100644 --- a/sass/src/com/vaadin/sass/util/StringUtil.java +++ b/sass/src/com/vaadin/sass/util/StringUtil.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.util; diff --git a/sass/src/com/vaadin/sass/visitor/BlockVisitor.java b/sass/src/com/vaadin/sass/visitor/BlockVisitor.java index 5f5227b5f2..6d2489e494 100644 --- a/sass/src/com/vaadin/sass/visitor/BlockVisitor.java +++ b/sass/src/com/vaadin/sass/visitor/BlockVisitor.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.visitor; diff --git a/sass/src/com/vaadin/sass/visitor/ExtendVisitor.java b/sass/src/com/vaadin/sass/visitor/ExtendVisitor.java index 5cf538604f..605c7930c3 100644 --- a/sass/src/com/vaadin/sass/visitor/ExtendVisitor.java +++ b/sass/src/com/vaadin/sass/visitor/ExtendVisitor.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.visitor; diff --git a/sass/src/com/vaadin/sass/visitor/ImportVisitor.java b/sass/src/com/vaadin/sass/visitor/ImportVisitor.java index 4dee49bc5c..00c0f41073 100644 --- a/sass/src/com/vaadin/sass/visitor/ImportVisitor.java +++ b/sass/src/com/vaadin/sass/visitor/ImportVisitor.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.visitor; @@ -61,7 +73,7 @@ public class ImportVisitor implements Visitor { if (url == null) { return null; } - int pos = url.lastIndexOf(File.separatorChar); + int pos = url.lastIndexOf('/'); if (pos == -1) { return null; } diff --git a/sass/src/com/vaadin/sass/visitor/MixinVisitor.java b/sass/src/com/vaadin/sass/visitor/MixinVisitor.java index 46c88eb3d7..68408574c3 100644 --- a/sass/src/com/vaadin/sass/visitor/MixinVisitor.java +++ b/sass/src/com/vaadin/sass/visitor/MixinVisitor.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.visitor; diff --git a/sass/src/com/vaadin/sass/visitor/NestPropertiesVisitor.java b/sass/src/com/vaadin/sass/visitor/NestPropertiesVisitor.java index 8914984008..82fbef42ef 100644 --- a/sass/src/com/vaadin/sass/visitor/NestPropertiesVisitor.java +++ b/sass/src/com/vaadin/sass/visitor/NestPropertiesVisitor.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.visitor; diff --git a/sass/src/com/vaadin/sass/visitor/ParentSelectorVisitor.java b/sass/src/com/vaadin/sass/visitor/ParentSelectorVisitor.java index b80e539dd7..f24d7ae09d 100644 --- a/sass/src/com/vaadin/sass/visitor/ParentSelectorVisitor.java +++ b/sass/src/com/vaadin/sass/visitor/ParentSelectorVisitor.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.visitor; diff --git a/sass/src/com/vaadin/sass/visitor/VariableVisitor.java b/sass/src/com/vaadin/sass/visitor/VariableVisitor.java index bb790a0aee..e8fb2fccc3 100644 --- a/sass/src/com/vaadin/sass/visitor/VariableVisitor.java +++ b/sass/src/com/vaadin/sass/visitor/VariableVisitor.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.visitor; diff --git a/sass/src/com/vaadin/sass/visitor/Visitor.java b/sass/src/com/vaadin/sass/visitor/Visitor.java index e6362c0811..046cb7c0d1 100644 --- a/sass/src/com/vaadin/sass/visitor/Visitor.java +++ b/sass/src/com/vaadin/sass/visitor/Visitor.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.visitor; diff --git a/src/com/vaadin/Application.java b/server/src/com/vaadin/Application.java index 6f4dccd028..b120c8455a 100644 --- a/src/com/vaadin/Application.java +++ b/server/src/com/vaadin/Application.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin; @@ -7,6 +19,7 @@ package com.vaadin; import java.io.IOException; import java.io.Serializable; import java.lang.annotation.Annotation; +import java.lang.reflect.Method; import java.net.SocketException; import java.net.URL; import java.util.ArrayList; @@ -35,7 +48,9 @@ import com.vaadin.annotations.Widgetset; import com.vaadin.data.util.converter.Converter; import com.vaadin.data.util.converter.ConverterFactory; import com.vaadin.data.util.converter.DefaultConverterFactory; +import com.vaadin.event.EventRouter; import com.vaadin.service.ApplicationContext; +import com.vaadin.shared.ApplicationConstants; import com.vaadin.terminal.AbstractErrorMessage; import com.vaadin.terminal.ApplicationResource; import com.vaadin.terminal.CombinedRequest; @@ -46,11 +61,15 @@ import com.vaadin.terminal.VariableOwner; import com.vaadin.terminal.WrappedRequest; import com.vaadin.terminal.WrappedRequest.BrowserDetails; import com.vaadin.terminal.WrappedResponse; -import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; +import com.vaadin.terminal.gwt.server.BootstrapFragmentResponse; +import com.vaadin.terminal.gwt.server.BootstrapListener; +import com.vaadin.terminal.gwt.server.BootstrapPageResponse; +import com.vaadin.terminal.gwt.server.BootstrapResponse; import com.vaadin.terminal.gwt.server.ChangeVariablesErrorEvent; import com.vaadin.terminal.gwt.server.ClientConnector; import com.vaadin.terminal.gwt.server.WebApplicationContext; +import com.vaadin.tools.ReflectTools; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractField; import com.vaadin.ui.Root; @@ -106,8 +125,6 @@ import com.vaadin.ui.Window; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") @@ -119,6 +136,13 @@ public class Application implements Terminal.ErrorListener, Serializable { */ public static final String ROOT_PARAMETER = "root"; + private static final Method BOOTSTRAP_FRAGMENT_METHOD = ReflectTools + .findMethod(BootstrapListener.class, "modifyBootstrapFragment", + BootstrapFragmentResponse.class); + private static final Method BOOTSTRAP_PAGE_METHOD = ReflectTools + .findMethod(BootstrapListener.class, "modifyBootstrapPage", + BootstrapPageResponse.class); + /** * A special application designed to help migrating applications from Vaadin * 6 to Vaadin 7. The legacy application supports setting a main window, @@ -468,6 +492,8 @@ public class Application implements Terminal.ErrorListener, Serializable { private final Map<String, Integer> retainOnRefreshRoots = new HashMap<String, Integer>(); + private final EventRouter eventRouter = new EventRouter(); + /** * Keeps track of which roots have been inited. * <p> @@ -763,8 +789,6 @@ public class Application implements Terminal.ErrorListener, Serializable { * Application user change event sent when the setUser is called to change * the current user of the application. * - * @version - * @VERSION@ * @since 3.0 */ public class UserChangeEvent extends java.util.EventObject { @@ -829,8 +853,6 @@ public class Application implements Terminal.ErrorListener, Serializable { * The <code>UserChangeListener</code> interface for listening application * user changes. * - * @version - * @VERSION@ * @since 3.0 */ public interface UserChangeListener extends EventListener, Serializable { @@ -2269,7 +2291,7 @@ public class Application implements Terminal.ErrorListener, Serializable { request = combinedRequest.getSecondRequest(); } String rootIdString = request - .getParameter(ApplicationConnection.ROOT_ID_PARAMETER); + .getParameter(ApplicationConstants.ROOT_ID_PARAMETER); Integer rootId = rootIdString == null ? null : new Integer(rootIdString); return rootId; @@ -2374,4 +2396,51 @@ public class Application implements Terminal.ErrorListener, Serializable { public Root getRootById(int rootId) { return roots.get(rootId); } + + /** + * Adds a listener that will be invoked when the bootstrap HTML is about to + * be generated. This can be used to modify the contents of the HTML that + * loads the Vaadin application in the browser and the HTTP headers that are + * included in the response serving the HTML. + * + * @see BootstrapListener#modifyBootstrapFragment(BootstrapFragmentResponse) + * @see BootstrapListener#modifyBootstrapPage(BootstrapPageResponse) + * + * @param listener + * the bootstrap listener to add + */ + public void addBootstrapListener(BootstrapListener listener) { + eventRouter.addListener(BootstrapFragmentResponse.class, listener, + BOOTSTRAP_FRAGMENT_METHOD); + eventRouter.addListener(BootstrapPageResponse.class, listener, + BOOTSTRAP_PAGE_METHOD); + } + + /** + * Remove a bootstrap listener that was previously added. + * + * @see #addBootstrapListener(BootstrapListener) + * + * @param listener + * the bootstrap listener to remove + */ + public void removeBootstrapListener(BootstrapListener listener) { + eventRouter.removeListener(BootstrapFragmentResponse.class, listener, + BOOTSTRAP_FRAGMENT_METHOD); + eventRouter.removeListener(BootstrapPageResponse.class, listener, + BOOTSTRAP_PAGE_METHOD); + } + + /** + * Fires a bootstrap event to all registered listeners. There are currently + * two supported events, both inheriting from {@link BootstrapResponse}: + * {@link BootstrapFragmentResponse} and {@link BootstrapPageResponse}. + * + * @param response + * the bootstrap response event for which listeners should be + * fired + */ + public void modifyBootstrapResponse(BootstrapResponse response) { + eventRouter.fireEvent(response); + } } diff --git a/src/com/vaadin/RootRequiresMoreInformationException.java b/server/src/com/vaadin/RootRequiresMoreInformationException.java index ed0fa41437..74026dd161 100644 --- a/src/com/vaadin/RootRequiresMoreInformationException.java +++ b/server/src/com/vaadin/RootRequiresMoreInformationException.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin; diff --git a/server/src/com/vaadin/annotations/AutoGenerated.java b/server/src/com/vaadin/annotations/AutoGenerated.java new file mode 100644 index 0000000000..cee0e3fcf6 --- /dev/null +++ b/server/src/com/vaadin/annotations/AutoGenerated.java @@ -0,0 +1,28 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.annotations; + +/** + * Marker annotation for automatically generated code elements. + * + * These elements may be modified or removed by code generation. + * + * @author Vaadin Ltd. + * @since 6.0 + */ +public @interface AutoGenerated { + +} diff --git a/src/com/vaadin/annotations/EagerInit.java b/server/src/com/vaadin/annotations/EagerInit.java index c7c2702d2a..5131a79576 100644 --- a/src/com/vaadin/annotations/EagerInit.java +++ b/server/src/com/vaadin/annotations/EagerInit.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.annotations; diff --git a/src/com/vaadin/annotations/JavaScript.java b/server/src/com/vaadin/annotations/JavaScript.java index 357bcc3649..7943fe1055 100644 --- a/src/com/vaadin/annotations/JavaScript.java +++ b/server/src/com/vaadin/annotations/JavaScript.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.annotations; @@ -26,7 +38,6 @@ import com.vaadin.terminal.gwt.server.ClientConnector; * the ClassLoader that was used to load com.example.MyConnector. * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ @Retention(RetentionPolicy.RUNTIME) diff --git a/src/com/vaadin/annotations/StyleSheet.java b/server/src/com/vaadin/annotations/StyleSheet.java index d082cb8d30..7833544ab5 100644 --- a/src/com/vaadin/annotations/StyleSheet.java +++ b/server/src/com/vaadin/annotations/StyleSheet.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.annotations; @@ -23,7 +35,6 @@ import com.vaadin.terminal.gwt.server.ClientConnector; * com.example.MyConnector. * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ @Retention(RetentionPolicy.RUNTIME) diff --git a/server/src/com/vaadin/annotations/Theme.java b/server/src/com/vaadin/annotations/Theme.java new file mode 100644 index 0000000000..e2610d2b3f --- /dev/null +++ b/server/src/com/vaadin/annotations/Theme.java @@ -0,0 +1,36 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.annotations; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import com.vaadin.ui.Root; + +/** + * Defines a specific theme for a {@link Root}. + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface Theme { + /** + * @return simple name of the theme + */ + public String value(); +} diff --git a/server/src/com/vaadin/annotations/Widgetset.java b/server/src/com/vaadin/annotations/Widgetset.java new file mode 100644 index 0000000000..e80f887691 --- /dev/null +++ b/server/src/com/vaadin/annotations/Widgetset.java @@ -0,0 +1,37 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.annotations; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import com.vaadin.ui.Root; + +/** + * Defines a specific theme for a {@link Root}. + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface Widgetset { + /** + * @return name of the widgetset + */ + public String value(); + +} diff --git a/src/com/vaadin/annotations/package.html b/server/src/com/vaadin/annotations/package.html index d789e9b5df..d789e9b5df 100644 --- a/src/com/vaadin/annotations/package.html +++ b/server/src/com/vaadin/annotations/package.html diff --git a/src/com/vaadin/data/Buffered.java b/server/src/com/vaadin/data/Buffered.java index 1387cb965b..5461d34fbd 100644 --- a/src/com/vaadin/data/Buffered.java +++ b/server/src/com/vaadin/data/Buffered.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data; @@ -36,8 +48,6 @@ import com.vaadin.data.Validator.InvalidValueException; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface Buffered extends Serializable { @@ -195,8 +205,6 @@ public interface Buffered extends Serializable { * in processing a data source. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/data/BufferedValidatable.java b/server/src/com/vaadin/data/BufferedValidatable.java index ce1d44fce6..a72119cf26 100644 --- a/src/com/vaadin/data/BufferedValidatable.java +++ b/server/src/com/vaadin/data/BufferedValidatable.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data; @@ -14,8 +26,6 @@ import java.io.Serializable; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface BufferedValidatable extends Buffered, Validatable, diff --git a/src/com/vaadin/data/Collapsible.java b/server/src/com/vaadin/data/Collapsible.java index 06c96b7ea7..64a78c3ab8 100644 --- a/src/com/vaadin/data/Collapsible.java +++ b/server/src/com/vaadin/data/Collapsible.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data; diff --git a/src/com/vaadin/data/Container.java b/server/src/com/vaadin/data/Container.java index f4c0ed9794..de53b88018 100644 --- a/src/com/vaadin/data/Container.java +++ b/server/src/com/vaadin/data/Container.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data; @@ -65,8 +77,6 @@ import com.vaadin.data.util.filter.UnsupportedFilterException; * </p> * * @author Vaadin Ltd - * @version - * @VERSION@ * @since 3.0 */ public interface Container extends Serializable { diff --git a/src/com/vaadin/data/Item.java b/server/src/com/vaadin/data/Item.java index 98b95aecff..684027e608 100644 --- a/src/com/vaadin/data/Item.java +++ b/server/src/com/vaadin/data/Item.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data; @@ -15,8 +27,6 @@ import java.util.Collection; * </p> * * @author Vaadin Ltd - * @version - * @VERSION@ * @since 3.0 */ public interface Item extends Serializable { diff --git a/src/com/vaadin/data/Property.java b/server/src/com/vaadin/data/Property.java index 9fab642381..3e5c6826bb 100644 --- a/src/com/vaadin/data/Property.java +++ b/server/src/com/vaadin/data/Property.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data; @@ -34,8 +46,6 @@ import java.io.Serializable; * type of values of the property * * @author Vaadin Ltd - * @version - * @VERSION@ * @since 3.0 */ public interface Property<T> extends Serializable { @@ -113,7 +123,6 @@ public interface Property<T> extends Serializable { * @param <T> * The type of the property * @author Vaadin Ltd - * @version @version@ * @since 7.0 */ public interface Transactional<T> extends Property<T> { @@ -166,8 +175,6 @@ public interface Property<T> extends Serializable { * modification failed because it's in read-only mode. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") @@ -197,8 +204,6 @@ public interface Property<T> extends Serializable { * as a data source. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface Viewer extends Serializable { @@ -231,8 +236,6 @@ public interface Property<T> extends Serializable { * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface Editor extends Property.Viewer, Serializable { @@ -246,8 +249,6 @@ public interface Property<T> extends Serializable { * changed. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface ValueChangeEvent extends Serializable { @@ -265,8 +266,6 @@ public interface Property<T> extends Serializable { * <code>ValueChangeEvent</code> objects. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface ValueChangeListener extends Serializable { @@ -295,8 +294,6 @@ public interface Property<T> extends Serializable { * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface ValueChangeNotifier extends Serializable { @@ -325,8 +322,6 @@ public interface Property<T> extends Serializable { * status has been changed. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface ReadOnlyStatusChangeEvent extends Serializable { @@ -344,8 +339,6 @@ public interface Property<T> extends Serializable { * <code>ReadOnlyStatusChangeEvent</code> objects. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface ReadOnlyStatusChangeListener extends Serializable { @@ -376,8 +369,6 @@ public interface Property<T> extends Serializable { * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface ReadOnlyStatusChangeNotifier extends Serializable { diff --git a/src/com/vaadin/data/Validatable.java b/server/src/com/vaadin/data/Validatable.java index 4a7a0fda10..a454e6f821 100644 --- a/src/com/vaadin/data/Validatable.java +++ b/server/src/com/vaadin/data/Validatable.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data; @@ -15,8 +27,6 @@ import java.util.Collection; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 * @see com.vaadin.data.Validator */ diff --git a/src/com/vaadin/data/Validator.java b/server/src/com/vaadin/data/Validator.java index 768a02babe..ef07d3eadc 100644 --- a/src/com/vaadin/data/Validator.java +++ b/server/src/com/vaadin/data/Validator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data; @@ -33,8 +45,6 @@ import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface Validator extends Serializable { @@ -61,8 +71,6 @@ public interface Validator extends Serializable { * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") @@ -160,8 +168,6 @@ public interface Validator extends Serializable { * the thrower. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 5.3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/data/fieldgroup/BeanFieldGroup.java b/server/src/com/vaadin/data/fieldgroup/BeanFieldGroup.java index b8efa5b1e4..b1e2941ee2 100644 --- a/src/com/vaadin/data/fieldgroup/BeanFieldGroup.java +++ b/server/src/com/vaadin/data/fieldgroup/BeanFieldGroup.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.fieldgroup; diff --git a/server/src/com/vaadin/data/fieldgroup/Caption.java b/server/src/com/vaadin/data/fieldgroup/Caption.java new file mode 100644 index 0000000000..9501c3398e --- /dev/null +++ b/server/src/com/vaadin/data/fieldgroup/Caption.java @@ -0,0 +1,27 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.data.fieldgroup; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ ElementType.FIELD }) +@Retention(RetentionPolicy.RUNTIME) +public @interface Caption { + String value(); +} diff --git a/src/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java b/server/src/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java index be0db328f2..fecaf9ce22 100644 --- a/src/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java +++ b/server/src/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.fieldgroup; diff --git a/src/com/vaadin/data/fieldgroup/FieldGroup.java b/server/src/com/vaadin/data/fieldgroup/FieldGroup.java index 3df19f5bc9..d79697f548 100644 --- a/src/com/vaadin/data/fieldgroup/FieldGroup.java +++ b/server/src/com/vaadin/data/fieldgroup/FieldGroup.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.fieldgroup; @@ -39,7 +51,6 @@ import com.vaadin.ui.Form; * </p> * * @author Vaadin Ltd - * @version @version@ * @since 7.0 */ public class FieldGroup implements Serializable { diff --git a/src/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java b/server/src/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java index 80c012cbdc..0958e346d6 100644 --- a/src/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java +++ b/server/src/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.fieldgroup; @@ -12,7 +24,6 @@ import com.vaadin.ui.Field; * that should be edited. * * @author Vaadin Ltd. - * @version @version@ * @since 7.0 */ public interface FieldGroupFieldFactory extends Serializable { diff --git a/server/src/com/vaadin/data/fieldgroup/PropertyId.java b/server/src/com/vaadin/data/fieldgroup/PropertyId.java new file mode 100644 index 0000000000..2c7f981dbc --- /dev/null +++ b/server/src/com/vaadin/data/fieldgroup/PropertyId.java @@ -0,0 +1,27 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.data.fieldgroup; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ ElementType.FIELD }) +@Retention(RetentionPolicy.RUNTIME) +public @interface PropertyId { + String value(); +} diff --git a/src/com/vaadin/data/package.html b/server/src/com/vaadin/data/package.html index a14ea1ac88..a14ea1ac88 100644 --- a/src/com/vaadin/data/package.html +++ b/server/src/com/vaadin/data/package.html diff --git a/src/com/vaadin/data/util/AbstractBeanContainer.java b/server/src/com/vaadin/data/util/AbstractBeanContainer.java index 2f428d2cb6..9cd4afa3c2 100644 --- a/src/com/vaadin/data/util/AbstractBeanContainer.java +++ b/server/src/com/vaadin/data/util/AbstractBeanContainer.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; diff --git a/src/com/vaadin/data/util/AbstractContainer.java b/server/src/com/vaadin/data/util/AbstractContainer.java index 7d96c2d757..fbce468bce 100644 --- a/src/com/vaadin/data/util/AbstractContainer.java +++ b/server/src/com/vaadin/data/util/AbstractContainer.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; diff --git a/src/com/vaadin/data/util/AbstractInMemoryContainer.java b/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java index b7832756f2..fd2ced2d4a 100644 --- a/src/com/vaadin/data/util/AbstractInMemoryContainer.java +++ b/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; diff --git a/src/com/vaadin/data/util/AbstractProperty.java b/server/src/com/vaadin/data/util/AbstractProperty.java index 373a8dfd58..f508156d05 100644 --- a/src/com/vaadin/data/util/AbstractProperty.java +++ b/server/src/com/vaadin/data/util/AbstractProperty.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; diff --git a/src/com/vaadin/data/util/BeanContainer.java b/server/src/com/vaadin/data/util/BeanContainer.java index bc1ee3c39e..dbbcffeedc 100644 --- a/src/com/vaadin/data/util/BeanContainer.java +++ b/server/src/com/vaadin/data/util/BeanContainer.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; diff --git a/src/com/vaadin/data/util/BeanItem.java b/server/src/com/vaadin/data/util/BeanItem.java index 94439471f5..42cd8493bd 100644 --- a/src/com/vaadin/data/util/BeanItem.java +++ b/server/src/com/vaadin/data/util/BeanItem.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; @@ -22,8 +34,6 @@ import java.util.Set; * A wrapper class for adding the Item interface to any Java Bean. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/data/util/BeanItemContainer.java b/server/src/com/vaadin/data/util/BeanItemContainer.java index dc4deaebdc..3f3bf1de9d 100644 --- a/src/com/vaadin/data/util/BeanItemContainer.java +++ b/server/src/com/vaadin/data/util/BeanItemContainer.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; diff --git a/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java index 717ce834cf..8f9000bce0 100644 --- a/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java +++ b/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; @@ -33,8 +45,6 @@ import com.vaadin.data.Property; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/data/util/ContainerOrderedWrapper.java b/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java index d3d6f88d3e..d332931008 100644 --- a/src/com/vaadin/data/util/ContainerOrderedWrapper.java +++ b/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; @@ -27,8 +39,6 @@ import com.vaadin.data.Property; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/data/util/DefaultItemSorter.java b/server/src/com/vaadin/data/util/DefaultItemSorter.java index 81b15ebd4f..6edac84b81 100644 --- a/src/com/vaadin/data/util/DefaultItemSorter.java +++ b/server/src/com/vaadin/data/util/DefaultItemSorter.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; diff --git a/src/com/vaadin/data/util/FilesystemContainer.java b/server/src/com/vaadin/data/util/FilesystemContainer.java index cdfeb57e14..54ee2d6f0c 100644 --- a/src/com/vaadin/data/util/FilesystemContainer.java +++ b/server/src/com/vaadin/data/util/FilesystemContainer.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; @@ -28,8 +40,6 @@ import com.vaadin.terminal.Resource; * A hierarchical container wrapper for a filesystem. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") @@ -602,8 +612,6 @@ public class FilesystemContainer implements Container.Hierarchical { * A Item wrapper for files in a filesystem. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public class FileItem implements Item { @@ -759,8 +767,6 @@ public class FilesystemContainer implements Container.Hierarchical { * extension. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public class FileExtensionFilter implements FilenameFilter, Serializable { diff --git a/src/com/vaadin/data/util/HierarchicalContainer.java b/server/src/com/vaadin/data/util/HierarchicalContainer.java index 06ab77c0e7..8338e3c190 100644 --- a/src/com/vaadin/data/util/HierarchicalContainer.java +++ b/server/src/com/vaadin/data/util/HierarchicalContainer.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; @@ -20,8 +32,6 @@ import com.vaadin.data.Item; * tree-like structure. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java b/server/src/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java index 172dc0dd4f..bd9260b063 100644 --- a/src/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java +++ b/server/src/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; diff --git a/src/com/vaadin/data/util/IndexedContainer.java b/server/src/com/vaadin/data/util/IndexedContainer.java index b95b2c4de8..5566b2f18c 100644 --- a/src/com/vaadin/data/util/IndexedContainer.java +++ b/server/src/com/vaadin/data/util/IndexedContainer.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; @@ -40,8 +52,6 @@ import com.vaadin.data.util.filter.UnsupportedFilterException; * @see com.vaadin.data.Container * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @@ -423,8 +433,6 @@ public class IndexedContainer extends * changed. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public static class ItemSetChangeEvent extends BaseItemSetChangeEvent { @@ -453,8 +461,6 @@ public class IndexedContainer extends * value has changed. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ private static class PropertyValueChangeEvent extends EventObject implements @@ -653,7 +659,6 @@ public class IndexedContainer extends * * @author Vaadin Ltd. * - * @version @VERSION@ * * @since 3.0 */ @@ -791,8 +796,6 @@ public class IndexedContainer extends * * @author Vaadin Ltd. * - * @version - * @VERSION@ * @since 3.0 */ private class IndexedContainerProperty implements Property<Object>, diff --git a/src/com/vaadin/data/util/ItemSorter.java b/server/src/com/vaadin/data/util/ItemSorter.java index 4399dbe292..48697b0957 100644 --- a/src/com/vaadin/data/util/ItemSorter.java +++ b/server/src/com/vaadin/data/util/ItemSorter.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; diff --git a/src/com/vaadin/data/util/ListSet.java b/server/src/com/vaadin/data/util/ListSet.java index b71cc46898..ffcd996a75 100644 --- a/src/com/vaadin/data/util/ListSet.java +++ b/server/src/com/vaadin/data/util/ListSet.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; diff --git a/src/com/vaadin/data/util/MethodProperty.java b/server/src/com/vaadin/data/util/MethodProperty.java index 0c64d90481..1ae60daac0 100644 --- a/src/com/vaadin/data/util/MethodProperty.java +++ b/server/src/com/vaadin/data/util/MethodProperty.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; @@ -41,8 +53,6 @@ import com.vaadin.util.SerializerHelper; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") @@ -694,8 +704,6 @@ public class MethodProperty<T> extends AbstractProperty<T> { * property. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("rawtypes") diff --git a/src/com/vaadin/data/util/MethodPropertyDescriptor.java b/server/src/com/vaadin/data/util/MethodPropertyDescriptor.java index a2a76ec6cf..21af439f5c 100644 --- a/src/com/vaadin/data/util/MethodPropertyDescriptor.java +++ b/server/src/com/vaadin/data/util/MethodPropertyDescriptor.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; diff --git a/src/com/vaadin/data/util/NestedMethodProperty.java b/server/src/com/vaadin/data/util/NestedMethodProperty.java index 9bff38456d..692e6a085f 100644 --- a/src/com/vaadin/data/util/NestedMethodProperty.java +++ b/server/src/com/vaadin/data/util/NestedMethodProperty.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; diff --git a/src/com/vaadin/data/util/NestedPropertyDescriptor.java b/server/src/com/vaadin/data/util/NestedPropertyDescriptor.java index b67b425d1d..702ab957b9 100644 --- a/src/com/vaadin/data/util/NestedPropertyDescriptor.java +++ b/server/src/com/vaadin/data/util/NestedPropertyDescriptor.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; diff --git a/src/com/vaadin/data/util/ObjectProperty.java b/server/src/com/vaadin/data/util/ObjectProperty.java index cb85b44c2a..9e9687b2d5 100644 --- a/src/com/vaadin/data/util/ObjectProperty.java +++ b/server/src/com/vaadin/data/util/ObjectProperty.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; @@ -12,8 +24,6 @@ import com.vaadin.data.Property; * interface. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/data/util/PropertyFormatter.java b/server/src/com/vaadin/data/util/PropertyFormatter.java index 3d65726309..26f93b9582 100644 --- a/src/com/vaadin/data/util/PropertyFormatter.java +++ b/server/src/com/vaadin/data/util/PropertyFormatter.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; diff --git a/src/com/vaadin/data/util/PropertysetItem.java b/server/src/com/vaadin/data/util/PropertysetItem.java index 22f2da75b2..e86d813809 100644 --- a/src/com/vaadin/data/util/PropertysetItem.java +++ b/server/src/com/vaadin/data/util/PropertysetItem.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; @@ -21,8 +33,6 @@ import com.vaadin.data.Property; * set managed by the class. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") @@ -163,8 +173,6 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, * changed. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ private static class PropertySetChangeEvent extends EventObject implements diff --git a/src/com/vaadin/data/util/QueryContainer.java b/server/src/com/vaadin/data/util/QueryContainer.java index dc7c883a7e..add93c25ee 100644 --- a/src/com/vaadin/data/util/QueryContainer.java +++ b/server/src/com/vaadin/data/util/QueryContainer.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; @@ -42,7 +54,6 @@ import com.vaadin.data.Property; * @see com.vaadin.data.Container * * @author Vaadin Ltd. - * @version * @since 4.0 * * @deprecated will be removed in the future, use the SQLContainer add-on @@ -517,7 +528,6 @@ public class QueryContainer implements Container, Container.Ordered, * The <code>Row</code> class implements methods of Item. * * @author Vaadin Ltd. - * @version * @since 4.0 */ class Row implements Item { diff --git a/src/com/vaadin/data/util/TextFileProperty.java b/server/src/com/vaadin/data/util/TextFileProperty.java index 598b721a9c..05d0c6f683 100644 --- a/src/com/vaadin/data/util/TextFileProperty.java +++ b/server/src/com/vaadin/data/util/TextFileProperty.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; diff --git a/src/com/vaadin/data/util/TransactionalPropertyWrapper.java b/server/src/com/vaadin/data/util/TransactionalPropertyWrapper.java index d042bfaac2..c03a4ce959 100644 --- a/src/com/vaadin/data/util/TransactionalPropertyWrapper.java +++ b/server/src/com/vaadin/data/util/TransactionalPropertyWrapper.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; @@ -25,7 +37,6 @@ import com.vaadin.data.Property.ValueChangeNotifier; * @see com.vaadin.data.Property.Transactional * * @author Vaadin Ltd - * @version @version@ * @since 7.0 * * @param <T> diff --git a/src/com/vaadin/data/util/VaadinPropertyDescriptor.java b/server/src/com/vaadin/data/util/VaadinPropertyDescriptor.java index ee1e525540..1af57fa1a1 100644 --- a/src/com/vaadin/data/util/VaadinPropertyDescriptor.java +++ b/server/src/com/vaadin/data/util/VaadinPropertyDescriptor.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util; diff --git a/src/com/vaadin/data/util/converter/Converter.java b/server/src/com/vaadin/data/util/converter/Converter.java index b8c15e8cdc..40faa37013 100644 --- a/src/com/vaadin/data/util/converter/Converter.java +++ b/server/src/com/vaadin/data/util/converter/Converter.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.converter; @@ -33,8 +45,6 @@ import java.util.Locale; * The presentation type. Must be compatible with what * {@link #getPresentationType()} returns. * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 7.0 */ public interface Converter<PRESENTATION, MODEL> extends Serializable { @@ -107,8 +117,6 @@ public interface Converter<PRESENTATION, MODEL> extends Serializable { * {@link Converter#convertToModel(Object, Locale)} could not be converted. * * @author Vaadin Ltd - * @version - * @VERSION@ * @since 7.0 */ public static class ConversionException extends RuntimeException { diff --git a/server/src/com/vaadin/data/util/converter/ConverterFactory.java b/server/src/com/vaadin/data/util/converter/ConverterFactory.java new file mode 100644 index 0000000000..63ad835d22 --- /dev/null +++ b/server/src/com/vaadin/data/util/converter/ConverterFactory.java @@ -0,0 +1,33 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.data.util.converter; + +import java.io.Serializable; + +/** + * Factory interface for providing Converters based on a presentation type and a + * model type. + * + * @author Vaadin Ltd. + * @since 7.0 + * + */ +public interface ConverterFactory extends Serializable { + public <PRESENTATION, MODEL> Converter<PRESENTATION, MODEL> createConverter( + Class<PRESENTATION> presentationType, Class<MODEL> modelType); + +} diff --git a/src/com/vaadin/data/util/converter/ConverterUtil.java b/server/src/com/vaadin/data/util/converter/ConverterUtil.java index 7011496ed7..36cd6d0859 100644 --- a/src/com/vaadin/data/util/converter/ConverterUtil.java +++ b/server/src/com/vaadin/data/util/converter/ConverterUtil.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.converter; diff --git a/src/com/vaadin/data/util/converter/DateToLongConverter.java b/server/src/com/vaadin/data/util/converter/DateToLongConverter.java index aeba38aa1f..24580fb4c7 100644 --- a/src/com/vaadin/data/util/converter/DateToLongConverter.java +++ b/server/src/com/vaadin/data/util/converter/DateToLongConverter.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.converter; @@ -11,8 +23,6 @@ import java.util.Locale; * A converter that converts from {@link Long} to {@link Date} and back. * * @author Vaadin Ltd - * @version - * @VERSION@ * @since 7.0 */ public class DateToLongConverter implements Converter<Date, Long> { diff --git a/src/com/vaadin/data/util/converter/DefaultConverterFactory.java b/server/src/com/vaadin/data/util/converter/DefaultConverterFactory.java index afb95d81ed..ffd432076f 100644 --- a/src/com/vaadin/data/util/converter/DefaultConverterFactory.java +++ b/server/src/com/vaadin/data/util/converter/DefaultConverterFactory.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.converter; @@ -18,8 +30,6 @@ import com.vaadin.Application; * </p> * * @author Vaadin Ltd - * @version - * @VERSION@ * @since 7.0 */ public class DefaultConverterFactory implements ConverterFactory { diff --git a/src/com/vaadin/data/util/converter/ReverseConverter.java b/server/src/com/vaadin/data/util/converter/ReverseConverter.java index fa1bb5daf1..8e34cd1844 100644 --- a/src/com/vaadin/data/util/converter/ReverseConverter.java +++ b/server/src/com/vaadin/data/util/converter/ReverseConverter.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.converter; @@ -16,8 +28,6 @@ import java.util.Locale; * The target type * * @author Vaadin Ltd - * @version - * @VERSION@ * @since 7.0 */ public class ReverseConverter<PRESENTATION, MODEL> implements diff --git a/src/com/vaadin/data/util/converter/StringToBooleanConverter.java b/server/src/com/vaadin/data/util/converter/StringToBooleanConverter.java index 999f575dc4..595cdc1957 100644 --- a/src/com/vaadin/data/util/converter/StringToBooleanConverter.java +++ b/server/src/com/vaadin/data/util/converter/StringToBooleanConverter.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.converter; @@ -14,8 +26,6 @@ import java.util.Locale; * </p> * * @author Vaadin Ltd - * @version - * @VERSION@ * @since 7.0 */ public class StringToBooleanConverter implements Converter<String, Boolean> { diff --git a/src/com/vaadin/data/util/converter/StringToDateConverter.java b/server/src/com/vaadin/data/util/converter/StringToDateConverter.java index 487b02b2aa..0437e8391c 100644 --- a/src/com/vaadin/data/util/converter/StringToDateConverter.java +++ b/server/src/com/vaadin/data/util/converter/StringToDateConverter.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.converter; @@ -20,8 +32,6 @@ import java.util.Locale; * </p> * * @author Vaadin Ltd - * @version - * @VERSION@ * @since 7.0 */ public class StringToDateConverter implements Converter<String, Date> { diff --git a/src/com/vaadin/data/util/converter/StringToDoubleConverter.java b/server/src/com/vaadin/data/util/converter/StringToDoubleConverter.java index 251f91855b..1c95d4fceb 100644 --- a/src/com/vaadin/data/util/converter/StringToDoubleConverter.java +++ b/server/src/com/vaadin/data/util/converter/StringToDoubleConverter.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.converter; @@ -20,8 +32,6 @@ import java.util.Locale; * </p> * * @author Vaadin Ltd - * @version - * @VERSION@ * @since 7.0 */ public class StringToDoubleConverter implements Converter<String, Double> { diff --git a/src/com/vaadin/data/util/converter/StringToIntegerConverter.java b/server/src/com/vaadin/data/util/converter/StringToIntegerConverter.java index 950f01c6ab..6240995121 100644 --- a/src/com/vaadin/data/util/converter/StringToIntegerConverter.java +++ b/server/src/com/vaadin/data/util/converter/StringToIntegerConverter.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.converter; @@ -17,8 +29,6 @@ import java.util.Locale; * </p> * * @author Vaadin Ltd - * @version - * @VERSION@ * @since 7.0 */ public class StringToIntegerConverter implements Converter<String, Integer> { diff --git a/src/com/vaadin/data/util/converter/StringToNumberConverter.java b/server/src/com/vaadin/data/util/converter/StringToNumberConverter.java index 42699a326a..fe9cf9621f 100644 --- a/src/com/vaadin/data/util/converter/StringToNumberConverter.java +++ b/server/src/com/vaadin/data/util/converter/StringToNumberConverter.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.converter; @@ -16,8 +28,6 @@ import java.util.Locale; * </p> * * @author Vaadin Ltd - * @version - * @VERSION@ * @since 7.0 */ public class StringToNumberConverter implements Converter<String, Number> { diff --git a/src/com/vaadin/data/util/filter/AbstractJunctionFilter.java b/server/src/com/vaadin/data/util/filter/AbstractJunctionFilter.java index 482b10120c..5236d43a86 100644 --- a/src/com/vaadin/data/util/filter/AbstractJunctionFilter.java +++ b/server/src/com/vaadin/data/util/filter/AbstractJunctionFilter.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.filter; diff --git a/src/com/vaadin/data/util/filter/And.java b/server/src/com/vaadin/data/util/filter/And.java index ca6c35aba7..50a502b83b 100644 --- a/src/com/vaadin/data/util/filter/And.java +++ b/server/src/com/vaadin/data/util/filter/And.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.filter; diff --git a/src/com/vaadin/data/util/filter/Between.java b/server/src/com/vaadin/data/util/filter/Between.java index b00a74d13d..a4171d1cf4 100644 --- a/src/com/vaadin/data/util/filter/Between.java +++ b/server/src/com/vaadin/data/util/filter/Between.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.filter; diff --git a/src/com/vaadin/data/util/filter/Compare.java b/server/src/com/vaadin/data/util/filter/Compare.java index 4091f5b922..7730bace6b 100644 --- a/src/com/vaadin/data/util/filter/Compare.java +++ b/server/src/com/vaadin/data/util/filter/Compare.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.filter; diff --git a/src/com/vaadin/data/util/filter/IsNull.java b/server/src/com/vaadin/data/util/filter/IsNull.java index 3faf4153ee..f07e266e04 100644 --- a/src/com/vaadin/data/util/filter/IsNull.java +++ b/server/src/com/vaadin/data/util/filter/IsNull.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.filter; diff --git a/src/com/vaadin/data/util/filter/Like.java b/server/src/com/vaadin/data/util/filter/Like.java index 3dcc48e809..ef32e5bbd0 100644 --- a/src/com/vaadin/data/util/filter/Like.java +++ b/server/src/com/vaadin/data/util/filter/Like.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.filter; diff --git a/src/com/vaadin/data/util/filter/Not.java b/server/src/com/vaadin/data/util/filter/Not.java index bbfc9ca86a..69ed37ff48 100644 --- a/src/com/vaadin/data/util/filter/Not.java +++ b/server/src/com/vaadin/data/util/filter/Not.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.filter; diff --git a/src/com/vaadin/data/util/filter/Or.java b/server/src/com/vaadin/data/util/filter/Or.java index b60074f7e3..cf41e22ace 100644 --- a/src/com/vaadin/data/util/filter/Or.java +++ b/server/src/com/vaadin/data/util/filter/Or.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.filter; diff --git a/src/com/vaadin/data/util/filter/SimpleStringFilter.java b/server/src/com/vaadin/data/util/filter/SimpleStringFilter.java index f98b2c02b4..0223f5045f 100644 --- a/src/com/vaadin/data/util/filter/SimpleStringFilter.java +++ b/server/src/com/vaadin/data/util/filter/SimpleStringFilter.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.filter; diff --git a/src/com/vaadin/data/util/filter/UnsupportedFilterException.java b/server/src/com/vaadin/data/util/filter/UnsupportedFilterException.java index c09cc474e9..7dcff1b250 100644 --- a/src/com/vaadin/data/util/filter/UnsupportedFilterException.java +++ b/server/src/com/vaadin/data/util/filter/UnsupportedFilterException.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.filter; diff --git a/src/com/vaadin/data/util/package.html b/server/src/com/vaadin/data/util/package.html index 07e3acde9e..07e3acde9e 100644 --- a/src/com/vaadin/data/util/package.html +++ b/server/src/com/vaadin/data/util/package.html diff --git a/src/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java b/server/src/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java index 788966048d..6fc082bfeb 100644 --- a/src/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer; diff --git a/src/com/vaadin/data/util/sqlcontainer/CacheMap.java b/server/src/com/vaadin/data/util/sqlcontainer/CacheMap.java index 839fceb3c2..e96dd17d28 100644 --- a/src/com/vaadin/data/util/sqlcontainer/CacheMap.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/CacheMap.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer; diff --git a/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java b/server/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java index 168bce1880..3e55633574 100644 --- a/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer; diff --git a/src/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java b/server/src/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java index adfd439ac8..c1121c50a4 100644 --- a/src/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer; diff --git a/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java b/server/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java index c73ffce63a..d37e8119a0 100644 --- a/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer; diff --git a/src/com/vaadin/data/util/sqlcontainer/Reference.java b/server/src/com/vaadin/data/util/sqlcontainer/Reference.java index dea1aa87c0..0611ab39fe 100644 --- a/src/com/vaadin/data/util/sqlcontainer/Reference.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/Reference.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer; diff --git a/src/com/vaadin/data/util/sqlcontainer/RowId.java b/server/src/com/vaadin/data/util/sqlcontainer/RowId.java index 925325134a..08442c9a32 100644 --- a/src/com/vaadin/data/util/sqlcontainer/RowId.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/RowId.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer; diff --git a/src/com/vaadin/data/util/sqlcontainer/RowItem.java b/server/src/com/vaadin/data/util/sqlcontainer/RowItem.java index d613a06b63..ed256b2b5a 100644 --- a/src/com/vaadin/data/util/sqlcontainer/RowItem.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/RowItem.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer; diff --git a/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java b/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java index 5827390723..78700caee9 100644 --- a/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer; diff --git a/src/com/vaadin/data/util/sqlcontainer/SQLUtil.java b/server/src/com/vaadin/data/util/sqlcontainer/SQLUtil.java index 4a48dbf499..cbe6c898f6 100644 --- a/src/com/vaadin/data/util/sqlcontainer/SQLUtil.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/SQLUtil.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer; diff --git a/src/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java b/server/src/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java index b4bca75a2a..6ef25a58bd 100644 --- a/src/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer; diff --git a/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java b/server/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java index 9aa4f7c4be..b795f16566 100644 --- a/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.connection; diff --git a/src/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java b/server/src/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java index cf12461588..1c5e510fa2 100644 --- a/src/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.connection; diff --git a/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java b/server/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java index 21760014b9..56a0450e0c 100644 --- a/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.connection; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java b/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java index ec986fab95..d6457bfe7b 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.query; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java b/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java index 433d742be8..5b14ab53b9 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.query; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java b/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java index 95521c5019..efc060953d 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.query; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/OrderBy.java b/server/src/com/vaadin/data/util/sqlcontainer/query/OrderBy.java index 8ebe10067e..58d1ecb90a 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/OrderBy.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/OrderBy.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.query; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java b/server/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java index 6e4396fad1..3e1866932b 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.query; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java b/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java index d0606704f7..e4544a491a 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.query; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java index 6485330541..c4b640e274 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.query.generator; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java index 13ef1d0090..937153f9c2 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.query.generator; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java index 43a562d3a8..6cb429a987 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.query.generator; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java index dde7077eee..a92ac588fa 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.query.generator; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java index b012ce7685..a6f343918d 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.query.generator; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java index 251a543a8a..7a296d8a76 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.query.generator.filter; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java index 4fcaf759ea..0a35a56a11 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.query.generator.filter; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java index 4293e1d630..441075ca19 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.query.generator.filter; diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java new file mode 100644 index 0000000000..4c29f4a01b --- /dev/null +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java @@ -0,0 +1,28 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.data.util.sqlcontainer.query.generator.filter; + +import java.io.Serializable; + +import com.vaadin.data.Container.Filter; +import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; + +public interface FilterTranslator extends Serializable { + public boolean translatesFilter(Filter filter); + + public String getWhereStringForFilter(Filter filter, StatementHelper sh); + +} diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java index a2a6cd2c09..f0bae918e5 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.query.generator.filter; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java index 25a85caec0..a5eadada92 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.query.generator.filter; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java index 5dfbe240e7..81f983de30 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.query.generator.filter; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java index 2f0ed814e0..261a892bea 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.query.generator.filter; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java index 24be8963e0..6414dedcb0 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.query.generator.filter; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java index f108003535..afff8d077e 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.query.generator.filter; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java index 8d2eabb5bc..9f94755d7a 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.util.sqlcontainer.query.generator.filter; diff --git a/src/com/vaadin/data/validator/AbstractStringValidator.java b/server/src/com/vaadin/data/validator/AbstractStringValidator.java index 5267cc7b7b..d1900ea16d 100644 --- a/src/com/vaadin/data/validator/AbstractStringValidator.java +++ b/server/src/com/vaadin/data/validator/AbstractStringValidator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.validator; @@ -13,7 +25,6 @@ package com.vaadin.data.validator; * </p> * * @author Vaadin Ltd. - * @version @VERSION@ * @since 5.4 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/data/validator/AbstractValidator.java b/server/src/com/vaadin/data/validator/AbstractValidator.java index 8febe5338a..9f8226f796 100644 --- a/src/com/vaadin/data/validator/AbstractValidator.java +++ b/server/src/com/vaadin/data/validator/AbstractValidator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.validator; @@ -30,8 +42,6 @@ import com.vaadin.data.Validator; * @param <T> * The type * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 5.4 */ public abstract class AbstractValidator<T> implements Validator { diff --git a/src/com/vaadin/data/validator/BeanValidator.java b/server/src/com/vaadin/data/validator/BeanValidator.java index 816ff79b83..7681f7e47e 100644 --- a/src/com/vaadin/data/validator/BeanValidator.java +++ b/server/src/com/vaadin/data/validator/BeanValidator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.validator; diff --git a/src/com/vaadin/data/validator/CompositeValidator.java b/server/src/com/vaadin/data/validator/CompositeValidator.java index cad31c9d4d..58a7fd2192 100644 --- a/src/com/vaadin/data/validator/CompositeValidator.java +++ b/server/src/com/vaadin/data/validator/CompositeValidator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.validator; @@ -19,7 +31,6 @@ import com.vaadin.data.Validator; * <code>AND</code> and <code>OR</code>. * * @author Vaadin Ltd. - * @version @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/data/validator/DateRangeValidator.java b/server/src/com/vaadin/data/validator/DateRangeValidator.java index 24f3d3ce10..44c0d1e929 100644 --- a/src/com/vaadin/data/validator/DateRangeValidator.java +++ b/server/src/com/vaadin/data/validator/DateRangeValidator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.validator; @@ -17,8 +29,6 @@ import com.vaadin.ui.DateField.Resolution; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 7.0 */ public class DateRangeValidator extends RangeValidator<Date> { diff --git a/src/com/vaadin/data/validator/DoubleRangeValidator.java b/server/src/com/vaadin/data/validator/DoubleRangeValidator.java index 05ae2f827e..3b0d4605e2 100644 --- a/src/com/vaadin/data/validator/DoubleRangeValidator.java +++ b/server/src/com/vaadin/data/validator/DoubleRangeValidator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.validator; @@ -7,8 +19,6 @@ package com.vaadin.data.validator; * Validator for validating that a {@link Double} is inside a given range. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 7.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/data/validator/DoubleValidator.java b/server/src/com/vaadin/data/validator/DoubleValidator.java index 18f1909add..b4c92abfe7 100644 --- a/src/com/vaadin/data/validator/DoubleValidator.java +++ b/server/src/com/vaadin/data/validator/DoubleValidator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.validator; @@ -9,8 +21,6 @@ package com.vaadin.data.validator; * information. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 5.4 * @deprecated in Vaadin 7.0. Use an Double converter on the field instead. */ diff --git a/src/com/vaadin/data/validator/EmailValidator.java b/server/src/com/vaadin/data/validator/EmailValidator.java index c76d7e13dc..d20e40e82f 100644 --- a/src/com/vaadin/data/validator/EmailValidator.java +++ b/server/src/com/vaadin/data/validator/EmailValidator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.validator; @@ -12,8 +24,6 @@ package com.vaadin.data.validator; * information. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 5.4 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/data/validator/IntegerRangeValidator.java b/server/src/com/vaadin/data/validator/IntegerRangeValidator.java index c171dd97d8..5125c716a5 100644 --- a/src/com/vaadin/data/validator/IntegerRangeValidator.java +++ b/server/src/com/vaadin/data/validator/IntegerRangeValidator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.validator; @@ -7,8 +19,6 @@ package com.vaadin.data.validator; * Validator for validating that an {@link Integer} is inside a given range. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 5.4 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/data/validator/IntegerValidator.java b/server/src/com/vaadin/data/validator/IntegerValidator.java index 88ae9f3f0b..732e7052fd 100644 --- a/src/com/vaadin/data/validator/IntegerValidator.java +++ b/server/src/com/vaadin/data/validator/IntegerValidator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.validator; @@ -9,8 +21,6 @@ package com.vaadin.data.validator; * information. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 5.4 * @deprecated in Vaadin 7.0. Use an Integer converter on the field instead. */ diff --git a/src/com/vaadin/data/validator/NullValidator.java b/server/src/com/vaadin/data/validator/NullValidator.java index 551d88c776..165dd455f9 100644 --- a/src/com/vaadin/data/validator/NullValidator.java +++ b/server/src/com/vaadin/data/validator/NullValidator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.validator; @@ -11,8 +23,6 @@ import com.vaadin.data.Validator; * values. By default, nulls are not allowed. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/data/validator/RangeValidator.java b/server/src/com/vaadin/data/validator/RangeValidator.java index 433271274f..3f29ce64da 100644 --- a/src/com/vaadin/data/validator/RangeValidator.java +++ b/server/src/com/vaadin/data/validator/RangeValidator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.validator; @@ -21,8 +33,6 @@ package com.vaadin.data.validator; * The type of Number to validate. Must implement Comparable so that * minimum and maximum checks work. * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 7.0 */ public class RangeValidator<T extends Comparable> extends AbstractValidator<T> { diff --git a/src/com/vaadin/data/validator/RegexpValidator.java b/server/src/com/vaadin/data/validator/RegexpValidator.java index 8143d54c97..342da2d984 100644 --- a/src/com/vaadin/data/validator/RegexpValidator.java +++ b/server/src/com/vaadin/data/validator/RegexpValidator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.validator; @@ -20,8 +32,6 @@ import java.util.regex.Pattern; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 5.4 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/data/validator/StringLengthValidator.java b/server/src/com/vaadin/data/validator/StringLengthValidator.java index 54b2d28f58..b887202770 100644 --- a/src/com/vaadin/data/validator/StringLengthValidator.java +++ b/server/src/com/vaadin/data/validator/StringLengthValidator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.data.validator; @@ -9,8 +21,6 @@ package com.vaadin.data.validator; * strings. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/data/validator/package.html b/server/src/com/vaadin/data/validator/package.html index c991bfc82a..c991bfc82a 100644 --- a/src/com/vaadin/data/validator/package.html +++ b/server/src/com/vaadin/data/validator/package.html diff --git a/src/com/vaadin/event/Action.java b/server/src/com/vaadin/event/Action.java index 6c218c25dc..aca28940a1 100644 --- a/src/com/vaadin/event/Action.java +++ b/server/src/com/vaadin/event/Action.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.event; @@ -14,8 +26,6 @@ import com.vaadin.terminal.Resource; * unregistration. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") @@ -105,8 +115,6 @@ public class Action implements Serializable { * Interface implemented by classes who wish to handle actions. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface Handler extends Serializable { @@ -148,8 +156,6 @@ public class Action implements Serializable { * action. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface Container extends Serializable { diff --git a/src/com/vaadin/event/ActionManager.java b/server/src/com/vaadin/event/ActionManager.java index 64fdeea69b..50ddef6265 100644 --- a/src/com/vaadin/event/ActionManager.java +++ b/server/src/com/vaadin/event/ActionManager.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.event; diff --git a/server/src/com/vaadin/event/ComponentEventListener.java b/server/src/com/vaadin/event/ComponentEventListener.java new file mode 100644 index 0000000000..820697ac9c --- /dev/null +++ b/server/src/com/vaadin/event/ComponentEventListener.java @@ -0,0 +1,23 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.event; + +import java.io.Serializable; +import java.util.EventListener; + +public interface ComponentEventListener extends EventListener, Serializable { + +}
\ No newline at end of file diff --git a/src/com/vaadin/event/DataBoundTransferable.java b/server/src/com/vaadin/event/DataBoundTransferable.java index 6f742e68d3..653997d11f 100644 --- a/src/com/vaadin/event/DataBoundTransferable.java +++ b/server/src/com/vaadin/event/DataBoundTransferable.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.event; diff --git a/src/com/vaadin/event/EventRouter.java b/server/src/com/vaadin/event/EventRouter.java index 90c080b860..80c6e5294d 100644 --- a/src/com/vaadin/event/EventRouter.java +++ b/server/src/com/vaadin/event/EventRouter.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.event; @@ -18,8 +30,6 @@ import java.util.List; * {@link com.vaadin.event package documentation}. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/event/FieldEvents.java b/server/src/com/vaadin/event/FieldEvents.java index 8f101c1913..8e247a6fef 100644 --- a/src/com/vaadin/event/FieldEvents.java +++ b/server/src/com/vaadin/event/FieldEvents.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.event; diff --git a/src/com/vaadin/event/ItemClickEvent.java b/server/src/com/vaadin/event/ItemClickEvent.java index 0aa0e106c5..c736353614 100644 --- a/src/com/vaadin/event/ItemClickEvent.java +++ b/server/src/com/vaadin/event/ItemClickEvent.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.event; diff --git a/src/com/vaadin/event/LayoutEvents.java b/server/src/com/vaadin/event/LayoutEvents.java index 602440ea07..7fc6e5a42d 100644 --- a/src/com/vaadin/event/LayoutEvents.java +++ b/server/src/com/vaadin/event/LayoutEvents.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.event; diff --git a/src/com/vaadin/event/ListenerMethod.java b/server/src/com/vaadin/event/ListenerMethod.java index f7dc8a7f13..2c43b31390 100644 --- a/src/com/vaadin/event/ListenerMethod.java +++ b/server/src/com/vaadin/event/ListenerMethod.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.event; @@ -36,8 +48,6 @@ import java.util.logging.Logger; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") @@ -610,8 +620,6 @@ public class ListenerMethod implements EventListener, Serializable { * MethodException instance and rethrown by the <code>ListenerMethod</code>. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public class MethodException extends RuntimeException implements diff --git a/src/com/vaadin/event/MethodEventSource.java b/server/src/com/vaadin/event/MethodEventSource.java index fb2e7b029b..5ebdc2bb99 100644 --- a/src/com/vaadin/event/MethodEventSource.java +++ b/server/src/com/vaadin/event/MethodEventSource.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.event; @@ -18,8 +30,6 @@ import java.lang.reflect.Method; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface MethodEventSource extends Serializable { diff --git a/src/com/vaadin/event/MouseEvents.java b/server/src/com/vaadin/event/MouseEvents.java index fafd44be89..0fe9902b2e 100644 --- a/src/com/vaadin/event/MouseEvents.java +++ b/server/src/com/vaadin/event/MouseEvents.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.event; @@ -15,8 +27,6 @@ import com.vaadin.ui.Component; * * @author Vaadin Ltd. * @see ClickListener - * @version - * @VERSION@ * @since 6.2 */ public interface MouseEvents { @@ -31,8 +41,6 @@ public interface MouseEvents { * * @author Vaadin Ltd. * @see ClickListener - * @version - * @VERSION@ * @since 6.2 */ public class ClickEvent extends Component.Event { @@ -169,8 +177,6 @@ public interface MouseEvents { * * @see ClickEvent * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 6.2 */ public interface ClickListener extends ComponentEventListener { @@ -194,8 +200,6 @@ public interface MouseEvents { * * @see ClickEvent * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 6.2 */ public class DoubleClickEvent extends Component.Event { @@ -211,8 +215,6 @@ public interface MouseEvents { * * @see DoubleClickEvent * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 6.2 */ public interface DoubleClickListener extends ComponentEventListener { diff --git a/src/com/vaadin/event/ShortcutAction.java b/server/src/com/vaadin/event/ShortcutAction.java index c42dd731c8..b3f41b474d 100644 --- a/src/com/vaadin/event/ShortcutAction.java +++ b/server/src/com/vaadin/event/ShortcutAction.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.event; @@ -36,7 +48,6 @@ import com.vaadin.ui.Window; * </p> * * @author Vaadin Ltd. - * @version * @since 4.0.1 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/event/ShortcutListener.java b/server/src/com/vaadin/event/ShortcutListener.java index b760cfabe6..82a09585b3 100644 --- a/src/com/vaadin/event/ShortcutListener.java +++ b/server/src/com/vaadin/event/ShortcutListener.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.event; diff --git a/src/com/vaadin/event/Transferable.java b/server/src/com/vaadin/event/Transferable.java index 838d8ad7e2..8b614b6b37 100644 --- a/src/com/vaadin/event/Transferable.java +++ b/server/src/com/vaadin/event/Transferable.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.event; diff --git a/src/com/vaadin/event/TransferableImpl.java b/server/src/com/vaadin/event/TransferableImpl.java index 4c973571f7..388916d8fa 100644 --- a/src/com/vaadin/event/TransferableImpl.java +++ b/server/src/com/vaadin/event/TransferableImpl.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.event; diff --git a/src/com/vaadin/event/dd/DragAndDropEvent.java b/server/src/com/vaadin/event/dd/DragAndDropEvent.java index b920d43469..d7d2b24f94 100644 --- a/src/com/vaadin/event/dd/DragAndDropEvent.java +++ b/server/src/com/vaadin/event/dd/DragAndDropEvent.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.event.dd; diff --git a/src/com/vaadin/event/dd/DragSource.java b/server/src/com/vaadin/event/dd/DragSource.java index 4daf0dcb18..f42fd8b61b 100644 --- a/src/com/vaadin/event/dd/DragSource.java +++ b/server/src/com/vaadin/event/dd/DragSource.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.event.dd; diff --git a/src/com/vaadin/event/dd/DropHandler.java b/server/src/com/vaadin/event/dd/DropHandler.java index 7a15ea5b68..36d25e5da1 100644 --- a/src/com/vaadin/event/dd/DropHandler.java +++ b/server/src/com/vaadin/event/dd/DropHandler.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.event.dd; diff --git a/src/com/vaadin/event/dd/DropTarget.java b/server/src/com/vaadin/event/dd/DropTarget.java index c18aa60b19..9a4ef05cae 100644 --- a/src/com/vaadin/event/dd/DropTarget.java +++ b/server/src/com/vaadin/event/dd/DropTarget.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.event.dd; diff --git a/src/com/vaadin/event/dd/TargetDetails.java b/server/src/com/vaadin/event/dd/TargetDetails.java index a352fbec60..eb67b49090 100644 --- a/src/com/vaadin/event/dd/TargetDetails.java +++ b/server/src/com/vaadin/event/dd/TargetDetails.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.event.dd; diff --git a/src/com/vaadin/event/dd/TargetDetailsImpl.java b/server/src/com/vaadin/event/dd/TargetDetailsImpl.java index 4a459777ed..7c0c98bb79 100644 --- a/src/com/vaadin/event/dd/TargetDetailsImpl.java +++ b/server/src/com/vaadin/event/dd/TargetDetailsImpl.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.event.dd; diff --git a/src/com/vaadin/event/dd/acceptcriteria/AcceptAll.java b/server/src/com/vaadin/event/dd/acceptcriteria/AcceptAll.java index 1457ea9df3..a8ef49c21c 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/AcceptAll.java +++ b/server/src/com/vaadin/event/dd/acceptcriteria/AcceptAll.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ /** * diff --git a/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java b/server/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java index c0f04d362f..7b04efc4b3 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java +++ b/server/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ /** * diff --git a/src/com/vaadin/event/dd/acceptcriteria/And.java b/server/src/com/vaadin/event/dd/acceptcriteria/And.java index 4122d67160..3d11ecf7bf 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/And.java +++ b/server/src/com/vaadin/event/dd/acceptcriteria/And.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ /** * diff --git a/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java b/server/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java index 7d2c42ecb0..be7e2d4033 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java +++ b/server/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.event.dd.acceptcriteria; diff --git a/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java b/server/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java index 4c52698a4a..55ee17fea9 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java +++ b/server/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ /** * diff --git a/src/com/vaadin/event/dd/acceptcriteria/Not.java b/server/src/com/vaadin/event/dd/acceptcriteria/Not.java index 1ed40a324d..b3f73699ea 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/Not.java +++ b/server/src/com/vaadin/event/dd/acceptcriteria/Not.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ /** * diff --git a/src/com/vaadin/event/dd/acceptcriteria/Or.java b/server/src/com/vaadin/event/dd/acceptcriteria/Or.java index 6ad45c54af..42d1c3293d 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/Or.java +++ b/server/src/com/vaadin/event/dd/acceptcriteria/Or.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ /** * diff --git a/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java b/server/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java index 47f06d434c..b9c2855021 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java +++ b/server/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.event.dd.acceptcriteria; diff --git a/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java b/server/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java index d4fd20c952..cc1d586076 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java +++ b/server/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ /** * diff --git a/src/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java b/server/src/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java index a644b858e2..a4b5f24619 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java +++ b/server/src/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ /** * diff --git a/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java b/server/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java index 5df8f3f618..536ba8780e 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java +++ b/server/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ /** * diff --git a/src/com/vaadin/event/package.html b/server/src/com/vaadin/event/package.html index 2e7e17b892..2e7e17b892 100644 --- a/src/com/vaadin/event/package.html +++ b/server/src/com/vaadin/event/package.html diff --git a/src/com/vaadin/external/json/JSONArray.java b/server/src/com/vaadin/external/json/JSONArray.java index 2307749ffc..2307749ffc 100644 --- a/src/com/vaadin/external/json/JSONArray.java +++ b/server/src/com/vaadin/external/json/JSONArray.java diff --git a/src/com/vaadin/external/json/JSONException.java b/server/src/com/vaadin/external/json/JSONException.java index 895ffcb457..895ffcb457 100644 --- a/src/com/vaadin/external/json/JSONException.java +++ b/server/src/com/vaadin/external/json/JSONException.java diff --git a/src/com/vaadin/external/json/JSONObject.java b/server/src/com/vaadin/external/json/JSONObject.java index ba772933be..ba772933be 100644 --- a/src/com/vaadin/external/json/JSONObject.java +++ b/server/src/com/vaadin/external/json/JSONObject.java diff --git a/src/com/vaadin/external/json/JSONString.java b/server/src/com/vaadin/external/json/JSONString.java index cc7e4d8c07..cc7e4d8c07 100644 --- a/src/com/vaadin/external/json/JSONString.java +++ b/server/src/com/vaadin/external/json/JSONString.java diff --git a/src/com/vaadin/external/json/JSONStringer.java b/server/src/com/vaadin/external/json/JSONStringer.java index ae905cb15f..ae905cb15f 100644 --- a/src/com/vaadin/external/json/JSONStringer.java +++ b/server/src/com/vaadin/external/json/JSONStringer.java diff --git a/src/com/vaadin/external/json/JSONTokener.java b/server/src/com/vaadin/external/json/JSONTokener.java index c3531cae1d..c3531cae1d 100644 --- a/src/com/vaadin/external/json/JSONTokener.java +++ b/server/src/com/vaadin/external/json/JSONTokener.java diff --git a/src/com/vaadin/external/json/JSONWriter.java b/server/src/com/vaadin/external/json/JSONWriter.java index 5f9ddeeae2..5f9ddeeae2 100644 --- a/src/com/vaadin/external/json/JSONWriter.java +++ b/server/src/com/vaadin/external/json/JSONWriter.java diff --git a/src/com/vaadin/external/json/README b/server/src/com/vaadin/external/json/README index ca6dc11764..ca6dc11764 100644 --- a/src/com/vaadin/external/json/README +++ b/server/src/com/vaadin/external/json/README diff --git a/src/com/vaadin/navigator/FragmentManager.java b/server/src/com/vaadin/navigator/FragmentManager.java index f1fd90e569..a42456a163 100644 --- a/src/com/vaadin/navigator/FragmentManager.java +++ b/server/src/com/vaadin/navigator/FragmentManager.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.navigator; diff --git a/src/com/vaadin/navigator/Navigator.java b/server/src/com/vaadin/navigator/Navigator.java index 1813301fe6..9a937d5750 100644 --- a/src/com/vaadin/navigator/Navigator.java +++ b/server/src/com/vaadin/navigator/Navigator.java @@ -1,7 +1,19 @@ package com.vaadin.navigator; /* - @VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ import java.io.Serializable; diff --git a/src/com/vaadin/navigator/View.java b/server/src/com/vaadin/navigator/View.java index 4d135b4c0b..4db334a2dd 100644 --- a/src/com/vaadin/navigator/View.java +++ b/server/src/com/vaadin/navigator/View.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.navigator; diff --git a/src/com/vaadin/navigator/ViewChangeListener.java b/server/src/com/vaadin/navigator/ViewChangeListener.java index 2eb34e6fcf..d2d4a091c6 100644 --- a/src/com/vaadin/navigator/ViewChangeListener.java +++ b/server/src/com/vaadin/navigator/ViewChangeListener.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.navigator; diff --git a/src/com/vaadin/navigator/ViewDisplay.java b/server/src/com/vaadin/navigator/ViewDisplay.java index 6016951394..bf4190258f 100644 --- a/src/com/vaadin/navigator/ViewDisplay.java +++ b/server/src/com/vaadin/navigator/ViewDisplay.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.navigator; diff --git a/src/com/vaadin/navigator/ViewProvider.java b/server/src/com/vaadin/navigator/ViewProvider.java index 4d9d22acab..6fdd80c364 100644 --- a/src/com/vaadin/navigator/ViewProvider.java +++ b/server/src/com/vaadin/navigator/ViewProvider.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.navigator; diff --git a/src/com/vaadin/package.html b/server/src/com/vaadin/package.html index f771019709..f771019709 100644 --- a/src/com/vaadin/package.html +++ b/server/src/com/vaadin/package.html diff --git a/src/com/vaadin/portal/gwt/PortalDefaultWidgetSet.gwt.xml b/server/src/com/vaadin/portal/gwt/PortalDefaultWidgetSet.gwt.xml index bd91d05b02..bd91d05b02 100644 --- a/src/com/vaadin/portal/gwt/PortalDefaultWidgetSet.gwt.xml +++ b/server/src/com/vaadin/portal/gwt/PortalDefaultWidgetSet.gwt.xml diff --git a/src/com/vaadin/service/ApplicationContext.java b/server/src/com/vaadin/service/ApplicationContext.java index 71bff7b865..c6116d6e73 100644 --- a/src/com/vaadin/service/ApplicationContext.java +++ b/server/src/com/vaadin/service/ApplicationContext.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.service; @@ -20,8 +32,6 @@ import com.vaadin.terminal.gwt.server.AbstractCommunicationManager; * HttpSession. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.1 */ public interface ApplicationContext extends Serializable { diff --git a/src/com/vaadin/service/FileTypeResolver.java b/server/src/com/vaadin/service/FileTypeResolver.java index c457c16eb4..2b289d6752 100644 --- a/src/com/vaadin/service/FileTypeResolver.java +++ b/server/src/com/vaadin/service/FileTypeResolver.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.service; @@ -22,8 +34,6 @@ import com.vaadin.terminal.ThemeResource; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/service/package.html b/server/src/com/vaadin/service/package.html index ea21139b91..ea21139b91 100644 --- a/src/com/vaadin/service/package.html +++ b/server/src/com/vaadin/service/package.html diff --git a/src/com/vaadin/terminal/AbstractClientConnector.java b/server/src/com/vaadin/terminal/AbstractClientConnector.java index 9c68361382..0eb38a3d13 100644 --- a/src/com/vaadin/terminal/AbstractClientConnector.java +++ b/server/src/com/vaadin/terminal/AbstractClientConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -35,7 +47,6 @@ import com.vaadin.ui.Root; * provides all the basic functionality required for connectors. * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ public abstract class AbstractClientConnector implements ClientConnector { diff --git a/src/com/vaadin/terminal/AbstractErrorMessage.java b/server/src/com/vaadin/terminal/AbstractErrorMessage.java index f7cd0e6aad..808791158a 100644 --- a/src/com/vaadin/terminal/AbstractErrorMessage.java +++ b/server/src/com/vaadin/terminal/AbstractErrorMessage.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; diff --git a/src/com/vaadin/terminal/AbstractExtension.java b/server/src/com/vaadin/terminal/AbstractExtension.java index 33a60e39ef..8ac0ce01e3 100644 --- a/src/com/vaadin/terminal/AbstractExtension.java +++ b/server/src/com/vaadin/terminal/AbstractExtension.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -17,7 +29,6 @@ import com.vaadin.terminal.gwt.server.ClientConnector; * the extend method is declared as protected. * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ public abstract class AbstractExtension extends AbstractClientConnector diff --git a/src/com/vaadin/terminal/AbstractJavaScriptExtension.java b/server/src/com/vaadin/terminal/AbstractJavaScriptExtension.java index df44c3edd5..aae71640aa 100644 --- a/src/com/vaadin/terminal/AbstractJavaScriptExtension.java +++ b/server/src/com/vaadin/terminal/AbstractJavaScriptExtension.java @@ -1,12 +1,23 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; import com.vaadin.shared.JavaScriptExtensionState; -import com.vaadin.terminal.gwt.client.ApplicationConnection; -import com.vaadin.ui.JavaScriptCallback; +import com.vaadin.ui.JavaScriptFunction; /** * Base class for Extensions with all client-side logic implemented using @@ -66,7 +77,8 @@ import com.vaadin.ui.JavaScriptCallback; * functions is described bellow.</li> * <li><code>translateVaadinUri(uri)</code> - Translates a Vaadin URI to a URL * that can be used in the browser. This is just way of accessing - * {@link ApplicationConnection#translateVaadinUri(String)}</li> + * {@link com.vaadin.terminal.gwt.client.ApplicationConnection#translateVaadinUri(String)} + * </li> * </ul> * The connector wrapper also supports these special functions: * <ul> @@ -74,12 +86,11 @@ import com.vaadin.ui.JavaScriptCallback; * the field, that function is called whenever the contents of the shared state * is changed.</li> * <li>Any field name corresponding to a call to - * {@link #registerCallback(String, JavaScriptCallback)} on the server will - * automatically be present as a function that triggers the registered callback + * {@link #addFunction(String, JavaScriptFunction)} on the server will + * automatically be present as a function that triggers the registered function * on the server.</li> - * <li>Any field name referred to using - * {@link #invokeCallback(String, Object...)} on the server will be called if a - * function has been assigned to the field.</li> + * <li>Any field name referred to using {@link #callFunction(String, Object...)} + * on the server will be called if a function has been assigned to the field.</li> * </ul> * <p> * @@ -108,7 +119,6 @@ import com.vaadin.ui.JavaScriptCallback; * </ul> * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ public abstract class AbstractJavaScriptExtension extends AbstractExtension { @@ -122,22 +132,21 @@ public abstract class AbstractJavaScriptExtension extends AbstractExtension { } /** - * Register a {@link JavaScriptCallback} that can be called from the + * Register a {@link JavaScriptFunction} that can be called from the * JavaScript using the provided name. A JavaScript function with the * provided name will be added to the connector wrapper object (initially * available as <code>this</code>). Calling that JavaScript function will - * cause the call method in the registered {@link JavaScriptCallback} to be + * cause the call method in the registered {@link JavaScriptFunction} to be * invoked with the same arguments. * * @param functionName * the name that should be used for client-side callback - * @param javaScriptCallback - * the callback object that will be invoked when the JavaScript - * function is called + * @param function + * the {@link JavaScriptFunction} object that will be invoked + * when the JavaScript function is called */ - protected void registerCallback(String functionName, - JavaScriptCallback javaScriptCallback) { - callbackHelper.registerCallback(functionName, javaScriptCallback); + protected void addFunction(String functionName, JavaScriptFunction function) { + callbackHelper.registerCallback(functionName, function); } /** @@ -152,7 +161,7 @@ public abstract class AbstractJavaScriptExtension extends AbstractExtension { * @param arguments * function arguments */ - protected void invokeCallback(String name, Object... arguments) { + protected void callFunction(String name, Object... arguments) { callbackHelper.invokeCallback(name, arguments); } diff --git a/src/com/vaadin/terminal/ApplicationResource.java b/server/src/com/vaadin/terminal/ApplicationResource.java index da92642d02..1d1444b774 100644 --- a/src/com/vaadin/terminal/ApplicationResource.java +++ b/server/src/com/vaadin/terminal/ApplicationResource.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -19,8 +31,6 @@ import com.vaadin.Application; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface ApplicationResource extends Resource, Serializable { diff --git a/src/com/vaadin/terminal/ClassResource.java b/server/src/com/vaadin/terminal/ClassResource.java index b74c8e7bb7..e4921f2413 100644 --- a/src/com/vaadin/terminal/ClassResource.java +++ b/server/src/com/vaadin/terminal/ClassResource.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -18,8 +30,6 @@ import com.vaadin.service.FileTypeResolver; * @see java.lang.Class#getResource(java.lang.String) * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/terminal/CombinedRequest.java b/server/src/com/vaadin/terminal/CombinedRequest.java index 5b92feb39a..3d6c3c2149 100644 --- a/src/com/vaadin/terminal/CombinedRequest.java +++ b/server/src/com/vaadin/terminal/CombinedRequest.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; diff --git a/src/com/vaadin/terminal/CompositeErrorMessage.java b/server/src/com/vaadin/terminal/CompositeErrorMessage.java index b82b622f54..e86102ae3b 100644 --- a/src/com/vaadin/terminal/CompositeErrorMessage.java +++ b/server/src/com/vaadin/terminal/CompositeErrorMessage.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -11,8 +23,6 @@ import java.util.Iterator; * Class for combining multiple error messages together. * * @author Vaadin Ltd - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/terminal/DeploymentConfiguration.java b/server/src/com/vaadin/terminal/DeploymentConfiguration.java index 6847072523..14a5a3724f 100644 --- a/src/com/vaadin/terminal/DeploymentConfiguration.java +++ b/server/src/com/vaadin/terminal/DeploymentConfiguration.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -11,8 +23,8 @@ import java.util.Properties; import javax.portlet.PortletContext; import javax.servlet.ServletContext; -import com.vaadin.terminal.gwt.server.VaadinContext; -import com.vaadin.terminal.gwt.server.VaadinContextListener; +import com.vaadin.terminal.gwt.server.AddonContext; +import com.vaadin.terminal.gwt.server.AddonContextListener; /** * Provide deployment specific settings that are required outside terminal @@ -115,11 +127,11 @@ public interface DeploymentConfiguration extends Serializable { */ public Properties getInitParameters(); - public Iterator<VaadinContextListener> getContextListeners(); + public Iterator<AddonContextListener> getAddonContextListeners(); - public VaadinContext getVaadinContext(); + public AddonContext getAddonContext(); - public void setVaadinContext(VaadinContext vaadinContext); + public void setAddonContext(AddonContext vaadinContext); /** * Returns whether Vaadin is in production mode. diff --git a/src/com/vaadin/terminal/DownloadStream.java b/server/src/com/vaadin/terminal/DownloadStream.java index 9853b0eee2..30810d5da4 100644 --- a/src/com/vaadin/terminal/DownloadStream.java +++ b/server/src/com/vaadin/terminal/DownloadStream.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -20,8 +32,6 @@ import com.vaadin.terminal.gwt.server.Constants; * Downloadable stream. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/terminal/ErrorMessage.java b/server/src/com/vaadin/terminal/ErrorMessage.java index 60a0780a72..15273efb6f 100644 --- a/src/com/vaadin/terminal/ErrorMessage.java +++ b/server/src/com/vaadin/terminal/ErrorMessage.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -11,8 +23,6 @@ import java.io.Serializable; * shown to user must implement this interface. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface ErrorMessage extends Serializable { diff --git a/src/com/vaadin/terminal/Extension.java b/server/src/com/vaadin/terminal/Extension.java index ef5bb4cf8d..87901c3c13 100644 --- a/src/com/vaadin/terminal/Extension.java +++ b/server/src/com/vaadin/terminal/Extension.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -16,7 +28,6 @@ import com.vaadin.terminal.gwt.server.ClientConnector; * Extensions can use shared state and RPC in the same way as components. * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ public interface Extension extends ClientConnector { diff --git a/src/com/vaadin/terminal/ExternalResource.java b/server/src/com/vaadin/terminal/ExternalResource.java index 84fcc65a44..d970c0934b 100644 --- a/src/com/vaadin/terminal/ExternalResource.java +++ b/server/src/com/vaadin/terminal/ExternalResource.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -15,8 +27,6 @@ import com.vaadin.service.FileTypeResolver; * terminal and are not fetched trough the terminal adapter. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/terminal/FileResource.java b/server/src/com/vaadin/terminal/FileResource.java index e3c9f0172a..ab8bc95ce3 100644 --- a/src/com/vaadin/terminal/FileResource.java +++ b/server/src/com/vaadin/terminal/FileResource.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -19,8 +31,6 @@ import com.vaadin.terminal.Terminal.ErrorEvent; * resource is automatically registered to the application when it is created. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/terminal/JavaScriptCallbackHelper.java b/server/src/com/vaadin/terminal/JavaScriptCallbackHelper.java index 131875a5a4..6153cf2619 100644 --- a/src/com/vaadin/terminal/JavaScriptCallbackHelper.java +++ b/server/src/com/vaadin/terminal/JavaScriptCallbackHelper.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -15,22 +27,20 @@ import java.util.Set; import com.vaadin.external.json.JSONArray; import com.vaadin.external.json.JSONException; import com.vaadin.shared.JavaScriptConnectorState; -import com.vaadin.terminal.gwt.client.JavaScriptConnectorHelper; import com.vaadin.tools.ReflectTools; import com.vaadin.ui.AbstractJavaScriptComponent; import com.vaadin.ui.JavaScript.JavaScriptCallbackRpc; -import com.vaadin.ui.JavaScriptCallback; +import com.vaadin.ui.JavaScriptFunction; /** * Internal helper class used to implement functionality common to * {@link AbstractJavaScriptComponent} and {@link AbstractJavaScriptExtension}. * Corresponding support in client-side code is in - * {@link JavaScriptConnectorHelper}. + * {@link com.vaadin.terminal.gwt.client.JavaScriptConnectorHelper}. * <p> * You should most likely no use this class directly. * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ public class JavaScriptCallbackHelper implements Serializable { @@ -39,7 +49,7 @@ public class JavaScriptCallbackHelper implements Serializable { JavaScriptCallbackRpc.class, "call", String.class, JSONArray.class); private AbstractClientConnector connector; - private Map<String, JavaScriptCallback> callbacks = new HashMap<String, JavaScriptCallback>(); + private Map<String, JavaScriptFunction> callbacks = new HashMap<String, JavaScriptFunction>(); private JavaScriptCallbackRpc javascriptCallbackRpc; public JavaScriptCallbackHelper(AbstractClientConnector connector) { @@ -47,7 +57,7 @@ public class JavaScriptCallbackHelper implements Serializable { } public void registerCallback(String functionName, - JavaScriptCallback javaScriptCallback) { + JavaScriptFunction javaScriptCallback) { callbacks.put(functionName, javaScriptCallback); JavaScriptConnectorState state = getConnectorState(); if (state.getCallbackNames().add(functionName)) { @@ -67,7 +77,7 @@ public class JavaScriptCallbackHelper implements Serializable { javascriptCallbackRpc = new JavaScriptCallbackRpc() { @Override public void call(String name, JSONArray arguments) { - JavaScriptCallback callback = callbacks.get(name); + JavaScriptFunction callback = callbacks.get(name); try { callback.call(arguments); } catch (JSONException e) { diff --git a/src/com/vaadin/terminal/KeyMapper.java b/server/src/com/vaadin/terminal/KeyMapper.java index 3f19692ef1..cf54af545f 100644 --- a/src/com/vaadin/terminal/KeyMapper.java +++ b/server/src/com/vaadin/terminal/KeyMapper.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -12,8 +24,6 @@ import java.util.HashMap; * for objects and retrieving the objects later with the key. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public class KeyMapper<V> implements Serializable { diff --git a/src/com/vaadin/terminal/LegacyPaint.java b/server/src/com/vaadin/terminal/LegacyPaint.java index ea93e3db7f..3db0f52079 100644 --- a/src/com/vaadin/terminal/LegacyPaint.java +++ b/server/src/com/vaadin/terminal/LegacyPaint.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; diff --git a/src/com/vaadin/terminal/Page.java b/server/src/com/vaadin/terminal/Page.java index a068e7573e..d5d474e2e3 100644 --- a/src/com/vaadin/terminal/Page.java +++ b/server/src/com/vaadin/terminal/Page.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -13,9 +25,8 @@ import java.util.List; import com.vaadin.event.EventRouter; import com.vaadin.shared.ui.root.PageClientRpc; +import com.vaadin.shared.ui.root.RootConstants; import com.vaadin.terminal.WrappedRequest.BrowserDetails; -import com.vaadin.terminal.gwt.client.ui.notification.VNotification; -import com.vaadin.terminal.gwt.client.ui.root.VRoot; import com.vaadin.terminal.gwt.server.WebApplicationContext; import com.vaadin.terminal.gwt.server.WebBrowser; import com.vaadin.tools.ReflectTools; @@ -467,31 +478,32 @@ public class Page implements Serializable { target.startTag("notification"); if (n.getCaption() != null) { target.addAttribute( - VNotification.ATTRIBUTE_NOTIFICATION_CAPTION, + RootConstants.ATTRIBUTE_NOTIFICATION_CAPTION, n.getCaption()); } if (n.getDescription() != null) { target.addAttribute( - VNotification.ATTRIBUTE_NOTIFICATION_MESSAGE, + RootConstants.ATTRIBUTE_NOTIFICATION_MESSAGE, n.getDescription()); } if (n.getIcon() != null) { target.addAttribute( - VNotification.ATTRIBUTE_NOTIFICATION_ICON, + RootConstants.ATTRIBUTE_NOTIFICATION_ICON, n.getIcon()); } if (!n.isHtmlContentAllowed()) { target.addAttribute( - VRoot.NOTIFICATION_HTML_CONTENT_NOT_ALLOWED, true); + RootConstants.NOTIFICATION_HTML_CONTENT_NOT_ALLOWED, + true); } target.addAttribute( - VNotification.ATTRIBUTE_NOTIFICATION_POSITION, + RootConstants.ATTRIBUTE_NOTIFICATION_POSITION, n.getPosition()); - target.addAttribute(VNotification.ATTRIBUTE_NOTIFICATION_DELAY, + target.addAttribute(RootConstants.ATTRIBUTE_NOTIFICATION_DELAY, n.getDelayMsec()); if (n.getStyleName() != null) { target.addAttribute( - VNotification.ATTRIBUTE_NOTIFICATION_STYLE, + RootConstants.ATTRIBUTE_NOTIFICATION_STYLE, n.getStyleName()); } target.endTag("notification"); @@ -501,7 +513,7 @@ public class Page implements Serializable { } if (fragment != null) { - target.addAttribute(VRoot.FRAGMENT_VARIABLE, fragment); + target.addAttribute(RootConstants.FRAGMENT_VARIABLE, fragment); } } diff --git a/src/com/vaadin/terminal/PaintException.java b/server/src/com/vaadin/terminal/PaintException.java index 68f689b7f1..dd5752653a 100644 --- a/src/com/vaadin/terminal/PaintException.java +++ b/server/src/com/vaadin/terminal/PaintException.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -11,8 +23,6 @@ import java.io.Serializable; * <code>PaintExcepection</code> is thrown if painting of a component fails. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/terminal/PaintTarget.java b/server/src/com/vaadin/terminal/PaintTarget.java index b658c9f4a3..5ccca8a8f0 100644 --- a/src/com/vaadin/terminal/PaintTarget.java +++ b/server/src/com/vaadin/terminal/PaintTarget.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -8,8 +20,6 @@ import java.io.Serializable; import java.util.Map; import com.vaadin.terminal.StreamVariable.StreamingStartEvent; -import com.vaadin.terminal.gwt.client.ApplicationConnection; -import com.vaadin.terminal.gwt.client.Paintable; import com.vaadin.terminal.gwt.server.ClientConnector; import com.vaadin.ui.Component; @@ -17,8 +27,6 @@ import com.vaadin.ui.Component; * This interface defines the methods for painting XML to the UIDL stream. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface PaintTarget extends Serializable { @@ -40,7 +48,7 @@ public interface PaintTarget extends Serializable { throws PaintException; /** - * Result of starting to paint a Paintable ( + * Result of starting to paint a Component ( * {@link PaintTarget#startPaintable(Component, String)}). * * @since 7.0 @@ -52,7 +60,7 @@ public interface PaintTarget extends Serializable { */ PAINTING, /** - * A previously unpainted or painted {@link Paintable} has been queued + * A previously unpainted or painted {@link Component} has been queued * be created/update later in a separate change in the same set of * changes. */ @@ -65,9 +73,9 @@ public interface PaintTarget extends Serializable { * scheme, that checks the paintable has actually changed or can a cached * version be used instead. This method should call the startTag method. * <p> - * If the Paintable is found in cache and this function returns true it may - * omit the content and close the tag, in which case cached content should - * be used. + * If the {@link Component} is found in cache and this function returns true + * it may omit the content and close the tag, in which case cached content + * should be used. * </p> * <p> * This method may also add only a reference to the paintable and queue the @@ -186,7 +194,7 @@ public interface PaintTarget extends Serializable { * <p> * The urls in UIDL message may use Vaadin specific protocol. Before * actually using the urls on the client side, they should be passed via - * {@link ApplicationConnection#translateVaadinUri(String)}. + * {@link com.vaadin.terminal.gwt.client.ApplicationConnection#translateVaadinUri(String)}. * <p> * Note that in current terminal implementation StreamVariables are cleaned * from the terminal only when: @@ -281,14 +289,14 @@ public interface PaintTarget extends Serializable { throws PaintException; /** - * Adds a Paintable type attribute. On client side the value will be a + * Adds a Component type attribute. On client side the value will be a * terminal specific reference to corresponding component on client side * implementation. * * @param name * the name of the attribute * @param value - * the Paintable to be referenced on client side + * the Component to be referenced on client side * @throws PaintException */ public void addAttribute(String name, Component value) @@ -407,7 +415,7 @@ public interface PaintTarget extends Serializable { throws PaintException; /** - * Adds a Paintable type variable. On client side the variable value will be + * Adds a Component type variable. On client side the variable value will be * a terminal specific reference to corresponding component on client side * implementation. When updated from client side, terminal will map the * client side component reference back to a corresponding server side diff --git a/src/com/vaadin/terminal/RequestHandler.java b/server/src/com/vaadin/terminal/RequestHandler.java index f37201715d..2ea02487b1 100644 --- a/src/com/vaadin/terminal/RequestHandler.java +++ b/server/src/com/vaadin/terminal/RequestHandler.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; diff --git a/server/src/com/vaadin/terminal/Resource.java b/server/src/com/vaadin/terminal/Resource.java new file mode 100644 index 0000000000..27adb16869 --- /dev/null +++ b/server/src/com/vaadin/terminal/Resource.java @@ -0,0 +1,36 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal; + +import java.io.Serializable; + +/** + * <code>Resource</code> provided to the client terminal. Support for actually + * displaying the resource type is left to the terminal. + * + * @author Vaadin Ltd. + * @since 3.0 + */ +public interface Resource extends Serializable { + + /** + * Gets the MIME type of the resource. + * + * @return the MIME type of the resource. + */ + public String getMIMEType(); +} diff --git a/src/com/vaadin/terminal/Scrollable.java b/server/src/com/vaadin/terminal/Scrollable.java index 472954c556..641b20ab34 100644 --- a/src/com/vaadin/terminal/Scrollable.java +++ b/server/src/com/vaadin/terminal/Scrollable.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -13,8 +25,6 @@ import java.io.Serializable; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface Scrollable extends Serializable { diff --git a/src/com/vaadin/terminal/Sizeable.java b/server/src/com/vaadin/terminal/Sizeable.java index e3c98e0fa9..d8d0b0e043 100644 --- a/src/com/vaadin/terminal/Sizeable.java +++ b/server/src/com/vaadin/terminal/Sizeable.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -11,8 +23,6 @@ import java.io.Serializable; * may be dynamically resized during runtime. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface Sizeable extends Serializable { diff --git a/src/com/vaadin/terminal/StreamResource.java b/server/src/com/vaadin/terminal/StreamResource.java index 1afd91dc08..bbb58c71e2 100644 --- a/src/com/vaadin/terminal/StreamResource.java +++ b/server/src/com/vaadin/terminal/StreamResource.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -17,8 +29,6 @@ import com.vaadin.service.FileTypeResolver; * registered to window in creation. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") @@ -167,8 +177,6 @@ public class StreamResource implements ApplicationResource { * Interface implemented by the source of a StreamResource. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface StreamSource extends Serializable { diff --git a/src/com/vaadin/terminal/StreamVariable.java b/server/src/com/vaadin/terminal/StreamVariable.java index 63763a5751..53f398f09c 100644 --- a/src/com/vaadin/terminal/StreamVariable.java +++ b/server/src/com/vaadin/terminal/StreamVariable.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -24,8 +36,6 @@ import com.vaadin.terminal.StreamVariable.StreamingStartEvent; * <p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 6.5 * @see PaintTarget#addVariable(VariableOwner, String, StreamVariable) */ diff --git a/src/com/vaadin/terminal/SystemError.java b/server/src/com/vaadin/terminal/SystemError.java index bae135ee6b..c4cb7eef0c 100644 --- a/src/com/vaadin/terminal/SystemError.java +++ b/server/src/com/vaadin/terminal/SystemError.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -16,8 +28,6 @@ import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; * {@link ErrorMessage}. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/terminal/Terminal.java b/server/src/com/vaadin/terminal/Terminal.java index 9dc6ced6a7..29cb649d54 100644 --- a/src/com/vaadin/terminal/Terminal.java +++ b/server/src/com/vaadin/terminal/Terminal.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -12,8 +24,6 @@ import java.io.Serializable; * this interface. </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface Terminal extends Serializable { diff --git a/src/com/vaadin/terminal/ThemeResource.java b/server/src/com/vaadin/terminal/ThemeResource.java index 41674b2373..61fe157ee6 100644 --- a/src/com/vaadin/terminal/ThemeResource.java +++ b/server/src/com/vaadin/terminal/ThemeResource.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -13,8 +25,6 @@ import com.vaadin.service.FileTypeResolver; * provide static images, flash, java-applets, etc for the terminals. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/terminal/UserError.java b/server/src/com/vaadin/terminal/UserError.java index a7a4fd89e2..18680f912f 100644 --- a/src/com/vaadin/terminal/UserError.java +++ b/server/src/com/vaadin/terminal/UserError.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -9,8 +21,6 @@ package com.vaadin.terminal; * errors are occur in normal usage of the application and guide the user. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/terminal/Vaadin6Component.java b/server/src/com/vaadin/terminal/Vaadin6Component.java index 59cbf956ca..048000e31d 100644 --- a/src/com/vaadin/terminal/Vaadin6Component.java +++ b/server/src/com/vaadin/terminal/Vaadin6Component.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -14,7 +26,6 @@ import com.vaadin.ui.Component; * {@link #changeVariables(Object, java.util.Map)} just like in Vaadin 6. * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 * */ diff --git a/src/com/vaadin/terminal/VariableOwner.java b/server/src/com/vaadin/terminal/VariableOwner.java index c52e04c008..faa0298311 100644 --- a/src/com/vaadin/terminal/VariableOwner.java +++ b/server/src/com/vaadin/terminal/VariableOwner.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; @@ -17,8 +29,6 @@ import java.util.Map; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 * @deprecated in 7.0. Only provided to ease porting of Vaadin 6 components. Do * not implement this directly, implement {@link Vaadin6Component}. diff --git a/src/com/vaadin/terminal/WrappedRequest.java b/server/src/com/vaadin/terminal/WrappedRequest.java index a27213d921..c317eae048 100644 --- a/src/com/vaadin/terminal/WrappedRequest.java +++ b/server/src/com/vaadin/terminal/WrappedRequest.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; diff --git a/src/com/vaadin/terminal/WrappedResponse.java b/server/src/com/vaadin/terminal/WrappedResponse.java index 995133a269..02daaa1bdd 100644 --- a/src/com/vaadin/terminal/WrappedResponse.java +++ b/server/src/com/vaadin/terminal/WrappedResponse.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal; diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java b/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java index bfd35fd034..06ed54990a 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java +++ b/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; @@ -290,7 +302,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet } }; - private final VaadinContext vaadinContext = new VaadinContext( + private final AddonContext addonContext = new AddonContext( getDeploymentConfiguration()); @Override @@ -316,14 +328,14 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet config.getInitParameter(name)); } - vaadinContext.init(); + addonContext.init(); } @Override public void destroy() { super.destroy(); - vaadinContext.destroy(); + addonContext.destroy(); } protected enum RequestType { @@ -769,6 +781,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet // No application URL when running inside a portlet application.start(new ApplicationStartEvent(null, getDeploymentConfiguration(), context)); + addonContext.fireApplicationStarted(application); } } diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java index 2ba19b0cf6..8857c0e964 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java +++ b/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; @@ -37,12 +49,12 @@ import javax.servlet.http.HttpSession; import com.vaadin.Application; import com.vaadin.Application.ApplicationStartEvent; import com.vaadin.Application.SystemMessages; +import com.vaadin.shared.ApplicationConstants; import com.vaadin.terminal.DeploymentConfiguration; import com.vaadin.terminal.Terminal; import com.vaadin.terminal.ThemeResource; import com.vaadin.terminal.WrappedRequest; import com.vaadin.terminal.WrappedResponse; -import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.server.AbstractCommunicationManager.Callback; import com.vaadin.ui.Root; @@ -55,8 +67,6 @@ import com.vaadin.ui.Root; * * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 6.0 */ @@ -124,7 +134,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements } }; - private final VaadinContext vaadinContext = new VaadinContext( + private final AddonContext addonContext = new AddonContext( getDeploymentConfiguration()); /** @@ -162,14 +172,14 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements servletConfig.getInitParameter(name)); } - vaadinContext.init(); + addonContext.init(); } @Override public void destroy() { super.destroy(); - vaadinContext.destroy(); + addonContext.destroy(); } /** @@ -250,7 +260,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements // key). if (requestType == RequestType.UIDL && request.getParameterMap().containsKey( - ApplicationConnection.PARAM_UNLOADBURST) + ApplicationConstants.PARAM_UNLOADBURST) && request.getContentLength() < 1 && getExistingApplication(request, false) == null) { redirectToApplication(request, response); @@ -851,6 +861,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements application.setLocale(locale); application.start(new ApplicationStartEvent(applicationUrl, getDeploymentConfiguration(), webApplicationContext)); + addonContext.fireApplicationStarted(application); } } @@ -1153,7 +1164,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements } private boolean isOnUnloadRequest(HttpServletRequest request) { - return request.getParameter(ApplicationConnection.PARAM_UNLOADBURST) != null; + return request.getParameter(ApplicationConstants.PARAM_UNLOADBURST) != null; } /** diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java index b87aaa278b..00e65382cd 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java +++ b/server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; @@ -49,13 +61,14 @@ import javax.servlet.http.HttpServletResponse; import com.vaadin.Application; import com.vaadin.Application.SystemMessages; import com.vaadin.RootRequiresMoreInformationException; -import com.vaadin.Version; import com.vaadin.annotations.JavaScript; import com.vaadin.annotations.StyleSheet; import com.vaadin.external.json.JSONArray; import com.vaadin.external.json.JSONException; import com.vaadin.external.json.JSONObject; +import com.vaadin.shared.ApplicationConstants; import com.vaadin.shared.Connector; +import com.vaadin.shared.Version; import com.vaadin.shared.communication.MethodInvocation; import com.vaadin.shared.communication.SharedState; import com.vaadin.shared.communication.UidlValue; @@ -74,7 +87,6 @@ import com.vaadin.terminal.Vaadin6Component; import com.vaadin.terminal.VariableOwner; import com.vaadin.terminal.WrappedRequest; import com.vaadin.terminal.WrappedResponse; -import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.server.BootstrapHandler.BootstrapContext; import com.vaadin.terminal.gwt.server.ComponentSizeValidator.InvalidLayout; import com.vaadin.terminal.gwt.server.RpcManager.RpcInvocationException; @@ -90,7 +102,7 @@ import com.vaadin.ui.Window; * This is a common base class for the server-side implementations of the * communication system between the client code (compiled with GWT into * JavaScript) and the server side components. Its client side counterpart is - * {@link ApplicationConnection}. + * {@link ApplicationConstants}. * * TODO Document better! */ @@ -768,8 +780,8 @@ public abstract class AbstractCommunicationManager implements Serializable { public String getSecurityKeyUIDL(WrappedRequest request) { final String seckey = getSecurityKey(request); if (seckey != null) { - return "\"" + ApplicationConnection.UIDL_SECURITY_TOKEN_ID - + "\":\"" + seckey + "\","; + return "\"" + ApplicationConstants.UIDL_SECURITY_TOKEN_ID + "\":\"" + + seckey + "\","; } else { return ""; } @@ -784,11 +796,11 @@ public abstract class AbstractCommunicationManager implements Serializable { protected String getSecurityKey(WrappedRequest request) { String seckey = null; seckey = (String) request - .getSessionAttribute(ApplicationConnection.UIDL_SECURITY_TOKEN_ID); + .getSessionAttribute(ApplicationConstants.UIDL_SECURITY_TOKEN_ID); if (seckey == null) { seckey = UUID.randomUUID().toString(); request.setSessionAttribute( - ApplicationConnection.UIDL_SECURITY_TOKEN_ID, seckey); + ApplicationConstants.UIDL_SECURITY_TOKEN_ID, seckey); } return seckey; @@ -1286,7 +1298,7 @@ public abstract class AbstractCommunicationManager implements Serializable { } } - return ApplicationConnection.CONNECTOR_PROTOCOL_PREFIX + "/" + name; + return ApplicationConstants.CONNECTOR_PROTOCOL_PREFIX + "/" + name; } /** @@ -1543,7 +1555,7 @@ public abstract class AbstractCommunicationManager implements Serializable { // ApplicationServlet has stored the security token in the // session; check that it matched the one sent in the UIDL String sessId = (String) request - .getSessionAttribute(ApplicationConnection.UIDL_SECURITY_TOKEN_ID); + .getSessionAttribute(ApplicationConstants.UIDL_SECURITY_TOKEN_ID); if (sessId == null || !sessId.equals(bursts[0])) { throw new InvalidUIDLSecurityKeyException( @@ -2342,7 +2354,7 @@ public abstract class AbstractCommunicationManager implements Serializable { streamVariableToSeckey.put(value, seckey); } - return ApplicationConnection.APP_PROTOCOL_PREFIX + return ApplicationConstants.APP_PROTOCOL_PREFIX + ServletPortletHelper.UPLOAD_URL_PREFIX + key + "/" + seckey; } @@ -2394,8 +2406,7 @@ public abstract class AbstractCommunicationManager implements Serializable { // Use the same logic as for determined roots BootstrapHandler bootstrapHandler = getBootstrapHandler(); BootstrapContext context = bootstrapHandler.createContext( - combinedRequest, response, application, root.getRootId(), - null); + combinedRequest, response, application, root.getRootId()); String widgetset = context.getWidgetsetName(); String theme = context.getThemeName(); @@ -2407,8 +2418,7 @@ public abstract class AbstractCommunicationManager implements Serializable { params.put("widgetset", widgetset); params.put("themeUri", themeUri); // Root id might have changed based on e.g. window.name - params.put(ApplicationConnection.ROOT_ID_PARAMETER, - root.getRootId()); + params.put(ApplicationConstants.ROOT_ID_PARAMETER, root.getRootId()); if (sendUIDL) { String initialUIDL = getInitialUIDL(combinedRequest, root); params.put("uidl", initialUIDL); @@ -2485,7 +2495,7 @@ public abstract class AbstractCommunicationManager implements Serializable { String pathInfo = request.getRequestPathInfo(); // + 2 to also remove beginning and ending slashes String resourceName = pathInfo - .substring(ApplicationConnection.CONNECTOR_RESOURCE_PREFIX + .substring(ApplicationConstants.CONNECTOR_RESOURCE_PREFIX .length() + 2); final String mimetype = response.getDeploymentConfiguration() diff --git a/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java b/server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java index 1382c1ed53..a8e4cdfaca 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java +++ b/server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; @@ -17,7 +29,7 @@ public abstract class AbstractDeploymentConfiguration implements private final Class<?> systemPropertyBaseClass; private final Properties applicationProperties = new Properties(); - private VaadinContext vaadinContext; + private AddonContext addonContext; private boolean productionMode; private boolean xsrfProtectionEnabled; private int resourceCacheTime; @@ -131,22 +143,22 @@ public abstract class AbstractDeploymentConfiguration implements } @Override - public Iterator<VaadinContextListener> getContextListeners() { - // Called once for init and once for destroy, so it's probably not worth - // the effort caching the ServiceLoader instance - ServiceLoader<VaadinContextListener> contextListenerLoader = ServiceLoader - .load(VaadinContextListener.class, getClassLoader()); + public Iterator<AddonContextListener> getAddonContextListeners() { + // Called once for init and then no more, so there's no point in caching + // the instance + ServiceLoader<AddonContextListener> contextListenerLoader = ServiceLoader + .load(AddonContextListener.class, getClassLoader()); return contextListenerLoader.iterator(); } @Override - public void setVaadinContext(VaadinContext vaadinContext) { - this.vaadinContext = vaadinContext; + public void setAddonContext(AddonContext addonContext) { + this.addonContext = addonContext; } @Override - public VaadinContext getVaadinContext() { - return vaadinContext; + public AddonContext getAddonContext() { + return addonContext; } @Override diff --git a/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java b/server/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java index d3474e736e..ec2aa84947 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java +++ b/server/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java b/server/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java index 3a33621d10..d857eeef4a 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java +++ b/server/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; @@ -23,8 +35,8 @@ import javax.servlet.http.HttpSessionBindingListener; import com.vaadin.Application; import com.vaadin.service.ApplicationContext; +import com.vaadin.shared.ApplicationConstants; import com.vaadin.terminal.ApplicationResource; -import com.vaadin.terminal.gwt.client.ApplicationConnection; /** * Base class for web application contexts (including portlet contexts) that @@ -181,8 +193,8 @@ public abstract class AbstractWebApplicationContext implements final String filename = resource.getFilename(); if (filename == null) { - return ApplicationConnection.APP_PROTOCOL_PREFIX - + ApplicationConnection.APP_REQUEST_PATH + mapKey + "/"; + return ApplicationConstants.APP_PROTOCOL_PREFIX + + ApplicationConstants.APP_REQUEST_PATH + mapKey + "/"; } else { // #7738 At least Tomcat and JBoss refuses requests containing // encoded slashes or backslashes in URLs. Application resource URLs @@ -190,8 +202,8 @@ public abstract class AbstractWebApplicationContext implements // in the future. String encodedFileName = urlEncode(filename).replace("%2F", "/") .replace("%5C", "\\"); - return ApplicationConnection.APP_PROTOCOL_PREFIX - + ApplicationConnection.APP_REQUEST_PATH + mapKey + "/" + return ApplicationConstants.APP_PROTOCOL_PREFIX + + ApplicationConstants.APP_REQUEST_PATH + mapKey + "/" + encodedFileName; } diff --git a/server/src/com/vaadin/terminal/gwt/server/AddonContext.java b/server/src/com/vaadin/terminal/gwt/server/AddonContext.java new file mode 100644 index 0000000000..2af22c560b --- /dev/null +++ b/server/src/com/vaadin/terminal/gwt/server/AddonContext.java @@ -0,0 +1,175 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.server; + +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.ServiceLoader; + +import com.vaadin.Application; +import com.vaadin.event.EventRouter; +import com.vaadin.terminal.DeploymentConfiguration; +import com.vaadin.tools.ReflectTools; + +/** + * Point of entry for add-ons for integrating into various aspects of the + * framework. One add-on context is initialized for each Vaadin Servlet or + * Portlet instance and upon initialization, every {@link AddonContextListener} + * that can be found is notified to let it add listeners to the context. + * <p> + * By default, AddonContextListeners are loaded using {@link ServiceLoader}, + * which means that the file + * META-INF/services/com.vaadin.terminal.gwt.server.AddonContextListener will be + * checked for lines containing fully qualified names of classes to use. This + * behavior can however be overridden for custom deployment situations (e.g. to + * use CDI or OSGi) by overriding + * {@link DeploymentConfiguration#getAddonContextListeners()}. + * + * @author Vaadin Ltd + * @since 7.0.0 + */ +public class AddonContext { + private static final Method APPLICATION_STARTED_METHOD = ReflectTools + .findMethod(ApplicationStartedListener.class, "applicationStarted", + ApplicationStartedEvent.class); + + private final DeploymentConfiguration deploymentConfiguration; + + private final EventRouter eventRouter = new EventRouter(); + + private List<BootstrapListener> bootstrapListeners = new ArrayList<BootstrapListener>(); + + private List<AddonContextListener> initedListeners = new ArrayList<AddonContextListener>(); + + /** + * Creates a new context using a given deployment configuration. Only the + * framework itself should typically create AddonContext methods. + * + * @param deploymentConfiguration + * the deployment configuration for the associated servlet or + * portlet. + */ + public AddonContext(DeploymentConfiguration deploymentConfiguration) { + this.deploymentConfiguration = deploymentConfiguration; + deploymentConfiguration.setAddonContext(this); + } + + /** + * Gets the deployment configuration for this context. + * + * @return the deployment configuration + */ + public DeploymentConfiguration getDeploymentConfiguration() { + return deploymentConfiguration; + } + + /** + * Initializes this context, causing all found listeners to be notified. + * Listeners are by default found using {@link ServiceLoader}, but the + * {@link DeploymentConfiguration} can provide an alternative + * implementation. + * <p> + * This method is not intended to be used by add-ons, but instead by the + * part of the framework that created this context object. + */ + public void init() { + AddonContextEvent event = new AddonContextEvent(this); + Iterator<AddonContextListener> listeners = deploymentConfiguration + .getAddonContextListeners(); + while (listeners.hasNext()) { + AddonContextListener listener = listeners.next(); + listener.contextCreated(event); + initedListeners.add(listener); + } + } + + /** + * Destroys this context, causing all initialized listeners to be invoked. + * <p> + * This method is not intended to be used by add-ons, but instead by the + * part of the framework that created this context object. + */ + public void destroy() { + AddonContextEvent event = new AddonContextEvent(this); + for (AddonContextListener listener : initedListeners) { + listener.contextDestoryed(event); + } + } + + /** + * Shorthand for adding a bootstrap listener that will be added to every new + * application. + * + * @see #addApplicationStartedListener(ApplicationStartedListener) + * @see Application#addBootstrapListener(BootstrapListener) + * + * @param listener + * the bootstrap listener that should be added to all new + * applications. + */ + public void addBootstrapListener(BootstrapListener listener) { + bootstrapListeners.add(listener); + } + + /** + * Fires an {@link ApplicationStartedEvent} to all registered listeners. + * This method is not intended to be used by add-ons, but instead by the + * part of the framework that creates new Application instances. + * + * @see #addApplicationStartedListener(ApplicationStartedListener) + * + * @param application + * the newly started application + */ + public void fireApplicationStarted(Application application) { + eventRouter.fireEvent(new ApplicationStartedEvent(this, application)); + for (BootstrapListener l : bootstrapListeners) { + application.addBootstrapListener(l); + } + } + + /** + * Adds a listener that will be notified any time a new {@link Application} + * instance is started or more precisely directly after + * {@link Application#init()} has been invoked. + * + * @param applicationStartListener + * the application start listener that should be added + */ + public void addApplicationStartedListener( + ApplicationStartedListener applicationStartListener) { + eventRouter.addListener(ApplicationStartedEvent.class, + applicationStartListener, APPLICATION_STARTED_METHOD); + } + + /** + * Removes an application start listener. + * + * @see #addApplicationStartedListener(ApplicationStartedListener) + * + * @param applicationStartListener + * the application start listener to remove + */ + public void removeApplicationStartedListener( + ApplicationStartedListener applicationStartListener) { + eventRouter.removeListener(ApplicationStartedEvent.class, + applicationStartListener, APPLICATION_STARTED_METHOD); + } + +} diff --git a/server/src/com/vaadin/terminal/gwt/server/AddonContextEvent.java b/server/src/com/vaadin/terminal/gwt/server/AddonContextEvent.java new file mode 100644 index 0000000000..0f3900fa20 --- /dev/null +++ b/server/src/com/vaadin/terminal/gwt/server/AddonContextEvent.java @@ -0,0 +1,50 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.server; + +import java.util.EventObject; + +/** + * Event used when an {@link AddonContext} is created and destroyed. + * + * @see AddonContextListener + * + * @author Vaadin Ltd + * @since 7.0.0 + */ +public class AddonContextEvent extends EventObject { + + /** + * Creates a new event for the given add-on context. + * + * @param source + * the add-on context that created the event + */ + public AddonContextEvent(AddonContext source) { + super(source); + } + + /** + * Gets the add-on context that created this event. + * + * @return the add-on context that created this event. + */ + public AddonContext getAddonContext() { + return (AddonContext) getSource(); + } + +} diff --git a/server/src/com/vaadin/terminal/gwt/server/AddonContextListener.java b/server/src/com/vaadin/terminal/gwt/server/AddonContextListener.java new file mode 100644 index 0000000000..b76d233716 --- /dev/null +++ b/server/src/com/vaadin/terminal/gwt/server/AddonContextListener.java @@ -0,0 +1,53 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.server; + +import java.util.EventListener; + +/** + * Listener that gets notified then the {@link AddonContext} is initialized, + * allowing an add-on to add listeners to various parts of the framework. In a + * default configuration, add-ons can register their listeners by including a + * file named + * META-INF/services/com.vaadin.terminal.gwt.server.AddonContextListener + * containing the fully qualified class names of classes implementing this + * interface. + * + * @author Vaadin Ltd + * @since 7.0.0 + */ +public interface AddonContextListener extends EventListener { + /** + * Notifies the listener that the add-on context has been created and + * initialized. An add-on can use this method to get access to an + * {@link AddonContext} object to which listeners can be added. + * + * @param event + * the add-on context event + */ + public void contextCreated(AddonContextEvent event); + + /** + * Notifies the listener that the add-on context has been closed. An add-on + * can use this method to e.g. close resources that have been opened in + * {@link #contextCreated(AddonContextEvent)}. + * + * @param event + * the add-on context event + */ + public void contextDestoryed(AddonContextEvent event); +} diff --git a/src/com/vaadin/terminal/gwt/server/ApplicationPortlet2.java b/server/src/com/vaadin/terminal/gwt/server/ApplicationPortlet2.java index 788c48267e..743670438e 100644 --- a/src/com/vaadin/terminal/gwt/server/ApplicationPortlet2.java +++ b/server/src/com/vaadin/terminal/gwt/server/ApplicationPortlet2.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java b/server/src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java index 42726c933e..d5c0d604c3 100644 --- a/src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java +++ b/server/src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java b/server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java index 1af49e0da0..06bc70872d 100644 --- a/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java +++ b/server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; @@ -14,8 +26,6 @@ import com.vaadin.terminal.gwt.server.ServletPortletHelper.ApplicationClassExcep * This servlet connects a Vaadin Application to Web. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 5.0 */ diff --git a/server/src/com/vaadin/terminal/gwt/server/ApplicationStartedEvent.java b/server/src/com/vaadin/terminal/gwt/server/ApplicationStartedEvent.java new file mode 100644 index 0000000000..02d73884f5 --- /dev/null +++ b/server/src/com/vaadin/terminal/gwt/server/ApplicationStartedEvent.java @@ -0,0 +1,65 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.server; + +import java.util.EventObject; + +import com.vaadin.Application; + +/** + * Event used by + * {@link ApplicationStartedListener#applicationStarted(ApplicationStartedEvent)} + * . + * + * @author Vaadin Ltd + * @since 7.0.0 + */ +public class ApplicationStartedEvent extends EventObject { + private final Application application; + + /** + * Creates a new event. + * + * @param context + * the add-on context that will fire the event + * @param application + * the application that has been started + */ + public ApplicationStartedEvent(AddonContext context, Application application) { + super(context); + this.application = application; + } + + /** + * Gets the add-on context from which this event originated. + * + * @return the add-on context that fired the + */ + public AddonContext getContext() { + return (AddonContext) getSource(); + } + + /** + * Gets the newly started Application. + * + * @return the newly created application + */ + public Application getApplication() { + return application; + } + +} diff --git a/server/src/com/vaadin/terminal/gwt/server/ApplicationStartedListener.java b/server/src/com/vaadin/terminal/gwt/server/ApplicationStartedListener.java new file mode 100644 index 0000000000..c6976aee57 --- /dev/null +++ b/server/src/com/vaadin/terminal/gwt/server/ApplicationStartedListener.java @@ -0,0 +1,42 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.server; + +import java.util.EventListener; + +import com.vaadin.Application; + +/** + * Listener that gets notified when a new {@link Application} has been started. + * Add-ons can use this listener to automatically integrate with API tied to the + * Application API. + * + * @see AddonContext#addApplicationStartedListener(ApplicationStartedListener) + * + * @author Vaadin Ltd + * @since 7.0.0 + */ +public interface ApplicationStartedListener extends EventListener { + /** + * Tells the listener that an application has been started (meaning that + * {@link Application#init()} has been invoked. + * + * @param event + * details about the event + */ + public void applicationStarted(ApplicationStartedEvent event); +} diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapDom.java b/server/src/com/vaadin/terminal/gwt/server/BootstrapDom.java new file mode 100644 index 0000000000..15210a7de5 --- /dev/null +++ b/server/src/com/vaadin/terminal/gwt/server/BootstrapDom.java @@ -0,0 +1,21 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.server; + +public class BootstrapDom { + +} diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapFragmentResponse.java b/server/src/com/vaadin/terminal/gwt/server/BootstrapFragmentResponse.java new file mode 100644 index 0000000000..fabb69784f --- /dev/null +++ b/server/src/com/vaadin/terminal/gwt/server/BootstrapFragmentResponse.java @@ -0,0 +1,77 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.server; + +import java.util.List; + +import org.jsoup.nodes.Node; + +import com.vaadin.Application; +import com.vaadin.terminal.WrappedRequest; + +/** + * A representation of a bootstrap fragment being generated. The bootstrap + * fragment is the HTML code that will make up the actual application. This also + * includes the JavaScript that initializes the application. + * + * @author Vaadin Ltd + * @since 7.0.0 + */ +public class BootstrapFragmentResponse extends BootstrapResponse { + private final List<Node> fragmentNodes; + + /** + * Crate a new bootstrap fragment response. + * + * @see BootstrapResponse#BootstrapResponse(BootstrapHandler, + * WrappedRequest, Application, Integer) + * + * @param handler + * the bootstrap handler that is firing the event + * @param request + * the wrapped request for which the bootstrap page should be + * generated + * @param application + * the application for which the bootstrap page should be + * generated + * @param rootId + * the generated id of the Root that will be displayed on the + * page + * @param fragmentNodes + * a mutable list containing the DOM nodes that will make up the + * application HTML + */ + public BootstrapFragmentResponse(BootstrapHandler handler, + WrappedRequest request, Application application, Integer rootId, + List<Node> fragmentNodes) { + super(handler, request, application, rootId); + this.fragmentNodes = fragmentNodes; + } + + /** + * Gets the list of DOM nodes that will be used to generate the fragment + * HTML. Changes to the returned list will be reflected in the generated + * HTML. + * + * @return the current list of DOM nodes that makes up the application + * fragment + */ + public List<Node> getFragmentNodes() { + return fragmentNodes; + } + +} diff --git a/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java b/server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java index d025e93072..fad80cacaa 100644 --- a/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java +++ b/server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; @@ -8,7 +20,9 @@ import java.io.BufferedWriter; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.Serializable; +import java.util.ArrayList; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; @@ -19,19 +33,20 @@ import org.jsoup.nodes.DataNode; import org.jsoup.nodes.Document; import org.jsoup.nodes.DocumentType; import org.jsoup.nodes.Element; +import org.jsoup.nodes.Node; import org.jsoup.parser.Tag; import com.vaadin.Application; import com.vaadin.RootRequiresMoreInformationException; -import com.vaadin.Version; import com.vaadin.external.json.JSONException; import com.vaadin.external.json.JSONObject; +import com.vaadin.shared.ApplicationConstants; +import com.vaadin.shared.Version; import com.vaadin.terminal.DeploymentConfiguration; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.RequestHandler; import com.vaadin.terminal.WrappedRequest; import com.vaadin.terminal.WrappedResponse; -import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.ui.Root; public abstract class BootstrapHandler implements RequestHandler { @@ -39,14 +54,14 @@ public abstract class BootstrapHandler implements RequestHandler { protected class BootstrapContext implements Serializable { private final WrappedResponse response; - private final BootstrapResponse bootstrapResponse; + private final BootstrapFragmentResponse bootstrapResponse; private String widgetsetName; private String themeName; private String appId; public BootstrapContext(WrappedResponse response, - BootstrapResponse bootstrapResponse) { + BootstrapFragmentResponse bootstrapResponse) { this.response = response; this.bootstrapResponse = bootstrapResponse; } @@ -98,7 +113,7 @@ public abstract class BootstrapHandler implements RequestHandler { return appId; } - public BootstrapResponse getBootstrapResponse() { + public BootstrapFragmentResponse getBootstrapResponse() { return bootstrapResponse; } @@ -124,7 +139,17 @@ public abstract class BootstrapHandler implements RequestHandler { } try { - writeBootstrapPage(request, response, application, rootId); + BootstrapContext context = createContext(request, response, + application, rootId); + setupMainDiv(context); + + BootstrapFragmentResponse fragmentResponse = context + .getBootstrapResponse(); + application.modifyBootstrapResponse(fragmentResponse); + + String html = getBootstrapHtml(context); + + writeBootstrapPage(response, html); } catch (JSONException e) { writeError(response, e); } @@ -132,75 +157,125 @@ public abstract class BootstrapHandler implements RequestHandler { return true; } - protected final void writeBootstrapPage(WrappedRequest request, - WrappedResponse response, Application application, Integer rootId) - throws IOException, JSONException { - - Map<String, Object> headers = new LinkedHashMap<String, Object>(); - BootstrapContext context = createContext(request, response, - application, rootId, headers); - + private String getBootstrapHtml(BootstrapContext context) { + WrappedRequest request = context.getRequest(); + WrappedResponse response = context.getResponse(); DeploymentConfiguration deploymentConfiguration = request .getDeploymentConfiguration(); - boolean standalone = deploymentConfiguration.isStandalone(request); - if (standalone) { - setBootstrapPageHeaders(context); - setBasicHtml(context); - setBootstrapPageHtmlHeader(context); - setBodyTag(context); - } + BootstrapFragmentResponse fragmentResponse = context + .getBootstrapResponse(); - setBootstrapPageHtmlVaadinScripts(context); + if (deploymentConfiguration.isStandalone(request)) { + Map<String, Object> headers = new LinkedHashMap<String, Object>(); + Document document = Document.createShell(""); + BootstrapPageResponse pageResponse = new BootstrapPageResponse( + this, request, context.getApplication(), context.getRootId(), document, + headers); + List<Node> fragmentNodes = fragmentResponse.getFragmentNodes(); + Element body = document.body(); + for (Node node : fragmentNodes) { + body.appendChild(node); + } - setMainDiv(context); + setupStandaloneDocument(context, pageResponse); + context.getApplication().modifyBootstrapResponse(pageResponse); - request.getDeploymentConfiguration().getVaadinContext() - .fireModifyBootstrapEvent(context.getBootstrapResponse()); + sendBootstrapHeaders(response, headers); - response.setContentType("text/html"); - BufferedWriter writer = new BufferedWriter(new OutputStreamWriter( - response.getOutputStream(), "UTF-8")); - if (standalone) { - Set<Entry<String, Object>> entrySet = headers.entrySet(); - for (Entry<String, Object> header : entrySet) { - Object value = header.getValue(); - if (value instanceof String) { - response.setHeader(header.getKey(), (String) value); - } else if (value instanceof Long) { - response.setDateHeader(header.getKey(), - ((Long) value).longValue()); - } else { - throw new RuntimeException("Unsupported header value: " - + value); + return document.outerHtml(); + } else { + StringBuilder sb = new StringBuilder(); + for (Node node : fragmentResponse.getFragmentNodes()) { + if (sb.length() != 0) { + sb.append('\n'); } + sb.append(node.outerHtml()); } - writer.append(context.getBootstrapResponse().getDocument() - .outerHtml()); - } else { - writer.append(context.getBootstrapResponse().getApplicationTag() - .outerHtml()); + + return sb.toString(); } - writer.close(); } - public BootstrapContext createContext(WrappedRequest request, - WrappedResponse response, Application application, Integer rootId, + private void sendBootstrapHeaders(WrappedResponse response, Map<String, Object> headers) { - boolean standalone = request.getDeploymentConfiguration().isStandalone( - request); - Document document; - Element applicationTag; - if (standalone) { - document = Document.createShell(""); - applicationTag = document.body(); - } else { - document = null; - applicationTag = new Element(Tag.valueOf("div"), ""); + Set<Entry<String, Object>> entrySet = headers.entrySet(); + for (Entry<String, Object> header : entrySet) { + Object value = header.getValue(); + if (value instanceof String) { + response.setHeader(header.getKey(), (String) value); + } else if (value instanceof Long) { + response.setDateHeader(header.getKey(), + ((Long) value).longValue()); + } else { + throw new RuntimeException("Unsupported header value: " + value); + } + } + } + + private void writeBootstrapPage(WrappedResponse response, String html) + throws IOException { + response.setContentType("text/html"); + BufferedWriter writer = new BufferedWriter(new OutputStreamWriter( + response.getOutputStream(), "UTF-8")); + writer.append(html); + writer.close(); + } + + private void setupStandaloneDocument(BootstrapContext context, + BootstrapPageResponse response) { + response.setHeader("Cache-Control", "no-cache"); + response.setHeader("Pragma", "no-cache"); + response.setDateHeader("Expires", 0); + + Document document = response.getDocument(); + + DocumentType doctype = new DocumentType("html", + "-//W3C//DTD XHTML 1.0 Transitional//EN", + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", + document.baseUri()); + document.child(0).before(doctype); + document.body().parent().attr("xmlns", "http://www.w3.org/1999/xhtml"); + + Element head = document.head(); + head.appendElement("meta").attr("http-equiv", "Content-Type") + .attr("content", "text/html; charset=utf-8"); + + // Chrome frame in all versions of IE (only if Chrome frame is + // installed) + head.appendElement("meta").attr("http-equiv", "X-UA-Compatible") + .attr("content", "chrome=1"); + + Root root = context.getRoot(); + String title = ((root == null || root.getCaption() == null) ? "" : root + .getCaption()); + head.appendElement("title").appendText(title); + + head.appendElement("style").attr("type", "text/css") + .appendText("html, body {height:100%;margin:0;}"); + + // Add favicon links + String themeName = context.getThemeName(); + if (themeName != null) { + String themeUri = getThemeUri(context, themeName); + head.appendElement("link").attr("rel", "shortcut icon") + .attr("type", "image/vnd.microsoft.icon") + .attr("href", themeUri + "/favicon.ico"); + head.appendElement("link").attr("rel", "icon") + .attr("type", "image/vnd.microsoft.icon") + .attr("href", themeUri + "/favicon.ico"); } + + Element body = document.body(); + body.attr("scroll", "auto"); + body.addClass(ApplicationConstants.GENERATED_BODY_CLASSNAME); + } + + public BootstrapContext createContext(WrappedRequest request, + WrappedResponse response, Application application, Integer rootId) { BootstrapContext context = new BootstrapContext(response, - new BootstrapResponse(this, request, document, applicationTag, - headers, application, rootId)); + new BootstrapFragmentResponse(this, request, + application, rootId, new ArrayList<Node>())); return context; } @@ -243,8 +318,10 @@ public abstract class BootstrapHandler implements RequestHandler { * @param context * * @throws IOException + * @throws JSONException */ - protected void setMainDiv(BootstrapContext context) throws IOException { + private void setupMainDiv(BootstrapContext context) throws IOException, + JSONException { String style = getMainDivStyle(context); /*- Add classnames; @@ -256,73 +333,23 @@ public abstract class BootstrapHandler implements RequestHandler { */ String appClass = "v-app-" - + getApplicationCSSClassName(context.getApplication()); + + context.getApplication().getClass().getSimpleName(); String classNames = "v-app " + appClass; + List<Node> fragmentNodes = context.getBootstrapResponse() + .getFragmentNodes(); - Element applicationTag = context.getBootstrapResponse() - .getApplicationTag(); - Element mainDiv = applicationTag.appendElement("div"); + Element mainDiv = new Element(Tag.valueOf("div"), ""); mainDiv.attr("id", context.getAppId()); mainDiv.addClass(classNames); if (style != null && style.length() != 0) { mainDiv.attr("style", style); } mainDiv.appendElement("div").addClass("v-app-loading"); - mainDiv.appendElement("noscript").append(getNoScriptMessage()); - } - - /** - * Returns a message printed for browsers without scripting support or if - * browsers scripting support is disabled. - */ - protected String getNoScriptMessage() { - return "You have to enable javascript in your browser to use an application built with Vaadin."; - } - - /** - * Returns the application class identifier for use in the application CSS - * class name in the root DIV. The application CSS class name is of form - * "v-app-"+getApplicationCSSClassName(). - * - * This method should normally not be overridden. - * - * @return The CSS class name to use in combination with "v-app-". - */ - protected String getApplicationCSSClassName(Application application) { - return application.getClass().getSimpleName(); - } + mainDiv.appendElement("noscript") + .append("You have to enable javascript in your browser to use an application built with Vaadin."); + fragmentNodes.add(mainDiv); - /** - * - * Method to open the body tag of the html kickstart page. - * <p> - * This method is responsible for closing the head tag and opening the body - * tag. - * <p> - * Override this method if you want to add some custom html to the page. - * - * @throws IOException - */ - protected void setBodyTag(BootstrapContext context) throws IOException { - Element body = context.getBootstrapResponse().getDocument().body(); - body.attr("scroll", "auto"); - body.addClass(ApplicationConnection.GENERATED_BODY_CLASSNAME); - } - - /** - * Method to write the script part of the page which loads needed Vaadin - * scripts and themes. - * <p> - * Override this method if you want to add some custom html around scripts. - * - * @param context - * - * @throws IOException - * @throws JSONException - */ - protected void setBootstrapPageHtmlVaadinScripts(BootstrapContext context) - throws IOException, JSONException { WrappedRequest request = context.getRequest(); DeploymentConfiguration deploymentConfiguration = request @@ -330,22 +357,19 @@ public abstract class BootstrapHandler implements RequestHandler { String staticFileLocation = deploymentConfiguration .getStaticFileLocation(request); - Element applicationTag = context.getBootstrapResponse() - .getApplicationTag(); - - applicationTag - .appendElement("iframe") - .attr("tabIndex", "-1") - .attr("id", "__gwt_historyFrame") - .attr("style", - "position:absolute;width:0;height:0;border:0;overflow:hidden") - .attr("src", "javascript:false"); + fragmentNodes + .add(new Element(Tag.valueOf("iframe"), "") + .attr("tabIndex", "-1") + .attr("id", "__gwt_historyFrame") + .attr("style", + "position:absolute;width:0;height:0;border:0;overflow:hidden") + .attr("src", "javascript:false")); String bootstrapLocation = staticFileLocation + "/VAADIN/vaadinBootstrap.js"; - applicationTag.appendElement("script").attr("type", "text/javascript") - .attr("src", bootstrapLocation); - Element mainScriptTag = applicationTag.appendElement("script").attr( + fragmentNodes.add(new Element(Tag.valueOf("script"), "").attr("type", + "text/javascript").attr("src", bootstrapLocation)); + Element mainScriptTag = new Element(Tag.valueOf("script"), "").attr( "type", "text/javascript"); StringBuilder builder = new StringBuilder(); @@ -359,6 +383,8 @@ public abstract class BootstrapHandler implements RequestHandler { builder.append("//]]>"); mainScriptTag.appendChild(new DataNode(builder.toString(), mainScriptTag.baseUri())); + fragmentNodes.add(mainScriptTag); + } protected void appendMainScriptTagContents(BootstrapContext context, @@ -396,7 +422,7 @@ public abstract class BootstrapHandler implements RequestHandler { JSONObject appConfig = new JSONObject(); if (rootId != null) { - appConfig.put(ApplicationConnection.ROOT_ID_PARAMETER, rootId); + appConfig.put(ApplicationConstants.ROOT_ID_PARAMETER, rootId); } if (context.getThemeName() != null) { @@ -482,93 +508,6 @@ public abstract class BootstrapHandler implements RequestHandler { protected abstract String getAppUri(BootstrapContext context); /** - * Method to write the contents of head element in html kickstart page. - * <p> - * Override this method if you want to add some custom html to the header of - * the page. - * - * @throws IOException - */ - protected void setBootstrapPageHtmlHeader(BootstrapContext context) - throws IOException { - String themeName = context.getThemeName(); - Element head = context.getBootstrapResponse().getDocument().head(); - head.appendElement("meta").attr("http-equiv", "Content-Type") - .attr("content", "text/html; charset=utf-8"); - - // Chrome frame in all versions of IE (only if Chrome frame is - // installed) - head.appendElement("meta").attr("http-equiv", "X-UA-Compatible") - .attr("content", "chrome=1"); - - head.appendElement("style").attr("type", "text/css") - .appendText("html, body {height:100%;margin:0;}"); - - // Add favicon links - if (themeName != null) { - String themeUri = getThemeUri(context, themeName); - head.appendElement("link").attr("rel", "shortcut icon") - .attr("type", "image/vnd.microsoft.icon") - .attr("href", themeUri + "/favicon.ico"); - head.appendElement("link").attr("rel", "icon") - .attr("type", "image/vnd.microsoft.icon") - .attr("href", themeUri + "/favicon.ico"); - } - - Root root = context.getRoot(); - String title = ((root == null || root.getCaption() == null) ? "" : root - .getCaption()); - - head.appendElement("title").appendText(title); - } - - /** - * Method to set http request headers for the Vaadin kickstart page. - * <p> - * Override this method if you need to customize http headers of the page. - * - * @param context - */ - protected void setBootstrapPageHeaders(BootstrapContext context) { - WrappedResponse response = context.getResponse(); - - // Window renders are not cacheable - response.setHeader("Cache-Control", "no-cache"); - response.setHeader("Pragma", "no-cache"); - response.setDateHeader("Expires", 0); - response.setContentType("text/html; charset=UTF-8"); - } - - /** - * Method to write the beginning of the html page. - * <p> - * This method is responsible for writing appropriate doc type declarations - * and to open html and head tags. - * <p> - * Override this method if you want to add some custom html to the very - * beginning of the page. - * - * @param context - * @throws IOException - */ - protected void setBasicHtml(BootstrapContext context) throws IOException { - - // write html header - // page.write("<!DOCTYPE html PUBLIC \"-//W3C//DTD " - // + "XHTML 1.0 Transitional//EN\" " - // + "\"http://www.w3.org/TR/xhtml1/" - // + "DTD/xhtml1-transitional.dtd\">\n"); - Document document = context.getBootstrapResponse().getDocument(); - DocumentType doctype = new DocumentType("html", - "//W3C//DTD XHTML 1.0 Transitional//EN", - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", - document.baseUri()); - document.child(0).before(doctype); - - document.body().parent().attr("xmlns", "http://www.w3.org/1999/xhtml"); - } - - /** * Get the URI for the application theme. * * A portal-wide default theme is fetched from the portal shared resource diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapListener.java b/server/src/com/vaadin/terminal/gwt/server/BootstrapListener.java new file mode 100644 index 0000000000..d99d5b7b84 --- /dev/null +++ b/server/src/com/vaadin/terminal/gwt/server/BootstrapListener.java @@ -0,0 +1,60 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.server; + +import java.util.EventListener; + +import javax.portlet.RenderResponse; + +/** + * Event listener notified when the bootstrap HTML is about to be generated and + * send to the client. The bootstrap HTML is first constructed as an in-memory + * DOM representation which registered listeners can modify before the final + * HTML is generated. + * + * @author Vaadin Ltd + * @since 7.0.0 + */ +public interface BootstrapListener extends EventListener { + /** + * Lets this listener make changes to the fragment that makes up the actual + * Vaadin application. In a typical Servlet deployment, this is the contents + * of the HTML body tag. In a typical Portlet deployment, this is the HTML + * that will be returned in a {@link RenderResponse}. + * + * @param response + * the bootstrap response that can modified to cause changes in + * the generated HTML. + */ + public void modifyBootstrapFragment(BootstrapFragmentResponse response); + + /** + * Lets this listener make changes to the overall HTML document that will be + * used as the initial HTML page in a typical Servlet deployment as well as + * the HTTP headers in the response serving the initial HTML. In cases where + * a full HTML document is not generated, this method will not be invoked. + * <p> + * If a full page is being generated, this method is invoked after + * {@link #modifyBootstrapFragment(BootstrapFragmentResponse)} has been + * invoked for all registered listeners. + * + * @param response + * the bootstrap response that can be modified to cause change in + * the generate HTML and in the HTTP headers of the response. + */ + public void modifyBootstrapPage(BootstrapPageResponse response); +} diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapPageResponse.java b/server/src/com/vaadin/terminal/gwt/server/BootstrapPageResponse.java new file mode 100644 index 0000000000..e7440f4c22 --- /dev/null +++ b/server/src/com/vaadin/terminal/gwt/server/BootstrapPageResponse.java @@ -0,0 +1,113 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.server; + +import java.util.Map; + +import org.jsoup.nodes.Document; + +import com.vaadin.Application; +import com.vaadin.terminal.WrappedRequest; +import com.vaadin.terminal.WrappedResponse; + +/** + * A representation of a bootstrap page being generated. The bootstrap page + * contains of the full DOM of the HTML document as well as the HTTP headers + * that will be included in the corresponding HTTP response. + * + * @author Vaadin Ltd + * @since 7.0.0 + */ +public class BootstrapPageResponse extends BootstrapResponse { + + private final Map<String, Object> headers; + private final Document document; + + /** + * Crate a new bootstrap page response. + * + * @see BootstrapResponse#BootstrapResponse(BootstrapHandler, + * WrappedRequest, Application, Integer) + * + * @param handler + * the bootstrap handler that is firing the event + * @param request + * the wrapped request for which the bootstrap page should be + * generated + * @param application + * the application for which the bootstrap page should be + * generated + * @param rootId + * the generated id of the Root that will be displayed on the + * page + * @param document + * the DOM document making up the HTML page + * @param headers + * a map into which header data can be added + */ + public BootstrapPageResponse(BootstrapHandler handler, + WrappedRequest request, Application application, Integer rootId, + Document document, Map<String, Object> headers) { + super(handler, request, application, rootId); + this.headers = headers; + this.document = document; + } + + /** + * Sets a header value that will be added to the HTTP response. If the + * header had already been set, the new value overwrites the previous one. + * + * @see WrappedResponse#setHeader(String, String) + * + * @param name + * the name of the header + * @param value + * the header value + */ + public void setHeader(String name, String value) { + headers.put(name, value); + } + + /** + * Properly formats a timestamp as a date in a header that will be included + * in the HTTP response. If the header had already been set, the new value + * overwrites the previous one. + * + * @see #setHeader(String, String) + * @see WrappedResponse#setDateHeader(String, long) + * + * @param name + * the name of the header + * @param timestamp + * the number of milliseconds since epoch + */ + public void setDateHeader(String name, long timestamp) { + headers.put(name, Long.valueOf(timestamp)); + } + + /** + * Gets the document node representing the root of the DOM hierarchy that + * will be used to generate the HTML page. Changes to the document will be + * reflected in the HTML. + * + * @return the document node + */ + public Document getDocument() { + return document; + } + +} diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java b/server/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java new file mode 100644 index 0000000000..10f97e7e79 --- /dev/null +++ b/server/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java @@ -0,0 +1,122 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.terminal.gwt.server; + +import java.util.EventObject; + +import com.vaadin.Application; +import com.vaadin.RootRequiresMoreInformationException; +import com.vaadin.terminal.WrappedRequest; +import com.vaadin.ui.Root; + +/** + * Base class providing common functionality used in different bootstrap + * modification events. + * + * @author Vaadin Ltd + * @since 7.0.0 + */ +public abstract class BootstrapResponse extends EventObject { + private final WrappedRequest request; + private final Application application; + private final Integer rootId; + + /** + * Creates a new bootstrap event. + * + * @param handler + * the bootstrap handler that is firing the event + * @param request + * the wrapped request for which the bootstrap page should be + * generated + * @param application + * the application for which the bootstrap page should be + * generated + * @param rootId + * the generated id of the Root that will be displayed on the + * page + */ + public BootstrapResponse(BootstrapHandler handler, WrappedRequest request, + Application application, Integer rootId) { + super(handler); + this.request = request; + this.application = application; + this.rootId = rootId; + } + + /** + * Gets the bootstrap handler that fired this event + * + * @return the bootstrap handler that fired this event + */ + public BootstrapHandler getBootstrapHandler() { + return (BootstrapHandler) getSource(); + } + + /** + * Gets the request for which the generated bootstrap HTML will be the + * response. This can be used to read request headers and other additional + * information. Please note that {@link WrappedRequest#getBrowserDetails()} + * will not be available because the bootstrap page is generated before the + * bootstrap javascript has had a chance to send any information back to the + * server. + * + * @return the wrapped request that is being handled + */ + public WrappedRequest getRequest() { + return request; + } + + /** + * Gets the application to which the rendered view belongs. + * + * @return the application + */ + public Application getApplication() { + return application; + } + + /** + * Gets the root id that has been generated for this response. Please note + * that if {@link Application#isRootPreserved()} is enabled, a previously + * created Root with a different id might eventually end up being used. + * + * @return the root id + */ + public Integer getRootId() { + return rootId; + } + + /** + * Gets the Root for which this page is being rendered, if available. Some + * features of the framework will postpone the Root selection until after + * the bootstrap page has been rendered and required information from the + * browser has been sent back. This method will return <code>null</code> if + * no Root instance is yet available. + * + * @see Application#isRootPreserved() + * @see Application#getRoot(WrappedRequest) + * @see RootRequiresMoreInformationException + * + * @return The Root that will be displayed in the page being generated, or + * <code>null</code> if all required information is not yet + * available. + */ + public Root getRoot() { + return Root.getCurrent(); + } +} diff --git a/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java b/server/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java index 8f0c80332f..cb0645d94f 100644 --- a/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java +++ b/server/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/src/com/vaadin/terminal/gwt/server/ClientConnector.java b/server/src/com/vaadin/terminal/gwt/server/ClientConnector.java index 4f74cfe4bb..eef4e240ec 100644 --- a/src/com/vaadin/terminal/gwt/server/ClientConnector.java +++ b/server/src/com/vaadin/terminal/gwt/server/ClientConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; @@ -19,7 +31,6 @@ import com.vaadin.ui.Root; * with the client side * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 * */ diff --git a/src/com/vaadin/terminal/gwt/server/ClientMethodInvocation.java b/server/src/com/vaadin/terminal/gwt/server/ClientMethodInvocation.java index 64ea288665..25d0b23725 100644 --- a/src/com/vaadin/terminal/gwt/server/ClientMethodInvocation.java +++ b/server/src/com/vaadin/terminal/gwt/server/ClientMethodInvocation.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/src/com/vaadin/terminal/gwt/server/CommunicationManager.java b/server/src/com/vaadin/terminal/gwt/server/CommunicationManager.java index 3cc3a8cb64..e0386b51b4 100644 --- a/src/com/vaadin/terminal/gwt/server/CommunicationManager.java +++ b/server/src/com/vaadin/terminal/gwt/server/CommunicationManager.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; @@ -24,8 +36,6 @@ import com.vaadin.ui.Root; * @see AbstractCommunicationManager * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 5.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java b/server/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java index 171d440796..6ebdace3e3 100644 --- a/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java +++ b/server/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/src/com/vaadin/terminal/gwt/server/Constants.java b/server/src/com/vaadin/terminal/gwt/server/Constants.java index 7efb0205ac..78c043da69 100644 --- a/src/com/vaadin/terminal/gwt/server/Constants.java +++ b/server/src/com/vaadin/terminal/gwt/server/Constants.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java b/server/src/com/vaadin/terminal/gwt/server/DragAndDropService.java index efb5666efa..bb96c6e53e 100644 --- a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java +++ b/server/src/com/vaadin/terminal/gwt/server/DragAndDropService.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; @@ -19,12 +31,12 @@ import com.vaadin.event.dd.DropTarget; import com.vaadin.event.dd.TargetDetails; import com.vaadin.event.dd.TargetDetailsImpl; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; +import com.vaadin.shared.ApplicationConstants; import com.vaadin.shared.communication.SharedState; import com.vaadin.shared.ui.dd.DragEventType; import com.vaadin.terminal.Extension; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.VariableOwner; -import com.vaadin.terminal.gwt.client.ui.dd.VDragAndDropManager; import com.vaadin.ui.Component; import com.vaadin.ui.Root; @@ -230,7 +242,7 @@ public class DragAndDropService implements VariableOwner, ClientConnector { @Override public String getConnectorId() { - return VDragAndDropManager.DD_SERVICE; + return ApplicationConstants.DRAG_AND_DROP_CONNECTOR_ID; } @Override diff --git a/src/com/vaadin/terminal/gwt/server/GAEApplicationServlet.java b/server/src/com/vaadin/terminal/gwt/server/GAEApplicationServlet.java index cc12c9cc43..fe3d384c5c 100644 --- a/src/com/vaadin/terminal/gwt/server/GAEApplicationServlet.java +++ b/server/src/com/vaadin/terminal/gwt/server/GAEApplicationServlet.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/src/com/vaadin/terminal/gwt/server/HttpServletRequestListener.java b/server/src/com/vaadin/terminal/gwt/server/HttpServletRequestListener.java index d811cadf86..22467a0c1a 100644 --- a/src/com/vaadin/terminal/gwt/server/HttpServletRequestListener.java +++ b/server/src/com/vaadin/terminal/gwt/server/HttpServletRequestListener.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/src/com/vaadin/terminal/gwt/server/JsonCodec.java b/server/src/com/vaadin/terminal/gwt/server/JsonCodec.java index 8199bc6ada..60197b0b3a 100644 --- a/src/com/vaadin/terminal/gwt/server/JsonCodec.java +++ b/server/src/com/vaadin/terminal/gwt/server/JsonCodec.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; @@ -30,8 +42,8 @@ import com.vaadin.external.json.JSONArray; import com.vaadin.external.json.JSONException; import com.vaadin.external.json.JSONObject; import com.vaadin.shared.Connector; +import com.vaadin.shared.JsonConstants; import com.vaadin.shared.communication.UidlValue; -import com.vaadin.terminal.gwt.client.communication.JsonEncoder; import com.vaadin.ui.Component; import com.vaadin.ui.ConnectorTracker; @@ -52,24 +64,24 @@ public class JsonCodec implements Serializable { private static Map<String, Class<?>> transportTypeToType = new HashMap<String, Class<?>>(); static { - registerType(String.class, JsonEncoder.VTYPE_STRING); - registerType(Connector.class, JsonEncoder.VTYPE_CONNECTOR); - registerType(Boolean.class, JsonEncoder.VTYPE_BOOLEAN); - registerType(boolean.class, JsonEncoder.VTYPE_BOOLEAN); - registerType(Integer.class, JsonEncoder.VTYPE_INTEGER); - registerType(int.class, JsonEncoder.VTYPE_INTEGER); - registerType(Float.class, JsonEncoder.VTYPE_FLOAT); - registerType(float.class, JsonEncoder.VTYPE_FLOAT); - registerType(Double.class, JsonEncoder.VTYPE_DOUBLE); - registerType(double.class, JsonEncoder.VTYPE_DOUBLE); - registerType(Long.class, JsonEncoder.VTYPE_LONG); - registerType(long.class, JsonEncoder.VTYPE_LONG); - registerType(String[].class, JsonEncoder.VTYPE_STRINGARRAY); - registerType(Object[].class, JsonEncoder.VTYPE_ARRAY); - registerType(Map.class, JsonEncoder.VTYPE_MAP); - registerType(HashMap.class, JsonEncoder.VTYPE_MAP); - registerType(List.class, JsonEncoder.VTYPE_LIST); - registerType(Set.class, JsonEncoder.VTYPE_SET); + registerType(String.class, JsonConstants.VTYPE_STRING); + registerType(Connector.class, JsonConstants.VTYPE_CONNECTOR); + registerType(Boolean.class, JsonConstants.VTYPE_BOOLEAN); + registerType(boolean.class, JsonConstants.VTYPE_BOOLEAN); + registerType(Integer.class, JsonConstants.VTYPE_INTEGER); + registerType(int.class, JsonConstants.VTYPE_INTEGER); + registerType(Float.class, JsonConstants.VTYPE_FLOAT); + registerType(float.class, JsonConstants.VTYPE_FLOAT); + registerType(Double.class, JsonConstants.VTYPE_DOUBLE); + registerType(double.class, JsonConstants.VTYPE_DOUBLE); + registerType(Long.class, JsonConstants.VTYPE_LONG); + registerType(long.class, JsonConstants.VTYPE_LONG); + registerType(String[].class, JsonConstants.VTYPE_STRINGARRAY); + registerType(Object[].class, JsonConstants.VTYPE_ARRAY); + registerType(Map.class, JsonConstants.VTYPE_MAP); + registerType(HashMap.class, JsonConstants.VTYPE_MAP); + registerType(List.class, JsonConstants.VTYPE_LIST); + registerType(Set.class, JsonConstants.VTYPE_SET); } private static void registerType(Class<?> type, String transportType) { @@ -215,24 +227,24 @@ public class JsonCodec implements Serializable { } // Collections - if (JsonEncoder.VTYPE_LIST.equals(transportType)) { + if (JsonConstants.VTYPE_LIST.equals(transportType)) { return decodeList(targetType, restrictToInternalTypes, (JSONArray) encodedJsonValue, connectorTracker); - } else if (JsonEncoder.VTYPE_SET.equals(transportType)) { + } else if (JsonConstants.VTYPE_SET.equals(transportType)) { return decodeSet(targetType, restrictToInternalTypes, (JSONArray) encodedJsonValue, connectorTracker); - } else if (JsonEncoder.VTYPE_MAP.equals(transportType)) { + } else if (JsonConstants.VTYPE_MAP.equals(transportType)) { return decodeMap(targetType, restrictToInternalTypes, encodedJsonValue, connectorTracker); } // Arrays - if (JsonEncoder.VTYPE_ARRAY.equals(transportType)) { + if (JsonConstants.VTYPE_ARRAY.equals(transportType)) { return decodeObjectArray(targetType, (JSONArray) encodedJsonValue, connectorTracker); - } else if (JsonEncoder.VTYPE_STRINGARRAY.equals(transportType)) { + } else if (JsonConstants.VTYPE_STRINGARRAY.equals(transportType)) { return decodeStringArray((JSONArray) encodedJsonValue); } @@ -240,23 +252,23 @@ public class JsonCodec implements Serializable { String stringValue = String.valueOf(encodedJsonValue); - if (JsonEncoder.VTYPE_CONNECTOR.equals(transportType)) { + if (JsonConstants.VTYPE_CONNECTOR.equals(transportType)) { return connectorTracker.getConnector(stringValue); } // Legacy types - if (JsonEncoder.VTYPE_STRING.equals(transportType)) { + if (JsonConstants.VTYPE_STRING.equals(transportType)) { return stringValue; - } else if (JsonEncoder.VTYPE_INTEGER.equals(transportType)) { + } else if (JsonConstants.VTYPE_INTEGER.equals(transportType)) { return Integer.valueOf(stringValue); - } else if (JsonEncoder.VTYPE_LONG.equals(transportType)) { + } else if (JsonConstants.VTYPE_LONG.equals(transportType)) { return Long.valueOf(stringValue); - } else if (JsonEncoder.VTYPE_FLOAT.equals(transportType)) { + } else if (JsonConstants.VTYPE_FLOAT.equals(transportType)) { return Float.valueOf(stringValue); - } else if (JsonEncoder.VTYPE_DOUBLE.equals(transportType)) { + } else if (JsonConstants.VTYPE_DOUBLE.equals(transportType)) { return Double.valueOf(stringValue); - } else if (JsonEncoder.VTYPE_BOOLEAN.equals(transportType)) { + } else if (JsonConstants.VTYPE_BOOLEAN.equals(transportType)) { return Boolean.valueOf(stringValue); } @@ -280,7 +292,7 @@ public class JsonCodec implements Serializable { if (encodedTransportType.equals(transportType)) { return true; } - if (encodedTransportType.equals(JsonEncoder.VTYPE_NULL)) { + if (encodedTransportType.equals(JsonConstants.VTYPE_NULL)) { return true; } diff --git a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java b/server/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java index 5a830ddb63..cfc3cc7e7e 100644 --- a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java +++ b/server/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; @@ -31,8 +43,6 @@ import com.vaadin.ui.CustomLayout; * etc. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 5.0 */ @SuppressWarnings("serial") diff --git a/server/src/com/vaadin/terminal/gwt/server/LegacyChangeVariablesInvocation.java b/server/src/com/vaadin/terminal/gwt/server/LegacyChangeVariablesInvocation.java new file mode 100644 index 0000000000..fc3fbd6c00 --- /dev/null +++ b/server/src/com/vaadin/terminal/gwt/server/LegacyChangeVariablesInvocation.java @@ -0,0 +1,50 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.server; + +import java.util.HashMap; +import java.util.Map; + +import com.vaadin.shared.ApplicationConstants; +import com.vaadin.shared.communication.MethodInvocation; + +public class LegacyChangeVariablesInvocation extends MethodInvocation { + private Map<String, Object> variableChanges = new HashMap<String, Object>(); + + public LegacyChangeVariablesInvocation(String connectorId, + String variableName, Object value) { + super(connectorId, ApplicationConstants.UPDATE_VARIABLE_INTERFACE, + ApplicationConstants.UPDATE_VARIABLE_METHOD); + setVariableChange(variableName, value); + } + + public static boolean isLegacyVariableChange(String interfaceName, + String methodName) { + return ApplicationConstants.UPDATE_VARIABLE_METHOD + .equals(interfaceName) + && ApplicationConstants.UPDATE_VARIABLE_METHOD + .equals(methodName); + } + + public void setVariableChange(String name, Object value) { + variableChanges.put(name, value); + } + + public Map<String, Object> getVariableChanges() { + return variableChanges; + } + +} diff --git a/server/src/com/vaadin/terminal/gwt/server/NoInputStreamException.java b/server/src/com/vaadin/terminal/gwt/server/NoInputStreamException.java new file mode 100644 index 0000000000..445d8c3cb1 --- /dev/null +++ b/server/src/com/vaadin/terminal/gwt/server/NoInputStreamException.java @@ -0,0 +1,21 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.server; + +@SuppressWarnings("serial") +public class NoInputStreamException extends Exception { + +} diff --git a/server/src/com/vaadin/terminal/gwt/server/NoOutputStreamException.java b/server/src/com/vaadin/terminal/gwt/server/NoOutputStreamException.java new file mode 100644 index 0000000000..fc9b3dee8a --- /dev/null +++ b/server/src/com/vaadin/terminal/gwt/server/NoOutputStreamException.java @@ -0,0 +1,21 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.server; + +@SuppressWarnings("serial") +public class NoOutputStreamException extends Exception { + +} diff --git a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java b/server/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java index 70505ab5f9..eba7d6e3a3 100644 --- a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java +++ b/server/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java b/server/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java index 39c27d05fe..b6fbbec298 100644 --- a/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java +++ b/server/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; @@ -17,11 +29,11 @@ import javax.portlet.ResourceURL; import com.vaadin.Application; import com.vaadin.external.json.JSONException; import com.vaadin.external.json.JSONObject; +import com.vaadin.shared.ApplicationConstants; import com.vaadin.terminal.DeploymentConfiguration; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.WrappedRequest; import com.vaadin.terminal.WrappedResponse; -import com.vaadin.terminal.gwt.client.ApplicationConfiguration; import com.vaadin.ui.Root; /** @@ -91,7 +103,7 @@ public class PortletCommunicationManager extends AbstractCommunicationManager { .createResourceURL(); portletResourceUrl .setResourceID(AbstractApplicationPortlet.RESOURCE_URL_ID); - defaults.put(ApplicationConfiguration.PORTLET_RESOUCE_URL_BASE, + defaults.put(ApplicationConstants.PORTLET_RESOUCE_URL_BASE, portletResourceUrl.toString()); defaults.put("pathInfo", ""); diff --git a/src/com/vaadin/terminal/gwt/server/PortletRequestListener.java b/server/src/com/vaadin/terminal/gwt/server/PortletRequestListener.java index 8a30f5c1d4..f7b6421e11 100644 --- a/src/com/vaadin/terminal/gwt/server/PortletRequestListener.java +++ b/server/src/com/vaadin/terminal/gwt/server/PortletRequestListener.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/src/com/vaadin/terminal/gwt/server/RequestTimer.java b/server/src/com/vaadin/terminal/gwt/server/RequestTimer.java index 6c0edec466..e3e0dc0106 100644 --- a/src/com/vaadin/terminal/gwt/server/RequestTimer.java +++ b/server/src/com/vaadin/terminal/gwt/server/RequestTimer.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/src/com/vaadin/terminal/gwt/server/ResourceReference.java b/server/src/com/vaadin/terminal/gwt/server/ResourceReference.java index 2104ad4b87..a1d5731f7d 100644 --- a/src/com/vaadin/terminal/gwt/server/ResourceReference.java +++ b/server/src/com/vaadin/terminal/gwt/server/ResourceReference.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java b/server/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java index 9fdffbf9a5..1e23a48388 100644 --- a/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java +++ b/server/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/src/com/vaadin/terminal/gwt/server/RpcManager.java b/server/src/com/vaadin/terminal/gwt/server/RpcManager.java index 026c847e2b..4d1e0fc152 100644 --- a/src/com/vaadin/terminal/gwt/server/RpcManager.java +++ b/server/src/com/vaadin/terminal/gwt/server/RpcManager.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; @@ -21,7 +33,6 @@ public interface RpcManager extends Serializable { * call * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0 * */ diff --git a/src/com/vaadin/terminal/gwt/server/RpcTarget.java b/server/src/com/vaadin/terminal/gwt/server/RpcTarget.java index b280f5c6b5..1a3cf28fcc 100644 --- a/src/com/vaadin/terminal/gwt/server/RpcTarget.java +++ b/server/src/com/vaadin/terminal/gwt/server/RpcTarget.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/src/com/vaadin/terminal/gwt/server/ServerRpcManager.java b/server/src/com/vaadin/terminal/gwt/server/ServerRpcManager.java index 1c7af82a36..9db6c20f00 100644 --- a/src/com/vaadin/terminal/gwt/server/ServerRpcManager.java +++ b/server/src/com/vaadin/terminal/gwt/server/ServerRpcManager.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/src/com/vaadin/terminal/gwt/server/ServerRpcMethodInvocation.java b/server/src/com/vaadin/terminal/gwt/server/ServerRpcMethodInvocation.java index ff81a27596..060fb686d4 100644 --- a/src/com/vaadin/terminal/gwt/server/ServerRpcMethodInvocation.java +++ b/server/src/com/vaadin/terminal/gwt/server/ServerRpcMethodInvocation.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java b/server/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java index 2a1dc31897..200f9a9103 100644 --- a/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java +++ b/server/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java @@ -3,13 +3,25 @@ package com.vaadin.terminal.gwt.server; import java.io.Serializable; import com.vaadin.Application; +import com.vaadin.shared.ApplicationConstants; import com.vaadin.terminal.DeploymentConfiguration; import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.ui.Root; /* - @VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ class ServletPortletHelper implements Serializable { @@ -106,15 +118,15 @@ class ServletPortletHelper implements Serializable { public static boolean isConnectorResourceRequest(WrappedRequest request) { return hasPathPrefix(request, - ApplicationConnection.CONNECTOR_RESOURCE_PREFIX + "/"); + ApplicationConstants.CONNECTOR_RESOURCE_PREFIX + "/"); } public static boolean isUIDLRequest(WrappedRequest request) { - return hasPathPrefix(request, ApplicationConnection.UIDL_REQUEST_PATH); + return hasPathPrefix(request, ApplicationConstants.UIDL_REQUEST_PATH); } public static boolean isApplicationResourceRequest(WrappedRequest request) { - return hasPathPrefix(request, ApplicationConnection.APP_REQUEST_PATH); + return hasPathPrefix(request, ApplicationConstants.APP_REQUEST_PATH); } } diff --git a/server/src/com/vaadin/terminal/gwt/server/SessionExpiredException.java b/server/src/com/vaadin/terminal/gwt/server/SessionExpiredException.java new file mode 100644 index 0000000000..05e85c1f72 --- /dev/null +++ b/server/src/com/vaadin/terminal/gwt/server/SessionExpiredException.java @@ -0,0 +1,21 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.server; + +@SuppressWarnings("serial") +public class SessionExpiredException extends Exception { + +} diff --git a/server/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java b/server/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java new file mode 100644 index 0000000000..6bc9f8fbd9 --- /dev/null +++ b/server/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java @@ -0,0 +1,28 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.server; + +import com.vaadin.terminal.StreamVariable.StreamingEndEvent; + +@SuppressWarnings("serial") +final class StreamingEndEventImpl extends AbstractStreamingEvent implements + StreamingEndEvent { + + public StreamingEndEventImpl(String filename, String type, long totalBytes) { + super(filename, type, totalBytes, totalBytes); + } + +} diff --git a/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java b/server/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java index 6ab3df2789..cf9339d676 100644 --- a/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java +++ b/server/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/server/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java b/server/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java new file mode 100644 index 0000000000..bcb114db60 --- /dev/null +++ b/server/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java @@ -0,0 +1,29 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.server; + +import com.vaadin.terminal.StreamVariable.StreamingProgressEvent; + +@SuppressWarnings("serial") +final class StreamingProgressEventImpl extends AbstractStreamingEvent implements + StreamingProgressEvent { + + public StreamingProgressEventImpl(final String filename, final String type, + long contentLength, long bytesReceived) { + super(filename, type, contentLength, bytesReceived); + } + +} diff --git a/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java b/server/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java index 274d05e111..07ff6cf7b1 100644 --- a/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java +++ b/server/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/src/com/vaadin/terminal/gwt/server/SystemMessageException.java b/server/src/com/vaadin/terminal/gwt/server/SystemMessageException.java index d15ff8a7ef..5575bcb618 100644 --- a/src/com/vaadin/terminal/gwt/server/SystemMessageException.java +++ b/server/src/com/vaadin/terminal/gwt/server/SystemMessageException.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/src/com/vaadin/terminal/gwt/server/UnsupportedBrowserHandler.java b/server/src/com/vaadin/terminal/gwt/server/UnsupportedBrowserHandler.java index 5248af595e..22e46cb722 100644 --- a/src/com/vaadin/terminal/gwt/server/UnsupportedBrowserHandler.java +++ b/server/src/com/vaadin/terminal/gwt/server/UnsupportedBrowserHandler.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/server/src/com/vaadin/terminal/gwt/server/UploadException.java b/server/src/com/vaadin/terminal/gwt/server/UploadException.java new file mode 100644 index 0000000000..566c98bf2b --- /dev/null +++ b/server/src/com/vaadin/terminal/gwt/server/UploadException.java @@ -0,0 +1,27 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.terminal.gwt.server; + +@SuppressWarnings("serial") +public class UploadException extends Exception { + public UploadException(Exception e) { + super("Upload failed", e); + } + + public UploadException(String msg) { + super(msg); + } +} diff --git a/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java b/server/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java index 36c08b2ed9..4cc0ed188d 100644 --- a/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java +++ b/server/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; @@ -22,8 +34,6 @@ import com.vaadin.Application; * added to a {@link HttpSession}. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.1 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/terminal/gwt/server/WebBrowser.java b/server/src/com/vaadin/terminal/gwt/server/WebBrowser.java index 4b92b12b66..90aef4283d 100644 --- a/src/com/vaadin/terminal/gwt/server/WebBrowser.java +++ b/server/src/com/vaadin/terminal/gwt/server/WebBrowser.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; @@ -17,7 +29,6 @@ import com.vaadin.terminal.WrappedRequest; * IP address. * * @author Vaadin Ltd. - * @version @VERSION@ */ public class WebBrowser implements Terminal { diff --git a/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java b/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java index cf58f398af..a64be4c163 100644 --- a/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java +++ b/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java b/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java index 32b2f352a8..237bb643ee 100644 --- a/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java +++ b/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/src/com/vaadin/terminal/gwt/server/WrappedPortletRequest.java b/server/src/com/vaadin/terminal/gwt/server/WrappedPortletRequest.java index a3fa172034..9ac2e5a608 100644 --- a/src/com/vaadin/terminal/gwt/server/WrappedPortletRequest.java +++ b/server/src/com/vaadin/terminal/gwt/server/WrappedPortletRequest.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; @@ -14,10 +26,10 @@ import javax.portlet.PortletRequest; import javax.portlet.ResourceRequest; import com.vaadin.Application; +import com.vaadin.shared.ApplicationConstants; import com.vaadin.terminal.CombinedRequest; import com.vaadin.terminal.DeploymentConfiguration; import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.gwt.client.ApplicationConnection; /** * Wrapper for {@link PortletRequest} and its subclasses. @@ -94,7 +106,7 @@ public class WrappedPortletRequest implements WrappedRequest { String resourceID = resourceRequest.getResourceID(); if (AbstractApplicationPortlet.RESOURCE_URL_ID.equals(resourceID)) { String resourcePath = resourceRequest - .getParameter(ApplicationConnection.V_RESOURCE_PATH); + .getParameter(ApplicationConstants.V_RESOURCE_PATH); return resourcePath; } return resourceID; diff --git a/src/com/vaadin/terminal/gwt/server/WrappedPortletResponse.java b/server/src/com/vaadin/terminal/gwt/server/WrappedPortletResponse.java index f7ecf26f3c..39ccacd331 100644 --- a/src/com/vaadin/terminal/gwt/server/WrappedPortletResponse.java +++ b/server/src/com/vaadin/terminal/gwt/server/WrappedPortletResponse.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.terminal.gwt.server; diff --git a/src/com/vaadin/terminal/package.html b/server/src/com/vaadin/terminal/package.html index 83514a0de5..83514a0de5 100644 --- a/src/com/vaadin/terminal/package.html +++ b/server/src/com/vaadin/terminal/package.html diff --git a/src/com/vaadin/tools/ReflectTools.java b/server/src/com/vaadin/tools/ReflectTools.java index ea2afae301..fcfe00564e 100644 --- a/src/com/vaadin/tools/ReflectTools.java +++ b/server/src/com/vaadin/tools/ReflectTools.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tools; diff --git a/src/com/vaadin/ui/AbsoluteLayout.java b/server/src/com/vaadin/ui/AbsoluteLayout.java index 1c84ca2865..9851a79bcd 100644 --- a/src/com/vaadin/ui/AbsoluteLayout.java +++ b/server/src/com/vaadin/ui/AbsoluteLayout.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -13,11 +25,11 @@ import com.vaadin.event.LayoutEvents.LayoutClickEvent; import com.vaadin.event.LayoutEvents.LayoutClickListener; import com.vaadin.event.LayoutEvents.LayoutClickNotifier; import com.vaadin.shared.Connector; +import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.absolutelayout.AbsoluteLayoutServerRpc; import com.vaadin.shared.ui.absolutelayout.AbsoluteLayoutState; import com.vaadin.terminal.Sizeable; -import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler; /** * AbsoluteLayout is a layout implementation that mimics html absolute @@ -618,14 +630,14 @@ public class AbsoluteLayout extends AbstractLayout implements @Override public void addListener(LayoutClickListener listener) { - addListener(LayoutClickEventHandler.LAYOUT_CLICK_EVENT_IDENTIFIER, + addListener(EventId.LAYOUT_CLICK_EVENT_IDENTIFIER, LayoutClickEvent.class, listener, LayoutClickListener.clickMethod); } @Override public void removeListener(LayoutClickListener listener) { - removeListener(LayoutClickEventHandler.LAYOUT_CLICK_EVENT_IDENTIFIER, + removeListener(EventId.LAYOUT_CLICK_EVENT_IDENTIFIER, LayoutClickEvent.class, listener); } diff --git a/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java index e7cb38256c..fb3993d0cf 100644 --- a/src/com/vaadin/ui/AbstractComponent.java +++ b/server/src/com/vaadin/ui/AbstractComponent.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -37,8 +49,6 @@ import com.vaadin.tools.ReflectTools; * components. Most components in Vaadin do just that. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/ui/AbstractComponentContainer.java b/server/src/com/vaadin/ui/AbstractComponentContainer.java index bc27242bb8..7450c76fda 100644 --- a/src/com/vaadin/ui/AbstractComponentContainer.java +++ b/server/src/com/vaadin/ui/AbstractComponentContainer.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -19,8 +31,6 @@ import com.vaadin.terminal.gwt.server.ComponentSizeValidator; * qualify as a component container. * * @author Vaadin Ltd - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/ui/AbstractField.java b/server/src/com/vaadin/ui/AbstractField.java index 6fe7f54df5..2d14acf442 100644 --- a/src/com/vaadin/ui/AbstractField.java +++ b/server/src/com/vaadin/ui/AbstractField.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -52,8 +64,6 @@ import com.vaadin.terminal.ErrorMessage; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") @@ -1188,8 +1198,6 @@ public abstract class AbstractField<T> extends AbstractComponent implements * status has changed. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public static class ReadOnlyStatusChangeEvent extends Component.Event diff --git a/src/com/vaadin/ui/AbstractJavaScriptComponent.java b/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java index 3668669d16..c442bf2204 100644 --- a/src/com/vaadin/ui/AbstractJavaScriptComponent.java +++ b/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java @@ -1,12 +1,22 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; import com.vaadin.shared.ui.JavaScriptComponentState; import com.vaadin.terminal.JavaScriptCallbackHelper; -import com.vaadin.terminal.gwt.client.ApplicationConnection; -import com.vaadin.terminal.gwt.client.ui.JavaScriptWidget; /** * Base class for Components with all client-side logic implemented using @@ -77,11 +87,11 @@ import com.vaadin.terminal.gwt.client.ui.JavaScriptWidget; * the field, that function is called whenever the contents of the shared state * is changed.</li> * <li>Any field name corresponding to a call to - * {@link #registerCallback(String, JavaScriptCallback)} on the server will - * automatically be present as a function that triggers the registered callback + * {@link #addFunction(String, JavaScriptFunction)} on the server will + * automatically be present as a function that triggers the registered function * on the server.</li> * <li>Any field name referred to using - * {@link #invokeCallback(String, Object...)} on the server will be called if a + * {@link #callFunction(String, Object...)} on the server will be called if a * function has been assigned to the field.</li> * </ul> * <p> @@ -111,7 +121,6 @@ import com.vaadin.terminal.gwt.client.ui.JavaScriptWidget; * </ul> * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ public abstract class AbstractJavaScriptComponent extends AbstractComponent { @@ -125,22 +134,21 @@ public abstract class AbstractJavaScriptComponent extends AbstractComponent { } /** - * Register a {@link JavaScriptCallback} that can be called from the + * Register a {@link JavaScriptFunction} that can be called from the * JavaScript using the provided name. A JavaScript function with the * provided name will be added to the connector wrapper object (initially * available as <code>this</code>). Calling that JavaScript function will - * cause the call method in the registered {@link JavaScriptCallback} to be + * cause the call method in the registered {@link JavaScriptFunction} to be * invoked with the same arguments. * * @param functionName - * the name that should be used for client-side callback - * @param javaScriptCallback - * the callback object that will be invoked when the JavaScript - * function is called + * the name that should be used for client-side function + * @param function + * the {@link JavaScriptFunction} object that will be invoked + * when the JavaScript function is called */ - protected void registerCallback(String functionName, - JavaScriptCallback javaScriptCallback) { - callbackHelper.registerCallback(functionName, javaScriptCallback); + protected void addFunction(String functionName, JavaScriptFunction function) { + callbackHelper.registerCallback(functionName, function); } /** @@ -155,7 +163,7 @@ public abstract class AbstractJavaScriptComponent extends AbstractComponent { * @param arguments * function arguments */ - protected void invokeCallback(String name, Object... arguments) { + protected void callFunction(String name, Object... arguments) { callbackHelper.invokeCallback(name, arguments); } diff --git a/src/com/vaadin/ui/AbstractLayout.java b/server/src/com/vaadin/ui/AbstractLayout.java index 7b3a537d06..c26812f3fc 100644 --- a/src/com/vaadin/ui/AbstractLayout.java +++ b/server/src/com/vaadin/ui/AbstractLayout.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -12,8 +24,6 @@ import com.vaadin.ui.Layout.MarginHandler; * interface. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 5.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/ui/AbstractMedia.java b/server/src/com/vaadin/ui/AbstractMedia.java index 71b2e38ef3..51a3bcd2be 100644 --- a/src/com/vaadin/ui/AbstractMedia.java +++ b/server/src/com/vaadin/ui/AbstractMedia.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; diff --git a/src/com/vaadin/ui/AbstractOrderedLayout.java b/server/src/com/vaadin/ui/AbstractOrderedLayout.java index 0581d0a279..a7cc780414 100644 --- a/src/com/vaadin/ui/AbstractOrderedLayout.java +++ b/server/src/com/vaadin/ui/AbstractOrderedLayout.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -11,12 +23,12 @@ import com.vaadin.event.LayoutEvents.LayoutClickEvent; import com.vaadin.event.LayoutEvents.LayoutClickListener; import com.vaadin.event.LayoutEvents.LayoutClickNotifier; import com.vaadin.shared.Connector; +import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.orderedlayout.AbstractOrderedLayoutServerRpc; import com.vaadin.shared.ui.orderedlayout.AbstractOrderedLayoutState; import com.vaadin.shared.ui.orderedlayout.AbstractOrderedLayoutState.ChildComponentData; import com.vaadin.terminal.Sizeable; -import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler; @SuppressWarnings("serial") public abstract class AbstractOrderedLayout extends AbstractLayout implements @@ -345,14 +357,14 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements @Override public void addListener(LayoutClickListener listener) { - addListener(LayoutClickEventHandler.LAYOUT_CLICK_EVENT_IDENTIFIER, + addListener(EventId.LAYOUT_CLICK_EVENT_IDENTIFIER, LayoutClickEvent.class, listener, LayoutClickListener.clickMethod); } @Override public void removeListener(LayoutClickListener listener) { - removeListener(LayoutClickEventHandler.LAYOUT_CLICK_EVENT_IDENTIFIER, + removeListener(EventId.LAYOUT_CLICK_EVENT_IDENTIFIER, LayoutClickEvent.class, listener); } diff --git a/src/com/vaadin/ui/AbstractSelect.java b/server/src/com/vaadin/ui/AbstractSelect.java index 0a97ceb649..19a74782c4 100644 --- a/src/com/vaadin/ui/AbstractSelect.java +++ b/server/src/com/vaadin/ui/AbstractSelect.java @@ -1,5 +1,17 @@ /* - * @VaadinApache2LicenseForJavaFiles@ + * * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -49,8 +61,6 @@ import com.vaadin.ui.AbstractSelect.ItemCaptionMode; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 5.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/ui/AbstractSplitPanel.java b/server/src/com/vaadin/ui/AbstractSplitPanel.java index 90dc38ff65..03e8a2dfb6 100644 --- a/src/com/vaadin/ui/AbstractSplitPanel.java +++ b/server/src/com/vaadin/ui/AbstractSplitPanel.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -10,12 +22,12 @@ import java.util.Iterator; import com.vaadin.event.ComponentEventListener; import com.vaadin.event.MouseEvents.ClickEvent; +import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.splitpanel.AbstractSplitPanelRpc; import com.vaadin.shared.ui.splitpanel.AbstractSplitPanelState; import com.vaadin.shared.ui.splitpanel.AbstractSplitPanelState.SplitterState; import com.vaadin.terminal.Sizeable; -import com.vaadin.terminal.gwt.client.ui.ClickEventHandler; import com.vaadin.tools.ReflectTools; /** @@ -25,8 +37,6 @@ import com.vaadin.tools.ReflectTools; * can contain two components. The components are split by a divider element. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 6.5 */ public abstract class AbstractSplitPanel extends AbstractComponentContainer { @@ -500,13 +510,12 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { } public void addListener(SplitterClickListener listener) { - addListener(ClickEventHandler.CLICK_EVENT_IDENTIFIER, - SplitterClickEvent.class, listener, - SplitterClickListener.clickMethod); + addListener(EventId.CLICK_EVENT_IDENTIFIER, SplitterClickEvent.class, + listener, SplitterClickListener.clickMethod); } public void removeListener(SplitterClickListener listener) { - removeListener(ClickEventHandler.CLICK_EVENT_IDENTIFIER, + removeListener(EventId.CLICK_EVENT_IDENTIFIER, SplitterClickEvent.class, listener); } diff --git a/src/com/vaadin/ui/AbstractTextField.java b/server/src/com/vaadin/ui/AbstractTextField.java index 2326c07d97..c8bbadd0ab 100644 --- a/src/com/vaadin/ui/AbstractTextField.java +++ b/server/src/com/vaadin/ui/AbstractTextField.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -16,10 +28,10 @@ import com.vaadin.event.FieldEvents.TextChangeEvent; import com.vaadin.event.FieldEvents.TextChangeListener; import com.vaadin.event.FieldEvents.TextChangeNotifier; import com.vaadin.shared.ui.textfield.AbstractTextFieldState; +import com.vaadin.shared.ui.textfield.TextFieldConstants; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; import com.vaadin.terminal.Vaadin6Component; -import com.vaadin.terminal.gwt.client.ui.textfield.VTextField; public abstract class AbstractTextField extends AbstractField<String> implements BlurNotifier, FocusNotifier, TextChangeNotifier, Vaadin6Component { @@ -105,9 +117,9 @@ public abstract class AbstractTextField extends AbstractField<String> implements } if (hasListeners(TextChangeEvent.class)) { - target.addAttribute(VTextField.ATTR_TEXTCHANGE_EVENTMODE, + target.addAttribute(TextFieldConstants.ATTR_TEXTCHANGE_EVENTMODE, getTextChangeEventMode().toString()); - target.addAttribute(VTextField.ATTR_TEXTCHANGE_TIMEOUT, + target.addAttribute(TextFieldConstants.ATTR_TEXTCHANGE_TIMEOUT, getTextChangeTimeout()); if (lastKnownTextContent != null) { /* @@ -118,7 +130,8 @@ public abstract class AbstractTextField extends AbstractField<String> implements * the actual value, depending on its state. */ target.addAttribute( - VTextField.ATTR_NO_VALUE_CHANGE_BETWEEN_PAINTS, true); + TextFieldConstants.ATTR_NO_VALUE_CHANGE_BETWEEN_PAINTS, + true); } } @@ -130,12 +143,13 @@ public abstract class AbstractTextField extends AbstractField<String> implements try { - if (variables.containsKey(VTextField.VAR_CURSOR)) { - Integer object = (Integer) variables.get(VTextField.VAR_CURSOR); + if (variables.containsKey(TextFieldConstants.VAR_CURSOR)) { + Integer object = (Integer) variables + .get(TextFieldConstants.VAR_CURSOR); lastKnownCursorPosition = object.intValue(); } - if (variables.containsKey(VTextField.VAR_CUR_TEXT)) { + if (variables.containsKey(TextFieldConstants.VAR_CUR_TEXT)) { /* * NOTE, we might want to develop this further so that on a * value change event the whole text content don't need to be @@ -439,7 +453,7 @@ public abstract class AbstractTextField extends AbstractField<String> implements * some sort of diffs instead of always sending the whole text content. * Also on value change events we could use the mechanism. */ - String object = (String) variables.get(VTextField.VAR_CUR_TEXT); + String object = (String) variables.get(TextFieldConstants.VAR_CUR_TEXT); lastKnownTextContent = object; textChangeEventPending = true; } diff --git a/server/src/com/vaadin/ui/Accordion.java b/server/src/com/vaadin/ui/Accordion.java new file mode 100644 index 0000000000..c31bfe8840 --- /dev/null +++ b/server/src/com/vaadin/ui/Accordion.java @@ -0,0 +1,31 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.ui; + +/** + * An accordion is a component similar to a {@link TabSheet}, but with a + * vertical orientation and the selected component presented between tabs. + * + * Closable tabs are not supported by the accordion. + * + * The {@link Accordion} can be styled with the .v-accordion, .v-accordion-item, + * .v-accordion-item-first and .v-accordion-item-caption styles. + * + * @see TabSheet + */ +public class Accordion extends TabSheet { + +} diff --git a/src/com/vaadin/ui/Alignment.java b/server/src/com/vaadin/ui/Alignment.java index 0d73da8504..2c3f1610d2 100644 --- a/src/com/vaadin/ui/Alignment.java +++ b/server/src/com/vaadin/ui/Alignment.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; diff --git a/src/com/vaadin/ui/Audio.java b/server/src/com/vaadin/ui/Audio.java index ac2ee869a6..03ed7ba6d5 100644 --- a/src/com/vaadin/ui/Audio.java +++ b/server/src/com/vaadin/ui/Audio.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; diff --git a/src/com/vaadin/ui/Button.java b/server/src/com/vaadin/ui/Button.java index 0cb667d527..f568d770e8 100644 --- a/src/com/vaadin/ui/Button.java +++ b/server/src/com/vaadin/ui/Button.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -28,8 +40,6 @@ import com.vaadin.ui.Component.Focusable; * A generic button component. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") @@ -96,8 +106,6 @@ public class Button extends AbstractComponent implements * Click event. This event is thrown, when the button is clicked. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public class ClickEvent extends Component.Event { @@ -257,8 +265,6 @@ public class Button extends AbstractComponent implements * {@link Component}. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface ClickListener extends Serializable { diff --git a/src/com/vaadin/ui/CheckBox.java b/server/src/com/vaadin/ui/CheckBox.java index 30ac9b4626..158c9d0032 100644 --- a/src/com/vaadin/ui/CheckBox.java +++ b/server/src/com/vaadin/ui/CheckBox.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; diff --git a/src/com/vaadin/ui/ComboBox.java b/server/src/com/vaadin/ui/ComboBox.java index 6286dad124..e2655be405 100644 --- a/src/com/vaadin/ui/ComboBox.java +++ b/server/src/com/vaadin/ui/ComboBox.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -7,9 +19,9 @@ package com.vaadin.ui; import java.util.Collection; import com.vaadin.data.Container; +import com.vaadin.shared.ui.combobox.ComboBoxConstants; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.gwt.client.ui.combobox.VFilterSelect; /** * A filtering dropdown single-select. Suitable for newItemsAllowed, but it's @@ -75,12 +87,12 @@ public class ComboBox extends Select { @Override public void paintContent(PaintTarget target) throws PaintException { if (inputPrompt != null) { - target.addAttribute("prompt", inputPrompt); + target.addAttribute(ComboBoxConstants.ATTR_INPUTPROMPT, inputPrompt); } super.paintContent(target); if (!textInputAllowed) { - target.addAttribute(VFilterSelect.ATTR_NO_TEXT_INPUT, true); + target.addAttribute(ComboBoxConstants.ATTR_NO_TEXT_INPUT, true); } } diff --git a/src/com/vaadin/ui/Component.java b/server/src/com/vaadin/ui/Component.java index a2c257ab68..ac668168f2 100644 --- a/src/com/vaadin/ui/Component.java +++ b/server/src/com/vaadin/ui/Component.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -47,8 +59,6 @@ import com.vaadin.terminal.gwt.server.ClientConnector; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface Component extends ClientConnector, Sizeable, Serializable { diff --git a/src/com/vaadin/ui/ComponentContainer.java b/server/src/com/vaadin/ui/ComponentContainer.java index 8182d54b56..c2a75f9313 100644 --- a/src/com/vaadin/ui/ComponentContainer.java +++ b/server/src/com/vaadin/ui/ComponentContainer.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -12,8 +24,6 @@ import java.io.Serializable; * implement this interface. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface ComponentContainer extends HasComponents { diff --git a/src/com/vaadin/ui/ConnectorTracker.java b/server/src/com/vaadin/ui/ConnectorTracker.java index e3d1bf86db..12ad377b62 100644 --- a/src/com/vaadin/ui/ConnectorTracker.java +++ b/server/src/com/vaadin/ui/ConnectorTracker.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -13,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.vaadin.terminal.AbstractClientConnector; -import com.vaadin.terminal.gwt.client.ServerConnector; import com.vaadin.terminal.gwt.server.ClientConnector; /** @@ -32,7 +43,6 @@ import com.vaadin.terminal.gwt.server.ClientConnector; * </p> * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 * */ diff --git a/src/com/vaadin/ui/CssLayout.java b/server/src/com/vaadin/ui/CssLayout.java index 356f0a3843..c43f347e68 100644 --- a/src/com/vaadin/ui/CssLayout.java +++ b/server/src/com/vaadin/ui/CssLayout.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -10,10 +22,10 @@ import com.vaadin.event.LayoutEvents.LayoutClickEvent; import com.vaadin.event.LayoutEvents.LayoutClickListener; import com.vaadin.event.LayoutEvents.LayoutClickNotifier; import com.vaadin.shared.Connector; +import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.csslayout.CssLayoutServerRpc; import com.vaadin.shared.ui.csslayout.CssLayoutState; -import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler; /** * CssLayout is a layout component that can be used in browser environment only. @@ -270,14 +282,14 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier { @Override public void addListener(LayoutClickListener listener) { - addListener(LayoutClickEventHandler.LAYOUT_CLICK_EVENT_IDENTIFIER, + addListener(EventId.LAYOUT_CLICK_EVENT_IDENTIFIER, LayoutClickEvent.class, listener, LayoutClickListener.clickMethod); } @Override public void removeListener(LayoutClickListener listener) { - removeListener(LayoutClickEventHandler.LAYOUT_CLICK_EVENT_IDENTIFIER, + removeListener(EventId.LAYOUT_CLICK_EVENT_IDENTIFIER, LayoutClickEvent.class, listener); } diff --git a/src/com/vaadin/ui/CustomComponent.java b/server/src/com/vaadin/ui/CustomComponent.java index 40b5dcd636..88f7b162c1 100644 --- a/src/com/vaadin/ui/CustomComponent.java +++ b/server/src/com/vaadin/ui/CustomComponent.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -17,8 +29,6 @@ import java.util.Iterator; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/ui/CustomField.java b/server/src/com/vaadin/ui/CustomField.java index ab3797a58c..794e472dae 100644 --- a/src/com/vaadin/ui/CustomField.java +++ b/server/src/com/vaadin/ui/CustomField.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; diff --git a/src/com/vaadin/ui/CustomLayout.java b/server/src/com/vaadin/ui/CustomLayout.java index d7830603f0..2da443bfa5 100644 --- a/src/com/vaadin/ui/CustomLayout.java +++ b/server/src/com/vaadin/ui/CustomLayout.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -43,8 +55,6 @@ import com.vaadin.terminal.gwt.server.JsonPaintTarget; * @author Vaadin Ltd. * @author Duy B. Vo (<a * href="mailto:devduy@gmail.com?subject=Vaadin">devduy@gmail.com</a>) - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/ui/DateField.java b/server/src/com/vaadin/ui/DateField.java index d0a22f3c29..5130d665eb 100644 --- a/src/com/vaadin/ui/DateField.java +++ b/server/src/com/vaadin/ui/DateField.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -24,10 +36,10 @@ import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; +import com.vaadin.shared.ui.datefield.DateFieldConstants; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; import com.vaadin.terminal.Vaadin6Component; -import com.vaadin.terminal.gwt.client.ui.datefield.VDateField; /** * <p> @@ -45,8 +57,6 @@ import com.vaadin.terminal.gwt.client.ui.datefield.VDateField; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") @@ -57,8 +67,6 @@ public class DateField extends AbstractField<Date> implements * Resolutions for DateFields * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 7.0 */ public enum Resolution { @@ -303,7 +311,8 @@ public class DateField extends AbstractField<Date> implements target.addAttribute("strict", true); } - target.addAttribute(VDateField.WEEK_NUMBERS, isShowISOWeekNumbers()); + target.addAttribute(DateFieldConstants.ATTR_WEEK_NUMBERS, + isShowISOWeekNumbers()); target.addAttribute("parsable", uiHasValidDateString); /* * TODO communicate back the invalid date string? E.g. returning back to diff --git a/src/com/vaadin/ui/DefaultFieldFactory.java b/server/src/com/vaadin/ui/DefaultFieldFactory.java index e17f08c1c6..28a5b6c669 100644 --- a/src/com/vaadin/ui/DefaultFieldFactory.java +++ b/server/src/com/vaadin/ui/DefaultFieldFactory.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; diff --git a/src/com/vaadin/ui/DragAndDropWrapper.java b/server/src/com/vaadin/ui/DragAndDropWrapper.java index 67229a45fe..3fd94210d8 100644 --- a/src/com/vaadin/ui/DragAndDropWrapper.java +++ b/server/src/com/vaadin/ui/DragAndDropWrapper.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -20,11 +32,11 @@ import com.vaadin.event.dd.TargetDetailsImpl; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.dd.HorizontalDropLocation; import com.vaadin.shared.ui.dd.VerticalDropLocation; +import com.vaadin.shared.ui.draganddropwrapper.DragAndDropWrapperConstants; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; import com.vaadin.terminal.StreamVariable; import com.vaadin.terminal.Vaadin6Component; -import com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapper; @SuppressWarnings("serial") public class DragAndDropWrapper extends CustomComponent implements DropTarget, @@ -221,7 +233,7 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget, @Override public void paintContent(PaintTarget target) throws PaintException { - target.addAttribute(VDragAndDropWrapper.DRAG_START_MODE, + target.addAttribute(DragAndDropWrapperConstants.DRAG_START_MODE, dragStartMode.ordinal()); if (getDropHandler() != null) { getDropHandler().getAcceptCriterion().paint(target); @@ -245,7 +257,7 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget, } } } - target.addAttribute(VDragAndDropWrapper.HTML5_DATA_FLAVORS, + target.addAttribute(DragAndDropWrapperConstants.HTML5_DATA_FLAVORS, html5DataFlavors); } diff --git a/src/com/vaadin/ui/Embedded.java b/server/src/com/vaadin/ui/Embedded.java index 6088c5aa66..d019ea3b0b 100644 --- a/src/com/vaadin/ui/Embedded.java +++ b/server/src/com/vaadin/ui/Embedded.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -10,21 +22,19 @@ import java.util.Map; import com.vaadin.event.MouseEvents.ClickEvent; import com.vaadin.event.MouseEvents.ClickListener; +import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; +import com.vaadin.shared.ui.embedded.EmbeddedConstants; import com.vaadin.shared.ui.embedded.EmbeddedServerRpc; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; import com.vaadin.terminal.Resource; import com.vaadin.terminal.Vaadin6Component; -import com.vaadin.terminal.gwt.client.ui.ClickEventHandler; -import com.vaadin.terminal.gwt.client.ui.embedded.EmbeddedConnector; /** * Component for embedding external objects. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") @@ -158,7 +168,7 @@ public class Embedded extends AbstractComponent implements Vaadin6Component { target.addAttribute("archive", archive); } if (altText != null && !"".equals(altText)) { - target.addAttribute(EmbeddedConnector.ALTERNATE_TEXT, altText); + target.addAttribute(EmbeddedConstants.ALTERNATE_TEXT, altText); } // Params @@ -507,8 +517,8 @@ public class Embedded extends AbstractComponent implements Vaadin6Component { * The listener to add */ public void addListener(ClickListener listener) { - addListener(ClickEventHandler.CLICK_EVENT_IDENTIFIER, ClickEvent.class, - listener, ClickListener.clickMethod); + addListener(EventId.CLICK_EVENT_IDENTIFIER, ClickEvent.class, listener, + ClickListener.clickMethod); } /** @@ -519,8 +529,8 @@ public class Embedded extends AbstractComponent implements Vaadin6Component { * The listener to remove */ public void removeListener(ClickListener listener) { - removeListener(ClickEventHandler.CLICK_EVENT_IDENTIFIER, - ClickEvent.class, listener); + removeListener(EventId.CLICK_EVENT_IDENTIFIER, ClickEvent.class, + listener); } @Override diff --git a/src/com/vaadin/ui/Field.java b/server/src/com/vaadin/ui/Field.java index 6dc40d192f..23a51d3f07 100644 --- a/src/com/vaadin/ui/Field.java +++ b/server/src/com/vaadin/ui/Field.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -66,8 +78,6 @@ public interface Field<T> extends Component, BufferedValidatable, Property<T>, * changed. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/ui/Form.java b/server/src/com/vaadin/ui/Form.java index fbc4d5a8e6..a1ec0f9917 100644 --- a/src/com/vaadin/ui/Form.java +++ b/server/src/com/vaadin/ui/Form.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -60,8 +72,6 @@ import com.vaadin.terminal.Vaadin6Component; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 * @deprecated Use {@link FieldGroup} instead of {@link Form} for more * flexibility. diff --git a/src/com/vaadin/ui/FormFieldFactory.java b/server/src/com/vaadin/ui/FormFieldFactory.java index 1efa05c5f5..f3ff6f5184 100644 --- a/src/com/vaadin/ui/FormFieldFactory.java +++ b/server/src/com/vaadin/ui/FormFieldFactory.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -16,8 +28,6 @@ import com.vaadin.data.Item; * <p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 6.0 * @see TableFieldFactory */ diff --git a/src/com/vaadin/ui/FormLayout.java b/server/src/com/vaadin/ui/FormLayout.java index c0be784a7b..c4ba4665ea 100644 --- a/src/com/vaadin/ui/FormLayout.java +++ b/server/src/com/vaadin/ui/FormLayout.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; diff --git a/src/com/vaadin/ui/GridLayout.java b/server/src/com/vaadin/ui/GridLayout.java index 2391a9cd3a..5a748c04f6 100644 --- a/src/com/vaadin/ui/GridLayout.java +++ b/server/src/com/vaadin/ui/GridLayout.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -16,6 +28,7 @@ import com.vaadin.event.LayoutEvents.LayoutClickEvent; import com.vaadin.event.LayoutEvents.LayoutClickListener; import com.vaadin.event.LayoutEvents.LayoutClickNotifier; import com.vaadin.shared.Connector; +import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.gridlayout.GridLayoutServerRpc; import com.vaadin.shared.ui.gridlayout.GridLayoutState; @@ -23,7 +36,6 @@ import com.vaadin.terminal.LegacyPaint; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; import com.vaadin.terminal.Vaadin6Component; -import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler; /** * A layout where the components are laid out on a grid using cell coordinates. @@ -47,8 +59,6 @@ import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") @@ -697,8 +707,6 @@ public class GridLayout extends AbstractLayout implements * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public class Area implements Serializable { @@ -872,8 +880,6 @@ public class GridLayout extends AbstractLayout implements * (even partly) at the same space on a grid with the new component. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public class OverlapsException extends java.lang.RuntimeException { @@ -930,8 +936,6 @@ public class GridLayout extends AbstractLayout implements * bounds of the grid. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public class OutOfBoundsException extends java.lang.RuntimeException { @@ -1401,14 +1405,14 @@ public class GridLayout extends AbstractLayout implements @Override public void addListener(LayoutClickListener listener) { - addListener(LayoutClickEventHandler.LAYOUT_CLICK_EVENT_IDENTIFIER, + addListener(EventId.LAYOUT_CLICK_EVENT_IDENTIFIER, LayoutClickEvent.class, listener, LayoutClickListener.clickMethod); } @Override public void removeListener(LayoutClickListener listener) { - removeListener(LayoutClickEventHandler.LAYOUT_CLICK_EVENT_IDENTIFIER, + removeListener(EventId.LAYOUT_CLICK_EVENT_IDENTIFIER, LayoutClickEvent.class, listener); } diff --git a/src/com/vaadin/ui/HasComponents.java b/server/src/com/vaadin/ui/HasComponents.java index 3ebd63bff2..8f1dccc5c6 100644 --- a/src/com/vaadin/ui/HasComponents.java +++ b/server/src/com/vaadin/ui/HasComponents.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -10,7 +22,6 @@ import java.util.Iterator; * other {@link Component}s. * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 * */ diff --git a/server/src/com/vaadin/ui/HorizontalLayout.java b/server/src/com/vaadin/ui/HorizontalLayout.java new file mode 100644 index 0000000000..9207b59353 --- /dev/null +++ b/server/src/com/vaadin/ui/HorizontalLayout.java @@ -0,0 +1,34 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.ui; + +/** + * Horizontal layout + * + * <code>HorizontalLayout</code> is a component container, which shows the + * subcomponents in the order of their addition (horizontally). + * + * @author Vaadin Ltd. + * @since 5.3 + */ +@SuppressWarnings("serial") +public class HorizontalLayout extends AbstractOrderedLayout { + + public HorizontalLayout() { + + } + +} diff --git a/src/com/vaadin/ui/HorizontalSplitPanel.java b/server/src/com/vaadin/ui/HorizontalSplitPanel.java index 5bd6c8a075..017234d62d 100644 --- a/src/com/vaadin/ui/HorizontalSplitPanel.java +++ b/server/src/com/vaadin/ui/HorizontalSplitPanel.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -22,8 +34,6 @@ package com.vaadin.ui; * </pre> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 6.5 */ public class HorizontalSplitPanel extends AbstractSplitPanel { diff --git a/src/com/vaadin/ui/Html5File.java b/server/src/com/vaadin/ui/Html5File.java index aa3fb558fa..596f83a1d8 100644 --- a/src/com/vaadin/ui/Html5File.java +++ b/server/src/com/vaadin/ui/Html5File.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; diff --git a/src/com/vaadin/ui/InlineDateField.java b/server/src/com/vaadin/ui/InlineDateField.java index cf61703318..550fa29b7b 100644 --- a/src/com/vaadin/ui/InlineDateField.java +++ b/server/src/com/vaadin/ui/InlineDateField.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -17,8 +29,6 @@ import com.vaadin.data.Property; * @see DateField * @see PopupDateField * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 5.0 */ public class InlineDateField extends DateField { diff --git a/src/com/vaadin/ui/JavaScript.java b/server/src/com/vaadin/ui/JavaScript.java index 53efb62965..35cc1893f6 100644 --- a/src/com/vaadin/ui/JavaScript.java +++ b/server/src/com/vaadin/ui/JavaScript.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -22,11 +34,10 @@ import com.vaadin.terminal.Page; * corresponding to the current Page. * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ public class JavaScript extends AbstractExtension { - private Map<String, JavaScriptCallback> callbacks = new HashMap<String, JavaScriptCallback>(); + private Map<String, JavaScriptFunction> functions = new HashMap<String, JavaScriptFunction>(); // Can not be defined in client package as this JSONArray is not available // in GWT @@ -43,10 +54,10 @@ public class JavaScript extends AbstractExtension { registerRpc(new JavaScriptCallbackRpc() { @Override public void call(String name, JSONArray arguments) { - JavaScriptCallback callback = callbacks.get(name); + JavaScriptFunction function = functions.get(name); // TODO handle situation if name is not registered try { - callback.call(arguments); + function.call(arguments); } catch (JSONException e) { throw new IllegalArgumentException(e); } @@ -62,44 +73,44 @@ public class JavaScript extends AbstractExtension { /** * Add a new function to the global JavaScript namespace (i.e. the window * object). The <code>call</code> method in the passed - * {@link JavaScriptCallback} object will be invoked with the same + * {@link JavaScriptFunction} object will be invoked with the same * parameters whenever the JavaScript function is called in the browser. * - * A callback added with the name <code>"myCallback"</code> can thus be + * A function added with the name <code>"myFunction"</code> can thus be * invoked with the following JavaScript code: - * <code>window.myCallback(argument1, argument2)</code>. + * <code>window.myFunction(argument1, argument2)</code>. * * If the name parameter contains dots, simple objects are created on demand * to allow calling the function using the same name (e.g. * <code>window.myObject.myFunction</code>). * * @param name - * the name that the callback function should get in the global - * JavaScript namespace. - * @param callback - * the JavaScriptCallback that will be invoked if the JavaScript + * the name that the function should get in the global JavaScript + * namespace. + * @param function + * the JavaScriptFunction that will be invoked if the JavaScript * function is called. */ - public void addCallback(String name, JavaScriptCallback callback) { - callbacks.put(name, callback); + public void addFunction(String name, JavaScriptFunction function) { + functions.put(name, function); if (getState().getNames().add(name)) { requestRepaint(); } } /** - * Removes a JavaScripCallback from the browser's global JavaScript + * Removes a JavaScripFunction from the browser's global JavaScript * namespace. * - * If the name contains dots and intermediate were created by - * {@link #addCallback(String, JavaScriptCallback)}addCallback, these - * objects will not be removed when the callback is removed. + * If the name contains dots and intermediate objects were created by + * {@link #addFunction(String, JavaScriptFunction)}, these objects will not + * be removed by this method. * * @param name * the name of the callback to remove */ - public void removeCallback(String name) { - callbacks.remove(name); + public void removeFunction(String name) { + functions.remove(name); if (getState().getNames().remove(name)) { requestRepaint(); } diff --git a/src/com/vaadin/ui/JavaScriptCallback.java b/server/src/com/vaadin/ui/JavaScriptFunction.java index 49f7695e89..3a17fef995 100644 --- a/src/com/vaadin/ui/JavaScriptCallback.java +++ b/server/src/com/vaadin/ui/JavaScriptFunction.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -15,15 +27,14 @@ import com.vaadin.terminal.AbstractJavaScriptExtension; * the corresponding JavaScript function is called, the {@link #call(JSONArray)} * method is invoked. * - * @see JavaScript#addCallback(String, JavaScriptCallback) - * @see AbstractJavaScriptComponent#registerCallback(String, JavaScriptCallback) - * @see AbstractJavaScriptExtension#registerCallback(String, JavaScriptCallback) + * @see JavaScript#addFunction(String, JavaScriptCallback) + * @see AbstractJavaScriptComponent#addFunction(String, JavaScriptCallback) + * @see AbstractJavaScriptExtension#addFunction(String, JavaScriptCallback) * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ -public interface JavaScriptCallback extends Serializable { +public interface JavaScriptFunction extends Serializable { /** * Invoked whenever the corresponding JavaScript function is called in the * browser. diff --git a/src/com/vaadin/ui/Label.java b/server/src/com/vaadin/ui/Label.java index 7e50a37805..668b99a74c 100644 --- a/src/com/vaadin/ui/Label.java +++ b/server/src/com/vaadin/ui/Label.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -33,8 +45,6 @@ import com.vaadin.shared.ui.label.LabelState; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") @@ -307,8 +317,6 @@ public class Label extends AbstractComponent implements Property<String>, * Value change event * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public static class ValueChangeEvent extends Component.Event implements diff --git a/src/com/vaadin/ui/Layout.java b/server/src/com/vaadin/ui/Layout.java index d083f9afdc..6a95d23f8c 100644 --- a/src/com/vaadin/ui/Layout.java +++ b/server/src/com/vaadin/ui/Layout.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -16,8 +28,6 @@ import com.vaadin.shared.ui.AlignmentInfo.Bits; * specific locations in the UI. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface Layout extends ComponentContainer, Serializable { diff --git a/src/com/vaadin/ui/Link.java b/server/src/com/vaadin/ui/Link.java index fd105f3255..57f2088054 100644 --- a/src/com/vaadin/ui/Link.java +++ b/server/src/com/vaadin/ui/Link.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -16,8 +28,6 @@ import com.vaadin.terminal.Vaadin6Component; * Link is used to create external or internal URL links. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/ui/ListSelect.java b/server/src/com/vaadin/ui/ListSelect.java index 35ccb34b3c..eb54183164 100644 --- a/src/com/vaadin/ui/ListSelect.java +++ b/server/src/com/vaadin/ui/ListSelect.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; diff --git a/src/com/vaadin/ui/LoginForm.java b/server/src/com/vaadin/ui/LoginForm.java index db7e5f9dd9..c8634ea81a 100644 --- a/src/com/vaadin/ui/LoginForm.java +++ b/server/src/com/vaadin/ui/LoginForm.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -13,12 +25,12 @@ import java.util.Iterator; import java.util.Map; import com.vaadin.Application; +import com.vaadin.shared.ApplicationConstants; import com.vaadin.terminal.ApplicationResource; import com.vaadin.terminal.DownloadStream; import com.vaadin.terminal.RequestHandler; import com.vaadin.terminal.WrappedRequest; import com.vaadin.terminal.WrappedResponse; -import com.vaadin.terminal.gwt.client.ApplicationConnection; /** * LoginForm is a Vaadin component to handle common problem among Ajax @@ -156,7 +168,7 @@ public class LoginForm extends CustomComponent { + " if (keycode == 13) {document.forms[0].submit();} } \n" + "</script>" + "</head><body onload='setTarget();' style='margin:0;padding:0; background:transparent;' class=\"" - + ApplicationConnection.GENERATED_BODY_CLASSNAME + + ApplicationConstants.GENERATED_BODY_CLASSNAME + "\">" + "<div class='v-app v-app-loginpage' style=\"background:transparent;\">" + "<iframe name='logintarget' style='width:0;height:0;" diff --git a/src/com/vaadin/ui/MenuBar.java b/server/src/com/vaadin/ui/MenuBar.java index 5b5dc13e20..37728ee69b 100644 --- a/src/com/vaadin/ui/MenuBar.java +++ b/server/src/com/vaadin/ui/MenuBar.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -10,11 +22,11 @@ import java.util.List; import java.util.Map; import java.util.Stack; +import com.vaadin.shared.ui.menubar.MenuBarConstants; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; import com.vaadin.terminal.Resource; import com.vaadin.terminal.Vaadin6Component; -import com.vaadin.terminal.gwt.client.ui.menubar.VMenuBar; /** * <p> @@ -41,10 +53,11 @@ public class MenuBar extends AbstractComponent implements Vaadin6Component { /** Paint (serialise) the component for the client. */ @Override public void paintContent(PaintTarget target) throws PaintException { - target.addAttribute(VMenuBar.OPEN_ROOT_MENU_ON_HOWER, openRootOnHover); + target.addAttribute(MenuBarConstants.OPEN_ROOT_MENU_ON_HOWER, + openRootOnHover); if (isHtmlContentAllowed()) { - target.addAttribute(VMenuBar.HTML_CONTENT_ALLOWED, true); + target.addAttribute(MenuBarConstants.HTML_CONTENT_ALLOWED, true); } target.startTag("options"); @@ -80,7 +93,7 @@ public class MenuBar extends AbstractComponent implements Vaadin6Component { target.addAttribute("id", item.getId()); if (item.getStyleName() != null) { - target.addAttribute(VMenuBar.ATTRIBUTE_ITEM_STYLE, + target.addAttribute(MenuBarConstants.ATTRIBUTE_ITEM_STYLE, item.getStyleName()); } @@ -96,22 +109,24 @@ public class MenuBar extends AbstractComponent implements Vaadin6Component { Resource icon = item.getIcon(); if (icon != null) { - target.addAttribute(VMenuBar.ATTRIBUTE_ITEM_ICON, icon); + target.addAttribute(MenuBarConstants.ATTRIBUTE_ITEM_ICON, icon); } if (!item.isEnabled()) { - target.addAttribute(VMenuBar.ATTRIBUTE_ITEM_DISABLED, true); + target.addAttribute(MenuBarConstants.ATTRIBUTE_ITEM_DISABLED, + true); } String description = item.getDescription(); if (description != null && description.length() > 0) { - target.addAttribute(VMenuBar.ATTRIBUTE_ITEM_DESCRIPTION, + target.addAttribute( + MenuBarConstants.ATTRIBUTE_ITEM_DESCRIPTION, description); } if (item.isCheckable()) { // if the "checked" attribute is present (either true or false), // the item is checkable - target.addAttribute(VMenuBar.ATTRIBUTE_CHECKED, + target.addAttribute(MenuBarConstants.ATTRIBUTE_CHECKED, item.isChecked()); } if (item.hasChildren()) { diff --git a/server/src/com/vaadin/ui/NativeButton.java b/server/src/com/vaadin/ui/NativeButton.java new file mode 100644 index 0000000000..d5d669bb9b --- /dev/null +++ b/server/src/com/vaadin/ui/NativeButton.java @@ -0,0 +1,33 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.ui; + +@SuppressWarnings("serial") +public class NativeButton extends Button { + + public NativeButton() { + super(); + } + + public NativeButton(String caption) { + super(caption); + } + + public NativeButton(String caption, ClickListener listener) { + super(caption, listener); + } + +} diff --git a/src/com/vaadin/ui/NativeSelect.java b/server/src/com/vaadin/ui/NativeSelect.java index 1f85f57c97..53c225a256 100644 --- a/src/com/vaadin/ui/NativeSelect.java +++ b/server/src/com/vaadin/ui/NativeSelect.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; diff --git a/src/com/vaadin/ui/Notification.java b/server/src/com/vaadin/ui/Notification.java index 502e5ff788..d408889519 100644 --- a/src/com/vaadin/ui/Notification.java +++ b/server/src/com/vaadin/ui/Notification.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; diff --git a/src/com/vaadin/ui/OptionGroup.java b/server/src/com/vaadin/ui/OptionGroup.java index e3bcdd61b7..dfb5019331 100644 --- a/src/com/vaadin/ui/OptionGroup.java +++ b/server/src/com/vaadin/ui/OptionGroup.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -15,9 +27,9 @@ import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; +import com.vaadin.shared.ui.optiongroup.OptionGroupConstants; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.gwt.client.ui.optiongroup.VOptionGroup; /** * Configures select to be used as an option group. @@ -49,7 +61,7 @@ public class OptionGroup extends AbstractSelect implements public void paintContent(PaintTarget target) throws PaintException { target.addAttribute("type", "optiongroup"); if (isHtmlContentAllowed()) { - target.addAttribute(VOptionGroup.HTML_CONTENT_ALLOWED, true); + target.addAttribute(OptionGroupConstants.HTML_CONTENT_ALLOWED, true); } super.paintContent(target); } @@ -59,7 +71,8 @@ public class OptionGroup extends AbstractSelect implements throws PaintException { super.paintItem(target, itemId); if (!isItemEnabled(itemId)) { - target.addAttribute(VOptionGroup.ATTRIBUTE_OPTION_DISABLED, true); + target.addAttribute(OptionGroupConstants.ATTRIBUTE_OPTION_DISABLED, + true); } } diff --git a/src/com/vaadin/ui/Panel.java b/server/src/com/vaadin/ui/Panel.java index 3c26b73f09..ba68238707 100644 --- a/src/com/vaadin/ui/Panel.java +++ b/server/src/com/vaadin/ui/Panel.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -13,6 +25,7 @@ import com.vaadin.event.Action.Handler; import com.vaadin.event.ActionManager; import com.vaadin.event.MouseEvents.ClickEvent; import com.vaadin.event.MouseEvents.ClickListener; +import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.panel.PanelServerRpc; import com.vaadin.shared.ui.panel.PanelState; @@ -20,15 +33,12 @@ import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; import com.vaadin.terminal.Scrollable; import com.vaadin.terminal.Vaadin6Component; -import com.vaadin.terminal.gwt.client.ui.ClickEventHandler; import com.vaadin.ui.Component.Focusable; /** * Panel - a simple single component container. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") @@ -425,8 +435,8 @@ public class Panel extends AbstractComponentContainer implements Scrollable, * The listener to add */ public void addListener(ClickListener listener) { - addListener(ClickEventHandler.CLICK_EVENT_IDENTIFIER, ClickEvent.class, - listener, ClickListener.clickMethod); + addListener(EventId.CLICK_EVENT_IDENTIFIER, ClickEvent.class, listener, + ClickListener.clickMethod); } /** @@ -437,8 +447,8 @@ public class Panel extends AbstractComponentContainer implements Scrollable, * The listener to remove */ public void removeListener(ClickListener listener) { - removeListener(ClickEventHandler.CLICK_EVENT_IDENTIFIER, - ClickEvent.class, listener); + removeListener(EventId.CLICK_EVENT_IDENTIFIER, ClickEvent.class, + listener); } /** diff --git a/src/com/vaadin/ui/PasswordField.java b/server/src/com/vaadin/ui/PasswordField.java index c1fccebbfe..084c05eb8f 100644 --- a/src/com/vaadin/ui/PasswordField.java +++ b/server/src/com/vaadin/ui/PasswordField.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; diff --git a/src/com/vaadin/ui/PopupDateField.java b/server/src/com/vaadin/ui/PopupDateField.java index 3688d4035f..a4304faaf9 100644 --- a/src/com/vaadin/ui/PopupDateField.java +++ b/server/src/com/vaadin/ui/PopupDateField.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -19,8 +31,6 @@ import com.vaadin.terminal.PaintTarget; * @see DateField * @see InlineDateField * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 5.0 */ public class PopupDateField extends DateField { diff --git a/src/com/vaadin/ui/PopupView.java b/server/src/com/vaadin/ui/PopupView.java index 766181b50f..4a5814f660 100644 --- a/src/com/vaadin/ui/PopupView.java +++ b/server/src/com/vaadin/ui/PopupView.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; diff --git a/src/com/vaadin/ui/ProgressIndicator.java b/server/src/com/vaadin/ui/ProgressIndicator.java index fef54a267c..d3e292a3e1 100644 --- a/src/com/vaadin/ui/ProgressIndicator.java +++ b/server/src/com/vaadin/ui/ProgressIndicator.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -22,8 +34,6 @@ import com.vaadin.terminal.Vaadin6Component; * May view an other property that indicates progress 0...1 * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 4 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/ui/RichTextArea.java b/server/src/com/vaadin/ui/RichTextArea.java index cec952926b..e3d1168559 100644 --- a/src/com/vaadin/ui/RichTextArea.java +++ b/server/src/com/vaadin/ui/RichTextArea.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; diff --git a/src/com/vaadin/ui/Root.java b/server/src/com/vaadin/ui/Root.java index bd4842632b..685296c55a 100644 --- a/src/com/vaadin/ui/Root.java +++ b/server/src/com/vaadin/ui/Root.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -20,7 +32,9 @@ import com.vaadin.event.Action.Handler; import com.vaadin.event.ActionManager; import com.vaadin.event.MouseEvents.ClickEvent; import com.vaadin.event.MouseEvents.ClickListener; +import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; +import com.vaadin.shared.ui.root.RootConstants; import com.vaadin.shared.ui.root.RootServerRpc; import com.vaadin.shared.ui.root.RootState; import com.vaadin.terminal.Page; @@ -32,7 +46,6 @@ import com.vaadin.terminal.Resource; import com.vaadin.terminal.Vaadin6Component; import com.vaadin.terminal.WrappedRequest; import com.vaadin.terminal.WrappedRequest.BrowserDetails; -import com.vaadin.terminal.gwt.client.ui.root.VRoot; import com.vaadin.ui.Window.CloseListener; /** @@ -412,8 +425,6 @@ public abstract class Root extends AbstractComponentContainer implements private static final ThreadLocal<Root> currentRoot = new ThreadLocal<Root>(); /** Identifies the click event */ - private static final String CLICK_EVENT_ID = VRoot.CLICK_EVENT_ID; - private ConnectorTracker connectorTracker = new ConnectorTracker(this); private Page page = new Page(this); @@ -537,7 +548,7 @@ public abstract class Root extends AbstractComponentContainer implements } if (isResizeLazy()) { - target.addAttribute(VRoot.RESIZE_LAZY, true); + target.addAttribute(RootConstants.RESIZE_LAZY, true); } } @@ -556,8 +567,9 @@ public abstract class Root extends AbstractComponentContainer implements @Override @SuppressWarnings("unchecked") public void changeVariables(Object source, Map<String, Object> variables) { - if (variables.containsKey(CLICK_EVENT_ID)) { - fireClick((Map<String, Object>) variables.get(CLICK_EVENT_ID)); + if (variables.containsKey(EventId.CLICK_EVENT_IDENTIFIER)) { + fireClick((Map<String, Object>) variables + .get(EventId.CLICK_EVENT_IDENTIFIER)); } // Actions @@ -565,8 +577,9 @@ public abstract class Root extends AbstractComponentContainer implements actionManager.handleActions(variables, this); } - if (variables.containsKey(VRoot.FRAGMENT_VARIABLE)) { - String fragment = (String) variables.get(VRoot.FRAGMENT_VARIABLE); + if (variables.containsKey(RootConstants.FRAGMENT_VARIABLE)) { + String fragment = (String) variables + .get(RootConstants.FRAGMENT_VARIABLE); getPage().setFragment(fragment, true); } @@ -1026,7 +1039,7 @@ public abstract class Root extends AbstractComponentContainer implements * The listener to add */ public void addListener(ClickListener listener) { - addListener(CLICK_EVENT_ID, ClickEvent.class, listener, + addListener(EventId.CLICK_EVENT_IDENTIFIER, ClickEvent.class, listener, ClickListener.clickMethod); } @@ -1038,7 +1051,8 @@ public abstract class Root extends AbstractComponentContainer implements * The listener to remove */ public void removeListener(ClickListener listener) { - removeListener(CLICK_EVENT_ID, ClickEvent.class, listener); + removeListener(EventId.CLICK_EVENT_IDENTIFIER, ClickEvent.class, + listener); } @Override diff --git a/src/com/vaadin/ui/Select.java b/server/src/com/vaadin/ui/Select.java index f60935c64b..698350cb30 100644 --- a/src/com/vaadin/ui/Select.java +++ b/server/src/com/vaadin/ui/Select.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -38,8 +50,6 @@ import com.vaadin.terminal.Resource; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/ui/Slider.java b/server/src/com/vaadin/ui/Slider.java index 94afe4e2bd..f7672f617c 100644 --- a/src/com/vaadin/ui/Slider.java +++ b/server/src/com/vaadin/ui/Slider.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; diff --git a/src/com/vaadin/ui/TabSheet.java b/server/src/com/vaadin/ui/TabSheet.java index c52e9394c0..5a1aa02845 100644 --- a/src/com/vaadin/ui/TabSheet.java +++ b/server/src/com/vaadin/ui/TabSheet.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -18,6 +30,8 @@ import com.vaadin.event.FieldEvents.BlurNotifier; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.event.FieldEvents.FocusNotifier; +import com.vaadin.shared.ui.tabsheet.TabsheetBaseConstants; +import com.vaadin.shared.ui.tabsheet.TabsheetConstants; import com.vaadin.terminal.ErrorMessage; import com.vaadin.terminal.KeyMapper; import com.vaadin.terminal.LegacyPaint; @@ -25,8 +39,6 @@ import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; import com.vaadin.terminal.Resource; import com.vaadin.terminal.Vaadin6Component; -import com.vaadin.terminal.gwt.client.ui.tabsheet.TabsheetBaseConnector; -import com.vaadin.terminal.gwt.client.ui.tabsheet.VTabsheet; import com.vaadin.ui.Component.Focusable; import com.vaadin.ui.themes.Reindeer; import com.vaadin.ui.themes.Runo; @@ -56,8 +68,6 @@ import com.vaadin.ui.themes.Runo; * time they are shown, but this may change in future releases. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public class TabSheet extends AbstractComponentContainer implements Focusable, @@ -390,7 +400,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, target.startTag("tab"); if (!tab.isEnabled() && tab.isVisible()) { target.addAttribute( - TabsheetBaseConnector.ATTRIBUTE_TAB_DISABLED, true); + TabsheetBaseConstants.ATTRIBUTE_TAB_DISABLED, true); } if (!tab.isVisible()) { @@ -405,30 +415,30 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, // VCaption.updateCaption(uidl) final Resource icon = tab.getIcon(); if (icon != null) { - target.addAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_ICON, + target.addAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_ICON, icon); } final String caption = tab.getCaption(); if (caption != null && caption.length() > 0) { target.addAttribute( - TabsheetBaseConnector.ATTRIBUTE_TAB_CAPTION, caption); + TabsheetBaseConstants.ATTRIBUTE_TAB_CAPTION, caption); } ErrorMessage tabError = tab.getComponentError(); if (tabError != null) { target.addAttribute( - TabsheetBaseConnector.ATTRIBUTE_TAB_ERROR_MESSAGE, + TabsheetBaseConstants.ATTRIBUTE_TAB_ERROR_MESSAGE, tabError.getFormattedHtmlMessage()); } final String description = tab.getDescription(); if (description != null) { target.addAttribute( - TabsheetBaseConnector.ATTRIBUTE_TAB_DESCRIPTION, + TabsheetBaseConstants.ATTRIBUTE_TAB_DESCRIPTION, description); } final String styleName = tab.getStyleName(); if (styleName != null && styleName.length() != 0) { - target.addAttribute(VTabsheet.TAB_STYLE_NAME, styleName); + target.addAttribute(TabsheetConstants.TAB_STYLE_NAME, styleName); } target.addAttribute("key", keyMapper.key(component)); @@ -806,8 +816,6 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, * tab in the tab sheet is changed. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public class SelectedTabChangeEvent extends Component.Event { @@ -839,8 +847,6 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, * * @author Vaadin Ltd. * - * @version - * @VERSION@ * @since 3.0 */ public interface SelectedTabChangeListener extends Serializable { diff --git a/src/com/vaadin/ui/Table.java b/server/src/com/vaadin/ui/Table.java index 39b7fb7473..6f7f88f883 100644 --- a/src/com/vaadin/ui/Table.java +++ b/server/src/com/vaadin/ui/Table.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -41,12 +53,12 @@ import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.DropTarget; import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion; import com.vaadin.shared.MouseEventDetails; +import com.vaadin.shared.ui.table.TableConstants; import com.vaadin.terminal.KeyMapper; import com.vaadin.terminal.LegacyPaint; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; import com.vaadin.terminal.Resource; -import com.vaadin.terminal.gwt.client.ui.table.VScrollTable; /** * <p> @@ -67,8 +79,6 @@ import com.vaadin.terminal.gwt.client.ui.table.VScrollTable; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings({ "deprecation" }) @@ -2874,9 +2884,9 @@ public class Table extends AbstractSelect implements Action.Container, */ int pageBufferLastIndex = pageBufferFirstIndex + pageBuffer[CELL_ITEMID].length - 1; - target.addAttribute(VScrollTable.ATTRIBUTE_PAGEBUFFER_FIRST, + target.addAttribute(TableConstants.ATTRIBUTE_PAGEBUFFER_FIRST, pageBufferFirstIndex); - target.addAttribute(VScrollTable.ATTRIBUTE_PAGEBUFFER_LAST, + target.addAttribute(TableConstants.ATTRIBUTE_PAGEBUFFER_LAST, pageBufferLastIndex); } else if (target.isFullRepaint() || isRowCacheInvalidated()) { paintRows(target, cells, actionSet); @@ -2899,7 +2909,7 @@ public class Table extends AbstractSelect implements Action.Container, if (keyMapperReset) { keyMapperReset = false; - target.addAttribute(VScrollTable.ATTRIBUTE_KEY_MAPPER_RESET, true); + target.addAttribute(TableConstants.ATTRIBUTE_KEY_MAPPER_RESET, true); } if (dropHandler != null) { @@ -4579,14 +4589,14 @@ public class Table extends AbstractSelect implements Action.Container, @Override public void addListener(ItemClickListener listener) { - addListener(VScrollTable.ITEM_CLICK_EVENT_ID, ItemClickEvent.class, + addListener(TableConstants.ITEM_CLICK_EVENT_ID, ItemClickEvent.class, listener, ItemClickEvent.ITEM_CLICK_METHOD); } @Override public void removeListener(ItemClickListener listener) { - removeListener(VScrollTable.ITEM_CLICK_EVENT_ID, ItemClickEvent.class, - listener); + removeListener(TableConstants.ITEM_CLICK_EVENT_ID, + ItemClickEvent.class, listener); } // Identical to AbstractCompoenentContainer.setEnabled(); @@ -4930,8 +4940,9 @@ public class Table extends AbstractSelect implements Action.Container, * The handler which should handle the header click events. */ public void addListener(HeaderClickListener listener) { - addListener(VScrollTable.HEADER_CLICK_EVENT_ID, HeaderClickEvent.class, - listener, HeaderClickEvent.HEADER_CLICK_METHOD); + addListener(TableConstants.HEADER_CLICK_EVENT_ID, + HeaderClickEvent.class, listener, + HeaderClickEvent.HEADER_CLICK_METHOD); } /** @@ -4941,7 +4952,7 @@ public class Table extends AbstractSelect implements Action.Container, * The listener to remove. */ public void removeListener(HeaderClickListener listener) { - removeListener(VScrollTable.HEADER_CLICK_EVENT_ID, + removeListener(TableConstants.HEADER_CLICK_EVENT_ID, HeaderClickEvent.class, listener); } @@ -4957,8 +4968,9 @@ public class Table extends AbstractSelect implements Action.Container, * The handler which should handle the footer click events. */ public void addListener(FooterClickListener listener) { - addListener(VScrollTable.FOOTER_CLICK_EVENT_ID, FooterClickEvent.class, - listener, FooterClickEvent.FOOTER_CLICK_METHOD); + addListener(TableConstants.FOOTER_CLICK_EVENT_ID, + FooterClickEvent.class, listener, + FooterClickEvent.FOOTER_CLICK_METHOD); } /** @@ -4968,7 +4980,7 @@ public class Table extends AbstractSelect implements Action.Container, * The listener to remove. */ public void removeListener(FooterClickListener listener) { - removeListener(VScrollTable.FOOTER_CLICK_EVENT_ID, + removeListener(TableConstants.FOOTER_CLICK_EVENT_ID, FooterClickEvent.class, listener); } @@ -5124,7 +5136,7 @@ public class Table extends AbstractSelect implements Action.Container, * The listener to attach to the Table */ public void addListener(ColumnResizeListener listener) { - addListener(VScrollTable.COLUMN_RESIZE_EVENT_ID, + addListener(TableConstants.COLUMN_RESIZE_EVENT_ID, ColumnResizeEvent.class, listener, ColumnResizeEvent.COLUMN_RESIZE_METHOD); } @@ -5136,7 +5148,7 @@ public class Table extends AbstractSelect implements Action.Container, * The listener to remove */ public void removeListener(ColumnResizeListener listener) { - removeListener(VScrollTable.COLUMN_RESIZE_EVENT_ID, + removeListener(TableConstants.COLUMN_RESIZE_EVENT_ID, ColumnResizeEvent.class, listener); } @@ -5190,7 +5202,7 @@ public class Table extends AbstractSelect implements Action.Container, * The listener to attach to the Table */ public void addListener(ColumnReorderListener listener) { - addListener(VScrollTable.COLUMN_REORDER_EVENT_ID, + addListener(TableConstants.COLUMN_REORDER_EVENT_ID, ColumnReorderEvent.class, listener, ColumnReorderEvent.METHOD); } @@ -5201,7 +5213,7 @@ public class Table extends AbstractSelect implements Action.Container, * The listener to remove */ public void removeListener(ColumnReorderListener listener) { - removeListener(VScrollTable.COLUMN_REORDER_EVENT_ID, + removeListener(TableConstants.COLUMN_REORDER_EVENT_ID, ColumnReorderEvent.class, listener); } diff --git a/src/com/vaadin/ui/TableFieldFactory.java b/server/src/com/vaadin/ui/TableFieldFactory.java index 6c9a641aa8..9424697b1f 100644 --- a/src/com/vaadin/ui/TableFieldFactory.java +++ b/server/src/com/vaadin/ui/TableFieldFactory.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -17,8 +29,6 @@ import com.vaadin.data.Container; * <p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 6.0 * @see FormFieldFactory */ diff --git a/src/com/vaadin/ui/TextArea.java b/server/src/com/vaadin/ui/TextArea.java index d7837dd33f..fed06b561a 100644 --- a/src/com/vaadin/ui/TextArea.java +++ b/server/src/com/vaadin/ui/TextArea.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; diff --git a/src/com/vaadin/ui/TextField.java b/server/src/com/vaadin/ui/TextField.java index 567e9c1c10..b7cae9b77b 100644 --- a/src/com/vaadin/ui/TextField.java +++ b/server/src/com/vaadin/ui/TextField.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -22,8 +34,6 @@ import com.vaadin.data.Property; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") diff --git a/src/com/vaadin/ui/Tree.java b/server/src/com/vaadin/ui/Tree.java index c15975d879..dda0a78aff 100644 --- a/src/com/vaadin/ui/Tree.java +++ b/server/src/com/vaadin/ui/Tree.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -39,12 +51,11 @@ import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion; import com.vaadin.event.dd.acceptcriteria.TargetDetailIs; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.dd.VerticalDropLocation; +import com.vaadin.shared.ui.tree.TreeConstants; import com.vaadin.terminal.KeyMapper; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; import com.vaadin.terminal.Resource; -import com.vaadin.terminal.gwt.client.ui.tree.TreeConnector; -import com.vaadin.terminal.gwt.client.ui.tree.VTree; import com.vaadin.tools.ReflectTools; /** @@ -52,8 +63,6 @@ import com.vaadin.tools.ReflectTools; * a hierarchical set of items. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings({ "serial", "deprecation" }) @@ -604,7 +613,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, if (itemStyleGenerator != null) { String stylename = itemStyleGenerator.getStyle(itemId); if (stylename != null) { - target.addAttribute(TreeConnector.ATTRIBUTE_NODE_STYLE, + target.addAttribute(TreeConstants.ATTRIBUTE_NODE_STYLE, stylename); } } @@ -618,11 +627,11 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, } // Adds the attributes - target.addAttribute(TreeConnector.ATTRIBUTE_NODE_CAPTION, + target.addAttribute(TreeConstants.ATTRIBUTE_NODE_CAPTION, getItemCaption(itemId)); final Resource icon = getItemIcon(itemId); if (icon != null) { - target.addAttribute(TreeConnector.ATTRIBUTE_NODE_ICON, + target.addAttribute(TreeConstants.ATTRIBUTE_NODE_ICON, getItemIcon(itemId)); } final String key = itemIdMapper.key(itemId); @@ -680,11 +689,11 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, final Action a = i.next(); target.startTag("action"); if (a.getCaption() != null) { - target.addAttribute(TreeConnector.ATTRIBUTE_ACTION_CAPTION, + target.addAttribute(TreeConstants.ATTRIBUTE_ACTION_CAPTION, a.getCaption()); } if (a.getIcon() != null) { - target.addAttribute(TreeConnector.ATTRIBUTE_ACTION_ICON, + target.addAttribute(TreeConstants.ATTRIBUTE_ACTION_ICON, a.getIcon()); } target.addAttribute("key", actionMapper.key(a)); @@ -843,8 +852,6 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * the node. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public static class ExpandEvent extends Component.Event { @@ -877,8 +884,6 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * Expand event listener. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface ExpandListener extends Serializable { @@ -932,8 +937,6 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * Collapse event * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public static class CollapseEvent extends Component.Event { @@ -966,8 +969,6 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * Collapse event listener. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface CollapseListener extends Serializable { @@ -1162,13 +1163,13 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, @Override public void addListener(ItemClickListener listener) { - addListener(VTree.ITEM_CLICK_EVENT_ID, ItemClickEvent.class, listener, - ItemClickEvent.ITEM_CLICK_METHOD); + addListener(TreeConstants.ITEM_CLICK_EVENT_ID, ItemClickEvent.class, + listener, ItemClickEvent.ITEM_CLICK_METHOD); } @Override public void removeListener(ItemClickListener listener) { - removeListener(VTree.ITEM_CLICK_EVENT_ID, ItemClickEvent.class, + removeListener(TreeConstants.ITEM_CLICK_EVENT_ID, ItemClickEvent.class, listener); } diff --git a/src/com/vaadin/ui/TreeTable.java b/server/src/com/vaadin/ui/TreeTable.java index 6132b652f7..7548a4840b 100644 --- a/src/com/vaadin/ui/TreeTable.java +++ b/server/src/com/vaadin/ui/TreeTable.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -20,10 +32,10 @@ import com.vaadin.data.Container.ItemSetChangeEvent; import com.vaadin.data.util.ContainerHierarchicalWrapper; import com.vaadin.data.util.HierarchicalContainer; import com.vaadin.data.util.HierarchicalContainerOrderedWrapper; +import com.vaadin.shared.ui.treetable.TreeTableConstants; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; import com.vaadin.terminal.Resource; -import com.vaadin.terminal.gwt.client.ui.treetable.TreeTableConnector; import com.vaadin.ui.Tree.CollapseEvent; import com.vaadin.ui.Tree.CollapseListener; import com.vaadin.ui.Tree.ExpandEvent; @@ -472,7 +484,7 @@ public class TreeTable extends Table implements Hierarchical { Object object = visibleColumns2[i]; if (hierarchyColumnId.equals(object)) { target.addAttribute( - TreeTableConnector.ATTRIBUTE_HIERARCHY_COLUMN_INDEX, + TreeTableConstants.ATTRIBUTE_HIERARCHY_COLUMN_INDEX, i); break; } diff --git a/src/com/vaadin/ui/TwinColSelect.java b/server/src/com/vaadin/ui/TwinColSelect.java index 5539236f77..80f4ae49c8 100644 --- a/src/com/vaadin/ui/TwinColSelect.java +++ b/server/src/com/vaadin/ui/TwinColSelect.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -7,9 +19,9 @@ package com.vaadin.ui; import java.util.Collection; import com.vaadin.data.Container; +import com.vaadin.shared.ui.twincolselect.TwinColSelectConstants; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.gwt.client.ui.twincolselect.VTwinColSelect; /** * Multiselect component with two lists: left side for available items and right @@ -128,10 +140,12 @@ public class TwinColSelect extends AbstractSelect { String lc = getLeftColumnCaption(); String rc = getRightColumnCaption(); if (lc != null) { - target.addAttribute(VTwinColSelect.ATTRIBUTE_LEFT_CAPTION, lc); + target.addAttribute(TwinColSelectConstants.ATTRIBUTE_LEFT_CAPTION, + lc); } if (rc != null) { - target.addAttribute(VTwinColSelect.ATTRIBUTE_RIGHT_CAPTION, rc); + target.addAttribute(TwinColSelectConstants.ATTRIBUTE_RIGHT_CAPTION, + rc); } super.paintContent(target); diff --git a/src/com/vaadin/ui/UniqueSerializable.java b/server/src/com/vaadin/ui/UniqueSerializable.java index 828b285538..789a8bb0b1 100644 --- a/src/com/vaadin/ui/UniqueSerializable.java +++ b/server/src/com/vaadin/ui/UniqueSerializable.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -12,7 +24,6 @@ import java.io.Serializable; * an anonymous inner class. Otherwise each instance will not be unique. * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0 * */ diff --git a/src/com/vaadin/ui/Upload.java b/server/src/com/vaadin/ui/Upload.java index 9d533b67f6..c4f15ebea9 100644 --- a/src/com/vaadin/ui/Upload.java +++ b/server/src/com/vaadin/ui/Upload.java @@ -1,5 +1,17 @@ /* - * @VaadinApache2LicenseForJavaFiles@ + * * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -55,8 +67,6 @@ import com.vaadin.terminal.gwt.server.NoOutputStreamException; * browsers setting size may work to some extend. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") @@ -182,8 +192,6 @@ public class Upload extends AbstractComponent implements Component.Focusable, * Upload component an output stream to write the uploaded data. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface Receiver extends Serializable { @@ -237,8 +245,6 @@ public class Upload extends AbstractComponent implements Component.Focusable, * FailedEvent, which are both subclasses of the FinishedEvent. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public static class FinishedEvent extends Component.Event { @@ -320,8 +326,6 @@ public class Upload extends AbstractComponent implements Component.Focusable, * reception is interrupted for some reason. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public static class FailedEvent extends FinishedEvent { @@ -408,8 +412,6 @@ public class Upload extends AbstractComponent implements Component.Focusable, * successfully. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public static class SucceededEvent extends FinishedEvent { @@ -432,8 +434,6 @@ public class Upload extends AbstractComponent implements Component.Focusable, * Upload.StartedEvent event is sent when the upload is started to received. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 5.0 */ public static class StartedEvent extends Component.Event { @@ -500,8 +500,6 @@ public class Upload extends AbstractComponent implements Component.Focusable, * Receives the events when the upload starts. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 5.0 */ public interface StartedListener extends Serializable { @@ -519,8 +517,6 @@ public class Upload extends AbstractComponent implements Component.Focusable, * Receives the events when the uploads are ready. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface FinishedListener extends Serializable { @@ -538,8 +534,6 @@ public class Upload extends AbstractComponent implements Component.Focusable, * Receives events when the uploads are finished, but unsuccessful. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface FailedListener extends Serializable { @@ -557,8 +551,6 @@ public class Upload extends AbstractComponent implements Component.Focusable, * Receives events when the uploads are successfully finished. * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ public interface SucceededListener extends Serializable { diff --git a/server/src/com/vaadin/ui/VerticalLayout.java b/server/src/com/vaadin/ui/VerticalLayout.java new file mode 100644 index 0000000000..0a13ca9a36 --- /dev/null +++ b/server/src/com/vaadin/ui/VerticalLayout.java @@ -0,0 +1,35 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.ui; + +/** + * Vertical layout + * + * <code>VerticalLayout</code> is a component container, which shows the + * subcomponents in the order of their addition (vertically). A vertical layout + * is by default 100% wide. + * + * @author Vaadin Ltd. + * @since 5.3 + */ +@SuppressWarnings("serial") +public class VerticalLayout extends AbstractOrderedLayout { + + public VerticalLayout() { + setWidth("100%"); + } + +} diff --git a/src/com/vaadin/ui/VerticalSplitPanel.java b/server/src/com/vaadin/ui/VerticalSplitPanel.java index 0630240e9c..813401c4a0 100644 --- a/src/com/vaadin/ui/VerticalSplitPanel.java +++ b/server/src/com/vaadin/ui/VerticalSplitPanel.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; diff --git a/src/com/vaadin/ui/Video.java b/server/src/com/vaadin/ui/Video.java index d4f95a5be3..95a38c59d5 100644 --- a/src/com/vaadin/ui/Video.java +++ b/server/src/com/vaadin/ui/Video.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; diff --git a/src/com/vaadin/ui/Window.java b/server/src/com/vaadin/ui/Window.java index e413d35e6d..13ef7e5784 100644 --- a/src/com/vaadin/ui/Window.java +++ b/server/src/com/vaadin/ui/Window.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui; @@ -20,12 +32,12 @@ import com.vaadin.event.ShortcutAction.KeyCode; import com.vaadin.event.ShortcutAction.ModifierKey; import com.vaadin.event.ShortcutListener; import com.vaadin.shared.MouseEventDetails; +import com.vaadin.shared.ui.root.RootConstants; import com.vaadin.shared.ui.window.WindowServerRpc; import com.vaadin.shared.ui.window.WindowState; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; import com.vaadin.terminal.Vaadin6Component; -import com.vaadin.terminal.gwt.client.ui.root.VRoot; /** * A component that represents a floating popup window that can be added to a @@ -50,8 +62,6 @@ import com.vaadin.terminal.gwt.client.ui.root.VRoot; * </p> * * @author Vaadin Ltd. - * @version - * @VERSION@ * @since 3.0 */ @SuppressWarnings("serial") @@ -161,14 +171,14 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier, sizeHasChanged = true; } Integer browserHeightVar = (Integer) variables - .get(VRoot.BROWSER_HEIGHT_VAR); + .get(RootConstants.BROWSER_HEIGHT_VAR); if (browserHeightVar != null && browserHeightVar.intValue() != browserWindowHeight) { browserWindowHeight = browserHeightVar.intValue(); sizeHasChanged = true; } Integer browserWidthVar = (Integer) variables - .get(VRoot.BROWSER_WIDTH_VAR); + .get(RootConstants.BROWSER_WIDTH_VAR); if (browserWidthVar != null && browserWidthVar.intValue() != browserWindowWidth) { browserWindowWidth = browserWidthVar.intValue(); diff --git a/src/com/vaadin/ui/doc-files/component_class_hierarchy.gif b/server/src/com/vaadin/ui/doc-files/component_class_hierarchy.gif Binary files differindex 936c220d11..936c220d11 100644 --- a/src/com/vaadin/ui/doc-files/component_class_hierarchy.gif +++ b/server/src/com/vaadin/ui/doc-files/component_class_hierarchy.gif diff --git a/src/com/vaadin/ui/doc-files/component_interfaces.gif b/server/src/com/vaadin/ui/doc-files/component_interfaces.gif Binary files differindex 44c99826bb..44c99826bb 100644 --- a/src/com/vaadin/ui/doc-files/component_interfaces.gif +++ b/server/src/com/vaadin/ui/doc-files/component_interfaces.gif diff --git a/src/com/vaadin/ui/package.html b/server/src/com/vaadin/ui/package.html index 6b19a28fe7..6b19a28fe7 100644 --- a/src/com/vaadin/ui/package.html +++ b/server/src/com/vaadin/ui/package.html diff --git a/src/com/vaadin/ui/themes/BaseTheme.java b/server/src/com/vaadin/ui/themes/BaseTheme.java index 6f448746bf..bdb0087d2e 100644 --- a/src/com/vaadin/ui/themes/BaseTheme.java +++ b/server/src/com/vaadin/ui/themes/BaseTheme.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui.themes; diff --git a/src/com/vaadin/ui/themes/ChameleonTheme.java b/server/src/com/vaadin/ui/themes/ChameleonTheme.java index 5ae8cd4e57..3fae97a29a 100644 --- a/src/com/vaadin/ui/themes/ChameleonTheme.java +++ b/server/src/com/vaadin/ui/themes/ChameleonTheme.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui.themes; diff --git a/src/com/vaadin/ui/themes/LiferayTheme.java b/server/src/com/vaadin/ui/themes/LiferayTheme.java index 9b48306ac2..4e143a204f 100644 --- a/src/com/vaadin/ui/themes/LiferayTheme.java +++ b/server/src/com/vaadin/ui/themes/LiferayTheme.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui.themes; diff --git a/src/com/vaadin/ui/themes/Reindeer.java b/server/src/com/vaadin/ui/themes/Reindeer.java index 7aaae8faa2..7bc6720465 100644 --- a/src/com/vaadin/ui/themes/Reindeer.java +++ b/server/src/com/vaadin/ui/themes/Reindeer.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui.themes; diff --git a/src/com/vaadin/ui/themes/Runo.java b/server/src/com/vaadin/ui/themes/Runo.java index 28a19e8dcd..6a6cf5b496 100644 --- a/src/com/vaadin/ui/themes/Runo.java +++ b/server/src/com/vaadin/ui/themes/Runo.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.ui.themes; diff --git a/src/com/vaadin/util/SerializerHelper.java b/server/src/com/vaadin/util/SerializerHelper.java index 5b7b388dd6..30b82794f4 100644 --- a/src/com/vaadin/util/SerializerHelper.java +++ b/server/src/com/vaadin/util/SerializerHelper.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.util; diff --git a/src/org/jsoup/Connection.java b/server/src/org/jsoup/Connection.java index 564eeb89b7..564eeb89b7 100644 --- a/src/org/jsoup/Connection.java +++ b/server/src/org/jsoup/Connection.java diff --git a/src/org/jsoup/Jsoup.java b/server/src/org/jsoup/Jsoup.java index 8c6afcee36..8c6afcee36 100644 --- a/src/org/jsoup/Jsoup.java +++ b/server/src/org/jsoup/Jsoup.java diff --git a/src/org/jsoup/examples/HtmlToPlainText.java b/server/src/org/jsoup/examples/HtmlToPlainText.java index 8f563e9608..8f563e9608 100644 --- a/src/org/jsoup/examples/HtmlToPlainText.java +++ b/server/src/org/jsoup/examples/HtmlToPlainText.java diff --git a/src/org/jsoup/examples/ListLinks.java b/server/src/org/jsoup/examples/ListLinks.java index 64b29ba107..64b29ba107 100644 --- a/src/org/jsoup/examples/ListLinks.java +++ b/server/src/org/jsoup/examples/ListLinks.java diff --git a/src/org/jsoup/examples/package-info.java b/server/src/org/jsoup/examples/package-info.java index c312f430d4..c312f430d4 100644 --- a/src/org/jsoup/examples/package-info.java +++ b/server/src/org/jsoup/examples/package-info.java diff --git a/src/org/jsoup/helper/DataUtil.java b/server/src/org/jsoup/helper/DataUtil.java index 9adfe42153..9adfe42153 100644 --- a/src/org/jsoup/helper/DataUtil.java +++ b/server/src/org/jsoup/helper/DataUtil.java diff --git a/src/org/jsoup/helper/DescendableLinkedList.java b/server/src/org/jsoup/helper/DescendableLinkedList.java index 28ca1971eb..28ca1971eb 100644 --- a/src/org/jsoup/helper/DescendableLinkedList.java +++ b/server/src/org/jsoup/helper/DescendableLinkedList.java diff --git a/src/org/jsoup/helper/HttpConnection.java b/server/src/org/jsoup/helper/HttpConnection.java index 06200a2547..06200a2547 100644 --- a/src/org/jsoup/helper/HttpConnection.java +++ b/server/src/org/jsoup/helper/HttpConnection.java diff --git a/src/org/jsoup/helper/StringUtil.java b/server/src/org/jsoup/helper/StringUtil.java index 071a92c7a5..071a92c7a5 100644 --- a/src/org/jsoup/helper/StringUtil.java +++ b/server/src/org/jsoup/helper/StringUtil.java diff --git a/src/org/jsoup/helper/Validate.java b/server/src/org/jsoup/helper/Validate.java index 814bcc3a40..814bcc3a40 100644 --- a/src/org/jsoup/helper/Validate.java +++ b/server/src/org/jsoup/helper/Validate.java diff --git a/src/org/jsoup/nodes/Attribute.java b/server/src/org/jsoup/nodes/Attribute.java index 02eb29db83..02eb29db83 100644 --- a/src/org/jsoup/nodes/Attribute.java +++ b/server/src/org/jsoup/nodes/Attribute.java diff --git a/src/org/jsoup/nodes/Attributes.java b/server/src/org/jsoup/nodes/Attributes.java index 9436750fc9..9436750fc9 100644 --- a/src/org/jsoup/nodes/Attributes.java +++ b/server/src/org/jsoup/nodes/Attributes.java diff --git a/src/org/jsoup/nodes/Comment.java b/server/src/org/jsoup/nodes/Comment.java index 37fd4368fa..37fd4368fa 100644 --- a/src/org/jsoup/nodes/Comment.java +++ b/server/src/org/jsoup/nodes/Comment.java diff --git a/src/org/jsoup/nodes/DataNode.java b/server/src/org/jsoup/nodes/DataNode.java index a64f56f0a4..a64f56f0a4 100644 --- a/src/org/jsoup/nodes/DataNode.java +++ b/server/src/org/jsoup/nodes/DataNode.java diff --git a/src/org/jsoup/nodes/Document.java b/server/src/org/jsoup/nodes/Document.java index adb371ce14..adb371ce14 100644 --- a/src/org/jsoup/nodes/Document.java +++ b/server/src/org/jsoup/nodes/Document.java diff --git a/src/org/jsoup/nodes/DocumentType.java b/server/src/org/jsoup/nodes/DocumentType.java index f8c79f0d18..f8c79f0d18 100644 --- a/src/org/jsoup/nodes/DocumentType.java +++ b/server/src/org/jsoup/nodes/DocumentType.java diff --git a/src/org/jsoup/nodes/Element.java b/server/src/org/jsoup/nodes/Element.java index 5c1894c934..5c1894c934 100644 --- a/src/org/jsoup/nodes/Element.java +++ b/server/src/org/jsoup/nodes/Element.java diff --git a/src/org/jsoup/nodes/Entities.java b/server/src/org/jsoup/nodes/Entities.java index 0ae83e1fc0..0ae83e1fc0 100644 --- a/src/org/jsoup/nodes/Entities.java +++ b/server/src/org/jsoup/nodes/Entities.java diff --git a/src/org/jsoup/nodes/Node.java b/server/src/org/jsoup/nodes/Node.java index eb2b40ee73..eb2b40ee73 100644 --- a/src/org/jsoup/nodes/Node.java +++ b/server/src/org/jsoup/nodes/Node.java diff --git a/src/org/jsoup/nodes/TextNode.java b/server/src/org/jsoup/nodes/TextNode.java index 9fd0feac8f..9fd0feac8f 100644 --- a/src/org/jsoup/nodes/TextNode.java +++ b/server/src/org/jsoup/nodes/TextNode.java diff --git a/src/org/jsoup/nodes/XmlDeclaration.java b/server/src/org/jsoup/nodes/XmlDeclaration.java index 80d4a0152f..80d4a0152f 100644 --- a/src/org/jsoup/nodes/XmlDeclaration.java +++ b/server/src/org/jsoup/nodes/XmlDeclaration.java diff --git a/src/org/jsoup/nodes/entities-base.properties b/server/src/org/jsoup/nodes/entities-base.properties index 3d1d11e6c4..3d1d11e6c4 100644 --- a/src/org/jsoup/nodes/entities-base.properties +++ b/server/src/org/jsoup/nodes/entities-base.properties diff --git a/src/org/jsoup/nodes/entities-full.properties b/server/src/org/jsoup/nodes/entities-full.properties index 92f124f408..92f124f408 100644 --- a/src/org/jsoup/nodes/entities-full.properties +++ b/server/src/org/jsoup/nodes/entities-full.properties diff --git a/src/org/jsoup/nodes/package-info.java b/server/src/org/jsoup/nodes/package-info.java index 24b12803ff..24b12803ff 100644 --- a/src/org/jsoup/nodes/package-info.java +++ b/server/src/org/jsoup/nodes/package-info.java diff --git a/src/org/jsoup/package-info.java b/server/src/org/jsoup/package-info.java index 49526116b4..49526116b4 100644 --- a/src/org/jsoup/package-info.java +++ b/server/src/org/jsoup/package-info.java diff --git a/src/org/jsoup/parser/CharacterReader.java b/server/src/org/jsoup/parser/CharacterReader.java index b549a571a0..b549a571a0 100644 --- a/src/org/jsoup/parser/CharacterReader.java +++ b/server/src/org/jsoup/parser/CharacterReader.java diff --git a/src/org/jsoup/parser/HtmlTreeBuilder.java b/server/src/org/jsoup/parser/HtmlTreeBuilder.java index 457a4c3249..457a4c3249 100644 --- a/src/org/jsoup/parser/HtmlTreeBuilder.java +++ b/server/src/org/jsoup/parser/HtmlTreeBuilder.java diff --git a/src/org/jsoup/parser/HtmlTreeBuilderState.java b/server/src/org/jsoup/parser/HtmlTreeBuilderState.java index ceab9faa5a..ceab9faa5a 100644 --- a/src/org/jsoup/parser/HtmlTreeBuilderState.java +++ b/server/src/org/jsoup/parser/HtmlTreeBuilderState.java diff --git a/src/org/jsoup/parser/ParseError.java b/server/src/org/jsoup/parser/ParseError.java index dfa090051b..dfa090051b 100644 --- a/src/org/jsoup/parser/ParseError.java +++ b/server/src/org/jsoup/parser/ParseError.java diff --git a/src/org/jsoup/parser/ParseErrorList.java b/server/src/org/jsoup/parser/ParseErrorList.java index 3824ffbc4e..3824ffbc4e 100644 --- a/src/org/jsoup/parser/ParseErrorList.java +++ b/server/src/org/jsoup/parser/ParseErrorList.java diff --git a/src/org/jsoup/parser/Parser.java b/server/src/org/jsoup/parser/Parser.java index 2236219c06..2236219c06 100644 --- a/src/org/jsoup/parser/Parser.java +++ b/server/src/org/jsoup/parser/Parser.java diff --git a/src/org/jsoup/parser/Tag.java b/server/src/org/jsoup/parser/Tag.java index 40b7557b39..40b7557b39 100644 --- a/src/org/jsoup/parser/Tag.java +++ b/server/src/org/jsoup/parser/Tag.java diff --git a/src/org/jsoup/parser/Token.java b/server/src/org/jsoup/parser/Token.java index 9f4f9e250d..9f4f9e250d 100644 --- a/src/org/jsoup/parser/Token.java +++ b/server/src/org/jsoup/parser/Token.java diff --git a/src/org/jsoup/parser/TokenQueue.java b/server/src/org/jsoup/parser/TokenQueue.java index a2fdfe621a..a2fdfe621a 100644 --- a/src/org/jsoup/parser/TokenQueue.java +++ b/server/src/org/jsoup/parser/TokenQueue.java diff --git a/src/org/jsoup/parser/Tokeniser.java b/server/src/org/jsoup/parser/Tokeniser.java index ce6ee690d6..ce6ee690d6 100644 --- a/src/org/jsoup/parser/Tokeniser.java +++ b/server/src/org/jsoup/parser/Tokeniser.java diff --git a/src/org/jsoup/parser/TokeniserState.java b/server/src/org/jsoup/parser/TokeniserState.java index e3013c73e9..e3013c73e9 100644 --- a/src/org/jsoup/parser/TokeniserState.java +++ b/server/src/org/jsoup/parser/TokeniserState.java diff --git a/src/org/jsoup/parser/TreeBuilder.java b/server/src/org/jsoup/parser/TreeBuilder.java index e06caad501..e06caad501 100644 --- a/src/org/jsoup/parser/TreeBuilder.java +++ b/server/src/org/jsoup/parser/TreeBuilder.java diff --git a/src/org/jsoup/parser/XmlTreeBuilder.java b/server/src/org/jsoup/parser/XmlTreeBuilder.java index 3f03ad26ac..3f03ad26ac 100644 --- a/src/org/jsoup/parser/XmlTreeBuilder.java +++ b/server/src/org/jsoup/parser/XmlTreeBuilder.java diff --git a/src/org/jsoup/parser/package-info.java b/server/src/org/jsoup/parser/package-info.java index 168fdf4086..168fdf4086 100644 --- a/src/org/jsoup/parser/package-info.java +++ b/server/src/org/jsoup/parser/package-info.java diff --git a/src/org/jsoup/safety/Cleaner.java b/server/src/org/jsoup/safety/Cleaner.java index eda67df86b..eda67df86b 100644 --- a/src/org/jsoup/safety/Cleaner.java +++ b/server/src/org/jsoup/safety/Cleaner.java diff --git a/src/org/jsoup/safety/Whitelist.java b/server/src/org/jsoup/safety/Whitelist.java index 2c1150ce9e..2c1150ce9e 100644 --- a/src/org/jsoup/safety/Whitelist.java +++ b/server/src/org/jsoup/safety/Whitelist.java diff --git a/src/org/jsoup/safety/package-info.java b/server/src/org/jsoup/safety/package-info.java index ac890f0607..ac890f0607 100644 --- a/src/org/jsoup/safety/package-info.java +++ b/server/src/org/jsoup/safety/package-info.java diff --git a/src/org/jsoup/select/Collector.java b/server/src/org/jsoup/select/Collector.java index 8f01045768..8f01045768 100644 --- a/src/org/jsoup/select/Collector.java +++ b/server/src/org/jsoup/select/Collector.java diff --git a/src/org/jsoup/select/CombiningEvaluator.java b/server/src/org/jsoup/select/CombiningEvaluator.java index a31ed2636f..a31ed2636f 100644 --- a/src/org/jsoup/select/CombiningEvaluator.java +++ b/server/src/org/jsoup/select/CombiningEvaluator.java diff --git a/src/org/jsoup/select/Elements.java b/server/src/org/jsoup/select/Elements.java index 8302da1e53..8302da1e53 100644 --- a/src/org/jsoup/select/Elements.java +++ b/server/src/org/jsoup/select/Elements.java diff --git a/src/org/jsoup/select/Evaluator.java b/server/src/org/jsoup/select/Evaluator.java index 16a083bd77..16a083bd77 100644 --- a/src/org/jsoup/select/Evaluator.java +++ b/server/src/org/jsoup/select/Evaluator.java diff --git a/src/org/jsoup/select/NodeTraversor.java b/server/src/org/jsoup/select/NodeTraversor.java index 9bb081e56c..9bb081e56c 100644 --- a/src/org/jsoup/select/NodeTraversor.java +++ b/server/src/org/jsoup/select/NodeTraversor.java diff --git a/src/org/jsoup/select/NodeVisitor.java b/server/src/org/jsoup/select/NodeVisitor.java index 20112e8d29..20112e8d29 100644 --- a/src/org/jsoup/select/NodeVisitor.java +++ b/server/src/org/jsoup/select/NodeVisitor.java diff --git a/src/org/jsoup/select/QueryParser.java b/server/src/org/jsoup/select/QueryParser.java index d3cc36f91c..d3cc36f91c 100644 --- a/src/org/jsoup/select/QueryParser.java +++ b/server/src/org/jsoup/select/QueryParser.java diff --git a/src/org/jsoup/select/Selector.java b/server/src/org/jsoup/select/Selector.java index 8fc6286798..8fc6286798 100644 --- a/src/org/jsoup/select/Selector.java +++ b/server/src/org/jsoup/select/Selector.java diff --git a/src/org/jsoup/select/StructuralEvaluator.java b/server/src/org/jsoup/select/StructuralEvaluator.java index 69e8a62e58..69e8a62e58 100644 --- a/src/org/jsoup/select/StructuralEvaluator.java +++ b/server/src/org/jsoup/select/StructuralEvaluator.java diff --git a/src/org/jsoup/select/package-info.java b/server/src/org/jsoup/select/package-info.java index a6e6a2fa0f..a6e6a2fa0f 100644 --- a/src/org/jsoup/select/package-info.java +++ b/server/src/org/jsoup/select/package-info.java diff --git a/src/com/vaadin/shared/AbstractFieldState.java b/shared/src/com/vaadin/shared/AbstractFieldState.java index 33fc0ff92c..0389507f6c 100644 --- a/src/com/vaadin/shared/AbstractFieldState.java +++ b/shared/src/com/vaadin/shared/AbstractFieldState.java @@ -1,16 +1,26 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared; import com.vaadin.shared.ui.TabIndexState; -import com.vaadin.ui.AbstractField; /** - * Shared state for {@link AbstractField}. + * Shared state for {@link com.vaadin.ui.AbstractField}. * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 * */ @@ -73,7 +83,8 @@ public class AbstractFieldState extends ComponentState implements TabIndexState /** * Is the field required. Required fields must filled by the user. * - * See AbstractField#isRequired() for more information. + * See {@link com.vaadin.ui.AbstractField#isRequired()} for more + * information. * * @return <code>true</code> if the field is required, otherwise * <code>false</code>. @@ -85,7 +96,8 @@ public class AbstractFieldState extends ComponentState implements TabIndexState /** * Sets the field required. Required fields must filled by the user. * - * See AbstractField#setRequired(boolean) for more information. + * See {@link com.vaadin.ui.AbstractField#setRequired(boolean)} for more + * information. * * @param required * Is the field required. diff --git a/shared/src/com/vaadin/shared/ApplicationConstants.java b/shared/src/com/vaadin/shared/ApplicationConstants.java new file mode 100644 index 0000000000..31e633a210 --- /dev/null +++ b/shared/src/com/vaadin/shared/ApplicationConstants.java @@ -0,0 +1,50 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared; + +public class ApplicationConstants { + // This indicates the whole page is generated by us (not embedded) + public static final String GENERATED_BODY_CLASSNAME = "v-generated-body"; + + public static final String APP_REQUEST_PATH = "APP/"; + + public static final String UIDL_REQUEST_PATH = "UIDL/"; + + public static final String CONNECTOR_RESOURCE_PREFIX = APP_REQUEST_PATH + + "CONNECTOR"; + + public static final String APP_PROTOCOL_PREFIX = "app://"; + public static final String CONNECTOR_PROTOCOL_PREFIX = "connector://"; + public static final String UIDL_SECURITY_TOKEN_ID = "Vaadin-Security-Key"; + /** + * Name of the parameter used to transmit root ids back and forth + */ + public static final String ROOT_ID_PARAMETER = "rootId"; + + public static final String PARAM_UNLOADBURST = "onunloadburst"; + + @Deprecated + public static final String UPDATE_VARIABLE_INTERFACE = "v"; + @Deprecated + public static final String UPDATE_VARIABLE_METHOD = "v"; + + public static final String PORTLET_RESOUCE_URL_BASE = "portletAppURLBase"; + + public static final String V_RESOURCE_PATH = "v-resourcePath"; + + @Deprecated + public static final String DRAG_AND_DROP_CONNECTOR_ID = "DD"; +} diff --git a/src/com/vaadin/shared/ComponentState.java b/shared/src/com/vaadin/shared/ComponentState.java index a3d22e55bc..92afad0520 100644 --- a/src/com/vaadin/shared/ComponentState.java +++ b/shared/src/com/vaadin/shared/ComponentState.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared; @@ -10,7 +22,6 @@ import java.util.Set; import com.vaadin.shared.communication.SharedState; import com.vaadin.shared.communication.URLReference; -import com.vaadin.ui.Component; /** * Default shared state implementation for UI components. @@ -235,8 +246,8 @@ public class ComponentState extends SharedState { /** * Returns the visibility state of the component. Note that this state is * related to the component only, not its parent. This might differ from - * what {@link Component#isVisible()} returns as this takes the hierarchy - * into account. + * what {@link com.vaadin.ui.Component#isVisible()} returns as this takes + * the hierarchy into account. * * @return The visibility state. */ diff --git a/src/com/vaadin/shared/Connector.java b/shared/src/com/vaadin/shared/Connector.java index e09d4d51b7..5a00f6cca2 100644 --- a/src/com/vaadin/shared/Connector.java +++ b/shared/src/com/vaadin/shared/Connector.java @@ -1,13 +1,23 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared; import java.io.Serializable; import com.vaadin.shared.communication.SharedState; -import com.vaadin.terminal.gwt.client.ServerConnector; -import com.vaadin.terminal.gwt.server.ClientConnector; /** * Interface implemented by all classes that are capable of communicating with @@ -21,12 +31,12 @@ import com.vaadin.terminal.gwt.server.ClientConnector; * <p> * No classes should implement this interface directly, client side classes * wanting to communicate with server side should implement - * {@link ServerConnector} and server side classes should implement - * {@link ClientConnector}. + * {@link com.vaadin.terminal.gwt.client.ServerConnector} and server side + * classes should implement + * {@link com.vaadin.terminal.gwt.server.ClientConnector}. * </p> * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ public interface Connector extends Serializable { diff --git a/shared/src/com/vaadin/shared/EventId.java b/shared/src/com/vaadin/shared/EventId.java new file mode 100644 index 0000000000..47ecd9f6aa --- /dev/null +++ b/shared/src/com/vaadin/shared/EventId.java @@ -0,0 +1,24 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared; + +public interface EventId { + public static final String BLUR = "blur"; + public static final String FOCUS = "focus"; + public static final String CLICK_EVENT_IDENTIFIER = "click"; + public static final String LAYOUT_CLICK_EVENT_IDENTIFIER = "lClick"; + +} diff --git a/shared/src/com/vaadin/shared/JavaScriptConnectorState.java b/shared/src/com/vaadin/shared/JavaScriptConnectorState.java new file mode 100644 index 0000000000..d2e606d1c6 --- /dev/null +++ b/shared/src/com/vaadin/shared/JavaScriptConnectorState.java @@ -0,0 +1,26 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.shared; + +import java.util.Map; +import java.util.Set; + +public interface JavaScriptConnectorState { + public Set<String> getCallbackNames(); + + public Map<String, Set<String>> getRpcInterfaces(); +}
\ No newline at end of file diff --git a/src/com/vaadin/shared/JavaScriptExtensionState.java b/shared/src/com/vaadin/shared/JavaScriptExtensionState.java index 35a7213239..3e97294f7d 100644 --- a/src/com/vaadin/shared/JavaScriptExtensionState.java +++ b/shared/src/com/vaadin/shared/JavaScriptExtensionState.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared; diff --git a/shared/src/com/vaadin/shared/JsonConstants.java b/shared/src/com/vaadin/shared/JsonConstants.java new file mode 100644 index 0000000000..053b669583 --- /dev/null +++ b/shared/src/com/vaadin/shared/JsonConstants.java @@ -0,0 +1,33 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared; + +public class JsonConstants { + public static final String VTYPE_CONNECTOR = "c"; + public static final String VTYPE_BOOLEAN = "b"; + public static final String VTYPE_DOUBLE = "d"; + public static final String VTYPE_FLOAT = "f"; + public static final String VTYPE_LONG = "l"; + public static final String VTYPE_INTEGER = "i"; + public static final String VTYPE_STRING = "s"; + public static final String VTYPE_ARRAY = "a"; + public static final String VTYPE_STRINGARRAY = "S"; + public static final String VTYPE_MAP = "m"; + public static final String VTYPE_LIST = "L"; + public static final String VTYPE_SET = "q"; + public static final String VTYPE_NULL = "n"; + +} diff --git a/src/com/vaadin/shared/MouseEventDetails.java b/shared/src/com/vaadin/shared/MouseEventDetails.java index bc7ede4c60..ccfaac3a00 100644 --- a/src/com/vaadin/shared/MouseEventDetails.java +++ b/shared/src/com/vaadin/shared/MouseEventDetails.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared; diff --git a/src/com/vaadin/shared/VBrowserDetails.java b/shared/src/com/vaadin/shared/VBrowserDetails.java index 0cd9fe6436..7646d2ba01 100644 --- a/src/com/vaadin/shared/VBrowserDetails.java +++ b/shared/src/com/vaadin/shared/VBrowserDetails.java @@ -1,20 +1,30 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared; import java.io.Serializable; -import com.vaadin.terminal.gwt.client.BrowserInfo; -import com.vaadin.terminal.gwt.server.WebBrowser; - /** * Class that parses the user agent string from the browser and provides - * information about the browser. Used internally by {@link BrowserInfo} and - * {@link WebBrowser}. Should not be used directly. + * information about the browser. Used internally by + * {@link com.vaadin.terminal.gwt.client.BrowserInfo} and + * {@link com.vaadin.terminal.gwt.server.WebBrowser}. Should not be used + * directly. * * @author Vaadin Ltd. - * @version @VERSION@ * @since 6.3 */ public class VBrowserDetails implements Serializable { diff --git a/src/com/vaadin/Version.java b/shared/src/com/vaadin/shared/Version.java index eb6d73e7e0..9320698318 100644 --- a/src/com/vaadin/Version.java +++ b/shared/src/com/vaadin/shared/Version.java @@ -1,7 +1,19 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ -package com.vaadin; +package com.vaadin.shared; import java.io.Serializable; @@ -35,10 +47,10 @@ public class Version implements Serializable { /* Initialize version numbers from string replaced by build-script. */ static { - if ("@VERSION@".equals("@" + "VERSION" + "@")) { + if ("7.0.0.dev-20120816-12".equals("@" + "VERSION" + "@")) { VERSION = "9.9.9.INTERNAL-DEBUG-BUILD"; } else { - VERSION = "@VERSION@"; + VERSION = "7.0.0.dev-20120816-12"; } final String[] digits = VERSION.split("\\.", 4); VERSION_MAJOR = Integer.parseInt(digits[0]); diff --git a/shared/src/com/vaadin/shared/communication/ClientRpc.java b/shared/src/com/vaadin/shared/communication/ClientRpc.java new file mode 100644 index 0000000000..7096cba342 --- /dev/null +++ b/shared/src/com/vaadin/shared/communication/ClientRpc.java @@ -0,0 +1,35 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.shared.communication; + +import java.io.Serializable; + +/** + * Interface to be extended by all server to client RPC interfaces. + * + * On the server side, proxies of the interface can be obtained from + * AbstractComponent. On the client, RPC implementations can be registered with + * AbstractConnector.registerRpc(). + * + * Note: Currently, each RPC interface may not contain multiple methods with the + * same name, even if their parameter lists would differ. + * + * @since 7.0 + */ +public interface ClientRpc extends Serializable { + +} diff --git a/shared/src/com/vaadin/shared/communication/FieldRpc.java b/shared/src/com/vaadin/shared/communication/FieldRpc.java new file mode 100644 index 0000000000..5e87975d63 --- /dev/null +++ b/shared/src/com/vaadin/shared/communication/FieldRpc.java @@ -0,0 +1,31 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.communication; + +public class FieldRpc { + public interface FocusServerRpc extends ServerRpc { + public void focus(); + } + + public interface BlurServerRpc extends ServerRpc { + public void blur(); + } + + public interface FocusAndBlurServerRpc extends FocusServerRpc, + BlurServerRpc { + + } +} diff --git a/src/com/vaadin/shared/communication/MethodInvocation.java b/shared/src/com/vaadin/shared/communication/MethodInvocation.java index 589c7b5d9b..720ce09fcb 100644 --- a/src/com/vaadin/shared/communication/MethodInvocation.java +++ b/shared/src/com/vaadin/shared/communication/MethodInvocation.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.communication; diff --git a/shared/src/com/vaadin/shared/communication/ServerRpc.java b/shared/src/com/vaadin/shared/communication/ServerRpc.java new file mode 100644 index 0000000000..9e438f96b0 --- /dev/null +++ b/shared/src/com/vaadin/shared/communication/ServerRpc.java @@ -0,0 +1,27 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.shared.communication; + +import java.io.Serializable; + +/** + * Interface to be extended by all client to server RPC interfaces. + * + * @since 7.0 + */ +public interface ServerRpc extends Serializable { +} diff --git a/src/com/vaadin/shared/communication/SharedState.java b/shared/src/com/vaadin/shared/communication/SharedState.java index 2882b1ed07..841e4579a2 100644 --- a/src/com/vaadin/shared/communication/SharedState.java +++ b/shared/src/com/vaadin/shared/communication/SharedState.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.communication; @@ -7,16 +19,13 @@ package com.vaadin.shared.communication; import java.io.Serializable; import com.vaadin.shared.Connector; -import com.vaadin.terminal.gwt.client.ServerConnector; -import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector; /** * Interface to be implemented by all shared state classes used to communicate * basic information about a {@link Connector} from server to client. * - * Shared state classes have to be declared in client side packages to be - * accessible both for server and client code. They can be static nested classes - * of a {@link ServerConnector}. + * Shared state classes have to be declared in shared package to be accessible + * both for server and client code. * * Shared state objects are only sent from the server to the client, and any * modifications from the client should be performed via an RPC call that @@ -27,9 +36,9 @@ import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector; * arrays of these. * * On the client side the connector should override - * {@link AbstractComponentConnector#createState()} to create the correct state - * class and {@link AbstractComponentConnector#getState()} override the return - * type. + * {@link com.vaadin.terminal.gwt.client.ui.AbstractConnector#getState()} to + * return the correct state type. This automatically causes a correct state + * object to be created. * * Subclasses of a {@link Connector} using shared state should also provide a * subclass of the shared state class of the parent class to extend the state. A diff --git a/shared/src/com/vaadin/shared/communication/URLReference.java b/shared/src/com/vaadin/shared/communication/URLReference.java new file mode 100644 index 0000000000..4f04dba4e6 --- /dev/null +++ b/shared/src/com/vaadin/shared/communication/URLReference.java @@ -0,0 +1,43 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.communication; + +import java.io.Serializable; + +public class URLReference implements Serializable { + + private String URL; + + /** + * Returns the URL that this object refers to. + * <p> + * Note that the URL can use special protocols like theme:// + * + * @return The URL for this reference or null if unknown. + */ + public String getURL() { + return URL; + } + + /** + * Sets the URL that this object refers to + * + * @param URL + */ + public void setURL(String URL) { + this.URL = URL; + } +}
\ No newline at end of file diff --git a/shared/src/com/vaadin/shared/communication/UidlValue.java b/shared/src/com/vaadin/shared/communication/UidlValue.java new file mode 100644 index 0000000000..cc6ddc181e --- /dev/null +++ b/shared/src/com/vaadin/shared/communication/UidlValue.java @@ -0,0 +1,37 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.shared.communication; + +import java.io.Serializable; + +public class UidlValue implements Serializable { + private Object value; + + public UidlValue(Object value) { + this.value = value; + } + + public Object getValue() { + return value; + } + + @Override + public String toString() { + return "" + value; + } + +} diff --git a/shared/src/com/vaadin/shared/extension/javascriptmanager/ExecuteJavaScriptRpc.java b/shared/src/com/vaadin/shared/extension/javascriptmanager/ExecuteJavaScriptRpc.java new file mode 100644 index 0000000000..33c4c83667 --- /dev/null +++ b/shared/src/com/vaadin/shared/extension/javascriptmanager/ExecuteJavaScriptRpc.java @@ -0,0 +1,23 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.shared.extension.javascriptmanager; + +import com.vaadin.shared.communication.ClientRpc; + +public interface ExecuteJavaScriptRpc extends ClientRpc { + public void executeJavaScript(String script); +} diff --git a/shared/src/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java b/shared/src/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java new file mode 100644 index 0000000000..7d1938d735 --- /dev/null +++ b/shared/src/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java @@ -0,0 +1,34 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.shared.extension.javascriptmanager; + +import java.util.HashSet; +import java.util.Set; + +import com.vaadin.shared.communication.SharedState; + +public class JavaScriptManagerState extends SharedState { + private Set<String> names = new HashSet<String>(); + + public Set<String> getNames() { + return names; + } + + public void setNames(Set<String> names) { + this.names = names; + } +} diff --git a/shared/src/com/vaadin/shared/ui/AbstractLayoutState.java b/shared/src/com/vaadin/shared/ui/AbstractLayoutState.java new file mode 100644 index 0000000000..675d11d0b7 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/AbstractLayoutState.java @@ -0,0 +1,31 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui; + +import com.vaadin.shared.ComponentState; + +public class AbstractLayoutState extends ComponentState { + private int marginsBitmask; + + public int getMarginsBitmask() { + return marginsBitmask; + } + + public void setMarginsBitmask(int marginsBitmask) { + this.marginsBitmask = marginsBitmask; + } + +}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/AbstractMediaState.java b/shared/src/com/vaadin/shared/ui/AbstractMediaState.java index 8cee16575d..2731529caf 100644 --- a/src/com/vaadin/shared/ui/AbstractMediaState.java +++ b/shared/src/com/vaadin/shared/ui/AbstractMediaState.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.ui; diff --git a/src/com/vaadin/shared/ui/AlignmentInfo.java b/shared/src/com/vaadin/shared/ui/AlignmentInfo.java index ff800de646..ba926b8d46 100644 --- a/src/com/vaadin/shared/ui/AlignmentInfo.java +++ b/shared/src/com/vaadin/shared/ui/AlignmentInfo.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.ui; diff --git a/shared/src/com/vaadin/shared/ui/ClickRpc.java b/shared/src/com/vaadin/shared/ui/ClickRpc.java new file mode 100644 index 0000000000..048bb06035 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/ClickRpc.java @@ -0,0 +1,30 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui; + +import com.vaadin.shared.MouseEventDetails; +import com.vaadin.shared.communication.ServerRpc; + +public interface ClickRpc extends ServerRpc { + /** + * Called when a click event has occurred and there are server side + * listeners for the event. + * + * @param mouseDetails + * Details about the mouse when the event took place + */ + public void click(MouseEventDetails mouseDetails); +}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/Connect.java b/shared/src/com/vaadin/shared/ui/Connect.java index aa60096eb9..d54374a0ec 100644 --- a/src/com/vaadin/shared/ui/Connect.java +++ b/shared/src/com/vaadin/shared/ui/Connect.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.ui; @@ -9,16 +21,11 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import com.vaadin.shared.Connector; -import com.vaadin.terminal.gwt.server.ClientConnector; -import com.vaadin.terminal.gwt.widgetsetutils.CustomWidgetMapGenerator; -import com.vaadin.terminal.gwt.widgetsetutils.EagerWidgetMapGenerator; -import com.vaadin.terminal.gwt.widgetsetutils.LazyWidgetMapGenerator; -import com.vaadin.terminal.gwt.widgetsetutils.WidgetMapGenerator; /** * Annotation defining the server side connector that this ClientSideConnector * should connect to. The value must always by a class extending - * {@link ClientConnector}. + * {@link com.vaadin.terminal.gwt.server.ClientConnector}. * <p> * With this annotation client side Vaadin connector is marked to have a server * side counterpart. The value of the annotation is the class of server side @@ -39,8 +46,10 @@ public @interface Connect { * Depending on the used WidgetMap generator, these optional hints may be * used to define how the client side components are loaded by the browser. * The default is to eagerly load all widgets - * {@link EagerWidgetMapGenerator}, but if the {@link WidgetMapGenerator} is - * used by the widgetset, these load style hints are respected. + * {@link com.vaadin.terminal.gwt.widgetsetutils.EagerWidgetMapGenerator}, + * but if the + * {@link com.vaadin.terminal.gwt.widgetsetutils.WidgetMapGenerator} is used + * by the widgetset, these load style hints are respected. * <p> * Lazy loading of a widget implementation means the client side component * is not included in the initial JavaScript application loaded when the @@ -60,12 +69,15 @@ public @interface Connect { * the best of both worlds. * <p> * Fine tunings to widget loading can also be made by overriding - * {@link WidgetMapGenerator} in the GWT module. Tunings might be helpful if - * the end users have slow connections and especially if they have high - * latency in their network. The {@link CustomWidgetMapGenerator} is an - * abstract generator implementation for easy customization. Vaadin package - * also includes {@link LazyWidgetMapGenerator} that makes as many widgets - * lazily loaded as possible. + * {@link com.vaadin.terminal.gwt.widgetsetutils.WidgetMapGenerator} in the + * GWT module. Tunings might be helpful if the end users have slow + * connections and especially if they have high latency in their network. + * The + * {@link com.vaadin.terminal.gwt.widgetsetutils.CustomWidgetMapGenerator} + * is an abstract generator implementation for easy customization. Vaadin + * package also includes + * {@link com.vaadin.terminal.gwt.widgetsetutils.LazyWidgetMapGenerator} + * that makes as many widgets lazily loaded as possible. * * @since 6.4 * diff --git a/src/com/vaadin/shared/ui/JavaScriptComponentState.java b/shared/src/com/vaadin/shared/ui/JavaScriptComponentState.java index d20b4701c2..7a2eedd95d 100644 --- a/src/com/vaadin/shared/ui/JavaScriptComponentState.java +++ b/shared/src/com/vaadin/shared/ui/JavaScriptComponentState.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.ui; diff --git a/src/com/vaadin/shared/ui/LayoutClickRpc.java b/shared/src/com/vaadin/shared/ui/LayoutClickRpc.java index 48e62083b1..844b695761 100644 --- a/src/com/vaadin/shared/ui/LayoutClickRpc.java +++ b/shared/src/com/vaadin/shared/ui/LayoutClickRpc.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.ui; diff --git a/shared/src/com/vaadin/shared/ui/MediaControl.java b/shared/src/com/vaadin/shared/ui/MediaControl.java new file mode 100644 index 0000000000..7fcd85480a --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/MediaControl.java @@ -0,0 +1,36 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.shared.ui; + +import com.vaadin.shared.communication.ClientRpc; + +/** + * Server to client RPC interface for controlling playback of the media. + * + * @since 7.0 + */ +public interface MediaControl extends ClientRpc { + /** + * Start playing the media. + */ + public void play(); + + /** + * Pause playback of the media. + */ + public void pause(); +}
\ No newline at end of file diff --git a/shared/src/com/vaadin/shared/ui/TabIndexState.java b/shared/src/com/vaadin/shared/ui/TabIndexState.java new file mode 100644 index 0000000000..5f17b9b016 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/TabIndexState.java @@ -0,0 +1,40 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui; + +/** + * Interface implemented by state classes that support tab indexes. + * + * @author Vaadin Ltd + * @since 7.0.0 + * + */ +public interface TabIndexState { + /** + * Gets the <i>tabulator index</i> of the field. + * + * @return the tab index for the Field + */ + public int getTabIndex(); + + /** + * Sets the <i>tabulator index</i> of the field. + * + * @param tabIndex + * the tab index to set + */ + public void setTabIndex(int tabIndex); +} diff --git a/src/com/vaadin/shared/ui/VMarginInfo.java b/shared/src/com/vaadin/shared/ui/VMarginInfo.java index b17a03626f..9e9e0a4bb4 100644 --- a/src/com/vaadin/shared/ui/VMarginInfo.java +++ b/shared/src/com/vaadin/shared/ui/VMarginInfo.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.ui; diff --git a/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutServerRpc.java b/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutServerRpc.java new file mode 100644 index 0000000000..d0fb4abdbd --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutServerRpc.java @@ -0,0 +1,23 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.absolutelayout; + +import com.vaadin.shared.communication.ServerRpc; +import com.vaadin.shared.ui.LayoutClickRpc; + +public interface AbsoluteLayoutServerRpc extends LayoutClickRpc, ServerRpc { + +}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java b/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java index f57b2c0d67..a0e0f4d3c7 100644 --- a/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java +++ b/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.ui.absolutelayout; diff --git a/src/com/vaadin/shared/ui/button/ButtonServerRpc.java b/shared/src/com/vaadin/shared/ui/button/ButtonServerRpc.java index 0e55b07aea..8efc082ff0 100644 --- a/src/com/vaadin/shared/ui/button/ButtonServerRpc.java +++ b/shared/src/com/vaadin/shared/ui/button/ButtonServerRpc.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.ui.button; diff --git a/src/com/vaadin/shared/ui/button/ButtonState.java b/shared/src/com/vaadin/shared/ui/button/ButtonState.java index c423e18d46..7e76f5d1e8 100644 --- a/src/com/vaadin/shared/ui/button/ButtonState.java +++ b/shared/src/com/vaadin/shared/ui/button/ButtonState.java @@ -1,15 +1,27 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.ui.button; import com.vaadin.shared.ComponentState; import com.vaadin.shared.ui.TabIndexState; -import com.vaadin.ui.Button; /** - * Shared state for Button and NativeButton. + * Shared state for {@link com.vaadin.ui.Button} and + * {@link com.vaadin.ui.NativeButton}. * * @see ComponentState * @@ -51,7 +63,8 @@ public class ButtonState extends ComponentState implements TabIndexState { /** * Returns the key code for activating the button via a keyboard shortcut. * - * See {@link Button#setClickShortcut(int, int...)} for more information. + * See {@link com.vaadin.ui.Button#setClickShortcut(int, int...)} for more + * information. * * @return key code or 0 for none */ @@ -62,7 +75,8 @@ public class ButtonState extends ComponentState implements TabIndexState { /** * Sets the key code for activating the button via a keyboard shortcut. * - * See {@link Button#setClickShortcut(int, int...)} for more information. + * See {@link com.vaadin.ui.Button#setClickShortcut(int, int...)} for more + * information. * * @param clickShortcutKeyCode * key code or 0 for none diff --git a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java b/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java new file mode 100644 index 0000000000..933ab639dc --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java @@ -0,0 +1,23 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.checkbox; + +import com.vaadin.shared.MouseEventDetails; +import com.vaadin.shared.communication.ServerRpc; + +public interface CheckBoxServerRpc extends ServerRpc { + public void setChecked(boolean checked, MouseEventDetails mouseEventDetails); +}
\ No newline at end of file diff --git a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java b/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java new file mode 100644 index 0000000000..1f48b8fe9e --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java @@ -0,0 +1,31 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.checkbox; + +import com.vaadin.shared.AbstractFieldState; + +public class CheckBoxState extends AbstractFieldState { + private boolean checked = false; + + public boolean isChecked() { + return checked; + } + + public void setChecked(boolean checked) { + this.checked = checked; + } + +}
\ No newline at end of file diff --git a/shared/src/com/vaadin/shared/ui/combobox/ComboBoxConstants.java b/shared/src/com/vaadin/shared/ui/combobox/ComboBoxConstants.java new file mode 100644 index 0000000000..3c763d5a0c --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/combobox/ComboBoxConstants.java @@ -0,0 +1,25 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.combobox; + +@Deprecated +public class ComboBoxConstants { + @Deprecated + public static final String ATTR_INPUTPROMPT = "prompt"; + @Deprecated + public static final String ATTR_NO_TEXT_INPUT = "noInput"; + +} diff --git a/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutServerRpc.java b/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutServerRpc.java new file mode 100644 index 0000000000..abfe98760d --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutServerRpc.java @@ -0,0 +1,23 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.csslayout; + +import com.vaadin.shared.communication.ServerRpc; +import com.vaadin.shared.ui.LayoutClickRpc; + +public interface CssLayoutServerRpc extends LayoutClickRpc, ServerRpc { + +}
\ No newline at end of file diff --git a/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java b/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java new file mode 100644 index 0000000000..fc230a8e2f --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java @@ -0,0 +1,35 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.csslayout; + +import java.util.HashMap; +import java.util.Map; + +import com.vaadin.shared.Connector; +import com.vaadin.shared.ui.AbstractLayoutState; + +public class CssLayoutState extends AbstractLayoutState { + private Map<Connector, String> childCss = new HashMap<Connector, String>(); + + public Map<Connector, String> getChildCss() { + return childCss; + } + + public void setChildCss(Map<Connector, String> childCss) { + this.childCss = childCss; + } + +}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java b/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java index 4399e0ece1..0c1aa24161 100644 --- a/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java +++ b/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.ui.customlayout; diff --git a/shared/src/com/vaadin/shared/ui/datefield/DateFieldConstants.java b/shared/src/com/vaadin/shared/ui/datefield/DateFieldConstants.java new file mode 100644 index 0000000000..3be84839bb --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/datefield/DateFieldConstants.java @@ -0,0 +1,24 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.datefield; + +@Deprecated +public class DateFieldConstants { + + @Deprecated + public static final String ATTR_WEEK_NUMBERS = "wn"; + +} diff --git a/src/com/vaadin/shared/ui/dd/AcceptCriterion.java b/shared/src/com/vaadin/shared/ui/dd/AcceptCriterion.java index 19c2e5f273..e53f75e552 100644 --- a/src/com/vaadin/shared/ui/dd/AcceptCriterion.java +++ b/shared/src/com/vaadin/shared/ui/dd/AcceptCriterion.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.ui.dd; @@ -9,11 +21,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterion; - /** * An annotation type used to point the server side counterpart for client side - * a {@link VAcceptCriterion} class. + * a {@link com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterion} class. * <p> * Annotations are used at GWT compilation phase, so remember to rebuild your * widgetset if you do changes for {@link AcceptCriterion} mappings. diff --git a/shared/src/com/vaadin/shared/ui/dd/DragEventType.java b/shared/src/com/vaadin/shared/ui/dd/DragEventType.java new file mode 100644 index 0000000000..a6aef5c853 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/dd/DragEventType.java @@ -0,0 +1,21 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.shared.ui.dd; + +public enum DragEventType { + ENTER, LEAVE, OVER, DROP +}
\ No newline at end of file diff --git a/shared/src/com/vaadin/shared/ui/dd/HorizontalDropLocation.java b/shared/src/com/vaadin/shared/ui/dd/HorizontalDropLocation.java new file mode 100644 index 0000000000..040cadf7e6 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/dd/HorizontalDropLocation.java @@ -0,0 +1,20 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.dd; + +public enum HorizontalDropLocation { + LEFT, RIGHT, CENTER +} diff --git a/shared/src/com/vaadin/shared/ui/dd/VerticalDropLocation.java b/shared/src/com/vaadin/shared/ui/dd/VerticalDropLocation.java new file mode 100644 index 0000000000..733b27e3ad --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/dd/VerticalDropLocation.java @@ -0,0 +1,20 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.dd; + +public enum VerticalDropLocation { + TOP, BOTTOM, MIDDLE +} diff --git a/shared/src/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperConstants.java b/shared/src/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperConstants.java new file mode 100644 index 0000000000..44d5c29217 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperConstants.java @@ -0,0 +1,26 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.draganddropwrapper; + +@Deprecated +public class DragAndDropWrapperConstants { + + @Deprecated + public static final String HTML5_DATA_FLAVORS = "html5-data-flavors"; + @Deprecated + public static final String DRAG_START_MODE = "dragStartMode"; + +} diff --git a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedConstants.java b/shared/src/com/vaadin/shared/ui/embedded/EmbeddedConstants.java new file mode 100644 index 0000000000..e1abc88904 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/embedded/EmbeddedConstants.java @@ -0,0 +1,23 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.embedded; + +@Deprecated +public class EmbeddedConstants { + @Deprecated + public static final String ALTERNATE_TEXT = "alt"; + +} diff --git a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedServerRpc.java b/shared/src/com/vaadin/shared/ui/embedded/EmbeddedServerRpc.java new file mode 100644 index 0000000000..7e52aab985 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/embedded/EmbeddedServerRpc.java @@ -0,0 +1,22 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.embedded; + +import com.vaadin.shared.communication.ServerRpc; +import com.vaadin.shared.ui.ClickRpc; + +public interface EmbeddedServerRpc extends ClickRpc, ServerRpc { +}
\ No newline at end of file diff --git a/shared/src/com/vaadin/shared/ui/form/FormState.java b/shared/src/com/vaadin/shared/ui/form/FormState.java new file mode 100644 index 0000000000..7e8b36707a --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/form/FormState.java @@ -0,0 +1,41 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.form; + +import com.vaadin.shared.AbstractFieldState; +import com.vaadin.shared.Connector; + +public class FormState extends AbstractFieldState { + private Connector layout; + private Connector footer; + + public Connector getLayout() { + return layout; + } + + public void setLayout(Connector layout) { + this.layout = layout; + } + + public Connector getFooter() { + return footer; + } + + public void setFooter(Connector footer) { + this.footer = footer; + } + +}
\ No newline at end of file diff --git a/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutServerRpc.java b/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutServerRpc.java new file mode 100644 index 0000000000..c39df862c5 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutServerRpc.java @@ -0,0 +1,23 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.gridlayout; + +import com.vaadin.shared.communication.ServerRpc; +import com.vaadin.shared.ui.LayoutClickRpc; + +public interface GridLayoutServerRpc extends LayoutClickRpc, ServerRpc { + +}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java b/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java index 9179a61d27..d2e685d8cb 100644 --- a/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java +++ b/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.ui.gridlayout; diff --git a/src/com/vaadin/shared/ui/label/ContentMode.java b/shared/src/com/vaadin/shared/ui/label/ContentMode.java index a58f2cdebb..1927b6c01b 100644 --- a/src/com/vaadin/shared/ui/label/ContentMode.java +++ b/shared/src/com/vaadin/shared/ui/label/ContentMode.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.ui.label; diff --git a/shared/src/com/vaadin/shared/ui/label/LabelState.java b/shared/src/com/vaadin/shared/ui/label/LabelState.java new file mode 100644 index 0000000000..35e27bc63d --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/label/LabelState.java @@ -0,0 +1,40 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.label; + +import com.vaadin.shared.ComponentState; + +public class LabelState extends ComponentState { + private ContentMode contentMode = ContentMode.TEXT; + private String text = ""; + + public ContentMode getContentMode() { + return contentMode; + } + + public void setContentMode(ContentMode contentMode) { + this.contentMode = contentMode; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } + +} diff --git a/shared/src/com/vaadin/shared/ui/menubar/MenuBarConstants.java b/shared/src/com/vaadin/shared/ui/menubar/MenuBarConstants.java new file mode 100644 index 0000000000..153750b1c6 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/menubar/MenuBarConstants.java @@ -0,0 +1,35 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.menubar; + +@Deprecated +public class MenuBarConstants { + @Deprecated + public static final String ATTRIBUTE_CHECKED = "checked"; + @Deprecated + public static final String ATTRIBUTE_ITEM_DESCRIPTION = "description"; + @Deprecated + public static final String ATTRIBUTE_ITEM_ICON = "icon"; + @Deprecated + public static final String ATTRIBUTE_ITEM_DISABLED = "disabled"; + @Deprecated + public static final String ATTRIBUTE_ITEM_STYLE = "style"; + @Deprecated + public static final String HTML_CONTENT_ALLOWED = "usehtml"; + @Deprecated + public static final String OPEN_ROOT_MENU_ON_HOWER = "ormoh"; + +} diff --git a/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java b/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java new file mode 100644 index 0000000000..fd28cf4d6e --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java @@ -0,0 +1,22 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.optiongroup; + +public class OptionGroupConstants { + public static final String HTML_CONTENT_ALLOWED = "usehtml"; + public static final String ATTRIBUTE_OPTION_DISABLED = "disabled"; + +} diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java b/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java new file mode 100644 index 0000000000..893d7b5dc3 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java @@ -0,0 +1,24 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.orderedlayout; + +import com.vaadin.shared.communication.ServerRpc; +import com.vaadin.shared.ui.LayoutClickRpc; + +public interface AbstractOrderedLayoutServerRpc extends LayoutClickRpc, + ServerRpc { + +}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java b/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java index c18a128912..235c9eab13 100644 --- a/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java +++ b/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.ui.orderedlayout; diff --git a/shared/src/com/vaadin/shared/ui/panel/PanelServerRpc.java b/shared/src/com/vaadin/shared/ui/panel/PanelServerRpc.java new file mode 100644 index 0000000000..ba42a2f452 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/panel/PanelServerRpc.java @@ -0,0 +1,23 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.panel; + +import com.vaadin.shared.communication.ServerRpc; +import com.vaadin.shared.ui.ClickRpc; + +public interface PanelServerRpc extends ClickRpc, ServerRpc { + +}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/panel/PanelState.java b/shared/src/com/vaadin/shared/ui/panel/PanelState.java index ed31ed1ea3..d432de97ad 100644 --- a/src/com/vaadin/shared/ui/panel/PanelState.java +++ b/shared/src/com/vaadin/shared/ui/panel/PanelState.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.ui.panel; diff --git a/shared/src/com/vaadin/shared/ui/root/PageClientRpc.java b/shared/src/com/vaadin/shared/ui/root/PageClientRpc.java new file mode 100644 index 0000000000..b7d9419057 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/root/PageClientRpc.java @@ -0,0 +1,25 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.shared.ui.root; + +import com.vaadin.shared.communication.ClientRpc; + +public interface PageClientRpc extends ClientRpc { + + public void setTitle(String title); + +} diff --git a/shared/src/com/vaadin/shared/ui/root/RootConstants.java b/shared/src/com/vaadin/shared/ui/root/RootConstants.java new file mode 100644 index 0000000000..bc4f6017f6 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/root/RootConstants.java @@ -0,0 +1,48 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.root; + +public class RootConstants { + /** + * Attribute name for the lazy resize setting . + */ + @Deprecated + public static final String RESIZE_LAZY = "rL"; + @Deprecated + public static final String BROWSER_HEIGHT_VAR = "browserHeight"; + + @Deprecated + public static final String BROWSER_WIDTH_VAR = "browserWidth"; + @Deprecated + public static final String NOTIFICATION_HTML_CONTENT_NOT_ALLOWED = "useplain"; + + @Deprecated + public static final String FRAGMENT_VARIABLE = "fragment"; + + @Deprecated + public static final String ATTRIBUTE_NOTIFICATION_STYLE = "style"; + @Deprecated + public static final String ATTRIBUTE_NOTIFICATION_CAPTION = "caption"; + @Deprecated + public static final String ATTRIBUTE_NOTIFICATION_MESSAGE = "message"; + @Deprecated + public static final String ATTRIBUTE_NOTIFICATION_ICON = "icon"; + @Deprecated + public static final String ATTRIBUTE_NOTIFICATION_POSITION = "position"; + @Deprecated + public static final String ATTRIBUTE_NOTIFICATION_DELAY = "delay"; + +} diff --git a/shared/src/com/vaadin/shared/ui/root/RootServerRpc.java b/shared/src/com/vaadin/shared/ui/root/RootServerRpc.java new file mode 100644 index 0000000000..f074a8d3cc --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/root/RootServerRpc.java @@ -0,0 +1,23 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.root; + +import com.vaadin.shared.communication.ServerRpc; +import com.vaadin.shared.ui.ClickRpc; + +public interface RootServerRpc extends ClickRpc, ServerRpc { + +}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/root/RootState.java b/shared/src/com/vaadin/shared/ui/root/RootState.java index 31c5a8f872..07c71c8167 100644 --- a/src/com/vaadin/shared/ui/root/RootState.java +++ b/shared/src/com/vaadin/shared/ui/root/RootState.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.ui.root; diff --git a/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelRpc.java b/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelRpc.java index e2ebcb0de3..92d5b9c2cb 100644 --- a/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelRpc.java +++ b/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelRpc.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.ui.splitpanel; diff --git a/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java b/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java index d94d5d8608..46eb851edd 100644 --- a/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java +++ b/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.ui.splitpanel; diff --git a/shared/src/com/vaadin/shared/ui/table/TableConstants.java b/shared/src/com/vaadin/shared/ui/table/TableConstants.java new file mode 100644 index 0000000000..084f436b53 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/table/TableConstants.java @@ -0,0 +1,36 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.table; + +public class TableConstants { + public static final String ITEM_CLICK_EVENT_ID = "itemClick"; + public static final String HEADER_CLICK_EVENT_ID = "handleHeaderClick"; + public static final String FOOTER_CLICK_EVENT_ID = "handleFooterClick"; + public static final String COLUMN_RESIZE_EVENT_ID = "columnResize"; + public static final String COLUMN_REORDER_EVENT_ID = "columnReorder"; + + @Deprecated + public static final String ATTRIBUTE_PAGEBUFFER_FIRST = "pb-ft"; + @Deprecated + public static final String ATTRIBUTE_PAGEBUFFER_LAST = "pb-l"; + /** + * Tell the client that old keys are no longer valid because the server has + * cleared its key map. + */ + @Deprecated + public static final String ATTRIBUTE_KEY_MAPPER_RESET = "clearKeyMap"; + +} diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetBaseConstants.java b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetBaseConstants.java new file mode 100644 index 0000000000..3c6c9a5207 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetBaseConstants.java @@ -0,0 +1,31 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.tabsheet; + +@Deprecated +public class TabsheetBaseConstants { + @Deprecated + public static final String ATTRIBUTE_TAB_DISABLED = "disabled"; + @Deprecated + public static final String ATTRIBUTE_TAB_DESCRIPTION = "description"; + @Deprecated + public static final String ATTRIBUTE_TAB_ERROR_MESSAGE = "error"; + @Deprecated + public static final String ATTRIBUTE_TAB_CAPTION = "caption"; + @Deprecated + public static final String ATTRIBUTE_TAB_ICON = "icon"; + +} diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetConstants.java b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetConstants.java new file mode 100644 index 0000000000..bd00f653a4 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetConstants.java @@ -0,0 +1,23 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.tabsheet; + +@Deprecated +public class TabsheetConstants { + @Deprecated + public static final String TAB_STYLE_NAME = "tabstyle"; + +} diff --git a/src/com/vaadin/shared/ui/textarea/TextAreaState.java b/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java index 3b3bd42f87..31cec77554 100644 --- a/src/com/vaadin/shared/ui/textarea/TextAreaState.java +++ b/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.ui.textarea; diff --git a/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java b/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java index d980eccae2..cd3562606d 100644 --- a/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java +++ b/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.ui.textfield; diff --git a/shared/src/com/vaadin/shared/ui/textfield/TextFieldConstants.java b/shared/src/com/vaadin/shared/ui/textfield/TextFieldConstants.java new file mode 100644 index 0000000000..e7835d926b --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/textfield/TextFieldConstants.java @@ -0,0 +1,26 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.textfield; + +public class TextFieldConstants { + public static final String VAR_CUR_TEXT = "curText"; + public static final String ATTR_NO_VALUE_CHANGE_BETWEEN_PAINTS = "nvc"; + public static final String ATTR_TEXTCHANGE_TIMEOUT = "iet"; + public static final String VAR_CURSOR = "c"; + public static final String ATTR_TEXTCHANGE_EVENTMODE = "iem"; + public static final String TEXTCHANGE_MODE_EAGER = "EAGER"; + +} diff --git a/shared/src/com/vaadin/shared/ui/tree/TreeConstants.java b/shared/src/com/vaadin/shared/ui/tree/TreeConstants.java new file mode 100644 index 0000000000..c2f301d517 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/tree/TreeConstants.java @@ -0,0 +1,35 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.tree; + +@Deprecated +public class TreeConstants { + + @Deprecated + public static final String ATTRIBUTE_NODE_STYLE = "style"; + @Deprecated + public static final String ATTRIBUTE_NODE_CAPTION = "caption"; + @Deprecated + public static final String ATTRIBUTE_NODE_ICON = "icon"; + + @Deprecated + public static final String ATTRIBUTE_ACTION_CAPTION = "caption"; + @Deprecated + public static final String ATTRIBUTE_ACTION_ICON = ATTRIBUTE_NODE_ICON; + + public static final String ITEM_CLICK_EVENT_ID = "itemClick"; + +} diff --git a/shared/src/com/vaadin/shared/ui/treetable/TreeTableConstants.java b/shared/src/com/vaadin/shared/ui/treetable/TreeTableConstants.java new file mode 100644 index 0000000000..08d26f3a13 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/treetable/TreeTableConstants.java @@ -0,0 +1,23 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.treetable; + +@Deprecated +public class TreeTableConstants { + @Deprecated + public static final String ATTRIBUTE_HIERARCHY_COLUMN_INDEX = "hci"; + +} diff --git a/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectConstants.java b/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectConstants.java new file mode 100644 index 0000000000..f6805d6aee --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectConstants.java @@ -0,0 +1,25 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.twincolselect; + +@Deprecated +public class TwinColSelectConstants { + @Deprecated + public static final String ATTRIBUTE_LEFT_CAPTION = "lc"; + @Deprecated + public static final String ATTRIBUTE_RIGHT_CAPTION = "rc"; + +} diff --git a/shared/src/com/vaadin/shared/ui/video/VideoState.java b/shared/src/com/vaadin/shared/ui/video/VideoState.java new file mode 100644 index 0000000000..695d495e16 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/video/VideoState.java @@ -0,0 +1,32 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.video; + +import com.vaadin.shared.communication.URLReference; +import com.vaadin.shared.ui.AbstractMediaState; + +public class VideoState extends AbstractMediaState { + private URLReference poster; + + public URLReference getPoster() { + return poster; + } + + public void setPoster(URLReference poster) { + this.poster = poster; + } + +} diff --git a/shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java b/shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java new file mode 100644 index 0000000000..b4ac869ac4 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java @@ -0,0 +1,22 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ +package com.vaadin.shared.ui.window; + +import com.vaadin.shared.communication.ServerRpc; +import com.vaadin.shared.ui.ClickRpc; + +public interface WindowServerRpc extends ClickRpc, ServerRpc { +}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/window/WindowState.java b/shared/src/com/vaadin/shared/ui/window/WindowState.java index 428bd75167..526c5dacb0 100644 --- a/src/com/vaadin/shared/ui/window/WindowState.java +++ b/shared/src/com/vaadin/shared/ui/window/WindowState.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.shared.ui.window; diff --git a/src/com/google/gwt/dom/client/VaadinDOMImplSafari.java b/src/com/google/gwt/dom/client/VaadinDOMImplSafari.java deleted file mode 100644 index 6e9cc81f43..0000000000 --- a/src/com/google/gwt/dom/client/VaadinDOMImplSafari.java +++ /dev/null @@ -1,26 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.google.gwt.dom.client; - -/** - * Overridden to workaround GWT issue #6194. Remove this when updating to a - * newer GWT that fixes the problem (2.3.0 possibly). Must be in this package as - * the whole DOMImpl hierarchy is package private and I really did not want to - * copy all the parent classes into this one... - */ -class VaadinDOMImplSafari extends DOMImplSafari { - @Override - public int getAbsoluteLeft(Element elem) { - // Chrome returns a float in certain cases (at least when zoom != 100%). - // The |0 ensures it is converted to an int. - return super.getAbsoluteLeft(elem) | 0; - } - - @Override - public int getAbsoluteTop(Element elem) { - // Chrome returns a float in certain cases (at least when zoom != 100%). - // The |0 ensures it is converted to an int. - return super.getAbsoluteTop(elem) | 0; - } -} diff --git a/src/com/vaadin/annotations/AutoGenerated.java b/src/com/vaadin/annotations/AutoGenerated.java deleted file mode 100644 index 72c9b62a91..0000000000 --- a/src/com/vaadin/annotations/AutoGenerated.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.annotations; - -/** - * Marker annotation for automatically generated code elements. - * - * These elements may be modified or removed by code generation. - * - * @author Vaadin Ltd. - * @version - * @VERSION@ - * @since 6.0 - */ -public @interface AutoGenerated { - -} diff --git a/src/com/vaadin/annotations/Theme.java b/src/com/vaadin/annotations/Theme.java deleted file mode 100644 index 7c62b07741..0000000000 --- a/src/com/vaadin/annotations/Theme.java +++ /dev/null @@ -1,24 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.annotations; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import com.vaadin.ui.Root; - -/** - * Defines a specific theme for a {@link Root}. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -public @interface Theme { - /** - * @return simple name of the theme - */ - public String value(); -} diff --git a/src/com/vaadin/annotations/Widgetset.java b/src/com/vaadin/annotations/Widgetset.java deleted file mode 100644 index 99113f73f9..0000000000 --- a/src/com/vaadin/annotations/Widgetset.java +++ /dev/null @@ -1,25 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.annotations; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import com.vaadin.ui.Root; - -/** - * Defines a specific theme for a {@link Root}. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -public @interface Widgetset { - /** - * @return name of the widgetset - */ - public String value(); - -} diff --git a/src/com/vaadin/data/fieldgroup/Caption.java b/src/com/vaadin/data/fieldgroup/Caption.java deleted file mode 100644 index b990b720cd..0000000000 --- a/src/com/vaadin/data/fieldgroup/Caption.java +++ /dev/null @@ -1,15 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.data.fieldgroup; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target({ ElementType.FIELD }) -@Retention(RetentionPolicy.RUNTIME) -public @interface Caption { - String value(); -} diff --git a/src/com/vaadin/data/fieldgroup/PropertyId.java b/src/com/vaadin/data/fieldgroup/PropertyId.java deleted file mode 100644 index 268047401d..0000000000 --- a/src/com/vaadin/data/fieldgroup/PropertyId.java +++ /dev/null @@ -1,15 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.data.fieldgroup; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target({ ElementType.FIELD }) -@Retention(RetentionPolicy.RUNTIME) -public @interface PropertyId { - String value(); -} diff --git a/src/com/vaadin/data/util/converter/ConverterFactory.java b/src/com/vaadin/data/util/converter/ConverterFactory.java deleted file mode 100644 index ed4ab41ac0..0000000000 --- a/src/com/vaadin/data/util/converter/ConverterFactory.java +++ /dev/null @@ -1,23 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.data.util.converter; - -import java.io.Serializable; - -/** - * Factory interface for providing Converters based on a presentation type and a - * model type. - * - * @author Vaadin Ltd. - * @version - * @VERSION@ - * @since 7.0 - * - */ -public interface ConverterFactory extends Serializable { - public <PRESENTATION, MODEL> Converter<PRESENTATION, MODEL> createConverter( - Class<PRESENTATION> presentationType, Class<MODEL> modelType); - -} 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 deleted file mode 100644 index 84af9d5c97..0000000000 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java +++ /dev/null @@ -1,16 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.data.util.sqlcontainer.query.generator.filter; - -import java.io.Serializable; - -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; - -public interface FilterTranslator extends Serializable { - public boolean translatesFilter(Filter filter); - - public String getWhereStringForFilter(Filter filter, StatementHelper sh); - -} diff --git a/src/com/vaadin/event/ComponentEventListener.java b/src/com/vaadin/event/ComponentEventListener.java deleted file mode 100644 index 21fe8683f6..0000000000 --- a/src/com/vaadin/event/ComponentEventListener.java +++ /dev/null @@ -1,11 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.event; - -import java.io.Serializable; -import java.util.EventListener; - -public interface ComponentEventListener extends EventListener, Serializable { - -}
\ No newline at end of file diff --git a/src/com/vaadin/shared/EventId.java b/src/com/vaadin/shared/EventId.java deleted file mode 100644 index 616d37dcd0..0000000000 --- a/src/com/vaadin/shared/EventId.java +++ /dev/null @@ -1,9 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.shared; - -public interface EventId { - public static final String BLUR = "blur"; - public static final String FOCUS = "focus"; -} diff --git a/src/com/vaadin/shared/JavaScriptConnectorState.java b/src/com/vaadin/shared/JavaScriptConnectorState.java deleted file mode 100644 index 8371623e68..0000000000 --- a/src/com/vaadin/shared/JavaScriptConnectorState.java +++ /dev/null @@ -1,14 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.shared; - -import java.util.Map; -import java.util.Set; - -public interface JavaScriptConnectorState { - public Set<String> getCallbackNames(); - - public Map<String, Set<String>> getRpcInterfaces(); -}
\ No newline at end of file diff --git a/src/com/vaadin/shared/communication/ClientRpc.java b/src/com/vaadin/shared/communication/ClientRpc.java deleted file mode 100644 index d49bc05260..0000000000 --- a/src/com/vaadin/shared/communication/ClientRpc.java +++ /dev/null @@ -1,23 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.shared.communication; - -import java.io.Serializable; - -/** - * Interface to be extended by all server to client RPC interfaces. - * - * On the server side, proxies of the interface can be obtained from - * AbstractComponent. On the client, RPC implementations can be registered with - * AbstractConnector.registerRpc(). - * - * Note: Currently, each RPC interface may not contain multiple methods with the - * same name, even if their parameter lists would differ. - * - * @since 7.0 - */ -public interface ClientRpc extends Serializable { - -} diff --git a/src/com/vaadin/shared/communication/FieldRpc.java b/src/com/vaadin/shared/communication/FieldRpc.java deleted file mode 100644 index 33e6f01028..0000000000 --- a/src/com/vaadin/shared/communication/FieldRpc.java +++ /dev/null @@ -1,19 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.shared.communication; - -public class FieldRpc { - public interface FocusServerRpc extends ServerRpc { - public void focus(); - } - - public interface BlurServerRpc extends ServerRpc { - public void blur(); - } - - public interface FocusAndBlurServerRpc extends FocusServerRpc, - BlurServerRpc { - - } -} diff --git a/src/com/vaadin/shared/communication/ServerRpc.java b/src/com/vaadin/shared/communication/ServerRpc.java deleted file mode 100644 index 5ee42a4bef..0000000000 --- a/src/com/vaadin/shared/communication/ServerRpc.java +++ /dev/null @@ -1,15 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.shared.communication; - -import java.io.Serializable; - -/** - * Interface to be extended by all client to server RPC interfaces. - * - * @since 7.0 - */ -public interface ServerRpc extends Serializable { -} diff --git a/src/com/vaadin/shared/communication/URLReference.java b/src/com/vaadin/shared/communication/URLReference.java deleted file mode 100644 index a4868cdb57..0000000000 --- a/src/com/vaadin/shared/communication/URLReference.java +++ /dev/null @@ -1,31 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.shared.communication; - -import java.io.Serializable; - -public class URLReference implements Serializable { - - private String URL; - - /** - * Returns the URL that this object refers to. - * <p> - * Note that the URL can use special protocols like theme:// - * - * @return The URL for this reference or null if unknown. - */ - public String getURL() { - return URL; - } - - /** - * Sets the URL that this object refers to - * - * @param URL - */ - public void setURL(String URL) { - this.URL = URL; - } -}
\ No newline at end of file diff --git a/src/com/vaadin/shared/communication/UidlValue.java b/src/com/vaadin/shared/communication/UidlValue.java deleted file mode 100644 index 0314488ef3..0000000000 --- a/src/com/vaadin/shared/communication/UidlValue.java +++ /dev/null @@ -1,25 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.shared.communication; - -import java.io.Serializable; - -public class UidlValue implements Serializable { - private Object value; - - public UidlValue(Object value) { - this.value = value; - } - - public Object getValue() { - return value; - } - - @Override - public String toString() { - return "" + value; - } - -} diff --git a/src/com/vaadin/shared/extension/javascriptmanager/ExecuteJavaScriptRpc.java b/src/com/vaadin/shared/extension/javascriptmanager/ExecuteJavaScriptRpc.java deleted file mode 100644 index 097913c37f..0000000000 --- a/src/com/vaadin/shared/extension/javascriptmanager/ExecuteJavaScriptRpc.java +++ /dev/null @@ -1,11 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.shared.extension.javascriptmanager; - -import com.vaadin.shared.communication.ClientRpc; - -public interface ExecuteJavaScriptRpc extends ClientRpc { - public void executeJavaScript(String script); -} diff --git a/src/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java b/src/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java deleted file mode 100644 index 85647d0abd..0000000000 --- a/src/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java +++ /dev/null @@ -1,22 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.shared.extension.javascriptmanager; - -import java.util.HashSet; -import java.util.Set; - -import com.vaadin.shared.communication.SharedState; - -public class JavaScriptManagerState extends SharedState { - private Set<String> names = new HashSet<String>(); - - public Set<String> getNames() { - return names; - } - - public void setNames(Set<String> names) { - this.names = names; - } -} diff --git a/src/com/vaadin/shared/ui/AbstractLayoutState.java b/src/com/vaadin/shared/ui/AbstractLayoutState.java deleted file mode 100644 index 9eaa11a9c6..0000000000 --- a/src/com/vaadin/shared/ui/AbstractLayoutState.java +++ /dev/null @@ -1,19 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.shared.ui; - -import com.vaadin.shared.ComponentState; - -public class AbstractLayoutState extends ComponentState { - private int marginsBitmask; - - public int getMarginsBitmask() { - return marginsBitmask; - } - - public void setMarginsBitmask(int marginsBitmask) { - this.marginsBitmask = marginsBitmask; - } - -}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/ClickRpc.java b/src/com/vaadin/shared/ui/ClickRpc.java deleted file mode 100644 index 61bde1a5e9..0000000000 --- a/src/com/vaadin/shared/ui/ClickRpc.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.shared.ui; - -import com.vaadin.shared.MouseEventDetails; -import com.vaadin.shared.communication.ServerRpc; - -public interface ClickRpc extends ServerRpc { - /** - * Called when a click event has occurred and there are server side - * listeners for the event. - * - * @param mouseDetails - * Details about the mouse when the event took place - */ - public void click(MouseEventDetails mouseDetails); -}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/MediaControl.java b/src/com/vaadin/shared/ui/MediaControl.java deleted file mode 100644 index 0a608a1685..0000000000 --- a/src/com/vaadin/shared/ui/MediaControl.java +++ /dev/null @@ -1,24 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.shared.ui; - -import com.vaadin.shared.communication.ClientRpc; - -/** - * Server to client RPC interface for controlling playback of the media. - * - * @since 7.0 - */ -public interface MediaControl extends ClientRpc { - /** - * Start playing the media. - */ - public void play(); - - /** - * Pause playback of the media. - */ - public void pause(); -}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/TabIndexState.java b/src/com/vaadin/shared/ui/TabIndexState.java deleted file mode 100644 index 774c9b33a0..0000000000 --- a/src/com/vaadin/shared/ui/TabIndexState.java +++ /dev/null @@ -1,29 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.shared.ui; - -/** - * Interface implemented by state classes that support tab indexes. - * - * @author Vaadin Ltd - * @version @VERSION@ - * @since 7.0.0 - * - */ -public interface TabIndexState { - /** - * Gets the <i>tabulator index</i> of the field. - * - * @return the tab index for the Field - */ - public int getTabIndex(); - - /** - * Sets the <i>tabulator index</i> of the field. - * - * @param tabIndex - * the tab index to set - */ - public void setTabIndex(int tabIndex); -} diff --git a/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutServerRpc.java b/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutServerRpc.java deleted file mode 100644 index 7d1f75f833..0000000000 --- a/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutServerRpc.java +++ /dev/null @@ -1,11 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.shared.ui.absolutelayout; - -import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.shared.ui.LayoutClickRpc; - -public interface AbsoluteLayoutServerRpc extends LayoutClickRpc, ServerRpc { - -}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java b/src/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java deleted file mode 100644 index fafd9bf2ff..0000000000 --- a/src/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java +++ /dev/null @@ -1,11 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.shared.ui.checkbox; - -import com.vaadin.shared.MouseEventDetails; -import com.vaadin.shared.communication.ServerRpc; - -public interface CheckBoxServerRpc extends ServerRpc { - public void setChecked(boolean checked, MouseEventDetails mouseEventDetails); -}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java b/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java deleted file mode 100644 index d43959327c..0000000000 --- a/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java +++ /dev/null @@ -1,19 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.shared.ui.checkbox; - -import com.vaadin.shared.AbstractFieldState; - -public class CheckBoxState extends AbstractFieldState { - private boolean checked = false; - - public boolean isChecked() { - return checked; - } - - public void setChecked(boolean checked) { - this.checked = checked; - } - -}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/csslayout/CssLayoutServerRpc.java b/src/com/vaadin/shared/ui/csslayout/CssLayoutServerRpc.java deleted file mode 100644 index 0672aa32ce..0000000000 --- a/src/com/vaadin/shared/ui/csslayout/CssLayoutServerRpc.java +++ /dev/null @@ -1,11 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.shared.ui.csslayout; - -import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.shared.ui.LayoutClickRpc; - -public interface CssLayoutServerRpc extends LayoutClickRpc, ServerRpc { - -}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java b/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java deleted file mode 100644 index 03b4a947f5..0000000000 --- a/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java +++ /dev/null @@ -1,23 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.shared.ui.csslayout; - -import java.util.HashMap; -import java.util.Map; - -import com.vaadin.shared.Connector; -import com.vaadin.shared.ui.AbstractLayoutState; - -public class CssLayoutState extends AbstractLayoutState { - private Map<Connector, String> childCss = new HashMap<Connector, String>(); - - public Map<Connector, String> getChildCss() { - return childCss; - } - - public void setChildCss(Map<Connector, String> childCss) { - this.childCss = childCss; - } - -}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/dd/DragEventType.java b/src/com/vaadin/shared/ui/dd/DragEventType.java deleted file mode 100644 index e03b347ada..0000000000 --- a/src/com/vaadin/shared/ui/dd/DragEventType.java +++ /dev/null @@ -1,9 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.shared.ui.dd; - -public enum DragEventType { - ENTER, LEAVE, OVER, DROP -}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/dd/HorizontalDropLocation.java b/src/com/vaadin/shared/ui/dd/HorizontalDropLocation.java deleted file mode 100644 index 065b880953..0000000000 --- a/src/com/vaadin/shared/ui/dd/HorizontalDropLocation.java +++ /dev/null @@ -1,8 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.shared.ui.dd; - -public enum HorizontalDropLocation { - LEFT, RIGHT, CENTER -} diff --git a/src/com/vaadin/shared/ui/dd/VerticalDropLocation.java b/src/com/vaadin/shared/ui/dd/VerticalDropLocation.java deleted file mode 100644 index 2658921124..0000000000 --- a/src/com/vaadin/shared/ui/dd/VerticalDropLocation.java +++ /dev/null @@ -1,8 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.shared.ui.dd; - -public enum VerticalDropLocation { - TOP, BOTTOM, MIDDLE -} diff --git a/src/com/vaadin/shared/ui/embedded/EmbeddedServerRpc.java b/src/com/vaadin/shared/ui/embedded/EmbeddedServerRpc.java deleted file mode 100644 index 27af1623b0..0000000000 --- a/src/com/vaadin/shared/ui/embedded/EmbeddedServerRpc.java +++ /dev/null @@ -1,10 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.shared.ui.embedded; - -import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.shared.ui.ClickRpc; - -public interface EmbeddedServerRpc extends ClickRpc, ServerRpc { -}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/form/FormState.java b/src/com/vaadin/shared/ui/form/FormState.java deleted file mode 100644 index a3035491bf..0000000000 --- a/src/com/vaadin/shared/ui/form/FormState.java +++ /dev/null @@ -1,29 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.shared.ui.form; - -import com.vaadin.shared.AbstractFieldState; -import com.vaadin.shared.Connector; - -public class FormState extends AbstractFieldState { - private Connector layout; - private Connector footer; - - public Connector getLayout() { - return layout; - } - - public void setLayout(Connector layout) { - this.layout = layout; - } - - public Connector getFooter() { - return footer; - } - - public void setFooter(Connector footer) { - this.footer = footer; - } - -}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/gridlayout/GridLayoutServerRpc.java b/src/com/vaadin/shared/ui/gridlayout/GridLayoutServerRpc.java deleted file mode 100644 index 110b9c33f9..0000000000 --- a/src/com/vaadin/shared/ui/gridlayout/GridLayoutServerRpc.java +++ /dev/null @@ -1,11 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.shared.ui.gridlayout; - -import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.shared.ui.LayoutClickRpc; - -public interface GridLayoutServerRpc extends LayoutClickRpc, ServerRpc { - -}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/label/LabelState.java b/src/com/vaadin/shared/ui/label/LabelState.java deleted file mode 100644 index 0298e40179..0000000000 --- a/src/com/vaadin/shared/ui/label/LabelState.java +++ /dev/null @@ -1,28 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.shared.ui.label; - -import com.vaadin.shared.ComponentState; - -public class LabelState extends ComponentState { - private ContentMode contentMode = ContentMode.TEXT; - private String text = ""; - - public ContentMode getContentMode() { - return contentMode; - } - - public void setContentMode(ContentMode contentMode) { - this.contentMode = contentMode; - } - - public String getText() { - return text; - } - - public void setText(String text) { - this.text = text; - } - -} diff --git a/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java b/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java deleted file mode 100644 index 3de8ec0220..0000000000 --- a/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java +++ /dev/null @@ -1,12 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.shared.ui.orderedlayout; - -import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.shared.ui.LayoutClickRpc; - -public interface AbstractOrderedLayoutServerRpc extends LayoutClickRpc, - ServerRpc { - -}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/panel/PanelServerRpc.java b/src/com/vaadin/shared/ui/panel/PanelServerRpc.java deleted file mode 100644 index 6ed4652070..0000000000 --- a/src/com/vaadin/shared/ui/panel/PanelServerRpc.java +++ /dev/null @@ -1,11 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.shared.ui.panel; - -import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.shared.ui.ClickRpc; - -public interface PanelServerRpc extends ClickRpc, ServerRpc { - -}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/root/PageClientRpc.java b/src/com/vaadin/shared/ui/root/PageClientRpc.java deleted file mode 100644 index c7d587938d..0000000000 --- a/src/com/vaadin/shared/ui/root/PageClientRpc.java +++ /dev/null @@ -1,13 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.shared.ui.root; - -import com.vaadin.shared.communication.ClientRpc; - -public interface PageClientRpc extends ClientRpc { - - public void setTitle(String title); - -} diff --git a/src/com/vaadin/shared/ui/root/RootServerRpc.java b/src/com/vaadin/shared/ui/root/RootServerRpc.java deleted file mode 100644 index 2e670553b8..0000000000 --- a/src/com/vaadin/shared/ui/root/RootServerRpc.java +++ /dev/null @@ -1,11 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.shared.ui.root; - -import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.shared.ui.ClickRpc; - -public interface RootServerRpc extends ClickRpc, ServerRpc { - -}
\ No newline at end of file diff --git a/src/com/vaadin/shared/ui/video/VideoState.java b/src/com/vaadin/shared/ui/video/VideoState.java deleted file mode 100644 index 1dc8d07b7c..0000000000 --- a/src/com/vaadin/shared/ui/video/VideoState.java +++ /dev/null @@ -1,20 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.shared.ui.video; - -import com.vaadin.shared.communication.URLReference; -import com.vaadin.shared.ui.AbstractMediaState; - -public class VideoState extends AbstractMediaState { - private URLReference poster; - - public URLReference getPoster() { - return poster; - } - - public void setPoster(URLReference poster) { - this.poster = poster; - } - -} diff --git a/src/com/vaadin/shared/ui/window/WindowServerRpc.java b/src/com/vaadin/shared/ui/window/WindowServerRpc.java deleted file mode 100644 index 11abfae4be..0000000000 --- a/src/com/vaadin/shared/ui/window/WindowServerRpc.java +++ /dev/null @@ -1,10 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.shared.ui.window; - -import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.shared.ui.ClickRpc; - -public interface WindowServerRpc extends ClickRpc, ServerRpc { -}
\ No newline at end of file diff --git a/src/com/vaadin/terminal/Resource.java b/src/com/vaadin/terminal/Resource.java deleted file mode 100644 index 58dc4fea9d..0000000000 --- a/src/com/vaadin/terminal/Resource.java +++ /dev/null @@ -1,26 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.terminal; - -import java.io.Serializable; - -/** - * <code>Resource</code> provided to the client terminal. Support for actually - * displaying the resource type is left to the terminal. - * - * @author Vaadin Ltd. - * @version - * @VERSION@ - * @since 3.0 - */ -public interface Resource extends Serializable { - - /** - * Gets the MIME type of the resource. - * - * @return the MIME type of the resource. - */ - public String getMIMEType(); -} diff --git a/src/com/vaadin/terminal/gwt/client/ClientExceptionHandler.java b/src/com/vaadin/terminal/gwt/client/ClientExceptionHandler.java deleted file mode 100644 index 002c73343a..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ClientExceptionHandler.java +++ /dev/null @@ -1,30 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client; - -import com.google.gwt.core.client.GWT; - -@Deprecated -public class ClientExceptionHandler { - - public static void displayError(Throwable e) { - displayError(e.getClass().getName() + ": " + e.getMessage()); - - GWT.log(e.getMessage(), e); - } - - @Deprecated - public static void displayError(String msg) { - VConsole.error(msg); - GWT.log(msg); - } - - @Deprecated - public static void displayError(String msg, Throwable e) { - displayError(msg); - displayError(e); - - } - -} diff --git a/src/com/vaadin/terminal/gwt/client/DirectionalManagedLayout.java b/src/com/vaadin/terminal/gwt/client/DirectionalManagedLayout.java deleted file mode 100644 index 296fbb22ff..0000000000 --- a/src/com/vaadin/terminal/gwt/client/DirectionalManagedLayout.java +++ /dev/null @@ -1,12 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client; - -import com.vaadin.terminal.gwt.client.ui.ManagedLayout; - -public interface DirectionalManagedLayout extends ManagedLayout { - public void layoutVertically(); - - public void layoutHorizontally(); -}
\ No newline at end of file diff --git a/src/com/vaadin/terminal/gwt/client/Focusable.java b/src/com/vaadin/terminal/gwt/client/Focusable.java deleted file mode 100644 index e8916bce40..0000000000 --- a/src/com/vaadin/terminal/gwt/client/Focusable.java +++ /dev/null @@ -1,19 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client; - -/** - * GWT's HasFocus is way too overkill for just receiving focus in simple - * components. Vaadin uses this interface in addition to GWT's HasFocus to pass - * focus requests from server to actual ui widgets in browsers. - * - * So in to make your server side focusable component receive focus on client - * side it must either implement this or HasFocus interface. - */ -public interface Focusable { - /** - * Sets focus to this widget. - */ - public void focus(); -} diff --git a/src/com/vaadin/terminal/gwt/client/LocaleNotLoadedException.java b/src/com/vaadin/terminal/gwt/client/LocaleNotLoadedException.java deleted file mode 100644 index 871495c79e..0000000000 --- a/src/com/vaadin/terminal/gwt/client/LocaleNotLoadedException.java +++ /dev/null @@ -1,13 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.terminal.gwt.client; - -@SuppressWarnings("serial") -public class LocaleNotLoadedException extends Exception { - - public LocaleNotLoadedException(String locale) { - super(locale); - } -} diff --git a/src/com/vaadin/terminal/gwt/client/Paintable.java b/src/com/vaadin/terminal/gwt/client/Paintable.java deleted file mode 100644 index c9e3ef79cc..0000000000 --- a/src/com/vaadin/terminal/gwt/client/Paintable.java +++ /dev/null @@ -1,19 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.terminal.gwt.client; - -/** - * An interface used by client-side widgets or paintable parts to receive - * updates from the corresponding server-side components in the form of - * {@link UIDL}. - * - * Updates can be sent back to the server using the - * {@link ApplicationConnection#updateVariable()} methods. - */ -@Deprecated -public interface Paintable { - - public void updateFromUIDL(UIDL uidl, ApplicationConnection client); -} diff --git a/src/com/vaadin/terminal/gwt/client/StyleConstants.java b/src/com/vaadin/terminal/gwt/client/StyleConstants.java deleted file mode 100644 index 0809580076..0000000000 --- a/src/com/vaadin/terminal/gwt/client/StyleConstants.java +++ /dev/null @@ -1,17 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.terminal.gwt.client; - -public class StyleConstants { - - public static final String MARGIN_TOP = "margin-top"; - public static final String MARGIN_RIGHT = "margin-right"; - public static final String MARGIN_BOTTOM = "margin-bottom"; - public static final String MARGIN_LEFT = "margin-left"; - - public static final String VERTICAL_SPACING = "vspacing"; - public static final String HORIZONTAL_SPACING = "hspacing"; - -} diff --git a/src/com/vaadin/terminal/gwt/client/WidgetInstantiator.java b/src/com/vaadin/terminal/gwt/client/WidgetInstantiator.java deleted file mode 100644 index 0a4f92bc79..0000000000 --- a/src/com/vaadin/terminal/gwt/client/WidgetInstantiator.java +++ /dev/null @@ -1,11 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client; - -/** - * A helper class used by WidgetMap implementation. Used by the generated code. - */ -interface WidgetInstantiator { - public ServerConnector get(); -} diff --git a/src/com/vaadin/terminal/gwt/client/WidgetLoader.java b/src/com/vaadin/terminal/gwt/client/WidgetLoader.java deleted file mode 100644 index 749a8343c8..0000000000 --- a/src/com/vaadin/terminal/gwt/client/WidgetLoader.java +++ /dev/null @@ -1,23 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client; - -import com.google.gwt.core.client.RunAsyncCallback; - -/** A helper class used by WidgetMap implementation. Used by the generated code. */ -abstract class WidgetLoader implements RunAsyncCallback { - - @Override - public void onFailure(Throwable reason) { - ApplicationConfiguration.endDependencyLoading(); - } - - @Override - public void onSuccess() { - addInstantiator(); - ApplicationConfiguration.endDependencyLoading(); - } - - abstract void addInstantiator(); -} diff --git a/src/com/vaadin/terminal/gwt/client/communication/DiffJSONSerializer.java b/src/com/vaadin/terminal/gwt/client/communication/DiffJSONSerializer.java deleted file mode 100644 index 29cb714828..0000000000 --- a/src/com/vaadin/terminal/gwt/client/communication/DiffJSONSerializer.java +++ /dev/null @@ -1,19 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.communication; - -import com.google.gwt.json.client.JSONValue; -import com.vaadin.terminal.gwt.client.ApplicationConnection; - -public interface DiffJSONSerializer<T> extends JSONSerializer<T> { - /** - * Update the target object in place based on the passed JSON data. - * - * @param target - * @param jsonValue - * @param connection - */ - public void update(T target, Type type, JSONValue jsonValue, - ApplicationConnection connection); -} diff --git a/src/com/vaadin/terminal/gwt/client/communication/GeneratedRpcMethodProvider.java b/src/com/vaadin/terminal/gwt/client/communication/GeneratedRpcMethodProvider.java deleted file mode 100644 index c92466084c..0000000000 --- a/src/com/vaadin/terminal/gwt/client/communication/GeneratedRpcMethodProvider.java +++ /dev/null @@ -1,20 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.communication; - -import java.util.Collection; - -/** - * Provides runtime data about client side RPC calls received from the server to - * the client-side code. - * - * A GWT generator is used to create an implementation of this class at - * run-time. - * - * @since 7.0 - */ -public interface GeneratedRpcMethodProvider { - - public Collection<RpcMethod> getGeneratedRpcMethods(); -} diff --git a/src/com/vaadin/terminal/gwt/client/communication/HasJavaScriptConnectorHelper.java b/src/com/vaadin/terminal/gwt/client/communication/HasJavaScriptConnectorHelper.java deleted file mode 100644 index a5191a5fed..0000000000 --- a/src/com/vaadin/terminal/gwt/client/communication/HasJavaScriptConnectorHelper.java +++ /dev/null @@ -1,11 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.terminal.gwt.client.communication; - -import com.vaadin.terminal.gwt.client.JavaScriptConnectorHelper; - -public interface HasJavaScriptConnectorHelper { - public JavaScriptConnectorHelper getJavascriptConnectorHelper(); -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractLayoutConnector.java deleted file mode 100644 index cd059357a8..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/AbstractLayoutConnector.java +++ /dev/null @@ -1,15 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.ui; - -import com.vaadin.shared.ui.AbstractLayoutState; - -public abstract class AbstractLayoutConnector extends - AbstractComponentContainerConnector { - - @Override - public AbstractLayoutState getState() { - return (AbstractLayoutState) super.getState(); - } -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/ActionOwner.java b/src/com/vaadin/terminal/gwt/client/ui/ActionOwner.java deleted file mode 100644 index 5e0f431f49..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/ActionOwner.java +++ /dev/null @@ -1,19 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.ui; - -import com.vaadin.terminal.gwt.client.ApplicationConnection; - -public interface ActionOwner { - - /** - * @return Array of IActions - */ - public Action[] getActions(); - - public ApplicationConnection getClient(); - - public String getPaintableId(); - -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/Field.java b/src/com/vaadin/terminal/gwt/client/ui/Field.java deleted file mode 100644 index 010892b0e9..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/Field.java +++ /dev/null @@ -1,16 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -/** - * - */ -package com.vaadin.terminal.gwt.client.ui; - -/** - * This interface indicates that the component is a Field (serverside), and - * wants (for instance) to automatically get the v-modified classname. - * - */ -public interface Field { - -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/ManagedLayout.java b/src/com/vaadin/terminal/gwt/client/ui/ManagedLayout.java deleted file mode 100644 index 6d0271ee40..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/ManagedLayout.java +++ /dev/null @@ -1,10 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.ui; - -import com.vaadin.terminal.gwt.client.ComponentConnector; - -public interface ManagedLayout extends ComponentConnector { - -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/PostLayoutListener.java b/src/com/vaadin/terminal/gwt/client/ui/PostLayoutListener.java deleted file mode 100644 index feb7494f87..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/PostLayoutListener.java +++ /dev/null @@ -1,8 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.ui; - -public interface PostLayoutListener { - public void postLayout(); -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/SimpleManagedLayout.java b/src/com/vaadin/terminal/gwt/client/ui/SimpleManagedLayout.java deleted file mode 100644 index 9ccb29a750..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/SimpleManagedLayout.java +++ /dev/null @@ -1,8 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.ui; - -public interface SimpleManagedLayout extends ManagedLayout { - public void layout(); -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/Vaadin6Connector.java b/src/com/vaadin/terminal/gwt/client/ui/Vaadin6Connector.java deleted file mode 100644 index f2f0125c86..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/Vaadin6Connector.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.ui; - -import com.vaadin.terminal.gwt.client.ApplicationConnection; -import com.vaadin.terminal.gwt.client.Paintable; -import com.vaadin.terminal.gwt.client.UIDL; - -public abstract class Vaadin6Connector extends AbstractComponentConnector - implements Paintable { - - @Override - public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { - ((Paintable) getWidget()).updateFromUIDL(uidl, client); - } - -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/audio/VAudio.java b/src/com/vaadin/terminal/gwt/client/ui/audio/VAudio.java deleted file mode 100644 index 08bc95ba16..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/audio/VAudio.java +++ /dev/null @@ -1,22 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.terminal.gwt.client.ui.audio; - -import com.google.gwt.dom.client.AudioElement; -import com.google.gwt.dom.client.Document; -import com.vaadin.terminal.gwt.client.ui.VMediaBase; - -public class VAudio extends VMediaBase { - private static String CLASSNAME = "v-audio"; - - private AudioElement audio; - - public VAudio() { - audio = Document.get().createAudioElement(); - setMediaElement(audio); - setStyleName(CLASSNAME); - } - -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/customcomponent/VCustomComponent.java b/src/com/vaadin/terminal/gwt/client/ui/customcomponent/VCustomComponent.java deleted file mode 100644 index 2b27bd0e58..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/customcomponent/VCustomComponent.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.terminal.gwt.client.ui.customcomponent; - -import com.google.gwt.user.client.ui.SimplePanel; - -public class VCustomComponent extends SimplePanel { - - private static final String CLASSNAME = "v-customcomponent"; - - public VCustomComponent() { - super(); - setStyleName(CLASSNAME); - } - -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptAll.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptAll.java deleted file mode 100644 index 7ce0d69727..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptAll.java +++ /dev/null @@ -1,20 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -/** - * - */ -package com.vaadin.terminal.gwt.client.ui.dd; - -import com.vaadin.event.dd.acceptcriteria.AcceptAll; -import com.vaadin.shared.ui.dd.AcceptCriterion; -import com.vaadin.terminal.gwt.client.UIDL; - -@AcceptCriterion(AcceptAll.class) -final public class VAcceptAll extends VAcceptCriterion { - - @Override - protected boolean accept(VDragEvent drag, UIDL configuration) { - return true; - } -}
\ No newline at end of file diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCallback.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCallback.java deleted file mode 100644 index cd9ade88c2..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCallback.java +++ /dev/null @@ -1,17 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.ui.dd; - -public interface VAcceptCallback { - - /** - * This method is called by {@link VDragAndDropManager} if the - * {@link VDragEvent} is still active. Developer can update for example drag - * icon or empahsis the target if the target accepts the transferable. If - * the drag and drop operation ends or the {@link VAbstractDropHandler} has - * changed before response arrives, the method is never called. - */ - public void accepted(VDragEvent event); - -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriteria.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriteria.java deleted file mode 100644 index 2deed95915..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriteria.java +++ /dev/null @@ -1,22 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.ui.dd; - -import com.google.gwt.core.client.GWT; - -/** - * A class via all AcceptCriteria instances are fetched by an identifier. - */ -public class VAcceptCriteria { - private static VAcceptCriterionFactory impl; - - static { - impl = GWT.create(VAcceptCriterionFactory.class); - } - - public static VAcceptCriterion get(String name) { - return impl.get(name); - } - -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterionFactory.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterionFactory.java deleted file mode 100644 index fe627665c5..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterionFactory.java +++ /dev/null @@ -1,15 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.ui.dd; - -import com.vaadin.terminal.gwt.widgetsetutils.AcceptCriteriaFactoryGenerator; - -/** - * Generated by {@link AcceptCriteriaFactoryGenerator} - * - */ -public abstract class VAcceptCriterionFactory { - - public abstract VAcceptCriterion get(String name); -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VContainsDataFlavor.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VContainsDataFlavor.java deleted file mode 100644 index 7c5d9f769a..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VContainsDataFlavor.java +++ /dev/null @@ -1,21 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -/** - * - */ -package com.vaadin.terminal.gwt.client.ui.dd; - -import com.vaadin.event.dd.acceptcriteria.ContainsDataFlavor; -import com.vaadin.shared.ui.dd.AcceptCriterion; -import com.vaadin.terminal.gwt.client.UIDL; - -@AcceptCriterion(ContainsDataFlavor.class) -final public class VContainsDataFlavor extends VAcceptCriterion { - - @Override - protected boolean accept(VDragEvent drag, UIDL configuration) { - String name = configuration.getStringAttribute("p"); - return drag.getTransferable().getDataFlavors().contains(name); - } -}
\ No newline at end of file diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragEventServerCallback.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VDragEventServerCallback.java deleted file mode 100644 index e2547dbf52..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragEventServerCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.ui.dd; - -import com.vaadin.terminal.gwt.client.UIDL; - -public interface VDragEventServerCallback { - - public void handleResponse(boolean accepted, UIDL response); - -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VHasDropHandler.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VHasDropHandler.java deleted file mode 100644 index 6d6f7c776d..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VHasDropHandler.java +++ /dev/null @@ -1,17 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.ui.dd; - -import com.vaadin.terminal.gwt.client.ComponentConnector; - -/** - * Used to detect Widget from widget tree that has {@link #getDropHandler()} - * - * Decide whether to get rid of this class. If so, {@link VAbstractDropHandler} - * must extend {@link ComponentConnector}. - * - */ -public interface VHasDropHandler { - public VDropHandler getDropHandler(); -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VHtml5File.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VHtml5File.java deleted file mode 100644 index 434ae732c1..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VHtml5File.java +++ /dev/null @@ -1,31 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.ui.dd; - -import com.google.gwt.core.client.JavaScriptObject; - -/** - * Wrapper for html5 File object. - */ -public class VHtml5File extends JavaScriptObject { - - protected VHtml5File() { - }; - - public native final String getName() - /*-{ - return this.name; - }-*/; - - public native final String getType() - /*-{ - return this.type; - }-*/; - - public native final int getSize() - /*-{ - return this.size ? this.size : 0; - }-*/; - -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VOverTreeNode.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VOverTreeNode.java deleted file mode 100644 index 1539054c88..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VOverTreeNode.java +++ /dev/null @@ -1,19 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -/** - * - */ -package com.vaadin.terminal.gwt.client.ui.dd; - -import com.vaadin.terminal.gwt.client.UIDL; - -final public class VOverTreeNode extends VAcceptCriterion { - - @Override - protected boolean accept(VDragEvent drag, UIDL configuration) { - Boolean containsKey = (Boolean) drag.getDropDetails().get( - "itemIdOverIsNode"); - return containsKey != null && containsKey.booleanValue(); - } -}
\ No newline at end of file diff --git a/src/com/vaadin/terminal/gwt/client/ui/layout/ElementResizeEvent.java b/src/com/vaadin/terminal/gwt/client/ui/layout/ElementResizeEvent.java deleted file mode 100644 index a519f5db87..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/layout/ElementResizeEvent.java +++ /dev/null @@ -1,25 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.ui.layout; - -import com.google.gwt.dom.client.Element; -import com.vaadin.terminal.gwt.client.LayoutManager; - -public class ElementResizeEvent { - private final Element element; - private final LayoutManager layoutManager; - - public ElementResizeEvent(LayoutManager layoutManager, Element element) { - this.layoutManager = layoutManager; - this.element = element; - } - - public Element getElement() { - return element; - } - - public LayoutManager getLayoutManager() { - return layoutManager; - } -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/layout/ElementResizeListener.java b/src/com/vaadin/terminal/gwt/client/ui/layout/ElementResizeListener.java deleted file mode 100644 index d6d3de48b8..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/layout/ElementResizeListener.java +++ /dev/null @@ -1,9 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.terminal.gwt.client.ui.layout; - -public interface ElementResizeListener { - public void onElementResize(ElementResizeEvent e); -}
\ No newline at end of file diff --git a/src/com/vaadin/terminal/gwt/client/ui/layout/MayScrollChildren.java b/src/com/vaadin/terminal/gwt/client/ui/layout/MayScrollChildren.java deleted file mode 100644 index 62c9937c4c..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/layout/MayScrollChildren.java +++ /dev/null @@ -1,10 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.ui.layout; - -import com.vaadin.terminal.gwt.client.ComponentContainerConnector; - -public interface MayScrollChildren extends ComponentContainerConnector { - -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/listselect/ListSelectConnector.java b/src/com/vaadin/terminal/gwt/client/ui/listselect/ListSelectConnector.java deleted file mode 100644 index 678847226b..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/listselect/ListSelectConnector.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.terminal.gwt.client.ui.listselect; - -import com.vaadin.shared.ui.Connect; -import com.vaadin.terminal.gwt.client.ui.optiongroup.OptionGroupBaseConnector; -import com.vaadin.ui.ListSelect; - -@Connect(ListSelect.class) -public class ListSelectConnector extends OptionGroupBaseConnector { - - @Override - public VListSelect getWidget() { - return (VListSelect) super.getWidget(); - } -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/nativeselect/NativeSelectConnector.java b/src/com/vaadin/terminal/gwt/client/ui/nativeselect/NativeSelectConnector.java deleted file mode 100644 index 8a00afa056..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/nativeselect/NativeSelectConnector.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.terminal.gwt.client.ui.nativeselect; - -import com.vaadin.shared.ui.Connect; -import com.vaadin.terminal.gwt.client.ui.optiongroup.OptionGroupBaseConnector; -import com.vaadin.ui.NativeSelect; - -@Connect(NativeSelect.class) -public class NativeSelectConnector extends OptionGroupBaseConnector { - - @Override - public VNativeSelect getWidget() { - return (VNativeSelect) super.getWidget(); - } -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/HorizontalLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/HorizontalLayoutConnector.java deleted file mode 100644 index 459bd474d1..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/HorizontalLayoutConnector.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.ui.orderedlayout; - -import com.vaadin.shared.ui.Connect; -import com.vaadin.shared.ui.Connect.LoadStyle; -import com.vaadin.ui.HorizontalLayout; - -@Connect(value = HorizontalLayout.class, loadStyle = LoadStyle.EAGER) -public class HorizontalLayoutConnector extends AbstractOrderedLayoutConnector { - - @Override - public VHorizontalLayout getWidget() { - return (VHorizontalLayout) super.getWidget(); - } - -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VHorizontalLayout.java b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VHorizontalLayout.java deleted file mode 100644 index 5bf377642e..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VHorizontalLayout.java +++ /dev/null @@ -1,14 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.ui.orderedlayout; - -public class VHorizontalLayout extends VMeasuringOrderedLayout { - - public static final String CLASSNAME = "v-horizontallayout"; - - public VHorizontalLayout() { - super(CLASSNAME, false); - } - -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VVerticalLayout.java b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VVerticalLayout.java deleted file mode 100644 index e44c576941..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VVerticalLayout.java +++ /dev/null @@ -1,14 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.ui.orderedlayout; - -public class VVerticalLayout extends VMeasuringOrderedLayout { - - public static final String CLASSNAME = "v-verticallayout"; - - public VVerticalLayout() { - super(CLASSNAME, true); - } - -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VerticalLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VerticalLayoutConnector.java deleted file mode 100644 index a481283156..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VerticalLayoutConnector.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.ui.orderedlayout; - -import com.vaadin.shared.ui.Connect; -import com.vaadin.shared.ui.Connect.LoadStyle; -import com.vaadin.ui.VerticalLayout; - -@Connect(value = VerticalLayout.class, loadStyle = LoadStyle.EAGER) -public class VerticalLayoutConnector extends AbstractOrderedLayoutConnector { - - @Override - public VVerticalLayout getWidget() { - return (VVerticalLayout) super.getWidget(); - } - -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/passwordfield/PasswordFieldConnector.java b/src/com/vaadin/terminal/gwt/client/ui/passwordfield/PasswordFieldConnector.java deleted file mode 100644 index 55d645f12e..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/passwordfield/PasswordFieldConnector.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.terminal.gwt.client.ui.passwordfield; - -import com.vaadin.shared.ui.Connect; -import com.vaadin.terminal.gwt.client.ui.textfield.TextFieldConnector; -import com.vaadin.ui.PasswordField; - -@Connect(PasswordField.class) -public class PasswordFieldConnector extends TextFieldConnector { - - @Override - public VPasswordField getWidget() { - return (VPasswordField) super.getWidget(); - } -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/passwordfield/VPasswordField.java b/src/com/vaadin/terminal/gwt/client/ui/passwordfield/VPasswordField.java deleted file mode 100644 index c160322de5..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/passwordfield/VPasswordField.java +++ /dev/null @@ -1,22 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.terminal.gwt.client.ui.passwordfield; - -import com.google.gwt.user.client.DOM; -import com.vaadin.terminal.gwt.client.ui.textfield.VTextField; - -/** - * This class represents a password field. - * - * @author Vaadin Ltd. - * - */ -public class VPasswordField extends VTextField { - - public VPasswordField() { - super(DOM.createInputPassword()); - } - -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/HorizontalSplitPanelConnector.java b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/HorizontalSplitPanelConnector.java deleted file mode 100644 index 8c2c4d24cd..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/HorizontalSplitPanelConnector.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.ui.splitpanel; - -import com.vaadin.shared.ui.Connect; -import com.vaadin.shared.ui.Connect.LoadStyle; -import com.vaadin.ui.HorizontalSplitPanel; - -@Connect(value = HorizontalSplitPanel.class, loadStyle = LoadStyle.EAGER) -public class HorizontalSplitPanelConnector extends AbstractSplitPanelConnector { - - @Override - public VSplitPanelHorizontal getWidget() { - return (VSplitPanelHorizontal) super.getWidget(); - } - -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelHorizontal.java b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelHorizontal.java deleted file mode 100644 index 9048a59d7d..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelHorizontal.java +++ /dev/null @@ -1,12 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.terminal.gwt.client.ui.splitpanel; - -public class VSplitPanelHorizontal extends VAbstractSplitPanel { - - public VSplitPanelHorizontal() { - super(VAbstractSplitPanel.ORIENTATION_HORIZONTAL); - } -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelVertical.java b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelVertical.java deleted file mode 100644 index d22ebed5d9..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelVertical.java +++ /dev/null @@ -1,12 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.terminal.gwt.client.ui.splitpanel; - -public class VSplitPanelVertical extends VAbstractSplitPanel { - - public VSplitPanelVertical() { - super(VAbstractSplitPanel.ORIENTATION_VERTICAL); - } -} diff --git a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VerticalSplitPanelConnector.java b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VerticalSplitPanelConnector.java deleted file mode 100644 index 048136c1c9..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VerticalSplitPanelConnector.java +++ /dev/null @@ -1,19 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.client.ui.splitpanel; - -import com.google.gwt.core.client.GWT; -import com.vaadin.shared.ui.Connect; -import com.vaadin.shared.ui.Connect.LoadStyle; -import com.vaadin.ui.VerticalSplitPanel; - -@Connect(value = VerticalSplitPanel.class, loadStyle = LoadStyle.EAGER) -public class VerticalSplitPanelConnector extends AbstractSplitPanelConnector { - - @Override - public VSplitPanelVertical getWidget() { - return (VSplitPanelVertical) super.getWidget(); - } - -} diff --git a/src/com/vaadin/terminal/gwt/server/BootstrapDom.java b/src/com/vaadin/terminal/gwt/server/BootstrapDom.java deleted file mode 100644 index 4731a5b79f..0000000000 --- a/src/com/vaadin/terminal/gwt/server/BootstrapDom.java +++ /dev/null @@ -1,9 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.terminal.gwt.server; - -public class BootstrapDom { - -} diff --git a/src/com/vaadin/terminal/gwt/server/BootstrapListener.java b/src/com/vaadin/terminal/gwt/server/BootstrapListener.java deleted file mode 100644 index 54bd13c25a..0000000000 --- a/src/com/vaadin/terminal/gwt/server/BootstrapListener.java +++ /dev/null @@ -1,11 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.terminal.gwt.server; - -import java.util.EventListener; - -public interface BootstrapListener extends EventListener { - public void modifyBootstrap(BootstrapResponse response); -} diff --git a/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java b/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java deleted file mode 100644 index 37b59989f6..0000000000 --- a/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java +++ /dev/null @@ -1,72 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.terminal.gwt.server; - -import java.util.EventObject; -import java.util.Map; - -import org.jsoup.nodes.Document; -import org.jsoup.nodes.Element; - -import com.vaadin.Application; -import com.vaadin.terminal.WrappedRequest; -import com.vaadin.ui.Root; - -public class BootstrapResponse extends EventObject { - private final Document document; - private final WrappedRequest request; - private final Map<String, Object> headers; - private final Element applicationTag; - private final Application application; - private final Integer rootId; - - public BootstrapResponse(BootstrapHandler handler, WrappedRequest request, - Document document, Element applicationTag, - Map<String, Object> headers, Application application, Integer rootId) { - super(handler); - this.request = request; - this.document = document; - this.applicationTag = applicationTag; - this.headers = headers; - this.application = application; - this.rootId = rootId; - } - - public void setHeader(String name, String value) { - headers.put(name, value); - } - - public void setDateHeader(String name, long timestamp) { - headers.put(name, Long.valueOf(timestamp)); - } - - public BootstrapHandler getBootstrapHandler() { - return (BootstrapHandler) getSource(); - } - - public WrappedRequest getRequest() { - return request; - } - - public Document getDocument() { - return document; - } - - public Element getApplicationTag() { - return applicationTag; - } - - public Application getApplication() { - return application; - } - - public Integer getRootId() { - return rootId; - } - - public Root getRoot() { - return Root.getCurrent(); - } -} diff --git a/src/com/vaadin/terminal/gwt/server/LegacyChangeVariablesInvocation.java b/src/com/vaadin/terminal/gwt/server/LegacyChangeVariablesInvocation.java deleted file mode 100644 index 9dba05d2c1..0000000000 --- a/src/com/vaadin/terminal/gwt/server/LegacyChangeVariablesInvocation.java +++ /dev/null @@ -1,38 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.server; - -import java.util.HashMap; -import java.util.Map; - -import com.vaadin.shared.communication.MethodInvocation; -import com.vaadin.terminal.gwt.client.ApplicationConnection; - -public class LegacyChangeVariablesInvocation extends MethodInvocation { - private Map<String, Object> variableChanges = new HashMap<String, Object>(); - - public LegacyChangeVariablesInvocation(String connectorId, - String variableName, Object value) { - super(connectorId, ApplicationConnection.UPDATE_VARIABLE_INTERFACE, - ApplicationConnection.UPDATE_VARIABLE_METHOD); - setVariableChange(variableName, value); - } - - public static boolean isLegacyVariableChange(String interfaceName, - String methodName) { - return ApplicationConnection.UPDATE_VARIABLE_METHOD - .equals(interfaceName) - && ApplicationConnection.UPDATE_VARIABLE_METHOD - .equals(methodName); - } - - public void setVariableChange(String name, Object value) { - variableChanges.put(name, value); - } - - public Map<String, Object> getVariableChanges() { - return variableChanges; - } - -} diff --git a/src/com/vaadin/terminal/gwt/server/NoInputStreamException.java b/src/com/vaadin/terminal/gwt/server/NoInputStreamException.java deleted file mode 100644 index 70c3add858..0000000000 --- a/src/com/vaadin/terminal/gwt/server/NoInputStreamException.java +++ /dev/null @@ -1,9 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.server; - -@SuppressWarnings("serial") -public class NoInputStreamException extends Exception { - -} diff --git a/src/com/vaadin/terminal/gwt/server/NoOutputStreamException.java b/src/com/vaadin/terminal/gwt/server/NoOutputStreamException.java deleted file mode 100644 index e4db8453b0..0000000000 --- a/src/com/vaadin/terminal/gwt/server/NoOutputStreamException.java +++ /dev/null @@ -1,9 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.server; - -@SuppressWarnings("serial") -public class NoOutputStreamException extends Exception { - -} diff --git a/src/com/vaadin/terminal/gwt/server/SessionExpiredException.java b/src/com/vaadin/terminal/gwt/server/SessionExpiredException.java deleted file mode 100644 index 37b76de443..0000000000 --- a/src/com/vaadin/terminal/gwt/server/SessionExpiredException.java +++ /dev/null @@ -1,9 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.server; - -@SuppressWarnings("serial") -public class SessionExpiredException extends Exception { - -} diff --git a/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java b/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java deleted file mode 100644 index 0d4963bd7d..0000000000 --- a/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java +++ /dev/null @@ -1,16 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.server; - -import com.vaadin.terminal.StreamVariable.StreamingEndEvent; - -@SuppressWarnings("serial") -final class StreamingEndEventImpl extends AbstractStreamingEvent implements - StreamingEndEvent { - - public StreamingEndEventImpl(String filename, String type, long totalBytes) { - super(filename, type, totalBytes, totalBytes); - } - -} diff --git a/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java b/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java deleted file mode 100644 index cfa7a1b98d..0000000000 --- a/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java +++ /dev/null @@ -1,17 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.server; - -import com.vaadin.terminal.StreamVariable.StreamingProgressEvent; - -@SuppressWarnings("serial") -final class StreamingProgressEventImpl extends AbstractStreamingEvent implements - StreamingProgressEvent { - - public StreamingProgressEventImpl(final String filename, final String type, - long contentLength, long bytesReceived) { - super(filename, type, contentLength, bytesReceived); - } - -} diff --git a/src/com/vaadin/terminal/gwt/server/UploadException.java b/src/com/vaadin/terminal/gwt/server/UploadException.java deleted file mode 100644 index 58253da0fb..0000000000 --- a/src/com/vaadin/terminal/gwt/server/UploadException.java +++ /dev/null @@ -1,15 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.server; - -@SuppressWarnings("serial") -public class UploadException extends Exception { - public UploadException(Exception e) { - super("Upload failed", e); - } - - public UploadException(String msg) { - super(msg); - } -} diff --git a/src/com/vaadin/terminal/gwt/server/VaadinContext.java b/src/com/vaadin/terminal/gwt/server/VaadinContext.java deleted file mode 100644 index f03044a872..0000000000 --- a/src/com/vaadin/terminal/gwt/server/VaadinContext.java +++ /dev/null @@ -1,61 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.terminal.gwt.server; - -import java.lang.reflect.Method; -import java.util.Iterator; - -import com.vaadin.event.EventRouter; -import com.vaadin.terminal.DeploymentConfiguration; -import com.vaadin.tools.ReflectTools; - -public class VaadinContext { - private static final Method BOOTSTRAP_GENERATE_METHOD = ReflectTools - .findMethod(BootstrapListener.class, "modifyBootstrap", - BootstrapResponse.class); - - private final DeploymentConfiguration deploymentConfiguration; - - private final EventRouter eventRouter = new EventRouter(); - - public VaadinContext(DeploymentConfiguration deploymentConfiguration) { - this.deploymentConfiguration = deploymentConfiguration; - deploymentConfiguration.setVaadinContext(this); - } - - public DeploymentConfiguration getDeploymentConfiguration() { - return deploymentConfiguration; - } - - public void init() { - VaadinContextEvent event = new VaadinContextEvent(this); - Iterator<VaadinContextListener> listeners = deploymentConfiguration - .getContextListeners(); - while (listeners.hasNext()) { - VaadinContextListener listener = listeners.next(); - listener.contextCreated(event); - } - } - - public void destroy() { - VaadinContextEvent event = new VaadinContextEvent(this); - Iterator<VaadinContextListener> listeners = deploymentConfiguration - .getContextListeners(); - while (listeners.hasNext()) { - VaadinContextListener listener = listeners.next(); - listener.contextDestoryed(event); - } - } - - public void addBootstrapListener(BootstrapListener listener) { - eventRouter.addListener(BootstrapResponse.class, listener, - BOOTSTRAP_GENERATE_METHOD); - } - - public void fireModifyBootstrapEvent(BootstrapResponse bootstrapResponse) { - eventRouter.fireEvent(bootstrapResponse); - } - -} diff --git a/src/com/vaadin/terminal/gwt/server/VaadinContextEvent.java b/src/com/vaadin/terminal/gwt/server/VaadinContextEvent.java deleted file mode 100644 index 239490433c..0000000000 --- a/src/com/vaadin/terminal/gwt/server/VaadinContextEvent.java +++ /dev/null @@ -1,19 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.terminal.gwt.server; - -import java.util.EventObject; - -public class VaadinContextEvent extends EventObject { - - public VaadinContextEvent(VaadinContext source) { - super(source); - } - - public VaadinContext getVaadinContext() { - return (VaadinContext) getSource(); - } - -} diff --git a/src/com/vaadin/terminal/gwt/server/VaadinContextListener.java b/src/com/vaadin/terminal/gwt/server/VaadinContextListener.java deleted file mode 100644 index 5e379d9b91..0000000000 --- a/src/com/vaadin/terminal/gwt/server/VaadinContextListener.java +++ /dev/null @@ -1,13 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.terminal.gwt.server; - -import java.util.EventListener; - -public interface VaadinContextListener extends EventListener { - public void contextCreated(VaadinContextEvent event); - - public void contextDestoryed(VaadinContextEvent event); -} diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java deleted file mode 100644 index 28f3dab482..0000000000 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java +++ /dev/null @@ -1,23 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.terminal.gwt.widgetsetutils; - -import com.vaadin.shared.ui.Connect.LoadStyle; -import com.vaadin.terminal.gwt.client.ServerConnector; - -/** - * WidgetMap generator that builds a widgetset that optimizes the transferred - * data. Widgets are loaded only when used if the widgetset is built with this - * generator. - * - * @see WidgetMapGenerator - * - */ -public class LazyWidgetMapGenerator extends WidgetMapGenerator { - @Override - protected LoadStyle getLoadStyle(Class<? extends ServerConnector> connector) { - return LoadStyle.LAZY; - } - -} diff --git a/src/com/vaadin/ui/Accordion.java b/src/com/vaadin/ui/Accordion.java deleted file mode 100644 index b937c7bc2b..0000000000 --- a/src/com/vaadin/ui/Accordion.java +++ /dev/null @@ -1,19 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.ui; - -/** - * An accordion is a component similar to a {@link TabSheet}, but with a - * vertical orientation and the selected component presented between tabs. - * - * Closable tabs are not supported by the accordion. - * - * The {@link Accordion} can be styled with the .v-accordion, .v-accordion-item, - * .v-accordion-item-first and .v-accordion-item-caption styles. - * - * @see TabSheet - */ -public class Accordion extends TabSheet { - -} diff --git a/src/com/vaadin/ui/HorizontalLayout.java b/src/com/vaadin/ui/HorizontalLayout.java deleted file mode 100644 index b9dc1c13ca..0000000000 --- a/src/com/vaadin/ui/HorizontalLayout.java +++ /dev/null @@ -1,24 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.ui; - -/** - * Horizontal layout - * - * <code>HorizontalLayout</code> is a component container, which shows the - * subcomponents in the order of their addition (horizontally). - * - * @author Vaadin Ltd. - * @version - * @VERSION@ - * @since 5.3 - */ -@SuppressWarnings("serial") -public class HorizontalLayout extends AbstractOrderedLayout { - - public HorizontalLayout() { - - } - -} diff --git a/src/com/vaadin/ui/NativeButton.java b/src/com/vaadin/ui/NativeButton.java deleted file mode 100644 index 6eb4379261..0000000000 --- a/src/com/vaadin/ui/NativeButton.java +++ /dev/null @@ -1,21 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.ui; - -@SuppressWarnings("serial") -public class NativeButton extends Button { - - public NativeButton() { - super(); - } - - public NativeButton(String caption) { - super(caption); - } - - public NativeButton(String caption, ClickListener listener) { - super(caption, listener); - } - -} diff --git a/src/com/vaadin/ui/VerticalLayout.java b/src/com/vaadin/ui/VerticalLayout.java deleted file mode 100644 index a04d052d98..0000000000 --- a/src/com/vaadin/ui/VerticalLayout.java +++ /dev/null @@ -1,25 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ -package com.vaadin.ui; - -/** - * Vertical layout - * - * <code>VerticalLayout</code> is a component container, which shows the - * subcomponents in the order of their addition (vertically). A vertical layout - * is by default 100% wide. - * - * @author Vaadin Ltd. - * @version - * @VERSION@ - * @since 5.3 - */ -@SuppressWarnings("serial") -public class VerticalLayout extends AbstractOrderedLayout { - - public VerticalLayout() { - setWidth("100%"); - } - -} diff --git a/tests/server-side/com/vaadin/tests/server/component/datefield/WeekNumberCalculation.java b/tests/client-side/com/vaadin/terminal/gwt/client/DateTimeServiceTest.java index ae8bc9beae..b111faf5bc 100644..100755 --- a/tests/server-side/com/vaadin/tests/server/component/datefield/WeekNumberCalculation.java +++ b/tests/client-side/com/vaadin/terminal/gwt/client/DateTimeServiceTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.server.component.datefield; +package com.vaadin.terminal.gwt.client; import java.util.Calendar; import java.util.Date; @@ -9,7 +9,7 @@ import junit.framework.TestCase; import com.vaadin.terminal.gwt.client.DateTimeService; -public class WeekNumberCalculation extends TestCase { +public class DateTimeServiceTest extends TestCase { final long MILLISECONDS_PER_DAY = 24 * 3600 * 1000; diff --git a/tests/client-side/com/vaadin/terminal/gwt/server/JSONSerializerTest.java b/tests/client-side/com/vaadin/terminal/gwt/server/JSONSerializerTest.java index 6e39f17599..16cc0ede98 100644 --- a/tests/client-side/com/vaadin/terminal/gwt/server/JSONSerializerTest.java +++ b/tests/client-side/com/vaadin/terminal/gwt/server/JSONSerializerTest.java @@ -1,7 +1,19 @@ package com.vaadin.terminal.gwt.server; /* - @VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ import java.beans.BeanInfo; import java.beans.Introspector; @@ -21,7 +33,6 @@ import com.vaadin.terminal.gwt.client.communication.JsonEncoder; * Tests for {@link JsonCodec}, {@link JsonEncoder}, {@link JsonDecoder} * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0 * */ diff --git a/tests/sass/src/com/vaadin/sass/AbstractTestBase.java b/tests/sass/src/com/vaadin/sass/AbstractTestBase.java index 92bff5cf3c..3593a6a19c 100644 --- a/tests/sass/src/com/vaadin/sass/AbstractTestBase.java +++ b/tests/sass/src/com/vaadin/sass/AbstractTestBase.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass; diff --git a/tests/sass/src/com/vaadin/sass/parser/ParserTest.java b/tests/sass/src/com/vaadin/sass/parser/ParserTest.java index 0906bfd63b..34c365ea13 100644 --- a/tests/sass/src/com/vaadin/sass/parser/ParserTest.java +++ b/tests/sass/src/com/vaadin/sass/parser/ParserTest.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.parser; diff --git a/tests/sass/src/com/vaadin/sass/testcases/css/EmptyBlock.java b/tests/sass/src/com/vaadin/sass/testcases/css/EmptyBlock.java index 43d4aff23f..de8a45b9a9 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/css/EmptyBlock.java +++ b/tests/sass/src/com/vaadin/sass/testcases/css/EmptyBlock.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.testcases.css; diff --git a/tests/sass/src/com/vaadin/sass/testcases/css/Interpolation.java b/tests/sass/src/com/vaadin/sass/testcases/css/Interpolation.java index 215b0e2f8f..01d593db78 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/css/Interpolation.java +++ b/tests/sass/src/com/vaadin/sass/testcases/css/Interpolation.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.testcases.css; diff --git a/tests/sass/src/com/vaadin/sass/testcases/css/Media.java b/tests/sass/src/com/vaadin/sass/testcases/css/Media.java index e23b816e55..04b8573154 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/css/Media.java +++ b/tests/sass/src/com/vaadin/sass/testcases/css/Media.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.testcases.css; diff --git a/tests/sass/src/com/vaadin/sass/testcases/css/Properties.java b/tests/sass/src/com/vaadin/sass/testcases/css/Properties.java index 7e78a088f7..e0c07bc9c0 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/css/Properties.java +++ b/tests/sass/src/com/vaadin/sass/testcases/css/Properties.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.testcases.css; diff --git a/tests/sass/src/com/vaadin/sass/testcases/css/Reindeer.java b/tests/sass/src/com/vaadin/sass/testcases/css/Reindeer.java index 00f03d0f16..9bb4ed4570 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/css/Reindeer.java +++ b/tests/sass/src/com/vaadin/sass/testcases/css/Reindeer.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.testcases.css; diff --git a/tests/sass/src/com/vaadin/sass/testcases/css/Selectors.java b/tests/sass/src/com/vaadin/sass/testcases/css/Selectors.java index 15162e5a90..cb865042b6 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/css/Selectors.java +++ b/tests/sass/src/com/vaadin/sass/testcases/css/Selectors.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.testcases.css; diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Comments.java b/tests/sass/src/com/vaadin/sass/testcases/scss/Comments.java index 3dbafc9d43..c76bbb8458 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/scss/Comments.java +++ b/tests/sass/src/com/vaadin/sass/testcases/scss/Comments.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.testcases.scss; @@ -9,9 +21,6 @@ import java.net.URISyntaxException; import junit.framework.Assert; -import org.junit.Test; -import org.w3c.css.sac.CSSException; - import com.vaadin.sass.AbstractTestBase; import com.vaadin.sass.ScssStylesheet; import com.vaadin.sass.handler.SCSSDocumentHandler; @@ -19,6 +28,9 @@ import com.vaadin.sass.handler.SCSSDocumentHandlerImpl; import com.vaadin.sass.parser.Parser; import com.vaadin.sass.tree.CommentNode; +import org.junit.Test; +import org.w3c.css.sac.CSSException; + public class Comments extends AbstractTestBase { String scss = "/scss/comments.scss"; String css = "/css/comments.css"; diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/ControlDirectives.java b/tests/sass/src/com/vaadin/sass/testcases/scss/ControlDirectives.java index 45e3752178..033bbb0a1f 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/scss/ControlDirectives.java +++ b/tests/sass/src/com/vaadin/sass/testcases/scss/ControlDirectives.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.testcases.scss; diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Extends.java b/tests/sass/src/com/vaadin/sass/testcases/scss/Extends.java index 87a2cec00b..f52a1d2f8b 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/scss/Extends.java +++ b/tests/sass/src/com/vaadin/sass/testcases/scss/Extends.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.testcases.scss; diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Functions.java b/tests/sass/src/com/vaadin/sass/testcases/scss/Functions.java index e8f2f26b14..d2e890c052 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/scss/Functions.java +++ b/tests/sass/src/com/vaadin/sass/testcases/scss/Functions.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.testcases.scss; diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Imports.java b/tests/sass/src/com/vaadin/sass/testcases/scss/Imports.java index 035576a381..8c609273a1 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/scss/Imports.java +++ b/tests/sass/src/com/vaadin/sass/testcases/scss/Imports.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.testcases.scss; diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/MicrosoftExtensions.java b/tests/sass/src/com/vaadin/sass/testcases/scss/MicrosoftExtensions.java index 08580fd9b2..5460700db4 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/scss/MicrosoftExtensions.java +++ b/tests/sass/src/com/vaadin/sass/testcases/scss/MicrosoftExtensions.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.testcases.scss; diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Mixins.java b/tests/sass/src/com/vaadin/sass/testcases/scss/Mixins.java index 9dc5ec5a5e..c801ab1437 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/scss/Mixins.java +++ b/tests/sass/src/com/vaadin/sass/testcases/scss/Mixins.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.testcases.scss; diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/NestedProperties.java b/tests/sass/src/com/vaadin/sass/testcases/scss/NestedProperties.java index b238cea9ae..2f57934086 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/scss/NestedProperties.java +++ b/tests/sass/src/com/vaadin/sass/testcases/scss/NestedProperties.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.testcases.scss; diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Nesting.java b/tests/sass/src/com/vaadin/sass/testcases/scss/Nesting.java index 0d5790c7dc..55365c78e1 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/scss/Nesting.java +++ b/tests/sass/src/com/vaadin/sass/testcases/scss/Nesting.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.testcases.scss; diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/ParentImports.java b/tests/sass/src/com/vaadin/sass/testcases/scss/ParentImports.java index e775b33880..8b12f3b7e9 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/scss/ParentImports.java +++ b/tests/sass/src/com/vaadin/sass/testcases/scss/ParentImports.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.testcases.scss; diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/ParentSelector.java b/tests/sass/src/com/vaadin/sass/testcases/scss/ParentSelector.java index 14c7c6543a..7ac2450bfc 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/scss/ParentSelector.java +++ b/tests/sass/src/com/vaadin/sass/testcases/scss/ParentSelector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.testcases.scss; diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Semicolons.java b/tests/sass/src/com/vaadin/sass/testcases/scss/Semicolons.java index 54f26a4f8f..9dd8a38bfe 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/scss/Semicolons.java +++ b/tests/sass/src/com/vaadin/sass/testcases/scss/Semicolons.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.testcases.scss; diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Variables.java b/tests/sass/src/com/vaadin/sass/testcases/scss/Variables.java index 61208229cf..010a2085ba 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/scss/Variables.java +++ b/tests/sass/src/com/vaadin/sass/testcases/scss/Variables.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.testcases.scss; diff --git a/tests/sass/src/com/vaadin/sass/testcases/visitor/ImportVisitorTest.java b/tests/sass/src/com/vaadin/sass/testcases/visitor/ImportVisitorTest.java index b2858045bb..8459139b4b 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/visitor/ImportVisitorTest.java +++ b/tests/sass/src/com/vaadin/sass/testcases/visitor/ImportVisitorTest.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.testcases.visitor; diff --git a/tests/sass/src/com/vaadin/sass/testcases/visitor/MixinVisitorTest.java b/tests/sass/src/com/vaadin/sass/testcases/visitor/MixinVisitorTest.java index 7f2f18a63a..6b7cfcb2fb 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/visitor/MixinVisitorTest.java +++ b/tests/sass/src/com/vaadin/sass/testcases/visitor/MixinVisitorTest.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.testcases.visitor; diff --git a/tests/sass/src/com/vaadin/sass/testcases/visitor/NestedPropertiesVisitorTest.java b/tests/sass/src/com/vaadin/sass/testcases/visitor/NestedPropertiesVisitorTest.java index 402330755c..3885869b72 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/visitor/NestedPropertiesVisitorTest.java +++ b/tests/sass/src/com/vaadin/sass/testcases/visitor/NestedPropertiesVisitorTest.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.testcases.visitor; diff --git a/tests/sass/src/com/vaadin/sass/tree/ImportNodeTest.java b/tests/sass/src/com/vaadin/sass/tree/ImportNodeTest.java index 723e1ada4e..b3a1c8f318 100644 --- a/tests/sass/src/com/vaadin/sass/tree/ImportNodeTest.java +++ b/tests/sass/src/com/vaadin/sass/tree/ImportNodeTest.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.sass.tree; diff --git a/tests/server-side/com/vaadin/tests/data/converter/ConverterFactory.java b/tests/server-side/com/vaadin/tests/data/converter/ConverterFactory.java index 19a470d816..6393d61981 100644 --- a/tests/server-side/com/vaadin/tests/data/converter/ConverterFactory.java +++ b/tests/server-side/com/vaadin/tests/data/converter/ConverterFactory.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.data.converter; diff --git a/tests/server-side/com/vaadin/tests/server/component/label/LabelConverters.java b/tests/server-side/com/vaadin/tests/server/component/label/LabelConverters.java index 5ba15cac6c..48279c7c88 100644 --- a/tests/server-side/com/vaadin/tests/server/component/label/LabelConverters.java +++ b/tests/server-side/com/vaadin/tests/server/component/label/LabelConverters.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.server.component.label; diff --git a/tests/server-side/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java b/tests/server-side/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java index 58bc2c4d4c..5db0df4280 100644 --- a/tests/server-side/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java +++ b/tests/server-side/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.server.navigator; diff --git a/tests/server-side/com/vaadin/tests/server/navigator/NavigatorTest.java b/tests/server-side/com/vaadin/tests/server/navigator/NavigatorTest.java index 0507db6700..894b841d38 100644 --- a/tests/server-side/com/vaadin/tests/server/navigator/NavigatorTest.java +++ b/tests/server-side/com/vaadin/tests/server/navigator/NavigatorTest.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.server.navigator; diff --git a/tests/server-side/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java b/tests/server-side/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java index 37c9a7ecd5..e342ee9005 100644 --- a/tests/server-side/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java +++ b/tests/server-side/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.server.navigator; diff --git a/tests/server-side/com/vaadin/tests/util/UniqueSerializableTest.java b/tests/server-side/com/vaadin/tests/util/UniqueSerializableTest.java index 578d983c4d..d62f0df332 100644 --- a/tests/server-side/com/vaadin/tests/util/UniqueSerializableTest.java +++ b/tests/server-side/com/vaadin/tests/util/UniqueSerializableTest.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.util; diff --git a/tests/testbench/META-INF/services/com.vaadin.terminal.gwt.server.AddonContextListener b/tests/testbench/META-INF/services/com.vaadin.terminal.gwt.server.AddonContextListener new file mode 100644 index 0000000000..9b3d9eb082 --- /dev/null +++ b/tests/testbench/META-INF/services/com.vaadin.terminal.gwt.server.AddonContextListener @@ -0,0 +1 @@ +com.vaadin.tests.vaadincontext.TestAddonContextListener
\ No newline at end of file diff --git a/tests/testbench/META-INF/services/com.vaadin.terminal.gwt.server.VaadinContextListener b/tests/testbench/META-INF/services/com.vaadin.terminal.gwt.server.VaadinContextListener deleted file mode 100644 index fd5ebaa53e..0000000000 --- a/tests/testbench/META-INF/services/com.vaadin.terminal.gwt.server.VaadinContextListener +++ /dev/null @@ -1 +0,0 @@ -com.vaadin.tests.vaadincontext.TestVaadinContextListener
\ No newline at end of file diff --git a/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java b/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java index b2148c8f08..6b7b36c3f3 100644 --- a/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java +++ b/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.launcher; diff --git a/tests/testbench/com/vaadin/launcher/DemoLauncher.java b/tests/testbench/com/vaadin/launcher/DemoLauncher.java index 91cdd343c7..d858b91483 100644 --- a/tests/testbench/com/vaadin/launcher/DemoLauncher.java +++ b/tests/testbench/com/vaadin/launcher/DemoLauncher.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.launcher; diff --git a/tests/testbench/com/vaadin/launcher/DevelopmentServerLauncher.java b/tests/testbench/com/vaadin/launcher/DevelopmentServerLauncher.java index cd465bc7cc..6162820dac 100644 --- a/tests/testbench/com/vaadin/launcher/DevelopmentServerLauncher.java +++ b/tests/testbench/com/vaadin/launcher/DevelopmentServerLauncher.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.launcher; diff --git a/tests/testbench/com/vaadin/launcher/util/BrowserLauncher.java b/tests/testbench/com/vaadin/launcher/util/BrowserLauncher.java index 0ade893238..c9b3622894 100644 --- a/tests/testbench/com/vaadin/launcher/util/BrowserLauncher.java +++ b/tests/testbench/com/vaadin/launcher/util/BrowserLauncher.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.launcher.util; diff --git a/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java b/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java index 6991b669a8..ce99f6e70f 100644 --- a/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java +++ b/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/LayoutDemo.java b/tests/testbench/com/vaadin/tests/LayoutDemo.java index e2d858560a..1a3801aecc 100644 --- a/tests/testbench/com/vaadin/tests/LayoutDemo.java +++ b/tests/testbench/com/vaadin/tests/LayoutDemo.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/ModalWindow.java b/tests/testbench/com/vaadin/tests/ModalWindow.java index 340571cd37..84fa761eb4 100644 --- a/tests/testbench/com/vaadin/tests/ModalWindow.java +++ b/tests/testbench/com/vaadin/tests/ModalWindow.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/NativeWindowing.java b/tests/testbench/com/vaadin/tests/NativeWindowing.java index 36cbe48935..70f978a8b1 100644 --- a/tests/testbench/com/vaadin/tests/NativeWindowing.java +++ b/tests/testbench/com/vaadin/tests/NativeWindowing.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/OrderedLayoutSwapComponents.java b/tests/testbench/com/vaadin/tests/OrderedLayoutSwapComponents.java index af73bdc652..25831c8f06 100644 --- a/tests/testbench/com/vaadin/tests/OrderedLayoutSwapComponents.java +++ b/tests/testbench/com/vaadin/tests/OrderedLayoutSwapComponents.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/Parameters.java b/tests/testbench/com/vaadin/tests/Parameters.java index 1e8ca53875..4fb224eb19 100644 --- a/tests/testbench/com/vaadin/tests/Parameters.java +++ b/tests/testbench/com/vaadin/tests/Parameters.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/PerformanceTestBasicComponentRendering.java b/tests/testbench/com/vaadin/tests/PerformanceTestBasicComponentRendering.java index e93ebc52f3..5f92484c6c 100644 --- a/tests/testbench/com/vaadin/tests/PerformanceTestBasicComponentRendering.java +++ b/tests/testbench/com/vaadin/tests/PerformanceTestBasicComponentRendering.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java b/tests/testbench/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java index 66c20009e0..aa8814ce4c 100644 --- a/tests/testbench/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java +++ b/tests/testbench/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/PerformanceTestSubTreeCaching.java b/tests/testbench/com/vaadin/tests/PerformanceTestSubTreeCaching.java index e0a7e2c90c..485843d104 100644 --- a/tests/testbench/com/vaadin/tests/PerformanceTestSubTreeCaching.java +++ b/tests/testbench/com/vaadin/tests/PerformanceTestSubTreeCaching.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/RandomLayoutStress.java b/tests/testbench/com/vaadin/tests/RandomLayoutStress.java index 0390ea8157..711e79a28d 100644 --- a/tests/testbench/com/vaadin/tests/RandomLayoutStress.java +++ b/tests/testbench/com/vaadin/tests/RandomLayoutStress.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/StressComponentsInTable.java b/tests/testbench/com/vaadin/tests/StressComponentsInTable.java index 87ab7fa1d4..7c4cca2b0b 100644 --- a/tests/testbench/com/vaadin/tests/StressComponentsInTable.java +++ b/tests/testbench/com/vaadin/tests/StressComponentsInTable.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TableChangingDatasource.java b/tests/testbench/com/vaadin/tests/TableChangingDatasource.java index 3f87f2fe4c..e9e23be18d 100644 --- a/tests/testbench/com/vaadin/tests/TableChangingDatasource.java +++ b/tests/testbench/com/vaadin/tests/TableChangingDatasource.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TableSelectTest.java b/tests/testbench/com/vaadin/tests/TableSelectTest.java index 823bdfb3c4..fd4ce5d5c8 100644 --- a/tests/testbench/com/vaadin/tests/TableSelectTest.java +++ b/tests/testbench/com/vaadin/tests/TableSelectTest.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestBench.java b/tests/testbench/com/vaadin/tests/TestBench.java index 04f71ce535..b58df225bc 100644 --- a/tests/testbench/com/vaadin/tests/TestBench.java +++ b/tests/testbench/com/vaadin/tests/TestBench.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestCaptionWrapper.java b/tests/testbench/com/vaadin/tests/TestCaptionWrapper.java index d086e0a665..d5669e5689 100644 --- a/tests/testbench/com/vaadin/tests/TestCaptionWrapper.java +++ b/tests/testbench/com/vaadin/tests/TestCaptionWrapper.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestDateField.java b/tests/testbench/com/vaadin/tests/TestDateField.java index 5997ee0199..6cdeb3ffbd 100644 --- a/tests/testbench/com/vaadin/tests/TestDateField.java +++ b/tests/testbench/com/vaadin/tests/TestDateField.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestForAlignments.java b/tests/testbench/com/vaadin/tests/TestForAlignments.java index 83175ecf72..130ec89901 100644 --- a/tests/testbench/com/vaadin/tests/TestForAlignments.java +++ b/tests/testbench/com/vaadin/tests/TestForAlignments.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java b/tests/testbench/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java index c4b96e59b4..78ab9f61ca 100644 --- a/tests/testbench/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java +++ b/tests/testbench/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestForBasicApplicationLayout.java b/tests/testbench/com/vaadin/tests/TestForBasicApplicationLayout.java index eadc787ad8..1692c2fe7b 100644 --- a/tests/testbench/com/vaadin/tests/TestForBasicApplicationLayout.java +++ b/tests/testbench/com/vaadin/tests/TestForBasicApplicationLayout.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java b/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java index 3852c5f13f..81b21c46c3 100644 --- a/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java +++ b/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestForContainerFilterable.java b/tests/testbench/com/vaadin/tests/TestForContainerFilterable.java index f3bd5ab227..eb51ba6a52 100644 --- a/tests/testbench/com/vaadin/tests/TestForContainerFilterable.java +++ b/tests/testbench/com/vaadin/tests/TestForContainerFilterable.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java b/tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java index 982c86781c..eb807504fa 100644 --- a/tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java +++ b/tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestForMultipleStyleNames.java b/tests/testbench/com/vaadin/tests/TestForMultipleStyleNames.java index 17c118803b..252a4c9c1e 100644 --- a/tests/testbench/com/vaadin/tests/TestForMultipleStyleNames.java +++ b/tests/testbench/com/vaadin/tests/TestForMultipleStyleNames.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java b/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java index ea66ed1ab2..628c3cc4e8 100644 --- a/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java +++ b/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestForPreconfiguredComponents.java b/tests/testbench/com/vaadin/tests/TestForPreconfiguredComponents.java index 9a41d719d4..d01879f769 100644 --- a/tests/testbench/com/vaadin/tests/TestForPreconfiguredComponents.java +++ b/tests/testbench/com/vaadin/tests/TestForPreconfiguredComponents.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestForRichTextEditor.java b/tests/testbench/com/vaadin/tests/TestForRichTextEditor.java index 417dde71c8..9d4c679648 100644 --- a/tests/testbench/com/vaadin/tests/TestForRichTextEditor.java +++ b/tests/testbench/com/vaadin/tests/TestForRichTextEditor.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestForStyledUpload.java b/tests/testbench/com/vaadin/tests/TestForStyledUpload.java index 2526941ed1..120cf9a59a 100644 --- a/tests/testbench/com/vaadin/tests/TestForStyledUpload.java +++ b/tests/testbench/com/vaadin/tests/TestForStyledUpload.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java b/tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java index a8d42184a0..61cf9c1c16 100644 --- a/tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java +++ b/tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestForTrees.java b/tests/testbench/com/vaadin/tests/TestForTrees.java index 24d6102f80..c0d8ec3845 100644 --- a/tests/testbench/com/vaadin/tests/TestForTrees.java +++ b/tests/testbench/com/vaadin/tests/TestForTrees.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestForUpload.java b/tests/testbench/com/vaadin/tests/TestForUpload.java index cfb40fc854..d42870b5b1 100644 --- a/tests/testbench/com/vaadin/tests/TestForUpload.java +++ b/tests/testbench/com/vaadin/tests/TestForUpload.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestForWindowOpen.java b/tests/testbench/com/vaadin/tests/TestForWindowOpen.java index 761d9bc106..621bdbfee2 100644 --- a/tests/testbench/com/vaadin/tests/TestForWindowOpen.java +++ b/tests/testbench/com/vaadin/tests/TestForWindowOpen.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestForWindowing.java b/tests/testbench/com/vaadin/tests/TestForWindowing.java index bbd523c0fd..9a3362af8b 100644 --- a/tests/testbench/com/vaadin/tests/TestForWindowing.java +++ b/tests/testbench/com/vaadin/tests/TestForWindowing.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestIFrames.java b/tests/testbench/com/vaadin/tests/TestIFrames.java index 48c4027a79..e0de636f2c 100644 --- a/tests/testbench/com/vaadin/tests/TestIFrames.java +++ b/tests/testbench/com/vaadin/tests/TestIFrames.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java b/tests/testbench/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java index b30cba7fc3..a4e8d184f4 100644 --- a/tests/testbench/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java +++ b/tests/testbench/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java b/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java index 064a04847a..5b3a93e065 100644 --- a/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java +++ b/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java b/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java index 50028137df..50cbe0778b 100644 --- a/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java +++ b/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TestSplitPanel.java b/tests/testbench/com/vaadin/tests/TestSplitPanel.java index 87c8309faf..d1a6ede53c 100644 --- a/tests/testbench/com/vaadin/tests/TestSplitPanel.java +++ b/tests/testbench/com/vaadin/tests/TestSplitPanel.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TreeFilesystem.java b/tests/testbench/com/vaadin/tests/TreeFilesystem.java index f43bcfb576..b311ae32b1 100644 --- a/tests/testbench/com/vaadin/tests/TreeFilesystem.java +++ b/tests/testbench/com/vaadin/tests/TreeFilesystem.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java b/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java index 2458f2dfa1..52dd61dbee 100644 --- a/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java +++ b/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/UpgradingSample.java b/tests/testbench/com/vaadin/tests/UpgradingSample.java index 3090962b71..cf2516fbff 100644 --- a/tests/testbench/com/vaadin/tests/UpgradingSample.java +++ b/tests/testbench/com/vaadin/tests/UpgradingSample.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java b/tests/testbench/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java index 94635d17c4..b91fd65842 100644 --- a/tests/testbench/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java +++ b/tests/testbench/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java b/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java index db17148549..42a9d358c5 100644 --- a/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java +++ b/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests; diff --git a/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java b/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java index 4a029e3373..77596da0f9 100644 --- a/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java +++ b/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.application; diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java b/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java index 17cc4270fb..100c30cdc9 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java +++ b/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.components.abstractcomponent; diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonTabIndex.java b/tests/testbench/com/vaadin/tests/components/button/ButtonTabIndex.java index 048e0698f3..e1c8b2faea 100644 --- a/tests/testbench/com/vaadin/tests/components/button/ButtonTabIndex.java +++ b/tests/testbench/com/vaadin/tests/components/button/ButtonTabIndex.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.components.button; diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java index b65a448830..184f8a9261 100644 --- a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java +++ b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.components.formlayout; diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayouts.java b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayouts.java index e247ce95f7..f2c24feae5 100644 --- a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayouts.java +++ b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayouts.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.components.formlayout; diff --git a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java b/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java index 9ea61b92bb..0b732e5948 100644 --- a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java +++ b/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.components.javascriptcomponent; @@ -21,7 +33,7 @@ import com.vaadin.tests.components.AbstractTestRoot; import com.vaadin.tests.util.Log; import com.vaadin.ui.AbstractJavaScriptComponent; import com.vaadin.ui.HasComponents; -import com.vaadin.ui.JavaScriptCallback; +import com.vaadin.ui.JavaScriptFunction; public class BasicJavaScriptComponent extends AbstractTestRoot { @@ -59,14 +71,14 @@ public class BasicJavaScriptComponent extends AbstractTestRoot { log.log("Got RPC message: " + message); } }); - registerCallback("messageToServer", new JavaScriptCallback() { + addFunction("messageToServer", new JavaScriptFunction() { @Override public void call(JSONArray arguments) throws JSONException { log.log("Got callback message: " + arguments.getString(0)); } }); - registerCallback("reportParentIds", new JavaScriptCallback() { + addFunction("reportParentIds", new JavaScriptFunction() { @Override public void call(JSONArray arguments) throws JSONException { JSONArray parentIds = arguments.getJSONArray(0); @@ -89,7 +101,7 @@ public class BasicJavaScriptComponent extends AbstractTestRoot { }); getRpcProxy(TestRpc.class).sendRpc("RPC message"); - invokeCallback("messageToClient", "Callback message"); + callFunction("messageToClient", "Callback message"); getState() .setMessages( diff --git a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentConnector.js b/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentConnector.js index fe8367d18a..b0ece6217d 100644 --- a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentConnector.js +++ b/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentConnector.js @@ -1,4 +1,5 @@ window.com_vaadin_tests_components_javascriptcomponent_BasicJavaScriptComponent_ExampleWidget = function() { + var self = this; var parentIds = []; var connectorId = this.getConnectorId(); while(connectorId) { @@ -30,7 +31,7 @@ window.com_vaadin_tests_components_javascriptcomponent_BasicJavaScriptComponent_ this.registerRpc({ sendRpc: function(message) { - this.getRpcProxy().sendRpc(message + " processed"); + self.getRpcProxy().sendRpc(message + " processed"); } }); diff --git a/tests/testbench/com/vaadin/tests/components/media/Media.java b/tests/testbench/com/vaadin/tests/components/media/Media.java index a1977c6ba1..ef7fc36c63 100644 --- a/tests/testbench/com/vaadin/tests/components/media/Media.java +++ b/tests/testbench/com/vaadin/tests/components/media/Media.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.components.media; diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java b/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java index 7722e182ff..f822af0779 100644 --- a/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java +++ b/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.components.panel; diff --git a/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java b/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java index bef3cfced8..b450bfe811 100644 --- a/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java +++ b/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.components.popupview; diff --git a/tests/testbench/com/vaadin/tests/components/table/OddEvenRowStyling.java b/tests/testbench/com/vaadin/tests/components/table/OddEvenRowStyling.java index 510abc5600..f6c70f4ffe 100644 --- a/tests/testbench/com/vaadin/tests/components/table/OddEvenRowStyling.java +++ b/tests/testbench/com/vaadin/tests/components/table/OddEvenRowStyling.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.components.table; diff --git a/tests/testbench/com/vaadin/tests/components/table/SortLabelsInTable.java b/tests/testbench/com/vaadin/tests/components/table/SortLabelsInTable.java index d46b9bf01d..cbe06b8f7d 100644 --- a/tests/testbench/com/vaadin/tests/components/table/SortLabelsInTable.java +++ b/tests/testbench/com/vaadin/tests/components/table/SortLabelsInTable.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.components.table; diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java b/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java index bad6359889..ff3e52505f 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.components.tree; diff --git a/tests/testbench/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java b/tests/testbench/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java index a92a9e045e..e0f68225cd 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.components.treetable; diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java index e688e039eb..1949697956 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.components.treetable; diff --git a/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java b/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java index 184bde9b14..56be00b923 100644 --- a/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java +++ b/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.components.window; diff --git a/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java b/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java index 8a1921cd50..abc3f7f010 100644 --- a/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java +++ b/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.dd; diff --git a/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java b/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java index 6f7dc820ee..d70c788fa4 100644 --- a/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java +++ b/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.dd; diff --git a/tests/testbench/com/vaadin/tests/extensions/BasicExtension.java b/tests/testbench/com/vaadin/tests/extensions/BasicExtension.java index 551d24735a..29e37d9847 100644 --- a/tests/testbench/com/vaadin/tests/extensions/BasicExtension.java +++ b/tests/testbench/com/vaadin/tests/extensions/BasicExtension.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.extensions; diff --git a/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.java b/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.java index e9505589a5..e774ee0286 100644 --- a/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.java +++ b/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.extensions; diff --git a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java index cb26cd7a83..de028cf0c3 100644 --- a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java +++ b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.extensions; diff --git a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java index 001e913734..b389b77e97 100644 --- a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java +++ b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.extensions; diff --git a/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java b/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java index a16f131475..9d09436e45 100644 --- a/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java +++ b/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.extensions; @@ -11,7 +23,7 @@ import com.vaadin.terminal.WrappedRequest; import com.vaadin.tests.components.AbstractTestRoot; import com.vaadin.tests.util.Log; import com.vaadin.ui.JavaScript; -import com.vaadin.ui.JavaScriptCallback; +import com.vaadin.ui.JavaScriptFunction; public class JavascriptManagerTest extends AbstractTestRoot { @@ -21,7 +33,7 @@ public class JavascriptManagerTest extends AbstractTestRoot { protected void setup(WrappedRequest request) { addComponent(log); final JavaScript js = JavaScript.getCurrent(); - js.addCallback("testing.doTest", new JavaScriptCallback() { + js.addFunction("testing.doTest", new JavaScriptFunction() { @Override public void call(JSONArray arguments) throws JSONException { log.log("Got " + arguments.length() + " arguments"); @@ -31,7 +43,7 @@ public class JavascriptManagerTest extends AbstractTestRoot { + arguments.getJSONObject(2).getBoolean("p")); log.log("Argument 4 is JSONObject.NULL: " + (arguments.get(3) == JSONObject.NULL)); - js.removeCallback("testing.doTest"); + js.removeFunction("testing.doTest"); } }); js.execute("window.testing.doTest(42, 'text', {p: true}, null)"); diff --git a/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java b/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java index cb05bde493..b33162d714 100644 --- a/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java +++ b/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.extensions; @@ -16,7 +28,7 @@ import com.vaadin.terminal.WrappedRequest; import com.vaadin.tests.components.AbstractTestRoot; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.JavaScriptCallback; +import com.vaadin.ui.JavaScriptFunction; import com.vaadin.ui.Notification; public class SimpleJavaScriptExtensionTest extends AbstractTestRoot { @@ -56,7 +68,7 @@ public class SimpleJavaScriptExtensionTest extends AbstractTestRoot { Notification.show(getState().getPrefix() + message); } }); - registerCallback("greetToServer", new JavaScriptCallback() { + addFunction("greetToServer", new JavaScriptFunction() { @Override public void call(JSONArray arguments) throws JSONException { Notification.show(getState().getPrefix() @@ -81,7 +93,7 @@ public class SimpleJavaScriptExtensionTest extends AbstractTestRoot { } public void greetCallback(String message) { - invokeCallback("greetToClient", message); + callFunction("greetToClient", message); } } diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java index 8eef5c08e8..00d336de92 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a1; @@ -16,7 +28,6 @@ import com.vaadin.ui.Root; * a%20form%20based%20on%20a%20bean%20-%20Vaadin%206%20style%20Form * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ public class AutoGeneratingForm extends Root { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java index 3907209097..43e404b461 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a1; @@ -14,7 +26,6 @@ import com.vaadin.ui.VerticalLayout; * https://vaadin.com/wiki/-/wiki/Main/Creating%20a%20basic%20application * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ public class BasicApplication extends Root { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java index c175fd6065..0a04aead7f 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a1; @@ -14,7 +26,6 @@ import com.vaadin.ui.TextField; * %20that%20preserves%20state%20on%20refresh * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ public class CreatingPreserveState extends Root { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DefineRootTheme.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DefineRootTheme.java index 3bd17547fa..5296f03c30 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DefineRootTheme.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DefineRootTheme.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a1; @@ -15,7 +27,6 @@ import com.vaadin.ui.VerticalLayout; * https://vaadin.com/wiki/-/wiki/Main/Defining%20the%20theme%20for%20a%20Root * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ @Theme("hello-theme") diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java index cf4c3b9267..616fea7ff2 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a1; @@ -18,7 +30,6 @@ import com.vaadin.ui.Root; * %20with%20different%20features%20for%20different%20clients * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ public class DifferentFeaturesForDifferentClients extends Application { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentRootAndApplication.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentRootAndApplication.java index ed0a5ba955..d53ede3518 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentRootAndApplication.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentRootAndApplication.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a1; @@ -18,7 +30,6 @@ import com.vaadin.ui.Root; * %20Root%20and%20Application * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ public class FindCurrentRootAndApplication extends Root { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java index 89c6ef52c4..d2b1ed95e0 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a1; @@ -16,7 +28,6 @@ import com.vaadin.ui.VerticalLayout; * https://vaadin.com/wiki/-/wiki/Main/Creating%20multi%20tab%20applications * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ public class MultiTabApplication extends Root { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java index eb297ebd36..906ace6f53 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a1; @@ -20,7 +32,6 @@ import com.vaadin.ui.TextField; * %20to%20validate%20input * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ public class UsingBeanValidation extends Root { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java index bf497a7b86..db6ee57477 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a1; @@ -17,7 +29,6 @@ import com.vaadin.ui.Root; * https://vaadin.com/wiki/-/wiki/Main/Using%20URI%20fragments * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ public class UsingUriFragments extends Root { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java index 426ef3525e..64b643a185 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a1; @@ -14,7 +26,6 @@ import com.vaadin.ui.Root; * parameters%20or%20screen%20size%20when%20initializing%20an%20application * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ public class UsingXyzWhenInitializing extends Root { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java index 78a945901d..c6109eebcd 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a2; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateRoot.java index 61b5f98f99..0ed4a7781e 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateRoot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateRoot.java @@ -11,7 +11,6 @@ import com.vaadin.ui.Root; * 20in%20the%20shared%20state * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet") diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponent.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponent.java index b4dab09807..b85d49172b 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponent.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponent.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a2; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponentRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponentRoot.java index 77792436f5..ef692ef8a3 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponentRoot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponentRoot.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a2; @@ -18,7 +30,6 @@ import com.vaadin.ui.Root; * .com/wiki/-/wiki/Main/Using%20RPC%20to%20send%20events%20to%20the%20client * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet") diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java index 98ff0386b3..0608cc092e 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a2; @@ -18,7 +30,6 @@ import com.vaadin.terminal.gwt.client.ui.layout.ElementResizeListener; * ayout and https://vaadin.com/wiki/-/wiki/Main/Complex%20widget%20layouts * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ public class MyPickerConnector extends AbstractComponentConnector implements diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java index b47f555640..f906661b51 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a2; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateRoot.java index 135d36828d..69c2a0d040 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateRoot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateRoot.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a2; @@ -15,7 +27,6 @@ import com.vaadin.ui.Root; * in%20the%20shared%20state * * @author Vaadin Ltd - * @version @VERSION@ * @since 7.0.0 */ @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet") diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java index bd4cfd5839..6c247cae44 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a3; @@ -23,7 +35,7 @@ public class Analytics extends AbstractJavaScriptExtension { private void pushCommand(Object... commandAndArguments) { // Cast to Object to use Object[] commandAndArguments as the first // varargs argument instead of as the full varargs argument array. - invokeCallback("pushCommand", (Object) commandAndArguments); + callFunction("pushCommand", (Object) commandAndArguments); } protected void extend(Root root) { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsRoot.java index 6f59aa765e..df588b6f2d 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsRoot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsRoot.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a3; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java index 2dc6dea432..8e415e4e68 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a3; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java index 9f452c61b0..9a477bf6dd 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a3; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRoot.java index dc46fe0c29..5e19d8ab1a 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRoot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRoot.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a3; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java index f763f51118..eb1277851c 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a3; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Flot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Flot.java index 946a67d7fd..99e6418fdc 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Flot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Flot.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a3; @@ -12,7 +24,7 @@ import com.vaadin.annotations.JavaScript; import com.vaadin.external.json.JSONArray; import com.vaadin.external.json.JSONException; import com.vaadin.ui.AbstractJavaScriptComponent; -import com.vaadin.ui.JavaScriptCallback; +import com.vaadin.ui.JavaScriptFunction; import com.vaadin.ui.Notification; @JavaScript({ @@ -27,7 +39,7 @@ public class Flot extends AbstractJavaScriptComponent { + dataIndex + "]"); } }); - registerCallback("onPlotClick", new JavaScriptCallback() { + addFunction("onPlotClick", new JavaScriptFunction() { @Override public void call(JSONArray arguments) throws JSONException { int seriesIndex = arguments.getInt(0); @@ -52,7 +64,7 @@ public class Flot extends AbstractJavaScriptComponent { public void highlight(int seriesIndex, int dataIndex) { getRpcProxy(FlotHighlightRpc.class).highlight(seriesIndex, dataIndex); - invokeCallback("highlight", seriesIndex, dataIndex); + callFunction("highlight", seriesIndex, dataIndex); } @Override diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java index 93730a8640..a1c04db794 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a3; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptRoot.java index 2b5e7337c8..f0584c2147 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptRoot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptRoot.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a3; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButton.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButton.java index 003eab7e9c..366dab16f0 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButton.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButton.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a3; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonRoot.java index 9cffdc9e63..1bf30b0054 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonRoot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonRoot.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.minitutorials.v7a3; diff --git a/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java b/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java index 7c8aed1992..da4b5dd7d9 100644 --- a/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java +++ b/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.serialization; diff --git a/tests/testbench/com/vaadin/tests/util/SampleDirectory.java b/tests/testbench/com/vaadin/tests/util/SampleDirectory.java index c22eac9a6e..8f3f85a075 100644 --- a/tests/testbench/com/vaadin/tests/util/SampleDirectory.java +++ b/tests/testbench/com/vaadin/tests/util/SampleDirectory.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.util; diff --git a/tests/testbench/com/vaadin/tests/vaadincontext/BoostrapModify.html b/tests/testbench/com/vaadin/tests/vaadincontext/BoostrapModify.html index d5ab5af108..84c02254b4 100644 --- a/tests/testbench/com/vaadin/tests/vaadincontext/BoostrapModify.html +++ b/tests/testbench/com/vaadin/tests/vaadincontext/BoostrapModify.html @@ -23,8 +23,13 @@ </tr> <tr> <td>assertText</td> - <td>//h1</td> - <td>This is a heading</td> + <td>//div[1]</td> + <td>Added by modifyBootstrapPage</td> +</tr> +<tr> + <td>assertText</td> + <td>//div[2]</td> + <td>Added by modifyBootstrapFragment</td> </tr> </tbody></table> </body> diff --git a/tests/testbench/com/vaadin/tests/vaadincontext/BoostrapModifyRoot.java b/tests/testbench/com/vaadin/tests/vaadincontext/BoostrapModifyRoot.java index 3af096ff37..ede8d51192 100644 --- a/tests/testbench/com/vaadin/tests/vaadincontext/BoostrapModifyRoot.java +++ b/tests/testbench/com/vaadin/tests/vaadincontext/BoostrapModifyRoot.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.vaadincontext; diff --git a/tests/testbench/com/vaadin/tests/vaadincontext/TestAddonContextListener.java b/tests/testbench/com/vaadin/tests/vaadincontext/TestAddonContextListener.java new file mode 100644 index 0000000000..4c93d70b36 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/vaadincontext/TestAddonContextListener.java @@ -0,0 +1,66 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * 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. + */ + +package com.vaadin.tests.vaadincontext; + +import org.jsoup.nodes.Element; +import org.jsoup.parser.Tag; + +import com.vaadin.terminal.gwt.server.BootstrapFragmentResponse; +import com.vaadin.terminal.gwt.server.BootstrapListener; +import com.vaadin.terminal.gwt.server.BootstrapPageResponse; +import com.vaadin.terminal.gwt.server.BootstrapResponse; +import com.vaadin.terminal.gwt.server.AddonContextEvent; +import com.vaadin.terminal.gwt.server.AddonContextListener; +import com.vaadin.ui.Root; + +public class TestAddonContextListener implements AddonContextListener { + @Override + public void contextCreated(AddonContextEvent event) { + event.getAddonContext().addBootstrapListener(new BootstrapListener() { + @Override + public void modifyBootstrapFragment( + BootstrapFragmentResponse response) { + if (shouldModify(response)) { + Element heading = new Element(Tag.valueOf("div"), "") + .text("Added by modifyBootstrapFragment"); + response.getFragmentNodes().add(0, heading); + } + } + + private boolean shouldModify(BootstrapResponse response) { + Root root = response.getRoot(); + boolean shouldModify = root != null + && root.getClass() == BoostrapModifyRoot.class; + return shouldModify; + } + + @Override + public void modifyBootstrapPage(BootstrapPageResponse response) { + if (shouldModify(response)) { + response.getDocument().body().child(0) + .before("<div>Added by modifyBootstrapPage</div>"); + } + } + }); + } + + @Override + public void contextDestoryed(AddonContextEvent event) { + // Nothing to do + } + +} diff --git a/tests/testbench/com/vaadin/tests/vaadincontext/TestVaadinContextListener.java b/tests/testbench/com/vaadin/tests/vaadincontext/TestVaadinContextListener.java deleted file mode 100644 index fa2767a023..0000000000 --- a/tests/testbench/com/vaadin/tests/vaadincontext/TestVaadinContextListener.java +++ /dev/null @@ -1,33 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.tests.vaadincontext; - -import com.vaadin.terminal.gwt.server.BootstrapListener; -import com.vaadin.terminal.gwt.server.BootstrapResponse; -import com.vaadin.terminal.gwt.server.VaadinContextEvent; -import com.vaadin.terminal.gwt.server.VaadinContextListener; -import com.vaadin.ui.Root; - -public class TestVaadinContextListener implements VaadinContextListener { - @Override - public void contextCreated(VaadinContextEvent event) { - event.getVaadinContext().addBootstrapListener(new BootstrapListener() { - @Override - public void modifyBootstrap(BootstrapResponse response) { - Root root = response.getRoot(); - if (root != null && root.getClass() == BoostrapModifyRoot.class) { - response.getApplicationTag().before( - "<h1>This is a heading</h1>"); - } - } - }); - } - - @Override - public void contextDestoryed(VaadinContextEvent event) { - // Nothing to do - } - -} diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java index c151e6e90b..a10d318991 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.widgetset.client; diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/ComplexTestBean.java b/tests/testbench/com/vaadin/tests/widgetset/client/ComplexTestBean.java index 47f8bedab1..af3a278559 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/ComplexTestBean.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/ComplexTestBean.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.widgetset.client; diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java index 11d01c552e..35c15aaef8 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.widgetset.client; diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestConnector.java index 32e87ce6a4..3977ff7f71 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.widgetset.client; diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestRpc.java b/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestRpc.java index eedbda0fb8..47a26b7408 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestRpc.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestRpc.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.widgetset.client; diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/SimpleTestBean.java b/tests/testbench/com/vaadin/tests/widgetset/client/SimpleTestBean.java index 43ad51e758..97e333c393 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/SimpleTestBean.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/SimpleTestBean.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.widgetset.client; diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java index a5b89e9c1e..8bffbb8e5e 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.widgetset.client.helloworldfeature; diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java index 3848ad169a..4a4d21cf4f 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.widgetset.client.helloworldfeature; diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java index 980d76043a..968eb463e2 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.widgetset.client.helloworldfeature; diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java index 913c8bdd1c..be90719279 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.widgetset.client.helloworldfeature; diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java index 838eff1e5c..63947c2435 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.widgetset.client.minitutorials.v7a2; diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java index 952e4b83c5..9c0d454e19 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.widgetset.client.minitutorials.v7a2; diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java index ab03d51806..729a867f16 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.widgetset.client.minitutorials.v7a2; diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java index bad782e462..57579d3ec2 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.widgetset.client.minitutorials.v7a2; diff --git a/tests/testbench/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java b/tests/testbench/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java index 44f91538b6..5987bfb539 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java +++ b/tests/testbench/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.widgetset.server; diff --git a/tests/testbench/com/vaadin/tests/widgetset/server/SerializerTestExtension.java b/tests/testbench/com/vaadin/tests/widgetset/server/SerializerTestExtension.java index 99c05e8f76..8cdcc0fe3a 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/server/SerializerTestExtension.java +++ b/tests/testbench/com/vaadin/tests/widgetset/server/SerializerTestExtension.java @@ -1,5 +1,17 @@ /* -@VaadinApache2LicenseForJavaFiles@ + * Copyright 2011 Vaadin Ltd. + * + * 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. */ package com.vaadin.tests.widgetset.server; |
