diff options
1905 files changed, 15158 insertions, 14117 deletions
diff --git a/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java b/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java index cd85ca6a3f..bef52514fb 100644 --- a/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java +++ b/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java @@ -27,18 +27,17 @@ import java.util.Properties; public class FetchReleaseNotesAuthors { private static final String template = "<li class=\"author\">@author@</li>"; - public static void main(String[] args) throws IOException, - InterruptedException { + public static void main(String[] args) + throws IOException, InterruptedException { Properties authorMap = new Properties(); String authorsFilename = FetchReleaseNotesAuthors.class.getPackage() - .getName().replace(".", "/") - + "/authormap.properties"; + .getName().replace(".", "/") + "/authormap.properties"; InputStream s = FetchReleaseNotesAuthors.class.getClassLoader() .getResourceAsStream(authorsFilename); if (s == null) { - System.err.println("Author mapping file " + authorsFilename - + " not found!"); + System.err.println( + "Author mapping file " + authorsFilename + " not found!"); } authorMap.load(s); @@ -53,8 +52,8 @@ public class FetchReleaseNotesAuthors { if (p.exitValue() != 0) { System.err.println("Exit code: " + p.exitValue()); } - BufferedReader b = new BufferedReader(new InputStreamReader( - p.getInputStream())); + BufferedReader b = new BufferedReader( + new InputStreamReader(p.getInputStream())); String line = ""; List<String> authors = new ArrayList<String>(); @@ -77,8 +76,8 @@ public class FetchReleaseNotesAuthors { private static String getPreviousVersion(String version) { String[] versionNumbers = version.split("\\."); if (versionNumbers.length > 4 || versionNumbers.length < 3) { - throw new IllegalArgumentException("Cannot parse version: " - + version); + throw new IllegalArgumentException( + "Cannot parse version: " + version); } int major = Integer.parseInt(versionNumbers[0]); int minor = Integer.parseInt(versionNumbers[1]); diff --git a/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java b/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java index 0cd06890eb..a763934464 100644 --- a/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java +++ b/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java @@ -27,8 +27,7 @@ import org.apache.commons.io.IOUtils; public class FetchReleaseNotesTickets { private static final String queryURL = "https://dev.vaadin.com/query?status=pending-release&status=released&@milestone@&resolution=fixed&col=id&col=summary&col=owner&col=type&col=priority&col=component&col=version&col=bfptime&col=fv&format=tab&order=id"; - private static final String ticketTemplate = "<tr>" - + "@badge@" // + private static final String ticketTemplate = "<tr>" + "@badge@" // + "<td class=\"ticket\"><a href=\"https://dev.vaadin.com/ticket/@ticket@\">#@ticket@</a></td>" // + "<td>@description@</td>" // + "</tr>"; // @@ -105,7 +104,8 @@ public class FetchReleaseNotesTickets { String badge = "<td></td>"; if (fields.length >= 8 && !fields[7].equals("")) { badge = "<td class=\"bfp\"><span class=\"bfp\">Priority</span></td>"; - } else if (fields.length >= 9 && fields[8].equalsIgnoreCase("true")) { + } else if (fields.length >= 9 + && fields[8].equalsIgnoreCase("true")) { badge = "<td class=\"fv\"><span class=\"fv\">Vote</span></td>"; } @@ -163,9 +163,9 @@ public class FetchReleaseNotesTickets { } private static void usage() { - System.err.println("Usage: " - + FetchReleaseNotesTickets.class.getSimpleName() - + " -Dvaadin.version=<version>"); + System.err.println( + "Usage: " + FetchReleaseNotesTickets.class.getSimpleName() + + " -Dvaadin.version=<version>"); System.exit(1); } } diff --git a/buildhelpers/src/main/java/com/vaadin/buildhelpers/CompileTheme.java b/buildhelpers/src/main/java/com/vaadin/buildhelpers/CompileTheme.java index d97025bdb6..83ce4608d9 100644 --- a/buildhelpers/src/main/java/com/vaadin/buildhelpers/CompileTheme.java +++ b/buildhelpers/src/main/java/com/vaadin/buildhelpers/CompileTheme.java @@ -64,11 +64,11 @@ public class CompileTheme { // Regular theme try { processSassTheme(themeFolder, themeName, "styles", version); - System.out.println("Compiling theme " + themeName - + " styles successful"); + System.out.println( + "Compiling theme " + themeName + " styles successful"); } catch (Exception e) { - System.err.println("Compiling theme " + themeName - + " styles failed"); + System.err + .println("Compiling theme " + themeName + " styles failed"); e.printStackTrace(); } // Legacy theme w/o .themename{} wrapping @@ -82,8 +82,8 @@ public class CompileTheme { + " legacy-styles successful"); } } catch (Exception e) { - System.err.println("Compiling theme " + themeName - + " legacy-styles failed"); + System.err.println( + "Compiling theme " + themeName + " legacy-styles failed"); e.printStackTrace(); } } @@ -103,8 +103,8 @@ public class CompileTheme { ScssStylesheet scss = ScssStylesheet.get(sassFile); if (scss == null) { - throw new IllegalArgumentException("SASS file: " + sassFile - + " not found"); + throw new IllegalArgumentException( + "SASS file: " + sassFile + " not found"); } scss.compile(); String filteredScss = scss.printState().replace("@version@", version); @@ -128,8 +128,8 @@ public class CompileTheme { boolean ok = newCss.renameTo(oldCss); if (!ok) { - throw new RuntimeException("Rename " + newCss + " -> " + oldCss - + " failed"); + throw new RuntimeException( + "Rename " + newCss + " -> " + oldCss + " failed"); } } @@ -142,8 +142,8 @@ public class CompileTheme { // hiding other classpath issues Class<?> smartSpritesClass = org.carrot2.labs.smartsprites.SmartSprites.class; } catch (NoClassDefFoundError e) { - System.err - .println("Could not find smartsprites. No sprites were generated. The theme should still work."); + System.err.println( + "Could not find smartsprites. No sprites were generated. The theme should still work."); return; } diff --git a/buildhelpers/src/main/java/com/vaadin/buildhelpers/GeneratePackageExports.java b/buildhelpers/src/main/java/com/vaadin/buildhelpers/GeneratePackageExports.java index d4ad3f838c..9b8f1d1fb1 100644 --- a/buildhelpers/src/main/java/com/vaadin/buildhelpers/GeneratePackageExports.java +++ b/buildhelpers/src/main/java/com/vaadin/buildhelpers/GeneratePackageExports.java @@ -44,11 +44,10 @@ public class GeneratePackageExports { public static void main(String[] args) { if (args.length < 2) { - System.err - .println("Invalid number of parameters\n" - + "Usage: java -cp .. GenerateManifest <package.jar> <accepted package prefixes>\n" - + "Use -Dvaadin.version to specify the version to be used for the packages\n" - + "Use -DincludeNumberPackages=1 to include package names which start with a number (not 100% OSGi compatible)"); + System.err.println("Invalid number of parameters\n" + + "Usage: java -cp .. GenerateManifest <package.jar> <accepted package prefixes>\n" + + "Use -Dvaadin.version to specify the version to be used for the packages\n" + + "Use -DincludeNumberPackages=1 to include package names which start with a number (not 100% OSGi compatible)"); System.exit(1); } @@ -178,7 +177,8 @@ public class GeneratePackageExports { } private static HashSet<String> getPackages(JarFile jar, - List<String> acceptedPackagePrefixes, boolean includeNumberPackages) { + List<String> acceptedPackagePrefixes, + boolean includeNumberPackages) { HashSet<String> packages = new HashSet<String>(); Pattern startsWithNumber = Pattern.compile("\\.\\d"); @@ -198,10 +198,11 @@ public class GeneratePackageExports { } int lastSlash = entry.getName().lastIndexOf('/'); - String pkg = entry.getName().substring(0, lastSlash) - .replace('/', '.'); + String pkg = entry.getName().substring(0, lastSlash).replace('/', + '.'); - if (!includeNumberPackages && startsWithNumber.matcher(pkg).find()) { + if (!includeNumberPackages + && startsWithNumber.matcher(pkg).find()) { continue; } diff --git a/buildhelpers/src/main/java/com/vaadin/buildhelpers/ManifestWriter.java b/buildhelpers/src/main/java/com/vaadin/buildhelpers/ManifestWriter.java index 9e9b29c4a1..90541f6231 100644 --- a/buildhelpers/src/main/java/com/vaadin/buildhelpers/ManifestWriter.java +++ b/buildhelpers/src/main/java/com/vaadin/buildhelpers/ManifestWriter.java @@ -85,9 +85,9 @@ public class ManifestWriter { fos.write(getBytes()); fos.close(); } catch (IOException e) { - System.err.println("Writing to file '" - + newMfFile.getAbsolutePath() + "' failed because: " - + e.getMessage()); + System.err.println( + "Writing to file '" + newMfFile.getAbsolutePath() + + "' failed because: " + e.getMessage()); status = 1; } } @@ -100,9 +100,9 @@ public class ManifestWriter { is = new FileInputStream(newMfFile); checkMf.read(is); } catch (IOException e) { - System.err.println("Reading from file '" - + newMfFile.getAbsolutePath() + "' failed because: " - + e.getMessage()); + System.err.println( + "Reading from file '" + newMfFile.getAbsolutePath() + + "' failed because: " + e.getMessage()); status = 1; } } @@ -112,8 +112,8 @@ public class ManifestWriter { System.out.println("Updating manifest in JAR " + jarFilename); try { // The "mf" order must correspond with manifest-jarfile order - Process process = Runtime.getRuntime().exec( - new String[] { "jar", "umf", + Process process = Runtime.getRuntime() + .exec(new String[] { "jar", "umf", newMfFile.getAbsolutePath(), jarFilename }); int exitValue = process.waitFor(); if (exitValue != 0) { @@ -123,14 +123,14 @@ public class ManifestWriter { while (reader.ready()) { System.err.println("jar: " + reader.readLine()); } - System.err - .println("The 'jar' command returned with exit value " + System.err.println( + "The 'jar' command returned with exit value " + exitValue); status = 1; } } catch (IOException e) { - System.err.println("Failed to execute 'jar' command. " - + e.getMessage()); + System.err.println( + "Failed to execute 'jar' command. " + e.getMessage()); status = 1; } catch (InterruptedException e) { System.err diff --git a/client-compiler/src/main/java/com/vaadin/sass/linker/SassLinker.java b/client-compiler/src/main/java/com/vaadin/sass/linker/SassLinker.java index dda6733384..02ad5f4896 100644 --- a/client-compiler/src/main/java/com/vaadin/sass/linker/SassLinker.java +++ b/client-compiler/src/main/java/com/vaadin/sass/linker/SassLinker.java @@ -109,30 +109,31 @@ public class SassLinker extends AbstractLinker { // Store the file info for the compilation scssFiles.add(new FileInfo(tempfile, partialPath)); } else { - logger.log(TreeLogger.WARN, "Duplicate file " - + tempfile.getPath()); + logger.log(TreeLogger.WARN, + "Duplicate file " + tempfile.getPath()); } } catch (IOException e) { logger.log(TreeLogger.ERROR, - "Could not write temporary file " + fileName, e); + "Could not write temporary file " + fileName, + e); } } } // Compile the files and store them in the artifact - logger.log(TreeLogger.INFO, "Processing " + scssFiles.size() - + " Sass file(s)"); + logger.log(TreeLogger.INFO, + "Processing " + scssFiles.size() + " Sass file(s)"); for (FileInfo fileInfo : scssFiles) { logger.log(TreeLogger.INFO, " " + fileInfo.originalScssPath + " -> " + fileInfo.getOriginalCssPath()); try { - ScssStylesheet scss = ScssStylesheet.get(fileInfo - .getAbsolutePath()); + ScssStylesheet scss = ScssStylesheet + .get(fileInfo.getAbsolutePath()); if (!fileInfo.isMixin()) { scss.compile(); - InputStream is = new ByteArrayInputStream(scss - .printState().getBytes()); + InputStream is = new ByteArrayInputStream( + scss.printState().getBytes()); toReturn.add(this.emitInputStream(logger, is, fileInfo.getOriginalCssPath())); @@ -143,10 +144,8 @@ public class SassLinker extends AbstractLinker { logger.log(TreeLogger.ERROR, "SCSS compilation failed for " + fileInfo.getOriginalCssPath(), e); } catch (IOException e) { - logger.log( - TreeLogger.ERROR, - "Could not write CSS file for " - + fileInfo.getOriginalCssPath(), e); + logger.log(TreeLogger.ERROR, "Could not write CSS file for " + + fileInfo.getOriginalCssPath(), e); } catch (Exception e) { logger.log(TreeLogger.ERROR, "SCSS compilation failed for " + fileInfo.getOriginalCssPath(), e); diff --git a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/AcceptCriteriaFactoryGenerator.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/AcceptCriteriaFactoryGenerator.java index 2d08329e9a..5ccbbc9d19 100644 --- a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/AcceptCriteriaFactoryGenerator.java +++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/AcceptCriteriaFactoryGenerator.java @@ -89,7 +89,8 @@ public class AcceptCriteriaFactoryGenerator extends Generator { ClassSourceFileComposerFactory composer = null; composer = new ClassSourceFileComposerFactory(packageName, className); composer.addImport("com.google.gwt.core.client.GWT"); - composer.setSuperclass("com.vaadin.client.ui.dd.VAcceptCriterionFactory"); + composer.setSuperclass( + "com.vaadin.client.ui.dd.VAcceptCriterionFactory"); SourceWriter sourceWriter = composer.createSourceWriter(context, printWriter); @@ -100,9 +101,8 @@ public class AcceptCriteriaFactoryGenerator extends Generator { sourceWriter.println("}"); // commit generated class context.commit(logger, printWriter); - logger.log(Type.INFO, - "Done. (" + (new Date().getTime() - date.getTime()) / 1000 - + "seconds)"); + logger.log(Type.INFO, "Done. (" + + (new Date().getTime() - date.getTime()) / 1000 + "seconds)"); } @@ -114,8 +114,8 @@ public class AcceptCriteriaFactoryGenerator extends Generator { sourceWriter.println("name = name.intern();"); - JClassType criteriaType = context.getTypeOracle().findType( - VAcceptCriterion.class.getName()); + JClassType criteriaType = context.getTypeOracle() + .findType(VAcceptCriterion.class.getName()); JClassType[] subtypes = criteriaType.getSubtypes(); Arrays.sort(subtypes, ConnectorBundle.jClassComparator); for (JClassType clientClass : subtypes) { @@ -123,10 +123,11 @@ public class AcceptCriteriaFactoryGenerator extends Generator { .getAnnotation(AcceptCriterion.class); if (annotation != null) { String clientClassName = clientClass.getQualifiedSourceName(); - Class<?> serverClass = clientClass.getAnnotation( - AcceptCriterion.class).value(); + Class<?> serverClass = clientClass + .getAnnotation(AcceptCriterion.class).value(); String serverClassName = serverClass.getCanonicalName(); - logger.log(Type.INFO, "creating mapping for " + serverClassName); + logger.log(Type.INFO, + "creating mapping for " + serverClassName); sourceWriter.print("if (\""); sourceWriter.print(serverClassName); sourceWriter.print("\" == name) return GWT.create("); diff --git a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java index 2b8ccc87d0..510401e739 100644 --- a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java +++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java @@ -440,9 +440,10 @@ public class ConnectorBundleLoaderFactory extends Generator { throw new UnableToCompleteException(); } if (!property.hasAccessorMethods()) { - logger.log(Type.ERROR, beanType.getQualifiedSourceName() - + " has the property '" + name - + "' without getter defined."); + logger.log(Type.ERROR, + beanType.getQualifiedSourceName() + + " has the property '" + name + + "' without getter defined."); throw new UnableToCompleteException(); } } @@ -480,8 +481,9 @@ public class ConnectorBundleLoaderFactory extends Generator { writer.print( "store.@%s::setPropertyData(Ljava/lang/Class;Ljava/lang/String;Lcom/google/gwt/core/client/JavaScriptObject;)", TypeDataStore.class.getName()); - writer.println("(@%s::class, '%s', data);", property.getBeanType() - .getQualifiedSourceName(), property.getName()); + writer.println("(@%s::class, '%s', data);", + property.getBeanType().getQualifiedSourceName(), + property.getName()); writer.println(); writer.splitIfNeeded(true, String.format("%s store", TypeDataStore.class.getName())); @@ -525,8 +527,7 @@ public class ConnectorBundleLoaderFactory extends Generator { .entrySet()) { JClassType connector = entry.getKey(); - TreeLogger typeLogger = logger.branch( - Type.DEBUG, + TreeLogger typeLogger = logger.branch(Type.DEBUG, "Generating @OnStateChange support for " + connector.getName()); @@ -544,9 +545,8 @@ public class ConnectorBundleLoaderFactory extends Generator { "Processing method " + method.getName()); if (method.isPublic() || method.isProtected()) { - methodLogger - .log(Type.ERROR, - "@OnStateChange is only supported for methods with private or default visibility."); + methodLogger.log(Type.ERROR, + "@OnStateChange is only supported for methods with private or default visibility."); throw new UnableToCompleteException(); } @@ -654,9 +654,8 @@ public class ConnectorBundleLoaderFactory extends Generator { .entrySet()) { JClassType beanType = entry.getKey(); for (Property property : entry.getValue()) { - w.println( - "store.setDelegateToWidget(%s, \"%s\", \"%s\");", - getClassLiteralString(beanType),// property.getBeanType()), + w.println("store.setDelegateToWidget(%s, \"%s\", \"%s\");", + getClassLiteralString(beanType), // property.getBeanType()), property.getName(), property.getAnnotation(DelegateToWidget.class).value()); } @@ -820,10 +819,12 @@ public class ConnectorBundleLoaderFactory extends Generator { } } - private void writeParamTypes(SplittingSourceWriter w, ConnectorBundle bundle) { + private void writeParamTypes(SplittingSourceWriter w, + ConnectorBundle bundle) { Map<JClassType, Set<JMethod>> needsParamTypes = bundle .getNeedsParamTypes(); - for (Entry<JClassType, Set<JMethod>> entry : needsParamTypes.entrySet()) { + for (Entry<JClassType, Set<JMethod>> entry : needsParamTypes + .entrySet()) { JClassType type = entry.getKey(); Set<JMethod> methods = entry.getValue(); @@ -864,8 +865,8 @@ public class ConnectorBundleLoaderFactory extends Generator { w.print("\","); if (method.isPublic()) { - typeLogger.log(Type.DEBUG, "Invoking " + method.getName() - + " using java"); + typeLogger.log(Type.DEBUG, + "Invoking " + method.getName() + " using java"); writeJavaInvoker(w, type, method); } else { @@ -893,8 +894,8 @@ public class ConnectorBundleLoaderFactory extends Generator { w.indent(); JType returnType = method.getReturnType(); - boolean hasReturnType = !"void".equals(returnType - .getQualifiedSourceName()); + boolean hasReturnType = !"void" + .equals(returnType.getQualifiedSourceName()); // Note that void is also a primitive type boolean hasPrimitiveReturnType = hasReturnType @@ -905,9 +906,9 @@ public class ConnectorBundleLoaderFactory extends Generator { if (hasPrimitiveReturnType) { // Integer.valueOf(expression); - w.print("@%s::valueOf(%s)(", returnType.isPrimitive() - .getQualifiedBoxedSourceName(), returnType - .getJNISignature()); + w.print("@%s::valueOf(%s)(", + returnType.isPrimitive().getQualifiedBoxedSourceName(), + returnType.getJNISignature()); // Implementation tested briefly, but I don't dare leave it // enabled since we are not using it in the framework and we @@ -923,8 +924,8 @@ public class ConnectorBundleLoaderFactory extends Generator { JType[] parameterTypes = method.getParameterTypes(); - w.print("target.@%s::" + method.getName() + "(*)(", method - .getEnclosingType().getQualifiedSourceName()); + w.print("target.@%s::" + method.getName() + "(*)(", + method.getEnclosingType().getQualifiedSourceName()); for (int i = 0; i < parameterTypes.length; i++) { if (i != 0) { w.print(", "); @@ -968,8 +969,8 @@ public class ConnectorBundleLoaderFactory extends Generator { w.indent(); JType returnType = method.getReturnType(); - boolean hasReturnType = !"void".equals(returnType - .getQualifiedSourceName()); + boolean hasReturnType = !"void" + .equals(returnType.getQualifiedSourceName()); if (hasReturnType) { w.print("return "); } @@ -989,8 +990,8 @@ public class ConnectorBundleLoaderFactory extends Generator { // Need to pass through native method to allow casting Object to // JSO if the value is a string w.print("%s.<%s>obj2jso(params[%d])", - JsonDecoder.class.getCanonicalName(), - parameterTypeName, i); + JsonDecoder.class.getCanonicalName(), parameterTypeName, + i); } else { w.print("(" + parameterTypeName + ") params[" + i + "]"); } @@ -1088,8 +1089,8 @@ public class ConnectorBundleLoaderFactory extends Generator { } private List<ConnectorBundle> buildBundles(TreeLogger logger, - TypeOracle typeOracle) throws NotFoundException, - UnableToCompleteException { + TypeOracle typeOracle) + throws NotFoundException, UnableToCompleteException { Map<LoadStyle, Collection<JClassType>> connectorsByLoadStyle = new HashMap<LoadStyle, Collection<JClassType>>(); for (LoadStyle loadStyle : LoadStyle.values()) { @@ -1097,8 +1098,8 @@ public class ConnectorBundleLoaderFactory extends Generator { } // Find all types with a valid mapping - Collection<JClassType> selectedTypes = getConnectorsForWidgetset( - logger, typeOracle); + Collection<JClassType> selectedTypes = getConnectorsForWidgetset(logger, + typeOracle); // Group by load style for (JClassType connectorSubtype : selectedTypes) { @@ -1142,8 +1143,8 @@ public class ConnectorBundleLoaderFactory extends Generator { for (JClassType type : lazy) { ConnectorBundle bundle = new ConnectorBundle(type.getName(), eagerBundle); - TreeLogger subLogger = logger.branch(Type.TRACE, "Populating " - + type.getName() + " bundle"); + TreeLogger subLogger = logger.branch(Type.TRACE, + "Populating " + type.getName() + " bundle"); bundle.processType(subLogger, type); bundles.add(bundle); @@ -1176,8 +1177,8 @@ public class ConnectorBundleLoaderFactory extends Generator { throws UnableToCompleteException { JClassType serverConnectorType; try { - serverConnectorType = typeOracle.getType(ServerConnector.class - .getName()); + serverConnectorType = typeOracle + .getType(ServerConnector.class.getName()); } catch (NotFoundException e) { logger.log(Type.ERROR, "Can't find " + ServerConnector.class.getName()); @@ -1213,13 +1214,10 @@ public class ConnectorBundleLoaderFactory extends Generator { superclass = type; } else { // Neither inherits from the other - this is a conflict - logger.log( - Type.ERROR, + logger.log(Type.ERROR, "Conflicting @Connect mappings detected for " - + identifier - + ": " - + type.getQualifiedSourceName() - + " and " + + identifier + ": " + + type.getQualifiedSourceName() + " and " + previousMapping.getQualifiedSourceName() + ". There can only be multiple @Connect mappings for the same server-side type if one is the subclass of the other."); throw new UnableToCompleteException(); diff --git a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.java index 992a012005..044120467e 100644 --- a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.java +++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.java @@ -68,16 +68,11 @@ public class ClientRpcVisitor extends TypeVisitor { public static void checkReturnType(TreeLogger logger, JMethod method) throws UnableToCompleteException { if (!method.getReturnType().getQualifiedSourceName().equals("void")) { - logger.log( - Type.ERROR, - "The method " - + method.getEnclosingType() - .getQualifiedSourceName() - + "." - + method.getName() - + " returns " - + method.getReturnType().getQualifiedSourceName() - + " but only void is supported for methods in RPC interfaces."); + logger.log(Type.ERROR, "The method " + + method.getEnclosingType().getQualifiedSourceName() + "." + + method.getName() + " returns " + + method.getReturnType().getQualifiedSourceName() + + " but only void is supported for methods in RPC interfaces."); throw new UnableToCompleteException(); } } diff --git a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java index b4531eb08e..d390ee0338 100644 --- a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java +++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java @@ -60,16 +60,16 @@ public class ConnectorBundle { public static final Comparator<JClassType> jClassComparator = new Comparator<JClassType>() { @Override public int compare(JClassType o1, JClassType o2) { - return o1.getQualifiedSourceName().compareTo( - o2.getQualifiedSourceName()); + return o1.getQualifiedSourceName() + .compareTo(o2.getQualifiedSourceName()); } }; public static final Comparator<JMethod> jMethodComparator = new Comparator<JMethod>() { @Override public int compare(JMethod o1, JMethod o2) { - return o1.getReadableDeclaration().compareTo( - o2.getReadableDeclaration()); + return o1.getReadableDeclaration() + .compareTo(o2.getReadableDeclaration()); } }; @@ -140,10 +140,11 @@ public class ConnectorBundle { TypeOracle oracle) throws NotFoundException { Map<JType, JClassType> serializers = new HashMap<JType, JClassType>(); - JClassType serializerInterface = oracle.findType(JSONSerializer.class - .getName()); + JClassType serializerInterface = oracle + .findType(JSONSerializer.class.getName()); JType[] deserializeParamTypes = new JType[] { - oracle.findType(com.vaadin.client.metadata.Type.class.getName()), + oracle.findType( + com.vaadin.client.metadata.Type.class.getName()), oracle.findType(JsonValue.class.getName()), oracle.findType(ApplicationConnection.class.getName()) }; String deserializeMethodName = "deserialize"; @@ -152,8 +153,8 @@ public class ConnectorBundle { deserializeParamTypes); for (JClassType serializer : serializerInterface.getSubtypes()) { - JMethod deserializeMethod = serializer.findMethod( - deserializeMethodName, deserializeParamTypes); + JMethod deserializeMethod = serializer + .findMethod(deserializeMethodName, deserializeParamTypes); if (deserializeMethod == null) { continue; } @@ -309,21 +310,18 @@ public class ConnectorBundle { private void checkSerializable(TreeLogger logger, JClassType type) throws UnableToCompleteException { - JClassType javaSerializable = type.getOracle().findType( - Serializable.class.getName()); + JClassType javaSerializable = type.getOracle() + .findType(Serializable.class.getName()); boolean serializable = type.isAssignableTo(javaSerializable); if (!serializable) { - boolean abortCompile = "true".equals(System - .getProperty(FAIL_IF_NOT_SERIALIZABLE)); - logger.log( - abortCompile ? Type.ERROR : Type.WARN, - type - + " is used in RPC or shared state but does not implement " - + Serializable.class.getName() - + ". Communication will work but the Application on server side cannot be serialized if it refers to objects of this type. " - + "If the system property " - + FAIL_IF_NOT_SERIALIZABLE - + " is set to \"true\", this causes the compilation to fail instead of just emitting a warning."); + boolean abortCompile = "true" + .equals(System.getProperty(FAIL_IF_NOT_SERIALIZABLE)); + logger.log(abortCompile ? Type.ERROR : Type.WARN, type + + " is used in RPC or shared state but does not implement " + + Serializable.class.getName() + + ". Communication will work but the Application on server side cannot be serialized if it refers to objects of this type. " + + "If the system property " + FAIL_IF_NOT_SERIALIZABLE + + " is set to \"true\", this causes the compilation to fail instead of just emitting a warning."); if (abortCompile) { throw new UnableToCompleteException(); } @@ -509,7 +507,8 @@ public class ConnectorBundle { set.add(value); } - private <K> void addMapping(Map<K, Set<JMethod>> map, K key, JMethod value) { + private <K> void addMapping(Map<K, Set<JMethod>> map, K key, + JMethod value) { Set<JMethod> set = map.get(key); if (set == null) { set = new TreeSet<JMethod>(jMethodComparator); @@ -609,9 +608,8 @@ public class ConnectorBundle { if (typeData != null && hasMapping(typeData, method, methodAttribute)) { return true; } else { - return previousBundle != null - && previousBundle.hasMethodAttribute(type, method, - methodAttribute); + return previousBundle != null && previousBundle + .hasMethodAttribute(type, method, methodAttribute); } } @@ -699,7 +697,8 @@ public class ConnectorBundle { } } - private boolean isNeedsOnStateChangeHandler(JClassType type, JMethod method) { + private boolean isNeedsOnStateChangeHandler(JClassType type, + JMethod method) { if (hasMapping(needsOnStateChange, type, method)) { return true; } else { diff --git a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java index a31dafe05c..b04fe030e7 100644 --- a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java +++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java @@ -45,15 +45,16 @@ public class FieldProperty extends Property { @Override public void writeSetterBody(TreeLogger logger, SourceWriter w, String beanVariable, String valueVariable) { - w.println("%s.@%s::%s = %s;", beanVariable, getBeanType() - .getQualifiedSourceName(), getName(), unboxValue(valueVariable)); + w.println("%s.@%s::%s = %s;", beanVariable, + getBeanType().getQualifiedSourceName(), getName(), + unboxValue(valueVariable)); } @Override public void writeGetterBody(TreeLogger logger, SourceWriter w, String beanVariable) { - String value = String.format("%s.@%s::%s", beanVariable, getBeanType() - .getQualifiedSourceName(), getName()); + String value = String.format("%s.@%s::%s", beanVariable, + getBeanType().getQualifiedSourceName(), getName()); w.print("return "); w.print(boxValue(value)); w.println(";"); diff --git a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java index a7a6c568da..253f180138 100644 --- a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java +++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java @@ -56,8 +56,8 @@ public abstract class JsonSerializer implements GeneratedSerializer { + ApplicationConnection.class.getName() + " connection) {"); w.indent(); // MouseEventDetails castedValue = (MouseEventDetails) value; - w.println(qualifiedSourceName + " castedValue = (" - + qualifiedSourceName + ") value;"); + w.println(qualifiedSourceName + " castedValue = (" + qualifiedSourceName + + ") value;"); printSerializerBody(logger, w, "castedValue", "connection"); diff --git a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/MethodProperty.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/MethodProperty.java index 32aad92774..e1c1b4e930 100644 --- a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/MethodProperty.java +++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/MethodProperty.java @@ -36,8 +36,8 @@ public class MethodProperty extends Property { private final String getter; private MethodProperty(JClassType beanType, JMethod setter, String getter) { - super(getTransportFieldName(setter), beanType, setter - .getParameterTypes()[0]); + super(getTransportFieldName(setter), beanType, + setter.getParameterTypes()[0]); this.setter = setter; this.getter = getter; } @@ -54,8 +54,8 @@ public class MethodProperty extends Property { List<JMethod> setters = getSetters(type, getters); for (JMethod setter : setters) { String getter = findGetter(type, setter); - properties.add(new MethodProperty(setter.getEnclosingType(), - setter, getters.contains(getter) ? getter : null)); + properties.add(new MethodProperty(setter.getEnclosingType(), setter, + getters.contains(getter) ? getter : null)); } return properties; @@ -74,9 +74,8 @@ public class MethodProperty extends Property { Set<String> getters) { List<JMethod> setterMethods = new ArrayList<JMethod>(); - while (beanType != null - && !beanType.getQualifiedSourceName().equals( - Object.class.getName())) { + while (beanType != null && !beanType.getQualifiedSourceName() + .equals(Object.class.getName())) { for (JMethod method : beanType.getMethods()) { // Process all setters that have corresponding fields if (!method.isPublic() || method.isStatic()) { @@ -112,18 +111,19 @@ public class MethodProperty extends Property { @Override public void writeSetterBody(TreeLogger logger, SourceWriter w, String beanVariable, String valueVariable) { - w.println("%s.@%s::%s(%s)(%s);", beanVariable, getBeanType() - .getQualifiedSourceName(), setter.getName(), setter - .getParameterTypes()[0].getJNISignature(), + w.println("%s.@%s::%s(%s)(%s);", beanVariable, + getBeanType().getQualifiedSourceName(), setter.getName(), + setter.getParameterTypes()[0].getJNISignature(), unboxValue(valueVariable)); } - private static String findGetter(JClassType beanType, JMethod setterMethod) { + private static String findGetter(JClassType beanType, + JMethod setterMethod) { JType setterParameterType = setterMethod.getParameterTypes()[0]; String fieldName = setterMethod.getName().substring(3); - if (setterParameterType.getQualifiedSourceName().equals( - boolean.class.getName())) { + if (setterParameterType.getQualifiedSourceName() + .equals(boolean.class.getName())) { return "is" + fieldName; } else { return "get" + fieldName; diff --git a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/Property.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/Property.java index 0c849bead5..7ed2826556 100644 --- a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/Property.java +++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/Property.java @@ -103,20 +103,20 @@ public abstract class Property implements Comparable<Property> { @Override public int hashCode() { - return getClass().hashCode() * 31 ^ 2 + getBeanType().hashCode() * 31 - + getName().hashCode(); + return getClass().hashCode() * 31 + ^ 2 + getBeanType().hashCode() * 31 + getName().hashCode(); } @Override public int compareTo(Property o) { int comp = getName().compareTo(o.getName()); if (comp == 0) { - comp = getBeanType().getQualifiedSourceName().compareTo( - o.getBeanType().getQualifiedSourceName()); + comp = getBeanType().getQualifiedSourceName() + .compareTo(o.getBeanType().getQualifiedSourceName()); } if (comp == 0) { - comp = getClass().getCanonicalName().compareTo( - o.getClass().getCanonicalName()); + comp = getClass().getCanonicalName() + .compareTo(o.getClass().getCanonicalName()); } return comp; } diff --git a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java index 8b645aa492..c1b3a6e7e4 100644 --- a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java +++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java @@ -57,17 +57,17 @@ public class RendererVisitor extends TypeVisitor { private static void doRendererType(TreeLogger logger, JClassType type, ConnectorBundle bundle) throws UnableToCompleteException { // The class in which createRenderer is implemented - JClassType createRendererClass = ConnectorBundle.findInheritedMethod( - type, "createRenderer").getEnclosingType(); + JClassType createRendererClass = ConnectorBundle + .findInheritedMethod(type, "createRenderer").getEnclosingType(); // Needs GWT constructor if createRenderer is not overridden - if (createRendererClass.getQualifiedSourceName().equals( - AbstractRendererConnector.class.getCanonicalName())) { + if (createRendererClass.getQualifiedSourceName() + .equals(AbstractRendererConnector.class.getCanonicalName())) { JMethod getRenderer = ConnectorBundle.findInheritedMethod(type, "getRenderer"); - if (getRenderer.getEnclosingType().getQualifiedSourceName() - .equals(AbstractRendererConnector.class.getCanonicalName())) { + if (getRenderer.getEnclosingType().getQualifiedSourceName().equals( + AbstractRendererConnector.class.getCanonicalName())) { logger.log(Type.ERROR, type.getQualifiedSourceName() + " must override either createRenderer or getRenderer"); throw new UnableToCompleteException(); @@ -79,8 +79,8 @@ public class RendererVisitor extends TypeVisitor { // Also needs renderer type to find the right GWT constructor bundle.setNeedsReturnType(type, getRenderer); - logger.log(Type.DEBUG, "Renderer type of " + type + " is " - + rendererType); + logger.log(Type.DEBUG, + "Renderer type of " + type + " is " + rendererType); } } @@ -93,8 +93,8 @@ public class RendererVisitor extends TypeVisitor { bundle.setNeedsSerialize(presentationType); } - logger.log(Type.DEBUG, "Presentation type of " + type + " is " - + presentationType); + logger.log(Type.DEBUG, + "Presentation type of " + type + " is " + presentationType); } private static boolean hasCustomDecodeMethod(JClassType type, @@ -110,8 +110,8 @@ public class RendererVisitor extends TypeVisitor { return !decodeMethod.getEnclosingType().getQualifiedSourceName() .equals(AbstractRendererConnector.class.getName()); } catch (NotFoundException e) { - logger.log(Type.ERROR, "Can't find decode method for renderer " - + type, e); + logger.log(Type.ERROR, + "Can't find decode method for renderer " + type, e); throw new UnableToCompleteException(); } } @@ -120,16 +120,13 @@ public class RendererVisitor extends TypeVisitor { throws UnableToCompleteException { JClassType originalType = type; while (type != null) { - if (type.getQualifiedBinaryName().equals( - AbstractRendererConnector.class.getName())) { + if (type.getQualifiedBinaryName() + .equals(AbstractRendererConnector.class.getName())) { JParameterizedType parameterized = type.isParameterized(); if (parameterized == null) { - logger.log( - Type.ERROR, - type.getQualifiedSourceName() - + " must define the generic parameter of the inherited " - + AbstractRendererConnector.class - .getSimpleName()); + logger.log(Type.ERROR, type.getQualifiedSourceName() + + " must define the generic parameter of the inherited " + + AbstractRendererConnector.class.getSimpleName()); throw new UnableToCompleteException(); } return parameterized.getTypeArgs()[0]; diff --git a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java index 86ece28041..0bc6a3f479 100644 --- a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java +++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java @@ -52,7 +52,8 @@ public class ServerRpcVisitor extends TypeVisitor { } } - if (method.getAnnotation(NoLoadingIndicator.class) != null) { + if (method + .getAnnotation(NoLoadingIndicator.class) != null) { bundle.setMethodAttribute(type, method, MethodAttribute.NO_LOADING_INDICATOR); } diff --git a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/StateInitVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/StateInitVisitor.java index 046c5c4611..4175760df7 100644 --- a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/StateInitVisitor.java +++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/StateInitVisitor.java @@ -24,8 +24,8 @@ public class StateInitVisitor extends TypeVisitor { @Override public void visitConnector(TreeLogger logger, JClassType type, ConnectorBundle bundle) { - JMethod getState = ConnectorBundle - .findInheritedMethod(type, "getState"); + JMethod getState = ConnectorBundle.findInheritedMethod(type, + "getState"); bundle.setNeedsReturnType(type, getState); bundle.setNeedsSerialize(getState.getReturnType()); diff --git a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java index 9a9cac18ba..5c1dc966af 100644 --- a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java +++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java @@ -32,8 +32,9 @@ public class WidgetInitVisitor extends TypeVisitor { ConnectorBundle bundle) throws UnableToCompleteException { if (ConnectorBundle.isConnectedComponentConnector(type)) { // The class in which createWidget is implemented - JClassType createWidgetClass = ConnectorBundle.findInheritedMethod( - type, "createWidget").getEnclosingType(); + JClassType createWidgetClass = ConnectorBundle + .findInheritedMethod(type, "createWidget") + .getEnclosingType(); JMethod getWidget = ConnectorBundle.findInheritedMethod(type, "getWidget"); @@ -42,9 +43,7 @@ public class WidgetInitVisitor extends TypeVisitor { // Needs GWT constructor if createWidget is not overridden if (createWidgetClass.getQualifiedSourceName().equals( AbstractComponentConnector.class.getCanonicalName())) { - if (getWidget - .getEnclosingType() - .getQualifiedSourceName() + if (getWidget.getEnclosingType().getQualifiedSourceName() .equals(AbstractComponentConnector.class .getCanonicalName())) { logger.log(Type.ERROR, type.getQualifiedSourceName() @@ -79,12 +78,8 @@ public class WidgetInitVisitor extends TypeVisitor { .findInheritedMethod(widgetType, methodName, property.getPropertyType()); if (delegatedSetter == null) { - logger.log( - Type.ERROR, - widgetType.getName() - + "." - + methodName - + "(" + logger.log(Type.ERROR, + widgetType.getName() + "." + methodName + "(" + property.getPropertyType() .getSimpleSourceName() + ") required by @DelegateToWidget for " diff --git a/client-compiler/src/main/java/com/vaadin/tools/CvalAddonsChecker.java b/client-compiler/src/main/java/com/vaadin/tools/CvalAddonsChecker.java index aab7231258..29bab5d5e4 100644 --- a/client-compiler/src/main/java/com/vaadin/tools/CvalAddonsChecker.java +++ b/client-compiler/src/main/java/com/vaadin/tools/CvalAddonsChecker.java @@ -108,14 +108,14 @@ public final class CvalAddonsChecker { Attributes attribs = manifest.getMainAttributes(); String license = attribs.getValue(VAADIN_ADDON_LICENSE); String name = attribs.getValue(VAADIN_ADDON_NAME); - String vers = attribs.getValue(VAADIN_ADDON_VERSION) == null ? "" - : attribs.getValue(VAADIN_ADDON_VERSION); - String title = attribs.getValue(VAADIN_ADDON_TITLE) == null ? name - : attribs.getValue(VAADIN_ADDON_TITLE); + String vers = attribs.getValue(VAADIN_ADDON_VERSION) == null + ? "" : attribs.getValue(VAADIN_ADDON_VERSION); + String title = attribs.getValue(VAADIN_ADDON_TITLE) == null + ? name : attribs.getValue(VAADIN_ADDON_TITLE); String widgetsets = attribs .getValue(VAADIN_ADDON_WIDGETSET) == null ? name - : attribs.getValue(VAADIN_ADDON_WIDGETSET); + : attribs.getValue(VAADIN_ADDON_WIDGETSET); if (name == null || license == null) { continue; @@ -131,14 +131,14 @@ public final class CvalAddonsChecker { title); printValidLicense(info, title, vers); } catch (UnreachableCvalServerException e) { - info = CvalChecker.parseJson("{'product':{'name':'" - + name + "'}}"); + info = CvalChecker.parseJson( + "{'product':{'name':'" + name + "'}}"); printServerUnreachable(title, vers); } for (String w : widgetsets.split("[, ]+")) { - ret.add(new CValUiInfo(title, String - .valueOf(computeMajorVersion(vers)), w, - info.getType())); + ret.add(new CValUiInfo(title, + String.valueOf(computeMajorVersion(vers)), + w, info.getType())); } } } catch (IOException ignored) { @@ -174,13 +174,12 @@ public final class CvalAddonsChecker { } private void printServerUnreachable(String name, String version) { - System.out.println(LINE - + "\n" - + getErrorMessage("unreachable", name, - computeMajorVersion(version)) + "\n" + LINE); + System.out.println(LINE + "\n" + getErrorMessage("unreachable", name, + computeMajorVersion(version)) + "\n" + LINE); } - private void printValidLicense(CvalInfo info, String title, String version) { + private void printValidLicense(CvalInfo info, String title, + String version) { String msg = info.getMessage(); if (msg == null) { String key = "evaluation".equals(info.getType()) ? "evaluation" diff --git a/client-compiler/src/main/java/com/vaadin/tools/CvalChecker.java b/client-compiler/src/main/java/com/vaadin/tools/CvalChecker.java index 9217781695..950c0db6b0 100644 --- a/client-compiler/src/main/java/com/vaadin/tools/CvalChecker.java +++ b/client-compiler/src/main/java/com/vaadin/tools/CvalChecker.java @@ -153,8 +153,8 @@ public final class CvalChecker { public boolean isLicenseExpired() { return (getExpired() != null && getExpired()) - || (getExpiredEpoch() != null && getExpiredEpoch().before( - new Date())); + || (getExpiredEpoch() != null + && getExpiredEpoch().before(new Date())); } public boolean isValidVersion(int majorVersion) { @@ -248,8 +248,8 @@ public final class CvalChecker { } else if (info != null && info.getMessage() != null) { msg = info.getMessage().replace("\\n", "\n"); } else if (info != null && info.isLicenseExpired()) { - String type = "evaluation".equals(info.getType()) ? "Evaluation license" - : "License"; + String type = "evaluation".equals(info.getType()) + ? "Evaluation license" : "License"; msg = getErrorMessage("expired", title, majorVers, type); } else if (key == null) { msg = getErrorMessage("none", title, majorVers); @@ -359,8 +359,8 @@ public final class CvalChecker { * when we have license key but server is unreachable */ public CvalInfo validateProduct(String productName, String productVersion, - String productTitle) throws InvalidCvalException, - UnreachableCvalServerException { + String productTitle) + throws InvalidCvalException, UnreachableCvalServerException { String key = getDeveloperLicenseKey(productName, productVersion, productTitle); @@ -416,8 +416,8 @@ public final class CvalChecker { int timeout = validCache ? 2000 : 10000; try { - CvalInfo srvinfo = parseJson(provider.askServer(productName + "-" - + productVersion, productKey, timeout)); + CvalInfo srvinfo = parseJson(provider.askServer( + productName + "-" + productVersion, productKey, timeout)); if (srvinfo != null && srvinfo.isValidInfo(productName, productKey) && srvinfo.isValidVersion(majorVersion)) { // We always cache the info if it is valid although it is @@ -502,8 +502,8 @@ public final class CvalChecker { static String getErrorMessage(String key, Object... pars) { Locale loc = Locale.getDefault(); - ResourceBundle res = ResourceBundle.getBundle( - CvalChecker.class.getName(), loc); + ResourceBundle res = ResourceBundle + .getBundle(CvalChecker.class.getName(), loc); String msg = res.getString(key); return new MessageFormat(msg, loc).format(pars); } diff --git a/client-compiler/src/main/java/com/vaadin/tools/WidgetsetCompiler.java b/client-compiler/src/main/java/com/vaadin/tools/WidgetsetCompiler.java index 7c06e9d7af..65aa019b78 100755 --- a/client-compiler/src/main/java/com/vaadin/tools/WidgetsetCompiler.java +++ b/client-compiler/src/main/java/com/vaadin/tools/WidgetsetCompiler.java @@ -71,8 +71,8 @@ public class WidgetsetCompiler { // TODO expecting this is launched via eclipse WTP // project - System.out - .println("Updating GWT module description file..."); + System.out.println( + "Updating GWT module description file..."); WidgetSetBuilder.updateWidgetSet(wsname); System.out.println("Done."); diff --git a/client-compiler/src/test/java/com/vaadin/tools/CvalAddonsCheckerTest.java b/client-compiler/src/test/java/com/vaadin/tools/CvalAddonsCheckerTest.java index c6200bc7e0..c706f0b9e0 100644 --- a/client-compiler/src/test/java/com/vaadin/tools/CvalAddonsCheckerTest.java +++ b/client-compiler/src/test/java/com/vaadin/tools/CvalAddonsCheckerTest.java @@ -54,8 +54,8 @@ public class CvalAddonsCheckerTest { @Before public void setup() { - addonChecker = new CvalAddonsChecker().setLicenseProvider( - validLicenseProvider).setFilter(".*test.*"); + addonChecker = new CvalAddonsChecker() + .setLicenseProvider(validLicenseProvider).setFilter(".*test.*"); licenseName = computeLicenseName(productNameCval); deleteCache(productNameCval); diff --git a/client-compiler/src/test/java/com/vaadin/tools/CvalAddonstCheckerUseCasesTest.java b/client-compiler/src/test/java/com/vaadin/tools/CvalAddonstCheckerUseCasesTest.java index 01cfe2087e..82962663f2 100644 --- a/client-compiler/src/test/java/com/vaadin/tools/CvalAddonstCheckerUseCasesTest.java +++ b/client-compiler/src/test/java/com/vaadin/tools/CvalAddonstCheckerUseCasesTest.java @@ -76,7 +76,7 @@ public class CvalAddonstCheckerUseCasesTest { enum Message { AGPL("AGPL"), VALID(">.* valid"), INVALID("not valid"), NO_LICENSE( "not found"), NO_VALIDATED("has not been validated"), EXPIRED( - "has expired"), EVALUATION("evaluation"); + "has expired"), EVALUATION("evaluation"); String msg; @@ -93,7 +93,7 @@ public class CvalAddonstCheckerUseCasesTest { } /* TODO: Use more descriptive test names */ - + @Test public void testUseCase1() throws Exception { useCase(1, License.NONE, Version.AGPL, Validated.NO, Network.OFF, @@ -219,8 +219,8 @@ public class CvalAddonstCheckerUseCasesTest { if (val == Validated.NO) { deleteCache(productNameCval); } else { - String type = lic == License.EVAL || lic == License.EVAL_EXPIRED ? "evaluation" - : null; + String type = lic == License.EVAL || lic == License.EVAL_EXPIRED + ? "evaluation" : null; Boolean expired = lic == License.EVAL_EXPIRED || lic == License.REAL_EXPIRED ? true : null; String key = val == Validated.OLD_KEY ? "oldkey" : null; @@ -253,17 +253,16 @@ public class CvalAddonstCheckerUseCasesTest { restoreSystemOut(); message = e.getMessage(); if (res == Compile.YES) { - Assert.fail(testNumber + "Unexpected Exception: " - + e.getMessage()); + Assert.fail( + testNumber + "Unexpected Exception: " + e.getMessage()); } } // System.err.println("\n> " + testNumber + " " + lic + " " + ver + " " // + val + " " + net + " " + res + " " + cached + "\n" + message); - Assert.assertTrue(testNumber + "Fail:\n" + message - + "\nDoes not match:" + msg.msg, - message.matches("(?s).*" + msg.msg + ".*")); + Assert.assertTrue(testNumber + "Fail:\n" + message + "\nDoes not match:" + + msg.msg, message.matches("(?s).*" + msg.msg + ".*")); String c = cachedPreferences(productNameCval); Assert.assertTrue(testNumber + "Fail: cacheExists != " diff --git a/client-compiler/src/test/java/com/vaadin/tools/CvalCheckerTest.java b/client-compiler/src/test/java/com/vaadin/tools/CvalCheckerTest.java index 6e1a8e57ed..8333449a78 100644 --- a/client-compiler/src/test/java/com/vaadin/tools/CvalCheckerTest.java +++ b/client-compiler/src/test/java/com/vaadin/tools/CvalCheckerTest.java @@ -96,9 +96,8 @@ public class CvalCheckerTest { static final CvalServer expiredLicenseProviderWithMessage = new CvalServer() { @Override String askServer(String productName, String productKey, int timeout) { - return responseJson - .replace("'expired", - "'message':'Custom\\\\nServer\\\\nMessage','expired':true,'expired"); + return responseJson.replace("'expired", + "'message':'Custom\\\\nServer\\\\nMessage','expired':true,'expired"); } }; // A provider returning an expired license with a server message @@ -205,15 +204,15 @@ public class CvalCheckerTest { // Success if license key and version are valid System.setProperty(licenseName, VALID_KEY); - licenseChecker - .validateProduct(productNameCval, "2.1", productTitleCval); + licenseChecker.validateProduct(productNameCval, "2.1", + productTitleCval); Assert.assertTrue(cacheExists(productNameCval)); // Success if license and cache file are valid, although the license // server is offline licenseChecker.setLicenseProvider(unreachableLicenseProvider); - licenseChecker - .validateProduct(productNameCval, "2.1", productTitleCval); + licenseChecker.validateProduct(productNameCval, "2.1", + productTitleCval); Assert.assertTrue(cacheExists(productNameCval)); // Fail if license key changes although cache file were validated @@ -262,8 +261,8 @@ public class CvalCheckerTest { // Check an unlimited license deleteCache(productNameCval); licenseChecker.setLicenseProvider(unlimitedLicenseProvider); - licenseChecker - .validateProduct(productNameCval, "2.1", productTitleCval); + licenseChecker.validateProduct(productNameCval, "2.1", + productTitleCval); Assert.assertTrue(cacheExists(productNameCval)); // Fail if expired flag does not come, but expired epoch is in the past @@ -281,8 +280,8 @@ public class CvalCheckerTest { deleteCache(productNameCval); licenseChecker.setLicenseProvider(nullVersionLicenseProvider); - licenseChecker - .validateProduct(productNameCval, "2.1", productTitleCval); + licenseChecker.validateProduct(productNameCval, "2.1", + productTitleCval); Assert.assertTrue(cacheExists(productNameCval)); } @@ -290,8 +289,8 @@ public class CvalCheckerTest { * Creates a new .jar file with a MANIFEST.MF with all vaadin license info * attributes set, and add the .jar to the classpath */ - static void addLicensedJarToClasspath(String productName, String licenseType) - throws Exception { + static void addLicensedJarToClasspath(String productName, + String licenseType) throws Exception { // Create a manifest with Vaadin CVAL license Manifest testManifest = new Manifest(); testManifest.getMainAttributes().putValue("Manifest-Version", "1.0"); @@ -306,8 +305,8 @@ public class CvalCheckerTest { // Create a temporary Jar File testJarFile = File.createTempFile("vaadin." + productName, ".jar"); testJarFile.deleteOnExit(); - JarOutputStream target = new JarOutputStream(new FileOutputStream( - testJarFile), testManifest); + JarOutputStream target = new JarOutputStream( + new FileOutputStream(testJarFile), testManifest); target.close(); // Add the new jar to our classpath (use reflection) @@ -362,7 +361,8 @@ public class CvalCheckerTest { } static void restoreSystemOut() { - System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out))); + System.setOut( + new PrintStream(new FileOutputStream(FileDescriptor.out))); } @Test(expected = FileNotFoundException.class) @@ -374,8 +374,8 @@ public class CvalCheckerTest { public void testReadKeyFromFile_LicenseFileEmpty() throws Exception { File tmpLicenseFile = File.createTempFile("license", "lic"); - assertNull(licenseChecker.readKeyFromFile(tmpLicenseFile.toURI() - .toURL(), 4)); + assertNull(licenseChecker + .readKeyFromFile(tmpLicenseFile.toURI().toURL(), 4)); tmpLicenseFile.delete(); } @@ -388,8 +388,8 @@ public class CvalCheckerTest { out.println("this-is-a-license"); out.close(); - assertEquals("this-is-a-license", licenseChecker.readKeyFromFile( - tmpLicenseFile.toURI().toURL(), 4)); + assertEquals("this-is-a-license", licenseChecker + .readKeyFromFile(tmpLicenseFile.toURI().toURL(), 4)); tmpLicenseFile.delete(); } @@ -402,8 +402,8 @@ public class CvalCheckerTest { out.println("4=this-is-a-license"); out.close(); - assertEquals("this-is-a-license", licenseChecker.readKeyFromFile( - tmpLicenseFile.toURI().toURL(), 4)); + assertEquals("this-is-a-license", licenseChecker + .readKeyFromFile(tmpLicenseFile.toURI().toURL(), 4)); tmpLicenseFile.delete(); } @@ -417,10 +417,10 @@ public class CvalCheckerTest { out.println("5=this-is-another-license"); out.close(); - assertEquals("this-is-a-license", licenseChecker.readKeyFromFile( - tmpLicenseFile.toURI().toURL(), 4)); - assertEquals("this-is-another-license", licenseChecker.readKeyFromFile( - tmpLicenseFile.toURI().toURL(), 5)); + assertEquals("this-is-a-license", licenseChecker + .readKeyFromFile(tmpLicenseFile.toURI().toURL(), 4)); + assertEquals("this-is-another-license", licenseChecker + .readKeyFromFile(tmpLicenseFile.toURI().toURL(), 5)); tmpLicenseFile.delete(); } @@ -434,10 +434,10 @@ public class CvalCheckerTest { out.println("5 = this-is-another-license"); out.close(); - assertEquals("this-is-a-license", licenseChecker.readKeyFromFile( - tmpLicenseFile.toURI().toURL(), 4)); - assertEquals("this-is-another-license", licenseChecker.readKeyFromFile( - tmpLicenseFile.toURI().toURL(), 5)); + assertEquals("this-is-a-license", licenseChecker + .readKeyFromFile(tmpLicenseFile.toURI().toURL(), 4)); + assertEquals("this-is-another-license", licenseChecker + .readKeyFromFile(tmpLicenseFile.toURI().toURL(), 5)); tmpLicenseFile.delete(); } @@ -450,8 +450,8 @@ public class CvalCheckerTest { out.println("5 = this-is-another-license"); out.close(); - assertNull(licenseChecker.readKeyFromFile(tmpLicenseFile.toURI() - .toURL(), 3)); + assertNull(licenseChecker + .readKeyFromFile(tmpLicenseFile.toURI().toURL(), 3)); tmpLicenseFile.delete(); } @@ -464,12 +464,12 @@ public class CvalCheckerTest { out.println("5 = this-is-another-license"); out.close(); - assertEquals("this-is-a-license", licenseChecker.readKeyFromFile( - tmpLicenseFile.toURI().toURL(), 3)); - assertEquals("this-is-a-license", licenseChecker.readKeyFromFile( - tmpLicenseFile.toURI().toURL(), 4)); - assertEquals("this-is-another-license", licenseChecker.readKeyFromFile( - tmpLicenseFile.toURI().toURL(), 5)); + assertEquals("this-is-a-license", licenseChecker + .readKeyFromFile(tmpLicenseFile.toURI().toURL(), 3)); + assertEquals("this-is-a-license", licenseChecker + .readKeyFromFile(tmpLicenseFile.toURI().toURL(), 4)); + assertEquals("this-is-another-license", licenseChecker + .readKeyFromFile(tmpLicenseFile.toURI().toURL(), 5)); tmpLicenseFile.delete(); } @@ -483,12 +483,12 @@ public class CvalCheckerTest { out.println("this-is-a-license"); out.close(); - assertEquals("this-is-a-license", licenseChecker.readKeyFromFile( - tmpLicenseFile.toURI().toURL(), 3)); - assertEquals("this-is-a-license", licenseChecker.readKeyFromFile( - tmpLicenseFile.toURI().toURL(), 4)); - assertEquals("this-is-another-license", licenseChecker.readKeyFromFile( - tmpLicenseFile.toURI().toURL(), 5)); + assertEquals("this-is-a-license", licenseChecker + .readKeyFromFile(tmpLicenseFile.toURI().toURL(), 3)); + assertEquals("this-is-a-license", licenseChecker + .readKeyFromFile(tmpLicenseFile.toURI().toURL(), 4)); + assertEquals("this-is-another-license", licenseChecker + .readKeyFromFile(tmpLicenseFile.toURI().toURL(), 5)); tmpLicenseFile.delete(); } diff --git a/client/src/main/java/com/vaadin/client/AnimationUtil.java b/client/src/main/java/com/vaadin/client/AnimationUtil.java index 063a0a163e..816a5f9e28 100644 --- a/client/src/main/java/com/vaadin/client/AnimationUtil.java +++ b/client/src/main/java/com/vaadin/client/AnimationUtil.java @@ -65,7 +65,7 @@ public class AnimationUtil { var callbackFunc = $entry(function(e) { listener.@com.vaadin.client.AnimationUtil.AnimationEndListener::onAnimationEnd(Lcom/google/gwt/dom/client/NativeEvent;)(e); }); - + elem.addEventListener(@com.vaadin.client.AnimationUtil::ANIMATION_END_EVENT_NAME, callbackFunc, false); // Store function reference for later removal @@ -111,7 +111,7 @@ public class AnimationUtil { return event.mozAnimationName; else if(event.oAnimationName) return event.oAnimationName; - + return ""; }-*/; @@ -119,22 +119,22 @@ public class AnimationUtil { public static native String getAnimationName(ComputedStyle cstyle) /*-{ var cs = cstyle.@com.vaadin.client.ComputedStyle::computedStyle; - + if(!cs.getPropertyValue) return ""; - + if(cs.getPropertyValue("-webkit-animation-name")) return cs.getPropertyValue("-webkit-animation-name"); - + else if(cs.getPropertyValue("animation-name")) return cs.getPropertyValue("animation-name"); - + else if(cs.getPropertyValue("-moz-animation-name")) return cs.getPropertyValue("-moz-animation-name"); - + else if(cs.getPropertyValue("-o-animation-name")) return cs.getPropertyValue("-o-animation-name"); - + return ""; }-*/; diff --git a/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java b/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java index a9fd9803c3..81cea63313 100644 --- a/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java +++ b/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java @@ -418,7 +418,8 @@ public class ApplicationConfiguration implements EntryPoint { .intValue(); // null -> false - standalone = jsoConfiguration.getConfigBoolean("standalone") == Boolean.TRUE; + standalone = jsoConfiguration + .getConfigBoolean("standalone") == Boolean.TRUE; heartbeatInterval = jsoConfiguration .getConfigInteger("heartbeatInterval"); @@ -442,7 +443,8 @@ public class ApplicationConfiguration implements EntryPoint { @Override public void execute() { Profiler.enter("ApplicationConfiguration.startApplication"); - ApplicationConfiguration appConf = getConfigFromDOM(applicationId); + ApplicationConfiguration appConf = getConfigFromDOM( + applicationId); ApplicationConnection a = GWT .create(ApplicationConnection.class); a.init(widgetSet, appConf); @@ -511,7 +513,8 @@ public class ApplicationConfiguration implements EntryPoint { // Initialize if not already loaded Integer currentTag = Integer.valueOf(tag); while (type == null && currentTag != null) { - String serverSideClassNameForTag = getServerSideClassNameForTag(currentTag); + String serverSideClassNameForTag = getServerSideClassNameForTag( + currentTag); if (TypeData.hasIdentifier(serverSideClassNameForTag)) { try { type = (Class<? extends ServerConnector>) TypeData @@ -624,9 +627,8 @@ public class ApplicationConfiguration implements EntryPoint { cmd.execute(); } callbacks.clear(); - } else if (dependenciesLoading == 0 - && !ConnectorBundleLoader.get().isBundleLoaded( - ConnectorBundleLoader.DEFERRED_BUNDLE_NAME)) { + } else if (dependenciesLoading == 0 && !ConnectorBundleLoader.get() + .isBundleLoaded(ConnectorBundleLoader.DEFERRED_BUNDLE_NAME)) { ConnectorBundleLoader.get().loadBundle( ConnectorBundleLoader.DEFERRED_BUNDLE_NAME, new BundleLoadCallback() { @@ -655,9 +657,8 @@ public class ApplicationConfiguration implements EntryPoint { // Don't run twice if the module has been inherited several times, // and don't continue if vaadinBootstrap was not executed. if (moduleLoaded || !vaadinBootstrapLoaded()) { - getLogger() - .log(Level.WARNING, - "vaadinBootstrap.js was not loaded, skipping vaadin application configuration."); + getLogger().log(Level.WARNING, + "vaadinBootstrap.js was not loaded, skipping vaadin application configuration."); return; } moduleLoaded = true; @@ -714,7 +715,8 @@ public class ApplicationConfiguration implements EntryPoint { @Override public void onFailure(Throwable reason) { - Window.alert("Failed to load Vaadin debug window styles"); + Window.alert( + "Failed to load Vaadin debug window styles"); } }); diff --git a/client/src/main/java/com/vaadin/client/ApplicationConnection.java b/client/src/main/java/com/vaadin/client/ApplicationConnection.java index 97ddd14764..f8c75948eb 100644 --- a/client/src/main/java/com/vaadin/client/ApplicationConnection.java +++ b/client/src/main/java/com/vaadin/client/ApplicationConnection.java @@ -109,9 +109,8 @@ public class ApplicationConnection implements HasHandlers { * <pre> * if (sessionExpired) { * response.setHeader("Content-Type", "text/html"); - * response.getWriter().write( - * myLoginPageHtml + "<!-- Vaadin-Refresh: " - * + request.getContextPath() + " -->"); + * response.getWriter().write(myLoginPageHtml + "<!-- Vaadin-Refresh: " + * + request.getContextPath() + " -->"); * } * </pre> */ @@ -156,7 +155,8 @@ public class ApplicationConnection implements HasHandlers { void onResponseHandlingEnded(ResponseHandlingEndedEvent e); } - public static class RequestStartingEvent extends ApplicationConnectionEvent { + public static class RequestStartingEvent + extends ApplicationConnectionEvent { public static Type<CommunicationHandler> TYPE = new Type<CommunicationHandler>(); @@ -175,8 +175,8 @@ public class ApplicationConnection implements HasHandlers { } } - public static class ResponseHandlingEndedEvent extends - ApplicationConnectionEvent { + public static class ResponseHandlingEndedEvent + extends ApplicationConnectionEvent { public static Type<CommunicationHandler> TYPE = new Type<CommunicationHandler>(); @@ -195,8 +195,8 @@ public class ApplicationConnection implements HasHandlers { } } - public static abstract class ApplicationConnectionEvent extends - GwtEvent<CommunicationHandler> { + public static abstract class ApplicationConnectionEvent + extends GwtEvent<CommunicationHandler> { private ApplicationConnection connection; @@ -210,8 +210,8 @@ public class ApplicationConnection implements HasHandlers { } - public static class ResponseHandlingStartedEvent extends - ApplicationConnectionEvent { + public static class ResponseHandlingStartedEvent + extends ApplicationConnectionEvent { public ResponseHandlingStartedEvent(ApplicationConnection connection) { super(connection); @@ -242,8 +242,8 @@ public class ApplicationConnection implements HasHandlers { * @since 7.1.8 * @author Vaadin Ltd */ - public static class ApplicationStoppedEvent extends - GwtEvent<ApplicationStoppedHandler> { + public static class ApplicationStoppedEvent + extends GwtEvent<ApplicationStoppedHandler> { public static Type<ApplicationStoppedHandler> TYPE = new Type<ApplicationStoppedHandler>(); @@ -351,8 +351,8 @@ public class ApplicationConnection implements HasHandlers { public ApplicationConnection() { // Assuming UI data is eagerly loaded - ConnectorBundleLoader.get().loadBundle( - ConnectorBundleLoader.EAGER_BUNDLE_NAME, null); + ConnectorBundleLoader.get() + .loadBundle(ConnectorBundleLoader.EAGER_BUNDLE_NAME, null); uIConnector = GWT.create(UIConnector.class); rpcManager = GWT.create(RpcManager.class); layoutManager = GWT.create(LayoutManager.class); @@ -368,9 +368,8 @@ public class ApplicationConnection implements HasHandlers { getLogger().info("Starting application " + cnf.getRootPanelId()); getLogger().info("Using theme: " + cnf.getThemeName()); - getLogger().info( - "Vaadin application servlet version: " - + cnf.getServletVersion()); + getLogger().info("Vaadin application servlet version: " + + cnf.getServletVersion()); if (!cnf.getServletVersion().equals(Version.getFullVersion())) { getLogger() @@ -440,8 +439,8 @@ public class ApplicationConnection implements HasHandlers { // Hack to avoid logging an error in endRequest() getMessageSender().startRequest(); - getMessageHandler().handleMessage( - MessageHandler.parseJson(jsonText)); + getMessageHandler() + .handleMessage(MessageHandler.parseJson(jsonText)); } // Tooltip can't be created earlier because the @@ -483,7 +482,7 @@ public class ApplicationConnection implements HasHandlers { return vi; } } - + client.getProfilingData = $entry(function() { var smh = ap.@com.vaadin.client.ApplicationConnection::getMessageHandler()(); var pd = [ @@ -498,7 +497,7 @@ public class ApplicationConnection implements HasHandlers { pd[pd.length] = smh.@com.vaadin.client.communication.MessageHandler::bootstrapTime; return pd; }); - + client.getElementByPath = $entry(function(id) { return componentLocator.@com.vaadin.client.componentlocator.ComponentLocator::getElementByPath(Ljava/lang/String;)(id); }); @@ -515,7 +514,7 @@ public class ApplicationConnection implements HasHandlers { return componentLocator.@com.vaadin.client.componentlocator.ComponentLocator::getPathForElement(Lcom/google/gwt/dom/client/Element;)(element); }); client.initializing = false; - + $wnd.vaadin.clients[TTAppId] = client; }-*/; @@ -619,10 +618,9 @@ public class ApplicationConnection implements HasHandlers { // Show this message just once if (cssWaits++ == 0) { - getLogger().warning( - "Assuming CSS loading is not complete, " - + "postponing render phase. " - + "(.v-loading-indicator height == 0)"); + getLogger().warning("Assuming CSS loading is not complete, " + + "postponing render phase. " + + "(.v-loading-indicator height == 0)"); } } else { cssLoaded = true; @@ -775,9 +773,8 @@ public class ApplicationConnection implements HasHandlers { @Override public void onError(ResourceLoadEvent event) { - getLogger() - .severe(event.getResourceUrl() - + " could not be loaded, or the load detection failed because the stylesheet is empty."); + getLogger().severe(event.getResourceUrl() + + " could not be loaded, or the load detection failed because the stylesheet is empty."); // The show must go on onLoad(event); } @@ -1361,9 +1358,8 @@ public class ApplicationConnection implements HasHandlers { */ @Deprecated public void unregisterPaintable(ServerConnector p) { - getLogger().info( - "unregisterPaintable (unnecessarily) called for " - + Util.getConnectorString(p)); + getLogger().info("unregisterPaintable (unnecessarily) called for " + + Util.getConnectorString(p)); } /** @@ -1397,10 +1393,8 @@ public class ApplicationConnection implements HasHandlers { } if (!manageCaption) { - getLogger() - .warning( - Util.getConnectorString(connector) - + " called updateComponent with manageCaption=false. The parameter was ignored - override delegateCaption() to return false instead. It is however not recommended to use caption this way at all."); + getLogger().warning(Util.getConnectorString(connector) + + " called updateComponent with manageCaption=false. The parameter was ignored - override delegateCaption() to return false instead. It is however not recommended to use caption this way at all."); } return false; } @@ -1474,37 +1468,35 @@ public class ApplicationConnection implements HasHandlers { * @param delegate * the delegate. */ - public void setCommunicationErrorDelegate(CommunicationErrorHandler delegate) { + public void setCommunicationErrorDelegate( + CommunicationErrorHandler delegate) { communicationErrorDelegate = delegate; } public void setApplicationRunning(boolean applicationRunning) { if (getApplicationState() == ApplicationState.TERMINATED) { if (applicationRunning) { - getLogger() - .severe("Tried to restart a terminated application. This is not supported"); + getLogger().severe( + "Tried to restart a terminated application. This is not supported"); } else { - getLogger() - .warning( - "Tried to stop a terminated application. This should not be done"); + getLogger().warning( + "Tried to stop a terminated application. This should not be done"); } return; } else if (getApplicationState() == ApplicationState.INITIALIZING) { if (applicationRunning) { applicationState = ApplicationState.RUNNING; } else { - getLogger() - .warning( - "Tried to stop the application before it has started. This should not be done"); + getLogger().warning( + "Tried to stop the application before it has started. This should not be done"); } } else if (getApplicationState() == ApplicationState.RUNNING) { if (!applicationRunning) { applicationState = ApplicationState.TERMINATED; eventBus.fireEvent(new ApplicationStoppedEvent()); } else { - getLogger() - .warning( - "Tried to start an already running application. This should not be done"); + getLogger().warning( + "Tried to start an already running application. This should not be done"); } } } diff --git a/client/src/main/java/com/vaadin/client/BrowserInfo.java b/client/src/main/java/com/vaadin/client/BrowserInfo.java index d1592c95f4..0074054392 100644 --- a/client/src/main/java/com/vaadin/client/BrowserInfo.java +++ b/client/src/main/java/com/vaadin/client/BrowserInfo.java @@ -453,8 +453,8 @@ public class BrowserInfo { * otherwise */ public boolean isAndroidWithBrokenScrollTop() { - return isAndroid() - && (getOperatingSystemMajorVersion() == 3 || getOperatingSystemMajorVersion() == 4); + return isAndroid() && (getOperatingSystemMajorVersion() == 3 + || getOperatingSystemMajorVersion() == 4); } public boolean isAndroid23() { diff --git a/client/src/main/java/com/vaadin/client/CSSRule.java b/client/src/main/java/com/vaadin/client/CSSRule.java index a1ddce6d0a..d57eacf275 100644 --- a/client/src/main/java/com/vaadin/client/CSSRule.java +++ b/client/src/main/java/com/vaadin/client/CSSRule.java @@ -63,11 +63,11 @@ public class CSSRule { /*-{ if(!$doc.styleSheets) return null; - + selector = selector.toLowerCase(); - + var allMatches = []; - + // IE handles imported sheet differently if(deep && sheet.imports && sheet.imports.length > 0) { for(var i=0; i < sheet.imports.length; i++) { @@ -76,13 +76,13 @@ public class CSSRule { allMatches.concat(imports); } } - + var theRules = new Array(); if (sheet.cssRules) theRules = sheet.cssRules else if (sheet.rules) theRules = sheet.rules - + var j = theRules.length; for(var i=0; i<j; i++) { var r = theRules[i]; @@ -102,7 +102,7 @@ public class CSSRule { allMatches = allMatches.concat(imports); } } - + return allMatches; }-*/; diff --git a/client/src/main/java/com/vaadin/client/ComputedStyle.java b/client/src/main/java/com/vaadin/client/ComputedStyle.java index 65a6e69019..4844b00a75 100644 --- a/client/src/main/java/com/vaadin/client/ComputedStyle.java +++ b/client/src/main/java/com/vaadin/client/ComputedStyle.java @@ -78,7 +78,7 @@ public class ComputedStyle { if(borderStyle == "none") return "0px"; } - + if(cs.getPropertyValue) { // Convert name to dashed format @@ -89,10 +89,10 @@ public class ComputedStyle { var ret = cs[name]; var style = elem.style; - + // From the awesome hack by Dean Edwards // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291 - + // If we're not dealing with a regular pixel number // but a number that has a weird ending, we need to convert it to pixels if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) { @@ -124,7 +124,7 @@ public class ComputedStyle { } else if (name == "height" && ret == "auto") { ret = elem.clientHeight + "px"; } - + return ret; }-*/; diff --git a/client/src/main/java/com/vaadin/client/ConnectorHierarchyChangeEvent.java b/client/src/main/java/com/vaadin/client/ConnectorHierarchyChangeEvent.java index 419f052324..3da7703cbd 100644 --- a/client/src/main/java/com/vaadin/client/ConnectorHierarchyChangeEvent.java +++ b/client/src/main/java/com/vaadin/client/ConnectorHierarchyChangeEvent.java @@ -34,8 +34,8 @@ import com.vaadin.client.ui.AbstractHasComponentsConnector; * @since 7.0.0 * */ -public class ConnectorHierarchyChangeEvent extends - AbstractServerConnectorEvent<ConnectorHierarchyChangeHandler> { +public class ConnectorHierarchyChangeEvent + extends AbstractServerConnectorEvent<ConnectorHierarchyChangeHandler> { /** * Type of this event, used by the event bus. */ @@ -90,8 +90,8 @@ public class ConnectorHierarchyChangeEvent extends * implement this interface, but instead make your connector class extend * {@link AbstractHasComponentsConnector} or an appropriate subclass. */ - public interface ConnectorHierarchyChangeHandler extends Serializable, - EventHandler { + public interface ConnectorHierarchyChangeHandler + extends Serializable, EventHandler { /** * Called by the framework when the list of child components of the * connector implementing this interface has changed. The implementation diff --git a/client/src/main/java/com/vaadin/client/ConnectorMap.java b/client/src/main/java/com/vaadin/client/ConnectorMap.java index 3200dd6ab4..2b95a1efaa 100644 --- a/client/src/main/java/com/vaadin/client/ConnectorMap.java +++ b/client/src/main/java/com/vaadin/client/ConnectorMap.java @@ -26,7 +26,8 @@ import com.google.gwt.user.client.ui.Widget; public class ConnectorMap { - public static ConnectorMap get(ApplicationConnection applicationConnection) { + public static ConnectorMap get( + ApplicationConnection applicationConnection) { return applicationConnection.getConnectorMap(); } diff --git a/client/src/main/java/com/vaadin/client/DateTimeService.java b/client/src/main/java/com/vaadin/client/DateTimeService.java index 04006d85fb..2d6b8aaaa0 100644 --- a/client/src/main/java/com/vaadin/client/DateTimeService.java +++ b/client/src/main/java/com/vaadin/client/DateTimeService.java @@ -152,8 +152,8 @@ public class DateTimeService { try { firstDay = LocaleService.getFirstDayOfWeek(currentLocale); } catch (final LocaleNotLoadedException e) { - getLogger().log(Level.SEVERE, - "Locale not loaded, using fallback 0", e); + getLogger().log(Level.SEVERE, "Locale not loaded, using fallback 0", + e); firstDay = 0; } int start = dateForFirstOfThisMonth.getDay() - firstDay; @@ -278,16 +278,16 @@ public class DateTimeService { // Find nearest thursday (defines the week in ISO 8601). The week number // for the nearest thursday is the same as for the target date. int nearestThursdayDiff = 4 - dayOfWeek; // 4 is thursday - Date nearestThursday = new Date(date.getTime() + nearestThursdayDiff - * MILLISECONDS_PER_DAY); + Date nearestThursday = new Date( + date.getTime() + nearestThursdayDiff * MILLISECONDS_PER_DAY); Date firstOfJanuary = new Date(nearestThursday.getYear(), 0, 1); long timeDiff = nearestThursday.getTime() - firstOfJanuary.getTime(); // Rounding the result, as the division doesn't result in an integer // when the given date is inside daylight saving time period. - int daysSinceFirstOfJanuary = (int) Math.round((double) timeDiff - / MILLISECONDS_PER_DAY); + int daysSinceFirstOfJanuary = (int) Math + .round((double) timeDiff / MILLISECONDS_PER_DAY); int weekNumber = (daysSinceFirstOfJanuary) / 7 + 1; @@ -343,8 +343,8 @@ public class DateTimeService { formatStr = formatStr.replaceAll("'([E]{4,})'", dayName); formatStr = formatStr.replaceAll("([E]{4,})'", "'" + dayName); formatStr = formatStr.replaceAll("'([E]{4,})", dayName + "'"); - formatStr = formatStr - .replaceAll("[E]{4,}", "'" + dayName + "'"); + formatStr = formatStr.replaceAll("[E]{4,}", + "'" + dayName + "'"); } } @@ -363,8 +363,8 @@ public class DateTimeService { formatStr = formatStr.replaceAll("'([E]{3,})'", dayName); formatStr = formatStr.replaceAll("([E]{3,})'", "'" + dayName); formatStr = formatStr.replaceAll("'([E]{3,})", dayName + "'"); - formatStr = formatStr - .replaceAll("[E]{3,}", "'" + dayName + "'"); + formatStr = formatStr.replaceAll("[E]{3,}", + "'" + dayName + "'"); } } @@ -386,8 +386,8 @@ public class DateTimeService { formatStr = formatStr.replaceAll("'([M]{4,})'", monthName); formatStr = formatStr.replaceAll("([M]{4,})'", "'" + monthName); formatStr = formatStr.replaceAll("'([M]{4,})", monthName + "'"); - formatStr = formatStr.replaceAll("[M]{4,}", "'" + monthName - + "'"); + formatStr = formatStr.replaceAll("[M]{4,}", + "'" + monthName + "'"); } } @@ -406,8 +406,8 @@ public class DateTimeService { formatStr = formatStr.replaceAll("'([M]{3,})'", monthName); formatStr = formatStr.replaceAll("([M]{3,})'", "'" + monthName); formatStr = formatStr.replaceAll("'([M]{3,})", monthName + "'"); - formatStr = formatStr.replaceAll("[M]{3,}", "'" + monthName - + "'"); + formatStr = formatStr.replaceAll("[M]{3,}", + "'" + monthName + "'"); } } @@ -490,8 +490,8 @@ public class DateTimeService { // Some version of Firefox sets the timestamp to 0 if parsing fails. if (date != null && date.getTime() == 0) { - throw new IllegalArgumentException("Parsing of '" + dateString - + "' failed"); + throw new IllegalArgumentException( + "Parsing of '" + dateString + "' failed"); } return date; diff --git a/client/src/main/java/com/vaadin/client/EventHelper.java b/client/src/main/java/com/vaadin/client/EventHelper.java index 1ee252af0f..94fbddf309 100644 --- a/client/src/main/java/com/vaadin/client/EventHelper.java +++ b/client/src/main/java/com/vaadin/client/EventHelper.java @@ -87,7 +87,8 @@ public class EventHelper { * handler later */ public static <T extends ComponentConnector & FocusHandler> HandlerRegistration updateFocusHandler( - T connector, HandlerRegistration handlerRegistration, Widget widget) { + T connector, HandlerRegistration handlerRegistration, + Widget widget) { return updateHandler(connector, connector, FOCUS, handlerRegistration, FocusEvent.getType(), widget); } @@ -126,14 +127,16 @@ public class EventHelper { * handler later */ public static <T extends ComponentConnector & BlurHandler> HandlerRegistration updateBlurHandler( - T connector, HandlerRegistration handlerRegistration, Widget widget) { + T connector, HandlerRegistration handlerRegistration, + Widget widget) { return updateHandler(connector, connector, BLUR, handlerRegistration, BlurEvent.getType(), widget); } public static <H extends EventHandler> HandlerRegistration updateHandler( ComponentConnector connector, H handler, String eventIdentifier, - HandlerRegistration handlerRegistration, Type<H> type, Widget widget) { + HandlerRegistration handlerRegistration, Type<H> type, + Widget widget) { if (connector.hasEventListener(eventIdentifier)) { if (handlerRegistration == null) { handlerRegistration = widget.addDomHandler(handler, type); diff --git a/client/src/main/java/com/vaadin/client/HasChildMeasurementHintConnector.java b/client/src/main/java/com/vaadin/client/HasChildMeasurementHintConnector.java index bb76377cd1..41aea1e57e 100644 --- a/client/src/main/java/com/vaadin/client/HasChildMeasurementHintConnector.java +++ b/client/src/main/java/com/vaadin/client/HasChildMeasurementHintConnector.java @@ -25,8 +25,8 @@ import com.vaadin.client.ui.layout.ElementResizeListener; * @since 7.6 * @author Vaadin Ltd */ -public interface HasChildMeasurementHintConnector extends - HasComponentsConnector { +public interface HasChildMeasurementHintConnector + extends HasComponentsConnector { /** * Specifies how you would like child components measurements to be handled. diff --git a/client/src/main/java/com/vaadin/client/JavaScriptConnectorHelper.java b/client/src/main/java/com/vaadin/client/JavaScriptConnectorHelper.java index 1833b370e5..eee180ad89 100644 --- a/client/src/main/java/com/vaadin/client/JavaScriptConnectorHelper.java +++ b/client/src/main/java/com/vaadin/client/JavaScriptConnectorHelper.java @@ -64,8 +64,8 @@ public class JavaScriptConnectorHelper { /** * The id of the previous response for which state changes have been * processed. If this is the same as the - * {@link ApplicationConnection#getLastSeenServerSyncId()}, it means that the - * state change has already been handled and should not be done again. + * {@link ApplicationConnection#getLastSeenServerSyncId()}, it means that + * the state change has already been handled and should not be done again. */ private int processedResponseId = -1; @@ -93,7 +93,8 @@ public class JavaScriptConnectorHelper { } private void processStateChanges() { - int lastResponseId = connector.getConnection().getLastSeenServerSyncId(); + int lastResponseId = connector.getConnection() + .getLastSeenServerSyncId(); if (processedResponseId == lastResponseId) { return; } @@ -140,7 +141,8 @@ public class JavaScriptConnectorHelper { return rpcName.replace('$', '.'); } - protected JavaScriptObject createRpcObject(String iface, Set<String> methods) { + protected JavaScriptObject createRpcObject(String iface, + Set<String> methods) { JavaScriptObject object = JavaScriptObject.createObject(); for (String method : methods) { @@ -157,19 +159,16 @@ public class JavaScriptConnectorHelper { Integer tag = Integer.valueOf(this.tag); while (tag != null) { String serverSideClassName = conf.getServerSideClassNameForTag(tag); - String initFunctionName = serverSideClassName - .replaceAll("\\.", "_"); + String initFunctionName = serverSideClassName.replaceAll("\\.", + "_"); if (tryInitJs(initFunctionName, getConnectorWrapper())) { - getLogger().info( - "JavaScript connector initialized using " - + initFunctionName); + getLogger().info("JavaScript connector initialized using " + + initFunctionName); this.initFunctionName = initFunctionName; return true; } else { - getLogger() - .warning( - "No JavaScript function " + initFunctionName - + " found"); + getLogger().warning("No JavaScript function " + initFunctionName + + " found"); attemptedNames.add(initFunctionName); tag = conf.getParentTag(tag.intValue()); } @@ -267,8 +266,8 @@ public class JavaScriptConnectorHelper { ElementResizeListener listener = elementListeners.get(callbackFunction); if (listener == null) { - LayoutManager layoutManager = LayoutManager.get(connector - .getConnection()); + LayoutManager layoutManager = LayoutManager + .get(connector.getConnection()); listener = new ElementResizeListener() { @Override public void onElementResize(ElementResizeEvent e) { @@ -343,8 +342,8 @@ public class JavaScriptConnectorHelper { return connector; } - return ConnectorMap.get(connector.getConnection()).getConnector( - connectorId); + return ConnectorMap.get(connector.getConnection()) + .getConnector(connectorId); } private void fireRpc(String iface, String method, @@ -378,16 +377,15 @@ public class JavaScriptConnectorHelper { interfaceList += getJsInterfaceName(iface); } - throw new IllegalStateException( - "Can not call method " - + method - + " for wildcard rpc proxy because the function is defined for multiple rpc interfaces: " - + interfaceList - + ". Retrieve a rpc proxy for a specific interface using getRpcProxy(interfaceName) to use the function."); + throw new IllegalStateException("Can not call method " + method + + " for wildcard rpc proxy because the function is defined for multiple rpc interfaces: " + + interfaceList + + ". Retrieve a rpc proxy for a specific interface using getRpcProxy(interfaceName) to use the function."); } } - private void fireCallback(String name, JsArray<JavaScriptObject> arguments) { + private void fireCallback(String name, + JsArray<JavaScriptObject> arguments) { MethodInvocation invocation = new JavaScriptMethodInvocation( connector.getConnectorId(), "com.vaadin.ui.JavaScript$JavaScriptCallbackRpc", "call", @@ -450,7 +448,8 @@ public class JavaScriptConnectorHelper { }-*/; private static native void invokeJsRpc(JavaScriptObject rpcMap, - String interfaceName, String methodName, JavaScriptObject parameters) + String interfaceName, String methodName, + JavaScriptObject parameters) /*-{ var targets = rpcMap[interfaceName]; if (!targets) { @@ -479,14 +478,15 @@ public class JavaScriptConnectorHelper { invokeIfPresent(connectorWrapper, "onUnregister"); if (!resizeListeners.isEmpty()) { - LayoutManager layoutManager = LayoutManager.get(connector - .getConnection()); + LayoutManager layoutManager = LayoutManager + .get(connector.getConnection()); for (Entry<Element, Map<JavaScriptObject, ElementResizeListener>> entry : resizeListeners .entrySet()) { Element element = entry.getKey(); - for (ElementResizeListener listener : entry.getValue().values()) { - layoutManager - .removeElementResizeListener(element, listener); + for (ElementResizeListener listener : entry.getValue() + .values()) { + layoutManager.removeElementResizeListener(element, + listener); } } resizeListeners.clear(); diff --git a/client/src/main/java/com/vaadin/client/LayoutManager.java b/client/src/main/java/com/vaadin/client/LayoutManager.java index ed83e195d7..10a77379f1 100644 --- a/client/src/main/java/com/vaadin/client/LayoutManager.java +++ b/client/src/main/java/com/vaadin/client/LayoutManager.java @@ -240,9 +240,8 @@ public class LayoutManager { } layoutCounts.put(layout.getConnectorId(), count); if (count.intValue() > 2) { - getLogger().severe( - Util.getConnectorString(layout) + " has been layouted " - + count.intValue() + " times"); + getLogger().severe(Util.getConnectorString(layout) + + " has been layouted " + count.intValue() + " times"); } } @@ -321,8 +320,8 @@ public class LayoutManager { for (int i = 0; i < dumpLength; i++) { ServerConnector connector = connectorMap.getConnector(dump.get(i)); if (connector != null) { - currentDependencyTree.setNeedsMeasure( - (ComponentConnector) connector, true); + currentDependencyTree + .setNeedsMeasure((ComponentConnector) connector, true); } } needsMeasure = FastStringSet.create(); @@ -357,23 +356,27 @@ public class LayoutManager { Collection<ElementResizeListener> listeners = elementResizeListeners .get(element); if (listeners != null) { - Profiler.enter("Layout fire resize events - listeners not null"); - Profiler.enter("ElementResizeListener.onElementResize copy list"); - ElementResizeListener[] array = listeners - .toArray(new ElementResizeListener[listeners - .size()]); - Profiler.leave("ElementResizeListener.onElementResize copy list"); + Profiler.enter( + "Layout fire resize events - listeners not null"); + Profiler.enter( + "ElementResizeListener.onElementResize copy list"); + ElementResizeListener[] array = listeners.toArray( + new ElementResizeListener[listeners.size()]); + Profiler.leave( + "ElementResizeListener.onElementResize copy list"); ElementResizeEvent event = new ElementResizeEvent(this, element); for (ElementResizeListener listener : array) { try { String key = null; if (Profiler.isEnabled()) { - Profiler.enter("ElementResizeListener.onElementResize construct profiler key"); + Profiler.enter( + "ElementResizeListener.onElementResize construct profiler key"); key = "ElementResizeListener.onElementResize for " + listener.getClass() .getSimpleName(); - Profiler.leave("ElementResizeListener.onElementResize construct profiler key"); + Profiler.leave( + "ElementResizeListener.onElementResize construct profiler key"); Profiler.enter(key); } @@ -386,7 +389,8 @@ public class LayoutManager { "Error in resize listener", e); } } - Profiler.leave("Layout fire resize events - listeners not null"); + Profiler.leave( + "Layout fire resize events - listeners not null"); } } listenersToFire.clear(); @@ -451,10 +455,9 @@ public class LayoutManager { Profiler.leave(key); } } catch (RuntimeException e) { - getLogger() - .log(Level.SEVERE, - "Error in SimpleManagedLayout (horizontal) handling", - e); + getLogger().log(Level.SEVERE, + "Error in SimpleManagedLayout (horizontal) handling", + e); } countLayout(layoutCounts, rr); @@ -488,10 +491,9 @@ public class LayoutManager { Profiler.leave(key); } } catch (RuntimeException e) { - getLogger() - .log(Level.SEVERE, - "Error in DirectionalManagedLayout handling", - e); + getLogger().log(Level.SEVERE, + "Error in DirectionalManagedLayout handling", + e); } countLayout(layoutCounts, cl); } else { @@ -514,10 +516,9 @@ public class LayoutManager { Profiler.leave(key); } } catch (RuntimeException e) { - getLogger() - .log(Level.SEVERE, - "Error in SimpleManagedLayout (vertical) handling", - e); + getLogger().log(Level.SEVERE, + "Error in SimpleManagedLayout (vertical) handling", + e); } countLayout(layoutCounts, rr); } @@ -544,8 +545,9 @@ public class LayoutManager { } String connectorString = changedCids.get(i); if (changedCids.length() < 10) { - ServerConnector connector = ConnectorMap.get( - connection).getConnector(connectorString); + ServerConnector connector = ConnectorMap + .get(connection) + .getConnector(connectorString); connectorString = Util .getConnectorString(connector); } @@ -557,18 +559,17 @@ public class LayoutManager { Profiler.leave("Layout pass"); - getLogger() - .info("Pass " + passes + " measured " - + measuredConnectorCount + " elements, fired " - + firedListeners + " listeners and did " - + layoutCount + " layouts."); + getLogger().info("Pass " + passes + " measured " + + measuredConnectorCount + " elements, fired " + + firedListeners + " listeners and did " + layoutCount + + " layouts."); if (passes > 100) { getLogger().severe(LOOP_ABORT_MESSAGE); if (ApplicationConfiguration.isDebugMode()) { - VNotification.createNotification( - VNotification.DELAY_FOREVER, - connection.getUIConnector().getWidget()) + VNotification + .createNotification(VNotification.DELAY_FOREVER, + connection.getUIConnector().getWidget()) .show(LOOP_ABORT_MESSAGE, VNotification.CENTERED, "error"); } @@ -601,15 +602,14 @@ public class LayoutManager { cleanMeasuredSizes(); - getLogger().info( - "Total layout phase time: " + totalDuration.elapsedMillis() - + "ms"); + getLogger().info("Total layout phase time: " + + totalDuration.elapsedMillis() + "ms"); } private void logConnectorStatus(int connectorId) { - currentDependencyTree - .logDependencyStatus((ComponentConnector) ConnectorMap.get( - connection).getConnector(Integer.toString(connectorId))); + currentDependencyTree.logDependencyStatus( + (ComponentConnector) ConnectorMap.get(connection) + .getConnector(Integer.toString(connectorId))); } private int measureConnectors(LayoutDependencyTree layoutDependencyTree, @@ -637,12 +637,10 @@ public class LayoutManager { } if (debugLogging) { - getLogger() - .info("Doing overflow fix for " - + Util.getConnectorString(componentConnector) - + " in " - + Util.getConnectorString(componentConnector - .getParent())); + getLogger().info("Doing overflow fix for " + + Util.getConnectorString(componentConnector) + + " in " + Util.getConnectorString( + componentConnector.getParent())); } Profiler.enter("Overflow fix apply"); @@ -760,9 +758,8 @@ public class LayoutManager { return true; } ServerConnector parent = componentConnector.getParent(); - if (parent instanceof ComponentConnector - && !currentDependencyTree - .noMoreChangesExpected((ComponentConnector) parent)) { + if (parent instanceof ComponentConnector && !currentDependencyTree + .noMoreChangesExpected((ComponentConnector) parent)) { return true; } @@ -819,9 +816,8 @@ public class LayoutManager { measuredAndUpdate(element, getMeasuredSize(element, null)); } Profiler.leave("LayoutManager.measureNonConenctors"); - getLogger().info( - "Measured " + measuredNonConnectorElements.size() - + " non connector elements"); + getLogger().info("Measured " + measuredNonConnectorElements.size() + + " non connector elements"); } private MeasureResult measuredAndUpdate(Element element, @@ -916,9 +912,8 @@ public class LayoutManager { */ public final void setNeedsHorizontalLayout(ManagedLayout layout) { if (isLayoutRunning()) { - getLogger() - .warning( - "setNeedsHorizontalLayout should not be run while a layout phase is in progress."); + getLogger().warning( + "setNeedsHorizontalLayout should not be run while a layout phase is in progress."); } needsHorizontalLayout.add(layout.getConnectorId()); } @@ -942,9 +937,8 @@ public class LayoutManager { */ public final void setNeedsVerticalLayout(ManagedLayout layout) { if (isLayoutRunning()) { - getLogger() - .warning( - "setNeedsVerticalLayout should not be run while a layout phase is in progress."); + getLogger().warning( + "setNeedsVerticalLayout should not be run while a layout phase is in progress."); } needsVerticalLayout.add(layout.getConnectorId()); } @@ -972,9 +966,10 @@ public class LayoutManager { * borders) of the element in pixels. */ public final int getOuterHeight(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; - return (int) Math.ceil(getMeasuredSize(element, nullSize) - .getOuterHeight()); + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; + return (int) Math + .ceil(getMeasuredSize(element, nullSize).getOuterHeight()); } /** @@ -998,7 +993,8 @@ public class LayoutManager { * borders) of the element in pixels. */ public final double getOuterHeightDouble(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; return getMeasuredSize(element, nullSize).getOuterHeight(); } @@ -1026,9 +1022,10 @@ public class LayoutManager { * borders) of the element in pixels. */ public final int getOuterWidth(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; - return (int) Math.ceil(getMeasuredSize(element, nullSize) - .getOuterWidth()); + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; + return (int) Math + .ceil(getMeasuredSize(element, nullSize).getOuterWidth()); } /** @@ -1051,7 +1048,8 @@ public class LayoutManager { * borders) of the element in pixels. */ public final double getOuterWidthDouble(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; return getMeasuredSize(element, nullSize).getOuterWidth(); } @@ -1078,9 +1076,10 @@ public class LayoutManager { * borders) of the element in pixels. */ public final int getInnerHeight(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; - return (int) Math.ceil(getMeasuredSize(element, nullSize) - .getInnerHeight()); + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; + return (int) Math + .ceil(getMeasuredSize(element, nullSize).getInnerHeight()); } /** @@ -1104,7 +1103,8 @@ public class LayoutManager { * borders) of the element in pixels. */ public final double getInnerHeightDouble(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; return getMeasuredSize(element, nullSize).getInnerHeight(); } @@ -1131,9 +1131,10 @@ public class LayoutManager { * borders) of the element in pixels. */ public final int getInnerWidth(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; - return (int) Math.ceil(getMeasuredSize(element, nullSize) - .getInnerWidth()); + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; + return (int) Math + .ceil(getMeasuredSize(element, nullSize).getInnerWidth()); } /** @@ -1157,7 +1158,8 @@ public class LayoutManager { * borders) of the element in pixels. */ public final double getInnerWidthDouble(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; return getMeasuredSize(element, nullSize).getInnerWidth(); } @@ -1182,7 +1184,8 @@ public class LayoutManager { * element in pixels. */ public final int getBorderHeight(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; return getMeasuredSize(element, nullSize).getBorderHeight(); } @@ -1207,7 +1210,8 @@ public class LayoutManager { * element in pixels. */ public int getPaddingHeight(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; return getMeasuredSize(element, nullSize).getPaddingHeight(); } @@ -1232,7 +1236,8 @@ public class LayoutManager { * element in pixels. */ public int getBorderWidth(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; return getMeasuredSize(element, nullSize).getBorderWidth(); } @@ -1255,7 +1260,8 @@ public class LayoutManager { * @return the measured top border of the element in pixels. */ public int getBorderTop(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; return getMeasuredSize(element, nullSize).getBorderTop(); } @@ -1278,7 +1284,8 @@ public class LayoutManager { * @return the measured left border of the element in pixels. */ public int getBorderLeft(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; return getMeasuredSize(element, nullSize).getBorderLeft(); } @@ -1301,7 +1308,8 @@ public class LayoutManager { * @return the measured bottom border of the element in pixels. */ public int getBorderBottom(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; return getMeasuredSize(element, nullSize).getBorderBottom(); } @@ -1324,7 +1332,8 @@ public class LayoutManager { * @return the measured right border of the element in pixels. */ public int getBorderRight(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; return getMeasuredSize(element, nullSize).getBorderRight(); } @@ -1349,7 +1358,8 @@ public class LayoutManager { * element in pixels. */ public int getPaddingWidth(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; return getMeasuredSize(element, nullSize).getPaddingWidth(); } @@ -1372,7 +1382,8 @@ public class LayoutManager { * @return the measured top padding of the element in pixels. */ public int getPaddingTop(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; return getMeasuredSize(element, nullSize).getPaddingTop(); } @@ -1395,7 +1406,8 @@ public class LayoutManager { * @return the measured left padding of the element in pixels. */ public int getPaddingLeft(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; return getMeasuredSize(element, nullSize).getPaddingLeft(); } @@ -1418,7 +1430,8 @@ public class LayoutManager { * @return the measured bottom padding of the element in pixels. */ public int getPaddingBottom(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; return getMeasuredSize(element, nullSize).getPaddingBottom(); } @@ -1441,7 +1454,8 @@ public class LayoutManager { * @return the measured right padding of the element in pixels. */ public int getPaddingRight(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; return getMeasuredSize(element, nullSize).getPaddingRight(); } @@ -1464,7 +1478,8 @@ public class LayoutManager { * @return the measured top margin of the element in pixels. */ public int getMarginTop(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; return getMeasuredSize(element, nullSize).getMarginTop(); } @@ -1487,7 +1502,8 @@ public class LayoutManager { * @return the measured right margin of the element in pixels. */ public int getMarginRight(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; return getMeasuredSize(element, nullSize).getMarginRight(); } @@ -1510,7 +1526,8 @@ public class LayoutManager { * @return the measured bottom margin of the element in pixels. */ public int getMarginBottom(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; return getMeasuredSize(element, nullSize).getMarginBottom(); } @@ -1533,7 +1550,8 @@ public class LayoutManager { * @return the measured left margin of the element in pixels. */ public int getMarginLeft(Element element) { - assert needsMeasure(element) : "Getting measurement for element that is not measured"; + assert needsMeasure( + element) : "Getting measurement for element that is not measured"; return getMeasuredSize(element, nullSize).getMarginLeft(); } @@ -1594,7 +1612,8 @@ public class LayoutManager { * the new outer height (including margins, borders and paddings) * of the component in pixels */ - public void reportOuterHeight(ComponentConnector component, int outerHeight) { + public void reportOuterHeight(ComponentConnector component, + int outerHeight) { Element element = component.getWidget().getElement(); MeasuredSize measuredSize = getMeasuredSize(element); if (isLayoutRunning()) { @@ -1627,8 +1646,8 @@ public class LayoutManager { int assignedHeight) { assert component.isRelativeHeight(); - float percentSize = parsePercent(component.getState().height == null ? "" - : component.getState().height); + float percentSize = parsePercent(component.getState().height == null + ? "" : component.getState().height); int effectiveHeight = Math.round(assignedHeight * (percentSize / 100)); reportOuterHeight(component, effectiveHeight); @@ -1792,7 +1811,8 @@ public class LayoutManager { if (component instanceof HasComponentsConnector) { HasComponentsConnector hasComponents = (HasComponentsConnector) component; - for (ComponentConnector child : hasComponents.getChildComponents()) { + for (ComponentConnector child : hasComponents + .getChildComponents()) { setNeedsMeasureRecursively(child); } } @@ -1820,7 +1840,8 @@ public class LayoutManager { * false otherwise */ public boolean isLayoutNeeded() { - if (!needsHorizontalLayout.isEmpty() || !needsVerticalLayout.isEmpty()) { + if (!needsHorizontalLayout.isEmpty() + || !needsVerticalLayout.isEmpty()) { return true; } if (!needsMeasure.isEmpty()) { diff --git a/client/src/main/java/com/vaadin/client/MeasuredSize.java b/client/src/main/java/com/vaadin/client/MeasuredSize.java index 2099008350..f358517afa 100644 --- a/client/src/main/java/com/vaadin/client/MeasuredSize.java +++ b/client/src/main/java/com/vaadin/client/MeasuredSize.java @@ -205,7 +205,8 @@ public class MeasuredSize { heightChanged = true; } if (!widthChanged && hasWidthChanged(this.paddings, paddings)) { - debugSizeChange(element, "Width (padding)", this.paddings, paddings); + debugSizeChange(element, "Width (padding)", this.paddings, + paddings); widthChanged = true; } this.paddings = paddings; @@ -278,9 +279,8 @@ public class MeasuredSize { private void debugSizeChange(Element element, String sizeChangeType, String changedFrom, String changedTo) { if (debugSizeChanges) { - getLogger() - .info(sizeChangeType + " has changed from " + changedFrom - + " to " + changedTo + " for " + element.toString()); + getLogger().info(sizeChangeType + " has changed from " + changedFrom + + " to " + changedTo + " for " + element.toString()); } } diff --git a/client/src/main/java/com/vaadin/client/Profiler.java b/client/src/main/java/com/vaadin/client/Profiler.java index 3923b66218..3d48d1c616 100644 --- a/client/src/main/java/com/vaadin/client/Profiler.java +++ b/client/src/main/java/com/vaadin/client/Profiler.java @@ -197,7 +197,8 @@ public class Profiler { return Collections.unmodifiableCollection(children.values()); } - private void buildRecursiveString(StringBuilder builder, String prefix) { + private void buildRecursiveString(StringBuilder builder, + String prefix) { if (getName() != null) { String msg = getStringRepresentation(prefix); builder.append(msg + '\n'); @@ -220,9 +221,7 @@ public class Profiler { String msg = prefix + " " + getName() + " in " + roundToSignificantFigures(getTimeSpent()) + " ms."; if (getCount() > 1) { - msg += " Invoked " - + getCount() - + " times (" + msg += " Invoked " + getCount() + " times (" + roundToSignificantFigures(getTimeSpent() / getCount()) + " ms per time, min " + roundToSignificantFigures(getMinTimeSpent()) @@ -270,10 +269,10 @@ public class Profiler { totalNode.time += getOwnTime(); totalNode.count += getCount(); - totalNode.minTime = roundToSignificantFigures(Math.min( - totalNode.minTime, getMinTimeSpent())); - totalNode.maxTime = roundToSignificantFigures(Math.max( - totalNode.maxTime, getMaxTimeSpent())); + totalNode.minTime = roundToSignificantFigures( + Math.min(totalNode.minTime, getMinTimeSpent())); + totalNode.maxTime = roundToSignificantFigures( + Math.max(totalNode.maxTime, getMaxTimeSpent())); } for (Node node : children.values()) { node.sumUpTotals(totals); @@ -468,9 +467,8 @@ public class Profiler { stack.add(rootNode); JsArray<GwtStatsEvent> gwtStatsEvents = getGwtStatsEvents(); if (gwtStatsEvents.length() == 0) { - getLogger() - .warning( - "No profiling events recorded, this might happen if another __gwtStatsEvent handler is installed."); + getLogger().warning( + "No profiling events recorded, this might happen if another __gwtStatsEvent handler is installed."); return; } @@ -503,10 +501,8 @@ public class Profiler { if (type.equals("end")) { if (!inEvent) { - getLogger().severe( - "Got end event for " + eventName - + " but is currently in " - + stackTop.getName()); + getLogger().severe("Got end event for " + eventName + + " but is currently in " + stackTop.getName()); return; } Node previousStackTop = stack.removeLast(); @@ -516,8 +512,9 @@ public class Profiler { previousStackTop.leave(gwtStatsEvent.getMillis()); } } else { - double millis = isExtendedEvent ? gwtStatsEvent - .getRelativeMillis() : gwtStatsEvent.getMillis(); + double millis = isExtendedEvent + ? gwtStatsEvent.getRelativeMillis() + : gwtStatsEvent.getMillis(); if (!inEvent) { stackTop = stackTop.enterChild(eventName, millis); stack.add(stackTop); @@ -538,9 +535,8 @@ public class Profiler { } if (stack.size() != 1) { - getLogger().warning( - "Not all nodes are left, the last node is " - + stack.getLast().getName()); + getLogger().warning("Not all nodes are left, the last node is " + + stack.getLast().getName()); return; } @@ -600,8 +596,8 @@ public class Profiler { } if (timings.isEmpty()) { - getLogger() - .info("Bootstrap timings not supported, please ensure your browser supports performance.timing"); + getLogger().info( + "Bootstrap timings not supported, please ensure your browser supports performance.timing"); return; } @@ -675,7 +671,8 @@ public class Profiler { public static void setProfilerResultConsumer( ProfilerResultConsumer profilerResultConsumer) { if (consumer != null) { - throw new IllegalStateException("The consumer has already been set"); + throw new IllegalStateException( + "The consumer has already been set"); } consumer = profilerResultConsumer; } @@ -697,8 +694,8 @@ public class Profiler { double getRelativeTime(); } - private static class DefaultRelativeTimeSupplier implements - RelativeTimeSupplier { + private static class DefaultRelativeTimeSupplier + implements RelativeTimeSupplier { @Override public native double getRelativeTime() @@ -707,8 +704,8 @@ public class Profiler { }-*/; } - private static class HighResolutionTimeSupplier implements - RelativeTimeSupplier { + private static class HighResolutionTimeSupplier + implements RelativeTimeSupplier { @Override public native double getRelativeTime() diff --git a/client/src/main/java/com/vaadin/client/ResourceLoader.java b/client/src/main/java/com/vaadin/client/ResourceLoader.java index 559768d09c..b7c845c292 100644 --- a/client/src/main/java/com/vaadin/client/ResourceLoader.java +++ b/client/src/main/java/com/vaadin/client/ResourceLoader.java @@ -533,12 +533,12 @@ public class ResourceLoader { if (rules === undefined) { rules = sheet.rules; } - + if (rules === null) { // Style sheet loaded, but can't access length because of XSS -> assume there's something there return 1; } - + // Return length so we can distinguish 0 (probably 404 error) from normal case. return rules.length; } catch (err) { diff --git a/client/src/main/java/com/vaadin/client/ServerConnector.java b/client/src/main/java/com/vaadin/client/ServerConnector.java index 0bc2ac9995..795474bfcd 100644 --- a/client/src/main/java/com/vaadin/client/ServerConnector.java +++ b/client/src/main/java/com/vaadin/client/ServerConnector.java @@ -84,7 +84,8 @@ public interface ServerConnector extends Connector { * @return A handler registration reference that can be used to unregister * the handler */ - public HandlerRegistration addStateChangeHandler(StateChangeHandler handler); + public HandlerRegistration addStateChangeHandler( + StateChangeHandler handler); /** * Removes a handler that is called whenever any part of the state has been diff --git a/client/src/main/java/com/vaadin/client/SimpleTree.java b/client/src/main/java/com/vaadin/client/SimpleTree.java index 3c63f54d5f..cd7d73683c 100644 --- a/client/src/main/java/com/vaadin/client/SimpleTree.java +++ b/client/src/main/java/com/vaadin/client/SimpleTree.java @@ -81,14 +81,15 @@ public class SimpleTree extends ComplexPanel implements HasDoubleClickHandlers { @Override public void onClick(ClickEvent event) { if (event.getNativeEvent().getEventTarget().cast() == handle) { - if (children.getStyle().getDisplay().intern() == Display.NONE - .getCssName()) { + if (children.getStyle().getDisplay() + .intern() == Display.NONE.getCssName()) { open(event.getNativeEvent().getAltKey()); } else { close(); } - } else if (event.getNativeEvent().getEventTarget().cast() == text) { + } else if (event.getNativeEvent().getEventTarget() + .cast() == text) { select(event); } } @@ -173,20 +174,22 @@ public class SimpleTree extends ComplexPanel implements HasDoubleClickHandlers { * {@inheritDoc} Events are not fired when double clicking child widgets. */ @Override - public HandlerRegistration addDoubleClickHandler(DoubleClickHandler handler) { + public HandlerRegistration addDoubleClickHandler( + DoubleClickHandler handler) { if (textDoubleClickHandlerManager == null) { textDoubleClickHandlerManager = new HandlerManager(this); addDomHandler(new DoubleClickHandler() { @Override public void onDoubleClick(DoubleClickEvent event) { - if (event.getNativeEvent().getEventTarget().cast() == text) { + if (event.getNativeEvent().getEventTarget() + .cast() == text) { textDoubleClickHandlerManager.fireEvent(event); } } }, DoubleClickEvent.getType()); } - return textDoubleClickHandlerManager.addHandler( - DoubleClickEvent.getType(), handler); + return textDoubleClickHandlerManager + .addHandler(DoubleClickEvent.getType(), handler); } } diff --git a/client/src/main/java/com/vaadin/client/SuperDevMode.java b/client/src/main/java/com/vaadin/client/SuperDevMode.java index f664244715..cc7e107555 100644 --- a/client/src/main/java/com/vaadin/client/SuperDevMode.java +++ b/client/src/main/java/com/vaadin/client/SuperDevMode.java @@ -53,9 +53,8 @@ public class SuperDevMode { private static void recompileWidgetsetAndStartInDevMode( final String serverUrl) { - getLogger().info( - "Recompiling widgetset using<br/>" + serverUrl - + "<br/>and then reloading in super dev mode"); + getLogger().info("Recompiling widgetset using<br/>" + serverUrl + + "<br/>and then reloading in super dev mode"); VNotification n = new VNotification(); n.show("<b>Recompiling widgetset, please wait</b>", VNotification.CENTERED, VNotification.STYLE_SYSTEM); @@ -63,8 +62,9 @@ public class SuperDevMode { JsonpRequestBuilder b = new JsonpRequestBuilder(); b.setCallbackParam("_callback"); b.setTimeout(COMPILE_TIMEOUT_IN_SECONDS * 1000); - b.requestObject(serverUrl + "recompile/" + GWT.getModuleName() + "?" - + getRecompileParameters(GWT.getModuleName()), + b.requestObject( + serverUrl + "recompile/" + GWT.getModuleName() + "?" + + getRecompileParameters(GWT.getModuleName()), new AsyncCallback<RecompileResult>() { @Override @@ -77,8 +77,7 @@ public class SuperDevMode { return; } - setSession( - getSuperDevModeHookKey(), + setSession(getSuperDevModeHookKey(), getSuperDevWidgetSetUrl(GWT.getModuleName(), serverUrl)); setSession(SKIP_RECOMPILE, "1"); @@ -92,9 +91,8 @@ public class SuperDevMode { getLogger().severe("JSONP compile call failed"); // Don't log exception as they are shown as // notifications - getLogger().severe( - caught.getClass().getSimpleName() + ": " - + caught.getMessage()); + getLogger().severe(caught.getClass().getSimpleName() + + ": " + caught.getMessage()); failed(); } @@ -227,12 +225,12 @@ public class SuperDevMode { var mod = $wnd.__gwt_activeModules[moduleName]; if (!mod) return false; - + if (mod.superdevmode) { // Running in super dev mode already, it is supported return true; } - + return !!mod.canRedirect; }-*/; @@ -254,9 +252,10 @@ public class SuperDevMode { // in super dev mode, as a result of the recompile, the enabled // check will fail... if (!isSuperDevModeEnabledInModule()) { - showError("SuperDevMode is disabled for this module/widgetset.<br/>" - + "Ensure that your module definition (.gwt.xml) does not contain <br/>" - + "<set-configuration-property name="devModeRedirectEnabled" value="false" /><br/>"); + showError( + "SuperDevMode is disabled for this module/widgetset.<br/>" + + "Ensure that your module definition (.gwt.xml) does not contain <br/>" + + "<set-configuration-property name="devModeRedirectEnabled" value="false" /><br/>"); return false; } return SuperDevMode.recompileIfNeeded(superDevModeParameter); diff --git a/client/src/main/java/com/vaadin/client/TooltipInfo.java b/client/src/main/java/com/vaadin/client/TooltipInfo.java index c1dd5037eb..970f155af5 100644 --- a/client/src/main/java/com/vaadin/client/TooltipInfo.java +++ b/client/src/main/java/com/vaadin/client/TooltipInfo.java @@ -82,6 +82,7 @@ public class TooltipInfo { public boolean equals(TooltipInfo other) { return (other != null && SharedUtil.equals(other.title, title) - && SharedUtil.equals(other.errorMessageHtml, errorMessageHtml) && other.identifier == identifier); + && SharedUtil.equals(other.errorMessageHtml, errorMessageHtml) + && other.identifier == identifier); } } diff --git a/client/src/main/java/com/vaadin/client/UIDL.java b/client/src/main/java/com/vaadin/client/UIDL.java index 2c2a5de308..1b9ee9ffce 100644 --- a/client/src/main/java/com/vaadin/client/UIDL.java +++ b/client/src/main/java/com/vaadin/client/UIDL.java @@ -314,9 +314,8 @@ public final class UIDL extends JavaScriptObject { case CHILD_TYPE_XML: return getChildXML(index); default: - throw new IllegalStateException( - "Illegal child in tag " + getTag() - + " at index " + index); + throw new IllegalStateException("Illegal child in tag " + + getTag() + " at index " + index); } } return null; @@ -522,8 +521,8 @@ public final class UIDL extends JavaScriptObject { */ public ServerConnector getPaintableAttribute(String name, ApplicationConnection connection) { - return ConnectorMap.get(connection).getConnector( - getStringAttribute(name)); + return ConnectorMap.get(connection) + .getConnector(getStringAttribute(name)); } /** @@ -535,8 +534,8 @@ public final class UIDL extends JavaScriptObject { */ public ServerConnector getPaintableVariable(String name, ApplicationConnection connection) { - return ConnectorMap.get(connection).getConnector( - getStringVariable(name)); + return ConnectorMap.get(connection) + .getConnector(getStringVariable(name)); } /** diff --git a/client/src/main/java/com/vaadin/client/Util.java b/client/src/main/java/com/vaadin/client/Util.java index 8b5caa6051..b53dbd071b 100644 --- a/client/src/main/java/com/vaadin/client/Util.java +++ b/client/src/main/java/com/vaadin/client/Util.java @@ -225,8 +225,8 @@ public class Util { @Deprecated public static int measureVerticalPaddingAndBorder(Element element, int paddingGuess) { - return WidgetUtil - .measureVerticalPaddingAndBorder(element, paddingGuess); + return WidgetUtil.measureVerticalPaddingAndBorder(element, + paddingGuess); } /** @@ -441,7 +441,8 @@ public class Util { * @return The border-box width for the element */ @Deprecated - public static int getRequiredWidth(com.google.gwt.dom.client.Element element) { + public static int getRequiredWidth( + com.google.gwt.dom.client.Element element) { return WidgetUtil.getRequiredWidth(element); } @@ -535,7 +536,8 @@ public class Util { * @return true if auto or scroll */ @Deprecated - public static boolean mayHaveScrollBars(com.google.gwt.dom.client.Element pe) { + public static boolean mayHaveScrollBars( + com.google.gwt.dom.client.Element pe) { return WidgetUtil.mayHaveScrollBars(pe); } @@ -596,8 +598,9 @@ public class Util { VOverlay overlay = findWidget(element, VOverlay.class); if (overlay != null && overlay.getOwner() != null) { - return getConnectorForElement(client, client.getUIConnector() - .getWidget(), overlay.getOwner().getElement()); + return getConnectorForElement(client, + client.getUIConnector().getWidget(), + overlay.getOwner().getElement()); } else { return null; } @@ -623,8 +626,8 @@ public class Util { * @param element * the element to start from */ - public static ComponentConnector findPaintable( - ApplicationConnection client, Element element) { + public static ComponentConnector findPaintable(ApplicationConnection client, + Element element) { Widget widget = Util.findWidget(element, null); ConnectorMap vPaintableMap = ConnectorMap.get(client); while (widget != null && !vPaintableMap.isConnector(widget)) { @@ -746,9 +749,8 @@ public class Util { if (connector != null) { getLogger().info("\t" + id + " (" + connector.getClass() + ") :"); } else { - getLogger().warning( - "\t" + id + ": Warning: no corresponding connector for id " - + id); + getLogger().warning("\t" + id + + ": Warning: no corresponding connector for id " + id); } for (MethodInvocation invocation : invocations) { getLogger().info("\t\t" + getInvocationDebugString(invocation)); @@ -763,22 +765,24 @@ public class Util { * @param invocation * @return */ - private static String getInvocationDebugString(MethodInvocation invocation) { + private static String getInvocationDebugString( + MethodInvocation invocation) { Object[] parameters = invocation.getParameters(); String formattedParams = null; - if (ApplicationConstants.UPDATE_VARIABLE_METHOD.equals(invocation - .getMethodName()) && parameters.length == 2) { + if (ApplicationConstants.UPDATE_VARIABLE_METHOD + .equals(invocation.getMethodName()) && parameters.length == 2) { // name, value Object value = parameters[1]; // TODO paintables inside lists/maps get rendered as // components in the debug console - String formattedValue = value instanceof ServerConnector ? ((ServerConnector) value) - .getConnectorId() : String.valueOf(value); + String formattedValue = value instanceof ServerConnector + ? ((ServerConnector) value).getConnectorId() + : String.valueOf(value); formattedParams = parameters[0] + " : " + formattedValue; } if (null == formattedParams) { - formattedParams = (null != parameters) ? Arrays - .toString(parameters) : null; + formattedParams = (null != parameters) ? Arrays.toString(parameters) + : null; } return invocation.getInterfaceName() + "." + invocation.getMethodName() + "(" + formattedParams + ")"; @@ -806,8 +810,8 @@ public class Util { printConnectorInvocations(invocations, curId, c); } } catch (Exception e) { - getLogger() - .log(Level.SEVERE, "Error logging method invocations", e); + getLogger().log(Level.SEVERE, "Error logging method invocations", + e); } } @@ -1230,7 +1234,8 @@ public class Util { Profiler.enter("skipMeasureDueLayoutHint"); boolean skip = false; - HasChildMeasurementHintConnector parent = getPossibleChildMeasurementHintParentConnector(candidate); + HasChildMeasurementHintConnector parent = getPossibleChildMeasurementHintParentConnector( + candidate); if (parent != null) { ChildMeasurementHint measureMode = parent.getChildMeasurementHint(); diff --git a/client/src/main/java/com/vaadin/client/VCaption.java b/client/src/main/java/com/vaadin/client/VCaption.java index ace4fd7184..51945907ae 100644 --- a/client/src/main/java/com/vaadin/client/VCaption.java +++ b/client/src/main/java/com/vaadin/client/VCaption.java @@ -94,7 +94,8 @@ public class VCaption extends HTML { * @param client * ApplicationConnection */ - public VCaption(ComponentConnector component, ApplicationConnection client) { + public VCaption(ComponentConnector component, + ApplicationConnection client) { super(); this.client = client; owner = component; @@ -172,8 +173,8 @@ public class VCaption extends HTML { icon = null; } if (hasIcon) { - String uri = owner.getState().resources.get( - ComponentConstants.ICON_RESOURCE).getURL(); + String uri = owner.getState().resources + .get(ComponentConstants.ICON_RESOURCE).getURL(); icon = client.getIcon(uri); @@ -247,8 +248,8 @@ public class VCaption extends HTML { getInsertPosition(InsertPosition.REQUIRED)); // Hide the required indicator from assistive device - Roles.getTextboxRole().setAriaHiddenState( - requiredFieldIndicator, true); + Roles.getTextboxRole() + .setAriaHiddenState(requiredFieldIndicator, true); } } else if (requiredFieldIndicator != null) { // Remove existing @@ -269,8 +270,8 @@ public class VCaption extends HTML { getInsertPosition(InsertPosition.ERROR)); // Hide error indicator from assistive devices - Roles.getTextboxRole().setAriaHiddenState( - errorIndicatorElement, true); + Roles.getTextboxRole().setAriaHiddenState(errorIndicatorElement, + true); } } else if (errorIndicatorElement != null) { // Remove existing @@ -447,9 +448,8 @@ public class VCaption extends HTML { if (owner != null) { Util.notifyParentOfSizeChange(owner.getWidget(), true); } else { - getLogger() - .warning( - "Warning: Icon load event was not propagated because VCaption owner is unknown."); + getLogger().warning( + "Warning: Icon load event was not propagated because VCaption owner is unknown."); } } } @@ -637,13 +637,13 @@ public class VCaption extends HTML { } if (icon != null) { - int iconRequiredWidth = WidgetUtil.getRequiredWidth(icon - .getElement()); + int iconRequiredWidth = WidgetUtil + .getRequiredWidth(icon.getElement()); if (availableWidth > iconRequiredWidth) { availableWidth -= iconRequiredWidth; } else { - icon.getElement().getStyle() - .setWidth(availableWidth, Unit.PX); + icon.getElement().getStyle().setWidth(availableWidth, + Unit.PX); availableWidth = 0; } } diff --git a/client/src/main/java/com/vaadin/client/VErrorMessage.java b/client/src/main/java/com/vaadin/client/VErrorMessage.java index 271c7b1be8..41967b9983 100644 --- a/client/src/main/java/com/vaadin/client/VErrorMessage.java +++ b/client/src/main/java/com/vaadin/client/VErrorMessage.java @@ -73,12 +73,10 @@ public class VErrorMessage extends FlowPanel { } errorContainer.setPopupPosition( DOM.getAbsoluteLeft(indicatorElement) - + 2 - * DOM.getElementPropertyInt(indicatorElement, + + 2 * DOM.getElementPropertyInt(indicatorElement, "offsetHeight"), DOM.getAbsoluteTop(indicatorElement) - + 2 - * DOM.getElementPropertyInt(indicatorElement, + + 2 * DOM.getElementPropertyInt(indicatorElement, "offsetHeight")); errorContainer.show(); diff --git a/client/src/main/java/com/vaadin/client/VTooltip.java b/client/src/main/java/com/vaadin/client/VTooltip.java index 39d0682821..454b5a8276 100644 --- a/client/src/main/java/com/vaadin/client/VTooltip.java +++ b/client/src/main/java/com/vaadin/client/VTooltip.java @@ -48,9 +48,8 @@ import com.vaadin.client.ui.VOverlay; public class VTooltip extends VOverlay { private static final String CLASSNAME = "v-tooltip"; private static final int MARGIN = 4; - public static final int TOOLTIP_EVENTS = Event.ONKEYDOWN - | Event.ONMOUSEOVER | Event.ONMOUSEOUT | Event.ONMOUSEMOVE - | Event.ONCLICK; + public static final int TOOLTIP_EVENTS = Event.ONKEYDOWN | Event.ONMOUSEOVER + | Event.ONMOUSEOUT | Event.ONMOUSEMOVE | Event.ONCLICK; VErrorMessage em = new VErrorMessage(); Element description = DOM.createDiv(); @@ -134,7 +133,8 @@ public class VTooltip extends VOverlay { } private void setTooltipText(TooltipInfo info) { - if (info.getErrorMessage() != null && !info.getErrorMessage().isEmpty()) { + if (info.getErrorMessage() != null + && !info.getErrorMessage().isEmpty()) { em.setVisible(true); em.updateMessage(info.getErrorMessage()); } else { @@ -227,8 +227,9 @@ public class VTooltip extends VOverlay { x = tooltipEventMouseX + Window.getScrollLeft() - 10 - offsetWidth; } - if (x + offsetWidth + MARGIN - Window.getScrollLeft() > Window - .getClientWidth()) { + if (x + offsetWidth + MARGIN + - Window.getScrollLeft() > Window + .getClientWidth()) { x = Window.getClientWidth() - offsetWidth - MARGIN + Window.getScrollLeft(); } @@ -254,8 +255,9 @@ public class VTooltip extends VOverlay { private int getFinalTouchX(int offsetWidth) { int x = 0; int widthNeeded = 10 + offsetWidth; - int roomLeft = currentElement != null ? currentElement - .getAbsoluteLeft() : EVENT_XY_POSITION_OUTSIDE; + int roomLeft = currentElement != null + ? currentElement.getAbsoluteLeft() + : EVENT_XY_POSITION_OUTSIDE; int viewPortWidth = Window.getClientWidth(); int roomRight = viewPortWidth - roomLeft; if (roomRight > widthNeeded) { @@ -263,7 +265,8 @@ public class VTooltip extends VOverlay { } else { x = roomLeft - offsetWidth; } - if (x + offsetWidth - Window.getScrollLeft() > viewPortWidth) { + if (x + offsetWidth + - Window.getScrollLeft() > viewPortWidth) { x = viewPortWidth - offsetWidth + Window.getScrollLeft(); } @@ -300,8 +303,9 @@ public class VTooltip extends VOverlay { - offsetHeight; } - if (y + offsetHeight + MARGIN - Window.getScrollTop() > Window - .getClientHeight()) { + if (y + offsetHeight + MARGIN + - Window.getScrollTop() > Window + .getClientHeight()) { y = tooltipEventMouseY - 5 - offsetHeight + Window.getScrollTop(); if (y - Window.getScrollTop() < 0) { @@ -333,19 +337,17 @@ public class VTooltip extends VOverlay { private int getFinalTouchY(int offsetHeight) { int y = 0; int heightNeeded = 10 + offsetHeight; - int roomAbove = currentElement != null ? currentElement - .getAbsoluteTop() - + currentElement.getOffsetHeight() + int roomAbove = currentElement != null + ? currentElement.getAbsoluteTop() + + currentElement.getOffsetHeight() : EVENT_XY_POSITION_OUTSIDE; int roomBelow = Window.getClientHeight() - roomAbove; if (roomBelow > heightNeeded) { y = roomAbove; } else { - y = roomAbove - - offsetHeight - - (currentElement != null ? currentElement - .getOffsetHeight() : 0); + y = roomAbove - offsetHeight - (currentElement != null + ? currentElement.getOffsetHeight() : 0); } if (y + offsetHeight - Window.getScrollTop() > Window @@ -454,13 +456,13 @@ public class VTooltip extends VOverlay { } private int getEventX(Event event, boolean isFocused) { - return isFocused ? EVENT_XY_POSITION_OUTSIDE : DOM - .eventGetClientX(event); + return isFocused ? EVENT_XY_POSITION_OUTSIDE + : DOM.eventGetClientX(event); } private int getEventY(Event event, boolean isFocused) { - return isFocused ? EVENT_XY_POSITION_OUTSIDE : DOM - .eventGetClientY(event); + return isFocused ? EVENT_XY_POSITION_OUTSIDE + : DOM.eventGetClientY(event); } @Override @@ -494,9 +496,9 @@ public class VTooltip extends VOverlay { opening = false; } - private class TooltipEventHandler implements MouseMoveHandler, - KeyDownHandler, FocusHandler, BlurHandler, MouseDownHandler, - MouseOutHandler { + private class TooltipEventHandler + implements MouseMoveHandler, KeyDownHandler, FocusHandler, + BlurHandler, MouseDownHandler, MouseOutHandler { /** * Marker for handling of tooltip through focus @@ -647,8 +649,8 @@ public class VTooltip extends VOverlay { @Override public void onMouseOut(MouseOutEvent moe) { - Element element = WidgetUtil.getElementUnderMouse(moe - .getNativeEvent()); + Element element = WidgetUtil + .getElementUnderMouse(moe.getNativeEvent()); handleOnMouseOut(element); } @@ -668,12 +670,12 @@ public class VTooltip extends VOverlay { } private boolean hasCommonOwner(Widget owner, Element element) { - ComponentConnector connector = Util.findPaintable( - getApplicationConnection(), element); + ComponentConnector connector = Util + .findPaintable(getApplicationConnection(), element); if (connector != null && connector.getConnection() != null && connector.getConnection().getUIConnector() != null) { - return owner.equals(connector.getConnection().getUIConnector() - .getWidget()); + return owner.equals( + connector.getConnection().getUIConnector().getWidget()); } return false; } diff --git a/client/src/main/java/com/vaadin/client/VUIDLBrowser.java b/client/src/main/java/com/vaadin/client/VUIDLBrowser.java index 08f4c653a5..a091596ab8 100644 --- a/client/src/main/java/com/vaadin/client/VUIDLBrowser.java +++ b/client/src/main/java/com/vaadin/client/VUIDLBrowser.java @@ -74,8 +74,8 @@ public class VUIDLBrowser extends SimpleTree { SimpleTree stateChanges = new SimpleTree("shared state"); for (String connectorId : stateJson.getKeySet()) { - stateChanges.add(new SharedStateItem(connectorId, stateJson - .getValueMap(connectorId))); + stateChanges.add(new SharedStateItem(connectorId, + stateJson.getValueMap(connectorId))); } add(stateChanges); @@ -239,9 +239,8 @@ public class VUIDLBrowser extends SimpleTree { @Override public void open(boolean recursive) { - if (getWidgetCount() == 1 - && getWidget(0).getElement().getInnerText() - .equals("LOADING")) { + if (getWidgetCount() == 1 && getWidget(0).getElement() + .getInnerText().equals("LOADING")) { dir(); } super.open(recursive); diff --git a/client/src/main/java/com/vaadin/client/WidgetLoader.java b/client/src/main/java/com/vaadin/client/WidgetLoader.java index 4cc1cd1d5f..9aaf8e89f9 100644 --- a/client/src/main/java/com/vaadin/client/WidgetLoader.java +++ b/client/src/main/java/com/vaadin/client/WidgetLoader.java @@ -17,7 +17,9 @@ package com.vaadin.client; import com.google.gwt.core.client.RunAsyncCallback; -/** A helper class used by WidgetMap implementation. Used by the generated code. */ +/** + * A helper class used by WidgetMap implementation. Used by the generated code. + */ abstract class WidgetLoader implements RunAsyncCallback { @Override diff --git a/client/src/main/java/com/vaadin/client/WidgetSet.java b/client/src/main/java/com/vaadin/client/WidgetSet.java index e85eac388f..eb92be0e8e 100644 --- a/client/src/main/java/com/vaadin/client/WidgetSet.java +++ b/client/src/main/java/com/vaadin/client/WidgetSet.java @@ -67,8 +67,8 @@ public class WidgetSet { * let the auto generated code instantiate this type */ try { - ServerConnector connector = (ServerConnector) TypeData.getType( - classType).createInstance(); + ServerConnector connector = (ServerConnector) TypeData + .getType(classType).createInstance(); if (connector instanceof HasJavaScriptConnectorHelper) { ((HasJavaScriptConnectorHelper) connector) .getJavascriptConnectorHelper().setTag(tag); @@ -78,8 +78,7 @@ public class WidgetSet { } catch (NoDataException e) { Profiler.leave("WidgetSet.createConnector"); throw new IllegalStateException( - "There is no information about " - + classType + "There is no information about " + classType + ". Did you remember to compile the right widgetset?", e); } @@ -127,10 +126,9 @@ public class WidgetSet { } while (bundleName == null && t != null); if (bundleName != null && !loader.isBundleLoaded(bundleName)) { - getLogger().info( - "Loading bundle " + bundleName - + " to be able to render server side class " - + serverSideClassName); + getLogger().info("Loading bundle " + bundleName + + " to be able to render server side class " + + serverSideClassName); ApplicationConfiguration.startDependencyLoading(); loader.loadBundle(bundleName, new BundleLoadCallback() { @Override diff --git a/client/src/main/java/com/vaadin/client/WidgetUtil.java b/client/src/main/java/com/vaadin/client/WidgetUtil.java index 8161ceff19..bfe7a10feb 100644 --- a/client/src/main/java/com/vaadin/client/WidgetUtil.java +++ b/client/src/main/java/com/vaadin/client/WidgetUtil.java @@ -293,8 +293,8 @@ public class WidgetUtil { setHeight(widget, ""); return paddingBorderGuess; } else if (height.endsWith("px")) { - int pixelHeight = Integer.parseInt(height.substring(0, - height.length() - 2)); + int pixelHeight = Integer + .parseInt(height.substring(0, height.length() - 2)); return setHeightExcludingPaddingAndBorder(widget.getElement(), pixelHeight, paddingBorderGuess, false); } else { @@ -320,8 +320,8 @@ public class WidgetUtil { setWidth(widget, ""); return paddingBorderGuess; } else if (width.endsWith("px")) { - int pixelWidth = Integer.parseInt(width.substring(0, - width.length() - 2)); + int pixelWidth = Integer + .parseInt(width.substring(0, width.length() - 2)); return setWidthExcludingPaddingAndBorder(widget.getElement(), pixelWidth, paddingBorderGuess, false); } else { @@ -455,12 +455,12 @@ public class WidgetUtil { // Add max version if fix lands sometime to Webkit // Starting from Opera 11.00, also a problem in Opera if (BrowserInfo.get().requiresOverflowAutoFix()) { - final String originalOverflow = elem.getStyle().getProperty( - "overflow"); - final String originalOverflowX = elem.getStyle().getProperty( - "overflowX"); - final String originalOverflowY = elem.getStyle().getProperty( - "overflowY"); + final String originalOverflow = elem.getStyle() + .getProperty("overflow"); + final String originalOverflowX = elem.getStyle() + .getProperty("overflowX"); + final String originalOverflowY = elem.getStyle() + .getProperty("overflowY"); if ("hidden".equals(originalOverflow) || "hidden".equals(originalOverflowX) || "hidden".equals(originalOverflowY)) { @@ -505,7 +505,8 @@ public class WidgetUtil { // updated when collapsing/expanding columns // Also appeared in Safari 5.1 with webkit 534 (#7667) if ((BrowserInfo.get().isChrome() || (BrowserInfo.get() - .isSafari() && BrowserInfo.get().getWebkitVersion() >= 534)) + .isSafari() + && BrowserInfo.get().getWebkitVersion() >= 534)) && (scrollleft > 0 || elem.getScrollLeft() > 0)) { int scrollvalue = scrollleft; @@ -541,7 +542,8 @@ public class WidgetUtil { * The element to check * @return The border-box width for the element */ - public static int getRequiredWidth(com.google.gwt.dom.client.Element element) { + public static int getRequiredWidth( + com.google.gwt.dom.client.Element element) { int reqWidth = getRequiredWidthBoundingClientRect(element); if (BrowserInfo.get().isIE() && !BrowserInfo.get().isIE8()) { int csSize = getRequiredWidthComputedStyle(element); @@ -772,7 +774,8 @@ public class WidgetUtil { * the element to detect * @return true if auto or scroll */ - public static boolean mayHaveScrollBars(com.google.gwt.dom.client.Element pe) { + public static boolean mayHaveScrollBars( + com.google.gwt.dom.client.Element pe) { String overflow = getComputedStyle(pe, "overflow"); if (overflow != null) { if (overflow.equals("auto") || overflow.equals("scroll")) { @@ -800,7 +803,7 @@ public class WidgetUtil { com.google.gwt.dom.client.Element el, String p) /*-{ try { - + if (el.currentStyle) { // IE return el.currentStyle[p]; @@ -815,7 +818,7 @@ public class WidgetUtil { } catch (e) { return ""; } - + }-*/; /** @@ -829,7 +832,7 @@ public class WidgetUtil { try { el.focus(); } catch (e) { - + } }-*/; @@ -1087,10 +1090,9 @@ public class WidgetUtil { touch.getClientX(), touch.getClientY(), false, false, false, false, NativeEvent.BUTTON_LEFT); final NativeEvent createMouseDownEvent = Document.get() - .createMouseDownEvent(0, touch.getScreenX(), - touch.getScreenY(), touch.getClientX(), - touch.getClientY(), false, false, false, false, - NativeEvent.BUTTON_LEFT); + .createMouseDownEvent(0, touch.getScreenX(), touch.getScreenY(), + touch.getClientX(), touch.getClientY(), false, false, + false, false, NativeEvent.BUTTON_LEFT); final NativeEvent createMouseClickEvent = Document.get() .createClickEvent(0, touch.getScreenX(), touch.getScreenY(), touch.getClientX(), touch.getClientY(), false, false, @@ -1140,7 +1142,7 @@ public class WidgetUtil { if ($wnd.document.activeElement) { return $wnd.document.activeElement; } - + return null; }-*/; @@ -1211,11 +1213,11 @@ public class WidgetUtil { /*-{ var top = elem.offsetTop; var height = elem.offsetHeight; - + if (elem.parentNode != elem.offsetParent) { top -= elem.parentNode.offsetTop; } - + var cur = elem.parentNode; while (cur && (cur.nodeType == 1)) { if (top < cur.scrollTop) { @@ -1224,12 +1226,12 @@ public class WidgetUtil { if (top + height > cur.scrollTop + cur.clientHeight) { cur.scrollTop = (top + height) - cur.clientHeight; } - + var offsetTop = cur.offsetTop; if (cur.parentNode != cur.offsetParent) { offsetTop -= cur.parentNode.offsetTop; } - + top += offsetTop - cur.scrollTop; cur = cur.parentNode; } @@ -1263,8 +1265,8 @@ public class WidgetUtil { divElement.getStyle().setDisplay(Display.NONE); RootPanel.getBodyElement().appendChild(divElement); - divElement.setInnerHTML("<a href='" + escapeAttribute(url) - + "' ></a>"); + divElement.setInnerHTML( + "<a href='" + escapeAttribute(url) + "' ></a>"); AnchorElement a = divElement.getChild(0).cast(); String href = a.getHref(); @@ -1365,7 +1367,8 @@ public class WidgetUtil { * * @return true if the values are considered equals; false otherwise */ - public static boolean pixelValuesEqual(final double num1, final double num2) { + public static boolean pixelValuesEqual(final double num1, + final double num2) { return Math.abs(num1 - num2) <= PIXEL_EPSILON; } @@ -1480,9 +1483,9 @@ public class WidgetUtil { unit = unitByType(symbol); } } else { - throw new IllegalArgumentException("Invalid size argument: \"" - + s + "\" (should match " + sizePattern.getSource() - + ")"); + throw new IllegalArgumentException( + "Invalid size argument: \"" + s + "\" (should match " + + sizePattern.getSource() + ")"); } return new CssSize(size, unit); } @@ -1558,8 +1561,8 @@ public class WidgetUtil { * @return true if the two sizes are equals, otherwise false. */ public static boolean equals(String cssSize1, String cssSize2) { - return CssSize.fromString(cssSize1).equals( - CssSize.fromString(cssSize2)); + return CssSize.fromString(cssSize1) + .equals(CssSize.fromString(cssSize2)); } } @@ -1595,7 +1598,8 @@ public class WidgetUtil { * @return the bottom border thickness */ public static double getBorderBottomThickness(Element element) { - return getBorderThickness(element, new String[] { "borderBottomWidth" }); + return getBorderThickness(element, + new String[] { "borderBottomWidth" }); } /** @@ -1611,8 +1615,8 @@ public class WidgetUtil { * @return the top and bottom border thickness */ public static double getBorderTopAndBottomThickness(Element element) { - return getBorderThickness(element, new String[] { "borderTopWidth", - "borderBottomWidth" }); + return getBorderThickness(element, + new String[] { "borderTopWidth", "borderBottomWidth" }); } /** @@ -1657,8 +1661,8 @@ public class WidgetUtil { * @return the top border thickness */ public static double getBorderLeftAndRightThickness(Element element) { - return getBorderThickness(element, new String[] { "borderLeftWidth", - "borderRightWidth" }); + return getBorderThickness(element, + new String[] { "borderLeftWidth", "borderRightWidth" }); } private static native double getBorderThickness( diff --git a/client/src/main/java/com/vaadin/client/communication/AtmospherePushConnection.java b/client/src/main/java/com/vaadin/client/communication/AtmospherePushConnection.java index f439d27107..dc09189be4 100644 --- a/client/src/main/java/com/vaadin/client/communication/AtmospherePushConnection.java +++ b/client/src/main/java/com/vaadin/client/communication/AtmospherePushConnection.java @@ -209,8 +209,8 @@ public class AtmospherePushConnection implements PushConnection { String csrfToken = connection.getMessageHandler().getCsrfToken(); if (!csrfToken.equals(ApplicationConstants.CSRF_TOKEN_DEFAULT_VALUE)) { - extraParams += "&" + ApplicationConstants.CSRF_TOKEN_PARAMETER - + "=" + csrfToken; + extraParams += "&" + ApplicationConstants.CSRF_TOKEN_PARAMETER + "=" + + csrfToken; } // uri is needed to identify the right connection when closing @@ -266,9 +266,8 @@ public class AtmospherePushConnection implements PushConnection { "This server to client push connection should not be used to send client to server messages"); } if (state == State.CONNECTED) { - getLogger().info( - "Sending push (" + transport + ") message to server: " - + message.toJson()); + getLogger().info("Sending push (" + transport + + ") message to server: " + message.toJson()); if (transport.equals("websocket")) { FragmentedMessage fragmented = new FragmentedMessage( @@ -295,9 +294,8 @@ public class AtmospherePushConnection implements PushConnection { } protected void onReopen(AtmosphereResponse response) { - getLogger().info( - "Push connection re-established using " - + response.getTransport()); + getLogger().info("Push connection re-established using " + + response.getTransport()); onConnect(response); } @@ -362,7 +360,8 @@ public class AtmospherePushConnection implements PushConnection { break; case DISCONNECT_PENDING: case DISCONNECTED: - throw new IllegalStateException("Can not disconnect more than once"); + throw new IllegalStateException( + "Can not disconnect more than once"); } } @@ -374,9 +373,8 @@ public class AtmospherePushConnection implements PushConnection { getConnectionStateHandler().pushInvalidContent(this, message); return; } else { - getLogger().info( - "Received push (" + getTransportType() + ") message: " - + message); + getLogger().info("Received push (" + getTransportType() + + ") message: " + message); connection.getMessageHandler().handleMessage(json); } } @@ -386,10 +384,9 @@ public class AtmospherePushConnection implements PushConnection { * tried */ protected void onTransportFailure() { - getLogger().warning( - "Push connection using primary method (" - + getConfig().getTransport() + ") failed. Trying with " - + getConfig().getFallbackTransport()); + getLogger().warning("Push connection using primary method (" + + getConfig().getTransport() + ") failed. Trying with " + + getConfig().getFallbackTransport()); } /** @@ -529,7 +526,7 @@ public class AtmospherePushConnection implements PushConnection { JavaScriptObject config) /*-{ var self = this; - + config.url = uri; config.onOpen = $entry(function(response) { self.@com.vaadin.client.communication.AtmospherePushConnection::onOpen(*)(response); @@ -555,7 +552,7 @@ public class AtmospherePushConnection implements PushConnection { config.onClientTimeout = $entry(function(request) { self.@com.vaadin.client.communication.AtmospherePushConnection::onClientTimeout(*)(request); }); - + return $wnd.vaadinPush.atmosphere.subscribe(config); }-*/; diff --git a/client/src/main/java/com/vaadin/client/communication/DefaultConnectionStateHandler.java b/client/src/main/java/com/vaadin/client/communication/DefaultConnectionStateHandler.java index f32bd5c5ea..080358086a 100644 --- a/client/src/main/java/com/vaadin/client/communication/DefaultConnectionStateHandler.java +++ b/client/src/main/java/com/vaadin/client/communication/DefaultConnectionStateHandler.java @@ -229,8 +229,8 @@ public class DefaultConnectionStateHandler implements ConnectionStateHandler { } reconnectAttempt++; - getLogger().info( - "Reconnect attempt " + reconnectAttempt + " for " + type); + getLogger() + .info("Reconnect attempt " + reconnectAttempt + " for " + type); if (reconnectAttempt >= getConfiguration().reconnectAttempts) { // Max attempts reached, stop trying @@ -283,9 +283,8 @@ public class DefaultConnectionStateHandler implements ConnectionStateHandler { if (!connection.isApplicationRunning()) { // This should not happen as nobody should call this if the // application has been stopped - getLogger() - .warning( - "Trying to reconnect after application has been stopped. Giving up"); + getLogger().warning( + "Trying to reconnect after application has been stopped. Giving up"); return; } if (payload != null) { @@ -390,8 +389,8 @@ public class DefaultConnectionStateHandler implements ConnectionStateHandler { * @return The text to show in the reconnect dialog */ protected String getDialogText(int reconnectAttempt) { - return getConfiguration().dialogText.replace("{0}", reconnectAttempt - + ""); + return getConfiguration().dialogText.replace("{0}", + reconnectAttempt + ""); } @Override @@ -401,7 +400,8 @@ public class DefaultConnectionStateHandler implements ConnectionStateHandler { } private ReconnectDialogConfigurationState getConfiguration() { - return connection.getUIConnector().getState().reconnectDialogConfiguration; + return connection.getUIConnector() + .getState().reconnectDialogConfiguration; } @Override @@ -416,9 +416,10 @@ public class DefaultConnectionStateHandler implements ConnectionStateHandler { * has expired.) If the response contains a magic substring, do a * synchronous refresh. See #8241. */ - MatchResult refreshToken = RegExp.compile( - ApplicationConnection.UIDL_REFRESH_TOKEN - + "(:\\s*(.*?))?(\\s|$)").exec(responseText); + MatchResult refreshToken = RegExp + .compile(ApplicationConnection.UIDL_REFRESH_TOKEN + + "(:\\s*(.*?))?(\\s|$)") + .exec(responseText); if (refreshToken != null) { WidgetUtil.redirect(refreshToken.getGroup(2)); } else { @@ -430,7 +431,8 @@ public class DefaultConnectionStateHandler implements ConnectionStateHandler { } @Override - public void pushInvalidContent(PushConnection pushConnection, String message) { + public void pushInvalidContent(PushConnection pushConnection, + String message) { debug("pushInvalidContent"); if (pushConnection.isBidirectional()) { // We can't be sure that what was pushed was actually a response but @@ -441,8 +443,8 @@ public class DefaultConnectionStateHandler implements ConnectionStateHandler { // Do nothing special for now. Should likely do the same as // xhrInvalidContent - handleUnrecoverableCommunicationError("Invalid JSON from server: " - + message, null); + handleUnrecoverableCommunicationError( + "Invalid JSON from server: " + message, null); } @@ -538,8 +540,8 @@ public class DefaultConnectionStateHandler implements ConnectionStateHandler { @Override public void pushScriptLoadError(String resourceUrl) { - connection.handleCommunicationError(resourceUrl - + " could not be loaded. Push will not work.", 0); + connection.handleCommunicationError( + resourceUrl + " could not be loaded. Push will not work.", 0); } @Override @@ -550,7 +552,8 @@ public class DefaultConnectionStateHandler implements ConnectionStateHandler { @Override public void pushReconnectPending(PushConnection pushConnection) { - debug("pushReconnectPending(" + pushConnection.getTransportType() + ")"); + debug("pushReconnectPending(" + pushConnection.getTransportType() + + ")"); getLogger().info("Reopening push connection"); if (pushConnection.isBidirectional()) { // Lost connection for a connection which will tell us when the @@ -579,10 +582,9 @@ public class DefaultConnectionStateHandler implements ConnectionStateHandler { debug("pushClientTimeout()"); // TODO Reconnect, allowing client timeout to be set // https://dev.vaadin.com/ticket/18429 - connection - .handleCommunicationError( - "Client unexpectedly disconnected. Ensure client timeout is disabled.", - -1); + connection.handleCommunicationError( + "Client unexpectedly disconnected. Ensure client timeout is disabled.", + -1); } @Override diff --git a/client/src/main/java/com/vaadin/client/communication/DefaultReconnectDialog.java b/client/src/main/java/com/vaadin/client/communication/DefaultReconnectDialog.java index 05b4e109ff..7d311dc9e5 100644 --- a/client/src/main/java/com/vaadin/client/communication/DefaultReconnectDialog.java +++ b/client/src/main/java/com/vaadin/client/communication/DefaultReconnectDialog.java @@ -37,7 +37,8 @@ import com.vaadin.client.ui.VOverlay; * @since 7.6 * @author Vaadin Ltd */ -public class DefaultReconnectDialog extends VOverlay implements ReconnectDialog { +public class DefaultReconnectDialog extends VOverlay + implements ReconnectDialog { private static final String STYLE_RECONNECTING = "active"; private static final String STYLE_BODY_RECONNECTING = "v-reconnecting"; diff --git a/client/src/main/java/com/vaadin/client/communication/Heartbeat.java b/client/src/main/java/com/vaadin/client/communication/Heartbeat.java index f38fbca5c8..3ed7510d8f 100644 --- a/client/src/main/java/com/vaadin/client/communication/Heartbeat.java +++ b/client/src/main/java/com/vaadin/client/communication/Heartbeat.java @@ -63,9 +63,10 @@ public class Heartbeat { setInterval(connection.getConfiguration().getHeartbeatInterval()); - uri = SharedUtil.addGetParameters(connection - .translateVaadinUri(ApplicationConstants.APP_PROTOCOL_PREFIX - + ApplicationConstants.HEARTBEAT_PATH + '/'), + uri = SharedUtil.addGetParameters( + connection.translateVaadinUri( + ApplicationConstants.APP_PROTOCOL_PREFIX + + ApplicationConstants.HEARTBEAT_PATH + '/'), UIConstants.UI_ID_PARAMETER + "=" + connection.getConfiguration().getUIId()); @@ -111,8 +112,8 @@ public class Heartbeat { public void onError(Request request, Throwable exception) { // Handler should stop the application if heartbeat should no // longer be sent - connection.getConnectionStateHandler().heartbeatException( - request, exception); + connection.getConnectionStateHandler() + .heartbeatException(request, exception); schedule(); } }; diff --git a/client/src/main/java/com/vaadin/client/communication/JsonDecoder.java b/client/src/main/java/com/vaadin/client/communication/JsonDecoder.java index 0ce89c873e..8c11cb76fd 100644 --- a/client/src/main/java/com/vaadin/client/communication/JsonDecoder.java +++ b/client/src/main/java/com/vaadin/client/communication/JsonDecoder.java @@ -119,8 +119,8 @@ public class JsonDecoder { } else if (Character.class.getName().equals(baseTypeName)) { return Character.valueOf(jsonValue.asString().charAt(0)); } else if (Connector.class.getName().equals(baseTypeName)) { - return ConnectorMap.get(connection).getConnector( - jsonValue.asString()); + return ConnectorMap.get(connection) + .getConnector(jsonValue.asString()); } else { return decodeObject(type, jsonValue, target, connection); } @@ -169,12 +169,15 @@ public class JsonDecoder { propertyReference = null; } - Profiler.leave("JsonDecoder.decodeObject meta data processing"); - JsonValue encodedPropertyValue = jsonObject.get(property - .getName()); + Profiler.leave( + "JsonDecoder.decodeObject meta data processing"); + JsonValue encodedPropertyValue = jsonObject + .get(property.getName()); Object decodedValue = decodeValue(propertyType, - encodedPropertyValue, propertyReference, connection); - Profiler.enter("JsonDecoder.decodeObject meta data processing"); + encodedPropertyValue, propertyReference, + connection); + Profiler.enter( + "JsonDecoder.decodeObject meta data processing"); property.setValue(target, decodedValue); } Profiler.leave("JsonDecoder.decodeObject meta data processing"); @@ -183,8 +186,8 @@ public class JsonDecoder { } catch (NoDataException e) { Profiler.leave("JsonDecoder.decodeObject meta data processing"); Profiler.leave("JsonDecoder.decodeObject"); - throw new RuntimeException("Can not deserialize " - + type.getSignature(), e); + throw new RuntimeException( + "Can not deserialize " + type.getSignature(), e); } } } @@ -210,7 +213,8 @@ public class JsonDecoder { if (keyType.getBaseTypeName().equals(String.class.getName())) { assert jsonMap.getType() == JsonType.OBJECT; return decodeStringMap(valueType, (JsonObject) jsonMap, connection); - } else if (keyType.getBaseTypeName().equals(Connector.class.getName())) { + } else if (keyType.getBaseTypeName() + .equals(Connector.class.getName())) { assert jsonMap.getType() == JsonType.OBJECT; return decodeConnectorMap(valueType, (JsonObject) jsonMap, connection); @@ -274,16 +278,16 @@ public class JsonDecoder { private static List<Object> decodeList(Type type, JsonArray jsonArray, ApplicationConnection connection) { List<Object> tokens = new ArrayList<Object>(); - decodeIntoCollection(type.getParameterTypes()[0], jsonArray, - connection, tokens); + decodeIntoCollection(type.getParameterTypes()[0], jsonArray, connection, + tokens); return tokens; } private static Set<Object> decodeSet(Type type, JsonArray jsonArray, ApplicationConnection connection) { Set<Object> tokens = new HashSet<Object>(); - decodeIntoCollection(type.getParameterTypes()[0], jsonArray, - connection, tokens); + decodeIntoCollection(type.getParameterTypes()[0], jsonArray, connection, + tokens); return tokens; } diff --git a/client/src/main/java/com/vaadin/client/communication/JsonEncoder.java b/client/src/main/java/com/vaadin/client/communication/JsonEncoder.java index 8d2a447ac5..d04be4d57b 100644 --- a/client/src/main/java/com/vaadin/client/communication/JsonEncoder.java +++ b/client/src/main/java/com/vaadin/client/communication/JsonEncoder.java @@ -122,14 +122,14 @@ public class JsonEncoder { Type propertyType = property.getType(); JsonValue encodedPropertyValue = encode(propertyValue, propertyType, connection); - jsonObject - .put(property.getName(), encodedPropertyValue); + jsonObject.put(property.getName(), + encodedPropertyValue); } return jsonObject; } catch (NoDataException e) { - throw new RuntimeException("Can not encode " - + type.getSignature(), e); + throw new RuntimeException( + "Can not encode " + type.getSignature(), e); } } else { @@ -154,8 +154,8 @@ public class JsonEncoder { if (value != null) { valueType = value.getClass().getName(); } - throw new IllegalArgumentException("Cannot encode object of type " - + valueType); + throw new IllegalArgumentException( + "Cannot encode object of type " + valueType); } jsonArray.set(0, Json.create(transportType)); jsonArray.set(1, encode(value, null, connection)); @@ -188,22 +188,23 @@ public class JsonEncoder { } } - private static JsonValue encodeChildValue(Object value, - Type collectionType, int typeIndex, ApplicationConnection connection) { + private static JsonValue encodeChildValue(Object value, Type collectionType, + int typeIndex, ApplicationConnection connection) { if (collectionType == null) { return encode(new UidlValue(value), null, connection); } else { assert collectionType.getParameterTypes() != null && collectionType.getParameterTypes().length > typeIndex - && collectionType.getParameterTypes()[typeIndex] != null : "Proper generics required for encoding child value, assertion failed for " - + collectionType; + && collectionType + .getParameterTypes()[typeIndex] != null : "Proper generics required for encoding child value, assertion failed for " + + collectionType; Type childType = collectionType.getParameterTypes()[typeIndex]; return encode(value, childType, connection); } } - private static JsonArray encodeObjectMap(Map<Object, Object> map, - Type type, ApplicationConnection connection) { + private static JsonArray encodeObjectMap(Map<Object, Object> map, Type type, + ApplicationConnection connection) { JsonArray keys = Json.createArray(); JsonArray values = Json.createArray(); @@ -230,8 +231,8 @@ public class JsonEncoder { for (Entry<?, ?> entry : map.entrySet()) { Connector connector = (Connector) entry.getKey(); - JsonValue encodedValue = encodeChildValue(entry.getValue(), type, - 1, connection); + JsonValue encodedValue = encodeChildValue(entry.getValue(), type, 1, + connection); jsonMap.put(connector.getConnectorId(), encodedValue); } @@ -239,8 +240,8 @@ public class JsonEncoder { return jsonMap; } - private static JsonValue encodeStringMap(Map<Object, Object> map, - Type type, ApplicationConnection connection) { + private static JsonValue encodeStringMap(Map<Object, Object> map, Type type, + ApplicationConnection connection) { JsonObject jsonMap = Json.createObject(); for (Entry<?, ?> entry : map.entrySet()) { diff --git a/client/src/main/java/com/vaadin/client/communication/MessageHandler.java b/client/src/main/java/com/vaadin/client/communication/MessageHandler.java index 15e94ca8d9..4a895d7f28 100644 --- a/client/src/main/java/com/vaadin/client/communication/MessageHandler.java +++ b/client/src/main/java/com/vaadin/client/communication/MessageHandler.java @@ -125,7 +125,9 @@ public class MessageHandler { */ private Set<Object> responseHandlingLocks = new HashSet<Object>(); - /** Contains all UIDL messages received while response handling is suspended */ + /** + * Contains all UIDL messages received while response handling is suspended + */ private List<PendingUIDLMessage> pendingUIDLMessages = new ArrayList<PendingUIDLMessage>(); // will hold the CSRF token once received @@ -232,14 +234,14 @@ public class MessageHandler { "The json to handle cannot be null"); } if (getServerId(json) == -1) { - getLogger() - .severe("Response didn't contain a server id. " - + "Please verify that the server is up-to-date and that the response data has not been modified in transmission."); + getLogger().severe("Response didn't contain a server id. " + + "Please verify that the server is up-to-date and that the response data has not been modified in transmission."); } if (connection.getApplicationState() == ApplicationState.RUNNING) { handleJSON(json); - } else if (connection.getApplicationState() == ApplicationState.INITIALIZING) { + } else if (connection + .getApplicationState() == ApplicationState.INITIALIZING) { // Application is starting up for the first time connection.setApplicationRunning(true); connection.executeWhenCSSLoaded(new Command() { @@ -249,9 +251,8 @@ public class MessageHandler { } }); } else { - getLogger() - .warning( - "Ignored received message because application has already been stopped"); + getLogger().warning( + "Ignored received message because application has already been stopped"); return; } } @@ -264,9 +265,8 @@ public class MessageHandler { // messages and ensure this is handled next. Otherwise we // would keep waiting for an older message forever (if this // is triggered by forceHandleMessage) - getLogger().info( - "Received resync message with id " + serverId - + " while waiting for " + getExpectedServerId()); + getLogger().info("Received resync message with id " + serverId + + " while waiting for " + getExpectedServerId()); lastSeenServerSyncId = serverId - 1; removeOldPendingMessages(); } @@ -286,21 +286,17 @@ public class MessageHandler { // Unexpected server id if (serverId <= lastSeenServerSyncId) { // Why is the server re-sending an old package? Ignore it - getLogger().warning( - "Received message with server id " + serverId - + " but have already seen " - + lastSeenServerSyncId + ". Ignoring it"); + getLogger().warning("Received message with server id " + + serverId + " but have already seen " + + lastSeenServerSyncId + ". Ignoring it"); endRequestIfResponse(json); return; } // We are waiting for an earlier message... - getLogger() - .info("Received message with server id " - + serverId - + " but expected " - + getExpectedServerId() - + ". Postponing handling until the missing message(s) have been received"); + getLogger().info("Received message with server id " + serverId + + " but expected " + getExpectedServerId() + + ". Postponing handling until the missing message(s) have been received"); } pendingUIDLMessages.add(new PendingUIDLMessage(json)); if (!forceHandleMessage.isRunning()) { @@ -364,8 +360,8 @@ public class MessageHandler { connection.setResource(key, resources.getAsString(key)); } } - handleUIDLDuration.logDuration( - " * Handling resources from server completed", 10); + handleUIDLDuration + .logDuration(" * Handling resources from server completed", 10); getLogger().info(" * Handling type inheritance map from server"); @@ -379,20 +375,20 @@ public class MessageHandler { getLogger().info("Handling type mappings from server"); if (json.containsKey("typeMappings")) { - connection.getConfiguration() - .addComponentMappings(json.getValueMap("typeMappings"), - connection.getWidgetSet()); + connection.getConfiguration().addComponentMappings( + json.getValueMap("typeMappings"), + connection.getWidgetSet()); } getLogger().info("Handling resource dependencies"); if (json.containsKey("scriptDependencies")) { - connection.loadScriptDependencies(json - .getJSStringArray("scriptDependencies")); + connection.loadScriptDependencies( + json.getJSStringArray("scriptDependencies")); } if (json.containsKey("styleDependencies")) { - connection.loadStyleDependencies(json - .getJSStringArray("styleDependencies")); + connection.loadStyleDependencies( + json.getJSStringArray("styleDependencies")); } handleUIDLDuration.logDuration( @@ -431,8 +427,8 @@ public class MessageHandler { redirectTimer = new Timer() { @Override public void run() { - WidgetUtil.redirect(timedRedirect - .getString("url")); + WidgetUtil.redirect( + timedRedirect.getString("url")); } }; sessionExpirationInterval = timedRedirect @@ -450,7 +446,8 @@ public class MessageHandler { double processUidlStart = Duration.currentTimeMillis(); // Ensure that all connectors that we are about to update exist - JsArrayString createdConnectorIds = createConnectorsIfNeeded(json); + JsArrayString createdConnectorIds = createConnectorsIfNeeded( + json); // Update states, do not fire events JsArrayObject<StateChangeEvent> pendingStateChangeEvents = updateConnectorState( @@ -463,15 +460,17 @@ public class MessageHandler { Profiler.enter("Handling locales"); getLogger().info(" * Handling locales"); // Store locale data - LocaleService - .addLocales(getUIConnector().getState().localeServiceState.localeData); + LocaleService.addLocales(getUIConnector() + .getState().localeServiceState.localeData); Profiler.leave("Handling locales"); // Update hierarchy, do not fire events - ConnectorHierarchyUpdateResult connectorHierarchyUpdateResult = updateConnectorHierarchy(json); + ConnectorHierarchyUpdateResult connectorHierarchyUpdateResult = updateConnectorHierarchy( + json); // Fire hierarchy change events - sendHierarchyChangeEvents(connectorHierarchyUpdateResult.events); + sendHierarchyChangeEvents( + connectorHierarchyUpdateResult.events); updateCaptions(pendingStateChangeEvents, connectorHierarchyUpdateResult.parentChangedIds); @@ -489,20 +488,20 @@ public class MessageHandler { if (json.containsKey("dd")) { // response contains data for drag and drop service - VDragAndDropManager.get().handleServerResponse( - json.getValueMap("dd")); + VDragAndDropManager.get() + .handleServerResponse(json.getValueMap("dd")); } - int removed = unregisterRemovedConnectors(connectorHierarchyUpdateResult.detachedConnectorIds); + int removed = unregisterRemovedConnectors( + connectorHierarchyUpdateResult.detachedConnectorIds); if (removed > 0 && !isResponse(json)) { // Must acknowledge the removal using an XHR or server // memory usage will keep growing getUIConnector().sendAck(); } - getLogger() - .info("handleUIDLMessage: " - + (Duration.currentTimeMillis() - processUidlStart) - + " ms"); + getLogger().info("handleUIDLMessage: " + + (Duration.currentTimeMillis() - processUidlStart) + + " ms"); updatingState = false; @@ -516,8 +515,8 @@ public class MessageHandler { layoutManager.layoutNow(); } } catch (final Throwable e) { - getLogger() - .log(Level.SEVERE, "Error processing layouts", e); + getLogger().log(Level.SEVERE, "Error processing layouts", + e); } Profiler.leave("Layout processing"); @@ -546,18 +545,17 @@ public class MessageHandler { // TODO build profiling for widget impl loading time - lastProcessingTime = (int) ((new Date().getTime()) - start - .getTime()); + lastProcessingTime = (int) ((new Date().getTime()) + - start.getTime()); totalProcessingTime += lastProcessingTime; if (bootstrapTime == 0) { double fetchStart = getFetchStartTime(); if (fetchStart != 0) { - int time = (int) (Duration.currentTimeMillis() - fetchStart); - getLogger().log( - Level.INFO, - "First response processed " + time - + " ms after fetchStart"); + int time = (int) (Duration.currentTimeMillis() + - fetchStart); + getLogger().log(Level.INFO, "First response processed " + + time + " ms after fetchStart"); } bootstrapTime = calculateBootstrapTime(); @@ -566,9 +564,8 @@ public class MessageHandler { } } - getLogger().info( - " Processing time was " - + String.valueOf(lastProcessingTime) + "ms"); + getLogger().info(" Processing time was " + + String.valueOf(lastProcessingTime) + "ms"); getLogger().info( "Referenced paintables: " + getConnectorMap().size()); @@ -607,13 +604,16 @@ public class MessageHandler { .cast(); // Update hierarchy based on the fake response - ConnectorHierarchyUpdateResult connectorHierarchyUpdateResult = updateConnectorHierarchy(fakeValueMap); + ConnectorHierarchyUpdateResult connectorHierarchyUpdateResult = updateConnectorHierarchy( + fakeValueMap); // Send hierarchy events based on the fake update - sendHierarchyChangeEvents(connectorHierarchyUpdateResult.events); + sendHierarchyChangeEvents( + connectorHierarchyUpdateResult.events); // Unregister all the old connectors that have now been removed - unregisterRemovedConnectors(connectorHierarchyUpdateResult.detachedConnectorIds); + unregisterRemovedConnectors( + connectorHierarchyUpdateResult.detachedConnectorIds); getLayoutManager().cleanMeasuredSizes(); } @@ -654,10 +654,12 @@ public class MessageHandler { .delegateCaptionHandling()) { ServerConnector parent = child.getParent(); if (parent instanceof HasComponentsConnector) { - Profiler.enter("HasComponentsConnector.updateCaption"); + Profiler.enter( + "HasComponentsConnector.updateCaption"); ((HasComponentsConnector) parent) .updateCaption((ComponentConnector) child); - Profiler.leave("HasComponentsConnector.updateCaption"); + Profiler.leave( + "HasComponentsConnector.updateCaption"); } } } @@ -725,15 +727,16 @@ public class MessageHandler { .getReturnType(); Widget widget = component.getWidget(); - Object propertyValue = property.getValue(component - .getState()); + Object propertyValue = property + .getValue(component.getState()); widgetType.getMethod(methodName).invoke(widget, propertyValue); } catch (NoDataException e) { throw new RuntimeException( "Missing data needed to invoke @DelegateToWidget for " - + component.getClass().getSimpleName(), e); + + component.getClass().getSimpleName(), + e); } } @@ -770,7 +773,8 @@ public class MessageHandler { } private void verifyConnectorHierarchy() { - Profiler.enter("verifyConnectorHierarchy - this is only performed in debug mode"); + Profiler.enter( + "verifyConnectorHierarchy - this is only performed in debug mode"); JsArrayObject<ServerConnector> currentConnectors = getConnectorMap() .getConnectorsAsJsArray(); @@ -779,31 +783,29 @@ public class MessageHandler { ServerConnector c = currentConnectors.get(i); if (c.getParent() != null) { if (!c.getParent().getChildren().contains(c)) { - getLogger() - .severe("ERROR: Connector " - + c.getConnectorId() - + " is connected to a parent but the parent (" - + c.getParent().getConnectorId() - + ") does not contain the connector"); + getLogger().severe("ERROR: Connector " + + c.getConnectorId() + + " is connected to a parent but the parent (" + + c.getParent().getConnectorId() + + ") does not contain the connector"); } } else if (c == getUIConnector()) { // UIConnector for this connection, ignore - } else if (c instanceof WindowConnector - && getUIConnector().hasSubWindow( - (WindowConnector) c)) { + } else if (c instanceof WindowConnector && getUIConnector() + .hasSubWindow((WindowConnector) c)) { // Sub window attached to this UIConnector, ignore } else { // The connector has been detached from the // hierarchy but was not unregistered. - getLogger() - .severe("ERROR: Connector " - + c.getConnectorId() - + " is not attached to a parent but has not been unregistered"); + getLogger().severe("ERROR: Connector " + + c.getConnectorId() + + " is not attached to a parent but has not been unregistered"); } } - Profiler.leave("verifyConnectorHierarchy - this is only performed in debug mode"); + Profiler.leave( + "verifyConnectorHierarchy - this is only performed in debug mode"); } private int unregisterRemovedConnectors( @@ -813,12 +815,14 @@ public class MessageHandler { JsArrayString detachedArray = detachedConnectors.dump(); int nrDetached = detachedArray.length(); for (int i = 0; i < nrDetached; i++) { - ServerConnector connector = getConnectorMap().getConnector( - detachedArray.get(i)); + ServerConnector connector = getConnectorMap() + .getConnector(detachedArray.get(i)); - Profiler.enter("unregisterRemovedConnectors unregisterConnector"); + Profiler.enter( + "unregisterRemovedConnectors unregisterConnector"); getConnectorMap().unregisterConnector(connector); - Profiler.leave("unregisterRemovedConnectors unregisterConnector"); + Profiler.leave( + "unregisterRemovedConnectors unregisterConnector"); } if (ApplicationConfiguration.isDebugMode()) { @@ -836,8 +840,8 @@ public class MessageHandler { private JsArrayString createConnectorsIfNeeded(ValueMap json) { getLogger().info(" * Creating connectors (if needed)"); - JsArrayString createdConnectors = JavaScriptObject - .createArray().cast(); + JsArrayString createdConnectors = JavaScriptObject.createArray() + .cast(); if (!json.containsKey("types")) { return createdConnectors; } @@ -859,8 +863,8 @@ public class MessageHandler { // connector onlyNoLayoutUpdates = false; - int connectorType = Integer.parseInt(types - .getString(connectorId)); + int connectorType = Integer + .parseInt(types.getString(connectorId)); Class<? extends ServerConnector> connectorClass = connection .getConfiguration() @@ -869,10 +873,12 @@ public class MessageHandler { // Connector does not exist so we must create it if (connectorClass != getUIConnector().getClass()) { // create, initialize and register the paintable - Profiler.enter("ApplicationConnection.getConnector"); + Profiler.enter( + "ApplicationConnection.getConnector"); connector = connection.getConnector(connectorId, connectorType); - Profiler.leave("ApplicationConnection.getConnector"); + Profiler.leave( + "ApplicationConnection.getConnector"); createdConnectors.push(connectorId); } else { @@ -921,9 +927,8 @@ public class MessageHandler { if (legacyConnector instanceof Paintable) { String key = null; if (Profiler.isEnabled()) { - key = "updateFromUIDL for " - + legacyConnector.getClass() - .getSimpleName(); + key = "updateFromUIDL for " + legacyConnector + .getClass().getSimpleName(); Profiler.enter(key); } @@ -934,15 +939,15 @@ public class MessageHandler { Profiler.leave(key); } } else if (legacyConnector == null) { - getLogger() - .severe("Received update for " - + uidl.getTag() + getLogger().severe( + "Received update for " + uidl.getTag() + ", but there is no such paintable (" + connectorId + ") rendered."); } else { getLogger() .severe("Server sent Vaadin 6 style updates for " - + Util.getConnectorString(legacyConnector) + + Util.getConnectorString( + legacyConnector) + " but this is not a Vaadin 6 Paintable"); } @@ -977,15 +982,15 @@ public class MessageHandler { Profiler.leave("sendHierarchyChangeEvents"); } - private void logHierarchyChange(ConnectorHierarchyChangeEvent event) { + private void logHierarchyChange( + ConnectorHierarchyChangeEvent event) { if (true) { // Always disabled for now. Can be enabled manually return; } - getLogger() - .info("Hierarchy changed for " - + Util.getConnectorString(event.getConnector())); + getLogger().info("Hierarchy changed for " + + Util.getConnectorString(event.getConnector())); String oldChildren = "* Old children: "; for (ComponentConnector child : event.getOldChildren()) { oldChildren += Util.getConnectorString(child) + " "; @@ -1041,11 +1046,12 @@ public class MessageHandler { } SharedState state = connector.getState(); - Type stateType = new Type(state.getClass() - .getName(), null); + Type stateType = new Type( + state.getClass().getName(), null); if (onlyNoLayoutUpdates) { - Profiler.enter("updateConnectorState @NoLayout handling"); + Profiler.enter( + "updateConnectorState @NoLayout handling"); for (String propertyName : stateJson.keys()) { Property property = stateType .getProperty(propertyName); @@ -1054,12 +1060,13 @@ public class MessageHandler { break; } } - Profiler.leave("updateConnectorState @NoLayout handling"); + Profiler.leave( + "updateConnectorState @NoLayout handling"); } Profiler.enter("updateConnectorState decodeValue"); - JsonDecoder.decodeValue(stateType, stateJson, - state, connection); + JsonDecoder.decodeValue(stateType, stateJson, state, + connection); Profiler.leave("updateConnectorState decodeValue"); if (Profiler.isEnabled()) { @@ -1095,8 +1102,8 @@ public class MessageHandler { int length = dump.length(); for (int i = 0; i < length; i++) { String connectorId = dump.get(i); - ServerConnector connector = getConnectorMap().getConnector( - connectorId); + ServerConnector connector = getConnectorMap() + .getConnector(connectorId); StateChangeEvent event = new StateChangeEvent(connector, Json.createObject(), true); @@ -1143,8 +1150,8 @@ public class MessageHandler { .getJSStringArray(connectorId); hasHierarchy.add(connectorId); - updateConnectorHierarchy(connectorId, - childConnectorIds, maybeDetached, result); + updateConnectorHierarchy(connectorId, childConnectorIds, + maybeDetached, result); } } @@ -1166,7 +1173,8 @@ public class MessageHandler { } } - Profiler.enter("updateConnectorHierarchy detach removed connectors"); + Profiler.enter( + "updateConnectorHierarchy detach removed connectors"); /* * Connector is in maybeDetached at this point if it has been @@ -1174,13 +1182,14 @@ public class MessageHandler { */ JsArrayString maybeDetachedArray = maybeDetached.dump(); for (int i = 0; i < maybeDetachedArray.length(); i++) { - ServerConnector removed = getConnectorMap().getConnector( - maybeDetachedArray.get(i)); + ServerConnector removed = getConnectorMap() + .getConnector(maybeDetachedArray.get(i)); recursivelyDetach(removed, result.events, result.detachedConnectorIds); } - Profiler.leave("updateConnectorHierarchy detach removed connectors"); + Profiler.leave( + "updateConnectorHierarchy detach removed connectors"); if (result.events.size() != 0) { onlyNoLayoutUpdates = false; @@ -1217,7 +1226,8 @@ public class MessageHandler { .getConnector(connectorId); int childConnectorSize = childConnectorIds.length(); - Profiler.enter("updateConnectorHierarchy find new connectors"); + Profiler.enter( + "updateConnectorHierarchy find new connectors"); List<ServerConnector> newChildren = new ArrayList<ServerConnector>(); List<ComponentConnector> newComponents = new ArrayList<ComponentConnector>(); @@ -1227,18 +1237,14 @@ public class MessageHandler { ServerConnector childConnector = connectorMap .getConnector(childConnectorId); if (childConnector == null) { - getLogger() - .severe("Hierarchy claims that " - + childConnectorId - + " is a child for " - + connectorId - + " (" - + parentConnector.getClass() - .getName() - + ") but no connector with id " - + childConnectorId - + " has been registered. " - + "More information might be available in the server-side log if assertions are enabled"); + getLogger().severe("Hierarchy claims that " + + childConnectorId + " is a child for " + + connectorId + " (" + + parentConnector.getClass().getName() + + ") but no connector with id " + + childConnectorId + + " has been registered. " + + "More information might be available in the server-side log if assertions are enabled"); continue; } newChildren.add(childConnector); @@ -1246,9 +1252,9 @@ public class MessageHandler { newComponents .add((ComponentConnector) childConnector); } else if (!(childConnector instanceof AbstractExtensionConnector)) { - throw new IllegalStateException( - Util.getConnectorString(childConnector) - + " is not a ComponentConnector nor an AbstractExtensionConnector"); + throw new IllegalStateException(Util + .getConnectorString(childConnector) + + " is not a ComponentConnector nor an AbstractExtensionConnector"); } if (childConnector.getParent() != parentConnector) { childConnector.setParent(parentConnector); @@ -1259,21 +1265,23 @@ public class MessageHandler { } } - Profiler.leave("updateConnectorHierarchy find new connectors"); + Profiler.leave( + "updateConnectorHierarchy find new connectors"); // TODO This check should be done on the server side in // the future so the hierarchy update is only sent when // something actually has changed List<ServerConnector> oldChildren = parentConnector .getChildren(); - boolean actuallyChanged = !Util.collectionsEquals( - oldChildren, newChildren); + boolean actuallyChanged = !Util + .collectionsEquals(oldChildren, newChildren); if (!actuallyChanged) { return; } - Profiler.enter("updateConnectorHierarchy handle HasComponentsConnector"); + Profiler.enter( + "updateConnectorHierarchy handle HasComponentsConnector"); if (parentConnector instanceof HasComponentsConnector) { HasComponentsConnector ccc = (HasComponentsConnector) parentConnector; @@ -1283,27 +1291,28 @@ public class MessageHandler { newComponents)) { // Fire change event if the hierarchy has // changed - ConnectorHierarchyChangeEvent event = GWT - .create(ConnectorHierarchyChangeEvent.class); + ConnectorHierarchyChangeEvent event = GWT.create( + ConnectorHierarchyChangeEvent.class); event.setOldChildren(oldComponents); event.setConnector(parentConnector); ccc.setChildComponents(newComponents); result.events.add(event); } } else if (!newComponents.isEmpty()) { - getLogger() - .severe("Hierachy claims " - + Util.getConnectorString(parentConnector) - + " has component children even though it isn't a HasComponentsConnector"); + getLogger().severe("Hierachy claims " + + Util.getConnectorString(parentConnector) + + " has component children even though it isn't a HasComponentsConnector"); } - Profiler.leave("updateConnectorHierarchy handle HasComponentsConnector"); + Profiler.leave( + "updateConnectorHierarchy handle HasComponentsConnector"); Profiler.enter("updateConnectorHierarchy setChildren"); parentConnector.setChildren(newChildren); Profiler.leave("updateConnectorHierarchy setChildren"); - Profiler.enter("updateConnectorHierarchy find removed children"); + Profiler.enter( + "updateConnectorHierarchy find removed children"); /* * Find children removed from this parent and mark for @@ -1325,7 +1334,8 @@ public class MessageHandler { } } - Profiler.leave("updateConnectorHierarchy find removed children"); + Profiler.leave( + "updateConnectorHierarchy find removed children"); } catch (final Throwable e) { getLogger().log(Level.SEVERE, "Error updating connector hierarchy", e); @@ -1412,20 +1422,20 @@ public class MessageHandler { /* * Clear child list and parent */ - Profiler.enter(prefix - + "recursivelyDetach clear children and parent"); + Profiler.enter( + prefix + "recursivelyDetach clear children and parent"); connector .setChildren(Collections.<ServerConnector> emptyList()); connector.setParent(null); - Profiler.leave(prefix - + "recursivelyDetach clear children and parent"); + Profiler.leave( + prefix + "recursivelyDetach clear children and parent"); /* * Create an artificial hierarchy event for containers to give * it a chance to clean up after its children if it has any */ - Profiler.enter(prefix - + "recursivelyDetach create hierarchy event"); + Profiler.enter( + prefix + "recursivelyDetach create hierarchy event"); if (connector instanceof HasComponentsConnector) { HasComponentsConnector ccc = (HasComponentsConnector) connector; List<ComponentConnector> oldChildren = ccc @@ -1435,8 +1445,8 @@ public class MessageHandler { * HasComponentsConnector has a separate child component * list that should also be cleared */ - ccc.setChildComponents(Collections - .<ComponentConnector> emptyList()); + ccc.setChildComponents( + Collections.<ComponentConnector> emptyList()); // Create event and add it to the list of pending events ConnectorHierarchyChangeEvent event = GWT @@ -1446,8 +1456,8 @@ public class MessageHandler { events.add(event); } } - Profiler.leave(prefix - + "recursivelyDetach create hierarchy event"); + Profiler.leave( + prefix + "recursivelyDetach create hierarchy event"); } private native void replaceState(AbstractConnector connector, @@ -1463,8 +1473,8 @@ public class MessageHandler { getLogger() .info(" * Performing server to client RPC calls"); - JsonArray rpcCalls = Util.jso2json(json - .getJavaScriptObject("rpc")); + JsonArray rpcCalls = Util + .jso2json(json.getJavaScriptObject("rpc")); int rpcLength = rpcCalls.length(); for (int i = 0; i < rpcLength; i++) { @@ -1474,17 +1484,15 @@ public class MessageHandler { .parseAndApplyInvocation(rpcCall, connection); - if (onlyNoLayoutUpdates - && !RpcManager.getMethod(invocation) - .isNoLayout()) { + if (onlyNoLayoutUpdates && !RpcManager + .getMethod(invocation).isNoLayout()) { onlyNoLayoutUpdates = false; } } catch (final Throwable e) { - getLogger() - .log(Level.SEVERE, - "Error performing server to client RPC calls", - e); + getLogger().log(Level.SEVERE, + "Error performing server to client RPC calls", + e); } } @@ -1557,18 +1565,16 @@ public class MessageHandler { if (!responseHandlingLocks.isEmpty()) { // Lock which was never release -> bug in locker or things just // too slow - getLogger() - .warning( - "WARNING: reponse handling was never resumed, forcibly removing locks..."); + getLogger().warning( + "WARNING: reponse handling was never resumed, forcibly removing locks..."); responseHandlingLocks.clear(); } else { // Waited for out-of-order message which never arrived // Do one final check and resynchronize if the message is not // there. The final check is only a precaution as this timer // should have been cancelled if the message has arrived - getLogger().warning( - "Gave up waiting for message " + getExpectedServerId() - + " from the server"); + getLogger().warning("Gave up waiting for message " + + getExpectedServerId() + " from the server"); } if (!handlePendingMessages() && !pendingUIDLMessages.isEmpty()) { @@ -1603,8 +1609,8 @@ public class MessageHandler { forceHandleMessage.cancel(); if (!pendingUIDLMessages.isEmpty()) { - getLogger() - .info("No more response handling locks, handling pending requests."); + getLogger().info( + "No more response handling locks, handling pending requests."); handlePendingMessages(); } } @@ -1776,10 +1782,9 @@ public class MessageHandler { final double start = Profiler.getRelativeTimeMillis(); try { ValueMap json = parseJSONResponse(jsonText); - getLogger().info( - "JSON parsing took " - + Util.round(Profiler.getRelativeTimeMillis() - - start, 3) + "ms"); + getLogger().info("JSON parsing took " + + Util.round(Profiler.getRelativeTimeMillis() - start, 3) + + "ms"); return json; } catch (final Exception e) { getLogger().severe("Unable to parse JSON: " + jsonText); diff --git a/client/src/main/java/com/vaadin/client/communication/MessageSender.java b/client/src/main/java/com/vaadin/client/communication/MessageSender.java index 5862809b0c..f77f55f6ff 100644 --- a/client/src/main/java/com/vaadin/client/communication/MessageSender.java +++ b/client/src/main/java/com/vaadin/client/communication/MessageSender.java @@ -78,9 +78,8 @@ public class MessageSender { public void sendInvocationsToServer() { if (!connection.isApplicationRunning()) { - getLogger() - .warning( - "Trying to send RPC from not yet started or stopped application"); + getLogger().warning( + "Trying to send RPC from not yet started or stopped application"); return; } @@ -115,9 +114,8 @@ public class MessageSender { if (reqJson.length() == 0) { // Nothing to send, all invocations were filtered out (for // non-existing connectors) - getLogger() - .warning( - "All RPCs filtered out, not sending anything to the server"); + getLogger().warning( + "All RPCs filtered out, not sending anything to the server"); return; } @@ -155,8 +153,8 @@ public class MessageSender { payload.put(ApplicationConstants.CSRF_TOKEN, csrfToken); } payload.put(ApplicationConstants.RPC_INVOCATIONS, reqInvocations); - payload.put(ApplicationConstants.SERVER_SYNC_ID, getMessageHandler() - .getLastSeenServerSyncId()); + payload.put(ApplicationConstants.SERVER_SYNC_ID, + getMessageHandler().getLastSeenServerSyncId()); payload.put(ApplicationConstants.CLIENT_TO_SERVER_ID, clientToServerMessageId++); @@ -257,9 +255,8 @@ public class MessageSender { Scheduler.get().scheduleDeferred(new Command() { @Override public void execute() { - if (!connection.isApplicationRunning() - || !(hasActiveRequest() || getServerRpcQueue() - .isFlushPending())) { + if (!connection.isApplicationRunning() || !(hasActiveRequest() + || getServerRpcQueue().isFlushPending())) { getLoadingIndicator().hide(); // If on Liferay and session expiration management is in @@ -392,9 +389,8 @@ public class MessageSender { // We have never sent a message to the server, so likely the // server knows better (typical case is that we refreshed a // @PreserveOnRefresh UI) - getLogger().info( - "Updating client-to-server id to " + nextExpectedId - + " based on server"); + getLogger().info("Updating client-to-server id to " + + nextExpectedId + " based on server"); } else { getLogger().warning( "Server expects next client-to-server id to be " diff --git a/client/src/main/java/com/vaadin/client/communication/PushConnection.java b/client/src/main/java/com/vaadin/client/communication/PushConnection.java index 489d2c39a4..f3595c732c 100644 --- a/client/src/main/java/com/vaadin/client/communication/PushConnection.java +++ b/client/src/main/java/com/vaadin/client/communication/PushConnection.java @@ -49,8 +49,8 @@ public interface PushConnection { * <p> * Implementation detail: If the push connection is not connected and the * message can thus not be sent, the implementation must call - * {@link ConnectionStateHandler#pushNotConnected(JsonObject)}, which - * will retry the send later. + * {@link ConnectionStateHandler#pushNotConnected(JsonObject)}, which will + * retry the send later. * <p> * This method must not be called if the push connection is not * bidirectional (if {@link #isBidirectional()} returns false) diff --git a/client/src/main/java/com/vaadin/client/communication/RpcManager.java b/client/src/main/java/com/vaadin/client/communication/RpcManager.java index dfcfb47f46..578c9bd6a4 100644 --- a/client/src/main/java/com/vaadin/client/communication/RpcManager.java +++ b/client/src/main/java/com/vaadin/client/communication/RpcManager.java @@ -58,9 +58,10 @@ public class RpcManager { method.invoke(clientRpc, invocation.getParameters()); } } catch (NoDataException e) { - throw new IllegalStateException("There is no information about " - + method.getSignature() - + ". Did you remember to compile the right widgetset?", e); + throw new IllegalStateException( + "There is no information about " + method.getSignature() + + ". Did you remember to compile the right widgetset?", + e); } } @@ -91,9 +92,10 @@ public class RpcManager { Type[] parameterTypes = method.getParameterTypes(); return parameterTypes; } catch (NoDataException e) { - throw new IllegalStateException("There is no information about " - + method.getSignature() - + ". Did you remember to compile the right widgetset?", e); + throw new IllegalStateException( + "There is no information about " + method.getSignature() + + ". Did you remember to compile the right widgetset?", + e); } } @@ -112,13 +114,12 @@ public class RpcManager { interfaceName, methodName); if (connector instanceof HasJavaScriptConnectorHelper) { ((HasJavaScriptConnectorHelper) connector) - .getJavascriptConnectorHelper().invokeJsRpc(invocation, - parametersJson); + .getJavascriptConnectorHelper() + .invokeJsRpc(invocation, parametersJson); } else { if (connector == null) { - throw new IllegalStateException("Target connector (" - + connector + ") not found for RCC to " - + getSignature(invocation)); + throw new IllegalStateException("Target connector (" + connector + + ") not found for RCC to " + getSignature(invocation)); } parseMethodParameters(invocation, parametersJson, connection); diff --git a/client/src/main/java/com/vaadin/client/communication/RpcProxy.java b/client/src/main/java/com/vaadin/client/communication/RpcProxy.java index b757590f77..83de44afb4 100644 --- a/client/src/main/java/com/vaadin/client/communication/RpcProxy.java +++ b/client/src/main/java/com/vaadin/client/communication/RpcProxy.java @@ -36,14 +36,14 @@ public class RpcProxy { return (T) TypeData.getType(rpcInterface).createProxy( new RpcInvokationHandler(rpcInterface, connector)); } catch (NoDataException e) { - throw new IllegalStateException("There is no information about " - + rpcInterface - + ". Did you forget to compile the widgetset?"); + throw new IllegalStateException( + "There is no information about " + rpcInterface + + ". Did you forget to compile the widgetset?"); } } - private static final class RpcInvokationHandler implements - InvokationHandler { + private static final class RpcInvokationHandler + implements InvokationHandler { private final Class<?> rpcInterface; private final ServerConnector connector; @@ -58,8 +58,8 @@ public class RpcProxy { MethodInvocation invocation = new MethodInvocation( connector.getConnectorId(), rpcInterface.getName(), method.getName(), params); - ServerRpcQueue serverRpcQueue = ServerRpcQueue.get(connector - .getConnection()); + ServerRpcQueue serverRpcQueue = ServerRpcQueue + .get(connector.getConnection()); serverRpcQueue.add(invocation, method.isLastOnly()); if (!method.isDelayed()) { serverRpcQueue.flush(); diff --git a/client/src/main/java/com/vaadin/client/communication/ServerRpcQueue.java b/client/src/main/java/com/vaadin/client/communication/ServerRpcQueue.java index e5d5ea8a25..27bebe4347 100644 --- a/client/src/main/java/com/vaadin/client/communication/ServerRpcQueue.java +++ b/client/src/main/java/com/vaadin/client/communication/ServerRpcQueue.java @@ -118,15 +118,15 @@ public class ServerRpcQueue { */ public void add(MethodInvocation invocation, boolean lastOnly) { if (!connection.isApplicationRunning()) { - getLogger() - .warning( - "Trying to invoke method on not yet started or stopped application"); + getLogger().warning( + "Trying to invoke method on not yet started or stopped application"); return; } String tag; if (lastOnly) { tag = invocation.getLastOnlyTag(); - assert !tag.matches("\\d+") : "getLastOnlyTag value must have at least one non-digit character"; + assert !tag.matches( + "\\d+") : "getLastOnlyTag value must have at least one non-digit character"; pendingInvocations.remove(tag); } else { tag = Integer.toString(lastInvocationTag++); @@ -255,9 +255,8 @@ public class ServerRpcQueue { for (MethodInvocation invocation : getAll()) { String connectorId = invocation.getConnectorId(); if (!connectorExists(connectorId)) { - getLogger().info( - "Ignoring RPC for removed connector: " + connectorId - + ": " + invocation.toString()); + getLogger().info("Ignoring RPC for removed connector: " + + connectorId + ": " + invocation.toString()); continue; } @@ -275,8 +274,8 @@ public class ServerRpcQueue { Method method = type.getMethod(invocation.getMethodName()); parameterTypes = method.getParameterTypes(); } catch (NoDataException e) { - throw new RuntimeException("No type data for " - + invocation.toString(), e); + throw new RuntimeException( + "No type data for " + invocation.toString(), e); } } @@ -334,8 +333,8 @@ public class ServerRpcQueue { * otherwise */ public static boolean isLegacyVariableChange(MethodInvocation invocation) { - return ApplicationConstants.UPDATE_VARIABLE_METHOD.equals(invocation - .getInterfaceName()) + return ApplicationConstants.UPDATE_VARIABLE_METHOD + .equals(invocation.getInterfaceName()) && ApplicationConstants.UPDATE_VARIABLE_METHOD .equals(invocation.getMethodName()); } diff --git a/client/src/main/java/com/vaadin/client/communication/StateChangeEvent.java b/client/src/main/java/com/vaadin/client/communication/StateChangeEvent.java index c2c1ceaea9..ba96d64518 100644 --- a/client/src/main/java/com/vaadin/client/communication/StateChangeEvent.java +++ b/client/src/main/java/com/vaadin/client/communication/StateChangeEvent.java @@ -33,8 +33,8 @@ import com.vaadin.client.ui.AbstractConnector; import elemental.json.JsonObject; -public class StateChangeEvent extends - AbstractServerConnectorEvent<StateChangeHandler> { +public class StateChangeEvent + extends AbstractServerConnectorEvent<StateChangeHandler> { /** * Type of this event, used by the event bus. */ @@ -176,7 +176,8 @@ public class StateChangeEvent extends @Deprecated public FastStringSet getChangedPropertiesFastSet() { if (changedProperties == null) { - Profiler.enter("StateChangeEvent.getChangedPropertiesFastSet populate"); + Profiler.enter( + "StateChangeEvent.getChangedPropertiesFastSet populate"); changedProperties = FastStringSet.create(); addJsonFields(stateJson, changedProperties, ""); @@ -186,7 +187,8 @@ public class StateChangeEvent extends changedProperties, ""); } - Profiler.leave("StateChangeEvent.getChangedPropertiesFastSet populate"); + Profiler.leave( + "StateChangeEvent.getChangedPropertiesFastSet populate"); } return changedProperties; } @@ -282,8 +284,10 @@ public class StateChangeEvent extends } } } catch (NoDataException e) { - throw new IllegalStateException("No property info for " + type - + ". Did you remember to compile the right widgetset?", e); + throw new IllegalStateException( + "No property info for " + type + + ". Did you remember to compile the right widgetset?", + e); } } diff --git a/client/src/main/java/com/vaadin/client/communication/XhrConnection.java b/client/src/main/java/com/vaadin/client/communication/XhrConnection.java index 11e3cf3cb7..3e7a86d4ac 100644 --- a/client/src/main/java/com/vaadin/client/communication/XhrConnection.java +++ b/client/src/main/java/com/vaadin/client/communication/XhrConnection.java @@ -146,10 +146,9 @@ public class XhrConnection { return; } - getLogger().info( - "Server visit took " - + Util.round(Profiler.getRelativeTimeMillis() - - requestStartTime, 3) + "ms"); + getLogger().info("Server visit took " + Util.round( + Profiler.getRelativeTimeMillis() - requestStartTime, 3) + + "ms"); // for(;;);["+ realJson +"]" String responseText = response.getText(); @@ -221,8 +220,8 @@ public class XhrConnection { }.schedule(retryTimeout); } } catch (RequestException e) { - getConnectionStateHandler().xhrException( - new XhrConnectionError(null, payload, e)); + getConnectionStateHandler() + .xhrException(new XhrConnectionError(null, payload, e)); } } @@ -236,8 +235,8 @@ public class XhrConnection { .translateVaadinUri(ApplicationConstants.APP_PROTOCOL_PREFIX + ApplicationConstants.UIDL_PATH + '/'); - uri = SharedUtil.addGetParameters(uri, UIConstants.UI_ID_PARAMETER - + "=" + connection.getConfiguration().getUIId()); + uri = SharedUtil.addGetParameters(uri, UIConstants.UI_ID_PARAMETER + "=" + + connection.getConfiguration().getUIId()); return uri; diff --git a/client/src/main/java/com/vaadin/client/componentlocator/ComponentLocator.java b/client/src/main/java/com/vaadin/client/componentlocator/ComponentLocator.java index 0dfaf99cc1..7b01fd8742 100644 --- a/client/src/main/java/com/vaadin/client/componentlocator/ComponentLocator.java +++ b/client/src/main/java/com/vaadin/client/componentlocator/ComponentLocator.java @@ -51,8 +51,9 @@ public class ComponentLocator { */ public ComponentLocator(ApplicationConnection client) { this.client = client; - locatorStrategies = Arrays.asList(new VaadinFinderLocatorStrategy( - client), new LegacyLocatorStrategy(client)); + locatorStrategies = Arrays.asList( + new VaadinFinderLocatorStrategy(client), + new LegacyLocatorStrategy(client)); } /** @@ -181,8 +182,8 @@ public class ComponentLocator { JsArray<Element> jsElements = JavaScriptObject.createArray().cast(); for (LocatorStrategy strategy : locatorStrategies) { if (strategy.validatePath(path)) { - List<Element> elements = strategy.getElementsByPathStartingAt( - path, root); + List<Element> elements = strategy + .getElementsByPathStartingAt(path, root); if (elements.size() > 0) { for (Element e : elements) { jsElements.push(e); diff --git a/client/src/main/java/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java b/client/src/main/java/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java index 517d979c8e..77d618aed4 100644 --- a/client/src/main/java/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java +++ b/client/src/main/java/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java @@ -75,8 +75,8 @@ public class LegacyLocatorStrategy implements LocatorStrategy { private final ApplicationConnection client; - private static final RegExp validSyntax = RegExp - .compile("^((\\w+::)?((PID_S)?\\w[-$_a-zA-Z0-9.' ]*)?)?(/[-$_a-zA-Z0-9]+\\[\\d+\\])*/?(#.*)?$"); + private static final RegExp validSyntax = RegExp.compile( + "^((\\w+::)?((PID_S)?\\w[-$_a-zA-Z0-9.' ]*)?)?(/[-$_a-zA-Z0-9]+\\[\\d+\\])*/?(#.*)?$"); public LegacyLocatorStrategy(ApplicationConnection clientConnection) { client = clientConnection; @@ -89,8 +89,8 @@ public class LegacyLocatorStrategy implements LocatorStrategy { @Override public String getPathForElement(Element targetElement) { - ComponentConnector connector = Util - .findPaintable(client, targetElement); + ComponentConnector connector = Util.findPaintable(client, + targetElement); Widget w = null; if (connector != null) { @@ -169,8 +169,8 @@ public class LegacyLocatorStrategy implements LocatorStrategy { * If the widget can provide an identifier for the targetElement we * let it do that */ - String elementLocator = ((SubPartAware) w).getSubPartName(DOM - .asOld(targetElement)); + String elementLocator = ((SubPartAware) w) + .getSubPartName(DOM.asOld(targetElement)); if (elementLocator != null) { return path + LegacyLocatorStrategy.SUBPART_SEPARATOR + elementLocator; @@ -200,7 +200,8 @@ public class LegacyLocatorStrategy implements LocatorStrategy { * {@inheritDoc} */ @Override - public Element getElementByPathStartingAt(String path, Element baseElement) { + public Element getElementByPathStartingAt(String path, + Element baseElement) { /* * Path is of type "targetWidgetPath#componentPart" or * "targetWidgetPath". @@ -253,7 +254,8 @@ public class LegacyLocatorStrategy implements LocatorStrategy { * {@inheritDoc} */ @Override - public List<Element> getElementsByPathStartingAt(String path, Element root) { + public List<Element> getElementsByPathStartingAt(String path, + Element root) { // This type of search is not supported in LegacyLocator List<Element> array = new ArrayList<Element>(); Element e = getElementByPathStartingAt(path, root); @@ -295,7 +297,8 @@ public class LegacyLocatorStrategy implements LocatorStrategy { * @return The widget whose root element is a parent of * {@code targetElement}. */ - private Widget findParentWidget(Element targetElement, Widget ancestorWidget) { + private Widget findParentWidget(Element targetElement, + Widget ancestorWidget) { /* * As we cannot resolve Widgets from the element we start from the * widget and move downwards to the correct child widget, as long as we @@ -334,13 +337,13 @@ public class LegacyLocatorStrategy implements LocatorStrategy { String childIndexString = part.substring("domChild[".length(), part.length() - 1); - if (WidgetUtil.findWidget(baseElement, null) instanceof VAbstractOrderedLayout) { + if (WidgetUtil.findWidget(baseElement, + null) instanceof VAbstractOrderedLayout) { if (element.hasChildNodes()) { Element e = element.getFirstChildElement().cast(); String cn = e.getClassName(); - if (cn != null - && (cn.equals("v-expand") || cn - .contains("v-has-caption"))) { + if (cn != null && (cn.equals("v-expand") + || cn.contains("v-has-caption"))) { element = e; } } @@ -472,8 +475,8 @@ public class LegacyLocatorStrategy implements LocatorStrategy { while (i.hasNext()) { Object child = i.next(); if (child == w) { - return basePath + PARENTCHILD_SEPARATOR + simpleName + "[" - + pos + "]"; + return basePath + PARENTCHILD_SEPARATOR + simpleName + "[" + pos + + "]"; } String simpleName2 = Util.getSimpleName(child); if (simpleName.equals(simpleName2)) { @@ -568,8 +571,9 @@ public class LegacyLocatorStrategy implements LocatorStrategy { // ChildComponentContainer and VOrderedLayout$Slot have been // replaced with Slot if (w instanceof VAbstractOrderedLayout - && ("ChildComponentContainer".equals(widgetClassName) || "VOrderedLayout$Slot" - .equals(widgetClassName))) { + && ("ChildComponentContainer".equals(widgetClassName) + || "VOrderedLayout$Slot" + .equals(widgetClassName))) { widgetClassName = "Slot"; } @@ -606,8 +610,8 @@ public class LegacyLocatorStrategy implements LocatorStrategy { // the same type before it int nextIndex = 0; for (Widget child : layout) { - boolean matchingType = nextWidgetClassName.equals(Util - .getSimpleName(child)); + boolean matchingType = nextWidgetClassName + .equals(Util.getSimpleName(child)); if (matchingType && widgetPosition == 0) { // This is the n:th child that we looked for break; diff --git a/client/src/main/java/com/vaadin/client/componentlocator/SelectorPredicate.java b/client/src/main/java/com/vaadin/client/componentlocator/SelectorPredicate.java index 31f6cc9b05..6c9a6af54b 100644 --- a/client/src/main/java/com/vaadin/client/componentlocator/SelectorPredicate.java +++ b/client/src/main/java/com/vaadin/client/componentlocator/SelectorPredicate.java @@ -141,11 +141,11 @@ public class SelectorPredicate { * found. */ private static String extractPredicateString(String pathFragment) { - int ixOpenBracket = LocatorUtil - .indexOfIgnoringQuoted(pathFragment, '['); + int ixOpenBracket = LocatorUtil.indexOfIgnoringQuoted(pathFragment, + '['); if (ixOpenBracket >= 0) { - int ixCloseBracket = LocatorUtil.indexOfIgnoringQuoted( - pathFragment, ']', ixOpenBracket); + int ixCloseBracket = LocatorUtil.indexOfIgnoringQuoted(pathFragment, + ']', ixOpenBracket); return pathFragment.substring(ixOpenBracket + 1, ixCloseBracket); } return ""; diff --git a/client/src/main/java/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java b/client/src/main/java/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java index 44bdeddff3..263031e13c 100644 --- a/client/src/main/java/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java +++ b/client/src/main/java/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java @@ -86,8 +86,8 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy { boolean hasSubParts = targetWidget instanceof SubPartAware; if (oldTarget != targetElement) { if (hasSubParts) { - subPart = ((SubPartAware) targetWidget).getSubPartName(DOM - .asOld(oldTarget)); + subPart = ((SubPartAware) targetWidget) + .getSubPartName(DOM.asOld(oldTarget)); } if (!hasSubParts || subPart == null) { @@ -96,7 +96,8 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy { } } - List<ConnectorPath> hierarchy = getConnectorHierarchyForElement(targetElement); + List<ConnectorPath> hierarchy = getConnectorHierarchyForElement( + targetElement); List<String> path = new ArrayList<String>(); // Assemble longname path components back-to-forth with useful @@ -151,12 +152,13 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy { // See if we get minimum from second last. If not then we already // have the best one.. Second last one contains almost full // component hierarchy. - if (getElementsByPath(selectors.get(selectors.size() - 2)).indexOf( - target) == min) { + if (getElementsByPath(selectors.get(selectors.size() - 2)) + .indexOf(target) == min) { for (int i = 1; i < selectors.size() - 2; ++i) { // Loop through the remaining selectors and look for one // with the same index - if (getElementsByPath(selectors.get(i)).indexOf(target) == min) { + if (getElementsByPath(selectors.get(i)) + .indexOf(target) == min) { bestSelector = selectors.get(i); break; } @@ -218,8 +220,8 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy { * not exist on the object (or some other error is encountered). */ private String getPropertyValue(ComponentConnector c, String propertyName) { - Property prop = AbstractConnector.getStateType(c).getProperty( - propertyName); + Property prop = AbstractConnector.getStateType(c) + .getProperty(propertyName); try { return prop.getValue(c.getState()).toString(); } catch (Exception e) { @@ -289,8 +291,9 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy { } else { final UIConnector uiConnector = client.getUIConnector(); - elements.addAll(eliminateDuplicates(getElementsByPathStartingAtConnector( - path, uiConnector, Document.get().getBody()))); + elements.addAll( + eliminateDuplicates(getElementsByPathStartingAtConnector( + path, uiConnector, Document.get().getBody()))); } for (SelectorPredicate p : postFilters) { @@ -340,7 +343,8 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy { * {@inheritDoc} */ @Override - public List<Element> getElementsByPathStartingAt(String path, Element root) { + public List<Element> getElementsByPathStartingAt(String path, + Element root) { List<SelectorPredicate> postFilters = SelectorPredicate .extractPostFilterPredicates(path); if (postFilters.size() > 0) { @@ -474,8 +478,8 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy { for (ComponentConnector parent : parents) { connectors.addAll(filterMatches( collectPotentialMatches(parent, fragments[0], - findRecursively), SelectorPredicate - .extractPredicates(fragments[0]))); + findRecursively), + SelectorPredicate.extractPredicates(fragments[0]))); } if (!connectors.isEmpty() && fragments.length > 1) { @@ -518,8 +522,8 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy { String propData = getPropertyValue(potentialMatches.get(i), p.getName()); - if ((p.isWildcard() && propData == null) - || (!p.isWildcard() && !p.getValue().equals(propData))) { + if ((p.isWildcard() && propData == null) || (!p.isWildcard() + && !p.getValue().equals(propData))) { potentialMatches.remove(i); --l; --i; @@ -637,7 +641,8 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy { if (widgetName.equals(fullName + ".class") || widgetName.equals(fullName) || widgetName.equals(simpleName + ".class") - || widgetName.equals(simpleName) || widgetName.equals(name)) { + || widgetName.equals(simpleName) + || widgetName.equals(name)) { return true; } } diff --git a/client/src/main/java/com/vaadin/client/connectors/AbstractRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/AbstractRendererConnector.java index f7e3c15ac8..cc59ca5088 100644 --- a/client/src/main/java/com/vaadin/client/connectors/AbstractRendererConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/AbstractRendererConnector.java @@ -34,9 +34,8 @@ import elemental.json.JsonValue; * {@link com.vaadin.ui.components.grid.Renderer Renderer}. As a connector, it * can use the regular Vaadin RPC and shared state mechanism to pass additional * state and information between the client and the server. This base class - * itself only uses the basic - * {@link com.vaadin.shared.communication.SharedState SharedState} and no RPC - * interfaces. + * itself only uses the basic {@link com.vaadin.shared.communication.SharedState + * SharedState} and no RPC interfaces. * * @param <T> * the presentation type of the renderer @@ -44,8 +43,8 @@ import elemental.json.JsonValue; * @since 7.4 * @author Vaadin Ltd */ -public abstract class AbstractRendererConnector<T> extends - AbstractExtensionConnector { +public abstract class AbstractRendererConnector<T> + extends AbstractExtensionConnector { private Renderer<T> renderer = null; @@ -54,10 +53,9 @@ public abstract class AbstractRendererConnector<T> extends protected AbstractRendererConnector() { if (presentationType == null) { - throw new IllegalStateException( - "No presentation type found for " - + getClass().getSimpleName() - + ". This may be caused by some unspecified problem in widgetset compilation."); + throw new IllegalStateException("No presentation type found for " + + getClass().getSimpleName() + + ". This may be caused by some unspecified problem in widgetset compilation."); } } @@ -112,7 +110,8 @@ public abstract class AbstractRendererConnector<T> extends + getClass().getSimpleName() + ". This might be caused by explicitely using " + "super.createRenderer() or some unspecified " - + "problem with the widgetset compilation.", e); + + "problem with the widgetset compilation.", + e); } } @@ -153,8 +152,8 @@ public abstract class AbstractRendererConnector<T> extends if (parent instanceof GridConnector) { return ((GridConnector) parent).getRowKey(row); } else { - throw new IllegalStateException("Renderers can only be used " - + "with a Grid."); + throw new IllegalStateException( + "Renderers can only be used " + "with a Grid."); } } @@ -174,8 +173,8 @@ public abstract class AbstractRendererConnector<T> extends if (parent instanceof GridConnector) { return ((GridConnector) parent).getColumnId(column); } else { - throw new IllegalStateException("Renderers can only be used " - + "with a Grid."); + throw new IllegalStateException( + "Renderers can only be used " + "with a Grid."); } } diff --git a/client/src/main/java/com/vaadin/client/connectors/AbstractSelectionModelConnector.java b/client/src/main/java/com/vaadin/client/connectors/AbstractSelectionModelConnector.java index 3a96f0f03b..45c8f3002d 100644 --- a/client/src/main/java/com/vaadin/client/connectors/AbstractSelectionModelConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/AbstractSelectionModelConnector.java @@ -53,8 +53,8 @@ public abstract class AbstractSelectionModelConnector<T extends SelectionModel<J protected abstract T createSelectionModel(); - public abstract static class AbstractSelectionModel implements - SelectionModel<JsonObject> { + public abstract static class AbstractSelectionModel + implements SelectionModel<JsonObject> { @Override public boolean isSelected(JsonObject row) { diff --git a/client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java index 094ca24b5a..caa571c355 100644 --- a/client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java @@ -29,7 +29,8 @@ import elemental.json.JsonObject; * @author Vaadin Ltd */ @Connect(com.vaadin.ui.renderers.ButtonRenderer.class) -public class ButtonRendererConnector extends ClickableRendererConnector<String> { +public class ButtonRendererConnector + extends ClickableRendererConnector<String> { @Override public ButtonRenderer getRenderer() { diff --git a/client/src/main/java/com/vaadin/client/connectors/ClickableRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/ClickableRendererConnector.java index 9d16a57a17..43874e767b 100644 --- a/client/src/main/java/com/vaadin/client/connectors/ClickableRendererConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/ClickableRendererConnector.java @@ -33,23 +33,24 @@ import elemental.json.JsonObject; * @since 7.4 * @author Vaadin Ltd */ -public abstract class ClickableRendererConnector<T> extends - AbstractRendererConnector<T> { +public abstract class ClickableRendererConnector<T> + extends AbstractRendererConnector<T> { HandlerRegistration clickRegistration; @Override protected void init() { - clickRegistration = addClickHandler(new RendererClickHandler<JsonObject>() { - @Override - public void onClick(RendererClickEvent<JsonObject> event) { - getRpcProxy(RendererClickRpc.class).click( - getRowKey(event.getCell().getRow()), - getColumnId(event.getCell().getColumn()), - MouseEventDetailsBuilder.buildMouseEventDetails(event - .getNativeEvent())); - } - }); + clickRegistration = addClickHandler( + new RendererClickHandler<JsonObject>() { + @Override + public void onClick(RendererClickEvent<JsonObject> event) { + getRpcProxy(RendererClickRpc.class).click( + getRowKey(event.getCell().getRow()), + getColumnId(event.getCell().getColumn()), + MouseEventDetailsBuilder.buildMouseEventDetails( + event.getNativeEvent())); + } + }); } @Override diff --git a/client/src/main/java/com/vaadin/client/connectors/DetailComponentManagerConnector.java b/client/src/main/java/com/vaadin/client/connectors/DetailComponentManagerConnector.java index 6830d27ef0..cf5b63d4ae 100644 --- a/client/src/main/java/com/vaadin/client/connectors/DetailComponentManagerConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/DetailComponentManagerConnector.java @@ -26,7 +26,8 @@ import com.vaadin.ui.Grid.DetailComponentManager; * @since 7.6.1 */ @Connect(DetailComponentManager.class) -public class DetailComponentManagerConnector extends AbstractExtensionConnector { +public class DetailComponentManagerConnector + extends AbstractExtensionConnector { @Override protected void extend(ServerConnector target) { diff --git a/client/src/main/java/com/vaadin/client/connectors/GridConnector.java b/client/src/main/java/com/vaadin/client/connectors/GridConnector.java index 550cf1517c..6045d31944 100644 --- a/client/src/main/java/com/vaadin/client/connectors/GridConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/GridConnector.java @@ -111,8 +111,8 @@ import elemental.json.JsonValue; * @author Vaadin Ltd */ @Connect(com.vaadin.ui.Grid.class) -public class GridConnector extends AbstractHasComponentsConnector implements - SimpleManagedLayout, DeferredWorker { +public class GridConnector extends AbstractHasComponentsConnector + implements SimpleManagedLayout, DeferredWorker { private static final class CustomStyleGenerator implements CellStyleGenerator<JsonObject>, RowStyleGenerator<JsonObject> { @@ -223,7 +223,8 @@ public class GridConnector extends AbstractHasComponentsConnector implements public void onStateChanged( StateChangeEvent stateChangeEvent) { - String error = editorConnector.getState().errorMessage; + String error = editorConnector + .getState().errorMessage; if (error == null) { columnToErrorMessage @@ -233,7 +234,8 @@ public class GridConnector extends AbstractHasComponentsConnector implements // therefore, we use this hack to make the // string human-readable. Element e = DOM.createElement("div"); - e.setInnerHTML(editorConnector.getState().errorMessage); + e.setInnerHTML(editorConnector + .getState().errorMessage); error = getHeaderCaption() + ": " + e.getInnerText(); @@ -242,8 +244,8 @@ public class GridConnector extends AbstractHasComponentsConnector implements } // Handle Editor RPC before updating error status - Scheduler.get().scheduleFinally( - new ScheduledCommand() { + Scheduler.get() + .scheduleFinally(new ScheduledCommand() { @Override public void execute() { @@ -400,8 +402,8 @@ public class GridConnector extends AbstractHasComponentsConnector implements } } - private class ItemClickHandler implements BodyClickHandler, - BodyDoubleClickHandler { + private class ItemClickHandler + implements BodyClickHandler, BodyDoubleClickHandler { @Override public void onClick(GridClickEvent event) { @@ -417,15 +419,13 @@ public class GridConnector extends AbstractHasComponentsConnector implements } } - private void fireItemClick(CellReference<?> cell, NativeEvent mouseEvent) { + private void fireItemClick(CellReference<?> cell, + NativeEvent mouseEvent) { String rowKey = getRowKey((JsonObject) cell.getRow()); String columnId = getColumnId(cell.getColumn()); - getRpcProxy(GridServerRpc.class) - .itemClick( - rowKey, - columnId, - MouseEventDetailsBuilder - .buildMouseEventDetails(mouseEvent)); + getRpcProxy(GridServerRpc.class).itemClick(rowKey, columnId, + MouseEventDetailsBuilder + .buildMouseEventDetails(mouseEvent)); } } @@ -441,8 +441,8 @@ public class GridConnector extends AbstractHasComponentsConnector implements newColumnOrder.add(((CustomGridColumn) column).id); } // the other case would be the multi selection column } - getRpcProxy(GridServerRpc.class).columnsReordered( - newColumnOrder, columnOrder); + getRpcProxy(GridServerRpc.class) + .columnsReordered(newColumnOrder, columnOrder); columnOrder = newColumnOrder; getState().columnOrder = newColumnOrder; } @@ -491,7 +491,8 @@ public class GridConnector extends AbstractHasComponentsConnector implements } }; - private class CustomDetailsGenerator implements HeightAwareDetailsGenerator { + private class CustomDetailsGenerator + implements HeightAwareDetailsGenerator { private final Map<String, ComponentConnector> idToDetailsMap = new HashMap<String, ComponentConnector>(); private final Map<String, Integer> idToRowIndex = new HashMap<String, Integer>(); @@ -534,9 +535,8 @@ public class GridConnector extends AbstractHasComponentsConnector implements private String getId(int rowIndex) { JsonObject row = getWidget().getDataSource().getRow(rowIndex); - if (!row.hasKey(GridState.JSONKEY_DETAILS_VISIBLE) - || row.getString(GridState.JSONKEY_DETAILS_VISIBLE) - .isEmpty()) { + if (!row.hasKey(GridState.JSONKEY_DETAILS_VISIBLE) || row + .getString(GridState.JSONKEY_DETAILS_VISIBLE).isEmpty()) { return null; } @@ -782,8 +782,8 @@ public class GridConnector extends AbstractHasComponentsConnector implements if (!Arrays.equals(columnIds, getState().sortColumns) || !Arrays.equals(directions, getState().sortDirs)) { // Report back to server if changed - getRpcProxy(GridServerRpc.class).sort(columnIds, - directions, event.isUserOriginated()); + getRpcProxy(GridServerRpc.class).sort(columnIds, directions, + event.isUserOriginated()); } } }); @@ -939,7 +939,8 @@ public class GridConnector extends AbstractHasComponentsConnector implements } } - private void updateHeaderCellFromState(HeaderCell cell, CellState cellState) { + private void updateHeaderCellFromState(HeaderCell cell, + CellState cellState) { switch (cellState.type) { case TEXT: cell.setText(cellState.text); @@ -958,8 +959,8 @@ public class GridConnector extends AbstractHasComponentsConnector implements } break; default: - throw new IllegalStateException("unexpected cell type: " - + cellState.type); + throw new IllegalStateException( + "unexpected cell type: " + cellState.type); } cell.setStyleName(cellState.styleName); } @@ -999,7 +1000,8 @@ public class GridConnector extends AbstractHasComponentsConnector implements } } - private void updateFooterCellFromState(FooterCell cell, CellState cellState) { + private void updateFooterCellFromState(FooterCell cell, + CellState cellState) { switch (cellState.type) { case TEXT: cell.setText(cellState.text); @@ -1018,8 +1020,8 @@ public class GridConnector extends AbstractHasComponentsConnector implements } break; default: - throw new IllegalStateException("unexpected cell type: " - + cellState.type); + throw new IllegalStateException( + "unexpected cell type: " + cellState.type); } cell.setStyleName(cellState.styleName); } @@ -1074,7 +1076,8 @@ public class GridConnector extends AbstractHasComponentsConnector implements column.setExpandRatio(state.expandRatio); assert state.rendererConnector instanceof AbstractRendererConnector : "GridColumnState.rendererConnector is invalid (not subclass of AbstractRendererConnector)"; - column.setRenderer((AbstractRendererConnector<Object>) state.rendererConnector); + column.setRenderer( + (AbstractRendererConnector<Object>) state.rendererConnector); column.setSortable(state.sortable); @@ -1087,7 +1090,8 @@ public class GridConnector extends AbstractHasComponentsConnector implements column.setHidingToggleCaption(state.hidingToggleCaption); column.setEditable(state.editable); - column.setEditorConnector((AbstractComponentConnector) state.editorConnector); + column.setEditorConnector( + (AbstractComponentConnector) state.editorConnector); } /** diff --git a/client/src/main/java/com/vaadin/client/connectors/JavaScriptRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/JavaScriptRendererConnector.java index 1229922a9c..70d3da211a 100644 --- a/client/src/main/java/com/vaadin/client/connectors/JavaScriptRendererConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/JavaScriptRendererConnector.java @@ -45,14 +45,14 @@ import elemental.json.JsonValue; // This is really typed to <JsonValue>, but because of the way native strings // are not always instanceof JsonValue, we need to accept Object @Connect(AbstractJavaScriptRenderer.class) -public class JavaScriptRendererConnector extends - AbstractRendererConnector<Object> implements - HasJavaScriptConnectorHelper { +public class JavaScriptRendererConnector + extends AbstractRendererConnector<Object> + implements HasJavaScriptConnectorHelper { private final JavaScriptConnectorHelper helper = new JavaScriptConnectorHelper( this); - private final JavaScriptObject cellReferenceWrapper = createCellReferenceWrapper(BrowserInfo - .get().isIE8()); + private final JavaScriptObject cellReferenceWrapper = createCellReferenceWrapper( + BrowserInfo.get().isIE8()); @Override protected void init() { @@ -137,9 +137,9 @@ public class JavaScriptRendererConnector extends helper.ensureJavascriptInited(); if (!hasFunction("render")) { - throw new RuntimeException("JavaScriptRenderer " - + helper.getInitFunctionName() - + " must have a function named 'render'"); + throw new RuntimeException( + "JavaScriptRenderer " + helper.getInitFunctionName() + + " must have a function named 'render'"); } final boolean hasInit = hasFunction("init"); @@ -221,8 +221,8 @@ public class JavaScriptRendererConnector extends @Override public Collection<String> getConsumedEvents() { if (hasGetConsumedEvents) { - JsArrayString events = getConsumedEvents(helper - .getConnectorWrapper()); + JsArrayString events = getConsumedEvents( + helper.getConnectorWrapper()); ArrayList<String> list = new ArrayList<String>( events.length()); diff --git a/client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java b/client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java index 5d00619995..d7e1580b7b 100644 --- a/client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java @@ -87,8 +87,8 @@ public class MultiSelectionModelConnector extends @OnStateChange("allSelected") void updateSelectAllCheckbox() { if (selectionModel.getSelectionColumnRenderer() != null) { - HeaderCell cell = getGrid().getDefaultHeaderRow().getCell( - getGrid().getColumn(0)); + HeaderCell cell = getGrid().getDefaultHeaderRow() + .getCell(getGrid().getColumn(0)); CheckBox widget = (CheckBox) cell.getWidget(); widget.setValue(getState().allSelected, false); } @@ -119,11 +119,12 @@ public class MultiSelectionModelConnector extends selectAll(); } }); - dataAvailable = getGrid().addDataAvailableHandler( - new DataAvailableHandler() { + dataAvailable = getGrid() + .addDataAvailableHandler(new DataAvailableHandler() { @Override - public void onDataAvailable(DataAvailableEvent event) { + public void onDataAvailable( + DataAvailableEvent event) { availableRows = event.getAvailableRows(); } }); @@ -156,7 +157,8 @@ public class MultiSelectionModelConnector extends assert !isBeingBatchSelected() : "Can't select all in middle of a batch selection."; DataSource<JsonObject> dataSource = getGrid().getDataSource(); - for (int i = availableRows.getStart(); i < availableRows.getEnd(); ++i) { + for (int i = availableRows.getStart(); i < availableRows + .getEnd(); ++i) { final JsonObject row = dataSource.getRow(i); if (row != null) { RowHandle<JsonObject> handle = dataSource.getHandle(row); @@ -202,7 +204,8 @@ public class MultiSelectionModelConnector extends assert !isBeingBatchSelected() : "Can't select all in middle of a batch selection."; DataSource<JsonObject> dataSource = getGrid().getDataSource(); - for (int i = availableRows.getStart(); i < availableRows.getEnd(); ++i) { + for (int i = availableRows.getStart(); i < availableRows + .getEnd(); ++i) { final JsonObject row = dataSource.getRow(i); if (row != null) { RowHandle<JsonObject> handle = dataSource.getHandle(row); @@ -300,8 +303,8 @@ public class MultiSelectionModelConnector extends * rows. Unpins any pinned rows. */ private void sendDeselected() { - getRpcProxy(MultiSelectionModelServerRpc.class).deselect( - getRowKeys(deselected)); + getRpcProxy(MultiSelectionModelServerRpc.class) + .deselect(getRowKeys(deselected)); if (isBeingBatchSelected()) { for (RowHandle<JsonObject> row : deselected) { @@ -317,8 +320,8 @@ public class MultiSelectionModelConnector extends * Unpins any pinned rows. */ private void sendSelected() { - getRpcProxy(MultiSelectionModelServerRpc.class).select( - getRowKeys(selected)); + getRpcProxy(MultiSelectionModelServerRpc.class) + .select(getRowKeys(selected)); if (isBeingBatchSelected()) { for (RowHandle<JsonObject> row : selected) { @@ -347,7 +350,8 @@ public class MultiSelectionModelConnector extends @Override public void startBatchSelect() { - assert selected.isEmpty() && deselected.isEmpty() : "Row caches were not clear."; + assert selected.isEmpty() + && deselected.isEmpty() : "Row caches were not clear."; batchSelect = true; } diff --git a/client/src/main/java/com/vaadin/client/connectors/NoSelectionModelConnector.java b/client/src/main/java/com/vaadin/client/connectors/NoSelectionModelConnector.java index b9f2d626c2..e0c88f5fa1 100644 --- a/client/src/main/java/com/vaadin/client/connectors/NoSelectionModelConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/NoSelectionModelConnector.java @@ -30,8 +30,8 @@ import elemental.json.JsonObject; * @author Vaadin Ltd */ @Connect(NoSelectionModel.class) -public class NoSelectionModelConnector extends - AbstractSelectionModelConnector<SelectionModel<JsonObject>> { +public class NoSelectionModelConnector + extends AbstractSelectionModelConnector<SelectionModel<JsonObject>> { @Override protected void extend(ServerConnector target) { diff --git a/client/src/main/java/com/vaadin/client/connectors/NumberRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/NumberRendererConnector.java index c044e0d6f1..98c4d64e9f 100644 --- a/client/src/main/java/com/vaadin/client/connectors/NumberRendererConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/NumberRendererConnector.java @@ -18,9 +18,8 @@ package com.vaadin.client.connectors; import com.vaadin.shared.ui.Connect; /** - * A connector for - * {@link com.vaadin.ui.components.grid.renderers.NumberRenderer NumberRenderer} - * . + * A connector for {@link com.vaadin.ui.components.grid.renderers.NumberRenderer + * NumberRenderer} . * <p> * The server-side Renderer operates on numbers, but the data is serialized as a * string, and displayed as-is on the client side. This is to be able to support diff --git a/client/src/main/java/com/vaadin/client/connectors/ProgressBarRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/ProgressBarRendererConnector.java index 9b5e8a9677..ea8215330b 100644 --- a/client/src/main/java/com/vaadin/client/connectors/ProgressBarRendererConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/ProgressBarRendererConnector.java @@ -25,8 +25,8 @@ import com.vaadin.shared.ui.Connect; * @author Vaadin Ltd */ @Connect(com.vaadin.ui.renderers.ProgressBarRenderer.class) -public class ProgressBarRendererConnector extends - AbstractRendererConnector<Double> { +public class ProgressBarRendererConnector + extends AbstractRendererConnector<Double> { @Override public ProgressBarRenderer getRenderer() { diff --git a/client/src/main/java/com/vaadin/client/connectors/RpcDataSourceConnector.java b/client/src/main/java/com/vaadin/client/connectors/RpcDataSourceConnector.java index d744bbc1c7..bd05ea0d34 100644 --- a/client/src/main/java/com/vaadin/client/connectors/RpcDataSourceConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/RpcDataSourceConnector.java @@ -133,8 +133,8 @@ public class RpcDataSourceConnector extends AbstractExtensionConnector { Range cached = getCachedRange(); - rpcProxy.requestRows(firstRowIndex, numberOfRows, - cached.getStart(), cached.length()); + rpcProxy.requestRows(firstRowIndex, numberOfRows, cached.getStart(), + cached.length()); /* * Show the progress indicator if there is a pending data request diff --git a/client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java b/client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java index fddf3865a2..0825db4d2f 100644 --- a/client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java @@ -78,8 +78,8 @@ public class SingleSelectionModelConnector extends /** * SingleSelectionModel without a selection column renderer. */ - public class SingleSelectionModel extends AbstractSelectionModel implements - SelectionModel.Single<JsonObject> { + public class SingleSelectionModel extends AbstractSelectionModel + implements SelectionModel.Single<JsonObject> { private RowHandle<JsonObject> selectedRow; private boolean deselectAllowed; @@ -110,8 +110,8 @@ public class SingleSelectionModelConnector extends // Check if currently re-selected row was deselected from // the server. if (row != null && getRowHandle(row).equals(selectedRow)) { - if (selectedRow.getRow().hasKey( - GridState.JSONKEY_SELECTED)) { + if (selectedRow.getRow() + .hasKey(GridState.JSONKEY_SELECTED)) { // Everything is OK, no need to do anything. return false; } @@ -130,8 +130,8 @@ public class SingleSelectionModelConnector extends } if (changed) { - getRpcProxy(SingleSelectionModelServerRpc.class).select( - getRowKey(row)); + getRpcProxy(SingleSelectionModelServerRpc.class) + .select(getRowKey(row)); } return changed; diff --git a/client/src/main/java/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java index 72d8db3c4a..e30f8dac99 100644 --- a/client/src/main/java/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java @@ -26,8 +26,8 @@ import com.vaadin.shared.ui.Connect; * @author Vaadin Ltd */ @Connect(com.vaadin.ui.renderers.HtmlRenderer.class) -public class UnsafeHtmlRendererConnector extends - AbstractRendererConnector<String> { +public class UnsafeHtmlRendererConnector + extends AbstractRendererConnector<String> { public static class UnsafeHtmlRenderer implements Renderer<String> { @Override diff --git a/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java b/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java index 05ac7182c5..e0c8612846 100644 --- a/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java +++ b/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java @@ -437,8 +437,10 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> { Range received = Range.withLength(firstRowIndex, rowData.size()); if (isWaitingForData()) { - cacheStrategy.onDataArrive(Duration.currentTimeMillis() - - currentRequestCallback.requestStart, received.length()); + cacheStrategy.onDataArrive( + Duration.currentTimeMillis() + - currentRequestCallback.requestStart, + received.length()); currentRequestCallback = null; } @@ -450,17 +452,20 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> { Range newUsefulData = partition[1]; if (!newUsefulData.isEmpty()) { // Update the parts that are actually inside - for (int i = newUsefulData.getStart(); i < newUsefulData.getEnd(); i++) { + for (int i = newUsefulData.getStart(); i < newUsefulData + .getEnd(); i++) { final T row = rowData.get(i - firstRowIndex); indexToRowMap.put(Integer.valueOf(i), row); keyToIndexMap.put(getRowKey(row), Integer.valueOf(i)); } if (dataChangeHandler != null) { - Profiler.enter("AbstractRemoteDataSource.setRowData notify dataChangeHandler"); + Profiler.enter( + "AbstractRemoteDataSource.setRowData notify dataChangeHandler"); dataChangeHandler.dataUpdated(newUsefulData.getStart(), newUsefulData.length()); - Profiler.leave("AbstractRemoteDataSource.setRowData notify dataChangeHandler"); + Profiler.leave( + "AbstractRemoteDataSource.setRowData notify dataChangeHandler"); } // Potentially extend the range @@ -552,8 +557,8 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> { // Removal and cache share some indices. fix accordingly. Range[] partitions = cached.partitionWith(removedRange); Range remainsBefore = partitions[0]; - Range transposedRemainsAfter = partitions[2].offsetBy(-removedRange - .length()); + Range transposedRemainsAfter = partitions[2] + .offsetBy(-removedRange.length()); cached = remainsBefore.combineWith(transposedRemainsAfter); } else if (removedRange.getEnd() <= cached.getStart()) { // Removal was before the cache. offset the cache. @@ -696,8 +701,8 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> { Object key = getRowKey(row); if (key == null) { - throw new NullPointerException("key may not be null (row: " + row - + ")"); + throw new NullPointerException( + "key may not be null (row: " + row + ")"); } if (pinnedRows.containsKey(key)) { diff --git a/client/src/main/java/com/vaadin/client/data/CacheStrategy.java b/client/src/main/java/com/vaadin/client/data/CacheStrategy.java index 79ce537314..37701bd785 100644 --- a/client/src/main/java/com/vaadin/client/data/CacheStrategy.java +++ b/client/src/main/java/com/vaadin/client/data/CacheStrategy.java @@ -46,8 +46,8 @@ public interface CacheStrategy { Range estimatedAvailableRange) { int cacheSize = getMinimumCacheSize(displayedRange.length()); - return displayedRange.expand(cacheSize, cacheSize).restrictTo( - estimatedAvailableRange); + return displayedRange.expand(cacheSize, cacheSize) + .restrictTo(estimatedAvailableRange); } @Override @@ -55,8 +55,8 @@ public interface CacheStrategy { Range estimatedAvailableRange) { int cacheSize = getMaximumCacheSize(displayedRange.length()); - return displayedRange.expand(cacheSize, cacheSize).restrictTo( - estimatedAvailableRange); + return displayedRange.expand(cacheSize, cacheSize) + .restrictTo(estimatedAvailableRange); } /** @@ -86,8 +86,8 @@ public interface CacheStrategy { * the cache and items are discarded if there's yet another page size worth * of items cached in either direction. */ - public static class DefaultCacheStrategy extends - AbstractBasicSymmetricalCacheStrategy { + public static class DefaultCacheStrategy + extends AbstractBasicSymmetricalCacheStrategy { private final int minimumRatio; private final int maximumRatio; diff --git a/client/src/main/java/com/vaadin/client/debug/internal/AnalyzeLayoutsPanel.java b/client/src/main/java/com/vaadin/client/debug/internal/AnalyzeLayoutsPanel.java index fc9f3856b5..45652e0257 100644 --- a/client/src/main/java/com/vaadin/client/debug/internal/AnalyzeLayoutsPanel.java +++ b/client/src/main/java/com/vaadin/client/debug/internal/AnalyzeLayoutsPanel.java @@ -68,8 +68,8 @@ public class AnalyzeLayoutsPanel extends FlowPanel { int size = valueMapArray.length(); if (size > 0) { - SimpleTree root = new SimpleTree("Layouts analyzed, " + size - + " top level problems"); + SimpleTree root = new SimpleTree( + "Layouts analyzed, " + size + " top level problems"); for (int i = 0; i < size; i++) { printLayoutError(ac, valueMapArray.get(i), root); } @@ -94,7 +94,8 @@ public class AnalyzeLayoutsPanel extends FlowPanel { printClientSideDetectedIssues(zeroHeightComponents, ac); } if (zeroWidthComponents.size() > 0) { - add(new HTML("<p><strong>Horizontally zero size:</strong></p>")); + add(new HTML( + "<p><strong>Horizontally zero size:</strong></p>")); printClientSideDetectedIssues(zeroWidthComponents, ac); } } @@ -111,12 +112,10 @@ public class AnalyzeLayoutsPanel extends FlowPanel { final ServerConnector parent = connector.getParent(); final String parentId = parent.getConnectorId(); - final Label errorDetails = new Label(connector.getClass() - .getSimpleName() - + "[" - + connector.getConnectorId() - + "]" - + " inside " + parent.getClass().getSimpleName()); + final Label errorDetails = new Label( + connector.getClass().getSimpleName() + "[" + + connector.getConnectorId() + "]" + " inside " + + parent.getClass().getSimpleName()); if (parent instanceof ComponentConnector) { final ComponentConnector parentConnector = (ComponentConnector) parent; @@ -173,8 +172,8 @@ public class AnalyzeLayoutsPanel extends FlowPanel { Highlight.show(connector); - final SimpleTree errorNode = new SimpleTree(connector.getClass() - .getSimpleName() + " id: " + pid); + final SimpleTree errorNode = new SimpleTree( + connector.getClass().getSimpleName() + " id: " + pid); errorNode.addDomHandler(new MouseOverHandler() { @Override public void onMouseOver(MouseOverEvent event) { @@ -205,12 +204,12 @@ public class AnalyzeLayoutsPanel extends FlowPanel { VerticalPanel errorDetails = new VerticalPanel(); if (valueMap.containsKey("heightMsg")) { - errorDetails.add(new Label("Height problem: " - + valueMap.getString("heightMsg"))); + errorDetails.add(new Label( + "Height problem: " + valueMap.getString("heightMsg"))); } if (valueMap.containsKey("widthMsg")) { - errorDetails.add(new Label("Width problem: " - + valueMap.getString("widthMsg"))); + errorDetails.add(new Label( + "Width problem: " + valueMap.getString("widthMsg"))); } if (errorDetails.getWidgetCount() > 0) { errorNode.add(errorDetails); diff --git a/client/src/main/java/com/vaadin/client/debug/internal/ConnectorInfoPanel.java b/client/src/main/java/com/vaadin/client/debug/internal/ConnectorInfoPanel.java index 5269d82bd6..554d13317f 100644 --- a/client/src/main/java/com/vaadin/client/debug/internal/ConnectorInfoPanel.java +++ b/client/src/main/java/com/vaadin/client/debug/internal/ConnectorInfoPanel.java @@ -57,13 +57,13 @@ public class ConnectorInfoPanel extends FlowPanel { if (connector instanceof ComponentConnector) { ComponentConnector component = (ComponentConnector) connector; - ignoreProperties.addAll(Arrays.asList("caption", "description", - "width", "height")); + ignoreProperties.addAll( + Arrays.asList("caption", "description", "width", "height")); AbstractComponentState componentState = component.getState(); - html += getRowHTML("Widget", component.getWidget().getClass() - .getSimpleName()); + html += getRowHTML("Widget", + component.getWidget().getClass().getSimpleName()); html += getRowHTML("Caption", componentState.caption); html += getRowHTML("Description", componentState.description); html += getRowHTML("Width", componentState.width + " (actual: " diff --git a/client/src/main/java/com/vaadin/client/debug/internal/DebugButton.java b/client/src/main/java/com/vaadin/client/debug/internal/DebugButton.java index f797197afb..23777823c0 100644 --- a/client/src/main/java/com/vaadin/client/debug/internal/DebugButton.java +++ b/client/src/main/java/com/vaadin/client/debug/internal/DebugButton.java @@ -44,7 +44,7 @@ public class DebugButton extends Button { public DebugButton(String caption) { this(null, null, caption); } - + public DebugButton(String caption, String title) { this(null, title, caption); } diff --git a/client/src/main/java/com/vaadin/client/debug/internal/ErrorNotificationHandler.java b/client/src/main/java/com/vaadin/client/debug/internal/ErrorNotificationHandler.java index 5d128cbdcc..adca5305ef 100644 --- a/client/src/main/java/com/vaadin/client/debug/internal/ErrorNotificationHandler.java +++ b/client/src/main/java/com/vaadin/client/debug/internal/ErrorNotificationHandler.java @@ -66,8 +66,8 @@ public class ErrorNotificationHandler extends Handler { .getRunningApplications().get(0); owner = connection.getUIConnector().getWidget(); } - VNotification n = VNotification.createNotification( - VNotification.DELAY_FOREVER, owner); + VNotification n = VNotification + .createNotification(VNotification.DELAY_FOREVER, owner); n.getElement().getStyle().setTextAlign(TextAlign.LEFT); n.show("<h1>Uncaught client side exception</h1><br />" + exceptionText.replace("\n", "<br/>\n"), diff --git a/client/src/main/java/com/vaadin/client/debug/internal/HierarchySection.java b/client/src/main/java/com/vaadin/client/debug/internal/HierarchySection.java index ffb4042e69..3557497be4 100644 --- a/client/src/main/java/com/vaadin/client/debug/internal/HierarchySection.java +++ b/client/src/main/java/com/vaadin/client/debug/internal/HierarchySection.java @@ -121,8 +121,8 @@ public class HierarchySection implements Section { stopFind(); connector.getConnection().getUIConnector() .showServerDesign(connector); - content.setWidget(new HTML( - "Design file for component sent to server log")); + content.setWidget( + new HTML("Design file for component sent to server log")); } }; @@ -334,17 +334,17 @@ public class HierarchySection implements Section { @Override public void onPreviewNativeEvent(NativePreviewEvent event) { - if (event.getTypeInt() == Event.ONKEYDOWN - && event.getNativeEvent().getKeyCode() == KeyCodes.KEY_ESCAPE) { + if (event.getTypeInt() == Event.ONKEYDOWN && event.getNativeEvent() + .getKeyCode() == KeyCodes.KEY_ESCAPE) { stopFind(); Highlight.hideAll(); return; } if (event.getTypeInt() == Event.ONMOUSEMOVE) { Highlight.hideAll(); - Element eventTarget = WidgetUtil.getElementFromPoint(event - .getNativeEvent().getClientX(), event.getNativeEvent() - .getClientY()); + Element eventTarget = WidgetUtil.getElementFromPoint( + event.getNativeEvent().getClientX(), + event.getNativeEvent().getClientY()); if (VDebugWindow.get().getElement().isOrHasChild(eventTarget)) { // Do not prevent using debug window controls @@ -376,9 +376,9 @@ public class HierarchySection implements Section { event.cancel(); event.consume(); event.getNativeEvent().stopPropagation(); - Element eventTarget = WidgetUtil.getElementFromPoint(event - .getNativeEvent().getClientX(), event.getNativeEvent() - .getClientY()); + Element eventTarget = WidgetUtil.getElementFromPoint( + event.getNativeEvent().getClientX(), + event.getNativeEvent().getClientY()); for (ApplicationConnection a : ApplicationConfiguration .getRunningApplications()) { ComponentConnector connector = Util.getConnectorForElement( diff --git a/client/src/main/java/com/vaadin/client/debug/internal/Highlight.java b/client/src/main/java/com/vaadin/client/debug/internal/Highlight.java index e91f4abcbb..74f1cabf02 100644 --- a/client/src/main/java/com/vaadin/client/debug/internal/Highlight.java +++ b/client/src/main/java/com/vaadin/client/debug/internal/Highlight.java @@ -204,8 +204,8 @@ public class Highlight { style.setBackgroundColor(color); style.setOpacity(DEFAULT_OPACITY); if (BrowserInfo.get().isIE()) { - style.setProperty("filter", "alpha(opacity=" - + (DEFAULT_OPACITY * 100) + ")"); + style.setProperty("filter", + "alpha(opacity=" + (DEFAULT_OPACITY * 100) + ")"); } highlights.add(highlight); diff --git a/client/src/main/java/com/vaadin/client/debug/internal/InfoSection.java b/client/src/main/java/com/vaadin/client/debug/internal/InfoSection.java index 39ff345cb1..034d921a37 100644 --- a/client/src/main/java/com/vaadin/client/debug/internal/InfoSection.java +++ b/client/src/main/java/com/vaadin/client/debug/internal/InfoSection.java @@ -165,8 +165,8 @@ public class InfoSection implements Section { addRow("Widget set", GWT.getModuleName()); addRow("Theme", connection.getUIConnector().getActiveTheme()); - String communicationMethodInfo = connection - .getMessageSender().getCommunicationMethodName(); + String communicationMethodInfo = connection.getMessageSender() + .getCommunicationMethodName(); int pollInterval = connection.getUIConnector().getState().pollInterval; if (pollInterval > 0) { communicationMethodInfo += " (poll interval " + pollInterval @@ -211,10 +211,10 @@ public class InfoSection implements Section { themeVersion); boolean servletOk = equalsEither(servletVersion, clientVersion, themeVersion); - addRow("Client engine version", clientVersion, clientOk ? null - : ERROR_STYLE); - addRow("Server engine version", servletVersion, servletOk ? null - : ERROR_STYLE); + addRow("Client engine version", clientVersion, + clientOk ? null : ERROR_STYLE); + addRow("Server engine version", servletVersion, + servletOk ? null : ERROR_STYLE); addRow("Theme version", themeVersion, themeOk ? null : ERROR_STYLE); if (jsVersion != null) { addRow("Push server version", atmosphereVersion); diff --git a/client/src/main/java/com/vaadin/client/debug/internal/LogSection.java b/client/src/main/java/com/vaadin/client/debug/internal/LogSection.java index 30abb4fff9..edbdf14ea3 100644 --- a/client/src/main/java/com/vaadin/client/debug/internal/LogSection.java +++ b/client/src/main/java/com/vaadin/client/debug/internal/LogSection.java @@ -61,7 +61,8 @@ public class LogSection implements Section { } @Override - protected String getRecordInfo(LogRecord event, String newline) { + protected String getRecordInfo(LogRecord event, + String newline) { return ""; } }); @@ -157,8 +158,8 @@ public class LogSection implements Section { public void onClick(ClickEvent event) { Element el = Element .as(event.getNativeEvent().getEventTarget()); - while (!el.getClassName().contains( - VDebugWindow.STYLENAME + "-message")) { + while (!el.getClassName() + .contains(VDebugWindow.STYLENAME + "-message")) { if (el == contentElement) { // clicked something else return; @@ -336,8 +337,8 @@ public class LogSection implements Section { + "'></span><span class='" + VDebugWindow.STYLENAME + "-time' title='" + VDebugWindow.getTimingTooltip(sinceStart, sinceReset) + "'>" - + sinceReset + "ms</span><span class='" - + VDebugWindow.STYLENAME + "-message'>" + msg + "</span>"; + + sinceReset + "ms</span><span class='" + VDebugWindow.STYLENAME + + "-message'>" + msg + "</span>"; row.setInnerHTML(inner); contentElement.appendChild(row); diff --git a/client/src/main/java/com/vaadin/client/debug/internal/NetworkSection.java b/client/src/main/java/com/vaadin/client/debug/internal/NetworkSection.java index 5b0579238f..deb1271348 100644 --- a/client/src/main/java/com/vaadin/client/debug/internal/NetworkSection.java +++ b/client/src/main/java/com/vaadin/client/debug/internal/NetworkSection.java @@ -84,8 +84,8 @@ public class NetworkSection implements Section { VUIDLBrowser vuidlBrowser = new VUIDLBrowser(uidl, ac); vuidlBrowser.addStyleName(VDebugWindow.STYLENAME + "-row"); vuidlBrowser.setText("Response @ " + sinceReset + "ms"); - vuidlBrowser.setTitle(VDebugWindow.getTimingTooltip(sinceStart, - sinceReset)); + vuidlBrowser.setTitle( + VDebugWindow.getTimingTooltip(sinceStart, sinceReset)); vuidlBrowser.close(); content.add(vuidlBrowser); diff --git a/client/src/main/java/com/vaadin/client/debug/internal/OptimizedWidgetsetPanel.java b/client/src/main/java/com/vaadin/client/debug/internal/OptimizedWidgetsetPanel.java index d9aad9e61b..9edb8c662f 100644 --- a/client/src/main/java/com/vaadin/client/debug/internal/OptimizedWidgetsetPanel.java +++ b/client/src/main/java/com/vaadin/client/debug/internal/OptimizedWidgetsetPanel.java @@ -95,8 +95,8 @@ public class OptimizedWidgetsetPanel extends FlowPanel { tag++; if (tag > 10000) { // Sanity check - getLogger() - .severe("Search for used connector classes was forcefully terminated"); + getLogger().severe( + "Search for used connector classes was forcefully terminated"); break; } } diff --git a/client/src/main/java/com/vaadin/client/debug/internal/ProfilerSection.java b/client/src/main/java/com/vaadin/client/debug/internal/ProfilerSection.java index 2851563884..c75df09fcf 100644 --- a/client/src/main/java/com/vaadin/client/debug/internal/ProfilerSection.java +++ b/client/src/main/java/com/vaadin/client/debug/internal/ProfilerSection.java @@ -69,13 +69,13 @@ public class ProfilerSection implements Section { SimpleTree offendersTree = new SimpleTree("Longest events"); for (int i = 0; i < totals.size() && i < 20; i++) { Node node = totals.get(i); - offendersTree.add(new Label(node - .getStringRepresentation(""))); + offendersTree + .add(new Label(node.getStringRepresentation(""))); } - SimpleTree root = new SimpleTree(eventCount - + " profiler events using " + Util.round(totalTime, 3) - + " ms"); + SimpleTree root = new SimpleTree( + eventCount + " profiler events using " + + Util.round(totalTime, 3) + " ms"); root.add(drillDownTree); root.add(offendersTree); root.open(false); @@ -85,12 +85,14 @@ public class ProfilerSection implements Section { } @Override - public void addBootstrapData(LinkedHashMap<String, Double> timings) { + public void addBootstrapData( + LinkedHashMap<String, Double> timings) { SimpleTree tree = new SimpleTree( "Time since window.performance.timing events"); Set<Entry<String, Double>> entrySet = timings.entrySet(); for (Entry<String, Double> entry : entrySet) { - tree.add(new Label(entry.getValue() + " " + entry.getKey())); + tree.add( + new Label(entry.getValue() + " " + entry.getKey())); } tree.open(false); diff --git a/client/src/main/java/com/vaadin/client/debug/internal/Section.java b/client/src/main/java/com/vaadin/client/debug/internal/Section.java index 876b9bbc27..5d0fd66d4f 100644 --- a/client/src/main/java/com/vaadin/client/debug/internal/Section.java +++ b/client/src/main/java/com/vaadin/client/debug/internal/Section.java @@ -31,7 +31,8 @@ public interface Section { * Returns a button that will be used to activate this section, displayed as * a tab in {@link VDebugWindow}. * <p> - * <em>The same instance <b>must</b> be returned each time this method is called.</em> + * <em>The same instance <b>must</b> be returned each time this method is + * called.</em> * </p> * <p> * The button should preferably only have an icon (no caption), and should diff --git a/client/src/main/java/com/vaadin/client/debug/internal/TestBenchSection.java b/client/src/main/java/com/vaadin/client/debug/internal/TestBenchSection.java index d0b6b10722..44c3373823 100644 --- a/client/src/main/java/com/vaadin/client/debug/internal/TestBenchSection.java +++ b/client/src/main/java/com/vaadin/client/debug/internal/TestBenchSection.java @@ -54,8 +54,8 @@ public class TestBenchSection implements Section { /** * Selector widget showing a selector in a program-usable form. */ - private static class SelectorWidget extends HTML implements - MouseOverHandler, MouseOutHandler { + private static class SelectorWidget extends HTML + implements MouseOverHandler, MouseOutHandler { private final SelectorPath path; public SelectorWidget(final SelectorPath path) { @@ -197,9 +197,9 @@ public class TestBenchSection implements Section { private void pickSelector(ServerConnector connector, Element element) { - SelectorPath p = new SelectorPath(connector, Util - .findPaintable(connector.getConnection(), element).getWidget() - .getElement()); + SelectorPath p = new SelectorPath(connector, + Util.findPaintable(connector.getConnection(), element) + .getWidget().getElement()); SelectorWidget w = new SelectorWidget(p); content.add(w); @@ -210,17 +210,17 @@ public class TestBenchSection implements Section { @Override public void onPreviewNativeEvent(NativePreviewEvent event) { - if (event.getTypeInt() == Event.ONKEYDOWN - && event.getNativeEvent().getKeyCode() == KeyCodes.KEY_ESCAPE) { + if (event.getTypeInt() == Event.ONKEYDOWN && event.getNativeEvent() + .getKeyCode() == KeyCodes.KEY_ESCAPE) { stopFind(); Highlight.hideAll(); return; } if (event.getTypeInt() == Event.ONMOUSEMOVE || event.getTypeInt() == Event.ONCLICK) { - Element eventTarget = WidgetUtil.getElementFromPoint(event - .getNativeEvent().getClientX(), event.getNativeEvent() - .getClientY()); + Element eventTarget = WidgetUtil.getElementFromPoint( + event.getNativeEvent().getClientX(), + event.getNativeEvent().getClientY()); if (VDebugWindow.get().getElement().isOrHasChild(eventTarget)) { if (isFindMode() && event.getTypeInt() == Event.ONCLICK) { stopFind(); @@ -232,9 +232,9 @@ public class TestBenchSection implements Section { // make sure that not finding the highlight element only Highlight.hideAll(); - eventTarget = WidgetUtil.getElementFromPoint(event - .getNativeEvent().getClientX(), event.getNativeEvent() - .getClientY()); + eventTarget = WidgetUtil.getElementFromPoint( + event.getNativeEvent().getClientX(), + event.getNativeEvent().getClientY()); ComponentConnector connector = findConnector(eventTarget); if (event.getTypeInt() == Event.ONMOUSEMOVE) { @@ -264,8 +264,8 @@ public class TestBenchSection implements Section { private ComponentConnector findConnector(Element element) { for (ApplicationConnection a : ApplicationConfiguration .getRunningApplications()) { - ComponentConnector connector = Util.getConnectorForElement(a, a - .getUIConnector().getWidget(), element); + ComponentConnector connector = Util.getConnectorForElement(a, + a.getUIConnector().getWidget(), element); if (connector == null) { connector = Util.getConnectorForElement(a, RootPanel.get(), element); diff --git a/client/src/main/java/com/vaadin/client/debug/internal/VDebugWindow.java b/client/src/main/java/com/vaadin/client/debug/internal/VDebugWindow.java index fbc838f861..5d7e1ba3ed 100644 --- a/client/src/main/java/com/vaadin/client/debug/internal/VDebugWindow.java +++ b/client/src/main/java/com/vaadin/client/debug/internal/VDebugWindow.java @@ -710,22 +710,23 @@ public final class VDebugWindow extends VOverlay { public void execute() { readStoredState(); - Window.addResizeHandler(new com.google.gwt.event.logical.shared.ResizeHandler() { - - Timer t = new Timer() { - @Override - public void run() { - applyPositionAndSize(); - } - }; - - @Override - public void onResize(ResizeEvent event) { - t.cancel(); - // TODO less - t.schedule(1000); - } - }); + Window.addResizeHandler( + new com.google.gwt.event.logical.shared.ResizeHandler() { + + Timer t = new Timer() { + @Override + public void run() { + applyPositionAndSize(); + } + }; + + @Override + public void onResize(ResizeEvent event) { + t.cancel(); + // TODO less + t.schedule(1000); + } + }); } }); } @@ -793,7 +794,8 @@ public final class VDebugWindow extends VOverlay { DebugButton[] modes = new DebugButton[] { new DebugButton(Icon.DEVMODE_OFF, "Debug only (causes page reload)"), - new DebugButton(Icon.DEVMODE_ON, "DevMode (causes page reload)"), + new DebugButton(Icon.DEVMODE_ON, + "DevMode (causes page reload)"), new DebugButton(Icon.DEVMODE_SUPER, "SuperDevMode (causes page reload)") }; diff --git a/client/src/main/java/com/vaadin/client/event/PointerEvent.java b/client/src/main/java/com/vaadin/client/event/PointerEvent.java index 71e73f945c..c544a286be 100644 --- a/client/src/main/java/com/vaadin/client/event/PointerEvent.java +++ b/client/src/main/java/com/vaadin/client/event/PointerEvent.java @@ -27,8 +27,8 @@ import com.google.gwt.event.shared.EventHandler; * * @since 7.2 */ -public abstract class PointerEvent<H extends EventHandler> extends - MouseEvent<H> { +public abstract class PointerEvent<H extends EventHandler> + extends MouseEvent<H> { enum EventType { PointerDown, PointerMove, PointerOut, PointerOver, PointerUp, PointerCancel; diff --git a/client/src/main/java/com/vaadin/client/event/PointerEventSupportImplIE10.java b/client/src/main/java/com/vaadin/client/event/PointerEventSupportImplIE10.java index 1de2f9722f..1b0e58c387 100644 --- a/client/src/main/java/com/vaadin/client/event/PointerEventSupportImplIE10.java +++ b/client/src/main/java/com/vaadin/client/event/PointerEventSupportImplIE10.java @@ -23,8 +23,8 @@ import com.vaadin.client.event.PointerEvent.EventType; * @since 7.2 * @author Vaadin Ltd */ -public class PointerEventSupportImplIE10 extends - PointerEventSupportImplModernIE { +public class PointerEventSupportImplIE10 + extends PointerEventSupportImplModernIE { @Override public String getNativeEventName(EventType eventName) { diff --git a/client/src/main/java/com/vaadin/client/event/PointerEventSupportImplModernIE.java b/client/src/main/java/com/vaadin/client/event/PointerEventSupportImplModernIE.java index 851c600bcb..57b822b24a 100644 --- a/client/src/main/java/com/vaadin/client/event/PointerEventSupportImplModernIE.java +++ b/client/src/main/java/com/vaadin/client/event/PointerEventSupportImplModernIE.java @@ -50,8 +50,8 @@ public class PointerEventSupportImplModernIE extends PointerEventSupportImpl { } DOMImplStandard .addBitlessEventDispatchers(eventDispatcherMapExtensions); - DOMImplStandard - .addCaptureEventDispatchers(captureEventDispatcherMapExtensions); + DOMImplStandard.addCaptureEventDispatchers( + captureEventDispatcherMapExtensions); inited = true; } diff --git a/client/src/main/java/com/vaadin/client/extensions/BrowserWindowOpenerConnector.java b/client/src/main/java/com/vaadin/client/extensions/BrowserWindowOpenerConnector.java index 11e3e80a14..ca17e84ea4 100644 --- a/client/src/main/java/com/vaadin/client/extensions/BrowserWindowOpenerConnector.java +++ b/client/src/main/java/com/vaadin/client/extensions/BrowserWindowOpenerConnector.java @@ -68,7 +68,8 @@ public class BrowserWindowOpenerConnector extends AbstractExtensionConnector if (!getState().parameters.isEmpty()) { StringBuilder params = new StringBuilder(); - for (Entry<String, String> entry : getState().parameters.entrySet()) { + for (Entry<String, String> entry : getState().parameters + .entrySet()) { if (params.length() != 0) { params.append('&'); } diff --git a/client/src/main/java/com/vaadin/client/extensions/ResponsiveConnector.java b/client/src/main/java/com/vaadin/client/extensions/ResponsiveConnector.java index ae330be8f4..c5fafd1cd9 100644 --- a/client/src/main/java/com/vaadin/client/extensions/ResponsiveConnector.java +++ b/client/src/main/java/com/vaadin/client/extensions/ResponsiveConnector.java @@ -40,8 +40,8 @@ import com.vaadin.shared.util.SharedUtil; */ @SuppressWarnings("GwtInconsistentSerializableClass") @Connect(Responsive.class) -public class ResponsiveConnector extends AbstractExtensionConnector implements - ElementResizeListener { +public class ResponsiveConnector extends AbstractExtensionConnector + implements ElementResizeListener { /** * The target component which we will monitor for width changes @@ -166,26 +166,26 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements */ private static native void searchForBreakPointsNative() /*-{ - + // Initialize variables @com.vaadin.client.extensions.ResponsiveConnector::widthRangeCache = []; @com.vaadin.client.extensions.ResponsiveConnector::heightRangeCache = []; - + var widthRanges = @com.vaadin.client.extensions.ResponsiveConnector::widthRangeCache; var heightRanges = @com.vaadin.client.extensions.ResponsiveConnector::heightRangeCache; - + // Can't do squat if we can't parse stylesheets if(!$doc.styleSheets) return; - + var sheets = $doc.styleSheets; - + // Loop all stylesheets on the page and process them individually for(var i = 0, len = sheets.length; i < len; i++) { var sheet = sheets[i]; @com.vaadin.client.extensions.ResponsiveConnector::searchStylesheetForBreakPoints(Lcom/google/gwt/core/client/JavaScriptObject;)(sheet); } - + }-*/; /** @@ -198,16 +198,16 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements private static native void searchStylesheetForBreakPoints( final JavaScriptObject sheet) /*-{ - + // Inline variables for easier reading var widthRanges = @com.vaadin.client.extensions.ResponsiveConnector::widthRangeCache; var heightRanges = @com.vaadin.client.extensions.ResponsiveConnector::heightRangeCache; - + // Get all the rulesets from the stylesheet var theRules = new Array(); var IEOrEdge = @com.vaadin.client.BrowserInfo::get()().@com.vaadin.client.BrowserInfo::isIE()() || @com.vaadin.client.BrowserInfo::get()().@com.vaadin.client.BrowserInfo::isEdge()(); var IE8 = @com.vaadin.client.BrowserInfo::get()().@com.vaadin.client.BrowserInfo::isIE8()(); - + try { if (sheet.cssRules) { theRules = sheet.cssRules @@ -220,7 +220,7 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements ", probably because of cross domain issues: " + e); return; } - + // Special import handling for IE8 if (IE8) { try { @@ -232,18 +232,18 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements @com.vaadin.client.extensions.ResponsiveConnector::error(Ljava/lang/String;)("Failed to handle imports of CSS style sheet: " + sheet.href); } } - + // Loop through the rulesets for(var i = 0, len = theRules.length; i < len; i++) { var rule = theRules[i]; - + if(rule.type == 3) { // @import rule, traverse recursively @com.vaadin.client.extensions.ResponsiveConnector::searchStylesheetForBreakPoints(Lcom/google/gwt/core/client/JavaScriptObject;)(rule.styleSheet); - + } else if(rule.type == 1 ||Â !rule.type) { // Regular selector rule - + // Helper function var pushToCache = function(ranges, selector, min, max) { // Avoid adding duplicates @@ -259,13 +259,13 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements ranges.push([selector, min, max]); } }; - + // Array of all of the separate selectors in this ruleset var haystack = rule.selectorText.split(","); - + // IE/Edge parses CSS like .class[attr="val"] into [attr="val"].class so we need to check for both var selectorRegEx = IEOrEdge ? /\[.*\]([\.|#]\S+)/ : /([\.|#]\S+?)\[.*\]/; - + // Loop all the selectors in this ruleset for(var k = 0, len2 = haystack.length; k < len2; k++) { @@ -273,7 +273,7 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements var widthRange = haystack[k].match(/\[width-range.*?\]/); var heightRange = haystack[k].match(/\[height-range.*?\]/); var selector = haystack[k].match(selectorRegEx); - + if (selector != null) { selector = selector[1]; @@ -285,7 +285,7 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements pushToCache(widthRanges, selector, min, max); } - + // Check for height-ranges. if (heightRange != null) { var minMax = heightRange[0].match(/\[height-range~?=["|'](.*?)-(.*?)["|']\]/i); @@ -298,7 +298,7 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements } } } - + }-*/; /** @@ -308,15 +308,15 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements */ private native void getBreakPointsFor(final String selectors) /*-{ - + var selectors = selectors.split(","); - + var widthBreakpoints = this.@com.vaadin.client.extensions.ResponsiveConnector::widthBreakpoints = []; var heightBreakpoints = this.@com.vaadin.client.extensions.ResponsiveConnector::heightBreakpoints = []; - + var widthRanges = @com.vaadin.client.extensions.ResponsiveConnector::widthRangeCache; var heightRanges = @com.vaadin.client.extensions.ResponsiveConnector::heightRangeCache; - + for(var i = 0, len = widthRanges.length; i < len; i++) { var bp = widthRanges[i]; for(var j = 0, len2 = selectors.length; j < len2; j++) { @@ -324,7 +324,7 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements widthBreakpoints.push(bp); } } - + for(var i = 0, len = heightRanges.length; i < len; i++) { var bp = heightRanges[i]; for(var j = 0, len2 = selectors.length; j < len2; j++) { @@ -332,10 +332,10 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements heightBreakpoints.push(bp); } } - + // Only for debugging // console.log("Breakpoints for", selectors.join(","), widthBreakpoints, heightBreakpoints); - + }-*/; private String currentWidthRanges = ""; @@ -386,8 +386,8 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements // case some new styles are applied if (!currentWidthRanges.equals(oldWidthRanges) || !currentHeightRanges.equals(oldHeightRanges)) { - layoutManager - .setNeedsMeasureRecursively(ResponsiveConnector.this.target); + layoutManager.setNeedsMeasureRecursively( + ResponsiveConnector.this.target); } } @@ -408,24 +408,24 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements private native String resolveBreakpoint(String which, int size) /*-{ - + // Default to "width" breakpoints var breakpoints = this.@com.vaadin.client.extensions.ResponsiveConnector::widthBreakpoints; - + // Use height breakpoints if we're measuring the height if(which == "height") breakpoints = this.@com.vaadin.client.extensions.ResponsiveConnector::heightBreakpoints; - + // Output string that goes into either the "width-range" or "height-range" attribute in the element var ranges = ""; - + // Loop the breakpoints for(var i = 0, len = breakpoints.length; i < len; i++) { var bp = breakpoints[i]; - + var min = parseInt(bp[1]); var max = parseInt(bp[2]); - + if(!isNaN(min) && !isNaN(max)) { if(min <= size && size <= max) { ranges += " " + bp[1] + "-" + bp[2]; @@ -440,10 +440,10 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements } } } - + // Trim the output and return it return ranges.replace(/^\s+/, ""); - + }-*/; } diff --git a/client/src/main/java/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java b/client/src/main/java/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java index 364b948573..ece6d560e9 100644 --- a/client/src/main/java/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java +++ b/client/src/main/java/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java @@ -104,7 +104,7 @@ public class JavaScriptManagerConnector extends AbstractExtensionConnector { } target = target[part]; } - + $wnd.console.log('removing',parts[parts.length - 1],'from',target); delete target[parts[parts.length - 1]]; }-*/; diff --git a/client/src/main/java/com/vaadin/client/legacy/ui/VLegacyTextField.java b/client/src/main/java/com/vaadin/client/legacy/ui/VLegacyTextField.java index bcd4f85be9..7c8520f658 100644 --- a/client/src/main/java/com/vaadin/client/legacy/ui/VLegacyTextField.java +++ b/client/src/main/java/com/vaadin/client/legacy/ui/VLegacyTextField.java @@ -46,8 +46,8 @@ import com.vaadin.shared.legacy.ui.textfield.LegacyTextFieldConstants; * */ @Deprecated -public class VLegacyTextField extends TextBoxBase implements Field, ChangeHandler, - FocusHandler, BlurHandler, KeyDownHandler { +public class VLegacyTextField extends TextBoxBase implements Field, + ChangeHandler, FocusHandler, BlurHandler, KeyDownHandler { /** * The input node CSS classname. diff --git a/client/src/main/java/com/vaadin/client/metadata/ConnectorBundleLoader.java b/client/src/main/java/com/vaadin/client/metadata/ConnectorBundleLoader.java index e67fee96cf..9a02912b6c 100644 --- a/client/src/main/java/com/vaadin/client/metadata/ConnectorBundleLoader.java +++ b/client/src/main/java/com/vaadin/client/metadata/ConnectorBundleLoader.java @@ -102,8 +102,8 @@ public abstract class ConnectorBundleLoader { public boolean isBundleLoaded(String bundleName) { AsyncBundleLoader loader = asyncBlockLoaders.get(bundleName); if (loader == null) { - throw new IllegalArgumentException("Bundle " + bundleName - + " not recognized"); + throw new IllegalArgumentException( + "Bundle " + bundleName + " not recognized"); } return loader.getState() == State.LOADED; } diff --git a/client/src/main/java/com/vaadin/client/metadata/OnStateChangeMethod.java b/client/src/main/java/com/vaadin/client/metadata/OnStateChangeMethod.java index 47749fcd52..fd325b53cb 100644 --- a/client/src/main/java/com/vaadin/client/metadata/OnStateChangeMethod.java +++ b/client/src/main/java/com/vaadin/client/metadata/OnStateChangeMethod.java @@ -70,8 +70,8 @@ public class OnStateChangeMethod { this.methodName = methodName; - this.properties = Collections.unmodifiableList(Arrays - .asList(properties)); + this.properties = Collections + .unmodifiableList(Arrays.asList(properties)); this.declaringClass = declaringClass; } @@ -95,8 +95,10 @@ public class OnStateChangeMethod { try { declaringType.getMethod(methodName).invoke(connector); } catch (NoDataException e) { - throw new RuntimeException("Couldn't invoke @OnStateChange method " - + declaringType.getSignature() + "." + methodName, e); + throw new RuntimeException( + "Couldn't invoke @OnStateChange method " + + declaringType.getSignature() + "." + methodName, + e); } } diff --git a/client/src/main/java/com/vaadin/client/metadata/Property.java b/client/src/main/java/com/vaadin/client/metadata/Property.java index 90b29b32b7..abaaab8fed 100644 --- a/client/src/main/java/com/vaadin/client/metadata/Property.java +++ b/client/src/main/java/com/vaadin/client/metadata/Property.java @@ -105,8 +105,8 @@ public class Property { /** * Gets the property name formatted for displaying in a user interface. This - * returns a string where e.g. "camelCase" has been converted to - * "Camel case". + * returns a string where e.g. "camelCase" has been converted to "Camel + * case". * * @return the name of this property, formatted for humans to read */ diff --git a/client/src/main/java/com/vaadin/client/metadata/Type.java b/client/src/main/java/com/vaadin/client/metadata/Type.java index 15617ffe3c..d863bed78b 100644 --- a/client/src/main/java/com/vaadin/client/metadata/Type.java +++ b/client/src/main/java/com/vaadin/client/metadata/Type.java @@ -80,7 +80,8 @@ public class Type { return new Property(this, propertyName); } - private static String calculateSignature(String name, Type[] parameterTypes) { + private static String calculateSignature(String name, + Type[] parameterTypes) { String string = name; if (parameterTypes != null && parameterTypes.length != 0) { string += '<'; diff --git a/client/src/main/java/com/vaadin/client/metadata/TypeDataStore.java b/client/src/main/java/com/vaadin/client/metadata/TypeDataStore.java index e3c1c8392a..c6f8a08695 100644 --- a/client/src/main/java/com/vaadin/client/metadata/TypeDataStore.java +++ b/client/src/main/java/com/vaadin/client/metadata/TypeDataStore.java @@ -74,8 +74,8 @@ public class TypeDataStore { public static Class<?> getClass(String identifier) throws NoDataException { Class<?> class1 = get().identifiers.get(identifier); if (class1 == null) { - throw new NoDataException("There is not class for identifier " - + identifier); + throw new NoDataException( + "There is not class for identifier " + identifier); } return class1; } @@ -103,8 +103,8 @@ public class TypeDataStore { public static Type getReturnType(Method method) throws NoDataException { Type type = get().returnTypes.get(method.getLookupKey()); if (type == null) { - throw new NoDataException("There is no return type for " - + method.getSignature()); + throw new NoDataException( + "There is no return type for " + method.getSignature()); } return type; } @@ -112,26 +112,27 @@ public class TypeDataStore { public static Invoker getInvoker(Method method) throws NoDataException { Invoker invoker = get().invokers.get(method.getLookupKey()); if (invoker == null) { - throw new NoDataException("There is no invoker for " - + method.getSignature()); + throw new NoDataException( + "There is no invoker for " + method.getSignature()); } return invoker; } public static Invoker getConstructor(Type type) throws NoDataException { - Invoker invoker = get().invokers.get(new Method(type, CONSTRUCTOR_NAME) - .getLookupKey()); + Invoker invoker = get().invokers + .get(new Method(type, CONSTRUCTOR_NAME).getLookupKey()); if (invoker == null) { - throw new NoDataException("There is no constructor for " - + type.getSignature()); + throw new NoDataException( + "There is no constructor for " + type.getSignature()); } return invoker; } public static Object getValue(Property property, Object target) throws NoDataException { - return getJsPropertyValue(get().jsTypeData, property.getBeanType() - .getBaseTypeName(), property.getName(), target); + return getJsPropertyValue(get().jsTypeData, + property.getBeanType().getBaseTypeName(), property.getName(), + target); } public static String getDelegateToWidget(Property property) { @@ -151,8 +152,8 @@ public class TypeDataStore { Type type = getType(clazz); delegateToWidget.put(new Property(type, propertyName).getLookupKey(), delegateValue); - JsArrayString typeProperties = delegateToWidgetProperties.get(type - .getBaseTypeName()); + JsArrayString typeProperties = delegateToWidgetProperties + .get(type.getBaseTypeName()); if (typeProperties == null) { typeProperties = JavaScriptObject.createArray().cast(); delegateToWidgetProperties.put(type.getBaseTypeName(), @@ -166,7 +167,8 @@ public class TypeDataStore { getType(presentationType)); } - public void setReturnType(Class<?> type, String methodName, Type returnType) { + public void setReturnType(Class<?> type, String methodName, + Type returnType) { returnTypes.put(new Method(getType(type), methodName).getLookupKey(), returnType); } @@ -202,11 +204,11 @@ public class TypeDataStore { public static ProxyHandler getProxyHandler(Type type) throws NoDataException { - ProxyHandler proxyHandler = get().proxyHandlers.get(type - .getBaseTypeName()); + ProxyHandler proxyHandler = get().proxyHandlers + .get(type.getBaseTypeName()); if (proxyHandler == null) { - throw new NoDataException("No proxy handler for " - + type.getSignature()); + throw new NoDataException( + "No proxy handler for " + type.getSignature()); } return proxyHandler; } @@ -225,8 +227,8 @@ public class TypeDataStore { private static boolean hasMethodAttribute(Method method, MethodAttribute attribute) { - FastStringSet attributes = get().methodAttributes.get(method - .getLookupKey()); + FastStringSet attributes = get().methodAttributes + .get(method.getLookupKey()); return attributes != null && attributes.contains(attribute.name()); } @@ -282,17 +284,20 @@ public class TypeDataStore { } public static Type getType(Property property) throws NoDataException { - return getJsPropertyType(get().jsTypeData, property.getBeanType() - .getBaseTypeName(), property.getName()); + return getJsPropertyType(get().jsTypeData, + property.getBeanType().getBaseTypeName(), property.getName()); } - public void setPropertyType(Class<?> clazz, String propertyName, Type type) { + public void setPropertyType(Class<?> clazz, String propertyName, + Type type) { setJsPropertyType(jsTypeData, clazz.getName(), propertyName, type); } - public static void setValue(Property property, Object target, Object value) { - setJsPropertyValue(get().jsTypeData, property.getBeanType() - .getBaseTypeName(), property.getName(), target, value); + public static void setValue(Property property, Object target, + Object value) { + setJsPropertyValue(get().jsTypeData, + property.getBeanType().getBaseTypeName(), property.getName(), + target, value); } public void setSerializerFactory(Class<?> clazz, Invoker factory) { @@ -300,8 +305,8 @@ public class TypeDataStore { } public static JSONSerializer<?> findSerializer(Type type) { - Invoker factoryCreator = get().serializerFactories.get(type - .getBaseTypeName()); + Invoker factoryCreator = get().serializerFactories + .get(type.getBaseTypeName()); if (factoryCreator == null) { return null; } @@ -313,8 +318,8 @@ public class TypeDataStore { } public void setSuperClass(Class<?> baseClass, Class<?> superClass) { - String superClassName = superClass == null ? null : superClass - .getName(); + String superClassName = superClass == null ? null + : superClass.getName(); setSuperClass(jsTypeData, baseClass.getName(), superClassName); } @@ -324,7 +329,8 @@ public class TypeDataStore { } private static native void setPropertyData(JavaScriptObject typeData, - String className, String propertyName, JavaScriptObject propertyData) + String className, String propertyName, + JavaScriptObject propertyData) /*-{ typeData[className][propertyName] = propertyData; }-*/; @@ -437,7 +443,8 @@ public class TypeDataStore { */ public void addOnStateChangeMethod(Class<?> clazz, OnStateChangeMethod method) { - FastStringMap<JsArrayObject<OnStateChangeMethod>> handlers = getOnStateChangeMethods(clazz); + FastStringMap<JsArrayObject<OnStateChangeMethod>> handlers = getOnStateChangeMethods( + clazz); if (handlers == null) { handlers = FastStringMap.create(); onStateChangeMethods.put(getType(clazz).getSignature(), handlers); @@ -482,7 +489,7 @@ public class TypeDataStore { * otherwise <code>false</code> */ public static boolean isNoLayoutProperty(Property property) { - return hasNoLayout(get().jsTypeData, property.getBeanType() - .getSignature(), property.getName()); + return hasNoLayout(get().jsTypeData, + property.getBeanType().getSignature(), property.getName()); } } diff --git a/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java b/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java index caffc521d1..91f02a019d 100644 --- a/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java +++ b/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java @@ -49,8 +49,8 @@ import com.vaadin.shared.ui.grid.GridConstants.Section; * @since 7.4 * @author Vaadin Ltd */ -public abstract class ClickableRenderer<T, W extends Widget> extends - WidgetRenderer<T, W> implements ClickHandler { +public abstract class ClickableRenderer<T, W extends Widget> + extends WidgetRenderer<T, W> implements ClickHandler { /** * A handler for {@link RendererClickEvent renderer click events}. @@ -79,8 +79,8 @@ public abstract class ClickableRenderer<T, W extends Widget> extends * the row type of the containing Grid */ @SuppressWarnings("rawtypes") - public static class RendererClickEvent<R> extends - MouseEvent<RendererClickHandler> { + public static class RendererClickEvent<R> + extends MouseEvent<RendererClickHandler> { @SuppressWarnings("unchecked") static final Type<RendererClickHandler> TYPE = new Type<RendererClickHandler>( @@ -213,7 +213,8 @@ public abstract class ClickableRenderer<T, W extends Widget> extends * @param handler * the click handler to be added */ - public HandlerRegistration addClickHandler(RendererClickHandler<?> handler) { + public HandlerRegistration addClickHandler( + RendererClickHandler<?> handler) { if (handlerManager == null) { handlerManager = new HandlerManager(this); } diff --git a/client/src/main/java/com/vaadin/client/renderers/DateRenderer.java b/client/src/main/java/com/vaadin/client/renderers/DateRenderer.java index 4d15fac724..c0a0d2a322 100644 --- a/client/src/main/java/com/vaadin/client/renderers/DateRenderer.java +++ b/client/src/main/java/com/vaadin/client/renderers/DateRenderer.java @@ -34,8 +34,8 @@ public class DateRenderer implements Renderer<Date> { // Calendar is unavailable for GWT @SuppressWarnings("deprecation") - private TimeZone timeZone = TimeZone.createTimeZone(new Date() - .getTimezoneOffset()); + private TimeZone timeZone = TimeZone + .createTimeZone(new Date().getTimezoneOffset()); public DateRenderer() { this(PredefinedFormat.DATE_TIME_SHORT); @@ -59,8 +59,8 @@ public class DateRenderer implements Renderer<Date> { * Gets the format of how the date is formatted. * * @return the format - * @see <a - * href="http://www.gwtproject.org/javadoc/latest/com/google/gwt/i18n/shared/DateTimeFormat.html">GWT + * @see <a href= + * "http://www.gwtproject.org/javadoc/latest/com/google/gwt/i18n/shared/DateTimeFormat.html">GWT * documentation on DateTimeFormat</a> */ public DateTimeFormat getFormat() { @@ -72,8 +72,8 @@ public class DateRenderer implements Renderer<Date> { * * @param format * the format to set - * @see <a - * href="http://www.gwtproject.org/javadoc/latest/com/google/gwt/i18n/shared/DateTimeFormat.html">GWT + * @see <a href= + * "http://www.gwtproject.org/javadoc/latest/com/google/gwt/i18n/shared/DateTimeFormat.html">GWT * documentation on DateTimeFormat</a> */ public void setFormat(DateTimeFormat format) { diff --git a/client/src/main/java/com/vaadin/client/renderers/HtmlRenderer.java b/client/src/main/java/com/vaadin/client/renderers/HtmlRenderer.java index ec6dc761f6..13366f784f 100644 --- a/client/src/main/java/com/vaadin/client/renderers/HtmlRenderer.java +++ b/client/src/main/java/com/vaadin/client/renderers/HtmlRenderer.java @@ -35,7 +35,7 @@ public class HtmlRenderer implements Renderer<String> { @Override public void render(RendererCellReference cell, String htmlString) { - cell.getElement().setInnerSafeHtml( - SafeHtmlUtils.fromSafeConstant(htmlString)); + cell.getElement() + .setInnerSafeHtml(SafeHtmlUtils.fromSafeConstant(htmlString)); } } diff --git a/client/src/main/java/com/vaadin/client/renderers/WidgetRenderer.java b/client/src/main/java/com/vaadin/client/renderers/WidgetRenderer.java index d7219e7241..953662aa7f 100644 --- a/client/src/main/java/com/vaadin/client/renderers/WidgetRenderer.java +++ b/client/src/main/java/com/vaadin/client/renderers/WidgetRenderer.java @@ -30,8 +30,8 @@ import com.vaadin.client.widget.grid.RendererCellReference; * @param <W> * the Widget type */ -public abstract class WidgetRenderer<T, W extends Widget> extends - ComplexRenderer<T> { +public abstract class WidgetRenderer<T, W extends Widget> + extends ComplexRenderer<T> { @Override public void init(RendererCellReference cell) { @@ -50,8 +50,8 @@ public abstract class WidgetRenderer<T, W extends Widget> extends @Override public void render(RendererCellReference cell, T data) { W w = getWidget(cell.getElement()); - assert w != null : "Widget not found in cell (" + cell.getColumn() - + "," + cell.getRow() + ")"; + assert w != null : "Widget not found in cell (" + cell.getColumn() + "," + + cell.getRow() + ")"; render(cell, data, w); } @@ -105,7 +105,8 @@ public abstract class WidgetRenderer<T, W extends Widget> extends protected static <W extends Widget> W getWidget(TableCellElement e, Class<W> klass) { W w = WidgetUtil.findWidget(e.getFirstChildElement(), klass); - assert w == null || w.getElement() == e.getFirstChildElement() : "Widget not found inside cell"; + assert w == null || w.getElement() == e + .getFirstChildElement() : "Widget not found inside cell"; return w; } } diff --git a/client/src/main/java/com/vaadin/client/ui/AbstractClickEventHandler.java b/client/src/main/java/com/vaadin/client/ui/AbstractClickEventHandler.java index a2c54ec7ca..e7409e0ba3 100644 --- a/client/src/main/java/com/vaadin/client/ui/AbstractClickEventHandler.java +++ b/client/src/main/java/com/vaadin/client/ui/AbstractClickEventHandler.java @@ -171,8 +171,8 @@ public abstract class AbstractClickEventHandler implements MouseDownHandler, * When getting a mousedown event, we must detect where the * corresponding mouseup event if it's on a different part of the page. */ - lastMouseDownTarget = WidgetUtil.getElementUnderMouse(event - .getNativeEvent()); + lastMouseDownTarget = WidgetUtil + .getElementUnderMouse(event.getNativeEvent()); mouseUpPreviewMatched = false; mouseUpEventPreviewRegistration = Event .addNativePreviewHandler(mouseUpPreviewHandler); @@ -186,10 +186,10 @@ public abstract class AbstractClickEventHandler implements MouseDownHandler, * but we can't fire the even there as the event might get canceled * before it gets here. */ - if (hasEventListener() - && mouseUpPreviewMatched + if (hasEventListener() && mouseUpPreviewMatched && lastMouseDownTarget != null - && WidgetUtil.getElementUnderMouse(event.getNativeEvent()) == lastMouseDownTarget + && WidgetUtil.getElementUnderMouse( + event.getNativeEvent()) == lastMouseDownTarget && shouldFireEvent(event)) { // "Click" with left, right or middle button fireClick(event.getNativeEvent()); diff --git a/client/src/main/java/com/vaadin/client/ui/AbstractComponentConnector.java b/client/src/main/java/com/vaadin/client/ui/AbstractComponentConnector.java index e040386e63..5879ac8208 100644 --- a/client/src/main/java/com/vaadin/client/ui/AbstractComponentConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/AbstractComponentConnector.java @@ -104,18 +104,19 @@ public abstract class AbstractComponentConnector extends AbstractConnector @OnStateChange("registeredEventListeners") void handleContextClickListenerChange() { if (contextHandler == null && hasEventListener(EventId.CONTEXT_CLICK)) { - contextHandler = getWidget().addDomHandler( - new ContextMenuHandler() { + contextHandler = getWidget() + .addDomHandler(new ContextMenuHandler() { @Override public void onContextMenu(ContextMenuEvent event) { - final MouseEventDetails mouseEventDetails = MouseEventDetailsBuilder.buildMouseEventDetails( - event.getNativeEvent(), getWidget() - .getElement()); + final MouseEventDetails mouseEventDetails = MouseEventDetailsBuilder + .buildMouseEventDetails( + event.getNativeEvent(), + getWidget().getElement()); event.preventDefault(); event.stopPropagation(); - sendContextClickEvent(mouseEventDetails, event - .getNativeEvent().getEventTarget()); + sendContextClickEvent(mouseEventDetails, + event.getNativeEvent().getEventTarget()); } }, ContextMenuEvent.getType()); @@ -196,8 +197,9 @@ public abstract class AbstractComponentConnector extends AbstractConnector * this was the case with iOS devices. */ - final MouseEventDetails mouseEventDetails = MouseEventDetailsBuilder.buildMouseEventDetails( - event.getNativeEvent(), getWidget().getElement()); + final MouseEventDetails mouseEventDetails = MouseEventDetailsBuilder + .buildMouseEventDetails(event.getNativeEvent(), + getWidget().getElement()); final EventTarget eventTarget = event.getNativeEvent() .getEventTarget(); @@ -364,7 +366,8 @@ public abstract class AbstractComponentConnector extends AbstractConnector + getClass().getSimpleName() + ". This might be caused by explicitely using " + "super.createWidget() or some unspecified " - + "problem with the widgetset compilation.", e); + + "problem with the widgetset compilation.", + e); } } @@ -419,7 +422,8 @@ public abstract class AbstractComponentConnector extends AbstractConnector * first setting tabindex, then enabled state (through super * implementation). */ - Profiler.enter("AbstractComponentConnector.onStateChanged update tab index"); + Profiler.enter( + "AbstractComponentConnector.onStateChanged update tab index"); if (getState() instanceof TabIndexState) { if (getWidget() instanceof Focusable) { ((Focusable) getWidget()) @@ -434,27 +438,35 @@ public abstract class AbstractComponentConnector extends AbstractConnector // + " which does not implement Focusable"); } } - Profiler.leave("AbstractComponentConnector.onStateChanged update tab index"); + Profiler.leave( + "AbstractComponentConnector.onStateChanged update tab index"); - Profiler.enter("AbstractComponentConnector.onStateChanged AbstractConnector.onStateChanged()"); + Profiler.enter( + "AbstractComponentConnector.onStateChanged AbstractConnector.onStateChanged()"); super.onStateChanged(stateChangeEvent); - Profiler.leave("AbstractComponentConnector.onStateChanged AbstractConnector.onStateChanged()"); + Profiler.leave( + "AbstractComponentConnector.onStateChanged AbstractConnector.onStateChanged()"); // Style names - Profiler.enter("AbstractComponentConnector.onStateChanged updateWidgetStyleNames"); + Profiler.enter( + "AbstractComponentConnector.onStateChanged updateWidgetStyleNames"); updateWidgetStyleNames(); - Profiler.leave("AbstractComponentConnector.onStateChanged updateWidgetStyleNames"); + Profiler.leave( + "AbstractComponentConnector.onStateChanged updateWidgetStyleNames"); /* * updateComponentSize need to be after caption update so caption can be * taken into account */ - Profiler.enter("AbstractComponentConnector.onStateChanged updateComponentSize"); + Profiler.enter( + "AbstractComponentConnector.onStateChanged updateComponentSize"); updateComponentSize(); - Profiler.leave("AbstractComponentConnector.onStateChanged updateComponentSize"); + Profiler.leave( + "AbstractComponentConnector.onStateChanged updateComponentSize"); - Profiler.enter("AbstractComponentContainer.onStateChanged check tooltip"); + Profiler.enter( + "AbstractComponentContainer.onStateChanged check tooltip"); if (!tooltipListenersAttached && hasTooltip()) { /* * Add event handlers for tooltips if they are needed but have not @@ -463,7 +475,8 @@ public abstract class AbstractComponentConnector extends AbstractConnector tooltipListenersAttached = true; getConnection().getVTooltip().connectHandlersToWidget(getWidget()); } - Profiler.leave("AbstractComponentContainer.onStateChanged check tooltip"); + Profiler.leave( + "AbstractComponentContainer.onStateChanged check tooltip"); Profiler.leave("AbstractComponentConnector.onStateChanged"); } @@ -518,16 +531,16 @@ public abstract class AbstractComponentConnector extends AbstractConnector if (newWidth.endsWith("%") != lastKnownWidth.endsWith("%")) { Connector parent = getParent(); if (parent instanceof ManagedLayout) { - getLayoutManager().setNeedsHorizontalLayout( - (ManagedLayout) parent); + getLayoutManager() + .setNeedsHorizontalLayout((ManagedLayout) parent); } } if (newHeight.endsWith("%") != lastKnownHeight.endsWith("%")) { Connector parent = getParent(); if (parent instanceof ManagedLayout) { - getLayoutManager().setNeedsVerticalLayout( - (ManagedLayout) parent); + getLayoutManager() + .setNeedsVerticalLayout((ManagedLayout) parent); } } @@ -537,14 +550,18 @@ public abstract class AbstractComponentConnector extends AbstractConnector // Set defined sizes Widget widget = getWidget(); - Profiler.enter("AbstractComponentConnector.updateComponentSize update styleNames"); + Profiler.enter( + "AbstractComponentConnector.updateComponentSize update styleNames"); widget.setStyleName("v-has-width", !isUndefinedWidth()); widget.setStyleName("v-has-height", !isUndefinedHeight()); - Profiler.leave("AbstractComponentConnector.updateComponentSize update styleNames"); + Profiler.leave( + "AbstractComponentConnector.updateComponentSize update styleNames"); - Profiler.enter("AbstractComponentConnector.updateComponentSize update DOM"); + Profiler.enter( + "AbstractComponentConnector.updateComponentSize update DOM"); updateWidgetSize(newWidth, newHeight); - Profiler.leave("AbstractComponentConnector.updateComponentSize update DOM"); + Profiler.leave( + "AbstractComponentConnector.updateComponentSize update DOM"); Profiler.leave("AbstractComponentConnector.updateComponentSize"); } @@ -617,8 +634,8 @@ public abstract class AbstractComponentConnector extends AbstractConnector setWidgetStyleName("v-readonly", isReadOnly()); // add / remove error style name - setWidgetStyleNameWithPrefix(primaryStyleName, - StyleConstants.ERROR_EXT, null != state.errorMessage); + setWidgetStyleNameWithPrefix(primaryStyleName, StyleConstants.ERROR_EXT, + null != state.errorMessage); // add additional user defined style names as class names, prefixed with // component default class name. remove nonexistent style names. @@ -693,8 +710,8 @@ public abstract class AbstractComponentConnector extends AbstractConnector * prefixes. */ @Deprecated - protected void setWidgetStyleNameWithPrefix(String prefix, - String styleName, boolean add) { + protected void setWidgetStyleNameWithPrefix(String prefix, String styleName, + boolean add) { if (!styleName.startsWith("-")) { if (!prefix.endsWith("-")) { prefix += "-"; @@ -738,9 +755,10 @@ public abstract class AbstractComponentConnector extends AbstractConnector // at this point. if (getWidget() != null && getWidget().isAttached()) { getWidget().removeFromParent(); - VConsole.error("Widget is still attached to the DOM after the connector (" - + Util.getConnectorString(this) - + ") has been unregistered. Widget was removed."); + VConsole.error( + "Widget is still attached to the DOM after the connector (" + + Util.getConnectorString(this) + + ") has been unregistered. Widget was removed."); } } @@ -755,7 +773,8 @@ public abstract class AbstractComponentConnector extends AbstractConnector AbstractComponentState state = getState(); if (state.description != null && !state.description.equals("")) { return true; - } else if (state.errorMessage != null && !state.errorMessage.equals("")) { + } else if (state.errorMessage != null + && !state.errorMessage.equals("")) { return true; } else { return false; diff --git a/client/src/main/java/com/vaadin/client/ui/AbstractComponentContainerConnector.java b/client/src/main/java/com/vaadin/client/ui/AbstractComponentContainerConnector.java index f808fb194c..a7867effbd 100644 --- a/client/src/main/java/com/vaadin/client/ui/AbstractComponentContainerConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/AbstractComponentContainerConnector.java @@ -20,7 +20,7 @@ package com.vaadin.client.ui; * * @since 7.0 */ -public abstract class AbstractComponentContainerConnector extends - AbstractHasComponentsConnector { +public abstract class AbstractComponentContainerConnector + extends AbstractHasComponentsConnector { } diff --git a/client/src/main/java/com/vaadin/client/ui/AbstractConnector.java b/client/src/main/java/com/vaadin/client/ui/AbstractConnector.java index 7f8d6c2b14..c6348e9de1 100644 --- a/client/src/main/java/com/vaadin/client/ui/AbstractConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/AbstractConnector.java @@ -54,8 +54,8 @@ import com.vaadin.shared.communication.URLReference; * @since 7.0.0 * */ -public abstract class AbstractConnector implements ServerConnector, - StateChangeHandler { +public abstract class AbstractConnector + implements ServerConnector, StateChangeHandler { private ApplicationConnection connection; private String id; @@ -120,13 +120,13 @@ public abstract class AbstractConnector implements ServerConnector, addStateChangeHandler(this); if (Profiler.isEnabled()) { - Profiler.enter("AbstractConnector.init " - + getClass().getSimpleName()); + Profiler.enter( + "AbstractConnector.init " + getClass().getSimpleName()); } init(); if (Profiler.isEnabled()) { - Profiler.leave("AbstractConnector.init " - + getClass().getSimpleName()); + Profiler.leave( + "AbstractConnector.init " + getClass().getSimpleName()); } Profiler.leave("AbstractConnector.doInit"); } @@ -225,7 +225,8 @@ public abstract class AbstractConnector implements ServerConnector, } if (statePropertyHandlerManagers != null && event instanceof StateChangeEvent) { - Profiler.enter("AbstractConnector.fireEvent statePropertyHandlerManagers"); + Profiler.enter( + "AbstractConnector.fireEvent statePropertyHandlerManagers"); StateChangeEvent stateChangeEvent = (StateChangeEvent) event; JsArrayString keys = statePropertyHandlerManagers.getKeys(); for (int i = 0; i < keys.length(); i++) { @@ -234,7 +235,8 @@ public abstract class AbstractConnector implements ServerConnector, statePropertyHandlerManagers.get(property).fireEvent(event); } } - Profiler.leave("AbstractConnector.fireEvent statePropertyHandlerManagers"); + Profiler.leave( + "AbstractConnector.fireEvent statePropertyHandlerManagers"); } if (Profiler.isEnabled()) { Profiler.leave(profilerKey); @@ -251,9 +253,10 @@ public abstract class AbstractConnector implements ServerConnector, } @Override - public HandlerRegistration addStateChangeHandler(StateChangeHandler handler) { - return ensureHandlerManager() - .addHandler(StateChangeEvent.TYPE, handler); + public HandlerRegistration addStateChangeHandler( + StateChangeHandler handler) { + return ensureHandlerManager().addHandler(StateChangeEvent.TYPE, + handler); } @Override @@ -264,8 +267,8 @@ public abstract class AbstractConnector implements ServerConnector, @Override public HandlerRegistration addStateChangeHandler(String propertyName, StateChangeHandler handler) { - return ensureHandlerManager(propertyName).addHandler( - StateChangeEvent.TYPE, handler); + return ensureHandlerManager(propertyName) + .addHandler(StateChangeEvent.TYPE, handler); } @Override @@ -339,8 +342,8 @@ public abstract class AbstractConnector implements ServerConnector, @Override public void onUnregister() { if (debugLogging) { - VConsole.log("Unregistered connector " - + Util.getConnectorString(this)); + VConsole.log( + "Unregistered connector " + Util.getConnectorString(this)); } } diff --git a/client/src/main/java/com/vaadin/client/ui/AbstractFieldConnector.java b/client/src/main/java/com/vaadin/client/ui/AbstractFieldConnector.java index 8d8df81bd8..f54ff85a13 100644 --- a/client/src/main/java/com/vaadin/client/ui/AbstractFieldConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/AbstractFieldConnector.java @@ -18,7 +18,8 @@ package com.vaadin.client.ui; import com.vaadin.client.StyleConstants; import com.vaadin.shared.AbstractFieldState; -public abstract class AbstractFieldConnector extends AbstractComponentConnector { +public abstract class AbstractFieldConnector + extends AbstractComponentConnector { @Override public AbstractFieldState getState() { diff --git a/client/src/main/java/com/vaadin/client/ui/AbstractHasComponentsConnector.java b/client/src/main/java/com/vaadin/client/ui/AbstractHasComponentsConnector.java index 27210de10d..c340c8ae31 100644 --- a/client/src/main/java/com/vaadin/client/ui/AbstractHasComponentsConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/AbstractHasComponentsConnector.java @@ -24,9 +24,9 @@ import com.vaadin.client.ConnectorHierarchyChangeEvent; import com.vaadin.client.ConnectorHierarchyChangeEvent.ConnectorHierarchyChangeHandler; import com.vaadin.client.HasComponentsConnector; -public abstract class AbstractHasComponentsConnector extends - AbstractComponentConnector implements HasComponentsConnector, - ConnectorHierarchyChangeHandler { +public abstract class AbstractHasComponentsConnector + extends AbstractComponentConnector + implements HasComponentsConnector, ConnectorHierarchyChangeHandler { List<ComponentConnector> childComponents; @@ -65,7 +65,7 @@ public abstract class AbstractHasComponentsConnector extends @Override public HandlerRegistration addConnectorHierarchyChangeHandler( ConnectorHierarchyChangeHandler handler) { - return ensureHandlerManager().addHandler( - ConnectorHierarchyChangeEvent.TYPE, handler); + return ensureHandlerManager() + .addHandler(ConnectorHierarchyChangeEvent.TYPE, handler); } } diff --git a/client/src/main/java/com/vaadin/client/ui/AbstractLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/AbstractLayoutConnector.java index 6e1dde3863..32157dce9e 100644 --- a/client/src/main/java/com/vaadin/client/ui/AbstractLayoutConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/AbstractLayoutConnector.java @@ -17,8 +17,8 @@ package com.vaadin.client.ui; import com.vaadin.shared.ui.AbstractLayoutState; -public abstract class AbstractLayoutConnector extends - AbstractComponentContainerConnector { +public abstract class AbstractLayoutConnector + extends AbstractComponentContainerConnector { @Override public AbstractLayoutState getState() { diff --git a/client/src/main/java/com/vaadin/client/ui/AbstractSingleComponentContainerConnector.java b/client/src/main/java/com/vaadin/client/ui/AbstractSingleComponentContainerConnector.java index 954803b64c..ff633b0728 100644 --- a/client/src/main/java/com/vaadin/client/ui/AbstractSingleComponentContainerConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/AbstractSingleComponentContainerConnector.java @@ -25,8 +25,8 @@ import com.vaadin.client.ComponentConnector; * * @since 7.0 */ -public abstract class AbstractSingleComponentContainerConnector extends - AbstractHasComponentsConnector { +public abstract class AbstractSingleComponentContainerConnector + extends AbstractHasComponentsConnector { /** * Returns the content (only/first child) of the container. diff --git a/client/src/main/java/com/vaadin/client/ui/ConnectorFocusAndBlurHandler.java b/client/src/main/java/com/vaadin/client/ui/ConnectorFocusAndBlurHandler.java index 8272f99d25..ede1cfa3ae 100644 --- a/client/src/main/java/com/vaadin/client/ui/ConnectorFocusAndBlurHandler.java +++ b/client/src/main/java/com/vaadin/client/ui/ConnectorFocusAndBlurHandler.java @@ -35,8 +35,8 @@ import com.vaadin.shared.communication.FieldRpc.FocusAndBlurServerRpc; * @since 7.6 * @author Vaadin Ltd */ -public class ConnectorFocusAndBlurHandler implements StateChangeHandler, - FocusHandler, BlurHandler { +public class ConnectorFocusAndBlurHandler + implements StateChangeHandler, FocusHandler, BlurHandler { private final AbstractComponentConnector connector; private final Widget widget; diff --git a/client/src/main/java/com/vaadin/client/ui/FocusUtil.java b/client/src/main/java/com/vaadin/client/ui/FocusUtil.java index 4750b89173..98520f249a 100644 --- a/client/src/main/java/com/vaadin/client/ui/FocusUtil.java +++ b/client/src/main/java/com/vaadin/client/ui/FocusUtil.java @@ -38,7 +38,8 @@ public class FocusUtil { * The access key to set */ public static void setAccessKey(Widget focusable, char key) { - assert (focusable != null && focusable.getElement() != null) : "Can't setAccessKey for a widget without an element"; + assert (focusable != null && focusable + .getElement() != null) : "Can't setAccessKey for a widget without an element"; focusable.getElement().setPropertyString("accessKey", "" + key); } @@ -52,7 +53,8 @@ public class FocusUtil { * whether this widget should take focus or release it */ public static void setFocus(Widget focusable, boolean focus) { - assert (focusable != null && focusable.getElement() != null) : "Can't setFocus for a widget without an element"; + assert (focusable != null && focusable + .getElement() != null) : "Can't setFocus for a widget without an element"; if (focus) { focusable.getElement().focus(); @@ -73,7 +75,8 @@ public class FocusUtil { * the widget's tab index */ public static void setTabIndex(Widget focusable, int tabIndex) { - assert (focusable != null && focusable.getElement() != null) : "Can't setTabIndex for a widget without an element"; + assert (focusable != null && focusable + .getElement() != null) : "Can't setTabIndex for a widget without an element"; focusable.getElement().setTabIndex(tabIndex); } @@ -87,7 +90,8 @@ public class FocusUtil { * @return the widget's tab index */ public static int getTabIndex(Widget focusable) { - assert (focusable != null && focusable.getElement() != null) : "Can't getTabIndex for a widget without an element"; + assert (focusable != null && focusable + .getElement() != null) : "Can't getTabIndex for a widget without an element"; return focusable.getElement().getTabIndex(); } diff --git a/client/src/main/java/com/vaadin/client/ui/FocusableScrollPanel.java b/client/src/main/java/com/vaadin/client/ui/FocusableScrollPanel.java index 1ac5a08ccd..3815372923 100644 --- a/client/src/main/java/com/vaadin/client/ui/FocusableScrollPanel.java +++ b/client/src/main/java/com/vaadin/client/ui/FocusableScrollPanel.java @@ -39,8 +39,8 @@ import com.vaadin.client.BrowserInfo; * A scrollhandlers similar to {@link ScrollPanel}. * */ -public class FocusableScrollPanel extends SimpleFocusablePanel implements - HasScrollHandlers, ScrollHandler { +public class FocusableScrollPanel extends SimpleFocusablePanel + implements HasScrollHandlers, ScrollHandler { public FocusableScrollPanel() { // Prevent IE standard mode bug when a AbsolutePanel is contained. @@ -174,8 +174,8 @@ public class FocusableScrollPanel extends SimpleFocusablePanel implements .getElements(getElement()); for (com.google.gwt.dom.client.Element el : elements) { final Style style = el.getStyle(); - style.setProperty("webkitTransform", "translate3d(0px," - + -position + "px,0px)"); + style.setProperty("webkitTransform", + "translate3d(0px," + -position + "px,0px)"); } getElement().setPropertyInt("_vScrollTop", position); } else { diff --git a/client/src/main/java/com/vaadin/client/ui/FontIcon.java b/client/src/main/java/com/vaadin/client/ui/FontIcon.java index 74d094a0f2..aa7a0d3b2b 100644 --- a/client/src/main/java/com/vaadin/client/ui/FontIcon.java +++ b/client/src/main/java/com/vaadin/client/ui/FontIcon.java @@ -43,9 +43,10 @@ public class FontIcon extends Icon { @Override public void setUri(String uri) { - String[] parts = uri.substring( - ApplicationConstants.FONTICON_PROTOCOL_PREFIX.length()).split( - "/"); + String[] parts = uri + .substring( + ApplicationConstants.FONTICON_PROTOCOL_PREFIX.length()) + .split("/"); setFontFamily(URL.decode(parts[0])); setCodepoint(Integer.parseInt(parts[1], 16)); } @@ -134,8 +135,8 @@ public class FontIcon extends Icon { * @return true if it's a fonticon uri */ public static boolean isFontIconUri(String uri) { - return uri != null - && uri.startsWith(ApplicationConstants.FONTICON_PROTOCOL_PREFIX); + return uri != null && uri + .startsWith(ApplicationConstants.FONTICON_PROTOCOL_PREFIX); } @Override diff --git a/client/src/main/java/com/vaadin/client/ui/LayoutClickEventHandler.java b/client/src/main/java/com/vaadin/client/ui/LayoutClickEventHandler.java index 6eccb9cb3b..ca23890310 100644 --- a/client/src/main/java/com/vaadin/client/ui/LayoutClickEventHandler.java +++ b/client/src/main/java/com/vaadin/client/ui/LayoutClickEventHandler.java @@ -22,7 +22,8 @@ import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.LayoutClickRpc; -public abstract class LayoutClickEventHandler extends AbstractClickEventHandler { +public abstract class LayoutClickEventHandler + extends AbstractClickEventHandler { public LayoutClickEventHandler(ComponentConnector connector) { this(connector, EventId.LAYOUT_CLICK_EVENT_IDENTIFIER); diff --git a/client/src/main/java/com/vaadin/client/ui/SimpleFocusablePanel.java b/client/src/main/java/com/vaadin/client/ui/SimpleFocusablePanel.java index f938b2e74f..0cc5ff6ef5 100644 --- a/client/src/main/java/com/vaadin/client/ui/SimpleFocusablePanel.java +++ b/client/src/main/java/com/vaadin/client/ui/SimpleFocusablePanel.java @@ -38,8 +38,8 @@ import com.vaadin.client.Focusable; * Compared to FocusPanel in GWT this panel does not support eg. accesskeys, but * is simpler by its dom hierarchy nor supports focusing via java api. */ -public class SimpleFocusablePanel extends SimplePanel implements - HasFocusHandlers, HasBlurHandlers, HasKeyDownHandlers, +public class SimpleFocusablePanel extends SimplePanel + implements HasFocusHandlers, HasBlurHandlers, HasKeyDownHandlers, HasKeyPressHandlers, Focusable { public SimpleFocusablePanel() { diff --git a/client/src/main/java/com/vaadin/client/ui/TouchScrollDelegate.java b/client/src/main/java/com/vaadin/client/ui/TouchScrollDelegate.java index f53b32b4e1..c6a63cbd6b 100644 --- a/client/src/main/java/com/vaadin/client/ui/TouchScrollDelegate.java +++ b/client/src/main/java/com/vaadin/client/ui/TouchScrollDelegate.java @@ -602,8 +602,8 @@ public class TouchScrollDelegate implements NativePreviewHandler { private void translateTo(double translateY) { for (Element el : layers) { Style style = el.getStyle(); - style.setProperty("webkitTransform", "translate3d(0px," - + translateY + "px,0px)"); + style.setProperty("webkitTransform", + "translate3d(0px," + translateY + "px,0px)"); } } @@ -621,8 +621,8 @@ public class TouchScrollDelegate implements NativePreviewHandler { @Override protected void onUpdate(double progress) { - lastAnimatedTranslateY = (fromY + (finalY - fromY) - * progress); + lastAnimatedTranslateY = (fromY + + (finalY - fromY) * progress); translateTo(lastAnimatedTranslateY); } @@ -651,8 +651,8 @@ public class TouchScrollDelegate implements NativePreviewHandler { } private int getMaxOverScroll() { - return androidWithBrokenScrollTop ? 0 : scrolledElement - .getClientHeight() / 3; + return androidWithBrokenScrollTop ? 0 + : scrolledElement.getClientHeight() / 3; } private int getMaxFinalY() { diff --git a/client/src/main/java/com/vaadin/client/ui/UnknownComponentConnector.java b/client/src/main/java/com/vaadin/client/ui/UnknownComponentConnector.java index 50ded0aeba..2a631d62e3 100644 --- a/client/src/main/java/com/vaadin/client/ui/UnknownComponentConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/UnknownComponentConnector.java @@ -31,17 +31,13 @@ public class UnknownComponentConnector extends AbstractComponentConnector { } public void setServerSideClassName(String serverClassName) { - getWidget() - .setCaption( - "Widgetset '" - + GWT.getModuleName() - + "' does not contain implementation for " - + serverClassName - + ". Check its component connector's @Connect mapping, widgetsets " - + "GWT module description file and re-compile your" - + " widgetset. In case you have downloaded a vaadin" - + " add-on package, you might want to refer to " - + "<a href='http://vaadin.com/using-addons'>add-on " - + "instructions</a>."); + getWidget().setCaption("Widgetset '" + GWT.getModuleName() + + "' does not contain implementation for " + serverClassName + + ". Check its component connector's @Connect mapping, widgetsets " + + "GWT module description file and re-compile your" + + " widgetset. In case you have downloaded a vaadin" + + " add-on package, you might want to refer to " + + "<a href='http://vaadin.com/using-addons'>add-on " + + "instructions</a>."); } } diff --git a/client/src/main/java/com/vaadin/client/ui/VAbsoluteLayout.java b/client/src/main/java/com/vaadin/client/ui/VAbsoluteLayout.java index 44230288a7..e85b6583b2 100644 --- a/client/src/main/java/com/vaadin/client/ui/VAbsoluteLayout.java +++ b/client/src/main/java/com/vaadin/client/ui/VAbsoluteLayout.java @@ -353,7 +353,8 @@ public class VAbsoluteLayout extends ComplexPanel { * @param stylenames * The style names that should be added to the wrapper */ - public void setWidgetWrapperStyleNames(Widget widget, String... stylenames) { + public void setWidgetWrapperStyleNames(Widget widget, + String... stylenames) { AbsoluteWrapper wrapper = getChildWrapper(widget); if (wrapper == null) { throw new IllegalArgumentException( @@ -474,8 +475,8 @@ public class VAbsoluteLayout extends ComplexPanel { Style style = caption.getElement().getStyle(); style.setProperty("position", "absolute"); style.setPropertyPx("left", getElement().getOffsetLeft()); - style.setPropertyPx("top", getElement().getOffsetTop() - - caption.getHeight()); + style.setPropertyPx("top", + getElement().getOffsetTop() - caption.getHeight()); } } @@ -495,8 +496,8 @@ public class VAbsoluteLayout extends ComplexPanel { * Updates the style names using the primary style name as prefix */ protected void updateStyleNames() { - setStyleName(VAbsoluteLayout.this.getStylePrimaryName() - + "-wrapper"); + setStyleName( + VAbsoluteLayout.this.getStylePrimaryName() + "-wrapper"); if (extraStyleNames != null) { for (String stylename : extraStyleNames) { addStyleDependentName(stylename); diff --git a/client/src/main/java/com/vaadin/client/ui/VAbstractSplitPanel.java b/client/src/main/java/com/vaadin/client/ui/VAbstractSplitPanel.java index 6c11783d34..81cd4f7b09 100644 --- a/client/src/main/java/com/vaadin/client/ui/VAbstractSplitPanel.java +++ b/client/src/main/java/com/vaadin/client/ui/VAbstractSplitPanel.java @@ -259,11 +259,10 @@ public abstract class VAbstractSplitPanel extends ComplexPanel { private float convertToPixels(String pos) { float posAsFloat; if (pos.indexOf("%") > 0) { - posAsFloat = Math.round(Float.parseFloat(pos.substring(0, - pos.length() - 1)) - / 100 - * (orientation == Orientation.HORIZONTAL ? getOffsetWidth() - : getOffsetHeight())); + posAsFloat = Math + .round(Float.parseFloat(pos.substring(0, pos.length() - 1)) + / 100 * (orientation == Orientation.HORIZONTAL + ? getOffsetWidth() : getOffsetHeight())); } else { posAsFloat = Float.parseFloat(pos.substring(0, pos.length() - 2)); } @@ -279,10 +278,10 @@ public abstract class VAbstractSplitPanel extends ComplexPanel { */ private float convertToPercentage(String pos) { if (pos.endsWith("px")) { - float pixelPosition = Float.parseFloat(pos.substring(0, - pos.length() - 2)); - int offsetLength = orientation == Orientation.HORIZONTAL ? getOffsetWidth() - : getOffsetHeight(); + float pixelPosition = Float + .parseFloat(pos.substring(0, pos.length() - 2)); + int offsetLength = orientation == Orientation.HORIZONTAL + ? getOffsetWidth() : getOffsetHeight(); // Take splitter size into account at the edge if (pixelPosition + getSplitterSize() >= offsetLength) { @@ -359,8 +358,8 @@ public abstract class VAbstractSplitPanel extends ComplexPanel { if (pos.indexOf("%") > 0) { int size = orientation == Orientation.HORIZONTAL ? getOffsetWidth() : getOffsetHeight(); - float percentage = Float.parseFloat(pos.substring(0, - pos.length() - 1)); + float percentage = Float + .parseFloat(pos.substring(0, pos.length() - 1)); pos = percentage / 100 * size + "px"; } @@ -419,7 +418,8 @@ public abstract class VAbstractSplitPanel extends ComplexPanel { } firstContainer.getStyle().setHeight(pixelPosition, Unit.PX); - int secondContainerHeight = (wholeSize - pixelPosition - getSplitterSize()); + int secondContainerHeight = (wholeSize - pixelPosition + - getSplitterSize()); if (secondContainerHeight < 0) { secondContainerHeight = 0; } @@ -468,7 +468,8 @@ public abstract class VAbstractSplitPanel extends ComplexPanel { } firstContainer.getStyle().setWidth(pixelPosition, Unit.PX); - int secondContainerWidth = (wholeSize - pixelPosition - getSplitterSize()); + int secondContainerWidth = (wholeSize - pixelPosition + - getSplitterSize()); if (secondContainerWidth < 0) { secondContainerWidth = 0; } @@ -732,8 +733,8 @@ public abstract class VAbstractSplitPanel extends ComplexPanel { public interface SplitterMoveHandler extends EventHandler { public void splitterMoved(SplitterMoveEvent event); - public static class SplitterMoveEvent extends - GwtEvent<SplitterMoveHandler> { + public static class SplitterMoveEvent + extends GwtEvent<SplitterMoveHandler> { public static final Type<SplitterMoveHandler> TYPE = new Type<SplitterMoveHandler>(); @@ -836,8 +837,8 @@ public abstract class VAbstractSplitPanel extends ComplexPanel { secondContainer.setClassName(secondContainerClass); for (String styleName : componentStyleNames) { - splitter.addClassName(splitterClass + "-" + styleName - + lockedSuffix); + splitter.addClassName( + splitterClass + "-" + styleName + lockedSuffix); firstContainer.addClassName(firstContainerClass + "-" + styleName); secondContainer .addClassName(secondContainerClass + "-" + styleName); diff --git a/client/src/main/java/com/vaadin/client/ui/VAccordion.java b/client/src/main/java/com/vaadin/client/ui/VAccordion.java index afc66d0f7b..74de41d513 100644 --- a/client/src/main/java/com/vaadin/client/ui/VAccordion.java +++ b/client/src/main/java/com/vaadin/client/ui/VAccordion.java @@ -151,8 +151,8 @@ public class VAccordion extends VTabsheetBase { addStyleDependentName("loading"); - connector.getRpcProxy(TabsheetServerRpc.class).setSelected( - tabKeys.get(index).toString()); + connector.getRpcProxy(TabsheetServerRpc.class) + .setSelected(tabKeys.get(index).toString()); } } @@ -361,13 +361,11 @@ public class VAccordion extends VTabsheetBase { public void updateCaption(TabState tabState) { // TODO need to call this because the caption does not have an owner caption.setCaptionAsHtml(isTabCaptionsAsHtml()); - caption.updateCaptionWithoutOwner( - tabState.caption, - !tabState.enabled, - hasAttribute(tabState.description), + caption.updateCaptionWithoutOwner(tabState.caption, + !tabState.enabled, hasAttribute(tabState.description), hasAttribute(tabState.componentError), - connector.getResourceUrl(ComponentConstants.ICON_RESOURCE - + tabState.key)); + connector.getResourceUrl( + ComponentConstants.ICON_RESOURCE + tabState.key)); } private boolean hasAttribute(String string) { diff --git a/client/src/main/java/com/vaadin/client/ui/VButton.java b/client/src/main/java/com/vaadin/client/ui/VButton.java index 2eb967c4fa..cb6f2aa61b 100644 --- a/client/src/main/java/com/vaadin/client/ui/VButton.java +++ b/client/src/main/java/com/vaadin/client/ui/VButton.java @@ -168,8 +168,8 @@ public class VButton extends FocusWidget implements ClickHandler { boolean isPhantomClickPossible = BrowserInfo.get().isSafari() && BrowserInfo.get().isTouchDevice() && BrowserInfo.get().getBrowserMajorVersion() == 8; - long clickTime = isPhantomClickPossible ? System - .currentTimeMillis() : 0; + long clickTime = isPhantomClickPossible ? System.currentTimeMillis() + : 0; // If clicks are currently disallowed or phantom, keep it from // bubbling or being passed to the superclass. if (disallowNextClick || isPhantomClickPossible @@ -251,8 +251,10 @@ public class VButton extends FocusWidget implements ClickHandler { case Event.ONMOUSEOUT: if (isTargetInsideButton(event)) { if (clickPending - && Math.abs(mousedownX - event.getClientX()) < MOVE_THRESHOLD - && Math.abs(mousedownY - event.getClientY()) < MOVE_THRESHOLD) { + && Math.abs(mousedownX + - event.getClientX()) < MOVE_THRESHOLD + && Math.abs(mousedownY + - event.getClientY()) < MOVE_THRESHOLD) { onClick(); break; } @@ -435,15 +437,15 @@ public class VButton extends FocusWidget implements ClickHandler { var convertToPixel = function(elem, value) { // From the awesome hack by Dean Edwards // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291 - + // Remember the original values var left = elem.style.left, rsLeft = elem.runtimeStyle.left; - + // Put in the new values to get a computed value out elem.runtimeStyle.left = elem.currentStyle.left; elem.style.left = value || 0; var ret = elem.style.pixelLeft; - + // Revert the changed values elem.style.left = left; elem.runtimeStyle.left = rsLeft; @@ -452,7 +454,7 @@ public class VButton extends FocusWidget implements ClickHandler { } var ret = 0; - + var sides = ["Right","Left"]; for(var i=0; i<2; i++) { var side = sides[i]; @@ -475,7 +477,7 @@ public class VButton extends FocusWidget implements ClickHandler { ret += parseInt(value.substr(0, value.length-2)); } } - + return ret; }-*/; diff --git a/client/src/main/java/com/vaadin/client/ui/VCalendar.java b/client/src/main/java/com/vaadin/client/ui/VCalendar.java index 08d4351931..cc4b7aa520 100644 --- a/client/src/main/java/com/vaadin/client/ui/VCalendar.java +++ b/client/src/main/java/com/vaadin/client/ui/VCalendar.java @@ -262,7 +262,7 @@ public class VCalendar extends Composite implements VHasDropHandler { e.onselectstart = function() { return false; } - + e.ondragstart = function() { return false; } @@ -308,7 +308,8 @@ public class VCalendar extends Composite implements VHasDropHandler { } } - private void addEventToMonthGrid(CalendarEvent e, boolean renderImmediately) { + private void addEventToMonthGrid(CalendarEvent e, + boolean renderImmediately) { Date when = e.getStart(); Date to = e.getEnd(); boolean eventAdded = false; @@ -374,7 +375,8 @@ public class VCalendar extends Composite implements VHasDropHandler { && from.getDay() != to.getDay() && isMidnight(endTime))); } - private void updateEventSlotIndex(CalendarEvent e, List<SimpleDayCell> cells) { + private void updateEventSlotIndex(CalendarEvent e, + List<SimpleDayCell> cells) { if (cells.isEmpty()) { return; } @@ -437,8 +439,8 @@ public class VCalendar extends Composite implements VHasDropHandler { // Remove event for (int row = 0; row < monthGrid.getRowCount(); row++) { for (int cell = 0; cell < monthGrid.getCellCount(row); cell++) { - SimpleDayCell sdc = (SimpleDayCell) monthGrid.getWidget( - row, cell); + SimpleDayCell sdc = (SimpleDayCell) monthGrid.getWidget(row, + cell); if (sdc == null) { return; } @@ -467,7 +469,8 @@ public class VCalendar extends Composite implements VHasDropHandler { * The events to sort * @return An array where the events has been sorted */ - public CalendarEvent[] sortEventsByDuration(Collection<CalendarEvent> events) { + public CalendarEvent[] sortEventsByDuration( + Collection<CalendarEvent> events) { CalendarEvent[] sorted = events .toArray(new CalendarEvent[events.size()]); Arrays.sort(sorted, getEventComparator()); @@ -649,13 +652,13 @@ public class VCalendar extends Composite implements VHasDropHandler { monthGrid.updateCellSizes(intWidth - weekToolbar.getOffsetWidth(), intHeight - nameToolbar.getOffsetHeight()); - weekToolbar.setHeightPX((intHeight == -1) ? intHeight : intHeight - - nameToolbar.getOffsetHeight()); + weekToolbar.setHeightPX((intHeight == -1) ? intHeight + : intHeight - nameToolbar.getOffsetHeight()); } else if (weekGrid != null) { - weekGrid.setHeightPX((intHeight == -1) ? intHeight : intHeight - - weeklyLongEvents.getOffsetHeight() - - dayToolbar.getOffsetHeight()); + weekGrid.setHeightPX((intHeight == -1) ? intHeight + : intHeight - weeklyLongEvents.getOffsetHeight() + - dayToolbar.getOffsetHeight()); } } @@ -669,8 +672,8 @@ public class VCalendar extends Composite implements VHasDropHandler { if (monthGrid != null) { monthGrid.updateCellSizes( - intWidth - weekToolbar.getOffsetWidth(), intHeight - - nameToolbar.getOffsetHeight()); + intWidth - weekToolbar.getOffsetWidth(), + intHeight - nameToolbar.getOffsetHeight()); } else if (weekGrid != null) { weekGrid.setWidthPX(intWidth); weeklyLongEvents.setWidthPX(weekGrid.getInternalWidth()); @@ -846,8 +849,9 @@ public class VCalendar extends Composite implements VHasDropHandler { int r = 0; if (!d1.equals(0L) && !d2.equals(0L)) { r = d2.compareTo(d1); - return (r == 0) ? ((Integer) o2.getIndex()).compareTo(o1 - .getIndex()) : r; + return (r == 0) + ? ((Integer) o2.getIndex()).compareTo(o1.getIndex()) + : r; } if (d2.equals(0L) && d1.equals(0L)) { @@ -862,8 +866,9 @@ public class VCalendar extends Composite implements VHasDropHandler { return -1; } r = d2.compareTo(d1); - return (r == 0) ? ((Integer) o2.getIndex()).compareTo(o1 - .getIndex()) : r; + return (r == 0) + ? ((Integer) o2.getIndex()).compareTo(o1.getIndex()) + : r; } }; } @@ -878,8 +883,8 @@ public class VCalendar extends Composite implements VHasDropHandler { */ @SuppressWarnings("deprecation") public static boolean isMidnight(Date date) { - return (date.getHours() == 0 && date.getMinutes() == 0 && date - .getSeconds() == 0); + return (date.getHours() == 0 && date.getMinutes() == 0 + && date.getSeconds() == 0); } /** @@ -1102,9 +1107,8 @@ public class VCalendar extends Composite implements VHasDropHandler { * @param days * The day information */ - public void updateMonthView(int firstDayOfWeek, Date today, - int daysInMonth, Collection<CalendarEvent> events, - List<CalendarDay> days) { + public void updateMonthView(int firstDayOfWeek, Date today, int daysInMonth, + Collection<CalendarEvent> events, List<CalendarDay> days) { // Remove all week numbers from bar while (outer.getWidgetCount() > 0) { diff --git a/client/src/main/java/com/vaadin/client/ui/VCalendarPanel.java b/client/src/main/java/com/vaadin/client/ui/VCalendarPanel.java index e1b906b6e4..bb87492c9d 100644 --- a/client/src/main/java/com/vaadin/client/ui/VCalendarPanel.java +++ b/client/src/main/java/com/vaadin/client/ui/VCalendarPanel.java @@ -238,7 +238,8 @@ public class VCalendarPanel extends FocusableFlexTable implements */ private void focusDay(Date date) { // Only used when calender body is present - if (resolution.getCalendarField() > Resolution.MONTH.getCalendarField()) { + if (resolution.getCalendarField() > Resolution.MONTH + .getCalendarField()) { if (focusedDay != null) { focusedDay.removeStyleDependentName(CN_FOCUSED); } @@ -275,8 +276,8 @@ public class VCalendarPanel extends FocusableFlexTable implements private void selectDate(Date date) { if (selectedDay != null) { selectedDay.removeStyleDependentName(CN_SELECTED); - Roles.getGridcellRole().removeAriaSelectedState( - selectedDay.getElement()); + Roles.getGridcellRole() + .removeAriaSelectedState(selectedDay.getElement()); } int rowCount = days.getRowCount(); @@ -446,8 +447,8 @@ public class VCalendarPanel extends FocusableFlexTable implements updateControlButtonRangeStyles(needsMonth); - final String monthName = needsMonth ? getDateTimeService().getMonth( - displayedMonth.getMonth()) : ""; + final String monthName = needsMonth + ? getDateTimeService().getMonth(displayedMonth.getMonth()) : ""; final int year = displayedMonth.getYear() + 1900; getFlexCellFormatter().setStyleName(0, 2, @@ -461,9 +462,10 @@ public class VCalendarPanel extends FocusableFlexTable implements getFlexCellFormatter().setStyleName(0, 1, parent.getStylePrimaryName() + "-calendarpanel-prevmonth"); - setHTML(0, 2, "<span class=\"" + parent.getStylePrimaryName() - + "-calendarpanel-month\">" + monthName + " " + year - + "</span>"); + setHTML(0, 2, + "<span class=\"" + parent.getStylePrimaryName() + + "-calendarpanel-month\">" + monthName + " " + year + + "</span>"); } private void updateControlButtonRangeStyles(boolean needsMonth) { @@ -555,7 +557,8 @@ public class VCalendarPanel extends FocusableFlexTable implements * @param minResolution * @return */ - private boolean isAcceptedByRangeStart(Date date, Resolution minResolution) { + private boolean isAcceptedByRangeStart(Date date, + Resolution minResolution) { assert (date != null); // rangeStart == null means that we accept all values below rangeEnd @@ -663,11 +666,9 @@ public class VCalendarPanel extends FocusableFlexTable implements "v-first"); days.getFlexCellFormatter().setStyleName(headerRow, firstWeekdayColumn, ""); - days.getRowFormatter() - .addStyleName( - headerRow, - parent.getStylePrimaryName() - + "-calendarpanel-weeknumbers"); + days.getRowFormatter().addStyleName(headerRow, + parent.getStylePrimaryName() + + "-calendarpanel-weeknumbers"); } else { days.getFlexCellFormatter().setStyleName(headerRow, weekColumn, ""); days.getFlexCellFormatter().setStyleName(headerRow, @@ -692,9 +693,8 @@ public class VCalendarPanel extends FocusableFlexTable implements days.setHTML(headerRow, firstWeekdayColumn + i, ""); } - Roles.getColumnheaderRole().set( - days.getCellFormatter().getElement(headerRow, - firstWeekdayColumn + i)); + Roles.getColumnheaderRole().set(days.getCellFormatter() + .getElement(headerRow, firstWeekdayColumn + i)); } // Zero out hours, minutes, seconds, and milliseconds to compare dates @@ -703,11 +703,11 @@ public class VCalendarPanel extends FocusableFlexTable implements final Date today = new Date(tmp.getYear(), tmp.getMonth(), tmp.getDate()); - final Date selectedDate = value == null ? null : new Date( - value.getYear(), value.getMonth(), value.getDate()); + final Date selectedDate = value == null ? null + : new Date(value.getYear(), value.getMonth(), value.getDate()); - final int startWeekDay = getDateTimeService().getStartWeekDay( - displayedMonth); + final int startWeekDay = getDateTimeService() + .getStartWeekDay(displayedMonth); final Date curr = (Date) displayedMonth.clone(); // Start from the first day of the week that at least partially belongs // to the current month @@ -721,8 +721,8 @@ public class VCalendarPanel extends FocusableFlexTable implements Date dayDate = (Date) curr.clone(); Day day = new Day(dayDate); - day.setStyleName(parent.getStylePrimaryName() - + "-calendarpanel-day"); + day.setStyleName( + parent.getStylePrimaryName() + "-calendarpanel-day"); if (!isDateInsideRange(dayDate, Resolution.DAY)) { day.addStyleDependentName(CN_OUTSIDE_RANGE); @@ -747,10 +747,10 @@ public class VCalendarPanel extends FocusableFlexTable implements day.addStyleDependentName(CN_OFFMONTH); } - days.setWidget(weekOfMonth, firstWeekdayColumn + dayOfWeek, day); - Roles.getGridcellRole().set( - days.getCellFormatter().getElement(weekOfMonth, - firstWeekdayColumn + dayOfWeek)); + days.setWidget(weekOfMonth, firstWeekdayColumn + dayOfWeek, + day); + Roles.getGridcellRole().set(days.getCellFormatter().getElement( + weekOfMonth, firstWeekdayColumn + dayOfWeek)); // ISO week numbers if requested days.getCellFormatter().setVisible(weekOfMonth, weekColumn, @@ -763,9 +763,8 @@ public class VCalendarPanel extends FocusableFlexTable implements int weekNumber = DateTimeService.getISOWeekNumber(curr); - days.setHTML(weekOfMonth, 0, "<span class=\"" - + weekCssClass + "\"" + ">" + weekNumber - + "</span>"); + days.setHTML(weekOfMonth, 0, "<span class=\"" + weekCssClass + + "\"" + ">" + weekNumber + "</span>"); } curr.setDate(curr.getDate() + 1); } @@ -802,8 +801,8 @@ public class VCalendarPanel extends FocusableFlexTable implements */ public void renderCalendar(boolean updateDate) { - super.setStylePrimaryName(parent.getStylePrimaryName() - + "-calendarpanel"); + super.setStylePrimaryName( + parent.getStylePrimaryName() + "-calendarpanel"); if (focusedDate == null) { Date now = new Date(); @@ -813,14 +812,13 @@ public class VCalendarPanel extends FocusableFlexTable implements displayedMonth = new FocusedDate(now.getYear(), now.getMonth(), 1); } - if (updateDate - && getResolution().getCalendarField() <= Resolution.MONTH - .getCalendarField() && focusChangeListener != null) { + if (updateDate && getResolution().getCalendarField() <= Resolution.MONTH + .getCalendarField() && focusChangeListener != null) { focusChangeListener.focusChanged(new Date(focusedDate.getTime())); } - final boolean needsMonth = getResolution().getCalendarField() > Resolution.YEAR - .getCalendarField(); + final boolean needsMonth = getResolution() + .getCalendarField() > Resolution.YEAR.getCalendarField(); boolean needsBody = getResolution().getCalendarField() >= Resolution.DAY .getCalendarField(); buildCalendarHeader(needsMonth); @@ -901,7 +899,8 @@ public class VCalendarPanel extends FocusableFlexTable implements // inside, // correct it if (!isDateInsideRange(requestedNextMonthDate, Resolution.DAY)) { - requestedNextMonthDate = adjustDateToFitInsideRange(requestedNextMonthDate); + requestedNextMonthDate = adjustDateToFitInsideRange( + requestedNextMonthDate); } focusedDate.setTime(requestedNextMonthDate.getTime()); @@ -957,7 +956,8 @@ public class VCalendarPanel extends FocusableFlexTable implements } if (!isDateInsideRange(requestedPreviousMonthDate, Resolution.DAY)) { - requestedPreviousMonthDate = adjustDateToFitInsideRange(requestedPreviousMonthDate); + requestedPreviousMonthDate = adjustDateToFitInsideRange( + requestedPreviousMonthDate); } focusedDate.setTime(requestedPreviousMonthDate.getTime()); displayedMonth.setMonth(displayedMonth.getMonth() - 1); @@ -1106,9 +1106,8 @@ public class VCalendarPanel extends FocusableFlexTable implements */ private void handleKeyPress(DomEvent<?> event) { // Special handling for events from time ListBoxes. - if (time != null - && time.getElement().isOrHasChild( - (Node) event.getNativeEvent().getEventTarget().cast())) { + if (time != null && time.getElement().isOrHasChild( + (Node) event.getNativeEvent().getEventTarget().cast())) { int nativeKeyCode = event.getNativeEvent().getKeyCode(); if (nativeKeyCode == getSelectKey()) { onSubmit(); // submit if enter key hit down on listboxes @@ -1125,16 +1124,18 @@ public class VCalendarPanel extends FocusableFlexTable implements // Check tabs int keycode = event.getNativeEvent().getKeyCode(); - if (keycode == KeyCodes.KEY_TAB && event.getNativeEvent().getShiftKey()) { + if (keycode == KeyCodes.KEY_TAB + && event.getNativeEvent().getShiftKey()) { if (onTabOut(event)) { return; } } // Handle the navigation - if (handleNavigation(keycode, event.getNativeEvent().getCtrlKey() - || event.getNativeEvent().getMetaKey(), event.getNativeEvent() - .getShiftKey())) { + if (handleNavigation(keycode, + event.getNativeEvent().getCtrlKey() + || event.getNativeEvent().getMetaKey(), + event.getNativeEvent().getShiftKey())) { event.preventDefault(); } @@ -1390,7 +1391,8 @@ public class VCalendarPanel extends FocusableFlexTable implements * @return Return true if key press was handled by the component, else * return false */ - protected boolean handleNavigation(int keycode, boolean ctrl, boolean shift) { + protected boolean handleNavigation(int keycode, boolean ctrl, + boolean shift) { if (!isEnabled() || isReadonly()) { return false; } @@ -1580,7 +1582,8 @@ public class VCalendarPanel extends FocusableFlexTable implements } boolean currentDateWasAdjusted = false; // Check that selected date is inside the allowed range - if (currentDate != null && !isDateInsideRange(currentDate, resolution)) { + if (currentDate != null + && !isDateInsideRange(currentDate, resolution)) { currentDate = adjustDateToFitInsideRange(currentDate); currentDateWasAdjusted = true; } @@ -1595,9 +1598,9 @@ public class VCalendarPanel extends FocusableFlexTable implements // If ranges enabled, we may need to focus on a different view to // potentially not get stuck if (rangeStart != null || rangeEnd != null) { - Date dateThatFitsInsideRange = adjustDateToFitInsideRange(new Date()); - focusedDate = new FocusedDate( - dateThatFitsInsideRange.getYear(), + Date dateThatFitsInsideRange = adjustDateToFitInsideRange( + new Date()); + focusedDate = new FocusedDate(dateThatFitsInsideRange.getYear(), dateThatFitsInsideRange.getMonth(), dateThatFitsInsideRange.getDate()); displayedMonth = new FocusedDate( @@ -2054,7 +2057,8 @@ public class VCalendarPanel extends FocusableFlexTable implements private Date rangeEnd; @Override - public String getSubPartName(com.google.gwt.user.client.Element subElement) { + public String getSubPartName( + com.google.gwt.user.client.Element subElement) { if (contains(nextMonth, subElement)) { return SUBPART_NEXT_MONTH; } else if (contains(prevMonth, subElement)) { @@ -2090,7 +2094,8 @@ public class VCalendarPanel extends FocusableFlexTable implements return SUBPART_AMPM_SELECT; } - } else if (getCellFormatter().getElement(0, 2).isOrHasChild(subElement)) { + } else if (getCellFormatter().getElement(0, 2) + .isOrHasChild(subElement)) { return SUBPART_MONTH_YEAR_HEADER; } @@ -2113,7 +2118,8 @@ public class VCalendarPanel extends FocusableFlexTable implements } @Override - public com.google.gwt.user.client.Element getSubPartElement(String subPart) { + public com.google.gwt.user.client.Element getSubPartElement( + String subPart) { if (SUBPART_NEXT_MONTH.equals(subPart)) { return nextMonth.getElement(); } @@ -2141,8 +2147,8 @@ public class VCalendarPanel extends FocusableFlexTable implements if (subPart.startsWith(SUBPART_DAY)) { // Zero or negative ids map to days in the preceding month, // past-the-end-of-month ids to days in the following month - int dayOfMonth = Integer.parseInt(subPart.substring(SUBPART_DAY - .length())); + int dayOfMonth = Integer + .parseInt(subPart.substring(SUBPART_DAY.length())); Date date = new Date(displayedMonth.getYear(), displayedMonth.getMonth(), dayOfMonth); Iterator<Widget> iter = days.iterator(); @@ -2158,8 +2164,8 @@ public class VCalendarPanel extends FocusableFlexTable implements } if (SUBPART_MONTH_YEAR_HEADER.equals(subPart)) { - return DOM.asOld((Element) getCellFormatter().getElement(0, 2) - .getChild(0)); + return DOM.asOld( + (Element) getCellFormatter().getElement(0, 2).getChild(0)); } return null; } diff --git a/client/src/main/java/com/vaadin/client/ui/VCheckBox.java b/client/src/main/java/com/vaadin/client/ui/VCheckBox.java index 887dba262a..55db9ad523 100644 --- a/client/src/main/java/com/vaadin/client/ui/VCheckBox.java +++ b/client/src/main/java/com/vaadin/client/ui/VCheckBox.java @@ -29,8 +29,8 @@ import com.vaadin.client.ui.aria.AriaHelper; import com.vaadin.client.ui.aria.HandlesAriaInvalid; import com.vaadin.client.ui.aria.HandlesAriaRequired; -public class VCheckBox extends com.google.gwt.user.client.ui.CheckBox implements - Field, HandlesAriaInvalid, HandlesAriaRequired { +public class VCheckBox extends com.google.gwt.user.client.ui.CheckBox + implements Field, HandlesAriaInvalid, HandlesAriaRequired { public static final String CLASSNAME = "v-checkbox"; diff --git a/client/src/main/java/com/vaadin/client/ui/VColorPickerArea.java b/client/src/main/java/com/vaadin/client/ui/VColorPickerArea.java index 23a9379c80..c2940ea4d5 100644 --- a/client/src/main/java/com/vaadin/client/ui/VColorPickerArea.java +++ b/client/src/main/java/com/vaadin/client/ui/VColorPickerArea.java @@ -31,8 +31,8 @@ import com.google.gwt.user.client.ui.Widget; * * @since 7.0.0 */ -public class VColorPickerArea extends Widget implements ClickHandler, HasHTML, - HasClickHandlers { +public class VColorPickerArea extends Widget + implements ClickHandler, HasHTML, HasClickHandlers { public static final String CLASSNAME = "v-colorpicker"; private String color = null; @@ -84,7 +84,8 @@ public class VColorPickerArea extends Widget implements ClickHandler, HasHTML, int type = DOM.eventGetType(event); switch (type) { case Event.ONCLICK: - if (DOM.isOrHasChild(area.getElement(), DOM.eventGetTarget(event))) { + if (DOM.isOrHasChild(area.getElement(), + DOM.eventGetTarget(event))) { super.onBrowserEvent(event); } break; diff --git a/client/src/main/java/com/vaadin/client/ui/VContextMenu.java b/client/src/main/java/com/vaadin/client/ui/VContextMenu.java index 6028eea52c..2411eafabb 100644 --- a/client/src/main/java/com/vaadin/client/ui/VContextMenu.java +++ b/client/src/main/java/com/vaadin/client/ui/VContextMenu.java @@ -90,10 +90,9 @@ public class VContextMenu extends VOverlay implements SubPartAware { @Override public void onClose(CloseEvent<PopupPanel> event) { Element currentFocus = WidgetUtil.getFocusedElement(); - if (focusedElement != null - && (currentFocus == null - || menu.getElement().isOrHasChild(currentFocus) || RootPanel - .getBodyElement().equals(currentFocus))) { + if (focusedElement != null && (currentFocus == null + || menu.getElement().isOrHasChild(currentFocus) + || RootPanel.getBodyElement().equals(currentFocus))) { focusedElement.focus(); focusedElement = null; } @@ -197,9 +196,9 @@ public class VContextMenu extends VOverlay implements SubPartAware { * Extend standard Gwt MenuBar to set proper settings and to override * onPopupClosed method so that PopupPanel gets closed. */ - class CMenuBar extends MenuBar implements HasFocusHandlers, - HasBlurHandlers, HasKeyDownHandlers, HasKeyPressHandlers, - Focusable, LoadHandler, KeyUpHandler { + class CMenuBar extends MenuBar + implements HasFocusHandlers, HasBlurHandlers, HasKeyDownHandlers, + HasKeyPressHandlers, Focusable, LoadHandler, KeyUpHandler { public CMenuBar() { super(true); addDomHandler(this, LoadEvent.getType()); @@ -282,7 +281,8 @@ public class VContextMenu extends VOverlay implements SubPartAware { } @Override - public com.google.gwt.user.client.Element getSubPartElement(String subPart) { + public com.google.gwt.user.client.Element getSubPartElement( + String subPart) { int index = Integer.parseInt(subPart.substring(6)); // ApplicationConnection.getConsole().log( // "Searching element for selection index " + index); @@ -293,11 +293,13 @@ public class VContextMenu extends VOverlay implements SubPartAware { } @Override - public String getSubPartName(com.google.gwt.user.client.Element subElement) { + public String getSubPartName( + com.google.gwt.user.client.Element subElement) { if (getElement().isOrHasChild(subElement)) { com.google.gwt.dom.client.Element e = subElement; { - while (e != null && !e.getTagName().toLowerCase().equals("tr")) { + while (e != null + && !e.getTagName().toLowerCase().equals("tr")) { e = e.getParentElement(); // ApplicationConnection.getConsole().log("Found row"); } diff --git a/client/src/main/java/com/vaadin/client/ui/VCustomLayout.java b/client/src/main/java/com/vaadin/client/ui/VCustomLayout.java index 0ee50fe0dd..3a1b56bb2d 100644 --- a/client/src/main/java/com/vaadin/client/ui/VCustomLayout.java +++ b/client/src/main/java/com/vaadin/client/ui/VCustomLayout.java @@ -126,8 +126,8 @@ public class VCustomLayout extends ComplexPanel { // If no given location is found in the layout, and exception is throws Element elem = locationToElement.get(location); if (elem == null && hasTemplate()) { - throw new IllegalArgumentException("No location " + location - + " found"); + throw new IllegalArgumentException( + "No location " + location + " found"); } // Get previous widget @@ -168,15 +168,13 @@ public class VCustomLayout extends ComplexPanel { "<((?:img)|(?:IMG))\\s([^>]*)src=\"((?![a-z]+:)[^/][^\"]+)\"", "<$1 $2src=\"" + relImgPrefix + "$3\""); // also support src attributes without quotes - template = template - .replaceAll( - "<((?:img)|(?:IMG))\\s([^>]*)src=[^\"]((?![a-z]+:)[^/][^ />]+)[ />]", - "<$1 $2src=\"" + relImgPrefix + "$3\""); + template = template.replaceAll( + "<((?:img)|(?:IMG))\\s([^>]*)src=[^\"]((?![a-z]+:)[^/][^ />]+)[ />]", + "<$1 $2src=\"" + relImgPrefix + "$3\""); // also prefix relative style="...url(...)..." - template = template - .replaceAll( - "(<[^>]+style=\"[^\"]*url\\()((?![a-z]+:)[^/][^\"]+)(\\)[^>]*>)", - "$1 " + relImgPrefix + "$2 $3"); + template = template.replaceAll( + "(<[^>]+style=\"[^\"]*url\\()((?![a-z]+:)[^/][^\"]+)(\\)[^>]*>)", + "$1 " + relImgPrefix + "$2 $3"); getElement().setInnerHTML(template); diff --git a/client/src/main/java/com/vaadin/client/ui/VDateFieldCalendar.java b/client/src/main/java/com/vaadin/client/ui/VDateFieldCalendar.java index 759ebef102..0947cebccf 100644 --- a/client/src/main/java/com/vaadin/client/ui/VDateFieldCalendar.java +++ b/client/src/main/java/com/vaadin/client/ui/VDateFieldCalendar.java @@ -87,24 +87,26 @@ public class VDateFieldCalendar extends VDateField { .getCalendarField()) { getClient().updateVariable(getId(), "day", date2.getDate(), false); - if (getCurrentResolution().getCalendarField() > Resolution.DAY - .getCalendarField()) { + if (getCurrentResolution() + .getCalendarField() > Resolution.DAY + .getCalendarField()) { getClient().updateVariable(getId(), "hour", date2.getHours(), false); - if (getCurrentResolution().getCalendarField() > Resolution.HOUR - .getCalendarField()) { + if (getCurrentResolution() + .getCalendarField() > Resolution.HOUR + .getCalendarField()) { getClient().updateVariable(getId(), "min", date2.getMinutes(), false); - if (getCurrentResolution().getCalendarField() > Resolution.MINUTE - .getCalendarField()) { + if (getCurrentResolution() + .getCalendarField() > Resolution.MINUTE + .getCalendarField()) { getClient().updateVariable(getId(), "sec", date2.getSeconds(), false); - if (getCurrentResolution().getCalendarField() > Resolution.SECOND - .getCalendarField()) { - getClient().updateVariable( - getId(), - "msec", - DateTimeService + if (getCurrentResolution() + .getCalendarField() > Resolution.SECOND + .getCalendarField()) { + getClient().updateVariable(getId(), + "msec", DateTimeService .getMilliseconds(date2), false); } diff --git a/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapper.java b/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapper.java index 4ecdec8b6f..779a3fbf0b 100644 --- a/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapper.java +++ b/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapper.java @@ -66,8 +66,8 @@ import com.vaadin.shared.ui.dd.VerticalDropLocation; * drop details: locations + sizes in document hierarchy up to wrapper * */ -public class VDragAndDropWrapper extends VCustomComponent implements - VHasDropHandler { +public class VDragAndDropWrapper extends VCustomComponent + implements VHasDropHandler { /** * Minimum pixel delta is used to detect click from drag. #12838 @@ -91,7 +91,8 @@ public class VDragAndDropWrapper extends VCustomComponent implements @Override public void onMouseDown(final MouseDownEvent event) { if (getConnector().isEnabled() - && event.getNativeEvent().getButton() == Event.BUTTON_LEFT + && event.getNativeEvent() + .getButton() == Event.BUTTON_LEFT && startDrag(event.getNativeEvent())) { event.preventDefault(); // prevent text selection startX = event.getClientX(); @@ -149,8 +150,8 @@ public class VDragAndDropWrapper extends VCustomComponent implements Element.as(event.getEventTarget())); Widget widget = paintable.getWidget(); transferable.setData("component", paintable); - VDragEvent dragEvent = VDragAndDropManager.get().startDrag( - transferable, event, true); + VDragEvent dragEvent = VDragAndDropManager.get() + .startDrag(transferable, event, true); transferable.setData("mouseDown", MouseEventDetailsBuilder .buildMouseEventDetails(event).serialize()); @@ -253,9 +254,8 @@ public class VDragAndDropWrapper extends VCustomComponent implements uploading = true; final Integer fileId = fileIds.remove(0); VHtml5File file = files.remove(0); - final String receiverUrl = client - .translateVaadinUri(fileIdToReceiver - .remove(fileId.toString())); + final String receiverUrl = client.translateVaadinUri( + fileIdToReceiver.remove(fileId.toString())); ExtendedXHR extendedXHR = (ExtendedXHR) ExtendedXHR .create(); extendedXHR @@ -297,14 +297,15 @@ public class VDragAndDropWrapper extends VCustomComponent implements dragleavetimer.cancel(); dragleavetimer = null; } - if (VDragAndDropManager.get().getCurrentDropHandler() != getDropHandler()) { + if (VDragAndDropManager.get() + .getCurrentDropHandler() != getDropHandler()) { VTransferable transferable = new VTransferable(); transferable.setDragSource(getConnector()); - vaadinDragEvent = VDragAndDropManager.get().startDrag( - transferable, event, false); - VDragAndDropManager.get().setCurrentDropHandler( - getDropHandler()); + vaadinDragEvent = VDragAndDropManager.get() + .startDrag(transferable, event, false); + VDragAndDropManager.get() + .setCurrentDropHandler(getDropHandler()); } try { event.preventDefault(); @@ -334,9 +335,8 @@ public class VDragAndDropWrapper extends VCustomComponent implements // this // is what IE does). // In Vaadin we fire it only if drop did not happen. - if (vaadinDragEvent != null - && VDragAndDropManager.get() - .getCurrentDropHandler() == getDropHandler()) { + if (vaadinDragEvent != null && VDragAndDropManager.get() + .getCurrentDropHandler() == getDropHandler()) { VDragAndDropManager.get().interruptDrag(); } } @@ -466,11 +466,11 @@ public class VDragAndDropWrapper extends VCustomComponent implements public final native void postFile(VHtml5File file) /*-{ - + this.setRequestHeader('Content-Type', 'multipart/form-data'); // Seems like IE10 will loose the file if we don't keep a reference to it... this.fileBeingUploaded = file; - + this.send(file); }-*/; @@ -626,19 +626,19 @@ public class VDragAndDropWrapper extends VCustomComponent implements protected native void hookHtml5Events(com.google.gwt.user.client.Element el) /*-{ var me = this; - + el.addEventListener("dragenter", $entry(function(ev) { return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragEnter(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); }), false); - + el.addEventListener("dragleave", $entry(function(ev) { return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragLeave(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); }), false); - + el.addEventListener("dragover", $entry(function(ev) { return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragOver(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); }), false); - + el.addEventListener("drop", $entry(function(ev) { return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragDrop(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); }), false); @@ -676,10 +676,12 @@ public class VDragAndDropWrapper extends VCustomComponent implements protected void deEmphasis(boolean doLayout) { if (emphasizedVDrop != null) { VDragAndDropWrapper.setStyleName(getElement(), OVER_STYLE, false); - VDragAndDropWrapper.setStyleName(getElement(), OVER_STYLE + "-" - + emphasizedVDrop.toString().toLowerCase(), false); - VDragAndDropWrapper.setStyleName(getElement(), OVER_STYLE + "-" - + emphasizedHDrop.toString().toLowerCase(), false); + VDragAndDropWrapper.setStyleName(getElement(), + OVER_STYLE + "-" + emphasizedVDrop.toString().toLowerCase(), + false); + VDragAndDropWrapper.setStyleName(getElement(), + OVER_STYLE + "-" + emphasizedHDrop.toString().toLowerCase(), + false); } if (doLayout) { notifySizePotentiallyChanged(); @@ -695,8 +697,10 @@ public class VDragAndDropWrapper extends VCustomComponent implements VDragAndDropWrapper.setStyleName(getElement(), OVER_STYLE, true); VDragAndDropWrapper.setStyleName(getElement(), OVER_STYLE + "-" + verticalDropLocation.toString().toLowerCase(), true); - VDragAndDropWrapper.setStyleName(getElement(), OVER_STYLE + "-" - + horizontalDropLocation.toString().toLowerCase(), true); + VDragAndDropWrapper.setStyleName(getElement(), + OVER_STYLE + "-" + + horizontalDropLocation.toString().toLowerCase(), + true); emphasizedVDrop = verticalDropLocation; emphasizedHDrop = horizontalDropLocation; diff --git a/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapperIE.java b/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapperIE.java index b32b36d13b..f9085dd7e4 100644 --- a/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapperIE.java +++ b/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapperIE.java @@ -53,7 +53,7 @@ public class VDragAndDropWrapperIE extends VDragAndDropWrapper { com.google.gwt.user.client.Element el) /*-{ var me = this; - + el.attachEvent("ondragstart", $entry(function(ev) { return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragStart(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); })); @@ -69,19 +69,19 @@ public class VDragAndDropWrapperIE extends VDragAndDropWrapper { protected native void hookHtml5Events(com.google.gwt.user.client.Element el) /*-{ var me = this; - + el.attachEvent("ondragenter", $entry(function(ev) { return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragEnter(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); })); - + el.attachEvent("ondragleave", $entry(function(ev) { return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragLeave(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); })); - + el.attachEvent("ondragover", $entry(function(ev) { return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragOver(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); })); - + el.attachEvent("ondrop", $entry(function(ev) { return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragDrop(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); })); diff --git a/client/src/main/java/com/vaadin/client/ui/VEmbedded.java b/client/src/main/java/com/vaadin/client/ui/VEmbedded.java index f3970f9ac7..1ac755d23a 100644 --- a/client/src/main/java/com/vaadin/client/ui/VEmbedded.java +++ b/client/src/main/java/com/vaadin/client/ui/VEmbedded.java @@ -83,11 +83,14 @@ public class VEmbedded extends HTML { * this by setting his own classid. */ if (uidl.hasAttribute("classid")) { - html.append("classid=\"" - + WidgetUtil.escapeAttribute(uidl - .getStringAttribute("classid")) + "\" "); + html.append( + "classid=\"" + + WidgetUtil.escapeAttribute( + uidl.getStringAttribute("classid")) + + "\" "); } else { - html.append("classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" "); + html.append( + "classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" "); } /* @@ -99,15 +102,18 @@ public class VEmbedded extends HTML { * codebase */ if (uidl.hasAttribute("codebase")) { - html.append("codebase=\"" - + WidgetUtil.escapeAttribute(uidl - .getStringAttribute("codebase")) + "\" "); + html.append( + "codebase=\"" + + WidgetUtil.escapeAttribute( + uidl.getStringAttribute("codebase")) + + "\" "); } else { - html.append("codebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0\" "); + html.append( + "codebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0\" "); } - ComponentConnector paintable = ConnectorMap.get(client).getConnector( - this); + ComponentConnector paintable = ConnectorMap.get(client) + .getConnector(this); String height = paintable.getState().height; String width = paintable.getState().width; @@ -118,23 +124,29 @@ public class VEmbedded extends HTML { // Codetype if (uidl.hasAttribute("codetype")) { - html.append("codetype=\"" - + WidgetUtil.escapeAttribute(uidl - .getStringAttribute("codetype")) + "\" "); + html.append( + "codetype=\"" + + WidgetUtil.escapeAttribute( + uidl.getStringAttribute("codetype")) + + "\" "); } // Standby if (uidl.hasAttribute("standby")) { - html.append("standby=\"" - + WidgetUtil.escapeAttribute(uidl - .getStringAttribute("standby")) + "\" "); + html.append( + "standby=\"" + + WidgetUtil.escapeAttribute( + uidl.getStringAttribute("standby")) + + "\" "); } // Archive if (uidl.hasAttribute("archive")) { - html.append("archive=\"" - + WidgetUtil.escapeAttribute(uidl - .getStringAttribute("archive")) + "\" "); + html.append( + "archive=\"" + + WidgetUtil.escapeAttribute( + uidl.getStringAttribute("archive")) + + "\" "); } // End object tag @@ -175,8 +187,8 @@ public class VEmbedded extends HTML { html.append("></embed>"); if (uidl.hasAttribute(EmbeddedConstants.ALTERNATE_TEXT)) { - html.append(uidl - .getStringAttribute(EmbeddedConstants.ALTERNATE_TEXT)); + html.append( + uidl.getStringAttribute(EmbeddedConstants.ALTERNATE_TEXT)); } // End object tag diff --git a/client/src/main/java/com/vaadin/client/ui/VFilterSelect.java b/client/src/main/java/com/vaadin/client/ui/VFilterSelect.java index cbaefde22f..4d908ddc17 100644 --- a/client/src/main/java/com/vaadin/client/ui/VFilterSelect.java +++ b/client/src/main/java/com/vaadin/client/ui/VFilterSelect.java @@ -90,10 +90,10 @@ import com.vaadin.shared.util.SharedUtil; * TODO needs major refactoring (to be extensible etc) */ @SuppressWarnings("deprecation") -public class VFilterSelect extends Composite implements Field, KeyDownHandler, - KeyUpHandler, ClickHandler, FocusHandler, BlurHandler, Focusable, - SubPartAware, HandlesAriaCaption, HandlesAriaInvalid, - HandlesAriaRequired, DeferredWorker { +public class VFilterSelect extends Composite + implements Field, KeyDownHandler, KeyUpHandler, ClickHandler, + FocusHandler, BlurHandler, Focusable, SubPartAware, HandlesAriaCaption, + HandlesAriaInvalid, HandlesAriaRequired, DeferredWorker { /** * Represents a suggestion in the suggestion popup box @@ -136,8 +136,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, public String getDisplayString() { final StringBuffer sb = new StringBuffer(); ApplicationConnection client = connector.getConnection(); - final Icon icon = client.getIcon(client - .translateVaadinUri(untranslatedIconUri)); + final Icon icon = client + .getIcon(client.translateVaadinUri(untranslatedIconUri)); if (icon != null) { sb.append(icon.getElement().getString()); } @@ -247,7 +247,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, if (isNaN(deltaY)) { deltaY = -0.5*e.wheelDelta; } - + @com.vaadin.client.ui.VFilterSelect.JsniUtil::moveScrollFromEvent(*)(widget, deltaX, deltaY, e, e.deltaMode); }); }-*/; @@ -322,8 +322,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, * Represents the popup box with the selection options. Wraps a suggestion * menu. */ - public class SuggestionPopup extends VOverlay implements PositionCallback, - CloseHandler<PopupPanel> { + public class SuggestionPopup extends VOverlay + implements PositionCallback, CloseHandler<PopupPanel> { private static final int Z_INDEX = 30000; @@ -442,9 +442,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, boolean firstPage = (currentPage == 0); final int first = currentPage * pageLength + 1 - (firstPage ? 0 : nullOffset); - final int last = first - + currentSuggestions.size() - - 1 + final int last = first + currentSuggestions.size() - 1 - (firstPage && "".equals(lastFilter) ? nullOffset : 0); final int matches = totalSuggestions - nullOffset; @@ -476,7 +474,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, // box-shadow. // IE9 and IE10 need explicit update to remove extra // box-shadows - if (BrowserInfo.get().isIE9() || BrowserInfo.get().isIE10()) { + if (BrowserInfo.get().isIE9() + || BrowserInfo.get().isIE10()) { forceReflow(); } } @@ -494,8 +493,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, } if (active) { DOM.sinkEvents(down, Event.ONCLICK); - down.setClassName(VFilterSelect.this.getStylePrimaryName() - + "-nextpage"); + down.setClassName( + VFilterSelect.this.getStylePrimaryName() + "-nextpage"); } else { DOM.sinkEvents(down, 0); down.setClassName(VFilterSelect.this.getStylePrimaryName() @@ -515,8 +514,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, if (active) { DOM.sinkEvents(up, Event.ONCLICK); - up.setClassName(VFilterSelect.this.getStylePrimaryName() - + "-prevpage"); + up.setClassName( + VFilterSelect.this.getStylePrimaryName() + "-prevpage"); } else { DOM.sinkEvents(up, 0); up.setClassName(VFilterSelect.this.getStylePrimaryName() @@ -826,7 +825,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, menuHeight -= up.getOffsetHeight() + down.getOffsetHeight() + status.getOffsetHeight(); } else { - final ComputedStyle s = new ComputedStyle(menu.getElement()); + final ComputedStyle s = new ComputedStyle( + menu.getElement()); menuHeight -= s.getIntProperty("marginBottom") + s.getIntProperty("marginTop"); } @@ -896,8 +896,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, } else if (isrelativeUnits(suggestionPopupWidth)) { float mainComponentWidth = desiredWidth - popupOuterPadding; // convert percentage value to fraction - int widthInPx = Math.round(mainComponentWidth - * asFraction(suggestionPopupWidth)); + int widthInPx = Math.round( + mainComponentWidth * asFraction(suggestionPopupWidth)); width = widthInPx + "px"; } else { // use as fixed width CSS definition @@ -917,8 +917,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, int compensation = WidgetUtil .measureHorizontalPaddingAndBorder( menu.getElement(), 4); - setTdWidth(menu.getElement(), menu.getOffsetWidth() - - compensation); + setTdWidth(menu.getElement(), + menu.getOffsetWidth() - compensation); } } @@ -1003,12 +1003,12 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, */ public void updateStyleNames(AbstractComponentState componentState) { debug("VFS.SP: updateStyleNames()"); - setStyleName(VFilterSelect.this.getStylePrimaryName() - + "-suggestpopup"); - menu.setStyleName(VFilterSelect.this.getStylePrimaryName() - + "-suggestmenu"); - status.setClassName(VFilterSelect.this.getStylePrimaryName() - + "-status"); + setStyleName( + VFilterSelect.this.getStylePrimaryName() + "-suggestpopup"); + menu.setStyleName( + VFilterSelect.this.getStylePrimaryName() + "-suggestmenu"); + status.setClassName( + VFilterSelect.this.getStylePrimaryName() + "-status"); if (ComponentStateUtil.hasStyles(componentState)) { for (String style : componentState.styles) { if (!"".equals(style)) { @@ -1023,8 +1023,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, /** * The menu where the suggestions are rendered */ - public class SuggestionMenu extends MenuBar implements SubPartAware, - LoadHandler { + public class SuggestionMenu extends MenuBar + implements SubPartAware, LoadHandler { private VLazyExecutor delayedImageLoadExecutioner = new VLazyExecutor( 100, new ScheduledCommand() { @@ -1068,8 +1068,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, */ String getPreferredHeight(int pageItemsCount) { if (currentSuggestions.size() > 0) { - final int pixels = (getPreferredHeight() / currentSuggestions - .size()) * pageItemsCount; + final int pixels = (getPreferredHeight() + / currentSuggestions.size()) * pageItemsCount; return pixels + "px"; } else { return ""; @@ -1123,8 +1123,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, && BrowserInfo.get().getBrowserMajorVersion() < 10) { // set TD width to a low value so that they won't mandate the // suggestion pop-up width - suggestionPopup - .setTdWidth(suggestionPopup.menu.getElement(), 1); + suggestionPopup.setTdWidth(suggestionPopup.menu.getElement(), + 1); } } @@ -1167,13 +1167,14 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, if (p > 0) { for (int i = 0; i < p; i++) { final MenuItem potentialExactMatch = getItems().get(i); - if (potentialExactMatch.getText().equals(enteredItemValue)) { + if (potentialExactMatch.getText() + .equals(enteredItemValue)) { selectItem(potentialExactMatch); // do not send a value change event if null was and // stays selected if (!"".equals(enteredItemValue) - || (selectedOptionKey != null && !"" - .equals(selectedOptionKey))) { + || (selectedOptionKey != null + && !"".equals(selectedOptionKey))) { doItemAction(potentialExactMatch, true); } suggestionPopup.hide(); @@ -1190,13 +1191,12 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, lastNewItemString = enteredItemValue; connector.sendNewItem(enteredItemValue); } - } else if (item != null - && !"".equals(lastFilter) - && (filteringmode == FilteringMode.CONTAINS ? item - .getText().toLowerCase() - .contains(lastFilter.toLowerCase()) : item - .getText().toLowerCase() - .startsWith(lastFilter.toLowerCase()))) { + } else if (item != null && !"".equals(lastFilter) + && (filteringmode == FilteringMode.CONTAINS + ? item.getText().toLowerCase() + .contains(lastFilter.toLowerCase()) + : item.getText().toLowerCase() + .startsWith(lastFilter.toLowerCase()))) { doItemAction(item, true); } else { // currentSuggestion has key="" for nullselection @@ -1220,8 +1220,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, @Override public com.google.gwt.user.client.Element getSubPartElement( String subPart) { - int index = Integer.parseInt(subPart.substring(SUBPART_PREFIX - .length())); + int index = Integer + .parseInt(subPart.substring(SUBPART_PREFIX.length())); MenuItem item = getItems().get(index); @@ -1287,8 +1287,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, */ int getItemOffsetHeight() { List<MenuItem> items = getItems(); - return items != null && items.size() > 0 ? items.get(0) - .getOffsetHeight() : 0; + return items != null && items.size() > 0 + ? items.get(0).getOffsetHeight() : 0; } /* @@ -1296,8 +1296,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, */ int getItemOffsetWidth() { List<MenuItem> items = getItems(); - return items != null && items.size() > 0 ? items.get(0) - .getOffsetWidth() : 0; + return items != null && items.size() > 0 + ? items.get(0).getOffsetWidth() : 0; } /** @@ -1313,8 +1313,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, String height = getElement().getStyle().getHeight(); String preferredHeight = getPreferredHeight(pageLength); - return !(height == null || height.length() == 0 || height - .equals(preferredHeight)); + return !(height == null || height.length() == 0 + || height.equals(preferredHeight)); } } @@ -1730,8 +1730,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, suggestionPopup = createSuggestionPopup(); popupOpener.sinkEvents(Event.ONMOUSEDOWN); - Roles.getButtonRole() - .setAriaHiddenState(popupOpener.getElement(), true); + Roles.getButtonRole().setAriaHiddenState(popupOpener.getElement(), + true); Roles.getButtonRole().set(popupOpener.getElement()); panel.add(tb); @@ -1865,8 +1865,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, if (filter.equals(lastFilter) && currentPage == page) { if (!suggestionPopup.isAttached()) { - suggestionPopup.showSuggestions(currentSuggestions, - currentPage, totalMatches); + suggestionPopup.showSuggestions(currentSuggestions, currentPage, + totalMatches); } return; } @@ -2001,7 +2001,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, } setSelectedItemIcon(suggestion.getIconUri()); - if (!(newKey.equals(selectedOptionKey) || ("".equals(newKey) && selectedOptionKey == null))) { + if (!(newKey.equals(selectedOptionKey) + || ("".equals(newKey) && selectedOptionKey == null))) { selectedOptionKey = newKey; connector.sendSelection(selectedOptionKey); @@ -2039,8 +2040,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, if (selectedItemIcon != null) { panel.remove(selectedItemIcon); } - selectedItemIcon = new IconWidget(connector.getConnection() - .getIcon(iconUri)); + selectedItemIcon = new IconWidget( + connector.getConnection().getIcon(iconUri)); // Older IE versions don't scale icon correctly if DOM // contains height and width attributes. selectedItemIcon.getElement().removeAttribute("height"); @@ -2094,8 +2095,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, // at this point, suggestion key matches the new selection key if (updatePromptAndSelectionIfMatchFound) { if (!suggestionKey.equals(selectedOptionKey) - || suggestion.getReplacementString().equals( - tb.getText()) + || suggestion.getReplacementString() + .equals(tb.getText()) || oldSuggestionTextMatchTheOldSelection) { // Update text field if we've got a new // selection @@ -2164,8 +2165,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, int iconHeight = WidgetUtil.getRequiredHeight(selectedItemIcon); int marginTop = (availableHeight - iconHeight) / 2; - selectedItemIcon.getElement().getStyle() - .setMarginTop(marginTop, Unit.PX); + selectedItemIcon.getElement().getStyle().setMarginTop(marginTop, + Unit.PX); } private static Set<Integer> navigationKeyCodes = new HashSet<Integer>(); @@ -2201,8 +2202,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, * items, wrongly interpreted responses and more. */ if (enableDebug) { - debug("Ignoring " - + keyCode + debug("Ignoring " + keyCode + " because we are waiting for a filtering response"); } DOM.eventPreventDefault(DOM.eventGetCurrentEvent()); @@ -2260,9 +2260,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, return; } - if (currentSuggestion != null - && tb.getText().equals( - currentSuggestion.getReplacementString())) { + if (currentSuggestion != null && tb.getText() + .equals(currentSuggestion.getReplacementString())) { // Retain behavior from #6686 by returning without stopping // propagation if there's nothing to do return; @@ -2439,9 +2438,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, @Override public void onClick(ClickEvent event) { debug("VFS: onClick()"); - if (textInputEnabled - && event.getNativeEvent().getEventTarget().cast() == tb - .getElement()) { + if (textInputEnabled && event.getNativeEvent().getEventTarget() + .cast() == tb.getElement()) { // Don't process clicks on the text field if text input is enabled return; } @@ -2581,9 +2579,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, preventNextBlurEventInIE = false; Element focusedElement = WidgetUtil.getFocusedElement(); - if (getElement().isOrHasChild(focusedElement) - || suggestionPopup.getElement() - .isOrHasChild(focusedElement)) { + if (getElement().isOrHasChild(focusedElement) || suggestionPopup + .getElement().isOrHasChild(focusedElement)) { // IF the suggestion popup or another part of the VFilterSelect // was focused, move the focus back to the textfield and prevent @@ -2664,10 +2661,10 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, // Use util.getRequiredWidth instead of getOffsetWidth here - int iconWidth = selectedItemIcon == null ? 0 : WidgetUtil - .getRequiredWidth(selectedItemIcon); - int buttonWidth = popupOpener == null ? 0 : WidgetUtil - .getRequiredWidth(popupOpener); + int iconWidth = selectedItemIcon == null ? 0 + : WidgetUtil.getRequiredWidth(selectedItemIcon); + int buttonWidth = popupOpener == null ? 0 + : WidgetUtil.getRequiredWidth(popupOpener); /* * Instead of setting the width of the wrapper, set the width of @@ -2685,8 +2682,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, * locked */ if (!tb.getElement().getStyle().getWidth().endsWith("px")) { - int iconWidth = selectedItemIcon == null ? 0 : selectedItemIcon - .getOffsetWidth(); + int iconWidth = selectedItemIcon == null ? 0 + : selectedItemIcon.getOffsetWidth(); tb.setWidth((tb.getOffsetWidth() - iconWidth) + "px"); } } @@ -2745,7 +2742,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, } @Override - public com.google.gwt.user.client.Element getSubPartElement(String subPart) { + public com.google.gwt.user.client.Element getSubPartElement( + String subPart) { String[] parts = subPart.split("/"); if ("textbox".equals(parts[0])) { return tb.getElement(); @@ -2761,7 +2759,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, } @Override - public String getSubPartName(com.google.gwt.user.client.Element subElement) { + public String getSubPartName( + com.google.gwt.user.client.Element subElement) { if (tb.getElement().isOrHasChild(subElement)) { return "textbox"; } else if (popupOpener.getElement().isOrHasChild(subElement)) { @@ -2795,8 +2794,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, } /** - * Sets the caption of selected item, if "scroll to page" is disabled. - * This method is meant for internal use and may change in future versions. + * Sets the caption of selected item, if "scroll to page" is disabled. This + * method is meant for internal use and may change in future versions. * * @since 7.7 * @param selectedCaption diff --git a/client/src/main/java/com/vaadin/client/ui/VFlash.java b/client/src/main/java/com/vaadin/client/ui/VFlash.java index eaf53836ee..f6d62f0c07 100644 --- a/client/src/main/java/com/vaadin/client/ui/VFlash.java +++ b/client/src/main/java/com/vaadin/client/ui/VFlash.java @@ -156,10 +156,11 @@ public class VFlash extends HTML { * this by setting his own classid. */ if (classId != null) { - html.append("classid=\"" + WidgetUtil.escapeAttribute(classId) - + "\" "); + html.append( + "classid=\"" + WidgetUtil.escapeAttribute(classId) + "\" "); } else { - html.append("classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" "); + html.append( + "classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" "); } /* @@ -174,7 +175,8 @@ public class VFlash extends HTML { html.append("codebase=\"" + WidgetUtil.escapeAttribute(codebase) + "\" "); } else { - html.append("codebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0\" "); + html.append( + "codebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0\" "); } // Add width and height @@ -190,14 +192,14 @@ public class VFlash extends HTML { // Standby if (standby != null) { - html.append("standby=\"" + WidgetUtil.escapeAttribute(standby) - + "\" "); + html.append( + "standby=\"" + WidgetUtil.escapeAttribute(standby) + "\" "); } // Archive if (archive != null) { - html.append("archive=\"" + WidgetUtil.escapeAttribute(archive) - + "\" "); + html.append( + "archive=\"" + WidgetUtil.escapeAttribute(archive) + "\" "); } // End object tag @@ -213,7 +215,8 @@ public class VFlash extends HTML { html.append("<param "); html.append("name=\"" + WidgetUtil.escapeAttribute(name) + "\" "); html.append("value=\"" - + WidgetUtil.escapeAttribute(embedParams.get(name)) + "\" "); + + WidgetUtil.escapeAttribute(embedParams.get(name)) + + "\" "); html.append("/>"); } @@ -228,8 +231,8 @@ public class VFlash extends HTML { for (String name : embedParams.keySet()) { html.append(WidgetUtil.escapeAttribute(name)); html.append("="); - html.append("\"" - + WidgetUtil.escapeAttribute(embedParams.get(name)) + "\""); + html.append("\"" + WidgetUtil.escapeAttribute(embedParams.get(name)) + + "\""); } // End embed tag diff --git a/client/src/main/java/com/vaadin/client/ui/VFormLayout.java b/client/src/main/java/com/vaadin/client/ui/VFormLayout.java index 3719688f2b..150328e867 100644 --- a/client/src/main/java/com/vaadin/client/ui/VFormLayout.java +++ b/client/src/main/java/com/vaadin/client/ui/VFormLayout.java @@ -111,7 +111,8 @@ public class VFormLayout extends SimplePanel { if (caption.getOwner() != null) { if (caption.getOwner() instanceof Focusable) { ((Focusable) caption.getOwner()).focus(); - } else if (caption.getOwner() instanceof com.google.gwt.user.client.ui.Focusable) { + } else if (caption + .getOwner() instanceof com.google.gwt.user.client.ui.Focusable) { ((com.google.gwt.user.client.ui.Focusable) caption .getOwner()).setFocus(true); } @@ -124,8 +125,7 @@ public class VFormLayout extends SimplePanel { margins.hasTop()); setStyleName(margin, CLASSNAME + "-" + StyleConstants.MARGIN_RIGHT, margins.hasRight()); - setStyleName(margin, - CLASSNAME + "-" + StyleConstants.MARGIN_BOTTOM, + setStyleName(margin, CLASSNAME + "-" + StyleConstants.MARGIN_BOTTOM, margins.hasBottom()); setStyleName(margin, CLASSNAME + "-" + StyleConstants.MARGIN_LEFT, margins.hasLeft()); @@ -253,7 +253,8 @@ public class VFormLayout extends SimplePanel { setStyleName(styleName); } - public void updateCaption(AbstractComponentState state, boolean enabled) { + public void updateCaption(AbstractComponentState state, + boolean enabled) { // Update styles as they might have changed when the caption changed setStyles(getStylesFromState(state, enabled)); @@ -264,9 +265,8 @@ public class VFormLayout extends SimplePanel { icon = null; } if (state.resources.containsKey(ComponentConstants.ICON_RESOURCE)) { - icon = owner.getConnection().getIcon( - state.resources.get(ComponentConstants.ICON_RESOURCE) - .getURL()); + icon = owner.getConnection().getIcon(state.resources + .get(ComponentConstants.ICON_RESOURCE).getURL()); DOM.insertChild(getElement(), icon.getElement(), 0); isEmpty = false; @@ -317,8 +317,8 @@ public class VFormLayout extends SimplePanel { // Hide the required indicator from screen reader, as this // information is set directly at the input field - Roles.getTextboxRole().setAriaHiddenState( - requiredFieldIndicator, true); + Roles.getTextboxRole() + .setAriaHiddenState(requiredFieldIndicator, true); } } else { if (requiredFieldIndicator != null) { @@ -378,8 +378,8 @@ public class VFormLayout extends SimplePanel { // Hide the error indicator from screen reader, as this // information is set directly at the input field - Roles.getFormRole().setAriaHiddenState( - errorIndicatorElement, true); + Roles.getFormRole() + .setAriaHiddenState(errorIndicatorElement, true); } } else if (errorIndicatorElement != null) { diff --git a/client/src/main/java/com/vaadin/client/ui/VGridLayout.java b/client/src/main/java/com/vaadin/client/ui/VGridLayout.java index 9e13bb7fb2..3578ab8c36 100644 --- a/client/src/main/java/com/vaadin/client/ui/VGridLayout.java +++ b/client/src/main/java/com/vaadin/client/ui/VGridLayout.java @@ -155,7 +155,8 @@ public class VGridLayout extends ComplexPanel { expandRatioSum += actualExpandRatio[i]; } for (int i = 0; i < rowHeights.length; i++) { - int ew = (int) (excessSpace * actualExpandRatio[i] / expandRatioSum); + int ew = (int) (excessSpace * actualExpandRatio[i] + / expandRatioSum); rowHeights[i] = minRowHeights[i] + ew; distributed += ew; } @@ -236,7 +237,8 @@ public class VGridLayout extends ComplexPanel { expandRatioSum += actualExpandRatio[i]; } for (int i = 0; i < columnWidths.length; i++) { - int ew = (int) (excessSpace * actualExpandRatio[i] / expandRatioSum); + int ew = (int) (excessSpace * actualExpandRatio[i] + / expandRatioSum); columnWidths[i] = minColumnWidths[i] + ew; distributed += ew; } @@ -533,9 +535,8 @@ public class VGridLayout extends ComplexPanel { } } - private static void distributeSpanSize(int[] dimensions, - int spanStartIndex, int spanSize, int spacingSize, int size, - float[] expansionRatios) { + private static void distributeSpanSize(int[] dimensions, int spanStartIndex, + int spanSize, int spacingSize, int size, float[] expansionRatios) { int allocated = dimensions[spanStartIndex]; for (int i = 1; i < spanSize; i++) { allocated += spacingSize + dimensions[spanStartIndex + i]; diff --git a/client/src/main/java/com/vaadin/client/ui/VMenuBar.java b/client/src/main/java/com/vaadin/client/ui/VMenuBar.java index b3825d2de5..e0358413ac 100644 --- a/client/src/main/java/com/vaadin/client/ui/VMenuBar.java +++ b/client/src/main/java/com/vaadin/client/ui/VMenuBar.java @@ -53,8 +53,8 @@ import com.vaadin.client.Util; import com.vaadin.client.WidgetUtil; import com.vaadin.shared.ui.menubar.MenuBarConstants; -public class VMenuBar extends SimpleFocusablePanel implements - CloseHandler<PopupPanel>, KeyPressHandler, KeyDownHandler, +public class VMenuBar extends SimpleFocusablePanel + implements CloseHandler<PopupPanel>, KeyPressHandler, KeyDownHandler, FocusHandler, SubPartAware { // The hierarchy of VMenuBar is a bit weird as VMenuBar is the Paintable, @@ -171,8 +171,8 @@ public class VMenuBar extends SimpleFocusablePanel implements } protected void updateStyleNames() { - String primaryStyleName = getParentMenu() != null ? getParentMenu() - .getStylePrimaryName() : getStylePrimaryName(); + String primaryStyleName = getParentMenu() != null + ? getParentMenu().getStylePrimaryName() : getStylePrimaryName(); // Reset the style name for all the items for (CustomMenuItem item : items) { @@ -184,8 +184,8 @@ public class VMenuBar extends SimpleFocusablePanel implements /* * Sub-menus should get the sub-menu prefix */ - super.setStylePrimaryName(primaryStyleName - + SUBMENU_CLASSNAME_PREFIX); + super.setStylePrimaryName( + primaryStyleName + SUBMENU_CLASSNAME_PREFIX); } } @@ -224,7 +224,8 @@ public class VMenuBar extends SimpleFocusablePanel implements if (item.getChildCount() > 0) { String bgStyle = ""; itemHTML.append("<span class=\"" + getStylePrimaryName() - + "-submenu-indicator\"" + bgStyle + ">►</span>"); + + "-submenu-indicator\"" + bgStyle + + ">►</span>"); } itemHTML.append("<span class=\"" + getStylePrimaryName() @@ -467,7 +468,8 @@ public class VMenuBar extends SimpleFocusablePanel implements * @param item */ public void itemOver(CustomMenuItem item) { - if ((openRootOnHover || subMenu || menuVisible) && !item.isSeparator()) { + if ((openRootOnHover || subMenu || menuVisible) + && !item.isSeparator()) { setSelected(item); if (!subMenu && openRootOnHover && !menuVisible) { menuVisible = true; // start opening menus @@ -576,11 +578,11 @@ public class VMenuBar extends SimpleFocusablePanel implements * Use parents primary style name if possible and remove the submenu * prefix if needed */ - String primaryStyleName = parentMenu != null ? parentMenu - .getStylePrimaryName() : getStylePrimaryName(); + String primaryStyleName = parentMenu != null + ? parentMenu.getStylePrimaryName() : getStylePrimaryName(); if (subMenu) { - primaryStyleName = primaryStyleName.replace( - SUBMENU_CLASSNAME_PREFIX, ""); + primaryStyleName = primaryStyleName + .replace(SUBMENU_CLASSNAME_PREFIX, ""); } popup.setStyleName(primaryStyleName + "-popup"); @@ -649,8 +651,8 @@ public class VMenuBar extends SimpleFocusablePanel implements private int adjustPopupHeight(int top, final int shadowSpace) { // Check that the popup will fit the screen - int availableHeight = RootPanel.getBodyElement().getOffsetHeight() - - top - shadowSpace; + int availableHeight = RootPanel.getBodyElement().getOffsetHeight() - top + - shadowSpace; int missingHeight = popup.getOffsetHeight() - availableHeight; if (missingHeight > 0) { // First move the top of the popup to get more space @@ -922,8 +924,8 @@ public class VMenuBar extends SimpleFocusablePanel implements String primaryStyleName = parentMenu.getStylePrimaryName(); if (parentMenu.subMenu) { - primaryStyleName = primaryStyleName.replace( - SUBMENU_CLASSNAME_PREFIX, ""); + primaryStyleName = primaryStyleName + .replace(SUBMENU_CLASSNAME_PREFIX, ""); } String currentStyles = super.getStyleName(); @@ -1055,20 +1057,21 @@ public class VMenuBar extends SimpleFocusablePanel implements // if the selected attribute is present (either true or false), // the item is selectable setCheckable(true); - setChecked(uidl - .getBooleanAttribute(MenuBarConstants.ATTRIBUTE_CHECKED)); + setChecked(uidl.getBooleanAttribute( + MenuBarConstants.ATTRIBUTE_CHECKED)); } else { setCheckable(false); } if (uidl.hasAttribute(MenuBarConstants.ATTRIBUTE_ITEM_STYLE)) { - styleName = uidl - .getStringAttribute(MenuBarConstants.ATTRIBUTE_ITEM_STYLE); + styleName = uidl.getStringAttribute( + MenuBarConstants.ATTRIBUTE_ITEM_STYLE); } - if (uidl.hasAttribute(MenuBarConstants.ATTRIBUTE_ITEM_DESCRIPTION)) { - description = uidl - .getStringAttribute(MenuBarConstants.ATTRIBUTE_ITEM_DESCRIPTION); + if (uidl.hasAttribute( + MenuBarConstants.ATTRIBUTE_ITEM_DESCRIPTION)) { + description = uidl.getStringAttribute( + MenuBarConstants.ATTRIBUTE_ITEM_DESCRIPTION); } updateStyleNames(); @@ -1104,8 +1107,8 @@ public class VMenuBar extends SimpleFocusablePanel implements public void iLayout(boolean iconLoadEvent) { // Only collapse if there is more than one item in the root menu and the // menu has an explicit size - if ((getItems().size() > 1 || (collapsedRootItems != null && collapsedRootItems - .getItems().size() > 0)) + if ((getItems().size() > 1 || (collapsedRootItems != null + && collapsedRootItems.getItems().size() > 0)) && getElement().getStyle().getProperty("width") != null && moreItem != null) { @@ -1117,8 +1120,8 @@ public class VMenuBar extends SimpleFocusablePanel implements removeItem(moreItem); } - int availableWidth = LayoutManager.get(client).getInnerWidth( - getElement()); + int availableWidth = LayoutManager.get(client) + .getInnerWidth(getElement()); // Used width includes the "more" item if present int usedWidth = getConsumedWidth(); @@ -1135,8 +1138,8 @@ public class VMenuBar extends SimpleFocusablePanel implements while (widthReduced < widthNeeded && getItems().size() > 0) { // Move last root menu item to collapsed menu - CustomMenuItem collapse = getItems().get( - getItems().size() - 1); + CustomMenuItem collapse = getItems() + .get(getItems().size() - 1); widthReduced += collapse.getOffsetWidth(); removeItem(collapse); collapsedRootItems.addItem(collapse, 0); @@ -1587,10 +1590,11 @@ public class VMenuBar extends SimpleFocusablePanel implements private final String SUBPART_PREFIX = "item"; @Override - public com.google.gwt.user.client.Element getSubPartElement(String subPart) { + public com.google.gwt.user.client.Element getSubPartElement( + String subPart) { if (subPart.startsWith(SUBPART_PREFIX)) { - int index = Integer.parseInt(subPart.substring(SUBPART_PREFIX - .length())); + int index = Integer + .parseInt(subPart.substring(SUBPART_PREFIX.length())); CustomMenuItem item = getItems().get(index); return item.getElement(); @@ -1609,7 +1613,8 @@ public class VMenuBar extends SimpleFocusablePanel implements if (!item.isSeparator() && isItemNamed(item, subPart)) { return item.getElement(); } - if (item.getSubMenu() != null && item.getSubMenu().menuVisible) { + if (item.getSubMenu() != null + && item.getSubMenu().menuVisible) { submenuItems.addAll(item.getSubMenu().getItems()); } @@ -1654,7 +1659,8 @@ public class VMenuBar extends SimpleFocusablePanel implements } @Override - public String getSubPartName(com.google.gwt.user.client.Element subElement) { + public String getSubPartName( + com.google.gwt.user.client.Element subElement) { if (!getElement().isOrHasChild(subElement)) { return null; } diff --git a/client/src/main/java/com/vaadin/client/ui/VNativeSelect.java b/client/src/main/java/com/vaadin/client/ui/VNativeSelect.java index 330442b550..d3c29b64ad 100644 --- a/client/src/main/java/com/vaadin/client/ui/VNativeSelect.java +++ b/client/src/main/java/com/vaadin/client/ui/VNativeSelect.java @@ -92,8 +92,8 @@ public class VNativeSelect extends VOptionGroupBase implements Field { client.updateVariable(paintableId, "selected", getSelectedItems(), isImmediate()); } else { - client.updateVariable(paintableId, "selected", new String[] { "" - + getSelectedItem() }, isImmediate()); + client.updateVariable(paintableId, "selected", + new String[] { "" + getSelectedItem() }, isImmediate()); } if (firstValueIsTemporaryNullItem) { // remove temporary empty item diff --git a/client/src/main/java/com/vaadin/client/ui/VNotification.java b/client/src/main/java/com/vaadin/client/ui/VNotification.java index 1ff51df8d0..c33c0e4835 100644 --- a/client/src/main/java/com/vaadin/client/ui/VNotification.java +++ b/client/src/main/java/com/vaadin/client/ui/VNotification.java @@ -227,8 +227,8 @@ public class VNotification extends VOverlay { return null; } - return getApplicationConnection().getUIConnector().getState().notificationConfigurations - .get(style); + return getApplicationConnection().getUIConnector() + .getState().notificationConfigurations.get(style); } private void setWaiAriaRole(NotificationTypeConfiguration styleSetup) { @@ -296,14 +296,13 @@ public class VNotification extends VOverlay { // Still animating in, wait for it to finish before touching // the animation delay (which would restart the animation-in // in some browsers) - if (getStyleName().contains( - VOverlay.ADDITIONAL_CLASSNAME_ANIMATE_IN)) { + if (getStyleName() + .contains(VOverlay.ADDITIONAL_CLASSNAME_ANIMATE_IN)) { AnimationUtil.addAnimationEndListener(getElement(), new AnimationEndListener() { @Override public void onAnimationEnd(NativeEvent event) { - if (AnimationUtil - .getAnimationName(event) + if (AnimationUtil.getAnimationName(event) .contains( VOverlay.ADDITIONAL_CLASSNAME_ANIMATE_IN)) { VNotification.this.hide(); @@ -439,8 +438,10 @@ public class VNotification extends VOverlay { if (x < 0) { x = DOM.eventGetClientX(event); y = DOM.eventGetClientY(event); - } else if (Math.abs(DOM.eventGetClientX(event) - x) > mouseMoveThreshold - || Math.abs(DOM.eventGetClientY(event) - y) > mouseMoveThreshold) { + } else if (Math + .abs(DOM.eventGetClientX(event) - x) > mouseMoveThreshold + || Math.abs(DOM.eventGetClientY(event) + - y) > mouseMoveThreshold) { hideAfterDelay(); } break; @@ -487,18 +488,19 @@ public class VNotification extends VOverlay { public static void showNotification(ApplicationConnection client, final UIDL notification) { - boolean onlyPlainText = notification - .hasAttribute(UIConstants.NOTIFICATION_HTML_CONTENT_NOT_ALLOWED); + boolean onlyPlainText = notification.hasAttribute( + UIConstants.NOTIFICATION_HTML_CONTENT_NOT_ALLOWED); String html = ""; - if (notification.hasAttribute(UIConstants.ATTRIBUTE_NOTIFICATION_ICON)) { - String iconUri = notification - .getStringAttribute(UIConstants.ATTRIBUTE_NOTIFICATION_ICON); + if (notification + .hasAttribute(UIConstants.ATTRIBUTE_NOTIFICATION_ICON)) { + String iconUri = notification.getStringAttribute( + UIConstants.ATTRIBUTE_NOTIFICATION_ICON); html += client.getIcon(iconUri).getElement().getString(); } if (notification .hasAttribute(UIConstants.ATTRIBUTE_NOTIFICATION_CAPTION)) { - String caption = notification - .getStringAttribute(UIConstants.ATTRIBUTE_NOTIFICATION_CAPTION); + String caption = notification.getStringAttribute( + UIConstants.ATTRIBUTE_NOTIFICATION_CAPTION); if (onlyPlainText) { caption = WidgetUtil.escapeHTML(caption); caption = caption.replaceAll("\\n", "<br />"); @@ -508,20 +510,21 @@ public class VNotification extends VOverlay { } if (notification .hasAttribute(UIConstants.ATTRIBUTE_NOTIFICATION_MESSAGE)) { - String message = notification - .getStringAttribute(UIConstants.ATTRIBUTE_NOTIFICATION_MESSAGE); + String message = notification.getStringAttribute( + UIConstants.ATTRIBUTE_NOTIFICATION_MESSAGE); if (onlyPlainText) { message = WidgetUtil.escapeHTML(message); message = message.replaceAll("\\n", "<br />"); } - html += "<p class='" + getDependentStyle(client, DESCRIPTION) - + "'>" + message + "</p>"; + html += "<p class='" + getDependentStyle(client, DESCRIPTION) + "'>" + + message + "</p>"; } final String style = notification - .hasAttribute(UIConstants.ATTRIBUTE_NOTIFICATION_STYLE) ? notification - .getStringAttribute(UIConstants.ATTRIBUTE_NOTIFICATION_STYLE) - : null; + .hasAttribute(UIConstants.ATTRIBUTE_NOTIFICATION_STYLE) + ? notification.getStringAttribute( + UIConstants.ATTRIBUTE_NOTIFICATION_STYLE) + : null; final int pos = notification .getIntAttribute(UIConstants.ATTRIBUTE_NOTIFICATION_POSITION); @@ -529,8 +532,8 @@ public class VNotification extends VOverlay { final int delay = notification .getIntAttribute(UIConstants.ATTRIBUTE_NOTIFICATION_DELAY); - createNotification(delay, client.getUIConnector().getWidget()).show( - html, position, style); + createNotification(delay, client.getUIConnector().getWidget()) + .show(html, position, style); } /** @@ -546,15 +549,16 @@ public class VNotification extends VOverlay { */ public static String getDependentStyle(ApplicationConnection client, String style) { - VNotification notification = createNotification(-1, client - .getUIConnector().getWidget()); + VNotification notification = createNotification(-1, + client.getUIConnector().getWidget()); String styleName = notification.getStyleName(); notification.addStyleDependentName(style); String extendedStyle = notification.getStyleName(); return extendedStyle.substring(styleName.length()).trim(); } - public static VNotification createNotification(int delayMsec, Widget owner) { + public static VNotification createNotification(int delayMsec, + Widget owner) { final VNotification notification = GWT.create(VNotification.class); notification.setWaiAriaRole(null); notification.setDelay(delayMsec); @@ -665,8 +669,8 @@ public class VNotification extends VOverlay { * messages, such as session expired. * */ - private static class NotificationRedirect implements - VNotification.EventListener { + private static class NotificationRedirect + implements VNotification.EventListener { String url; NotificationRedirect(String url) { diff --git a/client/src/main/java/com/vaadin/client/ui/VOptionGroup.java b/client/src/main/java/com/vaadin/client/ui/VOptionGroup.java index a3c9f069b3..4391683ac7 100644 --- a/client/src/main/java/com/vaadin/client/ui/VOptionGroup.java +++ b/client/src/main/java/com/vaadin/client/ui/VOptionGroup.java @@ -48,8 +48,8 @@ import com.vaadin.client.WidgetUtil; import com.vaadin.shared.EventId; import com.vaadin.shared.ui.optiongroup.OptionGroupConstants; -public class VOptionGroup extends VOptionGroupBase implements FocusHandler, - BlurHandler { +public class VOptionGroup extends VOptionGroupBase + implements FocusHandler, BlurHandler { public static final String CLASSNAME = "v-select-optiongroup"; @@ -150,7 +150,8 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler, // Need to recreate object if isMultiselect is changed (#10451) // OR if htmlContentAllowed changed due to Safari 5 issue - if ((op == null) || (isHtmlContentAllowed() != wasHtmlContentAllowed) + if ((op == null) + || (isHtmlContentAllowed() != wasHtmlContentAllowed) || (isMultiselect() != wasMultiselect)) { // Create a new element if (isMultiselect()) { @@ -172,8 +173,8 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler, op.setHTML(itemHtml); op.setValue(opUidl.getBooleanAttribute("selected")); - boolean optionEnabled = !opUidl - .getBooleanAttribute(OptionGroupConstants.ATTRIBUTE_OPTION_DISABLED); + boolean optionEnabled = !opUidl.getBooleanAttribute( + OptionGroupConstants.ATTRIBUTE_OPTION_DISABLED); boolean enabled = optionEnabled && !isReadonly() && isEnabled(); op.setEnabled(enabled); optionsEnabled.put(op, optionEnabled); @@ -234,7 +235,8 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler, @Override public void setTabIndex(int tabIndex) { - for (Iterator<Widget> iterator = panel.iterator(); iterator.hasNext();) { + for (Iterator<Widget> iterator = panel.iterator(); iterator + .hasNext();) { FocusWidget widget = (FocusWidget) iterator.next(); widget.setTabIndex(tabIndex); } diff --git a/client/src/main/java/com/vaadin/client/ui/VOptionGroupBase.java b/client/src/main/java/com/vaadin/client/ui/VOptionGroupBase.java index 5bee6b51ae..d94f205edc 100644 --- a/client/src/main/java/com/vaadin/client/ui/VOptionGroupBase.java +++ b/client/src/main/java/com/vaadin/client/ui/VOptionGroupBase.java @@ -160,8 +160,8 @@ public abstract class VOptionGroupBase extends Composite implements Field, client.updateVariable(paintableId, "selected", getSelectedItems(), immediate); } else { - client.updateVariable(paintableId, "selected", new String[] { "" - + getSelectedItem() }, immediate); + client.updateVariable(paintableId, "selected", + new String[] { "" + getSelectedItem() }, immediate); } } diff --git a/client/src/main/java/com/vaadin/client/ui/VOverlay.java b/client/src/main/java/com/vaadin/client/ui/VOverlay.java index 5dc29f5a42..52b5fbb3c1 100644 --- a/client/src/main/java/com/vaadin/client/ui/VOverlay.java +++ b/client/src/main/java/com/vaadin/client/ui/VOverlay.java @@ -119,9 +119,8 @@ public class VOverlay extends Overlay implements CloseHandler<PopupPanel> { if (ac == null) { // could not figure out which one we belong to, styling will // probably fail - Logger.getLogger(getClass().getSimpleName()) - .warning( - "Could not determine ApplicationConnection for Overlay. Overlay will be attached directly to the root panel"); + Logger.getLogger(getClass().getSimpleName()).warning( + "Could not determine ApplicationConnection for Overlay. Overlay will be attached directly to the root panel"); return super.getOverlayContainer(); } else { return getOverlayContainer(ac); diff --git a/client/src/main/java/com/vaadin/client/ui/VPanel.java b/client/src/main/java/com/vaadin/client/ui/VPanel.java index 946ff83180..1bda29fbbf 100644 --- a/client/src/main/java/com/vaadin/client/ui/VPanel.java +++ b/client/src/main/java/com/vaadin/client/ui/VPanel.java @@ -27,8 +27,8 @@ import com.vaadin.client.Focusable; import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner; import com.vaadin.client.ui.TouchScrollDelegate.TouchScrollHandler; -public class VPanel extends SimplePanel implements ShortcutActionHandlerOwner, - Focusable { +public class VPanel extends SimplePanel + implements ShortcutActionHandlerOwner, Focusable { public static final String CLASSNAME = "v-panel"; @@ -175,8 +175,8 @@ public class VPanel extends SimplePanel implements ShortcutActionHandlerOwner, "scrollTop"); int newscrollLeft = DOM.getElementPropertyInt(contentNode, "scrollLeft"); - if (client != null - && (newscrollLeft != scrollLeft || newscrollTop != scrollTop)) { + if (client != null && (newscrollLeft != scrollLeft + || newscrollTop != scrollTop)) { scrollLeft = newscrollLeft; scrollTop = newscrollTop; client.updateVariable(id, "scrollTop", scrollTop, false); diff --git a/client/src/main/java/com/vaadin/client/ui/VPopupCalendar.java b/client/src/main/java/com/vaadin/client/ui/VPopupCalendar.java index 47f11b09b1..1b0f26d08a 100644 --- a/client/src/main/java/com/vaadin/client/ui/VPopupCalendar.java +++ b/client/src/main/java/com/vaadin/client/ui/VPopupCalendar.java @@ -64,8 +64,8 @@ import com.vaadin.shared.ui.datefield.Resolution; * method. * */ -public class VPopupCalendar extends VTextualDate implements Field, - ClickHandler, CloseHandler<PopupPanel>, SubPartAware { +public class VPopupCalendar extends VTextualDate + implements Field, ClickHandler, CloseHandler<PopupPanel>, SubPartAware { /** For internal use only. May be removed or replaced in the future. */ public final Button calendarToggle = new Button(); @@ -129,8 +129,8 @@ public class VPopupCalendar extends VTextualDate implements Field, // Description of the usage of the widget for assisitve device users descriptionForAssisitveDevicesElement = DOM.createDiv(); - descriptionForAssisitveDevicesElement - .setInnerText(PopupDateFieldState.DESCRIPTION_FOR_ASSISTIVE_DEVICES); + descriptionForAssisitveDevicesElement.setInnerText( + PopupDateFieldState.DESCRIPTION_FOR_ASSISTIVE_DEVICES); AriaHelper.ensureHasId(descriptionForAssisitveDevicesElement); Roles.getTextboxRole().setAriaDescribedbyProperty(text.getElement(), Id.of(descriptionForAssisitveDevicesElement)); @@ -230,16 +230,19 @@ public class VPopupCalendar extends VTextualDate implements Field, .getCalendarField()) { getClient().updateVariable(getId(), "day", newDate.getDate(), false); - if (getCurrentResolution().getCalendarField() > Resolution.DAY - .getCalendarField()) { + if (getCurrentResolution() + .getCalendarField() > Resolution.DAY + .getCalendarField()) { getClient().updateVariable(getId(), "hour", newDate.getHours(), false); - if (getCurrentResolution().getCalendarField() > Resolution.HOUR - .getCalendarField()) { + if (getCurrentResolution() + .getCalendarField() > Resolution.HOUR + .getCalendarField()) { getClient().updateVariable(getId(), "min", newDate.getMinutes(), false); - if (getCurrentResolution().getCalendarField() > Resolution.MINUTE - .getCalendarField()) { + if (getCurrentResolution() + .getCalendarField() > Resolution.MINUTE + .getCalendarField()) { getClient().updateVariable(getId(), "sec", newDate.getSeconds(), false); } @@ -294,12 +297,12 @@ public class VPopupCalendar extends VTextualDate implements Field, if (reallyEnabled) { calendarToggle.setTabIndex(-1); - Roles.getButtonRole().setAriaHiddenState( - calendarToggle.getElement(), true); + Roles.getButtonRole() + .setAriaHiddenState(calendarToggle.getElement(), true); } else { calendarToggle.setTabIndex(0); - Roles.getButtonRole().setAriaHiddenState( - calendarToggle.getElement(), false); + Roles.getButtonRole() + .setAriaHiddenState(calendarToggle.getElement(), false); } handleAriaAttributes(); @@ -349,11 +352,11 @@ public class VPopupCalendar extends VTextualDate implements Field, removeFromWidget = text; } - Roles.getFormRole().removeAriaLabelledbyProperty( - removeFromWidget.getElement()); + Roles.getFormRole() + .removeAriaLabelledbyProperty(removeFromWidget.getElement()); if (captionId == null) { - Roles.getFormRole().removeAriaLabelledbyProperty( - setForWidget.getElement()); + Roles.getFormRole() + .removeAriaLabelledbyProperty(setForWidget.getElement()); } else { Roles.getFormRole().setAriaLabelledbyProperty( setForWidget.getElement(), Id.of(captionId)); @@ -562,7 +565,8 @@ public class VPopupCalendar extends VTextualDate implements Field, private final String CALENDAR_TOGGLE_ID = "popupButton"; @Override - public com.google.gwt.user.client.Element getSubPartElement(String subPart) { + public com.google.gwt.user.client.Element getSubPartElement( + String subPart) { if (subPart.equals(CALENDAR_TOGGLE_ID)) { return calendarToggle.getElement(); } @@ -571,7 +575,8 @@ public class VPopupCalendar extends VTextualDate implements Field, } @Override - public String getSubPartName(com.google.gwt.user.client.Element subElement) { + public String getSubPartName( + com.google.gwt.user.client.Element subElement) { if (calendarToggle.getElement().isOrHasChild(subElement)) { return CALENDAR_TOGGLE_ID; } diff --git a/client/src/main/java/com/vaadin/client/ui/VRichTextArea.java b/client/src/main/java/com/vaadin/client/ui/VRichTextArea.java index cb4482f7cb..14cd17ea2e 100644 --- a/client/src/main/java/com/vaadin/client/ui/VRichTextArea.java +++ b/client/src/main/java/com/vaadin/client/ui/VRichTextArea.java @@ -47,8 +47,8 @@ import com.vaadin.client.ui.richtextarea.VRichTextToolbar; * @author Vaadin Ltd. * */ -public class VRichTextArea extends Composite implements Field, KeyPressHandler, - KeyDownHandler, Focusable { +public class VRichTextArea extends Composite + implements Field, KeyPressHandler, KeyDownHandler, Focusable { /** * The input node CSS classname. @@ -232,10 +232,9 @@ public class VRichTextArea extends Composite implements Field, KeyPressHandler, ShortcutActionHandler shortcutHandler = getShortcutHandlerOwner() .getShortcutActionHandler(); if (shortcutHandler != null) { - shortcutHandler - .handleKeyboardEvent(com.google.gwt.user.client.Event - .as(event.getNativeEvent()), - ConnectorMap.get(client).getConnector(this)); + shortcutHandler.handleKeyboardEvent( + com.google.gwt.user.client.Event.as(event.getNativeEvent()), + ConnectorMap.get(client).getConnector(this)); } } diff --git a/client/src/main/java/com/vaadin/client/ui/VScrollTable.java b/client/src/main/java/com/vaadin/client/ui/VScrollTable.java index 107b267fa5..54eae33400 100644 --- a/client/src/main/java/com/vaadin/client/ui/VScrollTable.java +++ b/client/src/main/java/com/vaadin/client/ui/VScrollTable.java @@ -131,9 +131,9 @@ import com.vaadin.shared.ui.table.TableConstants; * * TODO implement unregistering for child components in Cells */ -public class VScrollTable extends FlowPanel implements HasWidgets, - ScrollHandler, VHasDropHandler, FocusHandler, BlurHandler, Focusable, - ActionOwner, SubPartAware, DeferredWorker { +public class VScrollTable extends FlowPanel + implements HasWidgets, ScrollHandler, VHasDropHandler, FocusHandler, + BlurHandler, Focusable, ActionOwner, SubPartAware, DeferredWorker { /** * Simple interface for parts of the table capable of owning a context menu. @@ -469,8 +469,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, int endOfFirstRange = row.getIndex() - 1; if (endOfFirstRange >= startRow.getIndex()) { // create range of first part unless its length is < 1 - ranges.add(new SelectionRange(startRow, endOfFirstRange - - startRow.getIndex() + 1)); + ranges.add(new SelectionRange(startRow, + endOfFirstRange - startRow.getIndex() + 1)); } int startOfSecondRange = row.getIndex() + 1; if (getEndIndex() >= startOfSecondRange) { @@ -478,8 +478,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, VScrollTableRow startOfRange = scrollBody .getRowByRowIndex(startOfSecondRange); if (startOfRange != null) { - ranges.add(new SelectionRange(startOfRange, getEndIndex() - - startOfSecondRange + 1)); + ranges.add(new SelectionRange(startOfRange, + getEndIndex() - startOfSecondRange + 1)); } } return ranges; @@ -635,8 +635,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets, // (prevents scrolling) event.preventDefault(); } else if (hasFocus()) { - if (handleNavigation(event.getKeyCode(), event.getCtrlKey() - || event.getMetaKey(), event.getShiftKey())) { + if (handleNavigation(event.getKeyCode(), + event.getCtrlKey() || event.getMetaKey(), + event.getShiftKey())) { navKeyDown = true; event.preventDefault(); } @@ -807,12 +808,11 @@ public class VScrollTable extends FlowPanel implements HasWidgets, // capture is in use Element elementUnderMouse = WidgetUtil .getElementUnderMouse(event.getNativeEvent()); - if (lastMouseDownTarget != null - && lastMouseDownTarget.isOrHasChild(elementUnderMouse)) { + if (lastMouseDownTarget != null && lastMouseDownTarget + .isOrHasChild(elementUnderMouse)) { mouseUpPreviewMatched = true; } else { - getLogger().log( - Level.FINEST, + getLogger().log(Level.FINEST, "Ignoring mouseup from " + elementUnderMouse + " when mousedown was on " + lastMouseDownTarget); @@ -868,8 +868,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, scrollBodyPanel.removeStyleName(getStylePrimaryName() + "-body"); if (scrollBody != null) { - scrollBody.removeStyleName(getStylePrimaryName() - + "-body-noselection"); + scrollBody.removeStyleName( + getStylePrimaryName() + "-body-noselection"); } if (isPrimary) { @@ -893,8 +893,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, this.client = client; // Add a handler to clear saved context menu details when the menu // closes. See #8526. - addCloseHandler = client.getContextMenu().addCloseHandler( - new CloseHandler<PopupPanel>() { + addCloseHandler = client.getContextMenu() + .addCloseHandler(new CloseHandler<PopupPanel>() { @Override public void onClose(CloseEvent<PopupPanel> event) { @@ -981,8 +981,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, if (focusedRow == null && scrollBody.iterator().hasNext()) { // FIXME should focus first visible from top, not first rendered // ?? - return setRowFocus((VScrollTableRow) scrollBody.iterator() - .next()); + return setRowFocus( + (VScrollTableRow) scrollBody.iterator().next()); } else { VScrollTableRow next = getNextRow(focusedRow, offset); if (next != null) { @@ -1015,8 +1015,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, if (focusedRow == null && scrollBody.iterator().hasNext()) { // FIXME logic is exactly the same as in moveFocusDown, should // be the opposite?? - return setRowFocus((VScrollTableRow) scrollBody.iterator() - .next()); + return setRowFocus( + (VScrollTableRow) scrollBody.iterator().next()); } else { VScrollTableRow prev = getPreviousRow(focusedRow, offset); if (prev != null) { @@ -1096,12 +1096,13 @@ public class VScrollTable extends FlowPanel implements HasWidgets, // Send the selected row ranges client.updateVariable(paintableId, "selectedRanges", - ranges.toArray(new String[selectedRowRanges.size()]), false); + ranges.toArray(new String[selectedRowRanges.size()]), + false); selectedRowRanges.clear(); // clean selectedRowKeys so that they don't contain excess values - for (Iterator<String> iterator = selectedRowKeys.iterator(); iterator - .hasNext();) { + for (Iterator<String> iterator = selectedRowKeys + .iterator(); iterator.hasNext();) { String key = iterator.next(); VScrollTableRow renderedRowByKey = getRenderedRowByKey(key); if (renderedRowByKey != null) { @@ -1313,10 +1314,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets, */ VScrollTableRow row = (VScrollTableRow) iterator.next(); boolean selected = selectedKeys.contains(row.getKey()); - if (!selected - && unSyncedselectionsBeforeRowFetch != null - && unSyncedselectionsBeforeRowFetch.contains(row - .getKey())) { + if (!selected && unSyncedselectionsBeforeRowFetch != null + && unSyncedselectionsBeforeRowFetch + .contains(row.getKey())) { selected = true; keyboardSelectionOverRowFetchInProgress = true; } @@ -1410,11 +1410,11 @@ public class VScrollTable extends FlowPanel implements HasWidgets, if (firstvisible >= 0) { firstRowInViewPort = firstvisible; if (firstvisibleOnLastPage > -1) { - scrollBodyPanel - .setScrollPosition(measureRowHeightOffset(firstvisibleOnLastPage)); + scrollBodyPanel.setScrollPosition( + measureRowHeightOffset(firstvisibleOnLastPage)); } else { - scrollBodyPanel - .setScrollPosition(measureRowHeightOffset(firstvisible)); + scrollBodyPanel.setScrollPosition( + measureRowHeightOffset(firstvisible)); } } disableLazyScroller(); @@ -1423,10 +1423,10 @@ public class VScrollTable extends FlowPanel implements HasWidgets, /** For internal use only. May be removed or replaced in the future. */ public void updateFirstVisibleAndScrollIfNeeded(UIDL uidl) { - firstvisible = uidl.hasVariable("firstvisible") ? uidl - .getIntVariable("firstvisible") : 0; - firstvisibleOnLastPage = uidl.hasVariable("firstvisibleonlastpage") ? uidl - .getIntVariable("firstvisibleonlastpage") : -1; + firstvisible = uidl.hasVariable("firstvisible") + ? uidl.getIntVariable("firstvisible") : 0; + firstvisibleOnLastPage = uidl.hasVariable("firstvisibleonlastpage") + ? uidl.getIntVariable("firstvisibleonlastpage") : -1; if (firstvisible != lastRequestedFirstvisible && scrollBody != null) { // Update lastRequestedFirstvisible right away here @@ -1463,11 +1463,12 @@ public class VScrollTable extends FlowPanel implements HasWidgets, /** For internal use only. May be removed or replaced in the future. */ public void updateSelectionProperties(UIDL uidl, AbstractComponentState state, boolean readOnly) { - setMultiSelectMode(uidl.hasAttribute("multiselectmode") ? uidl - .getIntAttribute("multiselectmode") : MULTISELECT_MODE_DEFAULT); + setMultiSelectMode(uidl.hasAttribute("multiselectmode") + ? uidl.getIntAttribute("multiselectmode") + : MULTISELECT_MODE_DEFAULT); - nullSelectionAllowed = uidl.hasAttribute("nsa") ? uidl - .getBooleanAttribute("nsa") : true; + nullSelectionAllowed = uidl.hasAttribute("nsa") + ? uidl.getBooleanAttribute("nsa") : true; if (uidl.hasAttribute("selectmode")) { if (readOnly) { @@ -1484,8 +1485,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, /** For internal use only. May be removed or replaced in the future. */ public void updateDragMode(UIDL uidl) { - dragmode = uidl.hasAttribute("dragmode") ? uidl - .getIntAttribute("dragmode") : 0; + dragmode = uidl.hasAttribute("dragmode") + ? uidl.getIntAttribute("dragmode") : 0; if (BrowserInfo.get().isIE()) { if (dragmode > 0) { getElement().setPropertyJSO("onselectstart", @@ -1560,9 +1561,11 @@ public class VScrollTable extends FlowPanel implements HasWidgets, // try to focus a row currently selected and in viewport String selectedRowKey = selectedRowKeys.iterator().next(); if (selectedRowKey != null) { - VScrollTableRow renderedRow = getRenderedRowByKey(selectedRowKey); + VScrollTableRow renderedRow = getRenderedRowByKey( + selectedRowKey); if (renderedRow == null || !renderedRow.isInViewPort()) { - setRowFocus(scrollBody.getRowByRowIndex(firstRowInViewPort)); + setRowFocus( + scrollBody.getRowByRowIndex(firstRowInViewPort)); } else { setRowFocus(renderedRow); } @@ -1591,8 +1594,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, if (lastRowInViewport == null) { // this should not happen in normal situations (white space at the // end of viewport). Select the last rendered as a fallback. - lastRowInViewport = scrollBody.getRowByRowIndex(scrollBody - .getLastRendered()); + lastRowInViewport = scrollBody + .getRowByRowIndex(scrollBody.getLastRendered()); if (lastRowInViewport == null) { return; // empty table } @@ -1785,10 +1788,10 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * caching window. */ protected void discardRowsOutsideCacheWindow() { - int firstRowToKeep = (int) (firstRowInViewPort - pageLength - * cache_rate); - int lastRowToKeep = (int) (firstRowInViewPort + pageLength + pageLength - * cache_rate); + int firstRowToKeep = (int) (firstRowInViewPort + - pageLength * cache_rate); + int lastRowToKeep = (int) (firstRowInViewPort + pageLength + + pageLength * cache_rate); // sanity checks: if (firstRowToKeep < 0) { firstRowToKeep = 0; @@ -2205,8 +2208,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, tHead.enableBrowserIntelligence(); tFoot.enableBrowserIntelligence(); - int hierarchyColumnIndent = scrollBody != null ? scrollBody - .getMaxIndent() : 0; + int hierarchyColumnIndent = scrollBody != null + ? scrollBody.getMaxIndent() : 0; HeaderCell hierarchyHeaderWithExpandRatio = null; // first loop: collect natural widths @@ -2320,9 +2323,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets, if (hierarchyHeaderWithExpandRatio != null) { // ensure first that the hierarchyColumn gets at least the // space allocated for indent - final int newSpace = Math - .round((extraSpace * (hierarchyHeaderWithExpandRatio - .getExpandRatio() / expandRatioDivider))); + final int newSpace = Math.round((extraSpace + * (hierarchyHeaderWithExpandRatio.getExpandRatio() + / expandRatioDivider))); if (newSpace < hierarchyColumnIndent) { // not enough space for indent, remove indent from the // extraSpace again and handle hierarchy column's header @@ -2341,14 +2344,15 @@ public class VScrollTable extends FlowPanel implements HasWidgets, if (hCell.getExpandRatio() > 0) { int w = widths[i]; if (setIndentToHierarchyHeader - && hierarchyHeaderWithExpandRatio.equals(hCell)) { + && hierarchyHeaderWithExpandRatio + .equals(hCell)) { // hierarchy column's header is no longer part of // the expansion divide and only gets indent w += hierarchyColumnIndent; } else { final int newSpace = Math - .round((extraSpace * (hCell - .getExpandRatio() / expandRatioDivider))); + .round((extraSpace * (hCell.getExpandRatio() + / expandRatioDivider))); w += newSpace; } widths[i] = w; @@ -2367,8 +2371,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, HeaderCell hCell = (HeaderCell) headCells.next(); if (!hCell.isDefinedWidth()) { int w = widths[i]; - final int newSpace = Math.round((float) extraSpace - * (float) w / totalWidthR); + final int newSpace = Math.round( + (float) extraSpace * (float) w / totalWidthR); w += newSpace; widths[i] = w; } @@ -2445,8 +2449,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, // int bodyHeight = scrollBody.getOffsetHeight(); bodyHeight = scrollBody.getRequiredHeight(); } else { - bodyHeight = (int) Math.round(scrollBody.getRowHeight(true) - * pageLength); + bodyHeight = (int) Math + .round(scrollBody.getRowHeight(true) * pageLength); } boolean needsSpaceForHorizontalSrollbar = (total > availW); if (needsSpaceForHorizontalSrollbar) { @@ -2469,8 +2473,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, if (totalRows - 1 > scrollBody.getLastRendered()) { // fetch cache rows int firstInNewSet = scrollBody.getLastRendered() + 1; - int lastInNewSet = (int) (firstRowInViewPort + pageLength + cache_rate - * pageLength); + int lastInNewSet = (int) (firstRowInViewPort + pageLength + + cache_rate * pageLength); if (lastInNewSet > totalRows - 1) { lastInNewSet = totalRows - 1; } @@ -2484,8 +2488,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * Ensures the column alignments are correct at initial loading. <br/> * (child components widths are correct) */ - WidgetUtil.runWebkitOverflowAutoFixDeferred(scrollBodyPanel - .getElement()); + WidgetUtil + .runWebkitOverflowAutoFixDeferred(scrollBodyPanel.getElement()); hadScrollBars = willHaveScrollbarz; } @@ -2502,10 +2506,10 @@ public class VScrollTable extends FlowPanel implements HasWidgets, return true; } } else { - int fakeheight = (int) Math.round(scrollBody.getRowHeight() - * totalRows); - int availableHeight = scrollBodyPanel.getElement().getPropertyInt( - "clientHeight"); + int fakeheight = (int) Math + .round(scrollBody.getRowHeight() * totalRows); + int availableHeight = scrollBodyPanel.getElement() + .getPropertyInt("clientHeight"); if (fakeheight > availableHeight) { return true; } @@ -2516,8 +2520,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, private void announceScrollPosition() { if (scrollPositionElement == null) { scrollPositionElement = DOM.createDiv(); - scrollPositionElement.setClassName(getStylePrimaryName() - + "-scrollposition"); + scrollPositionElement + .setClassName(getStylePrimaryName() + "-scrollposition"); scrollPositionElement.getStyle().setPosition(Position.ABSOLUTE); scrollPositionElement.getStyle().setDisplay(Display.NONE); getElement().appendChild(scrollPositionElement); @@ -2546,9 +2550,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, /** For internal use only. May be removed or replaced in the future. */ public boolean isScrollPositionVisible() { - return scrollPositionElement != null - && !scrollPositionElement.getStyle().getDisplay() - .equals(Display.NONE.toString()); + return scrollPositionElement != null && !scrollPositionElement + .getStyle().getDisplay().equals(Display.NONE.toString()); } /** For internal use only. May be removed or replaced in the future. */ @@ -2585,9 +2588,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets, // tell scroll position to user if currently "visible" rows are // not rendered - if (totalRows > pageLength - && ((firstRowInViewPort + pageLength > scrollBody - .getLastRendered()) || (firstRowInViewPort < scrollBody + if (totalRows > pageLength && ((firstRowInViewPort + + pageLength > scrollBody.getLastRendered()) + || (firstRowInViewPort < scrollBody .getFirstRendered()))) { announceScrollPosition(); } else { @@ -2639,7 +2642,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * reqFirstRow and reqRows before needing them. See (#14135) */ - setReqFirstRow((firstRowInViewPort - (int) (pageLength * cache_rate))); + setReqFirstRow( + (firstRowInViewPort - (int) (pageLength * cache_rate))); int last = firstRowInViewPort + (int) (cache_rate * pageLength) + pageLength - 1; if (last >= totalRows) { @@ -2662,7 +2666,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, if (reqFirstRow < firstToBeRendered) { firstToBeRendered = reqFirstRow; - } else if (firstRowInViewPort - (int) (cache_rate * pageLength) > firstToBeRendered) { + } else if (firstRowInViewPort + - (int) (cache_rate * pageLength) > firstToBeRendered) { firstToBeRendered = firstRowInViewPort - (int) (cache_rate * pageLength); if (firstToBeRendered < 0) { @@ -2686,9 +2691,10 @@ public class VScrollTable extends FlowPanel implements HasWidgets, if (lastReqRow > lastToBeRendered) { lastToBeRendered = lastReqRow; - } else if (firstRowInViewPort + pageLength + pageLength - * cache_rate < lastToBeRendered) { - lastToBeRendered = (firstRowInViewPort + pageLength + (int) (pageLength * cache_rate)); + } else if (firstRowInViewPort + pageLength + + pageLength * cache_rate < lastToBeRendered) { + lastToBeRendered = (firstRowInViewPort + pageLength + + (int) (pageLength * cache_rate)); if (lastToBeRendered >= totalRows) { lastToBeRendered = totalRows - 1; } @@ -2708,7 +2714,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets, lastToBeRendered = totalRows - 1; } if (reqFirstRow < firstToBeRendered - || (reqFirstRow > firstToBeRendered && (reqFirstRow < firstRendered || reqFirstRow > lastRendered + 1))) { + || (reqFirstRow > firstToBeRendered + && (reqFirstRow < firstRendered + || reqFirstRow > lastRendered + 1))) { setReqFirstRow(firstToBeRendered); } if (lastRendered < lastToBeRendered @@ -2824,8 +2832,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * of the caption container element by the correct amount */ public void resizeCaptionContainer(int rightSpacing) { - int captionContainerWidth = width - - colResizeWidget.getOffsetWidth() - rightSpacing; + int captionContainerWidth = width - colResizeWidget.getOffsetWidth() + - rightSpacing; if (td.getClassName().contains("-asc") || td.getClassName().contains("-desc")) { @@ -2877,8 +2885,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, protected void updateStyleNames(String primaryStyleName) { colResizeWidget.setClassName(primaryStyleName + "-resizer"); sortIndicator.setClassName(primaryStyleName + "-sort-indicator"); - captionContainer.setClassName(primaryStyleName - + "-caption-container"); + captionContainer + .setClassName(primaryStyleName + "-caption-container"); if (sorted) { if (sortAscending) { setStyleName(primaryStyleName + "-header-cell-asc"); @@ -3054,9 +3062,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, if (enabled && event != null) { if (isResizing || event.getEventTarget().cast() == colResizeWidget) { - if (dragging - && (event.getTypeInt() == Event.ONMOUSEUP || event - .getTypeInt() == Event.ONTOUCHEND)) { + if (dragging && (event.getTypeInt() == Event.ONMOUSEUP + || event.getTypeInt() == Event.ONTOUCHEND)) { // Handle releasing column header on spacer #5318 handleCaptionEvent(event); } else { @@ -3093,8 +3100,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, private void createFloatingCopy() { floatingCopyOfHeaderCell = DOM.createDiv(); DOM.setInnerHTML(floatingCopyOfHeaderCell, DOM.getInnerHTML(td)); - floatingCopyOfHeaderCell = DOM - .getChild(floatingCopyOfHeaderCell, 2); + floatingCopyOfHeaderCell = DOM.getChild(floatingCopyOfHeaderCell, + 2); // #12714 the shown "ghost element" should be inside // v-overlay-container, and it should contain the same styles as the // table to enable theming (except v-table & v-widget). @@ -3208,8 +3215,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, if (!moved) { // mouse event was a click to header -> sort column - if (sortable - && WidgetUtil.isTouchEventOrLeftMouseButton(event)) { + if (sortable && WidgetUtil + .isTouchEventOrLeftMouseButton(event)) { if (sortColumn.equals(cid)) { // just toggle order client.updateVariable(paintableId, "sortascending", @@ -3223,8 +3230,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets, scrollBodyPanel.setScrollPosition(0); firstvisible = 0; rowRequestHandler.setReqFirstRow(0); - rowRequestHandler.setReqRows((int) (2 * pageLength - * cache_rate + pageLength)); + rowRequestHandler + .setReqRows((int) (2 * pageLength * cache_rate + + pageLength)); rowRequestHandler.deferRowFetch(); // some validation + // defer 250ms rowRequestHandler.cancel(); // instead of waiting @@ -3251,10 +3259,10 @@ public class VScrollTable extends FlowPanel implements HasWidgets, // distance in x-axis (the same idea as in #13381) int currentX = WidgetUtil.getTouchOrMouseClientX(event); - if (currentDragX == null - || Math.abs(currentDragX - currentX) > VDragAndDropManager.MINIMUM_DISTANCE_TO_START_DRAG) { - if (dragging - && WidgetUtil.isTouchEventOrLeftMouseButton(event)) { + if (currentDragX == null || Math.abs(currentDragX + - currentX) > VDragAndDropManager.MINIMUM_DISTANCE_TO_START_DRAG) { + if (dragging && WidgetUtil + .isTouchEventOrLeftMouseButton(event)) { if (event.getTypeInt() == Event.ONTOUCHMOVE) { /* * prevent using this event in e.g. scrolling @@ -3289,7 +3297,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, + scrollBody.getCellExtraWidth(); } final int dist = Math.abs(x - slotX); - if (closestDistance == -1 || dist < closestDistance) { + if (closestDistance == -1 + || dist < closestDistance) { closestDistance = dist; closestSlot = i; } @@ -3328,8 +3337,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, // Ensure last header cell is taking into account possible // column selector - HeaderCell lastCell = tHead.getHeaderCell(tHead - .getVisibleCellCount() - 1); + HeaderCell lastCell = tHead + .getHeaderCell(tHead.getVisibleCellCount() - 1); tHead.resizeCaptionContainer(lastCell); triggerLazyColumnAdjustment(true); @@ -3430,7 +3439,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } if (columnIndex < 0) { columnIndex = 0; - for (Iterator<Widget> it = tHead.iterator(); it.hasNext(); columnIndex++) { + for (Iterator<Widget> it = tHead.iterator(); it + .hasNext(); columnIndex++) { if (it.next() == this) { break; } @@ -3452,8 +3462,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * @return */ public int getNaturalColumnWidth(int columnIndex) { - final int iw = columnIndex == getHierarchyColumnIndex() ? scrollBody - .getMaxIndent() : 0; + final int iw = columnIndex == getHierarchyColumnIndex() + ? scrollBody.getMaxIndent() : 0; saveNaturalColumnWidthIfNotSaved(columnIndex); if (isDefinedWidth()) { if (iw > width) { @@ -3574,7 +3584,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, for (Widget w : visibleCells) { int cellExtraWidth = w.getOffsetWidth(); if (scrollBody != null - && visibleCells.indexOf(w) == getHierarchyColumnIndex() + && visibleCells + .indexOf(w) == getHierarchyColumnIndex() && cellExtraWidth < scrollBody.getMaxIndent()) { // indent must be taken into consideration even if it // hasn't been applied yet @@ -3872,14 +3883,14 @@ public class VScrollTable extends FlowPanel implements HasWidgets, removeSlotFocus(); if (index > 0) { Element child = tr.getChild(index - 1).getFirstChild().cast(); - child.setClassName(VScrollTable.this.getStylePrimaryName() - + "-resizer"); + child.setClassName( + VScrollTable.this.getStylePrimaryName() + "-resizer"); child.addClassName(VScrollTable.this.getStylePrimaryName() + "-focus-slot-right"); } else { Element child = tr.getChild(index).getFirstChild().cast(); - child.setClassName(VScrollTable.this.getStylePrimaryName() - + "-resizer"); + child.setClassName( + VScrollTable.this.getStylePrimaryName() + "-resizer"); child.addClassName(VScrollTable.this.getStylePrimaryName() + "-focus-slot-left"); } @@ -3892,13 +3903,13 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } if (focusedSlot == 0) { Element child = tr.getChild(focusedSlot).getFirstChild().cast(); - child.setClassName(VScrollTable.this.getStylePrimaryName() - + "-resizer"); + child.setClassName( + VScrollTable.this.getStylePrimaryName() + "-resizer"); } else if (focusedSlot > 0) { Element child = tr.getChild(focusedSlot - 1).getFirstChild() .cast(); - child.setClassName(VScrollTable.this.getStylePrimaryName() - + "-resizer"); + child.setClassName( + VScrollTable.this.getStylePrimaryName() + "-resizer"); } focusedSlot = -1; } @@ -3954,9 +3965,10 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } // update variable to server - client.updateVariable(paintableId, "collapsedcolumns", - collapsedColumns.toArray(new String[collapsedColumns - .size()]), false); + client.updateVariable( + paintableId, "collapsedcolumns", collapsedColumns + .toArray(new String[collapsedColumns.size()]), + false); // let rowRequestHandler determine proper rows rowRequestHandler.refreshContent(); lazyRevertFocusToRow(currentlyFocusedRow); @@ -4112,8 +4124,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, DOM.appendChild(td, captionContainer); - DOM.sinkEvents(td, Event.MOUSEEVENTS | Event.ONDBLCLICK - | Event.ONCONTEXTMENU); + DOM.sinkEvents(td, + Event.MOUSEEVENTS | Event.ONDBLCLICK | Event.ONCONTEXTMENU); setElement(td); @@ -4121,8 +4133,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } protected void updateStyleNames(String primaryStyleName) { - captionContainer.setClassName(primaryStyleName - + "-footer-container"); + captionContainer + .setClassName(primaryStyleName + "-footer-container"); } /** @@ -4218,8 +4230,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, */ if (scrollBody != null) { int maxIndent = scrollBody.getMaxIndent(); - if (w < maxIndent - && tFoot.visibleCells.indexOf(this) == getHierarchyColumnIndex()) { + if (w < maxIndent && tFoot.visibleCells + .indexOf(this) == getHierarchyColumnIndex()) { // ensure there's room for the indent w = maxIndent; } @@ -4234,7 +4246,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, int tdWidth = width; int maxIndent = scrollBody.getMaxIndent(); if (tdWidth < maxIndent - && tFoot.visibleCells.indexOf(this) == getHierarchyColumnIndex()) { + && tFoot.visibleCells.indexOf( + this) == getHierarchyColumnIndex()) { // ensure there's room for the indent tdWidth = maxIndent; } @@ -4384,7 +4397,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, .getOffsetWidth() + getHeaderPadding(); if (columnIndex < 0) { columnIndex = 0; - for (Iterator<Widget> it = tHead.iterator(); it.hasNext(); columnIndex++) { + for (Iterator<Widget> it = tHead.iterator(); it + .hasNext(); columnIndex++) { if (it.next() == this) { break; } @@ -4406,8 +4420,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * @return */ public int getNaturalColumnWidth(int columnIndex) { - final int iw = columnIndex == getHierarchyColumnIndex() ? scrollBody - .getMaxIndent() : 0; + final int iw = columnIndex == getHierarchyColumnIndex() + ? scrollBody.getMaxIndent() : 0; saveNaturalColumnWidthIfNotSaved(columnIndex); if (isDefinedWidth()) { if (iw > width) { @@ -4569,8 +4583,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, final String cid = col.getStringAttribute("cid"); updated.add(cid); - String caption = col.hasAttribute("fcaption") ? col - .getStringAttribute("fcaption") : ""; + String caption = col.hasAttribute("fcaption") + ? col.getStringAttribute("fcaption") : ""; FooterCell c = getFooterCell(cid); if (c == null) { c = new FooterCell(cid, caption); @@ -4928,10 +4942,10 @@ public class VScrollTable extends FlowPanel implements HasWidgets, return; } - int reactFirstRow = (int) (firstRowInViewPort - pageLength - * cache_react_rate); - int reactLastRow = (int) (firstRowInViewPort + pageLength + pageLength - * cache_react_rate); + int reactFirstRow = (int) (firstRowInViewPort + - pageLength * cache_react_rate); + int reactLastRow = (int) (firstRowInViewPort + pageLength + + pageLength * cache_react_rate); if (reactFirstRow < 0) { reactFirstRow = 0; } @@ -4948,8 +4962,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * not waste time rendering a set of rows that will never be * visible... */ - rowRequestHandler.triggerRowFetch(reactFirstRow, reactLastRow - - reactFirstRow + 1, 1); + rowRequestHandler.triggerRowFetch(reactFirstRow, + reactLastRow - reactFirstRow + 1, 1); } else if (lastRendered < reactLastRow) { // get some cache rows below visible area rowRequestHandler.triggerRowFetch(lastRendered + 1, @@ -4963,8 +4977,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * some rare situations the table may make two cache visits to * server. */ - rowRequestHandler.triggerRowFetch(reactFirstRow, firstRendered - - reactFirstRow, 1); + rowRequestHandler.triggerRowFetch(reactFirstRow, + firstRendered - reactFirstRow, 1); } } @@ -4977,8 +4991,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * the number of rows * @return a list of the rows added. */ - protected List<VScrollTableRow> insertRows(UIDL rowData, - int firstIndex, int rows) { + protected List<VScrollTableRow> insertRows(UIDL rowData, int firstIndex, + int rows) { aligns = tHead.getColumnAlignments(); final Iterator<?> it = rowData.getChildIterator(); List<VScrollTableRow> insertedRows = new ArrayList<VScrollTableRow>(); @@ -5101,8 +5115,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } if (index > 0) { VScrollTableRow sibling = getRowByRowIndex(index - 1); - tBodyElement - .insertAfter(row.getElement(), sibling.getElement()); + tBodyElement.insertAfter(row.getElement(), + sibling.getElement()); } else { VScrollTableRow sibling = getRowByRowIndex(index); tBodyElement.insertBefore(row.getElement(), @@ -5311,8 +5325,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, // Spanned rows might cause an NPE. if (columnIndex < tr.getChildCount()) { Element wrapperdiv = tr.getCells() - .getItem(columnIndex) - .getFirstChildElement().cast(); + .getItem(columnIndex).getFirstChildElement() + .cast(); return wrapperdiv.getOffsetWidth(); } } @@ -5356,8 +5370,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets, /** * This method exists for the needs of {@link VTreeTable} only. May be - * removed or replaced in the future.</br> </br> Returns the maximum - * indent of the hierarcyColumn, if applicable. + * removed or replaced in the future.</br> + * </br> + * Returns the maximum indent of the hierarcyColumn, if applicable. * * @see {@link VScrollTable#getHierarchyColumnIndex()} * @@ -5369,8 +5384,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets, /** * This method exists for the needs of {@link VTreeTable} only. May be - * removed or replaced in the future.</br> </br> Calculates the maximum - * indent of the hierarcyColumn, if applicable. + * removed or replaced in the future.</br> + * </br> + * Calculates the maximum indent of the hierarcyColumn, if applicable. */ protected void calculateMaxIndent() { // NOP @@ -5381,8 +5397,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, if (rows.getLength() == 0) { /* need to temporary add empty row and detect */ VScrollTableRow scrollTableRow = new VScrollTableRow(); - scrollTableRow.updateStyleNames(VScrollTable.this - .getStylePrimaryName()); + scrollTableRow.updateStyleNames( + VScrollTable.this.getStylePrimaryName()); tBodyElement.appendChild(scrollTableRow.getElement()); detectExtrawidth(); tBodyElement.removeChild(scrollTableRow.getElement()); @@ -5395,8 +5411,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, // for measuring noCells = true; VScrollTableRow next = (VScrollTableRow) iterator().next(); - boolean sorted = tHead.getHeaderCell(0) != null ? tHead - .getHeaderCell(0).isSorted() : false; + boolean sorted = tHead.getHeaderCell(0) != null + ? tHead.getHeaderCell(0).isSorted() : false; next.addCell(null, "", ALIGN_LEFT, "", true, sorted); firstTD = item.getCells().getItem(0); } @@ -5451,8 +5467,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, return -1; } - public class VScrollTableRow extends Panel implements ActionOwner, - ContextMenuOwner { + public class VScrollTableRow extends Panel + implements ActionOwner, ContextMenuOwner { private static final int TOUCHSCROLL_TIMEOUT = 100; private static final int DRAGMODE_MULTIROW = 2; @@ -5484,9 +5500,10 @@ public class VScrollTable extends FlowPanel implements HasWidgets, this.rowKey = rowKey; rowElement = Document.get().createTRElement(); setElement(rowElement); - DOM.sinkEvents(getElement(), Event.MOUSEEVENTS - | Event.TOUCHEVENTS | Event.ONDBLCLICK - | Event.ONCONTEXTMENU | VTooltip.TOOLTIP_EVENTS); + DOM.sinkEvents(getElement(), + Event.MOUSEEVENTS | Event.TOUCHEVENTS | Event.ONDBLCLICK + | Event.ONCONTEXTMENU + | VTooltip.TOOLTIP_EVENTS); } public VScrollTableRow(UIDL uidl, char[] aligns) { @@ -5611,8 +5628,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, String description = null; if (uidl.hasAttribute("descr-" + columnId)) { - description = uidl.getStringAttribute("descr-" - + columnId); + description = uidl + .getStringAttribute("descr-" + columnId); } boolean sorted = tHead.getHeaderCell(col).isSorted(); @@ -5688,8 +5705,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, addStyleName(VScrollTable.this.getStylePrimaryName() + "-row-odd"); } else { - addStyleName(VScrollTable.this.getStylePrimaryName() - + "-row"); + addStyleName( + VScrollTable.this.getStylePrimaryName() + "-row"); } } @@ -5763,8 +5780,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, */ String className = td.getClassName(); String oldPrimaryName = className.split("-cell-content")[0]; - td.setClassName(className.replaceAll(oldPrimaryName, - primaryStyleName)); + td.setClassName( + className.replaceAll(oldPrimaryName, primaryStyleName)); } public void addCell(UIDL rowUidl, Widget w, char align, @@ -5890,8 +5907,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, TooltipInfo info = null; final Element targetTdOrTr = getTdOrTr(target); - if (targetTdOrTr != null - && "td".equals(targetTdOrTr.getTagName().toLowerCase())) { + if (targetTdOrTr != null && "td" + .equals(targetTdOrTr.getTagName().toLowerCase())) { TableCellElement td = (TableCellElement) targetTdOrTr .cast(); info = cellToolTips.get(td); @@ -6049,11 +6066,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets, final Element targetTdOrTr = getEventTargetTdOrTr(event); if (type == Event.ONCONTEXTMENU) { showContextMenu(event); - if (enabled - && (actionKeys != null || client - .hasEventListeners( - VScrollTable.this, - TableConstants.ITEM_CLICK_EVENT_ID))) { + if (enabled && (actionKeys != null + || client.hasEventListeners(VScrollTable.this, + TableConstants.ITEM_CLICK_EVENT_ID))) { /* * Prevent browser context menu only if there are * action handlers or item click listeners @@ -6081,10 +6096,10 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * event there as the event might get canceled before it * gets here. */ - if (mouseUpPreviewMatched - && lastMouseDownTarget != null - && lastMouseDownTarget == getElementTdOrTr(WidgetUtil - .getElementUnderMouse(event))) { + if (mouseUpPreviewMatched && lastMouseDownTarget != null + && lastMouseDownTarget == getElementTdOrTr( + WidgetUtil + .getElementUnderMouse(event))) { // "Click" with left, right or middle button if (targetCellOrRowFound) { @@ -6092,23 +6107,23 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * Queue here, send at the same time as the * corresponding value change event - see #7127 */ - boolean clickEventSent = handleClickEvent( - event, targetTdOrTr, false); + boolean clickEventSent = handleClickEvent(event, + targetTdOrTr, false); if (event.getButton() == Event.BUTTON_LEFT && isSelectable()) { // Ctrl+Shift click - if ((event.getCtrlKey() || event - .getMetaKey()) + if ((event.getCtrlKey() + || event.getMetaKey()) && event.getShiftKey() && isMultiSelectModeDefault()) { toggleShiftSelection(false); setRowFocus(this); // Ctrl click - } else if ((event.getCtrlKey() || event - .getMetaKey()) + } else if ((event.getCtrlKey() + || event.getMetaKey()) && isMultiSelectModeDefault()) { boolean wasSelected = isSelected(); toggleSelection(); @@ -6119,16 +6134,17 @@ public class VScrollTable extends FlowPanel implements HasWidgets, */ selectionRangeStart = this; if (wasSelected) { - removeRowFromUnsentSelectionRanges(this); + removeRowFromUnsentSelectionRanges( + this); } - } else if ((event.getCtrlKey() || event - .getMetaKey()) + } else if ((event.getCtrlKey() + || event.getMetaKey()) && isSingleSelectMode()) { // Ctrl (or meta) click (Single // selection) - if (!isSelected() - || (isSelected() && nullSelectionAllowed)) { + if (!isSelected() || (isSelected() + && nullSelectionAllowed)) { if (!isSelected()) { deselectAll(); @@ -6167,14 +6183,15 @@ public class VScrollTable extends FlowPanel implements HasWidgets, deselectAll(); } toggleSelection(); - } else if ((isSingleSelectMode() || isMultiSelectModeSimple()) + } else if ((isSingleSelectMode() + || isMultiSelectModeSimple()) && nullSelectionAllowed) { toggleSelection(); - }/* - * else NOP to avoid excessive server - * visits (selection is removed with - * CTRL/META click) - */ + } /* + * else NOP to avoid excessive server + * visits (selection is removed with + * CTRL/META click) + */ selectionRangeStart = this; setRowFocus(this); @@ -6184,7 +6201,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, if (BrowserInfo.get().isIE()) { ((Element) event.getEventTarget() .cast()).setPropertyJSO( - "onselectstart", null); + "onselectstart", null); } // Queue value change sendSelectedRows(false); @@ -6223,8 +6240,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * if row is selected. Null check for active * delegate is as a workaround. */ - if (dragmode != 0 - && touchStart != null + if (dragmode != 0 && touchStart != null && (TouchScrollDelegate .getActiveScrollDelegate() == null)) { startRowDrag(touchStart, type, targetTdOrTr); @@ -6313,8 +6329,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * the corresponding mouseup event if it's on a * different part of the page. */ - lastMouseDownTarget = getElementTdOrTr(WidgetUtil - .getElementUnderMouse(event)); + lastMouseDownTarget = getElementTdOrTr( + WidgetUtil.getElementUnderMouse(event)); mouseUpPreviewMatched = false; mouseUpEventPreviewRegistration = Event .addNativePreviewHandler(mouseUpPreviewHandler); @@ -6322,14 +6338,13 @@ public class VScrollTable extends FlowPanel implements HasWidgets, if (targetCellOrRowFound) { setRowFocus(this); ensureFocus(); - if (dragmode != 0 - && (event.getButton() == NativeEvent.BUTTON_LEFT)) { + if (dragmode != 0 && (event + .getButton() == NativeEvent.BUTTON_LEFT)) { startRowDrag(event, type, targetTdOrTr); - } else if (event.getCtrlKey() - || event.getShiftKey() + } else if (event.getCtrlKey() || event.getShiftKey() || event.getMetaKey() - && isMultiSelectModeDefault()) { + && isMultiSelectModeDefault()) { // Prevent default text selection in Firefox event.preventDefault(); @@ -6337,8 +6352,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, // Prevent default text selection in IE if (BrowserInfo.get().isIE()) { ((Element) event.getEventTarget().cast()) - .setPropertyJSO( - "onselectstart", + .setPropertyJSO("onselectstart", getPreventTextSelectionIEHack()); } @@ -6365,10 +6379,12 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * axis checks */ Touch touch = event.getChangedTouches().get(0); - if (Math.abs(touch.getClientX() - touchStartX) > TouchScrollDelegate.SIGNIFICANT_MOVE_THRESHOLD) { + if (Math.abs(touch.getClientX() + - touchStartX) > TouchScrollDelegate.SIGNIFICANT_MOVE_THRESHOLD) { return true; } - if (Math.abs(touch.getClientY() - touchStartY) > TouchScrollDelegate.SIGNIFICANT_MOVE_THRESHOLD) { + if (Math.abs(touch.getClientY() + - touchStartY) > TouchScrollDelegate.SIGNIFICANT_MOVE_THRESHOLD) { return true; } return false; @@ -6410,8 +6426,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } } - VDragEvent ev = VDragAndDropManager.get().startDrag( - transferable, event, true); + VDragEvent ev = VDragAndDropManager.get() + .startDrag(transferable, event, true); if (dragmode == DRAGMODE_MULTIROW && isMultiSelectModeAny() && rowKeyIsSelected(rowKey)) { @@ -6421,8 +6437,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, // Hide rows which are not selected Element dragImage = ev.getDragImage(); int i = 0; - for (Iterator<Widget> iterator = scrollBody.iterator(); iterator - .hasNext();) { + for (Iterator<Widget> iterator = scrollBody + .iterator(); iterator.hasNext();) { VScrollTableRow next = (VScrollTableRow) iterator .next(); @@ -6473,8 +6489,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets, if (!(widget instanceof VLabel) && !(widget instanceof VEmbedded) - && !(widget instanceof VLegacyTextField && ((VLegacyTextField) widget) - .isReadOnly())) { + && !(widget instanceof VLegacyTextField + && ((VLegacyTextField) widget) + .isReadOnly())) { return null; } } @@ -6709,9 +6726,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, if (cells.hasNext()) { final Object cell = cells.next(); if (cell instanceof String) { - addSpannedCell(uidl, cell.toString(), aligns[0], - "", htmlContentAllowed, false, null, - colCount); + addSpannedCell(uidl, cell.toString(), aligns[0], "", + htmlContentAllowed, false, null, colCount); } else { addSpannedCell(uidl, (Widget) cell, aligns[0], "", false, colCount); @@ -7018,7 +7034,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, - totalExplicitColumnsWidths; if (hierarchyHeaderInNeedOfFurtherHandling != null - && !hierarchyHeaderInNeedOfFurtherHandling.isDefinedWidth()) { + && !hierarchyHeaderInNeedOfFurtherHandling + .isDefinedWidth()) { // ensure the cell gets enough space for the indent int w = hierarchyHeaderInNeedOfFurtherHandling .getNaturalColumnWidth(hierarchyColumnIndex); @@ -7103,8 +7120,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets, while (headCells.hasNext()) { HeaderCell hc = (HeaderCell) headCells.next(); if (!hc.isResizing && !hc.isDefinedWidth()) { - setColWidth(colIndex, hc.getWidthWithIndent() + availW - - checksum, false); + setColWidth(colIndex, + hc.getWidthWithIndent() + availW - checksum, + false); break; } colIndex++; @@ -7285,8 +7303,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, @Override public void execute() { - scrollBodyPanel - .setScrollPosition(measureRowHeightOffset(firstRowInViewPort)); + scrollBodyPanel.setScrollPosition( + measureRowHeightOffset(firstRowInViewPort)); } }); } @@ -7302,8 +7320,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * @return html snippet containing possibly an icon + caption text */ protected String buildCaptionHtmlSnippet(UIDL uidl) { - String s = uidl.hasAttribute("caption") ? uidl - .getStringAttribute("caption") : ""; + String s = uidl.hasAttribute("caption") + ? uidl.getStringAttribute("caption") : ""; if (uidl.hasAttribute("icon")) { Icon icon = client.getIcon(uidl.getStringAttribute("icon")); icon.setAlternateText("icon"); @@ -7353,8 +7371,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, return; } if (!enabled) { - scrollBodyPanel - .setScrollPosition(measureRowHeightOffset(firstRowInViewPort)); + scrollBodyPanel.setScrollPosition( + measureRowHeightOffset(firstRowInViewPort)); return; } @@ -7392,13 +7410,13 @@ public class VScrollTable extends FlowPanel implements HasWidgets, firstRowInViewPort = maxFirstRow; } - int postLimit = (int) (firstRowInViewPort + (pageLength - 1) + pageLength - * cache_react_rate); + int postLimit = (int) (firstRowInViewPort + (pageLength - 1) + + pageLength * cache_react_rate); if (postLimit > totalRows - 1) { postLimit = totalRows - 1; } - int preLimit = (int) (firstRowInViewPort - pageLength - * cache_react_rate); + int preLimit = (int) (firstRowInViewPort + - pageLength * cache_react_rate); if (preLimit < 0) { preLimit = 0; } @@ -7417,15 +7435,15 @@ public class VScrollTable extends FlowPanel implements HasWidgets, if (allRenderedRowsAreNew()) { // need a totally new set of rows - rowRequestHandler - .setReqFirstRow((firstRowInViewPort - (int) (pageLength * cache_rate))); + rowRequestHandler.setReqFirstRow( + (firstRowInViewPort - (int) (pageLength * cache_rate))); int last = firstRowInViewPort + (int) (cache_rate * pageLength) + pageLength - 1; if (last >= totalRows) { last = totalRows - 1; } - rowRequestHandler.setReqRows(last - - rowRequestHandler.getReqFirstRow() + 1); + rowRequestHandler + .setReqRows(last - rowRequestHandler.getReqFirstRow() + 1); updatedReqRows = false; rowRequestHandler.deferRowFetch(); return; @@ -7433,19 +7451,18 @@ public class VScrollTable extends FlowPanel implements HasWidgets, if (preLimit < firstRendered) { // need some rows to the beginning of the rendered area - rowRequestHandler - .setReqFirstRow((int) (firstRowInViewPort - pageLength - * cache_rate)); - rowRequestHandler.setReqRows(firstRendered - - rowRequestHandler.getReqFirstRow()); + rowRequestHandler.setReqFirstRow( + (int) (firstRowInViewPort - pageLength * cache_rate)); + rowRequestHandler.setReqRows( + firstRendered - rowRequestHandler.getReqFirstRow()); rowRequestHandler.deferRowFetch(); return; } if (postLimit > lastRendered) { // need some rows to the end of the rendered area - int reqRows = (int) ((firstRowInViewPort + pageLength + pageLength - * cache_rate) - lastRendered); + int reqRows = (int) ((firstRowInViewPort + pageLength + + pageLength * cache_rate) - lastRendered); rowRequestHandler.triggerRowFetch(lastRendered + 1, reqRows); } } @@ -7454,8 +7471,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets, int firstRowInViewPort = calcFirstRowInViewPort(); int firstRendered = scrollBody.getFirstRendered(); int lastRendered = scrollBody.getLastRendered(); - return (firstRowInViewPort - pageLength * cache_rate > lastRendered || firstRowInViewPort - + pageLength + pageLength * cache_rate < firstRendered); + return (firstRowInViewPort - pageLength * cache_rate > lastRendered + || firstRowInViewPort + pageLength + + pageLength * cache_rate < firstRendered); } protected int calcFirstRowInViewPort() { @@ -7478,7 +7496,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, TableDDDetails other = (TableDDDetails) obj; return dropLocation == other.dropLocation && overkey == other.overkey - && ((colkey != null && colkey.equals(other.colkey)) || (colkey == null && other.colkey == null)); + && ((colkey != null && colkey.equals(other.colkey)) + || (colkey == null && other.colkey == null)); } return false; } @@ -7525,10 +7544,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } drag.getDropDetails().put("itemIdOver", dropDetails.overkey + ""); - drag.getDropDetails().put( - "detail", - dropDetails.dropLocation != null ? dropDetails.dropLocation - .toString() : null); + drag.getDropDetails().put("detail", dropDetails.dropLocation != null + ? dropDetails.dropLocation.toString() : null); } @@ -7579,8 +7596,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } private void deEmphasis() { - UIObject.setStyleName(getElement(), - getStylePrimaryName() + "-drag", false); + UIObject.setStyleName(getElement(), getStylePrimaryName() + "-drag", + false); if (lastEmphasized == null) { return; } @@ -7605,8 +7622,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, */ private void emphasis(TableDDDetails details) { deEmphasis(); - UIObject.setStyleName(getElement(), - getStylePrimaryName() + "-drag", true); + UIObject.setStyleName(getElement(), getStylePrimaryName() + "-drag", + true); // iterate old and new emphasized row for (Widget w : scrollBody.renderedRows) { VScrollTableRow row = (VScrollTableRow) w; @@ -7710,7 +7727,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * The keyboard event received * @return true iff the navigation event was handled */ - protected boolean handleNavigation(int keycode, boolean ctrl, boolean shift) { + protected boolean handleNavigation(int keycode, boolean ctrl, + boolean shift) { if (keycode == KeyCodes.KEY_TAB || keycode == KeyCodes.KEY_SHIFT) { // Do not handle tab key return false; @@ -7718,8 +7736,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, // Down navigation if (!isSelectable() && keycode == getNavigationDownKey()) { - scrollBodyPanel.setScrollPosition(scrollBodyPanel - .getScrollPosition() + scrollingVelocity); + scrollBodyPanel.setScrollPosition( + scrollBodyPanel.getScrollPosition() + scrollingVelocity); return true; } else if (keycode == getNavigationDownKey()) { if (isMultiSelectModeAny() && moveFocusDown()) { @@ -7733,8 +7751,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, // Up navigation if (!isSelectable() && keycode == getNavigationUpKey()) { - scrollBodyPanel.setScrollPosition(scrollBodyPanel - .getScrollPosition() - scrollingVelocity); + scrollBodyPanel.setScrollPosition( + scrollBodyPanel.getScrollPosition() - scrollingVelocity); return true; } else if (keycode == getNavigationUpKey()) { if (isMultiSelectModeAny() && moveFocusUp()) { @@ -7747,14 +7765,16 @@ public class VScrollTable extends FlowPanel implements HasWidgets, if (keycode == getNavigationLeftKey()) { // Left navigation - scrollBodyPanel.setHorizontalScrollPosition(scrollBodyPanel - .getHorizontalScrollPosition() - scrollingVelocity); + scrollBodyPanel.setHorizontalScrollPosition( + scrollBodyPanel.getHorizontalScrollPosition() + - scrollingVelocity); return true; } else if (keycode == getNavigationRightKey()) { // Right navigation - scrollBodyPanel.setHorizontalScrollPosition(scrollBodyPanel - .getHorizontalScrollPosition() + scrollingVelocity); + scrollBodyPanel.setHorizontalScrollPosition( + scrollBodyPanel.getHorizontalScrollPosition() + + scrollingVelocity); return true; } @@ -7946,8 +7966,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } private int getFullyVisibleRowCount() { - return (int) (scrollBodyPanel.getOffsetHeight() / scrollBody - .getRowHeight()); + return (int) (scrollBodyPanel.getOffsetHeight() + / scrollBody.getRowHeight()); } private void scrollByPagelength(int i) { @@ -8010,7 +8030,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, && focusedElement != scrollBodyPanel.getFocusElement() && Util.getConnectorForElement(client, getParent(), focusedElement) == ConnectorMap.get(client) - .getConnector(this)) { + .getConnector(this)) { /* * Steal focus back to the focus handler if it was moved to some * other part of the table. Avoid stealing focus in other cases. @@ -8034,8 +8054,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, */ private void removeRowFromUnsentSelectionRanges(VScrollTableRow row) { Collection<SelectionRange> newRanges = null; - for (Iterator<SelectionRange> iterator = selectedRowRanges.iterator(); iterator - .hasNext();) { + for (Iterator<SelectionRange> iterator = selectedRowRanges + .iterator(); iterator.hasNext();) { SelectionRange range = iterator.next(); if (range.inRange(row)) { // Split the range if given row is in range @@ -8059,7 +8079,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, */ public boolean isFocusable() { if (scrollBody != null && enabled) { - return !(!hasHorizontalScrollbar() && !hasVerticalScrollbar() && !isSelectable()); + return !(!hasHorizontalScrollbar() && !hasVerticalScrollbar() + && !isSelectable()); } return false; } @@ -8158,7 +8179,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, || keyCode == getNavigationStartKey(); } - public void lazyRevertFocusToRow(final VScrollTableRow currentlyFocusedRow) { + public void lazyRevertFocusToRow( + final VScrollTableRow currentlyFocusedRow) { Scheduler.get().scheduleFinally(new ScheduledCommand() { @Override public void execute() { @@ -8221,14 +8243,14 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } private boolean isDynamicWidth() { - ComponentConnector paintable = ConnectorMap.get(client).getConnector( - this); + ComponentConnector paintable = ConnectorMap.get(client) + .getConnector(this); return paintable.isUndefinedWidth(); } private boolean isDynamicHeight() { - ComponentConnector paintable = ConnectorMap.get(client).getConnector( - this); + ComponentConnector paintable = ConnectorMap.get(client) + .getConnector(this); if (paintable == null) { // This should be refactored. As isDynamicHeight can be called from // a timer it is possible that the connector has been unregistered @@ -8265,15 +8287,17 @@ public class VScrollTable extends FlowPanel implements HasWidgets, private static final RegExp SUBPART_FOOTER_REGEXP = RegExp .compile(SUBPART_FOOTER + "\\[(\\d+)\\]"); /** Matches row[ix] - used for extracting the index of the targeted row */ - private static final RegExp SUBPART_ROW_REGEXP = RegExp.compile(SUBPART_ROW - + "\\[(\\d+)]"); - /** Matches col[ix] - used for extracting the index of the targeted column */ - private static final RegExp SUBPART_ROW_COL_REGEXP = RegExp - .compile(SUBPART_ROW + "\\[(\\d+)\\]/" + SUBPART_COL - + "\\[(\\d+)\\]"); + private static final RegExp SUBPART_ROW_REGEXP = RegExp + .compile(SUBPART_ROW + "\\[(\\d+)]"); + /** + * Matches col[ix] - used for extracting the index of the targeted column + */ + private static final RegExp SUBPART_ROW_COL_REGEXP = RegExp.compile( + SUBPART_ROW + "\\[(\\d+)\\]/" + SUBPART_COL + "\\[(\\d+)\\]"); @Override - public com.google.gwt.user.client.Element getSubPartElement(String subPart) { + public com.google.gwt.user.client.Element getSubPartElement( + String subPart) { if (SUBPART_ROW_COL_REGEXP.test(subPart)) { MatchResult result = SUBPART_ROW_COL_REGEXP.exec(subPart); int rowIx = Integer.valueOf(result.getGroup(1)); @@ -8315,7 +8339,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } @Override - public String getSubPartName(com.google.gwt.user.client.Element subElement) { + public String getSubPartName( + com.google.gwt.user.client.Element subElement) { Widget widget = WidgetUtil.findWidget(subElement, null); if (widget instanceof HeaderCell) { return SUBPART_HEADER + "[" + tHead.visibleCells.indexOf(widget) @@ -8330,7 +8355,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, if (rowIx >= 0) { int colIx = -1; for (int ix = 0; ix < row.getElement().getChildCount(); ix++) { - if (row.getElement().getChild(ix).isOrHasChild(subElement)) { + if (row.getElement().getChild(ix) + .isOrHasChild(subElement)) { colIx = ix; break; } diff --git a/client/src/main/java/com/vaadin/client/ui/VSlider.java b/client/src/main/java/com/vaadin/client/ui/VSlider.java index 952c387539..0d7ab474e1 100644 --- a/client/src/main/java/com/vaadin/client/ui/VSlider.java +++ b/client/src/main/java/com/vaadin/client/ui/VSlider.java @@ -37,8 +37,8 @@ import com.vaadin.client.BrowserInfo; import com.vaadin.client.WidgetUtil; import com.vaadin.shared.ui.slider.SliderOrientation; -public class VSlider extends SimpleFocusablePanel implements Field, - HasValue<Double>, SubPartAware { +public class VSlider extends SimpleFocusablePanel + implements Field, HasValue<Double>, SubPartAware { public static final String CLASSNAME = "v-slider"; @@ -137,7 +137,8 @@ public class VSlider extends SimpleFocusablePanel implements Field, updateStyleNames(style, true); } - protected void updateStyleNames(String styleName, boolean isPrimaryStyleName) { + protected void updateStyleNames(String styleName, + boolean isPrimaryStyleName) { feedbackPopup.removeStyleName(getStylePrimaryName() + "-feedback"); removeStyleName(getStylePrimaryName() + "-vertical"); @@ -282,8 +283,10 @@ public class VSlider extends SimpleFocusablePanel implements Field, increaseValue(true); } else if (DOM.eventGetType(event) == Event.MOUSEEVENTS) { processBaseEvent(event); - } else if ((BrowserInfo.get().isGecko() && DOM.eventGetType(event) == Event.ONKEYPRESS) - || (!BrowserInfo.get().isGecko() && DOM.eventGetType(event) == Event.ONKEYDOWN)) { + } else if ((BrowserInfo.get().isGecko() + && DOM.eventGetType(event) == Event.ONKEYPRESS) + || (!BrowserInfo.get().isGecko() + && DOM.eventGetType(event) == Event.ONKEYDOWN)) { if (handleNavigation(event.getKeyCode(), event.getCtrlKey(), event.getShiftKey())) { @@ -403,8 +406,8 @@ public class VSlider extends SimpleFocusablePanel implements Field, } if (isVertical()) { - v = ((baseSize - (coord - baseOffset)) / (double) (baseSize - handleSize)) - * (max - min) + min; + v = ((baseSize - (coord - baseOffset)) + / (double) (baseSize - handleSize)) * (max - min) + min; } else { v = ((coord - baseOffset) / (double) (baseSize - handleSize)) * (max - min) + min; @@ -657,7 +660,8 @@ public class VSlider extends SimpleFocusablePanel implements Field, } @Override - public com.google.gwt.user.client.Element getSubPartElement(String subPart) { + public com.google.gwt.user.client.Element getSubPartElement( + String subPart) { if (subPart.equals("popup")) { feedbackPopup.show(); return feedbackPopup.getElement(); @@ -666,7 +670,8 @@ public class VSlider extends SimpleFocusablePanel implements Field, } @Override - public String getSubPartName(com.google.gwt.user.client.Element subElement) { + public String getSubPartName( + com.google.gwt.user.client.Element subElement) { if (feedbackPopup.getElement().isOrHasChild(subElement)) { return "popup"; } diff --git a/client/src/main/java/com/vaadin/client/ui/VSplitPanelVertical.java b/client/src/main/java/com/vaadin/client/ui/VSplitPanelVertical.java index 7baed03ca3..5f645887bc 100644 --- a/client/src/main/java/com/vaadin/client/ui/VSplitPanelVertical.java +++ b/client/src/main/java/com/vaadin/client/ui/VSplitPanelVertical.java @@ -32,7 +32,8 @@ public class VSplitPanelVertical extends VAbstractSplitPanel { getFirstContainer().getStyle().setOverflow(Overflow.HIDDEN); } - if (getSecondWidget() != null && isWidgetFullHeight(getSecondWidget())) { + if (getSecondWidget() != null + && isWidgetFullHeight(getSecondWidget())) { getSecondContainer().getStyle().setOverflow(Overflow.HIDDEN); } } diff --git a/client/src/main/java/com/vaadin/client/ui/VTabsheet.java b/client/src/main/java/com/vaadin/client/ui/VTabsheet.java index 9b1608cb65..74b3cf3871 100644 --- a/client/src/main/java/com/vaadin/client/ui/VTabsheet.java +++ b/client/src/main/java/com/vaadin/client/ui/VTabsheet.java @@ -77,7 +77,8 @@ import com.vaadin.shared.ui.tabsheet.TabState; import com.vaadin.shared.ui.tabsheet.TabsheetServerRpc; import com.vaadin.shared.ui.tabsheet.TabsheetState; -public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware { +public class VTabsheet extends VTabsheetBase + implements Focusable, SubPartAware { private static final String PREV_SCROLLER_DISABLED_CLASSNAME = "Prev-disabled"; @@ -284,7 +285,8 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware } @Override - public HandlerRegistration addMouseDownHandler(MouseDownHandler handler) { + public HandlerRegistration addMouseDownHandler( + MouseDownHandler handler) { return addDomHandler(handler, MouseDownEvent.getType()); } @@ -334,7 +336,8 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware } private boolean update(TabState tabState) { - if (tabState.description != null || tabState.componentError != null) { + if (tabState.description != null + || tabState.componentError != null) { setTooltipInfo(new TooltipInfo(tabState.description, tabState.componentError, this)); } else { @@ -348,9 +351,9 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware boolean ret = updateCaptionWithoutOwner(captionString, !tabState.enabled, hasAttribute(tabState.description), hasAttribute(tabState.componentError), - tab.getTabsheet().connector - .getResourceUrl(ComponentConstants.ICON_RESOURCE - + tabState.key), tabState.iconAltText); + tab.getTabsheet().connector.getResourceUrl( + ComponentConstants.ICON_RESOURCE + tabState.key), + tabState.iconAltText); setClosable(tabState.closable); @@ -602,7 +605,8 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware } // FIXME: Shouldn't something be selected instead? - int scrollerIndexCandidate = getTabIndex(getTabsheet().scrollerPositionTabId); + int scrollerIndexCandidate = getTabIndex( + getTabsheet().scrollerPositionTabId); if (scrollerIndexCandidate < 0) { // The tab with id scrollerPositionTabId has been removed scrollerIndexCandidate = getTabsheet().scrollerIndex; @@ -901,15 +905,15 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware scrollerPrev = DOM.createButton(); scrollerPrev.setTabIndex(-1); - DOM.setElementProperty(scrollerPrev, "className", SCROLLER_CLASSNAME - + "Prev"); + DOM.setElementProperty(scrollerPrev, "className", + SCROLLER_CLASSNAME + "Prev"); Roles.getTablistRole().setAriaHiddenState(scrollerPrev, true); DOM.sinkEvents(scrollerPrev, Event.ONCLICK | Event.ONMOUSEDOWN); scrollerNext = DOM.createButton(); scrollerNext.setTabIndex(-1); - DOM.setElementProperty(scrollerNext, "className", SCROLLER_CLASSNAME - + "Next"); + DOM.setElementProperty(scrollerNext, "className", + SCROLLER_CLASSNAME + "Next"); Roles.getTablistRole().setAriaHiddenState(scrollerNext, true); DOM.sinkEvents(scrollerNext, Event.ONCLICK | Event.ONMOUSEDOWN); @@ -923,7 +927,8 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware deco = DOM.createDiv(); tb.setStyleName(CLASSNAME + "-tabs"); - DOM.setElementProperty(contentNode, "className", CLASSNAME + "-content"); + DOM.setElementProperty(contentNode, "className", + CLASSNAME + "-content"); DOM.setElementProperty(deco, "className", CLASSNAME + "-deco"); add(tb, tabs); @@ -1020,7 +1025,8 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware // style inheritance) if (ComponentStateUtil.hasStyles(state)) { final List<String> styles = state.styles; - if (currentStyle == null || !currentStyle.equals(styles.toString())) { + if (currentStyle == null + || !currentStyle.equals(styles.toString())) { currentStyle = styles.toString(); final String tabsBaseClass = TABS_CLASSNAME; String tabsClass = tabsBaseClass; @@ -1041,8 +1047,8 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware } else { tb.setStyleName(CLASSNAME + "-tabs"); DOM.setElementProperty(tabs, "className", TABS_CLASSNAME); - DOM.setElementProperty(contentNode, "className", CLASSNAME - + "-content"); + DOM.setElementProperty(contentNode, "className", + CLASSNAME + "-content"); DOM.setElementProperty(deco, "className", CLASSNAME + "-deco"); } } @@ -1109,8 +1115,8 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware } private boolean isScrollerPrevDisabled() { - return scrollerPrev.getClassName().contains( - PREV_SCROLLER_DISABLED_CLASSNAME); + return scrollerPrev.getClassName() + .contains(PREV_SCROLLER_DISABLED_CLASSNAME); } private boolean isScrollerHidden() { @@ -1319,18 +1325,16 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware boolean clipped = isClippedTabs(); if (tb.getTabCount() > 0 && tb.isVisible() && (scrolled || clipped)) { scroller.getStyle().clearDisplay(); - DOM.setElementProperty(scrollerPrev, "className", - SCROLLER_CLASSNAME - + (scrolled ? "Prev" - : PREV_SCROLLER_DISABLED_CLASSNAME)); + DOM.setElementProperty(scrollerPrev, "className", SCROLLER_CLASSNAME + + (scrolled ? "Prev" : PREV_SCROLLER_DISABLED_CLASSNAME)); DOM.setElementProperty(scrollerNext, "className", SCROLLER_CLASSNAME + (clipped ? "Next" : "Next-disabled")); // the active tab should be focusable if and only if it is visible boolean isActiveTabVisible = scrollerIndex <= activeTabIndex && !isClipped(tb.selected); - tb.selected.setTabulatorIndex(isActiveTabVisible ? tabulatorIndex - : -1); + tb.selected.setTabulatorIndex( + isActiveTabVisible ? tabulatorIndex : -1); } else { scroller.getStyle().setDisplay(Display.NONE); @@ -1358,8 +1362,8 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware /** For internal use only. May be removed or replaced in the future. */ public void showAllTabs() { scrollerIndex = tb.getFirstVisibleTab(); - scrollerPositionTabId = scrollerIndex < 0 ? null : tb - .getTab(scrollerIndex).id; + scrollerPositionTabId = scrollerIndex < 0 ? null + : tb.getTab(scrollerIndex).id; for (int i = 0; i < tb.getTabCount(); i++) { Tab t = tb.getTab(i); if (!t.isHiddenOnServer()) { @@ -1373,9 +1377,10 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware } private boolean isClippedTabs() { - return (tb.getOffsetWidth() - DOM.getElementPropertyInt((Element) tb - .getContainerElement().getLastChild().cast(), "offsetWidth")) > getOffsetWidth() - - (isScrolledTabs() ? scroller.getOffsetWidth() : 0); + return (tb.getOffsetWidth() - DOM.getElementPropertyInt( + (Element) tb.getContainerElement().getLastChild().cast(), + "offsetWidth")) > getOffsetWidth() + - (isScrolledTabs() ? scroller.getOffsetWidth() : 0); } private boolean isClipped(Tab tab) { @@ -1733,8 +1738,8 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware focusBlurManager.onFocus(focusSource); if (focusSource.hasTooltip()) { - focusSource.setAssistiveDescription(getVTooltip() - .getUniqueId()); + focusSource.setAssistiveDescription( + getVTooltip().getUniqueId()); getVTooltip().showAssistive(focusSource.getTooltipInfo()); } @@ -1968,7 +1973,8 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware .compile("tab\\[(\\d+)](.*)"); @Override - public com.google.gwt.user.client.Element getSubPartElement(String subPart) { + public com.google.gwt.user.client.Element getSubPartElement( + String subPart) { if ("tabpanel".equals(subPart)) { return DOM.asOld(tabPanel.getElement().getFirstChildElement()); } else if (SUBPART_TAB_REGEXP.test(subPart)) { @@ -1989,16 +1995,16 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware } @Override - public String getSubPartName(com.google.gwt.user.client.Element subElement) { + public String getSubPartName( + com.google.gwt.user.client.Element subElement) { if (tabPanel.getElement().equals(subElement.getParentElement()) || tabPanel.getElement().equals(subElement)) { return "tabpanel"; } else { for (int i = 0; i < tb.getTabCount(); ++i) { Tab tab = tb.getTab(i); - if (tab.isClosable() - && tab.tabCaption.getCloseButton().isOrHasChild( - subElement)) { + if (tab.isClosable() && tab.tabCaption.getCloseButton() + .isOrHasChild(subElement)) { return "tab[" + i + "]/close"; } else if (tab.getElement().isOrHasChild(subElement)) { return "tab[" + i + "]"; diff --git a/client/src/main/java/com/vaadin/client/ui/VTabsheetPanel.java b/client/src/main/java/com/vaadin/client/ui/VTabsheetPanel.java index 240f493907..6360a32785 100644 --- a/client/src/main/java/com/vaadin/client/ui/VTabsheetPanel.java +++ b/client/src/main/java/com/vaadin/client/ui/VTabsheetPanel.java @@ -129,8 +129,8 @@ public class VTabsheetPanel extends ComplexPanel { hide(DOM.getParent(visibleWidget.getElement())); } visibleWidget = newVisible; - touchScrollHandler.setElements(visibleWidget.getElement() - .getParentElement()); + touchScrollHandler + .setElements(visibleWidget.getElement().getParentElement()); } // Always ensure the selected tab is visible. If server prevents a tab // change we might end up here with visibleWidget == newVisible but its diff --git a/client/src/main/java/com/vaadin/client/ui/VTextualDate.java b/client/src/main/java/com/vaadin/client/ui/VTextualDate.java index 96f6ce490d..c71108c86f 100644 --- a/client/src/main/java/com/vaadin/client/ui/VTextualDate.java +++ b/client/src/main/java/com/vaadin/client/ui/VTextualDate.java @@ -80,11 +80,10 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler, text.setText(""); setPrompting(false); } - if (getClient() != null - && getClient().hasEventListeners(VTextualDate.this, - EventId.FOCUS)) { - getClient() - .updateVariable(getId(), EventId.FOCUS, "", true); + if (getClient() != null && getClient() + .hasEventListeners(VTextualDate.this, EventId.FOCUS)) { + getClient().updateVariable(getId(), EventId.FOCUS, "", + true); } // Needed for tooltip event handling @@ -102,9 +101,8 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler, if (prompting) { text.setText(readonly ? "" : inputPrompt); } - if (getClient() != null - && getClient().hasEventListeners(VTextualDate.this, - EventId.BLUR)) { + if (getClient() != null && getClient() + .hasEventListeners(VTextualDate.this, EventId.BLUR)) { getClient().updateVariable(getId(), EventId.BLUR, "", true); } @@ -144,11 +142,13 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler, } else { frmString += " HH"; } - if (currentResolution.getCalendarField() >= Resolution.MINUTE - .getCalendarField()) { + if (currentResolution + .getCalendarField() >= Resolution.MINUTE + .getCalendarField()) { frmString += ":mm"; - if (currentResolution.getCalendarField() >= Resolution.SECOND - .getCalendarField()) { + if (currentResolution + .getCalendarField() >= Resolution.SECOND + .getCalendarField()) { frmString += ":ss"; } } @@ -253,9 +253,8 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler, // presentation. // FIXME: Add a description/example here of when this is // needed - text.setValue( - getDateTimeService().formatDate(getDate(), - getFormatString()), false); + text.setValue(getDateTimeService().formatDate(getDate(), + getFormatString()), false); } // remove possibly added invalid value indication @@ -275,8 +274,8 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler, removeStyleName(getStylePrimaryName() + PARSE_ERROR_CLASSNAME); } // always send the date string - getClient() - .updateVariable(getId(), "dateString", text.getText(), false); + getClient().updateVariable(getId(), "dateString", text.getText(), + false); // Update variables // (only the smallest defining resolution needs to be @@ -364,12 +363,9 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler, } protected void setText(String text) { - if (inputPrompt != null - && (text == null || "".equals(text)) - && !this.text.getStyleName() - .contains( - VLegacyTextField.CLASSNAME + "-" - + VLegacyTextField.CLASSNAME_FOCUS)) { + if (inputPrompt != null && (text == null || "".equals(text)) + && !this.text.getStyleName().contains(VLegacyTextField.CLASSNAME + + "-" + VLegacyTextField.CLASSNAME_FOCUS)) { text = readonly ? "" : inputPrompt; setPrompting(true); } else { @@ -382,7 +378,8 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler, private final String TEXTFIELD_ID = "field"; @Override - public com.google.gwt.user.client.Element getSubPartElement(String subPart) { + public com.google.gwt.user.client.Element getSubPartElement( + String subPart) { if (subPart.equals(TEXTFIELD_ID)) { return text.getElement(); } @@ -391,7 +388,8 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler, } @Override - public String getSubPartName(com.google.gwt.user.client.Element subElement) { + public String getSubPartName( + com.google.gwt.user.client.Element subElement) { if (text.getElement().isOrHasChild(subElement)) { return TEXTFIELD_ID; } diff --git a/client/src/main/java/com/vaadin/client/ui/VTree.java b/client/src/main/java/com/vaadin/client/ui/VTree.java index efbafd0cb7..86d5c0afcd 100644 --- a/client/src/main/java/com/vaadin/client/ui/VTree.java +++ b/client/src/main/java/com/vaadin/client/ui/VTree.java @@ -81,9 +81,9 @@ import com.vaadin.shared.ui.tree.TreeConstants; /** * */ -public class VTree extends FocusElementPanel implements VHasDropHandler, - FocusHandler, BlurHandler, KeyPressHandler, KeyDownHandler, - SubPartAware, ActionOwner, HandlesAriaCaption { +public class VTree extends FocusElementPanel + implements VHasDropHandler, FocusHandler, BlurHandler, KeyPressHandler, + KeyDownHandler, SubPartAware, ActionOwner, HandlesAriaCaption { private String lastNodeKey = ""; public static final String CLASSNAME = "v-tree"; @@ -254,8 +254,8 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, } else if (event.getTypeInt() == Event.ONMOUSEUP) { // Remove IE text selection hack if (BrowserInfo.get().isIE()) { - ((Element) event.getEventTarget().cast()).setPropertyJSO( - "onselectstart", null); + ((Element) event.getEventTarget().cast()) + .setPropertyJSO("onselectstart", null); } } else if (event.getTypeInt() == Event.ONKEYUP) { if (selectionHasChanged) { @@ -333,8 +333,8 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, drag.getDropDetails().put("itemIdOver", currentMouseOverKey); if (currentMouseOverKey != null) { TreeNode treeNode = getNodeByKey(currentMouseOverKey); - VerticalDropLocation detail = treeNode.getDropDetail(drag - .getCurrentGwtEvent()); + VerticalDropLocation detail = treeNode + .getDropDetail(drag.getCurrentGwtEvent()); Boolean overTreeNode = null; if (treeNode != null && !treeNode.isLeaf() && detail == VerticalDropLocation.MIDDLE) { @@ -370,17 +370,20 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, @Override public void dragOver(final VDragEvent currentDrag) { - final Object oldIdOver = currentDrag.getDropDetails().get( - "itemIdOver"); + final Object oldIdOver = currentDrag.getDropDetails() + .get("itemIdOver"); final VerticalDropLocation oldDetail = (VerticalDropLocation) currentDrag .getDropDetails().get("detail"); updateTreeRelatedDragData(currentDrag); final VerticalDropLocation detail = (VerticalDropLocation) currentDrag .getDropDetails().get("detail"); - boolean nodeHasChanged = (currentMouseOverKey != null && currentMouseOverKey != oldIdOver) - || (currentMouseOverKey == null && oldIdOver != null); - boolean detailHasChanded = (detail != null && detail != oldDetail) + boolean nodeHasChanged = (currentMouseOverKey != null + && currentMouseOverKey != oldIdOver) + || (currentMouseOverKey == null + && oldIdOver != null); + boolean detailHasChanded = (detail != null + && detail != oldDetail) || (detail == null && oldDetail != null); if (nodeHasChanged || detailHasChanded) { @@ -396,8 +399,8 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, public void accepted(VDragEvent event) { VerticalDropLocation curDetail = (VerticalDropLocation) event .getDropDetails().get("detail"); - if (curDetail == detail - && newKey.equals(currentMouseOverKey)) { + if (curDetail == detail && newKey + .equals(currentMouseOverKey)) { getNodeByKey(newKey).emphasis(detail); } /* @@ -710,7 +713,8 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, final int type = DOM.eventGetType(event); final Element target = DOM.eventGetTarget(event); - if (type == Event.ONLOAD && icon != null && target == icon.getElement()) { + if (type == Event.ONLOAD && icon != null + && target == icon.getElement()) { iconLoaded.trigger(); } @@ -719,9 +723,8 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, } final boolean inCaption = isCaptionElement(target); - if (inCaption - && client.hasEventListeners(VTree.this, - TreeConstants.ITEM_CLICK_EVENT_ID) + if (inCaption && client.hasEventListeners(VTree.this, + TreeConstants.ITEM_CLICK_EVENT_ID) && (type == Event.ONDBLCLICK || type == Event.ONMOUSEUP)) { fireClick(event); @@ -751,11 +754,10 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, if (dragMode != 0 || dropHandler != null) { if (type == Event.ONMOUSEDOWN || type == Event.ONTOUCHSTART) { - if (nodeCaptionDiv.isOrHasChild((Node) event - .getEventTarget().cast())) { - if (dragMode > 0 - && (type == Event.ONTOUCHSTART || event - .getButton() == NativeEvent.BUTTON_LEFT)) { + if (nodeCaptionDiv.isOrHasChild( + (Node) event.getEventTarget().cast())) { + if (dragMode > 0 && (type == Event.ONTOUCHSTART || event + .getButton() == NativeEvent.BUTTON_LEFT)) { mouseDownEvent = event; // save event for possible // dd operation if (type == Event.ONMOUSEDOWN) { @@ -775,18 +777,17 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, } } } - } else if (type == Event.ONMOUSEMOVE - || type == Event.ONMOUSEOUT + } else if (type == Event.ONMOUSEMOVE || type == Event.ONMOUSEOUT || type == Event.ONTOUCHMOVE) { if (mouseDownEvent != null) { // start actual drag on slight move when mouse is down VTransferable t = new VTransferable(); - t.setDragSource(ConnectorMap.get(client).getConnector( - VTree.this)); + t.setDragSource(ConnectorMap.get(client) + .getConnector(VTree.this)); t.setData("itemId", key); - VDragEvent drag = VDragAndDropManager.get().startDrag( - t, mouseDownEvent, true); + VDragEvent drag = VDragAndDropManager.get().startDrag(t, + mouseDownEvent, true); drag.createDragImage(nodeCaptionDiv, true); event.stopPropagation(); @@ -815,9 +816,10 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, * The element to check * @return true if the element is the caption or the icon */ - public boolean isCaptionElement(com.google.gwt.dom.client.Element target) { - return (target == nodeCaptionSpan || (icon != null && target == icon - .getElement())); + public boolean isCaptionElement( + com.google.gwt.dom.client.Element target) { + return (target == nodeCaptionSpan + || (icon != null && target == icon.getElement())); } private void fireClick(final Event evt) { @@ -849,8 +851,8 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, // selection event happening after this. In all other cases // we want to send it immediately. clickEventPending = false; - if ((details.getButton() == MouseButton.LEFT || details - .getButton() == MouseButton.MIDDLE) + if ((details.getButton() == MouseButton.LEFT + || details.getButton() == MouseButton.MIDDLE) && !details.isDoubleClick() && selectable) { // Probably a selection that will cause a value change // event to be sent @@ -864,7 +866,8 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, clickEventPending = false; } } - client.updateVariable(paintableId, "clickedKey", key, false); + client.updateVariable(paintableId, "clickedKey", key, + false); client.updateVariable(paintableId, "clickEvent", details.toString(), !clickEventPending); } @@ -906,8 +909,8 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, Id.of(labelId)); nodeCaptionDiv = DOM.createDiv(); - DOM.setElementProperty(nodeCaptionDiv, "className", CLASSNAME - + "-caption"); + DOM.setElementProperty(nodeCaptionDiv, "className", + CLASSNAME + "-caption"); Element wrapper = DOM.createDiv(); wrapper.setId(labelId); wrapper.setAttribute("for", treeItemId); @@ -948,8 +951,8 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, } if (state) { if (!childrenLoaded && notifyServer) { - client.updateVariable(paintableId, "requestChildTree", - true, false); + client.updateVariable(paintableId, "requestChildTree", true, + false); } if (notifyServer) { client.updateVariable(paintableId, "expand", @@ -1160,10 +1163,10 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, public void setNodeStyleName(String styleName) { addStyleName(TreeNode.CLASSNAME + "-" + styleName); - setStyleName(nodeCaptionDiv, TreeNode.CLASSNAME + "-caption-" - + styleName, true); - childNodeContainer.addStyleName(TreeNode.CLASSNAME + "-children-" - + styleName); + setStyleName(nodeCaptionDiv, + TreeNode.CLASSNAME + "-caption-" + styleName, true); + childNodeContainer.addStyleName( + TreeNode.CLASSNAME + "-children-" + styleName); } @@ -1369,8 +1372,8 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, TreeNode currentNode = startNode; while (startParent != null && startParent != commonParent) { List<TreeNode> startChildren = startParent.getChildren(); - for (int i = startChildren.indexOf(currentNode) + 1; i < startChildren - .size(); i++) { + for (int i = startChildren.indexOf(currentNode) + + 1; i < startChildren.size(); i++) { selectAllChildren(startChildren.get(i), true); } @@ -1418,7 +1421,8 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, } /** - * Selects a range of items which are in direct relation with each other.<br/> + * Selects a range of items which are in direct relation with each + * other.<br/> * NOTE: The start node <b>MUST</b> be before the end node! * * @param startNode @@ -1820,9 +1824,9 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, // Selection if (keycode == getNavigationSelectKey()) { if (!focusedNode.isSelected()) { - selectNode( - focusedNode, - (!isMultiselect || multiSelectMode == MULTISELECT_MODE_SIMPLE) + selectNode(focusedNode, + (!isMultiselect + || multiSelectMode == MULTISELECT_MODE_SIMPLE) && selectable); } else { deselectNode(focusedNode); @@ -1899,7 +1903,8 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, * @return The bottom most child */ private TreeNode getLastVisibleChildInTree(TreeNode root) { - if (root.isLeaf() || !root.getState() || root.getChildren().size() == 0) { + if (root.isLeaf() || !root.getState() + || root.getChildren().size() == 0) { return root; } List<TreeNode> children = root.getChildren(); @@ -2082,7 +2087,8 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, * .lang.String) */ @Override - public com.google.gwt.user.client.Element getSubPartElement(String subPart) { + public com.google.gwt.user.client.Element getSubPartElement( + String subPart) { if ("fe".equals(subPart)) { if (BrowserInfo.get().isOpera() && focusedNode != null) { return focusedNode.getElement(); @@ -2135,7 +2141,8 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, * .gwt.user.client.Element) */ @Override - public String getSubPartName(com.google.gwt.user.client.Element subElement) { + public String getSubPartName( + com.google.gwt.user.client.Element subElement) { // Supported identifiers: // // n[index]/n[index]/n[index]{/expand} diff --git a/client/src/main/java/com/vaadin/client/ui/VTreeTable.java b/client/src/main/java/com/vaadin/client/ui/VTreeTable.java index 0ba84af4bb..2dd912acaa 100644 --- a/client/src/main/java/com/vaadin/client/ui/VTreeTable.java +++ b/client/src/main/java/com/vaadin/client/ui/VTreeTable.java @@ -48,7 +48,8 @@ public class VTreeTable extends VScrollTable { public final boolean ctrl; public final boolean shift; - public PendingNavigationEvent(int keycode, boolean ctrl, boolean shift) { + public PendingNavigationEvent(int keycode, boolean ctrl, + boolean shift) { this.keycode = keycode; this.ctrl = ctrl; this.shift = shift; @@ -143,8 +144,8 @@ public class VTreeTable extends VScrollTable { return new VTreeTableRow(uidl, aligns2); } - public class VTreeTableRow extends - VScrollTable.VScrollTableBody.VScrollTableRow { + public class VTreeTableRow + extends VScrollTable.VScrollTableBody.VScrollTableRow { private boolean isTreeCellAdded = false; private SpanElement treeSpacer; @@ -163,8 +164,8 @@ public class VTreeTable extends VScrollTable { public void addCell(UIDL rowUidl, String text, char align, String style, boolean textIsHTML, boolean isSorted, String description) { - super.addCell(rowUidl, text, align, style, textIsHTML, - isSorted, description); + super.addCell(rowUidl, text, align, style, textIsHTML, isSorted, + description); addTreeSpacer(rowUidl); } @@ -175,8 +176,8 @@ public class VTreeTable extends VScrollTable { .getFirstChild(); if (rowUidl.hasAttribute("icon")) { - Icon icon = client.getIcon(rowUidl - .getStringAttribute("icon")); + Icon icon = client + .getIcon(rowUidl.getStringAttribute("icon")); icon.setAlternateText("icon"); container.insertFirst(icon.getElement()); } @@ -193,8 +194,8 @@ public class VTreeTable extends VScrollTable { treeSpacer.setClassName(classname); container.insertFirst(treeSpacer); - depth = rowUidl.hasAttribute("depth") ? rowUidl - .getIntAttribute("depth") : 0; + depth = rowUidl.hasAttribute("depth") + ? rowUidl.getIntAttribute("depth") : 0; setIndent(); isTreeCellAdded = true; return true; @@ -355,9 +356,8 @@ public class VTreeTable extends VScrollTable { if (cells.hasNext()) { final Object cell = cells.next(); if (cell instanceof String) { - addSpannedCell(uidl, cell.toString(), aligns[0], - "", htmlContentAllowed, false, null, - colCount); + addSpannedCell(uidl, cell.toString(), aligns[0], "", + htmlContentAllowed, false, null, colCount); } else { addSpannedCell(uidl, (Widget) cell, aligns[0], "", false, colCount); @@ -625,7 +625,8 @@ public class VTreeTable extends VScrollTable { public RowExpandAnimation(List<VScrollTableRow> rows) { this.rows = rows; buildAndInsertAnimatingDiv(); - preparator = new AnimationPreparator(rows.get(0).getIndex() - 1); + preparator = new AnimationPreparator( + rows.get(0).getIndex() - 1); preparator.prepareTableForAnimation(); for (VScrollTableRow row : rows) { cloneAndAppendRow(row); @@ -724,7 +725,8 @@ public class VTreeTable extends VScrollTable { return td.getChild(0).cast(); } - private void resetCellWrapperDivsDisplayProperty(VScrollTableRow row) { + private void resetCellWrapperDivsDisplayProperty( + VScrollTableRow row) { Element tr = row.getElement(); for (int ix = 0; ix < tr.getChildCount(); ix++) { getWrapperDiv(tr, ix).getStyle().clearProperty("display"); @@ -804,8 +806,9 @@ public class VTreeTable extends VScrollTable { VTreeTableRow focusedRow = (VTreeTableRow) getFocusedRow(); if (focusedRow != null) { - if (focusedRow.canHaveChildren - && ((keycode == KeyCodes.KEY_RIGHT && !focusedRow.open) || (keycode == KeyCodes.KEY_LEFT && focusedRow.open))) { + if (focusedRow.canHaveChildren && ((keycode == KeyCodes.KEY_RIGHT + && !focusedRow.open) + || (keycode == KeyCodes.KEY_LEFT && focusedRow.open))) { if (!ctrl) { client.updateVariable(paintableId, "selectCollapsed", true, false); diff --git a/client/src/main/java/com/vaadin/client/ui/VTwinColSelect.java b/client/src/main/java/com/vaadin/client/ui/VTwinColSelect.java index 8495a25f68..e2d06d811b 100644 --- a/client/src/main/java/com/vaadin/client/ui/VTwinColSelect.java +++ b/client/src/main/java/com/vaadin/client/ui/VTwinColSelect.java @@ -74,8 +74,8 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, * A ListBox which catches double clicks * */ - public class DoubleClickListBox extends ListBox implements - HasDoubleClickHandlers { + public class DoubleClickListBox extends ListBox + implements HasDoubleClickHandlers { public DoubleClickListBox(boolean isMultipleSelect) { super(isMultipleSelect); } @@ -170,13 +170,15 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, /** For internal use only. May be removed or replaced in the future. */ public void updateCaptions(UIDL uidl) { String leftCaption = (uidl - .hasAttribute(TwinColSelectConstants.ATTRIBUTE_LEFT_CAPTION) ? uidl - .getStringAttribute(TwinColSelectConstants.ATTRIBUTE_LEFT_CAPTION) - : null); + .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); + .hasAttribute(TwinColSelectConstants.ATTRIBUTE_RIGHT_CAPTION) + ? uidl.getStringAttribute( + TwinColSelectConstants.ATTRIBUTE_RIGHT_CAPTION) + : null); boolean hasCaptions = (leftCaption != null || rightCaption != null); @@ -389,13 +391,14 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, /** For internal use only. May be removed or replaced in the future. */ public void setInternalWidths() { getElement().getStyle().setPosition(Position.RELATIVE); - int bordersAndPaddings = WidgetUtil.measureHorizontalPaddingAndBorder( - buttons.getElement(), 0); + int bordersAndPaddings = WidgetUtil + .measureHorizontalPaddingAndBorder(buttons.getElement(), 0); int buttonWidth = WidgetUtil.getRequiredWidth(buttons); int totalWidth = getOffsetWidth(); - int spaceForSelect = (totalWidth - buttonWidth - bordersAndPaddings) / 2; + int spaceForSelect = (totalWidth - buttonWidth - bordersAndPaddings) + / 2; options.setWidth(spaceForSelect + "px"); if (optionsCaption != null) { @@ -563,7 +566,8 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, private static final String SUBPART_REMOVE_BUTTON = "remove"; @Override - public com.google.gwt.user.client.Element getSubPartElement(String subPart) { + public com.google.gwt.user.client.Element getSubPartElement( + String subPart) { if (SUBPART_OPTION_SELECT.equals(subPart)) { return options.getElement(); } else if (subPart.startsWith(SUBPART_OPTION_SELECT_ITEM)) { @@ -573,8 +577,8 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, } else if (SUBPART_SELECTION_SELECT.equals(subPart)) { return selections.getElement(); } else if (subPart.startsWith(SUBPART_SELECTION_SELECT_ITEM)) { - String idx = subPart.substring(SUBPART_SELECTION_SELECT_ITEM - .length()); + String idx = subPart + .substring(SUBPART_SELECTION_SELECT_ITEM.length()); return (com.google.gwt.user.client.Element) selections.getElement() .getChild(Integer.parseInt(idx)); } else if (optionsCaption != null @@ -593,7 +597,8 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, } @Override - public String getSubPartName(com.google.gwt.user.client.Element subElement) { + public String getSubPartName( + com.google.gwt.user.client.Element subElement) { if (optionsCaption != null && optionsCaption.getElement().isOrHasChild(subElement)) { return SUBPART_LEFT_CAPTION; diff --git a/client/src/main/java/com/vaadin/client/ui/VUpload.java b/client/src/main/java/com/vaadin/client/ui/VUpload.java index 2800acccf9..99d4511b15 100644 --- a/client/src/main/java/com/vaadin/client/ui/VUpload.java +++ b/client/src/main/java/com/vaadin/client/ui/VUpload.java @@ -250,8 +250,9 @@ public class VUpload extends SimplePanel { } VConsole.log("VUpload:Submit complete"); ((UploadConnector) ConnectorMap.get(client) - .getConnector(VUpload.this)).getRpcProxy( - UploadServerRpc.class).poll(); + .getConnector(VUpload.this)) + .getRpcProxy(UploadServerRpc.class) + .poll(); } rebuildPanel(); @@ -293,7 +294,8 @@ public class VUpload extends SimplePanel { // Only visit the server if the upload has not already // finished if (thisUploadId == nextUploadId) { - VConsole.log("Visiting server to see if upload started event changed UI."); + VConsole.log( + "Visiting server to see if upload started event changed UI."); client.updateVariable(paintableId, "pollForStart", thisUploadId, true); } diff --git a/client/src/main/java/com/vaadin/client/ui/VVideo.java b/client/src/main/java/com/vaadin/client/ui/VVideo.java index 023a7f9ee0..93d0a28a59 100644 --- a/client/src/main/java/com/vaadin/client/ui/VVideo.java +++ b/client/src/main/java/com/vaadin/client/ui/VVideo.java @@ -48,7 +48,7 @@ public class VVideo extends VMediaBase { el.addEventListener('loadedmetadata', $entry(function(e) { self.@com.vaadin.client.ui.VVideo::updateElementDynamicSize(II)(el.videoWidth, el.videoHeight); }), false); - + }-*/; /** diff --git a/client/src/main/java/com/vaadin/client/ui/VWindow.java b/client/src/main/java/com/vaadin/client/ui/VWindow.java index de465f6c1f..bd89191a35 100644 --- a/client/src/main/java/com/vaadin/client/ui/VWindow.java +++ b/client/src/main/java/com/vaadin/client/ui/VWindow.java @@ -136,10 +136,14 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, /** For internal use only. May be removed or replaced in the future. */ public ShortcutActionHandler shortcutHandler; - /** Last known positionx read from UIDL or updated to application connection */ + /** + * Last known positionx read from UIDL or updated to application connection + */ private int uidlPositionX = -1; - /** Last known positiony read from UIDL or updated to application connection */ + /** + * Last known positiony read from UIDL or updated to application connection + */ private int uidlPositionY = -1; /** For internal use only. May be removed or replaced in the future. */ @@ -334,8 +338,8 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, final int order = windowOrder.size(); setWindowOrder(order); windowOrder.add(this); - setPopupPosition(order * STACKING_OFFSET_PIXELS, order - * STACKING_OFFSET_PIXELS); + setPopupPosition(order * STACKING_OFFSET_PIXELS, + order * STACKING_OFFSET_PIXELS); } @@ -374,11 +378,12 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, footer = DOM.createDiv(); DOM.setElementProperty(footer, "className", CLASSNAME + "-footer"); resizeBox = DOM.createDiv(); - DOM.setElementProperty(resizeBox, "className", CLASSNAME + "-resizebox"); + DOM.setElementProperty(resizeBox, "className", + CLASSNAME + "-resizebox"); closeBox = DOM.createDiv(); maximizeRestoreBox = DOM.createDiv(); - DOM.setElementProperty(maximizeRestoreBox, "className", CLASSNAME - + "-maximizebox"); + DOM.setElementProperty(maximizeRestoreBox, "className", + CLASSNAME + "-maximizebox"); DOM.setElementAttribute(maximizeRestoreBox, "tabindex", "0"); DOM.setElementProperty(closeBox, "className", CLASSNAME + "-closebox"); DOM.setElementAttribute(closeBox, "tabindex", "0"); @@ -580,8 +585,8 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, super.setVisible(visible); } - if (visible - && BrowserInfo.get().requiresPositionAbsoluteOverflowAutoFix()) { + if (visible && BrowserInfo.get() + .requiresPositionAbsoluteOverflowAutoFix()) { /* * Shake up the DOM a bit to make the window shed unnecessary @@ -629,8 +634,8 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, this.closable = closable; if (closable) { - DOM.setElementProperty(closeBox, "className", CLASSNAME - + "-closebox"); + DOM.setElementProperty(closeBox, "className", + CLASSNAME + "-closebox"); } else { DOM.setElementProperty(closeBox, "className", CLASSNAME @@ -737,8 +742,8 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, } private void showModalityCurtain() { - getModalityCurtain().getStyle().setZIndex( - windowOrder.indexOf(this) + Z_INDEX); + getModalityCurtain().getStyle() + .setZIndex(windowOrder.indexOf(this) + Z_INDEX); if (isShowing()) { getOverlayContainer().insertBefore(getModalityCurtain(), @@ -826,11 +831,11 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, resizable = resizability; if (resizability) { DOM.setElementProperty(footer, "className", CLASSNAME + "-footer"); - DOM.setElementProperty(resizeBox, "className", CLASSNAME - + "-resizebox"); + DOM.setElementProperty(resizeBox, "className", + CLASSNAME + "-resizebox"); } else { - DOM.setElementProperty(footer, "className", CLASSNAME + "-footer " - + CLASSNAME + "-footer-noresize"); + DOM.setElementProperty(footer, "className", + CLASSNAME + "-footer " + CLASSNAME + "-footer-noresize"); DOM.setElementProperty(resizeBox, "className", CLASSNAME + "-resizebox " + CLASSNAME + "-resizebox-disabled"); } @@ -896,9 +901,8 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, } // Provide information to assistive device users that a sub window was // opened - String prefix = "<span class='" - + AriaHelper.ASSISTIVE_DEVICE_ONLY_STYLE + "'>" - + assistivePrefix + "</span>"; + String prefix = "<span class='" + AriaHelper.ASSISTIVE_DEVICE_ONLY_STYLE + + "'>" + assistivePrefix + "</span>"; String postfix = "<span class='" + AriaHelper.ASSISTIVE_DEVICE_ONLY_STYLE + "'>" + assistivePostfix + "</span>"; @@ -1185,8 +1189,8 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, public void updateContentsSize() { LayoutManager layoutManager = getLayoutManager(); - layoutManager.setNeedsMeasure(ConnectorMap.get(client).getConnector( - this)); + layoutManager + .setNeedsMeasure(ConnectorMap.get(client).getConnector(this)); layoutManager.layoutNow(); } @@ -1347,8 +1351,8 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, @Override public void onScroll(ScrollEvent event) { - client.updateVariable(id, "scrollTop", - contentPanel.getScrollPosition(), false); + client.updateVariable(id, "scrollTop", contentPanel.getScrollPosition(), + false); client.updateVariable(id, "scrollLeft", contentPanel.getHorizontalScrollPosition(), false); @@ -1356,8 +1360,7 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, @Override public void onKeyDown(KeyDownEvent event) { - if (vaadinModality - && event.getNativeKeyCode() == KeyCodes.KEY_BACKSPACE + if (vaadinModality && event.getNativeKeyCode() == KeyCodes.KEY_BACKSPACE && !isFocusedElementEditable()) { event.preventDefault(); } @@ -1423,8 +1426,8 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, assistiveConnectors = connectors; if (connectors.length == 0) { - Roles.getDialogRole().removeAriaDescribedbyProperty( - getElement()); + Roles.getDialogRole() + .removeAriaDescribedbyProperty(getElement()); } else { Id[] ids = new Id[connectors.length]; for (int index = 0; index < connectors.length; index++) { @@ -1463,8 +1466,8 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, * Sets the WAI-ARIA role the window. * * This role defines how an assistive device handles a window. Available - * roles are alertdialog and dialog (@see <a - * href="http://www.w3.org/TR/2011/CR-wai-aria-20110118/roles">Roles + * roles are alertdialog and dialog (@see + * <a href="http://www.w3.org/TR/2011/CR-wai-aria-20110118/roles">Roles * Model</a>). * * The default role is dialog. diff --git a/client/src/main/java/com/vaadin/client/ui/absolutelayout/AbsoluteLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/absolutelayout/AbsoluteLayoutConnector.java index 19b66fb72f..f3d1706e4c 100644 --- a/client/src/main/java/com/vaadin/client/ui/absolutelayout/AbsoluteLayoutConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/absolutelayout/AbsoluteLayoutConnector.java @@ -40,8 +40,8 @@ import com.vaadin.ui.AbsoluteLayout; * counterpart {@link VAbsoluteLayout} */ @Connect(AbsoluteLayout.class) -public class AbsoluteLayoutConnector extends - AbstractComponentContainerConnector implements DirectionalManagedLayout { +public class AbsoluteLayoutConnector extends AbstractComponentContainerConnector + implements DirectionalManagedLayout { private LayoutClickEventHandler clickEventHandler = new LayoutClickEventHandler( this) { @@ -120,8 +120,8 @@ public class AbsoluteLayoutConnector extends VAbsoluteLayout absoluteLayoutWidget = getWidget(); boolean captionIsNeeded = VCaption.isNeeded(component.getState()); - VCaption caption = absoluteLayoutWidget.getWidgetCaption(component - .getWidget()); + VCaption caption = absoluteLayoutWidget + .getWidgetCaption(component.getWidget()); if (captionIsNeeded) { if (caption == null) { caption = new VCaption(component, getConnection()); @@ -173,8 +173,8 @@ public class AbsoluteLayoutConnector extends } private void setChildWidgetPosition(ComponentConnector child) { - String position = getState().connectorToCssPosition.get(child - .getConnectorId()); + String position = getState().connectorToCssPosition + .get(child.getConnectorId()); if (position == null) { position = ""; } @@ -204,7 +204,8 @@ public class AbsoluteLayoutConnector extends * @return updated position, or the original string if no updates were * needed */ - private String addDefaultPositionIfMissing(String position, String property) { + private String addDefaultPositionIfMissing(String position, + String property) { if (!position.contains(property)) { position = position + property + ":0.0px;"; } @@ -219,7 +220,8 @@ public class AbsoluteLayoutConnector extends * (com.vaadin.client.ConnectorHierarchyChangeEvent) */ @Override - public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) { + public void onConnectorHierarchyChange( + ConnectorHierarchyChangeEvent event) { for (ComponentConnector child : getChildComponents()) { if (!getWidget().contains(child.getWidget())) { getWidget().add(child.getWidget()); diff --git a/client/src/main/java/com/vaadin/client/ui/accordion/AccordionConnector.java b/client/src/main/java/com/vaadin/client/ui/accordion/AccordionConnector.java index 949e19071c..6e74443863 100644 --- a/client/src/main/java/com/vaadin/client/ui/accordion/AccordionConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/accordion/AccordionConnector.java @@ -29,8 +29,8 @@ import com.vaadin.shared.ui.accordion.AccordionState; import com.vaadin.ui.Accordion; @Connect(Accordion.class) -public class AccordionConnector extends TabsheetBaseConnector implements - SimpleManagedLayout, MayScrollChildren { +public class AccordionConnector extends TabsheetBaseConnector + implements SimpleManagedLayout, MayScrollChildren { @Override protected void init() { @@ -47,8 +47,8 @@ public class AccordionConnector extends TabsheetBaseConnector implements * the content area is */ if (getWidget().selectedItemIndex >= 0) { - StackItem selectedItem = getWidget().getStackItem( - getWidget().selectedItemIndex); + StackItem selectedItem = getWidget() + .getStackItem(getWidget().selectedItemIndex); ComponentConnector contentConnector = getChildComponents().get(0); if (contentConnector != null) { @@ -106,12 +106,12 @@ public class AccordionConnector extends TabsheetBaseConnector implements usedPixels += item.getCaptionHeight(); } else { // This includes the captionNode borders - usedPixels += WidgetUtil.getRequiredHeight(item - .getElement()); + usedPixels += WidgetUtil + .getRequiredHeight(item.getElement()); } } - int rootElementInnerHeight = getLayoutManager().getInnerHeight( - getWidget().getElement()); + int rootElementInnerHeight = getLayoutManager() + .getInnerHeight(getWidget().getElement()); int spaceForOpenItem = rootElementInnerHeight - usedPixels; if (spaceForOpenItem < 0) { diff --git a/client/src/main/java/com/vaadin/client/ui/aria/AriaHelper.java b/client/src/main/java/com/vaadin/client/ui/aria/AriaHelper.java index bf93901a33..368b1b51ef 100644 --- a/client/src/main/java/com/vaadin/client/ui/aria/AriaHelper.java +++ b/client/src/main/java/com/vaadin/client/ui/aria/AriaHelper.java @@ -47,8 +47,8 @@ public class AriaHelper { ((HandlesAriaCaption) widget).bindAriaCaption(null); } else { ensureHasId(captionElement); - ((HandlesAriaCaption) widget).bindAriaCaption(DOM - .asOld(captionElement)); + ((HandlesAriaCaption) widget) + .bindAriaCaption(DOM.asOld(captionElement)); } } else if (captionElement != null) { // Handle the default case @@ -175,8 +175,9 @@ public class AriaHelper { * * @param element * Element to move out of sight - * @param boolean assistiveOnly true when element should only be visible for - * assistive devices, false to make the element visible for all + * @param boolean + * assistiveOnly true when element should only be visible for + * assistive devices, false to make the element visible for all */ public static void setVisibleForAssistiveDevicesOnly(Element element, boolean assistiveOnly) { diff --git a/client/src/main/java/com/vaadin/client/ui/button/ButtonConnector.java b/client/src/main/java/com/vaadin/client/ui/button/ButtonConnector.java index 2c2006e19b..1b5fd9e509 100644 --- a/client/src/main/java/com/vaadin/client/ui/button/ButtonConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/button/ButtonConnector.java @@ -34,8 +34,8 @@ import com.vaadin.shared.ui.button.ButtonState; import com.vaadin.ui.Button; @Connect(value = Button.class, loadStyle = LoadStyle.EAGER) -public class ButtonConnector extends AbstractComponentConnector implements - ClickHandler { +public class ButtonConnector extends AbstractComponentConnector + implements ClickHandler { @Override public boolean delegateCaptionHandling() { @@ -123,8 +123,8 @@ public class ButtonConnector extends AbstractComponentConnector implements // Add mouse details MouseEventDetails details = MouseEventDetailsBuilder - .buildMouseEventDetails(event.getNativeEvent(), getWidget() - .getElement()); + .buildMouseEventDetails(event.getNativeEvent(), + getWidget().getElement()); getRpcProxy(ButtonServerRpc.class).click(details); } diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/CalendarConnector.java b/client/src/main/java/com/vaadin/client/ui/calendar/CalendarConnector.java index 58cc31a580..753a47265a 100644 --- a/client/src/main/java/com/vaadin/client/ui/calendar/CalendarConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/calendar/CalendarConnector.java @@ -82,8 +82,8 @@ import com.vaadin.ui.Calendar; * @author Vaadin Ltd. */ @Connect(value = Calendar.class, loadStyle = LoadStyle.LAZY) -public class CalendarConnector extends AbstractComponentConnector implements - ActionOwner, SimpleManagedLayout, Paintable { +public class CalendarConnector extends AbstractComponentConnector + implements ActionOwner, SimpleManagedLayout, Paintable { private CalendarServerRpc rpc = RpcProxy.create(CalendarServerRpc.class, this); @@ -184,8 +184,8 @@ public class CalendarConnector extends AbstractComponentConnector implements StringBuilder sb = new StringBuilder(); sb.append(DateUtil.formatClientSideDate(event.getStart())); sb.append("-"); - sb.append(DateUtil.formatClientSideTime(event - .getStartTime())); + sb.append(DateUtil + .formatClientSideTime(event.getStartTime())); rpc.eventMove(event.getIndex(), sb.toString()); } } @@ -196,19 +196,20 @@ public class CalendarConnector extends AbstractComponentConnector implements if (hasEventListener(CalendarEventId.EVENTRESIZE)) { StringBuilder buffer = new StringBuilder(); - buffer.append(DateUtil.formatClientSideDate(event - .getStart())); + buffer.append( + DateUtil.formatClientSideDate(event.getStart())); buffer.append("-"); - buffer.append(DateUtil.formatClientSideTime(event - .getStartTime())); + buffer.append(DateUtil + .formatClientSideTime(event.getStartTime())); String newStartDate = buffer.toString(); buffer = new StringBuilder(); - buffer.append(DateUtil.formatClientSideDate(event.getEnd())); + buffer.append( + DateUtil.formatClientSideDate(event.getEnd())); buffer.append("-"); - buffer.append(DateUtil.formatClientSideTime(event - .getEndTime())); + buffer.append( + DateUtil.formatClientSideTime(event.getEndTime())); String newEndDate = buffer.toString(); @@ -233,7 +234,8 @@ public class CalendarConnector extends AbstractComponentConnector implements }); getWidget().setListener(new MouseEventListener() { @Override - public void contextMenu(ContextMenuEvent event, final Widget widget) { + public void contextMenu(ContextMenuEvent event, + final Widget widget) { final NativeEvent ne = event.getNativeEvent(); int left = ne.getClientX(); int top = ne.getClientY(); @@ -259,15 +261,15 @@ public class CalendarConnector extends AbstractComponentConnector implements */ SimpleDayCell cell = (SimpleDayCell) widget; Date start = new Date(cell.getDate().getYear(), - cell.getDate().getMonth(), cell.getDate() - .getDate(), 0, 0, 0); + cell.getDate().getMonth(), + cell.getDate().getDate(), 0, 0, 0); - Date end = new Date(cell.getDate().getYear(), cell - .getDate().getMonth(), cell.getDate() - .getDate(), 23, 59, 59); + Date end = new Date(cell.getDate().getYear(), + cell.getDate().getMonth(), + cell.getDate().getDate(), 23, 59, 59); - return CalendarConnector.this.getActionsBetween( - start, end); + return CalendarConnector.this + .getActionsBetween(start, end); } else if (widget instanceof MonthEventLabel) { MonthEventLabel mel = (MonthEventLabel) widget; @@ -285,9 +287,8 @@ public class CalendarConnector extends AbstractComponentConnector implements * Week and Day view */ DateCell cell = (DateCell) widget; - int slotIndex = DOM.getChildIndex( - cell.getElement(), (Element) ne - .getEventTarget().cast()); + int slotIndex = DOM.getChildIndex(cell.getElement(), + (Element) ne.getEventTarget().cast()); DateCellSlot slot = cell.getSlot(slotIndex); return CalendarConnector.this.getActionsBetween( slot.getFrom(), slot.getTo()); @@ -327,8 +328,10 @@ public class CalendarConnector extends AbstractComponentConnector implements VCalendar widget = getWidget(); // Enable or disable the forward and backward navigation buttons - widget.setForwardNavigationEnabled(hasEventListener(CalendarEventId.FORWARD)); - widget.setBackwardNavigationEnabled(hasEventListener(CalendarEventId.BACKWARD)); + widget.setForwardNavigationEnabled( + hasEventListener(CalendarEventId.FORWARD)); + widget.setBackwardNavigationEnabled( + hasEventListener(CalendarEventId.BACKWARD)); widget.set24HFormat(state.format24H); widget.setDayNames(state.dayNames); @@ -340,10 +343,12 @@ public class CalendarConnector extends AbstractComponentConnector implements widget.setReadOnly(state.readOnly); widget.setDisabled(!state.enabled); - widget.setRangeSelectAllowed(hasEventListener(CalendarEventId.RANGESELECT)); + widget.setRangeSelectAllowed( + hasEventListener(CalendarEventId.RANGESELECT)); widget.setRangeMoveAllowed(hasEventListener(CalendarEventId.EVENTMOVE)); widget.setEventMoveAllowed(hasEventListener(CalendarEventId.EVENTMOVE)); - widget.setEventResizeAllowed(hasEventListener(CalendarEventId.EVENTRESIZE)); + widget.setEventResizeAllowed( + hasEventListener(CalendarEventId.EVENTRESIZE)); widget.setEventCaptionAsHtml(state.eventCaptionAsHtml); @@ -374,9 +379,9 @@ public class CalendarConnector extends AbstractComponentConnector implements /* * (non-Javadoc) * - * @see - * com.vaadin.terminal.gwt.client.Paintable#updateFromUIDL(com.vaadin.terminal - * .gwt.client.UIDL, com.vaadin.terminal.gwt.client.ApplicationConnection) + * @see com.vaadin.terminal.gwt.client.Paintable#updateFromUIDL(com.vaadin. + * terminal .gwt.client.UIDL, + * com.vaadin.terminal.gwt.client.ApplicationConnection) */ @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { @@ -385,9 +390,9 @@ public class CalendarConnector extends AbstractComponentConnector implements UIDL child = (UIDL) childIterator.next(); if (DROPHANDLER_ACCEPT_CRITERIA_PAINT_TAG.equals(child.getTag())) { if (getWidget().getDropHandler() == null) { - getWidget().setDropHandler( - showingMonthView() ? new CalendarMonthDropHandler( - this) : new CalendarWeekDropHandler(this)); + getWidget().setDropHandler(showingMonthView() + ? new CalendarMonthDropHandler(this) + : new CalendarWeekDropHandler(this)); } getWidget().getDropHandler().updateAcceptRules(child); } else { @@ -420,7 +425,8 @@ public class CalendarConnector extends AbstractComponentConnector implements } @Override - public TooltipInfo getTooltipInfo(com.google.gwt.dom.client.Element element) { + public TooltipInfo getTooltipInfo( + com.google.gwt.dom.client.Element element) { TooltipInfo tooltipInfo = null; Widget w = WidgetUtil.findWidget(element, null); if (w instanceof HasTooltipKey) { @@ -662,10 +668,10 @@ public class CalendarConnector extends AbstractComponentConnector implements calendarEvent.setStart(getWidget().getDateFormat().parse(dateFrom)); calendarEvent.setEnd(getWidget().getDateFormat().parse(dateTo)); calendarEvent.setFormat24h(format24h); - calendarEvent.setStartTime(getWidget().getDateTimeFormat().parse( - dateFrom + " " + timeFrom)); - calendarEvent.setEndTime(getWidget().getDateTimeFormat().parse( - dateTo + " " + timeTo)); + calendarEvent.setStartTime(getWidget().getDateTimeFormat() + .parse(dateFrom + " " + timeFrom)); + calendarEvent.setEndTime(getWidget().getDateTimeFormat() + .parse(dateTo + " " + timeTo)); calendarEvent.setStyleName(event.styleName); calendarEvent.setIndex(event.index); list.add(calendarEvent); diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/CalendarEvent.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/CalendarEvent.java index 5630db2415..687dcd2b52 100644 --- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/CalendarEvent.java +++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/CalendarEvent.java @@ -282,10 +282,10 @@ public class CalendarEvent { if (targetDay.compareTo(getStart()) == 0) { // for first day rangeInMinutesForDay = DateConstants.DAYINMINUTES - (getStartTime().getTime() - getStart().getTime()) - / DateConstants.MINUTEINMILLIS; + / DateConstants.MINUTEINMILLIS; } else if (targetDay.compareTo(getEnd()) == 0) { // for last day - rangeInMinutesForDay = (getEndTime().getTime() - getEnd() - .getTime()) / DateConstants.MINUTEINMILLIS; + rangeInMinutesForDay = (getEndTime().getTime() + - getEnd().getTime()) / DateConstants.MINUTEINMILLIS; } else { // for in-between days rangeInMinutesForDay = DateConstants.DAYINMINUTES; } @@ -306,7 +306,8 @@ public class CalendarEvent { // if difference between start and end times is more than day - of // course it is not one day, but several days - if (getEndTime().getTime() - getStartTime().getTime() > DateConstants.DAYINMILLIS) { + if (getEndTime().getTime() + - getStartTime().getTime() > DateConstants.DAYINMILLIS) { isSeveralDays = true; } else { // if difference <= day -> there can be different cases if (getStart().compareTo(getEnd()) != 0 diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCell.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCell.java index 39d516b694..ef200ef095 100644 --- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCell.java +++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCell.java @@ -45,9 +45,8 @@ import com.google.gwt.user.client.Event; import com.google.gwt.user.client.ui.Widget; import com.vaadin.client.WidgetUtil; -public class DateCell extends FocusableComplexPanel implements - MouseDownHandler, MouseMoveHandler, MouseUpHandler, KeyDownHandler, - ContextMenuHandler { +public class DateCell extends FocusableComplexPanel implements MouseDownHandler, + MouseMoveHandler, MouseUpHandler, KeyDownHandler, ContextMenuHandler { private static final String DRAGEMPHASISSTYLE = " dragemphasis"; private Date date; private int width; @@ -111,8 +110,8 @@ public class DateCell extends FocusableComplexPanel implements firstHour = weekgrid.getFirstHour(); lastHour = weekgrid.getLastHour(); numberOfSlots = (lastHour - firstHour + 1) * 2; - long slotTime = Math.round(((lastHour - firstHour + 1) * 3600000.0) - / numberOfSlots); + long slotTime = Math.round( + ((lastHour - firstHour + 1) * 3600000.0) / numberOfSlots); slotElements = new Element[numberOfSlots]; slotElementHeights = new int[numberOfSlots]; @@ -176,7 +175,8 @@ public class DateCell extends FocusableComplexPanel implements } } - throw new IllegalArgumentException("Element not found in this DateCell"); + throw new IllegalArgumentException( + "Element not found in this DateCell"); } public DateCellSlot getSlot(int index) { @@ -326,8 +326,8 @@ public class DateCell extends FocusableComplexPanel implements startingSlotHeight = height / numberOfSlots; for (int i = 0; i < slotElements.length; i++) { - slotElements[i].getStyle() - .setHeight(slotElementHeights[i], Unit.PX); + slotElements[i].getStyle().setHeight(slotElementHeights[i], + Unit.PX); } updateEventCellsHeight(); @@ -352,9 +352,10 @@ public class DateCell extends FocusableComplexPanel implements d.setMoveWidth(width); int freeSpaceCol = findFreeColumnSpaceOnLeft( - new WeekGridMinuteTimeRange(d.getCalendarEvent() - .getStartTime(), d.getCalendarEvent() - .getEndTime()), order, columns); + new WeekGridMinuteTimeRange( + d.getCalendarEvent().getStartTime(), + d.getCalendarEvent().getEndTime()), + order, columns); if (freeSpaceCol >= 0) { col = freeSpaceCol; columns.put(eventIndex, col); @@ -378,10 +379,8 @@ public class DateCell extends FocusableComplexPanel implements int eventWidth = (width / colCount); for (Integer index : g.getItems()) { DateCellDayEvent d = (DateCellDayEvent) getWidget(index); - d.getElement() - .getStyle() - .setMarginLeft((eventWidth * columns.get(index)), - Unit.PX); + d.getElement().getStyle().setMarginLeft( + (eventWidth * columns.get(index)), Unit.PX); d.setWidth(eventWidth + "px"); d.setSlotHeightInPX(getSlotHeight()); } @@ -404,9 +403,9 @@ public class DateCell extends FocusableComplexPanel implements } DateCellDayEvent d = (DateCellDayEvent) getWidget(eventIndex); - WeekGridMinuteTimeRange nextRange = new WeekGridMinuteTimeRange(d - .getCalendarEvent().getStartTime(), d.getCalendarEvent() - .getEndTime()); + WeekGridMinuteTimeRange nextRange = new WeekGridMinuteTimeRange( + d.getCalendarEvent().getStartTime(), + d.getCalendarEvent().getEndTime()); if (WeekGridMinuteTimeRange.doesOverlap(dateRange, nextRange)) { skipIndex = col; @@ -453,8 +452,8 @@ public class DateCell extends FocusableComplexPanel implements int count = getWidgetCount(); DateCellDayEvent target = (DateCellDayEvent) getWidget(targetIndex); WeekGridMinuteTimeRange targetRange = new WeekGridMinuteTimeRange( - target.getCalendarEvent().getStartTime(), target - .getCalendarEvent().getEndTime()); + target.getCalendarEvent().getStartTime(), + target.getCalendarEvent().getEndTime()); Date groupStart = targetRange.getStart(); Date groupEnd = targetRange.getEnd(); @@ -464,9 +463,9 @@ public class DateCell extends FocusableComplexPanel implements } DateCellDayEvent d = (DateCellDayEvent) getWidget(i); - WeekGridMinuteTimeRange nextRange = new WeekGridMinuteTimeRange(d - .getCalendarEvent().getStartTime(), d.getCalendarEvent() - .getEndTime()); + WeekGridMinuteTimeRange nextRange = new WeekGridMinuteTimeRange( + d.getCalendarEvent().getStartTime(), + d.getCalendarEvent().getEndTime()); if (WeekGridMinuteTimeRange.doesOverlap(targetRange, nextRange)) { g.add(i); @@ -547,8 +546,8 @@ public class DateCell extends FocusableComplexPanel implements events.add(dayEvent.getCalendarEvent()); index = 0; - for (CalendarEvent e : weekgrid.getCalendar().sortEventsByDuration( - events)) { + for (CalendarEvent e : weekgrid.getCalendar() + .sortEventsByDuration(events)) { if (e.equals(dayEvent.getCalendarEvent())) { break; } @@ -584,7 +583,8 @@ public class DateCell extends FocusableComplexPanel implements int eventStartHours = eventStart.getHours(); int eventEndHours = eventEnd.getHours(); - display = !(eventEndHours < firstHour || eventStartHours > lastHour); + display = !(eventEndHours < firstHour + || eventStartHours > lastHour); } return display; } @@ -642,8 +642,8 @@ public class DateCell extends FocusableComplexPanel implements // and then the end for (int i = 0; i < nodes.getLength(); i++) { Element element = (Element) nodes.getItem(i); - boolean isRangeElement = element.getClassName().contains( - "v-daterange"); + boolean isRangeElement = element.getClassName() + .contains("v-daterange"); if (isRangeElement && slotStart == -1) { slotStart = i; @@ -666,10 +666,8 @@ public class DateCell extends FocusableComplexPanel implements + (currentDate.getMonth() + 1) + "-" + currentDate.getDate(); if (weekgrid.getCalendar().getRangeSelectListener() != null) { - weekgrid.getCalendar() - .getRangeSelectListener() - .rangeSelected( - yr + ":" + startMinutes + ":" + endMinutes); + weekgrid.getCalendar().getRangeSelectListener().rangeSelected( + yr + ":" + startMinutes + ":" + endMinutes); } eventRangeStart = -1; } else { @@ -792,7 +790,8 @@ public class DateCell extends FocusableComplexPanel implements * {@link #addEmphasisStyle(Element)} instead */ @Deprecated - public void addEmphasisStyle(com.google.gwt.user.client.Element elementOver) { + public void addEmphasisStyle( + com.google.gwt.user.client.Element elementOver) { String originalStylename = getStyleName(elementOver); setStyleName(elementOver, originalStylename + DRAGEMPHASISSTYLE); } @@ -812,10 +811,8 @@ public class DateCell extends FocusableComplexPanel implements public void removeEmphasisStyle( com.google.gwt.user.client.Element elementOver) { String originalStylename = getStyleName(elementOver); - setStyleName( - elementOver, - originalStylename.substring(0, originalStylename.length() - - DRAGEMPHASISSTYLE.length())); + setStyleName(elementOver, originalStylename.substring(0, + originalStylename.length() - DRAGEMPHASISSTYLE.length())); } /** @@ -830,8 +827,8 @@ public class DateCell extends FocusableComplexPanel implements if (weekgrid.getCalendar().getMouseEventListener() != null) { event.preventDefault(); event.stopPropagation(); - weekgrid.getCalendar().getMouseEventListener() - .contextMenu(event, DateCell.this); + weekgrid.getCalendar().getMouseEventListener().contextMenu(event, + DateCell.this); } } diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellContainer.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellContainer.java index 26f5951987..4ba22f61f8 100644 --- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellContainer.java +++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellContainer.java @@ -31,8 +31,8 @@ import com.vaadin.client.ui.VCalendar; * * since 7.1 */ -public class DateCellContainer extends FlowPanel implements MouseDownHandler, - MouseUpHandler { +public class DateCellContainer extends FlowPanel + implements MouseDownHandler, MouseUpHandler { private Date date; diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellDayEvent.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellDayEvent.java index 55834397d3..173506497c 100644 --- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellDayEvent.java +++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellDayEvent.java @@ -49,9 +49,9 @@ import com.vaadin.shared.ui.calendar.DateConstants; * * @since 7.1 */ -public class DateCellDayEvent extends FocusableHTML implements - MouseDownHandler, MouseUpHandler, MouseMoveHandler, KeyDownHandler, - ContextMenuHandler, HasTooltipKey { +public class DateCellDayEvent extends FocusableHTML + implements MouseDownHandler, MouseUpHandler, MouseMoveHandler, + KeyDownHandler, ContextMenuHandler, HasTooltipKey { private final DateCell dateCell; private Element caption = null; @@ -215,20 +215,24 @@ public class DateCellDayEvent extends FocusableHTML implements public void onMouseDown(MouseDownEvent event) { startX = event.getClientX(); startY = event.getClientY(); - if (isDisabled() || event.getNativeButton() != NativeEvent.BUTTON_LEFT) { + if (isDisabled() + || event.getNativeButton() != NativeEvent.BUTTON_LEFT) { return; } clickTarget = Element.as(event.getNativeEvent().getEventTarget()); mouseMoveCanceled = false; - if (weekGrid.getCalendar().isEventMoveAllowed() || clickTargetsResize()) { + if (weekGrid.getCalendar().isEventMoveAllowed() + || clickTargetsResize()) { moveRegistration = addMouseMoveHandler(this); setFocus(true); try { - startYrelative = (int) ((double) event.getRelativeY(caption) % slotHeight); - startXrelative = (event.getRelativeX(weekGrid.getElement()) - weekGrid.timebar - .getOffsetWidth()) % getDateCellWidth(); + startYrelative = (int) ((double) event.getRelativeY(caption) + % slotHeight); + startXrelative = (event.getRelativeX(weekGrid.getElement()) + - weekGrid.timebar.getOffsetWidth()) + % getDateCellWidth(); } catch (Exception e) { GWT.log("Exception calculating relative start position", e); } @@ -282,7 +286,8 @@ public class DateCellDayEvent extends FocusableHTML implements s.setZIndex(1); if (!clickTargetsResize()) { // check if mouse has moved over threshold of 3 pixels - boolean mouseMoved = (xDiff < -3 || xDiff > 3 || yDiff < -3 || yDiff > 3); + boolean mouseMoved = (xDiff < -3 || xDiff > 3 || yDiff < -3 + || yDiff > 3); if (!weekGrid.getCalendar().isDisabledOrReadOnly() && mouseMoved) { // Event Move: @@ -296,7 +301,8 @@ public class DateCellDayEvent extends FocusableHTML implements Element e = Element.as(et); if (e == caption || e == eventContent || e.getParentElement() == caption) { - if (weekGrid.getCalendar().getEventClickListener() != null) { + if (weekGrid.getCalendar() + .getEventClickListener() != null) { weekGrid.getCalendar().getEventClickListener() .eventClick(calendarEvent); } @@ -608,7 +614,8 @@ public class DateCellDayEvent extends FocusableHTML implements */ private boolean clickTargetsResize() { return weekGrid.getCalendar().isEventResizeAllowed() - && (clickTarget == topResizeBar || clickTarget == bottomResizeBar); + && (clickTarget == topResizeBar + || clickTarget == bottomResizeBar); } private void addGlobalResizeStyle() { diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DayToolbar.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DayToolbar.java index 10ed5bb3f9..523410262d 100644 --- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DayToolbar.java +++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DayToolbar.java @@ -73,8 +73,8 @@ public class DayToolbar extends HorizontalPanel implements ClickHandler { setCellHorizontalAlignment(nextLabel, ALIGN_RIGHT); int cellw = width / (count - 2); if (cellw > 0) { - int[] cellWidths = VCalendar - .distributeSize(width, count - 2, 0); + int[] cellWidths = VCalendar.distributeSize(width, count - 2, + 0); for (int i = 1; i < count - 1; i++) { Widget widget = getWidget(i); // if (remain > 0) { diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/FocusableComplexPanel.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/FocusableComplexPanel.java index cdad83744e..6c629e01a4 100644 --- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/FocusableComplexPanel.java +++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/FocusableComplexPanel.java @@ -39,8 +39,8 @@ import com.vaadin.client.Focusable; * @author Vaadin Ltd. * */ -public class FocusableComplexPanel extends ComplexPanel implements - HasFocusHandlers, HasBlurHandlers, HasKeyDownHandlers, +public class FocusableComplexPanel extends ComplexPanel + implements HasFocusHandlers, HasBlurHandlers, HasKeyDownHandlers, HasKeyPressHandlers, Focusable { protected void makeFocusable() { diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleDayCell.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleDayCell.java index 158241337b..0c3fd30059 100644 --- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleDayCell.java +++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleDayCell.java @@ -47,8 +47,8 @@ import com.vaadin.shared.ui.calendar.DateConstants; * @since 7.1 * @author Vaadin Ltd. */ -public class SimpleDayCell extends FocusableFlowPanel implements - MouseUpHandler, MouseDownHandler, MouseOverHandler, MouseMoveHandler { +public class SimpleDayCell extends FocusableFlowPanel implements MouseUpHandler, + MouseDownHandler, MouseOverHandler, MouseMoveHandler { private static int BOTTOMSPACERHEIGHT = -1; private static int EVENTHEIGHT = -1; @@ -221,9 +221,8 @@ public class SimpleDayCell extends FocusableFlowPanel implements } } - int remainingSpace = intHeight - - ((slots * EVENTHEIGHT) + BOTTOMSPACERHEIGHT + caption - .getOffsetHeight()); + int remainingSpace = intHeight - ((slots * EVENTHEIGHT) + + BOTTOMSPACERHEIGHT + caption.getOffsetHeight()); int newHeight = remainingSpace + BOTTOMSPACERHEIGHT; if (newHeight < 0) { newHeight = EVENTHEIGHT; @@ -344,8 +343,8 @@ public class SimpleDayCell extends FocusableFlowPanel implements public void setMonthNameVisible(boolean b) { monthNameVisible = b; int dateOfMonth = date.getDate(); - caption.setText(dateOfMonth + " " - + calendar.getMonthNames()[date.getMonth()]); + caption.setText( + dateOfMonth + " " + calendar.getMonthNames()[date.getMonth()]); } public HandlerRegistration addMouseMoveHandler(MouseMoveHandler handler) { @@ -517,9 +516,11 @@ public class SimpleDayCell extends FocusableFlowPanel implements } // Check boundaries if (relativeY < 0 - || relativeY >= (calendar.getMonthGrid().getRowCount() * dateCellHeigth) + || relativeY >= (calendar.getMonthGrid().getRowCount() + * dateCellHeigth) || relativeX < 0 - || relativeX >= (calendar.getMonthGrid().getColumnCount() * dateCellWidth)) { + || relativeX >= (calendar.getMonthGrid().getColumnCount() + * dateCellWidth)) { return; } @@ -644,7 +645,8 @@ public class SimpleDayCell extends FocusableFlowPanel implements } } - public void updateDragPosition(MonthEventLabel w, int dayDiff, int weekDiff) { + public void updateDragPosition(MonthEventLabel w, int dayDiff, + int weekDiff) { // Draw event to its new position only when position has changed if (dayDiff == prevDayDiff && weekDiff == prevWeekDiff) { return; diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleWeekToolbar.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleWeekToolbar.java index fc79163d3e..e4b1740513 100644 --- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleWeekToolbar.java +++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleWeekToolbar.java @@ -102,8 +102,8 @@ public class SimpleWeekToolbar extends FlexTable implements ClickHandler { public void onClick(ClickEvent event) { WeekLabel wl = (WeekLabel) event.getSource(); if (calendar.getWeekClickListener() != null) { - calendar.getWeekClickListener().weekClick( - wl.getYear() + "w" + wl.getWeek()); + calendar.getWeekClickListener() + .weekClick(wl.getYear() + "w" + wl.getWeek()); } } } diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeekGrid.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeekGrid.java index aecaff1931..ceab62c35e 100644 --- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeekGrid.java +++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeekGrid.java @@ -165,8 +165,8 @@ public class WeekGrid extends SimplePanel { this.width = content.getOffsetWidth() - timebar.getOffsetWidth(); } else { - this.width = (width == -1) ? width : width - - timebar.getOffsetWidth(); + this.width = (width == -1) ? width + : width - timebar.getOffsetWidth(); if (isVerticalScrollable() && width != -1) { this.width = this.width - WidgetUtil.getNativeScrollbarSize(); @@ -219,12 +219,13 @@ public class WeekGrid extends SimplePanel { int count = content.getWidgetCount(); int datesWidth = width; if (datesWidth > 0 && count > 1) { - cellWidths = VCalendar - .distributeSize(datesWidth, count - 1, -1); + cellWidths = VCalendar.distributeSize(datesWidth, count - 1, + -1); for (int i = 1; i < count; i++) { DateCell dc = (DateCell) content.getWidget(i); - dc.setHorizontalSized(isHorizontalScrollable() || width < 0); + dc.setHorizontalSized( + isHorizontalScrollable() || width < 0); dc.setWidthPX(cellWidths[i - 1]); if (dc.isToday()) { dc.setTimeBarWidth(getOffsetWidth()); @@ -237,7 +238,8 @@ public class WeekGrid extends SimplePanel { if (count > 1) { for (int i = 1; i < count; i++) { DateCell dc = (DateCell) content.getWidget(i); - dc.setHorizontalSized(isHorizontalScrollable() || width < 0); + dc.setHorizontalSized( + isHorizontalScrollable() || width < 0); } } } @@ -269,8 +271,8 @@ public class WeekGrid extends SimplePanel { if (count > 1) { DateCell first = (DateCell) content.getWidget(1); dateCellBorder = first.getSlotBorder(); - int dateHeight = (first.getOffsetHeight() / first - .getNumberOfSlots()) - dateCellBorder; + int dateHeight = (first.getOffsetHeight() + / first.getNumberOfSlots()) - dateCellBorder; cellHeights = new int[48]; Arrays.fill(cellHeights, dateHeight); @@ -291,10 +293,8 @@ public class WeekGrid extends SimplePanel { Date dcDate = dc.getDate(); int comp = dcDate.compareTo(from); int comp2 = dcDate.compareTo(toTime); - if (comp >= 0 - && comp2 < 0 - || (comp == 0 && comp2 == 0 && VCalendar - .isZeroLengthMidnightEvent(e))) { + if (comp >= 0 && comp2 < 0 || (comp == 0 && comp2 == 0 + && VCalendar.isZeroLengthMidnightEvent(e))) { // Same event may be over two DateCells if event's date // range floats over one day. It can't float over two days, // because event which range is over 24 hours, will be handled @@ -322,8 +322,8 @@ public class WeekGrid extends SimplePanel { int shownHeightInMinutes = endHourInMinutes - firstHourInMinutes + DateConstants.HOURINMINUTES; - durationInMinutes = Math.min(durationInMinutes, shownHeightInMinutes - - startFromMinutes); + durationInMinutes = Math.min(durationInMinutes, + shownHeightInMinutes - startFromMinutes); // calculate full slots to event int slotsTillEvent = startFromMinutes / slotInMinutes; @@ -353,25 +353,29 @@ public class WeekGrid extends SimplePanel { // calculate slot overflow at start if (startOverFlowTime > 0 && currentSlot < cellHeights.length) { int lastSlotHeight = cellHeights[currentSlot] + dateCellBorder; - pixelLength += (int) (((double) lastSlotHeight / (double) slotInMinutes) * startOverFlowTime); + pixelLength += (int) (((double) lastSlotHeight + / (double) slotInMinutes) * startOverFlowTime); } // calculate length in full slots int lastFullSlot = currentSlot + durationInSlots; - for (; currentSlot < lastFullSlot && currentSlot < cellHeights.length; currentSlot++) { + for (; currentSlot < lastFullSlot + && currentSlot < cellHeights.length; currentSlot++) { pixelLength += cellHeights[currentSlot] + dateCellBorder; } // calculate overflow at end if (endOverFlowTime > 0 && currentSlot < cellHeights.length) { int lastSlotHeight = cellHeights[currentSlot] + dateCellBorder; - pixelLength += (int) (((double) lastSlotHeight / (double) slotInMinutes) * endOverFlowTime); + pixelLength += (int) (((double) lastSlotHeight + / (double) slotInMinutes) * endOverFlowTime); } // reduce possible underflow at end if (endOverFlowTime < 0) { int lastSlotHeight = cellHeights[currentSlot] + dateCellBorder; - pixelLength += (int) (((double) lastSlotHeight / (double) slotInMinutes) * endOverFlowTime); + pixelLength += (int) (((double) lastSlotHeight + / (double) slotInMinutes) * endOverFlowTime); } return pixelLength; @@ -410,8 +414,8 @@ public class WeekGrid extends SimplePanel { public void eventMoved(DateCellDayEvent dayEvent) { Style s = dayEvent.getElement().getStyle(); - int left = Integer.parseInt(s.getLeft().substring(0, - s.getLeft().length() - 2)); + int left = Integer + .parseInt(s.getLeft().substring(0, s.getLeft().length() - 2)); DateCell previousParent = (DateCell) dayEvent.getParent(); DateCell newParent = (DateCell) content .getWidget((left / getDateCellWidth()) + 1); diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeeklyLongEvents.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeeklyLongEvents.java index 9488c8835a..6b9bdf64d0 100644 --- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeeklyLongEvents.java +++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeeklyLongEvents.java @@ -78,8 +78,8 @@ public class WeeklyLongEvents extends HorizontalPanel implements HasTooltipKey { Date dcDate = dc.getDate(); int comp = dcDate.compareTo(from); int comp2 = dcDate.compareTo(to); - WeeklyLongEventsDateCell eventLabel = dc.getDateCell(calendarEvent - .getSlotIndex()); + WeeklyLongEventsDateCell eventLabel = dc + .getDateCell(calendarEvent.getSlotIndex()); eventLabel.setStylePrimaryName("v-calendar-event"); if (comp >= 0 && comp2 <= 0) { eventLabel.setEvent(calendarEvent); @@ -176,8 +176,8 @@ public class WeeklyLongEvents extends HorizontalPanel implements HasTooltipKey { dc.setWidth(cellWidth + "px"); } else { - dc.setWidth(calendar.getWeekGrid().getDateCellWidths()[i] - + "px"); + dc.setWidth( + calendar.getWeekGrid().getDateCellWidths()[i] + "px"); } } } diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarDropHandler.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarDropHandler.java index 92046f96ec..ce892c1867 100644 --- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarDropHandler.java +++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarDropHandler.java @@ -54,9 +54,8 @@ public abstract class CalendarDropHandler extends VAbstractDropHandler { /* * (non-Javadoc) * - * @see - * com.vaadin.terminal.gwt.client.ui.dd.VDropHandler#getApplicationConnection - * () + * @see com.vaadin.terminal.gwt.client.ui.dd.VDropHandler# + * getApplicationConnection () */ @Override public ApplicationConnection getApplicationConnection() { diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarWeekDropHandler.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarWeekDropHandler.java index e0edf21e89..6af67de15c 100644 --- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarWeekDropHandler.java +++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarWeekDropHandler.java @@ -121,7 +121,8 @@ public class CalendarWeekDropHandler extends CalendarDropHandler { return DOM.isOrHasChild(weekGridElement, elementOver) && !DOM.isOrHasChild(timeBarElement, elementOver) && todayBarElement != elementOver - && (WidgetUtil.findWidget(elementOver, DateCellDayEvent.class) == null); + && (WidgetUtil.findWidget(elementOver, + DateCellDayEvent.class) == null); } /* diff --git a/client/src/main/java/com/vaadin/client/ui/checkbox/CheckBoxConnector.java b/client/src/main/java/com/vaadin/client/ui/checkbox/CheckBoxConnector.java index 0dc9810c51..36509e62de 100644 --- a/client/src/main/java/com/vaadin/client/ui/checkbox/CheckBoxConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/checkbox/CheckBoxConnector.java @@ -37,8 +37,8 @@ import com.vaadin.shared.ui.checkbox.CheckBoxState; import com.vaadin.ui.CheckBox; @Connect(CheckBox.class) -public class CheckBoxConnector extends AbstractFieldConnector implements - ClickHandler { +public class CheckBoxConnector extends AbstractFieldConnector + implements ClickHandler { @Override public boolean delegateCaptionHandling() { @@ -76,8 +76,8 @@ public class CheckBoxConnector extends AbstractFieldConnector implements getWidget().errorIndicatorElement.getStyle().clearDisplay(); } } else if (getWidget().errorIndicatorElement != null) { - getWidget().errorIndicatorElement.getStyle().setDisplay( - Display.NONE); + getWidget().errorIndicatorElement.getStyle() + .setDisplay(Display.NONE); getWidget().setAriaInvalid(false); } @@ -130,8 +130,8 @@ public class CheckBoxConnector extends AbstractFieldConnector implements // Add mouse details MouseEventDetails details = MouseEventDetailsBuilder - .buildMouseEventDetails(event.getNativeEvent(), getWidget() - .getElement()); + .buildMouseEventDetails(event.getNativeEvent(), + getWidget().getElement()); getRpcProxy(CheckBoxServerRpc.class).setChecked(getState().checked, details); if (getState().immediate) { diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/AbstractColorPickerConnector.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/AbstractColorPickerConnector.java index cba2a667ca..769ced7ba8 100644 --- a/client/src/main/java/com/vaadin/client/ui/colorpicker/AbstractColorPickerConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/AbstractColorPickerConnector.java @@ -27,8 +27,8 @@ import com.vaadin.shared.ui.colorpicker.ColorPickerState; * * @since 7.0.0 */ -public abstract class AbstractColorPickerConnector extends - AbstractComponentConnector implements ClickHandler { +public abstract class AbstractColorPickerConnector + extends AbstractComponentConnector implements ClickHandler { private static final String DEFAULT_WIDTH_STYLE = "v-default-caption-width"; @@ -49,9 +49,8 @@ public abstract class AbstractColorPickerConnector extends if (stateChangeEvent.hasPropertyChanged("color")) { refreshColor(); - if (getState().showDefaultCaption - && (getState().caption == null || "" - .equals(getState().caption))) { + if (getState().showDefaultCaption && (getState().caption == null + || "".equals(getState().caption))) { setCaption(getState().color); } @@ -79,8 +78,8 @@ public abstract class AbstractColorPickerConnector extends * @return */ protected String getCaption() { - if (getState().showDefaultCaption - && (getState().caption == null || "".equals(getState().caption))) { + if (getState().showDefaultCaption && (getState().caption == null + || "".equals(getState().caption))) { return getState().color; } return getState().caption; diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java index 355e705581..238bd2112a 100644 --- a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java @@ -36,8 +36,8 @@ import com.vaadin.ui.ColorPickerArea; @Connect(value = ColorPickerArea.class, loadStyle = LoadStyle.LAZY) public class ColorPickerAreaConnector extends AbstractColorPickerConnector { - private ColorPickerServerRpc rpc = RpcProxy.create( - ColorPickerServerRpc.class, this); + private ColorPickerServerRpc rpc = RpcProxy + .create(ColorPickerServerRpc.class, this); @Override protected Widget createWidget() { diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java index 2f0dbd5ce7..12fb8b241e 100644 --- a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java @@ -35,8 +35,8 @@ import com.vaadin.ui.ColorPicker; @Connect(value = ColorPicker.class, loadStyle = LoadStyle.LAZY) public class ColorPickerConnector extends AbstractColorPickerConnector { - private ColorPickerServerRpc rpc = RpcProxy.create( - ColorPickerServerRpc.class, this); + private ColorPickerServerRpc rpc = RpcProxy + .create(ColorPickerServerRpc.class, this); @Override protected Widget createWidget() { diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java index 223675f660..541b479a61 100644 --- a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java @@ -40,8 +40,8 @@ import com.vaadin.ui.components.colorpicker.ColorPickerGradient; public class ColorPickerGradientConnector extends AbstractComponentConnector implements MouseUpHandler { - private ColorPickerGradientServerRpc rpc = RpcProxy.create( - ColorPickerGradientServerRpc.class, this); + private ColorPickerGradientServerRpc rpc = RpcProxy + .create(ColorPickerGradientServerRpc.class, this); @Override protected Widget createWidget() { diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java index dc3c3ca790..b212f2e273 100644 --- a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java @@ -40,8 +40,8 @@ import com.vaadin.ui.components.colorpicker.ColorPickerGrid; public class ColorPickerGridConnector extends AbstractComponentConnector implements ClickHandler { - private ColorPickerGridServerRpc rpc = RpcProxy.create( - ColorPickerGridServerRpc.class, this); + private ColorPickerGridServerRpc rpc = RpcProxy + .create(ColorPickerGridServerRpc.class, this); @Override protected Widget createWidget() { diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGradient.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGradient.java index 70ced91da4..125ec48370 100644 --- a/client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGradient.java +++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGradient.java @@ -190,7 +190,8 @@ public class VColorPickerGradient extends FocusPanel implements } @Override - public com.google.gwt.user.client.Element getSubPartElement(String subPart) { + public com.google.gwt.user.client.Element getSubPartElement( + String subPart) { if (subPart.equals(CLICKLAYER_ID)) { return clicklayer.getElement(); } @@ -199,7 +200,8 @@ public class VColorPickerGradient extends FocusPanel implements } @Override - public String getSubPartName(com.google.gwt.user.client.Element subElement) { + public String getSubPartName( + com.google.gwt.user.client.Element subElement) { if (clicklayer.getElement().isOrHasChild(subElement)) { return CLICKLAYER_ID; } diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGrid.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGrid.java index c407bdc5ef..04f06c2f4f 100644 --- a/client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGrid.java +++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGrid.java @@ -30,8 +30,8 @@ import com.google.gwt.user.client.ui.HTMLTable.Cell; * @since 7.0.0 * */ -public class VColorPickerGrid extends AbsolutePanel implements ClickHandler, - HasClickHandlers { +public class VColorPickerGrid extends AbsolutePanel + implements ClickHandler, HasClickHandlers { private int rows = 1; private int columns = 1; diff --git a/client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java b/client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java index 269e7165ab..1c24f14cd7 100644 --- a/client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java @@ -38,14 +38,14 @@ import com.vaadin.shared.ui.combobox.ComboBoxState; import com.vaadin.ui.ComboBox; @Connect(ComboBox.class) -public class ComboBoxConnector extends AbstractFieldConnector implements - Paintable, SimpleManagedLayout { +public class ComboBoxConnector extends AbstractFieldConnector + implements Paintable, SimpleManagedLayout { protected ComboBoxServerRpc rpc = RpcProxy.create(ComboBoxServerRpc.class, this); - protected FocusAndBlurServerRpc focusAndBlurRpc = RpcProxy.create( - FocusAndBlurServerRpc.class, this); + protected FocusAndBlurServerRpc focusAndBlurRpc = RpcProxy + .create(FocusAndBlurServerRpc.class, this); @Override protected void init() { @@ -198,8 +198,9 @@ public class ComboBoxConnector extends AbstractFieldConnector implements } // TODO even this condition should probably be moved to the handler - if ((getDataReceivedHandler().isWaitingForFilteringResponse() && getWidget().lastFilter - .toLowerCase().equals(uidl.getStringVariable("filter"))) + if ((getDataReceivedHandler().isWaitingForFilteringResponse() + && getWidget().lastFilter.toLowerCase() + .equals(uidl.getStringVariable("filter"))) || popupOpenAndCleared) { getDataReceivedHandler().dataReceived(); } @@ -229,8 +230,8 @@ public class ComboBoxConnector extends AbstractFieldConnector implements private boolean isWidgetsCurrentSelectionTextInTextBox() { return getWidget().currentSuggestion != null - && getWidget().currentSuggestion.getReplacementString().equals( - getWidget().tb.getText()); + && getWidget().currentSuggestion.getReplacementString() + .equals(getWidget().tb.getText()); } @Override diff --git a/client/src/main/java/com/vaadin/client/ui/csslayout/CssLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/csslayout/CssLayoutConnector.java index 1ec395280d..c40a7d3801 100644 --- a/client/src/main/java/com/vaadin/client/ui/csslayout/CssLayoutConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/csslayout/CssLayoutConnector.java @@ -111,9 +111,11 @@ public class CssLayoutConnector extends AbstractLayoutConnector { * (com.vaadin.client.ConnectorHierarchyChangeEvent) */ @Override - public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) { + public void onConnectorHierarchyChange( + ConnectorHierarchyChangeEvent event) { Profiler.enter("CssLayoutConnector.onConnectorHierarchyChange"); - Profiler.enter("CssLayoutConnector.onConnectorHierarchyChange add children"); + Profiler.enter( + "CssLayoutConnector.onConnectorHierarchyChange add children"); int index = 0; for (ComponentConnector child : getChildComponents()) { VCaption childCaption = childIdToCaption @@ -123,10 +125,12 @@ public class CssLayoutConnector extends AbstractLayoutConnector { } getWidget().addOrMove(child.getWidget(), index++); } - Profiler.leave("CssLayoutConnector.onConnectorHierarchyChange add children"); + Profiler.leave( + "CssLayoutConnector.onConnectorHierarchyChange add children"); // Detach old child widgets and possibly their caption - Profiler.enter("CssLayoutConnector.onConnectorHierarchyChange remove old children"); + Profiler.enter( + "CssLayoutConnector.onConnectorHierarchyChange remove old children"); for (ComponentConnector child : event.getOldChildren()) { if (child.getParent() == this) { // Skip current children @@ -139,7 +143,8 @@ public class CssLayoutConnector extends AbstractLayoutConnector { getWidget().remove(vCaption); } } - Profiler.leave("CssLayoutConnector.onConnectorHierarchyChange remove old children"); + Profiler.leave( + "CssLayoutConnector.onConnectorHierarchyChange remove old children"); Profiler.leave("CssLayoutConnector.onConnectorHierarchyChange"); } diff --git a/client/src/main/java/com/vaadin/client/ui/customcomponent/CustomComponentConnector.java b/client/src/main/java/com/vaadin/client/ui/customcomponent/CustomComponentConnector.java index e981dc13fc..c2c00a2975 100644 --- a/client/src/main/java/com/vaadin/client/ui/customcomponent/CustomComponentConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/customcomponent/CustomComponentConnector.java @@ -37,7 +37,8 @@ public class CustomComponentConnector extends AbstractHasComponentsConnector { } @Override - public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) { + public void onConnectorHierarchyChange( + ConnectorHierarchyChangeEvent event) { VCustomComponent customComponent = getWidget(); if (getChildComponents().size() == 1) { ComponentConnector newChild = getChildComponents().get(0); diff --git a/client/src/main/java/com/vaadin/client/ui/customfield/CustomFieldConnector.java b/client/src/main/java/com/vaadin/client/ui/customfield/CustomFieldConnector.java index d18574d010..75bb63f6e9 100644 --- a/client/src/main/java/com/vaadin/client/ui/customfield/CustomFieldConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/customfield/CustomFieldConnector.java @@ -30,8 +30,8 @@ import com.vaadin.shared.ui.Connect; import com.vaadin.ui.CustomField; @Connect(value = CustomField.class) -public class CustomFieldConnector extends AbstractFieldConnector implements - HasComponentsConnector, ConnectorHierarchyChangeHandler { +public class CustomFieldConnector extends AbstractFieldConnector + implements HasComponentsConnector, ConnectorHierarchyChangeHandler { List<ComponentConnector> childComponents; @@ -53,7 +53,8 @@ public class CustomFieldConnector extends AbstractFieldConnector implements } @Override - public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) { + public void onConnectorHierarchyChange( + ConnectorHierarchyChangeEvent event) { // We always have 1 child, unless the child is hidden getWidget().setWidget(getContentWidget()); } @@ -86,8 +87,8 @@ public class CustomFieldConnector extends AbstractFieldConnector implements @Override public HandlerRegistration addConnectorHierarchyChangeHandler( ConnectorHierarchyChangeHandler handler) { - return ensureHandlerManager().addHandler( - ConnectorHierarchyChangeEvent.TYPE, handler); + return ensureHandlerManager() + .addHandler(ConnectorHierarchyChangeEvent.TYPE, handler); } /** diff --git a/client/src/main/java/com/vaadin/client/ui/customlayout/CustomLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/customlayout/CustomLayoutConnector.java index abbb0ef60b..c8ced70dd7 100644 --- a/client/src/main/java/com/vaadin/client/ui/customlayout/CustomLayoutConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/customlayout/CustomLayoutConnector.java @@ -33,8 +33,8 @@ import com.vaadin.shared.ui.customlayout.CustomLayoutState; import com.vaadin.ui.CustomLayout; @Connect(CustomLayout.class) -public class CustomLayoutConnector extends AbstractLayoutConnector implements - SimpleManagedLayout, Paintable { +public class CustomLayoutConnector extends AbstractLayoutConnector + implements SimpleManagedLayout, Paintable { private boolean templateUpdated; @@ -77,8 +77,8 @@ public class CustomLayoutConnector extends AbstractLayoutConnector implements if (templateName != null) { // Get the HTML-template from client. Overrides templateContents // (even though both can never be given at the same time) - templateContents = getConnection().getResource( - "layouts/" + templateName + ".html"); + templateContents = getConnection() + .getResource("layouts/" + templateName + ".html"); } if (templateContents != null) { @@ -88,21 +88,19 @@ public class CustomLayoutConnector extends AbstractLayoutConnector implements } else { // Template missing -> show debug notice and render components in // order. - String warning = templateName != null ? "Layout file layouts/" - + templateName + ".html is missing." + String warning = templateName != null + ? "Layout file layouts/" + templateName + + ".html is missing." : "Layout file not specified."; - getWidget() - .getElement() - .setInnerHTML( - "<em>" - + warning - + " Components will be drawn for debug purposes.</em>"); + getWidget().getElement().setInnerHTML("<em>" + warning + + " Components will be drawn for debug purposes.</em>"); } templateUpdated = true; } @Override - public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) { + public void onConnectorHierarchyChange( + ConnectorHierarchyChangeEvent event) { // Must call here in addition to onStateChanged because // onConnectorHierarchyChange is invoked before onStateChanged updateHtmlTemplate(); @@ -113,9 +111,8 @@ public class CustomLayoutConnector extends AbstractLayoutConnector implements getWidget().setWidget(child.getWidget(), location); } catch (final IllegalArgumentException e) { // If no location is found, this component is not visible - getLogger().warning( - "Child not rendered as no slot with id '" + location - + "' has been defined"); + getLogger().warning("Child not rendered as no slot with id '" + + location + "' has been defined"); } } for (ComponentConnector oldChild : event.getOldChildren()) { diff --git a/client/src/main/java/com/vaadin/client/ui/datefield/AbstractDateFieldConnector.java b/client/src/main/java/com/vaadin/client/ui/datefield/AbstractDateFieldConnector.java index 6d1c9316f6..e7e52d4021 100644 --- a/client/src/main/java/com/vaadin/client/ui/datefield/AbstractDateFieldConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/datefield/AbstractDateFieldConnector.java @@ -81,19 +81,17 @@ public class AbstractDateFieldConnector extends AbstractFieldConnector // Remove old stylename that indicates current resolution setWidgetStyleName( - getWidget().getStylePrimaryName() - + "-" - + VDateField.resolutionToString(getWidget() - .getCurrentResolution()), false); + getWidget().getStylePrimaryName() + "-" + VDateField + .resolutionToString(getWidget().getCurrentResolution()), + false); getWidget().setCurrentResolution(newResolution); // Add stylename that indicates current resolution setWidgetStyleName( - getWidget().getStylePrimaryName() - + "-" - + VDateField.resolutionToString(getWidget() - .getCurrentResolution()), true); + getWidget().getStylePrimaryName() + "-" + VDateField + .resolutionToString(getWidget().getCurrentResolution()), + true); final Resolution resolution = getWidget().getCurrentResolution(); final int year = uidl.getIntVariable("year"); @@ -110,9 +108,8 @@ public class AbstractDateFieldConnector extends AbstractFieldConnector // Construct new date for this datefield (only if not null) if (year > -1) { - getWidget().setCurrentDate( - new Date((long) getWidget().getTime(year, month, day, hour, - min, sec, 0))); + getWidget().setCurrentDate(new Date((long) getWidget().getTime(year, + month, day, hour, min, sec, 0))); } else { getWidget().setCurrentDate(null); } diff --git a/client/src/main/java/com/vaadin/client/ui/dd/DDEventHandleStrategy.java b/client/src/main/java/com/vaadin/client/ui/dd/DDEventHandleStrategy.java index 7b3203f330..bffd3c3353 100644 --- a/client/src/main/java/com/vaadin/client/ui/dd/DDEventHandleStrategy.java +++ b/client/src/main/java/com/vaadin/client/ui/dd/DDEventHandleStrategy.java @@ -151,8 +151,8 @@ public class DDEventHandleStrategy { DDManagerMediator mediator, NativePreviewEvent event) { VDragAndDropManager manager = mediator.getManager(); if (manager.getDragElement() != null) { - manager.getDragElement().getStyle() - .setProperty("display", originalImageDisplay); + manager.getDragElement().getStyle().setProperty("display", + originalImageDisplay); } } @@ -187,7 +187,8 @@ public class DDEventHandleStrategy { // ApplicationConnection // .getConsole() // .log( - // "IGNORING proxy image event, fired because of hack or not significant"); + // "IGNORING proxy image event, fired because of hack or not + // significant"); return true; case Event.ONMOUSEMOVE: case Event.ONTOUCHMOVE: @@ -335,8 +336,8 @@ public class DDEventHandleStrategy { protected void handleMouseOut(Element target, NativePreviewEvent event, DDManagerMediator mediator) { VDragAndDropManager manager = mediator.getManager(); - Element relatedTarget = Element.as(event.getNativeEvent() - .getRelatedEventTarget()); + Element relatedTarget = Element + .as(event.getNativeEvent().getRelatedEventTarget()); VDropHandler newDragHanler = findDragTarget(relatedTarget, mediator); if (manager.getDragElement() != null && manager.getDragElement().isOrHasChild(relatedTarget)) { diff --git a/client/src/main/java/com/vaadin/client/ui/dd/DragAndDropHandler.java b/client/src/main/java/com/vaadin/client/ui/dd/DragAndDropHandler.java index 63c44f1fd5..f6ae4ba0ab 100644 --- a/client/src/main/java/com/vaadin/client/ui/dd/DragAndDropHandler.java +++ b/client/src/main/java/com/vaadin/client/ui/dd/DragAndDropHandler.java @@ -173,9 +173,8 @@ public class DragAndDropHandler { @Override public void onPreviewNativeEvent(NativePreviewEvent event) { final int typeInt = event.getTypeInt(); - if (typeInt == -1 - && event.getNativeEvent().getType() - .toLowerCase().contains("pointer")) { + if (typeInt == -1 && event.getNativeEvent().getType() + .toLowerCase().contains("pointer")) { /* * Ignore PointerEvents since IE10 and IE11 send * also MouseEvents for backwards compatibility. @@ -196,12 +195,10 @@ public class DragAndDropHandler { break; case Event.ONMOUSEMOVE: case Event.ONTOUCHMOVE: - int currentX = WidgetUtil - .getTouchOrMouseClientX(event - .getNativeEvent()); - int currentY = WidgetUtil - .getTouchOrMouseClientY(event - .getNativeEvent()); + int currentX = WidgetUtil.getTouchOrMouseClientX( + event.getNativeEvent()); + int currentY = WidgetUtil.getTouchOrMouseClientY( + event.getNativeEvent()); if (Math.abs(startX - currentX) > 3 || Math.abs(startY - currentY) > 3) { removeStartPreviewHandler(); diff --git a/client/src/main/java/com/vaadin/client/ui/dd/VAbstractDropHandler.java b/client/src/main/java/com/vaadin/client/ui/dd/VAbstractDropHandler.java index 61708260a1..025bb49e81 100644 --- a/client/src/main/java/com/vaadin/client/ui/dd/VAbstractDropHandler.java +++ b/client/src/main/java/com/vaadin/client/ui/dd/VAbstractDropHandler.java @@ -122,7 +122,7 @@ public abstract class VAbstractDropHandler implements VDropHandler { boolean validated = false; /** - * The default implemmentation visits server if {@link AcceptCriterion} + * The default implemmentation visits server if {@link AcceptCriterion} * can't be verified on client or if {@link AcceptCriterion} are met on * client. */ diff --git a/client/src/main/java/com/vaadin/client/ui/dd/VDragAndDropManager.java b/client/src/main/java/com/vaadin/client/ui/dd/VDragAndDropManager.java index 109b69f0c4..0afb23ed3e 100644 --- a/client/src/main/java/com/vaadin/client/ui/dd/VDragAndDropManager.java +++ b/client/src/main/java/com/vaadin/client/ui/dd/VDragAndDropManager.java @@ -83,8 +83,8 @@ public class VDragAndDropManager { void clearServerCallback(); } - private final class DefaultDragAndDropEventHandler implements - NativePreviewHandler { + private final class DefaultDragAndDropEventHandler + implements NativePreviewHandler { @Override public void onPreviewNativeEvent(NativePreviewEvent event) { @@ -110,8 +110,8 @@ public class VDragAndDropManager { String display = getEventHandleStrategy().updateDragImage(event, managerMediator); - Element targetElement = getEventHandleStrategy().getTargetElement( - event, managerMediator); + Element targetElement = getEventHandleStrategy() + .getTargetElement(event, managerMediator); try { if (handleDragImage(targetElement, event)) { @@ -130,7 +130,8 @@ public class VDragAndDropManager { managerMediator); } - private boolean handleDragImage(Element target, NativePreviewEvent event) { + private boolean handleDragImage(Element target, + NativePreviewEvent event) { if (!WidgetUtil.isTouchEvent(event.getNativeEvent()) && getDragElement() == null) { return false; @@ -265,8 +266,8 @@ public class VDragAndDropManager { addActiveDragSourceStyleName(); VDropHandler dh = null; if (startEvent != null) { - dh = findDragTarget(Element.as(currentDrag - .getCurrentGwtEvent().getEventTarget())); + dh = findDragTarget(Element.as( + currentDrag.getCurrentGwtEvent().getEventTarget())); } if (dh != null) { // drag has started on a DropHandler, kind of drag over @@ -276,8 +277,8 @@ public class VDragAndDropManager { } if (handleDragEvents) { - handlerRegistration = Event - .addNativePreviewHandler(defaultDragAndDropEventHandler); + handlerRegistration = Event.addNativePreviewHandler( + defaultDragAndDropEventHandler); if (dragElement != null && dragElement.getParentElement() == null) { attachDragElement(); @@ -290,32 +291,30 @@ public class VDragAndDropManager { private void addActiveDragSourceStyleName() { ComponentConnector dragSource = currentDrag.getTransferable() .getDragSource(); - dragSource.getWidget().addStyleName( - ACTIVE_DRAG_SOURCE_STYLENAME); + dragSource.getWidget() + .addStyleName(ACTIVE_DRAG_SOURCE_STYLENAME); } }; final int eventType = Event.as(startEvent).getTypeInt(); - if (handleDragEvents - && (eventType == Event.ONMOUSEDOWN || eventType == Event.ONTOUCHSTART)) { + if (handleDragEvents && (eventType == Event.ONMOUSEDOWN + || eventType == Event.ONTOUCHSTART)) { // only really start drag event on mousemove deferredStartRegistration = Event .addNativePreviewHandler(new NativePreviewHandler() { - private int startX = WidgetUtil - .getTouchOrMouseClientX(currentDrag - .getCurrentGwtEvent()); - private int startY = WidgetUtil - .getTouchOrMouseClientY(currentDrag - .getCurrentGwtEvent()); + private int startX = WidgetUtil.getTouchOrMouseClientX( + currentDrag.getCurrentGwtEvent()); + private int startY = WidgetUtil.getTouchOrMouseClientY( + currentDrag.getCurrentGwtEvent()); @Override public void onPreviewNativeEvent( NativePreviewEvent event) { int typeInt = event.getTypeInt(); - if (typeInt == -1 - && event.getNativeEvent().getType() - .toLowerCase().contains("pointer")) { + if (typeInt == -1 && event.getNativeEvent() + .getType().toLowerCase() + .contains("pointer")) { /* * Ignore PointerEvents since IE10 and IE11 send * also MouseEvents for backwards compatibility. @@ -332,8 +331,8 @@ public class VDragAndDropManager { .getNativeEvent() .getCurrentEventTarget(); if (Node.is(currentEventTarget) - && !dragElement.isOrHasChild(Node - .as(currentEventTarget))) { + && !dragElement.isOrHasChild( + Node.as(currentEventTarget))) { // drag image appeared below, ignore break; } @@ -353,24 +352,26 @@ public class VDragAndDropManager { .getNativeEvent() .getRelatedEventTarget(); if (Node.is(relatedEventTarget) - && !dragElement.isOrHasChild(Node - .as(relatedEventTarget))) { + && !dragElement.isOrHasChild( + Node.as(relatedEventTarget))) { // drag image appeared below, ignore break; } case Event.ONMOUSEMOVE: case Event.ONTOUCHMOVE: int currentX = WidgetUtil - .getTouchOrMouseClientX(event - .getNativeEvent()); + .getTouchOrMouseClientX( + event.getNativeEvent()); int currentY = WidgetUtil - .getTouchOrMouseClientY(event - .getNativeEvent()); - if (Math.abs(startX - currentX) > MINIMUM_DISTANCE_TO_START_DRAG - || Math.abs(startY - currentY) > MINIMUM_DISTANCE_TO_START_DRAG) { + .getTouchOrMouseClientY( + event.getNativeEvent()); + if (Math.abs( + startX - currentX) > MINIMUM_DISTANCE_TO_START_DRAG + || Math.abs(startY + - currentY) > MINIMUM_DISTANCE_TO_START_DRAG) { ensureDeferredRegistrationCleanup(); - currentDrag.setCurrentGwtEvent(event - .getNativeEvent()); + currentDrag.setCurrentGwtEvent( + event.getNativeEvent()); startDrag.execute(); } break; @@ -488,8 +489,7 @@ public class VDragAndDropManager { Scheduler.get().scheduleFixedDelay(new RepeatingCommand() { @Override public boolean execute() { - if (!client.getMessageSender() - .hasActiveRequest()) { + if (!client.getMessageSender().hasActiveRequest()) { removeActiveDragSourceStyleName(dragSource); return false; } @@ -514,8 +514,8 @@ public class VDragAndDropManager { * the server visit is done. */ if (!sendTransferableToServer && currentDrag != null) { - removeActiveDragSourceStyleName(currentDrag.getTransferable() - .getDragSource()); + removeActiveDragSourceStyleName( + currentDrag.getTransferable().getDragSource()); } currentDrag = null; @@ -541,7 +541,8 @@ public class VDragAndDropManager { } } - private void removeActiveDragSourceStyleName(ComponentConnector dragSource) { + private void removeActiveDragSourceStyleName( + ComponentConnector dragSource) { dragSource.getWidget().removeStyleName(ACTIVE_DRAG_SOURCE_STYLENAME); } @@ -608,8 +609,8 @@ public class VDragAndDropManager { if (currentDrag.getCurrentGwtEvent() != null) { try { MouseEventDetails mouseEventDetails = MouseEventDetailsBuilder - .buildMouseEventDetails(currentDrag - .getCurrentGwtEvent()); + .buildMouseEventDetails( + currentDrag.getCurrentGwtEvent()); currentDrag.getDropDetails().put("mouseEvent", mouseEventDetails.serialize()); } catch (Exception e) { @@ -700,7 +701,8 @@ public class VDragAndDropManager { ApplicationConnection connection = getCurrentDragApplicationConnection(); Element dragImageParent; if (connection == null) { - VConsole.error("Could not determine ApplicationConnection for current drag operation. The drag image will likely look broken"); + VConsole.error( + "Could not determine ApplicationConnection for current drag operation. The drag image will likely look broken"); dragImageParent = RootPanel.getBodyElement(); } else { dragImageParent = VOverlay.getOverlayContainer(connection); diff --git a/client/src/main/java/com/vaadin/client/ui/dd/VDragEvent.java b/client/src/main/java/com/vaadin/client/ui/dd/VDragEvent.java index c889dbf34e..aaa6e5c488 100644 --- a/client/src/main/java/com/vaadin/client/ui/dd/VDragEvent.java +++ b/client/src/main/java/com/vaadin/client/ui/dd/VDragEvent.java @@ -112,7 +112,8 @@ public class VDragEvent { * instead */ @Deprecated - public void setElementOver(com.google.gwt.user.client.Element targetElement) { + public void setElementOver( + com.google.gwt.user.client.Element targetElement) { elementOver = targetElement; } diff --git a/client/src/main/java/com/vaadin/client/ui/dd/VHtml5DragEvent.java b/client/src/main/java/com/vaadin/client/ui/dd/VHtml5DragEvent.java index 672eac9e06..ed4dd1b6cb 100644 --- a/client/src/main/java/com/vaadin/client/ui/dd/VHtml5DragEvent.java +++ b/client/src/main/java/com/vaadin/client/ui/dd/VHtml5DragEvent.java @@ -94,15 +94,15 @@ public class VHtml5DragEvent extends NativeEvent { return item.webkitGetAsEntry().isFile; } } - + // Zero sized files without a type are also likely to be folders var file = this.dataTransfer.files[fileIndex]; if (file.size == 0 && !file.type) { return false; } - + // TODO Make it detect folders on all browsers - + return true; }-*/; diff --git a/client/src/main/java/com/vaadin/client/ui/dd/VOverTreeNode.java b/client/src/main/java/com/vaadin/client/ui/dd/VOverTreeNode.java index c7c00a6bee..2ebde20780 100644 --- a/client/src/main/java/com/vaadin/client/ui/dd/VOverTreeNode.java +++ b/client/src/main/java/com/vaadin/client/ui/dd/VOverTreeNode.java @@ -24,8 +24,8 @@ final public class VOverTreeNode extends VAcceptCriterion { @Override protected boolean accept(VDragEvent drag, UIDL configuration) { - Boolean containsKey = (Boolean) drag.getDropDetails().get( - "itemIdOverIsNode"); + Boolean containsKey = (Boolean) drag.getDropDetails() + .get("itemIdOverIsNode"); return containsKey != null && containsKey.booleanValue(); } } diff --git a/client/src/main/java/com/vaadin/client/ui/dd/VTargetDetailIs.java b/client/src/main/java/com/vaadin/client/ui/dd/VTargetDetailIs.java index 9084d7df89..72cf0b4c2b 100644 --- a/client/src/main/java/com/vaadin/client/ui/dd/VTargetDetailIs.java +++ b/client/src/main/java/com/vaadin/client/ui/dd/VTargetDetailIs.java @@ -28,8 +28,8 @@ final public class VTargetDetailIs extends VAcceptCriterion { @Override protected boolean accept(VDragEvent drag, UIDL configuration) { String name = configuration.getStringAttribute("p"); - String t = configuration.hasAttribute("t") ? configuration - .getStringAttribute("t").intern() : "s"; + String t = configuration.hasAttribute("t") + ? configuration.getStringAttribute("t").intern() : "s"; Object value = null; if (t == "s") { value = configuration.getStringAttribute("v"); diff --git a/client/src/main/java/com/vaadin/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java b/client/src/main/java/com/vaadin/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java index 7ea9596809..b1d326ee84 100644 --- a/client/src/main/java/com/vaadin/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java @@ -78,11 +78,13 @@ public class DragAndDropWrapperConnector extends CustomComponentConnector && !receiverUrl .equals(getWidget().fileIdToReceiver .get(fileId))) { - VConsole.error("Overwriting file receiver mapping for fileId " - + fileId - + " . Old receiver URL: " - + getWidget().fileIdToReceiver.get(fileId) - + " New receiver URL: " + receiverUrl); + VConsole.error( + "Overwriting file receiver mapping for fileId " + + fileId + " . Old receiver URL: " + + getWidget().fileIdToReceiver + .get(fileId) + + " New receiver URL: " + + receiverUrl); } getWidget().fileIdToReceiver.put(fileId, receiverUrl); } @@ -90,11 +92,11 @@ public class DragAndDropWrapperConnector extends CustomComponentConnector } getWidget().startNextUpload(); - getWidget().dragStartMode = uidl - .getIntAttribute(DragAndDropWrapperConstants.DRAG_START_MODE); + getWidget().dragStartMode = uidl.getIntAttribute( + DragAndDropWrapperConstants.DRAG_START_MODE); - String dragImageComponentConnectorId = uidl - .getStringAttribute(DragAndDropWrapperConstants.DRAG_START_COMPONENT_ATTRIBUTE); + String dragImageComponentConnectorId = uidl.getStringAttribute( + DragAndDropWrapperConstants.DRAG_START_COMPONENT_ATTRIBUTE); ComponentConnector connector = null; if (dragImageComponentConnectorId != null) { @@ -102,8 +104,7 @@ public class DragAndDropWrapperConnector extends CustomComponentConnector .getConnector(dragImageComponentConnectorId); if (connector == null) { - getLogger().log( - Level.WARNING, + getLogger().log(Level.WARNING, "DragAndDropWrapper drag image component" + " connector now found. Make sure the" + " component is attached."); @@ -112,8 +113,8 @@ public class DragAndDropWrapperConnector extends CustomComponentConnector } } getWidget().initDragStartMode(); - getWidget().html5DataFlavors = uidl - .getMapAttribute(DragAndDropWrapperConstants.HTML5_DATA_FLAVORS); + getWidget().html5DataFlavors = uidl.getMapAttribute( + DragAndDropWrapperConstants.HTML5_DATA_FLAVORS); // Used to prevent wrapper from stealing tooltips when not defined getWidget().hasTooltip = getState().description != null; diff --git a/client/src/main/java/com/vaadin/client/ui/embedded/EmbeddedConnector.java b/client/src/main/java/com/vaadin/client/ui/embedded/EmbeddedConnector.java index 7b837726a7..2419d0f361 100644 --- a/client/src/main/java/com/vaadin/client/ui/embedded/EmbeddedConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/embedded/EmbeddedConnector.java @@ -44,8 +44,8 @@ import com.vaadin.shared.ui.embedded.EmbeddedState; import com.vaadin.ui.Embedded; @Connect(Embedded.class) -public class EmbeddedConnector extends AbstractComponentConnector implements - Paintable { +public class EmbeddedConnector extends AbstractComponentConnector + implements Paintable { private Element resourceElement; private ObjectElement objectElement; @@ -136,9 +136,9 @@ public class EmbeddedConnector extends AbstractComponentConnector implements setResourceUrl(getResourceUrl("src")); if (uidl.hasAttribute(EmbeddedConstants.ALTERNATE_TEXT)) { - el.setPropertyString( - EmbeddedConstants.ALTERNATE_TEXT, - uidl.getStringAttribute(EmbeddedConstants.ALTERNATE_TEXT)); + el.setPropertyString(EmbeddedConstants.ALTERNATE_TEXT, + uidl.getStringAttribute( + EmbeddedConstants.ALTERNATE_TEXT)); } if (created) { @@ -160,16 +160,16 @@ public class EmbeddedConnector extends AbstractComponentConnector implements + " allowTransparency=\"true\" src=\"\"" + " name=\"" + uidl.getId() + "\"></iframe>"); - getWidget().browserElement = DOM.getFirstChild(getWidget() - .getElement()); + getWidget().browserElement = DOM + .getFirstChild(getWidget().getElement()); } resourceElement = getWidget().browserElement; objectElement = null; setResourceUrl(getResourceUrl("src")); clearBrowserElement = false; } else { - VConsole.error("Unknown Embedded type '" + getWidget().type - + "'"); + VConsole.error( + "Unknown Embedded type '" + getWidget().type + "'"); } } else if (uidl.hasAttribute("mimetype")) { // remove old style name related to type @@ -235,8 +235,8 @@ public class EmbeddedConnector extends AbstractComponentConnector implements } getWidget().getElement().appendChild(obj); if (uidl.hasAttribute(EmbeddedConstants.ALTERNATE_TEXT)) { - obj.setInnerText(uidl - .getStringAttribute(EmbeddedConstants.ALTERNATE_TEXT)); + obj.setInnerText(uidl.getStringAttribute( + EmbeddedConstants.ALTERNATE_TEXT)); } } else { VConsole.error("Unknown Embedded mimetype '" + mime + "'"); diff --git a/client/src/main/java/com/vaadin/client/ui/formlayout/FormLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/formlayout/FormLayoutConnector.java index 39992d91a6..c8cbf6e54c 100644 --- a/client/src/main/java/com/vaadin/client/ui/formlayout/FormLayoutConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/formlayout/FormLayoutConnector.java @@ -45,8 +45,8 @@ import com.vaadin.shared.ui.orderedlayout.FormLayoutState; import com.vaadin.ui.FormLayout; @Connect(FormLayout.class) -public class FormLayoutConnector extends AbstractLayoutConnector implements - PostLayoutListener { +public class FormLayoutConnector extends AbstractLayoutConnector + implements PostLayoutListener { /* * Handlers & Listeners @@ -85,8 +85,8 @@ public class FormLayoutConnector extends AbstractLayoutConnector implements LayoutManager layoutManager = getLayoutManager(); double tableWidth = layoutManager .getOuterWidthDouble(getWidget().table.getElement()); - double ownWidth = layoutManager.getInnerWidthDouble(getWidget() - .getElement()); + double ownWidth = layoutManager + .getInnerWidthDouble(getWidget().getElement()); if (ownWidth < tableWidth) { // Something inside the table prevents it from shrinking, // temporarily force column widths @@ -113,8 +113,8 @@ public class FormLayoutConnector extends AbstractLayoutConnector implements // Restrict content td width // Round down to prevent interactions with fractional sizes of // other columns - int targetWidth = (int) Math.floor(componentColWidth - - excessWidth); + int targetWidth = (int) Math + .floor(componentColWidth - excessWidth); // Target might be negative if captions are wider than the total // available width @@ -152,8 +152,8 @@ public class FormLayoutConnector extends AbstractLayoutConnector implements public void onUnregister() { getLayoutManager().removeElementResizeListener( getWidget().table.getElement(), resizeListener); - getLayoutManager().removeElementResizeListener( - getWidget().getElement(), resizeListener); + getLayoutManager().removeElementResizeListener(getWidget().getElement(), + resizeListener); removeComponentCellListener(); super.onUnregister(); } @@ -176,7 +176,8 @@ public class FormLayoutConnector extends AbstractLayoutConnector implements } @Override - public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) { + public void onConnectorHierarchyChange( + ConnectorHierarchyChangeEvent event) { VFormLayout formLayout = getWidget(); VFormLayoutTable formLayoutTable = getWidget().table; @@ -249,7 +250,8 @@ public class FormLayoutConnector extends AbstractLayoutConnector implements // FIXME This incorrectly depends on AbstractFieldConnector if (component instanceof AbstractFieldConnector) { - hideErrors = ((AbstractFieldConnector) component).getState().hideErrors; + hideErrors = ((AbstractFieldConnector) component) + .getState().hideErrors; } getWidget().table.updateError(component.getWidget(), diff --git a/client/src/main/java/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java index 03beb3c1e0..1a81c657a0 100644 --- a/client/src/main/java/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java @@ -111,7 +111,8 @@ public class GridLayoutConnector extends AbstractComponentContainerConnector layout.colExpandRatioArray = getState().colExpand; layout.rowExpandRatioArray = getState().rowExpand; - layout.updateMarginStyleNames(new MarginInfo(getState().marginsBitmask)); + layout.updateMarginStyleNames( + new MarginInfo(getState().marginsBitmask)); layout.updateSpacingStyleName(getState().spacing); getLayoutManager().setNeedsLayout(this); } @@ -132,7 +133,8 @@ public class GridLayoutConnector extends AbstractComponentContainerConnector } @Override - public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) { + public void onConnectorHierarchyChange( + ConnectorHierarchyChangeEvent event) { VGridLayout layout = getWidget(); // clean non rendered components diff --git a/client/src/main/java/com/vaadin/client/ui/layout/ComponentConnectorLayoutSlot.java b/client/src/main/java/com/vaadin/client/ui/layout/ComponentConnectorLayoutSlot.java index b323fde1db..80bde33449 100644 --- a/client/src/main/java/com/vaadin/client/ui/layout/ComponentConnectorLayoutSlot.java +++ b/client/src/main/java/com/vaadin/client/ui/layout/ComponentConnectorLayoutSlot.java @@ -39,15 +39,15 @@ public class ComponentConnectorLayoutSlot extends VLayoutSlot { @Override protected int getCaptionHeight() { VCaption caption = getCaption(); - return caption != null ? getLayoutManager().getOuterHeight( - caption.getElement()) : 0; + return caption != null + ? getLayoutManager().getOuterHeight(caption.getElement()) : 0; } @Override protected int getCaptionWidth() { VCaption caption = getCaption(); - return caption != null ? getLayoutManager().getOuterWidth( - caption.getElement()) : 0; + return caption != null + ? getLayoutManager().getOuterWidth(caption.getElement()) : 0; } public LayoutManager getLayoutManager() { diff --git a/client/src/main/java/com/vaadin/client/ui/layout/LayoutDependencyTree.java b/client/src/main/java/com/vaadin/client/ui/layout/LayoutDependencyTree.java index 27733bfbe3..105f905ac4 100644 --- a/client/src/main/java/com/vaadin/client/ui/layout/LayoutDependencyTree.java +++ b/client/src/main/java/com/vaadin/client/ui/layout/LayoutDependencyTree.java @@ -67,8 +67,8 @@ public class LayoutDependencyTree { layoutBlockers.add(blockerId); if (wasEmpty) { if (needsLayout) { - getLayoutQueue(direction).remove( - connector.getConnectorId()); + getLayoutQueue(direction) + .remove(connector.getConnectorId()); } else { // Propagation already done if needsLayout is set propagatePotentialLayout(); @@ -83,8 +83,8 @@ public class LayoutDependencyTree { layoutBlockers.remove(blockerId); if (layoutBlockers.isEmpty()) { if (needsLayout) { - getLayoutQueue(direction).add( - connector.getConnectorId()); + getLayoutQueue(direction) + .add(connector.getConnectorId()); } else { propagateNoUpcomingLayout(); } @@ -102,8 +102,8 @@ public class LayoutDependencyTree { measureBlockers.add(blockerId); if (wasEmpty) { if (needsMeasure) { - getMeasureQueue(direction).remove( - connector.getConnectorId()); + getMeasureQueue(direction) + .remove(connector.getConnectorId()); } else { propagatePotentialResize(); } @@ -247,7 +247,8 @@ public class LayoutDependencyTree { if (connector instanceof HasComponentsConnector) { HasComponentsConnector container = (HasComponentsConnector) connector; - for (ComponentConnector child : container.getChildComponents()) { + for (ComponentConnector child : container + .getChildComponents()) { if (!Util.shouldSkipMeasurementOfConnector(child, connector) && isRelativeInDirection(child, direction)) { resized.push(child.getConnectorId()); @@ -280,15 +281,19 @@ public class LayoutDependencyTree { LayoutDependency layoutDependency = getDependency(connectorId, direction); if (layoutDependency.connector instanceof ManagedLayout) { - Profiler.enter("LayoutDependency.markSizeAsChanged setNeedsLayout"); + Profiler.enter( + "LayoutDependency.markSizeAsChanged setNeedsLayout"); layoutDependency.setNeedsLayout(true); - Profiler.leave("LayoutDependency.markSizeAsChanged setNeedsLayout"); + Profiler.leave( + "LayoutDependency.markSizeAsChanged setNeedsLayout"); } else { - Profiler.enter("LayoutDependency.markSizeAsChanged propagatePostLayoutMeasure"); + Profiler.enter( + "LayoutDependency.markSizeAsChanged propagatePostLayoutMeasure"); // Should simulate setNeedsLayout(true) + markAsLayouted -> // propagate needs measure layoutDependency.propagatePostLayoutMeasure(); - Profiler.leave("LayoutDependency.markSizeAsChanged propagatePostLayoutMeasure"); + Profiler.leave( + "LayoutDependency.markSizeAsChanged propagatePostLayoutMeasure"); } } Profiler.leave("LayoutDependency.markSizeAsChanged phase 1"); @@ -296,7 +301,8 @@ public class LayoutDependencyTree { Profiler.enter("LayoutDependency.markSizeAsChanged scrollbars"); // Should also go through the hierarchy to discover appeared or // disappeared scrollbars - ComponentConnector scrollingBoundary = getScrollingBoundary(connector); + ComponentConnector scrollingBoundary = getScrollingBoundary( + connector); if (scrollingBoundary != null) { getDependency(scrollingBoundary.getConnectorId(), getOppositeDirection()).setNeedsMeasure(true); @@ -343,28 +349,34 @@ public class LayoutDependencyTree { } private void propagatePostLayoutMeasure() { - Profiler.enter("LayoutDependency.propagatePostLayoutMeasure getResizedByLayout"); + Profiler.enter( + "LayoutDependency.propagatePostLayoutMeasure getResizedByLayout"); JsArrayString resizedByLayout = getResizedByLayout(); - Profiler.leave("LayoutDependency.propagatePostLayoutMeasure getResizedByLayout"); + Profiler.leave( + "LayoutDependency.propagatePostLayoutMeasure getResizedByLayout"); int length = resizedByLayout.length(); for (int i = 0; i < length; i++) { - Profiler.enter("LayoutDependency.propagatePostLayoutMeasure setNeedsMeasure"); + Profiler.enter( + "LayoutDependency.propagatePostLayoutMeasure setNeedsMeasure"); String resizedId = resizedByLayout.get(i); LayoutDependency layoutDependency = getDependency(resizedId, direction); layoutDependency.setNeedsMeasure(true); - Profiler.leave("LayoutDependency.propagatePostLayoutMeasure setNeedsMeasure"); + Profiler.leave( + "LayoutDependency.propagatePostLayoutMeasure setNeedsMeasure"); } // Special case for e.g. wrapping texts - Profiler.enter("LayoutDependency.propagatePostLayoutMeasure horizontal case"); + Profiler.enter( + "LayoutDependency.propagatePostLayoutMeasure horizontal case"); if (direction == HORIZONTAL && !connector.isUndefinedWidth() && connector.isUndefinedHeight()) { LayoutDependency dependency = getDependency( connector.getConnectorId(), VERTICAL); dependency.setNeedsMeasure(true); } - Profiler.leave("LayoutDependency.propagatePostLayoutMeasure horizontal case"); + Profiler.leave( + "LayoutDependency.propagatePostLayoutMeasure horizontal case"); } @Override @@ -377,13 +389,15 @@ public class LayoutDependencyTree { } AbstractComponentState state = connector.getState(); s += " sizing: " - + getSizeDefinition(direction == VERTICAL ? state.height - : state.width) + "\n"; + + getSizeDefinition( + direction == VERTICAL ? state.height : state.width) + + "\n"; if (needsLayout) { s += "Needs layout\n"; } - if (getLayoutQueue(direction).contains(connector.getConnectorId())) { + if (getLayoutQueue(direction) + .contains(connector.getConnectorId())) { s += "In layout queue\n"; } s += "Layout blockers: " + blockersToString(layoutBlockers) + "\n"; @@ -391,7 +405,8 @@ public class LayoutDependencyTree { if (needsMeasure) { s += "Needs measure\n"; } - if (getMeasureQueue(direction).contains(connector.getConnectorId())) { + if (getMeasureQueue(direction) + .contains(connector.getConnectorId())) { s += "In measure queue\n"; } s += "Measure blockers: " + blockersToString(measureBlockers); @@ -441,8 +456,8 @@ public class LayoutDependencyTree { */ @Deprecated public void setNeedsMeasure(String connectorId, boolean needsMeasure) { - ComponentConnector connector = (ComponentConnector) ConnectorMap.get( - connection).getConnector(connectorId); + ComponentConnector connector = (ComponentConnector) ConnectorMap + .get(connection).getConnector(connectorId); if (connector == null) { return; } @@ -459,8 +474,8 @@ public class LayoutDependencyTree { public void setNeedsHorizontalMeasure(String connectorId, boolean needsMeasure) { // Ensure connector exists - ComponentConnector connector = (ComponentConnector) ConnectorMap.get( - connection).getConnector(connectorId); + ComponentConnector connector = (ComponentConnector) ConnectorMap + .get(connection).getConnector(connectorId); if (connector == null) { return; } @@ -474,10 +489,11 @@ public class LayoutDependencyTree { dependency.setNeedsMeasure(needsMeasure); } - public void setNeedsVerticalMeasure(String connectorId, boolean needsMeasure) { + public void setNeedsVerticalMeasure(String connectorId, + boolean needsMeasure) { // Ensure connector exists - ComponentConnector connector = (ComponentConnector) ConnectorMap.get( - connection).getConnector(connectorId); + ComponentConnector connector = (ComponentConnector) ConnectorMap + .get(connection).getConnector(connectorId); if (connector == null) { return; } @@ -503,9 +519,8 @@ public class LayoutDependencyTree { connector = (ComponentConnector) ConnectorMap.get(connection) .getConnector(connectorId); if (connector == null) { - getLogger().warning( - "No connector found for id " + connectorId - + " while creating LayoutDependency"); + getLogger().warning("No connector found for id " + + connectorId + " while creating LayoutDependency"); return null; } } @@ -537,13 +552,14 @@ public class LayoutDependencyTree { setNeedsHorizontalLayout(layout.getConnectorId(), needsLayout); } - public void setNeedsHorizontalLayout(String connectorId, boolean needsLayout) { + public void setNeedsHorizontalLayout(String connectorId, + boolean needsLayout) { LayoutDependency dependency = getDependency(connectorId, HORIZONTAL); if (dependency != null) { dependency.setNeedsLayout(needsLayout); } else { - getLogger().warning( - "No dependency found in setNeedsHorizontalLayout"); + getLogger() + .warning("No dependency found in setNeedsHorizontalLayout"); } } @@ -556,11 +572,13 @@ public class LayoutDependencyTree { * performance. */ @Deprecated - public void setNeedsVerticalLayout(ManagedLayout layout, boolean needsLayout) { + public void setNeedsVerticalLayout(ManagedLayout layout, + boolean needsLayout) { setNeedsVerticalLayout(layout.getConnectorId(), needsLayout); } - public void setNeedsVerticalLayout(String connectorId, boolean needsLayout) { + public void setNeedsVerticalLayout(String connectorId, + boolean needsLayout) { LayoutDependency dependency = getDependency(connectorId, VERTICAL); if (dependency != null) { dependency.setNeedsLayout(needsLayout); @@ -634,8 +652,8 @@ public class LayoutDependencyTree { ConnectorMap connectorMap = ConnectorMap.get(connection); JsArrayString blockersDump = blockers.dump(); for (int i = 0; i < blockersDump.length(); i++) { - ServerConnector blocker = connectorMap.getConnector(blockersDump - .get(i)); + ServerConnector blocker = connectorMap + .getConnector(blockersDump.get(i)); if (b.length() != 1) { b.append(", "); } @@ -678,7 +696,8 @@ public class LayoutDependencyTree { return asManagedLayoutArray(getVerticalLayoutTargetsJsArray()); } - private ManagedLayout[] asManagedLayoutArray(JsArrayString connectorIdArray) { + private ManagedLayout[] asManagedLayoutArray( + JsArrayString connectorIdArray) { int length = connectorIdArray.length(); ConnectorMap connectorMap = ConnectorMap.get(connection); ManagedLayout[] result = new ManagedLayout[length]; @@ -738,7 +757,8 @@ public class LayoutDependencyTree { .noMoreChangesExpected(); } - public ComponentConnector getScrollingBoundary(ComponentConnector connector) { + public ComponentConnector getScrollingBoundary( + ComponentConnector connector) { LayoutDependency dependency = getDependency(connector.getConnectorId(), HORIZONTAL); if (!dependency.scrollingParentCached) { @@ -746,7 +766,8 @@ public class LayoutDependencyTree { if (parent instanceof MayScrollChildren) { dependency.scrollingBoundary = connector; } else if (parent instanceof ComponentConnector) { - dependency.scrollingBoundary = getScrollingBoundary((ComponentConnector) parent); + dependency.scrollingBoundary = getScrollingBoundary( + (ComponentConnector) parent); } else { // No scrolling parent } diff --git a/client/src/main/java/com/vaadin/client/ui/layout/VLayoutSlot.java b/client/src/main/java/com/vaadin/client/ui/layout/VLayoutSlot.java index 5260e1866e..3dc661cd15 100644 --- a/client/src/main/java/com/vaadin/client/ui/layout/VLayoutSlot.java +++ b/client/src/main/java/com/vaadin/client/ui/layout/VLayoutSlot.java @@ -52,7 +52,8 @@ public abstract class VLayoutSlot { this.caption = caption; if (caption != null) { // Physical attach. - DOM.insertBefore(wrapper, caption.getElement(), widget.getElement()); + DOM.insertBefore(wrapper, caption.getElement(), + widget.getElement()); Style style = caption.getElement().getStyle(); style.setPosition(Position.ABSOLUTE); style.setTop(0, Unit.PX); @@ -119,7 +120,8 @@ public abstract class VLayoutSlot { .getWidth(); double percentage = parsePercent(percentWidth); allocatedContentWidth = availableWidth * (percentage / 100); - reportActualRelativeWidth(Math.round((float) allocatedContentWidth)); + reportActualRelativeWidth( + Math.round((float) allocatedContentWidth)); } double usedWidth; // widget width in px @@ -191,8 +193,8 @@ public abstract class VLayoutSlot { String height = getWidget().getElement().getStyle().getHeight(); double percentage = parsePercent(height); allocatedContentHeight = contentHeight * (percentage / 100); - reportActualRelativeHeight(Math - .round((float) allocatedContentHeight)); + reportActualRelativeHeight( + Math.round((float) allocatedContentHeight)); } style.setTop(currentLocation, Unit.PX); diff --git a/client/src/main/java/com/vaadin/client/ui/link/LinkConnector.java b/client/src/main/java/com/vaadin/client/ui/link/LinkConnector.java index 1e77fb51b4..bc0cf33e98 100644 --- a/client/src/main/java/com/vaadin/client/ui/link/LinkConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/link/LinkConnector.java @@ -80,8 +80,8 @@ public class LinkConnector extends AbstractComponentConnector { DOM.insertChild(getWidget().getElement(), getWidget().errorIndicatorElement, 0); } else if (getWidget().errorIndicatorElement != null) { - getWidget().errorIndicatorElement.getStyle().setDisplay( - Display.NONE); + getWidget().errorIndicatorElement.getStyle() + .setDisplay(Display.NONE); } if (getWidget().icon != null) { diff --git a/client/src/main/java/com/vaadin/client/ui/loginform/LoginFormConnector.java b/client/src/main/java/com/vaadin/client/ui/loginform/LoginFormConnector.java index c3ed73a1d0..42e4d51f03 100644 --- a/client/src/main/java/com/vaadin/client/ui/loginform/LoginFormConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/loginform/LoginFormConnector.java @@ -41,8 +41,8 @@ import com.vaadin.shared.ui.loginform.LoginFormState; import com.google.gwt.core.client.Scheduler; @Connect(com.vaadin.ui.LoginForm.class) -public class LoginFormConnector extends - AbstractSingleComponentContainerConnector { +public class LoginFormConnector + extends AbstractSingleComponentContainerConnector { private VLegacyTextField passwordField; private VLegacyTextField userField; @@ -63,13 +63,15 @@ public class LoginFormConnector extends super.init(); loginFormRpc = getRpcProxy(LoginFormRpc.class); - getWidget().addSubmitCompleteHandler(new FormPanel.SubmitCompleteHandler() { - @Override - public void onSubmitComplete(FormPanel.SubmitCompleteEvent event) { - valuesChanged(); - loginFormRpc.submitCompleted(); - } - }); + getWidget().addSubmitCompleteHandler( + new FormPanel.SubmitCompleteHandler() { + @Override + public void onSubmitComplete( + FormPanel.SubmitCompleteEvent event) { + valuesChanged(); + loginFormRpc.submitCompleted(); + } + }); } @Override @@ -78,7 +80,8 @@ public class LoginFormConnector extends } @Override - public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) { + public void onConnectorHierarchyChange( + ConnectorHierarchyChangeEvent event) { ComponentConnector content = getContent(); if (content != null) { getWidget().setWidget(getContentWidget()); @@ -90,7 +93,8 @@ public class LoginFormConnector extends super.onStateChanged(stateChangeEvent); LoginFormState state = getState(); - userField = configureTextField(state.userNameFieldConnector, "username"); + userField = configureTextField(state.userNameFieldConnector, + "username"); passwordField = configureTextField(state.passwordFieldConnector, "password"); addSubmitButtonClickHandler(state.loginButtonConnector); @@ -98,9 +102,11 @@ public class LoginFormConnector extends getResourceUrl(LoginFormConstants.LOGIN_RESOURCE_NAME)); } - private VLegacyTextField configureTextField(Connector connector, String id) { + private VLegacyTextField configureTextField(Connector connector, + String id) { if (connector != null) { - VLegacyTextField textField = ((LegacyTextFieldConnector) connector).getWidget(); + VLegacyTextField textField = ((LegacyTextFieldConnector) connector) + .getWidget(); textField.addKeyDownHandler(new SubmitKeyHandler()); @@ -135,11 +141,11 @@ public class LoginFormConnector extends private void addSubmitButtonClickHandler(Connector buttonConnector) { if (buttonConnector instanceof ButtonConnector) { - addSubmitButtonClickHandler(((ButtonConnector) buttonConnector) - .getWidget()); + addSubmitButtonClickHandler( + ((ButtonConnector) buttonConnector).getWidget()); } else if (buttonConnector instanceof NativeButtonConnector) { - addSubmitButtonClickHandler(((NativeButtonConnector) buttonConnector) - .getWidget()); + addSubmitButtonClickHandler( + ((NativeButtonConnector) buttonConnector).getWidget()); } } diff --git a/client/src/main/java/com/vaadin/client/ui/menubar/MenuBar.java b/client/src/main/java/com/vaadin/client/ui/menubar/MenuBar.java index 833fb5a38a..0b1fbde1c8 100644 --- a/client/src/main/java/com/vaadin/client/ui/menubar/MenuBar.java +++ b/client/src/main/java/com/vaadin/client/ui/menubar/MenuBar.java @@ -60,13 +60,11 @@ import com.vaadin.client.ui.VOverlay; * <ul class='css'> * <li>.gwt-MenuBar { the menu bar itself }</li> * <li>.gwt-MenuBar .gwt-MenuItem { menu items }</li> - * <li> - * .gwt-MenuBar .gwt-MenuItem-selected { selected menu items }</li> + * <li>.gwt-MenuBar .gwt-MenuItem-selected { selected menu items }</li> * </ul> * * <p> - * <h3>Example</h3> - * {@example com.google.gwt.examples.MenuBarExample} + * <h3>Example</h3> {@example com.google.gwt.examples.MenuBarExample} * </p> * * @deprecated @@ -377,7 +375,8 @@ public class MenuBar extends Widget implements PopupListener { while (curMenu != null) { curMenu.close(); - if ((curMenu.parentMenu == null) && (curMenu.selectedItem != null)) { + if ((curMenu.parentMenu == null) + && (curMenu.selectedItem != null)) { curMenu.selectedItem.setSelectionStyle(false); curMenu.selectedItem = null; } diff --git a/client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java b/client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java index 03eeb85165..5aa3a76d33 100644 --- a/client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java @@ -36,8 +36,8 @@ import com.vaadin.shared.ui.menubar.MenuBarConstants; import com.vaadin.shared.ui.menubar.MenuBarState; @Connect(com.vaadin.ui.MenuBar.class) -public class MenuBarConnector extends AbstractComponentConnector implements - Paintable, SimpleManagedLayout { +public class MenuBarConnector extends AbstractComponentConnector + implements Paintable, SimpleManagedLayout { /** * This method must be implemented to update the client-side component from @@ -78,9 +78,8 @@ public class MenuBarConnector extends AbstractComponentConnector implements if (moreItemUIDL.hasAttribute("icon")) { itemHTML.append("<img src=\"" - + WidgetUtil.escapeAttribute(client - .translateVaadinUri(moreItemUIDL - .getStringAttribute("icon"))) + + WidgetUtil.escapeAttribute(client.translateVaadinUri( + moreItemUIDL.getStringAttribute("icon"))) + "\" class=\"" + ImageIcon.CLASSNAME + "\" alt=\"\" />"); } @@ -97,8 +96,8 @@ public class MenuBarConnector extends AbstractComponentConnector implements getWidget().collapsedRootItems = new VMenuBar(true, getWidget()); getWidget().moreItem.setSubMenu(getWidget().collapsedRootItems); - getWidget().moreItem.addStyleName(getWidget().getStylePrimaryName() - + "-more-menuitem"); + getWidget().moreItem.addStyleName( + getWidget().getStylePrimaryName() + "-more-menuitem"); } UIDL uidlItems = uidl.getChildUIDL(1); @@ -155,7 +154,8 @@ public class MenuBarConnector extends AbstractComponentConnector implements while (!itr.hasNext() && !iteratorStack.empty()) { boolean hasCheckableItem = false; - for (VMenuBar.CustomMenuItem menuItem : currentMenu.getItems()) { + for (VMenuBar.CustomMenuItem menuItem : currentMenu + .getItems()) { hasCheckableItem = hasCheckableItem || menuItem.isCheckable(); } @@ -168,7 +168,7 @@ public class MenuBarConnector extends AbstractComponentConnector implements itr = iteratorStack.pop(); currentMenu = menuStack.pop(); } - }// while + } // while getLayoutManager().setNeedsHorizontalLayout(this); @@ -196,8 +196,8 @@ public class MenuBarConnector extends AbstractComponentConnector implements // Check content of widget to find tooltip for element if (element != getWidget().getElement()) { - VMenuBar.CustomMenuItem item = getWidget().getMenuItemWithElement( - element); + VMenuBar.CustomMenuItem item = getWidget() + .getMenuItemWithElement(element); if (item != null) { info = item.getTooltip(); } diff --git a/client/src/main/java/com/vaadin/client/ui/nativebutton/NativeButtonConnector.java b/client/src/main/java/com/vaadin/client/ui/nativebutton/NativeButtonConnector.java index 65d4a1eb9b..6a9ba4a824 100644 --- a/client/src/main/java/com/vaadin/client/ui/nativebutton/NativeButtonConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/nativebutton/NativeButtonConnector.java @@ -67,8 +67,8 @@ public class NativeButtonConnector extends AbstractComponentConnector { getWidget().captionElement); } else if (getWidget().errorIndicatorElement != null) { - getWidget().getElement().removeChild( - getWidget().errorIndicatorElement); + getWidget().getElement() + .removeChild(getWidget().errorIndicatorElement); getWidget().errorIndicatorElement = null; } diff --git a/client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java b/client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java index 6d5df17b52..f4dd34f0c8 100644 --- a/client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java @@ -72,13 +72,13 @@ public abstract class OptionGroupBaseConnector extends AbstractFieldConnector getWidget().newItemField.addStyleName(StyleConstants.UI_WIDGET); } - getWidget().newItemField.setEnabled(getWidget().isEnabled() - && !getWidget().isReadonly()); - getWidget().newItemButton.setEnabled(getWidget().isEnabled() - && !getWidget().isReadonly()); + getWidget().newItemField.setEnabled( + getWidget().isEnabled() && !getWidget().isReadonly()); + getWidget().newItemButton.setEnabled( + getWidget().isEnabled() && !getWidget().isReadonly()); - if (getWidget().newItemField == null - || getWidget().newItemField.getParent() != getWidget().container) { + if (getWidget().newItemField == null || getWidget().newItemField + .getParent() != getWidget().container) { getWidget().container.add(getWidget().newItemField); getWidget().container.add(getWidget().newItemButton); final int w = getWidget().container.getOffsetWidth() diff --git a/client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupConnector.java b/client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupConnector.java index 6035d5ad26..1762d72abc 100644 --- a/client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupConnector.java @@ -62,10 +62,10 @@ public class OptionGroupConnector extends OptionGroupBaseConnector { // add focus and blur handlers to checkboxes / radio buttons for (Widget wid : getWidget().panel) { if (wid instanceof CheckBox) { - getWidget().focusHandlers.add(((CheckBox) wid) - .addFocusHandler(getWidget())); - getWidget().blurHandlers.add(((CheckBox) wid) - .addBlurHandler(getWidget())); + getWidget().focusHandlers + .add(((CheckBox) wid).addFocusHandler(getWidget())); + getWidget().blurHandlers + .add(((CheckBox) wid).addBlurHandler(getWidget())); } } } diff --git a/client/src/main/java/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java index dbd530dde1..7f37e65ee9 100644 --- a/client/src/main/java/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java @@ -52,8 +52,8 @@ import com.vaadin.shared.ui.orderedlayout.AbstractOrderedLayoutState; /** * Base class for vertical and horizontal ordered layouts */ -public abstract class AbstractOrderedLayoutConnector extends - AbstractLayoutConnector { +public abstract class AbstractOrderedLayoutConnector + extends AbstractLayoutConnector { /* * Handlers & Listeners @@ -132,11 +132,11 @@ public abstract class AbstractOrderedLayoutConnector extends String widgetWidth = widgetElement.getStyle().getWidth(); String widgetHeight = widgetElement.getStyle().getHeight(); - if (widgetHeight.endsWith("%") - && (pos == CaptionPosition.TOP || pos == CaptionPosition.BOTTOM)) { + if (widgetHeight.endsWith("%") && (pos == CaptionPosition.TOP + || pos == CaptionPosition.BOTTOM)) { getWidget().updateCaptionOffset(captionElement); - } else if (widgetWidth.endsWith("%") - && (pos == CaptionPosition.LEFT || pos == CaptionPosition.RIGHT)) { + } else if (widgetWidth.endsWith("%") && (pos == CaptionPosition.LEFT + || pos == CaptionPosition.RIGHT)) { getWidget().updateCaptionOffset(captionElement); } @@ -226,8 +226,8 @@ public abstract class AbstractOrderedLayoutConnector extends /** * The id of the previous response for which state changes have been * processed. If this is the same as the - * {@link ApplicationConnection#getLastSeenServerSyncId()}, it means that we can - * skip some quite expensive calculations because we know that the state + * {@link ApplicationConnection#getLastSeenServerSyncId()}, it means that we + * can skip some quite expensive calculations because we know that the state * hasn't changed since the last time the values were calculated. */ private int processedResponseId = -1; @@ -286,11 +286,11 @@ public abstract class AbstractOrderedLayoutConnector extends if (slot.hasCaption()) { CaptionPosition pos = slot.getCaptionPosition(); slot.setCaptionResizeListener(slotCaptionResizeListener); - if (child.isRelativeHeight() - && (pos == CaptionPosition.TOP || pos == CaptionPosition.BOTTOM)) { + if (child.isRelativeHeight() && (pos == CaptionPosition.TOP + || pos == CaptionPosition.BOTTOM)) { getWidget().updateCaptionOffset(slot.getCaptionElement()); - } else if (child.isRelativeWidth() - && (pos == CaptionPosition.LEFT || pos == CaptionPosition.RIGHT)) { + } else if (child.isRelativeWidth() && (pos == CaptionPosition.LEFT + || pos == CaptionPosition.RIGHT)) { getWidget().updateCaptionOffset(slot.getCaptionElement()); } } @@ -305,7 +305,8 @@ public abstract class AbstractOrderedLayoutConnector extends * (com.vaadin.client.ConnectorHierarchyChangeEvent) */ @Override - public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) { + public void onConnectorHierarchyChange( + ConnectorHierarchyChangeEvent event) { Profiler.enter("AOLC.onConnectorHierarchyChange"); List<ComponentConnector> previousChildren = event.getOldChildren(); @@ -314,17 +315,21 @@ public abstract class AbstractOrderedLayoutConnector extends // remove spacing as it is exists as separate elements that cannot be // removed easily after reordering the contents - Profiler.enter("AOLC.onConnectorHierarchyChange temporarily remove spacing"); + Profiler.enter( + "AOLC.onConnectorHierarchyChange temporarily remove spacing"); layout.setSpacing(false); - Profiler.leave("AOLC.onConnectorHierarchyChange temporarily remove spacing"); + Profiler.leave( + "AOLC.onConnectorHierarchyChange temporarily remove spacing"); for (ComponentConnector child : getChildComponents()) { Profiler.enter("AOLC.onConnectorHierarchyChange add children"); Slot slot = layout.getSlot(child.getWidget()); if (slot.getParent() != layout) { - Profiler.enter("AOLC.onConnectorHierarchyChange add state change handler"); + Profiler.enter( + "AOLC.onConnectorHierarchyChange add state change handler"); child.addStateChangeHandler(childStateChangeHandler); - Profiler.leave("AOLC.onConnectorHierarchyChange add state change handler"); + Profiler.leave( + "AOLC.onConnectorHierarchyChange add state change handler"); } Profiler.enter("AOLC.onConnectorHierarchyChange addOrMoveSlot"); layout.addOrMoveSlot(slot, currentIndex++, false); @@ -386,14 +391,15 @@ public abstract class AbstractOrderedLayoutConnector extends * .gwt.dom.client.Element) */ @Override - public TooltipInfo getTooltipInfo(com.google.gwt.dom.client.Element element) { + public TooltipInfo getTooltipInfo( + com.google.gwt.dom.client.Element element) { if (element != getWidget().getElement()) { Slot slot = WidgetUtil.findWidget(element, Slot.class); if (slot != null && slot.getCaptionElement() != null && slot.getParent() == getWidget() && slot.getCaptionElement().isOrHasChild(element)) { - ComponentConnector connector = Util.findConnectorFor(slot - .getWidget()); + ComponentConnector connector = Util + .findConnectorFor(slot.getWidget()); if (connector != null) { return connector.getTooltipInfo(element); } @@ -441,7 +447,8 @@ public abstract class AbstractOrderedLayoutConnector extends boolean onlyZeroExpands = true; if (needsExpand) { for (ComponentConnector child : getChildComponents()) { - double expandRatio = getState().childData.get(child).expandRatio; + double expandRatio = getState().childData + .get(child).expandRatio; if (expandRatio != 0) { onlyZeroExpands = false; break; @@ -478,8 +485,8 @@ public abstract class AbstractOrderedLayoutConnector extends hasChildrenWithMiddleAlignment = true; } - double expandRatio = onlyZeroExpands ? 1 : getState().childData - .get(child).expandRatio; + double expandRatio = onlyZeroExpands ? 1 + : getState().childData.get(child).expandRatio; slot.setExpandRatio(expandRatio); @@ -588,8 +595,8 @@ public abstract class AbstractOrderedLayoutConnector extends if (slot.hasCaption()) { slot.setCaptionResizeListener(slotCaptionResizeListener); } - } else if ((hasChildrenWithRelativeHeight || hasChildrenWithRelativeWidth) - && slot.hasCaption()) { + } else if ((hasChildrenWithRelativeHeight + || hasChildrenWithRelativeWidth) && slot.hasCaption()) { /* * If the slot has caption, we need to listen for its size changes * in order to update the padding/margin offset for relative sized @@ -622,8 +629,8 @@ public abstract class AbstractOrderedLayoutConnector extends return; } h += getLayoutManager().getBorderHeight(getWidget().getElement()) - + getLayoutManager().getPaddingHeight( - getWidget().getElement()); + + getLayoutManager() + .getPaddingHeight(getWidget().getElement()); getWidget().getElement().getStyle().setHeight(h, Unit.PX); getLayoutManager().setNeedsMeasure(this); } @@ -644,8 +651,8 @@ public abstract class AbstractOrderedLayoutConnector extends Element captionElement = slot.getCaptionElement(); CaptionPosition captionPosition = slot.getCaptionPosition(); - int pixelHeight = layoutManager.getOuterHeight(childWidget - .getElement()); + int pixelHeight = layoutManager + .getOuterHeight(childWidget.getElement()); if (pixelHeight == -1) { // Height has not yet been measured -> postpone actions that // depend on the max height @@ -660,8 +667,7 @@ public abstract class AbstractOrderedLayoutConnector extends && captionSizeShouldBeAddedtoComponentHeight; if (includeCaptionHeight) { - int captionHeight = layoutManager - .getOuterHeight(captionElement) + int captionHeight = layoutManager.getOuterHeight(captionElement) - getLayoutManager().getMarginHeight(captionElement); if (captionHeight == -1) { // Height has not yet been measured -> postpone actions that diff --git a/client/src/main/java/com/vaadin/client/ui/orderedlayout/HorizontalLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/orderedlayout/HorizontalLayoutConnector.java index 2cd1acd78b..9e339f1860 100644 --- a/client/src/main/java/com/vaadin/client/ui/orderedlayout/HorizontalLayoutConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/orderedlayout/HorizontalLayoutConnector.java @@ -31,9 +31,8 @@ public class HorizontalLayoutConnector extends AbstractOrderedLayoutConnector { /* * (non-Javadoc) * - * @see - * com.vaadin.client.ui.orderedlayout.AbstractOrderedLayoutConnector#getWidget - * () + * @see com.vaadin.client.ui.orderedlayout.AbstractOrderedLayoutConnector# + * getWidget () */ @Override public VHorizontalLayout getWidget() { diff --git a/client/src/main/java/com/vaadin/client/ui/orderedlayout/Slot.java b/client/src/main/java/com/vaadin/client/ui/orderedlayout/Slot.java index 564c15472f..e9cf6a0448 100644 --- a/client/src/main/java/com/vaadin/client/ui/orderedlayout/Slot.java +++ b/client/src/main/java/com/vaadin/client/ui/orderedlayout/Slot.java @@ -410,8 +410,8 @@ public class Slot extends SimplePanel { if (caption == null) { return; } - captionWrap.removeClassName("v-caption-on-" - + this.captionPosition.name().toLowerCase()); + captionWrap.removeClassName( + "v-caption-on-" + this.captionPosition.name().toLowerCase()); this.captionPosition = captionPosition; if (captionPosition == CaptionPosition.BOTTOM @@ -421,8 +421,8 @@ public class Slot extends SimplePanel { captionWrap.insertFirst(caption); } - captionWrap.addClassName("v-caption-on-" - + captionPosition.name().toLowerCase()); + captionWrap.addClassName( + "v-caption-on-" + captionPosition.name().toLowerCase()); } /** @@ -489,7 +489,8 @@ public class Slot extends SimplePanel { * Is the component enabled */ public void setCaption(String captionText, Icon icon, List<String> styles, - String error, boolean showError, boolean required, boolean enabled) { + String error, boolean showError, boolean required, + boolean enabled) { setCaption(captionText, icon, styles, error, showError, required, enabled, false); } @@ -540,8 +541,8 @@ public class Slot extends SimplePanel { // Made changes to DOM. Focus can be lost if it was in the // widget. - focusLost = (focusedElement == null ? false : widget - .getElement().isOrHasChild(focusedElement)); + focusLost = (focusedElement == null ? false + : widget.getElement().isOrHasChild(focusedElement)); } } else if (caption != null) { orphan(widget); @@ -552,8 +553,8 @@ public class Slot extends SimplePanel { captionWrap = null; // Made changes to DOM. Focus can be lost if it was in the widget. - focusLost = (focusedElement == null ? false : widget.getElement() - .isOrHasChild(focusedElement)); + focusLost = (focusedElement == null ? false + : widget.getElement().isOrHasChild(focusedElement)); } // Caption text @@ -663,8 +664,8 @@ public class Slot extends SimplePanel { // even if it does it will be stopped once something // is done with the browser. schedule(25); - } else if (WidgetUtil.getFocusedElement().equals( - Document.get().getBody())) { + } else if (WidgetUtil.getFocusedElement() + .equals(Document.get().getBody())) { // Focus found it's way to BodyElement. Now it can // be restored focusedElement.focus(); diff --git a/client/src/main/java/com/vaadin/client/ui/orderedlayout/VAbstractOrderedLayout.java b/client/src/main/java/com/vaadin/client/ui/orderedlayout/VAbstractOrderedLayout.java index 1a36ba9c93..02e4e651a3 100644 --- a/client/src/main/java/com/vaadin/client/ui/orderedlayout/VAbstractOrderedLayout.java +++ b/client/src/main/java/com/vaadin/client/ui/orderedlayout/VAbstractOrderedLayout.java @@ -120,24 +120,29 @@ public class VAbstractOrderedLayout extends FlowPanel { * operation */ public void addOrMoveSlot(Slot slot, int index, boolean adjustSpacing) { - Profiler.enter("VAOL.onConnectorHierarchyChange addOrMoveSlot find index"); + Profiler.enter( + "VAOL.onConnectorHierarchyChange addOrMoveSlot find index"); if (slot.getParent() == this) { int currentIndex = getWidgetIndex(slot); if (index == currentIndex) { - Profiler.leave("VAOL.onConnectorHierarchyChange addOrMoveSlot find index"); + Profiler.leave( + "VAOL.onConnectorHierarchyChange addOrMoveSlot find index"); return; } } - Profiler.leave("VAOL.onConnectorHierarchyChange addOrMoveSlot find index"); + Profiler.leave( + "VAOL.onConnectorHierarchyChange addOrMoveSlot find index"); Profiler.enter("VAOL.onConnectorHierarchyChange addOrMoveSlot insert"); insert(slot, index); Profiler.leave("VAOL.onConnectorHierarchyChange addOrMoveSlot insert"); if (adjustSpacing) { - Profiler.enter("VAOL.onConnectorHierarchyChange addOrMoveSlot setSpacing"); + Profiler.enter( + "VAOL.onConnectorHierarchyChange addOrMoveSlot setSpacing"); setSpacing(spacing); - Profiler.leave("VAOL.onConnectorHierarchyChange addOrMoveSlot setSpacing"); + Profiler.leave( + "VAOL.onConnectorHierarchyChange addOrMoveSlot setSpacing"); } } @@ -336,14 +341,14 @@ public class VAbstractOrderedLayout extends FlowPanel { RegExp captionPositionRegexp = RegExp.compile("v-caption-on-(\\S+)"); // Get caption position from the classname - MatchResult matcher = captionPositionRegexp.exec(captionWrap - .getClassName()); + MatchResult matcher = captionPositionRegexp + .exec(captionWrap.getClassName()); if (matcher == null || matcher.getGroupCount() < 2) { return CaptionPosition.TOP; } String captionClass = matcher.getGroup(1); - CaptionPosition captionPosition = CaptionPosition.valueOf( - CaptionPosition.class, captionClass.toUpperCase()); + CaptionPosition captionPosition = CaptionPosition + .valueOf(CaptionPosition.class, captionClass.toUpperCase()); return captionPosition; } @@ -373,7 +378,8 @@ public class VAbstractOrderedLayout extends FlowPanel { * {@link #updateCaptionOffset(Element)} instead */ @Deprecated - public void updateCaptionOffset(com.google.gwt.user.client.Element caption) { + public void updateCaptionOffset( + com.google.gwt.user.client.Element caption) { Element captionWrap = caption.getParentElement(); @@ -390,7 +396,8 @@ public class VAbstractOrderedLayout extends FlowPanel { captionStyle.clearMarginLeft(); // Get caption position from the classname - CaptionPosition captionPosition = getCaptionPositionFromElement(captionWrap); + CaptionPosition captionPosition = getCaptionPositionFromElement( + captionWrap); if (captionPosition == CaptionPosition.LEFT || captionPosition == CaptionPosition.RIGHT) { @@ -644,22 +651,22 @@ public class VAbstractOrderedLayout extends FlowPanel { if (layoutManager != null) { // TODO check caption position if (vertical) { - int size = layoutManager.getOuterHeight(slot - .getWidget().getElement()); + int size = layoutManager.getOuterHeight( + slot.getWidget().getElement()); if (slot.hasCaption()) { - size += layoutManager.getOuterHeight(slot - .getCaptionElement()); + size += layoutManager.getOuterHeight( + slot.getCaptionElement()); } if (size > 0) { totalSize += size; } } else { int max = -1; - max = layoutManager.getOuterWidth(slot.getWidget() - .getElement()); + max = layoutManager.getOuterWidth( + slot.getWidget().getElement()); if (slot.hasCaption()) { - int max2 = layoutManager.getOuterWidth(slot - .getCaptionElement()); + int max2 = layoutManager.getOuterWidth( + slot.getCaptionElement()); max = Math.max(max, max2); } if (max > 0) { @@ -668,13 +675,13 @@ public class VAbstractOrderedLayout extends FlowPanel { } } else { // FIXME expandRatio might be <0 - totalSize += vertical ? slot.getOffsetHeight() : slot - .getOffsetWidth(); + totalSize += vertical ? slot.getOffsetHeight() + : slot.getOffsetWidth(); } } // TODO fails in Opera, always returns 0 - int spacingSize = vertical ? slot.getVerticalSpacing() : slot - .getHorizontalSpacing(); + int spacingSize = vertical ? slot.getVerticalSpacing() + : slot.getHorizontalSpacing(); if (spacingSize > 0) { totalSize += spacingSize; } @@ -702,8 +709,8 @@ public class VAbstractOrderedLayout extends FlowPanel { // FIXME expandRatio might be <0 if (slot.getExpandRatio() != 0) { if (layoutManager != null) { - layoutManager.setNeedsMeasure(Util - .findConnectorFor(slot.getWidget())); + layoutManager.setNeedsMeasure( + Util.findConnectorFor(slot.getWidget())); } else if (slot.getWidget() instanceof RequiresResize) { ((RequiresResize) slot.getWidget()).onResize(); } diff --git a/client/src/main/java/com/vaadin/client/ui/orderedlayout/VerticalLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/orderedlayout/VerticalLayoutConnector.java index 33ff020e89..56a639692c 100644 --- a/client/src/main/java/com/vaadin/client/ui/orderedlayout/VerticalLayoutConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/orderedlayout/VerticalLayoutConnector.java @@ -31,9 +31,8 @@ public class VerticalLayoutConnector extends AbstractOrderedLayoutConnector { /* * (non-Javadoc) * - * @see - * com.vaadin.client.ui.orderedlayout.AbstractOrderedLayoutConnector#getWidget - * () + * @see com.vaadin.client.ui.orderedlayout.AbstractOrderedLayoutConnector# + * getWidget () */ @Override public VVerticalLayout getWidget() { diff --git a/client/src/main/java/com/vaadin/client/ui/panel/PanelConnector.java b/client/src/main/java/com/vaadin/client/ui/panel/PanelConnector.java index 11111df602..839a9fd3b8 100644 --- a/client/src/main/java/com/vaadin/client/ui/panel/PanelConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/panel/PanelConnector.java @@ -92,8 +92,8 @@ public class PanelConnector extends AbstractSingleComponentContainerConnector // Restore default stylenames getWidget().contentNode.setClassName(VPanel.CLASSNAME + "-content"); - getWidget().bottomDecoration.setClassName(VPanel.CLASSNAME - + "-deco"); + getWidget().bottomDecoration + .setClassName(VPanel.CLASSNAME + "-deco"); getWidget().captionNode.setClassName(VPanel.CLASSNAME + "-caption"); boolean hasCaption = false; if (getState().caption != null && !"".equals(getState().caption)) { @@ -101,8 +101,8 @@ public class PanelConnector extends AbstractSingleComponentContainerConnector hasCaption = true; } else { getWidget().setCaption(""); - getWidget().captionNode.setClassName(VPanel.CLASSNAME - + "-nocaption"); + getWidget().captionNode + .setClassName(VPanel.CLASSNAME + "-nocaption"); } // Add proper stylenames for all elements. This way we can prevent @@ -202,8 +202,8 @@ public class PanelConnector extends AbstractSingleComponentContainerConnector Profiler.enter("PanelConnector.layout modify style"); Style style = panel.getElement().getStyle(); - panel.captionNode.getParentElement().getStyle() - .setMarginTop(-top, Unit.PX); + panel.captionNode.getParentElement().getStyle().setMarginTop(-top, + Unit.PX); panel.bottomDecoration.getStyle().setMarginBottom(-bottom, Unit.PX); style.setPaddingTop(top, Unit.PX); style.setPaddingBottom(bottom, Unit.PX); @@ -248,7 +248,8 @@ public class PanelConnector extends AbstractSingleComponentContainerConnector } @Override - public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) { + public void onConnectorHierarchyChange( + ConnectorHierarchyChangeEvent event) { // We always have 1 child, unless the child is hidden getWidget().setWidget(getContentWidget()); } diff --git a/client/src/main/java/com/vaadin/client/ui/popupview/PopupViewConnector.java b/client/src/main/java/com/vaadin/client/ui/popupview/PopupViewConnector.java index 6afceb75de..02ec2ab243 100644 --- a/client/src/main/java/com/vaadin/client/ui/popupview/PopupViewConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/popupview/PopupViewConnector.java @@ -107,8 +107,8 @@ public class PopupViewConnector extends AbstractHasComponentsConnector styleBuf.append(primaryName); // Add "animate-in" class back if already present - boolean isAnimatingIn = getWidget().popup.getStyleName().contains( - VOverlay.ADDITIONAL_CLASSNAME_ANIMATE_IN); + boolean isAnimatingIn = getWidget().popup.getStyleName() + .contains(VOverlay.ADDITIONAL_CLASSNAME_ANIMATE_IN); if (isAnimatingIn) { styleBuf.append(" "); @@ -138,8 +138,8 @@ public class PopupViewConnector extends AbstractHasComponentsConnector @Override public void onVisibilityChange(VisibilityChangeEvent event) { - getRpcProxy(PopupViewServerRpc.class).setPopupVisibility( - event.isVisible()); + getRpcProxy(PopupViewServerRpc.class) + .setPopupVisibility(event.isVisible()); } } diff --git a/client/src/main/java/com/vaadin/client/ui/richtextarea/VRichTextToolbar.java b/client/src/main/java/com/vaadin/client/ui/richtextarea/VRichTextToolbar.java index 2e0554c499..005bb80fa3 100644 --- a/client/src/main/java/com/vaadin/client/ui/richtextarea/VRichTextToolbar.java +++ b/client/src/main/java/com/vaadin/client/ui/richtextarea/VRichTextToolbar.java @@ -181,27 +181,27 @@ public class VRichTextToolbar extends Composite { * We use an inner EventHandler class to avoid exposing event methods on the * RichTextToolbar itself. */ - private class EventHandler implements ClickHandler, ChangeHandler, - KeyUpHandler { + private class EventHandler + implements ClickHandler, ChangeHandler, KeyUpHandler { @Override @SuppressWarnings("deprecation") public void onChange(ChangeEvent event) { Object sender = event.getSource(); if (sender == backColors) { - basic.setBackColor(backColors.getValue(backColors - .getSelectedIndex())); + basic.setBackColor( + backColors.getValue(backColors.getSelectedIndex())); backColors.setSelectedIndex(0); } else if (sender == foreColors) { - basic.setForeColor(foreColors.getValue(foreColors - .getSelectedIndex())); + basic.setForeColor( + foreColors.getValue(foreColors.getSelectedIndex())); foreColors.setSelectedIndex(0); } else if (sender == fonts) { basic.setFontName(fonts.getValue(fonts.getSelectedIndex())); fonts.setSelectedIndex(0); } else if (sender == fontSizes) { - basic.setFontSize(fontSizesConstants[fontSizes - .getSelectedIndex() - 1]); + basic.setFontSize( + fontSizesConstants[fontSizes.getSelectedIndex() - 1]); fontSizes.setSelectedIndex(0); } } @@ -239,8 +239,8 @@ public class VRichTextToolbar extends Composite { extended.insertImage(url); } } else if (sender == createLink) { - final String url = Window - .prompt("Enter a link URL:", "http://"); + final String url = Window.prompt("Enter a link URL:", + "http://"); if (url != null) { extended.createLink(url); } @@ -339,8 +339,8 @@ public class VRichTextToolbar extends Composite { setStyleName("gwt-RichTextToolbar"); if (basic != null) { - topPanel.add(bold = createToggleButton(images.bold(), - strings.bold())); + topPanel.add( + bold = createToggleButton(images.bold(), strings.bold())); topPanel.add(italic = createToggleButton(images.italic(), strings.italic())); topPanel.add(underline = createToggleButton(images.underline(), diff --git a/client/src/main/java/com/vaadin/client/ui/slider/SliderConnector.java b/client/src/main/java/com/vaadin/client/ui/slider/SliderConnector.java index 8c3c0254d3..a5e1ef1cb6 100644 --- a/client/src/main/java/com/vaadin/client/ui/slider/SliderConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/slider/SliderConnector.java @@ -29,11 +29,11 @@ import com.vaadin.shared.ui.slider.SliderState; import com.vaadin.ui.Slider; @Connect(Slider.class) -public class SliderConnector extends AbstractFieldConnector implements - ValueChangeHandler<Double> { +public class SliderConnector extends AbstractFieldConnector + implements ValueChangeHandler<Double> { - protected SliderServerRpc rpc = RpcProxy - .create(SliderServerRpc.class, this); + protected SliderServerRpc rpc = RpcProxy.create(SliderServerRpc.class, + this); private final ElementResizeListener resizeListener = new ElementResizeListener() { @@ -56,8 +56,8 @@ public class SliderConnector extends AbstractFieldConnector implements @Override public void onUnregister() { super.onUnregister(); - getLayoutManager().removeElementResizeListener( - getWidget().getElement(), resizeListener); + getLayoutManager().removeElementResizeListener(getWidget().getElement(), + resizeListener); } @Override diff --git a/client/src/main/java/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java b/client/src/main/java/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java index 6bf03ad880..ba4ec20662 100644 --- a/client/src/main/java/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java @@ -62,15 +62,15 @@ public abstract class AbstractSplitPanelConnector extends // Send % values as a fraction to avoid that the splitter // "jumps" when server responds with the integer pct value // (e.g. dragged 16.6% -> should not jump to 17%) - pos = Float.valueOf(position.substring(0, - position.length() - 1)); + pos = Float.valueOf( + position.substring(0, position.length() - 1)); } else { - pos = Integer.parseInt(position.substring(0, - position.length() - 2)); + pos = Integer.parseInt( + position.substring(0, position.length() - 2)); } - getRpcProxy(AbstractSplitPanelRpc.class).setSplitterPosition( - pos); + getRpcProxy(AbstractSplitPanelRpc.class) + .setSplitterPosition(pos); } }, SplitterMoveEvent.TYPE); @@ -86,8 +86,8 @@ public abstract class AbstractSplitPanelConnector extends @Override protected <H extends EventHandler> HandlerRegistration registerHandler( H handler, Type<H> type) { - if ((Event.getEventsSunk(getWidget().splitter) & Event - .getTypeInt(type.getName())) != 0) { + if ((Event.getEventsSunk(getWidget().splitter) + & Event.getTypeInt(type.getName())) != 0) { // If we are already sinking the event for the splitter we do // not want to additionally sink it for the root element return getWidget().addHandler(handler, type); @@ -208,14 +208,14 @@ public abstract class AbstractSplitPanelConnector extends LayoutManager layoutManager = getLayoutManager(); if (this instanceof HorizontalSplitPanelConnector) { if (child.isRelativeHeight()) { - int height = layoutManager.getInnerHeight(getWidget() - .getElement()); + int height = layoutManager + .getInnerHeight(getWidget().getElement()); layoutManager.reportHeightAssignedToRelative(child, height); } } else { if (child.isRelativeWidth()) { - int width = layoutManager.getInnerWidth(getWidget() - .getElement()); + int width = layoutManager + .getInnerWidth(getWidget().getElement()); layoutManager.reportWidthAssignedToRelative(child, width); } } @@ -240,7 +240,8 @@ public abstract class AbstractSplitPanelConnector extends } @Override - public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) { + public void onConnectorHierarchyChange( + ConnectorHierarchyChangeEvent event) { handleHierarchyChange(); } diff --git a/client/src/main/java/com/vaadin/client/ui/table/TableConnector.java b/client/src/main/java/com/vaadin/client/ui/table/TableConnector.java index cfe93b6641..66ac86bf31 100644 --- a/client/src/main/java/com/vaadin/client/ui/table/TableConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/table/TableConnector.java @@ -54,9 +54,9 @@ import com.vaadin.shared.ui.table.TableServerRpc; import com.vaadin.shared.ui.table.TableState; @Connect(com.vaadin.ui.Table.class) -public class TableConnector extends AbstractFieldConnector implements - HasComponentsConnector, ConnectorHierarchyChangeHandler, Paintable, - DirectionalManagedLayout, PostLayoutListener, +public class TableConnector extends AbstractFieldConnector + implements HasComponentsConnector, ConnectorHierarchyChangeHandler, + Paintable, DirectionalManagedLayout, PostLayoutListener, HasChildMeasurementHintConnector { private List<ComponentConnector> childComponents; @@ -113,8 +113,9 @@ public class TableConnector extends AbstractFieldConnector implements */ if (w != null) { rowKey = w.getKey(); - colKey = getWidget().tHead.getHeaderCell( - getElementIndex(e, w.getElement())).getColKey(); + colKey = getWidget().tHead + .getHeaderCell(getElementIndex(e, w.getElement())) + .getColKey(); } } } @@ -190,8 +191,8 @@ public class TableConnector extends AbstractFieldConnector implements getWidget().updateDragMode(uidl); // Update child measure hint - int childMeasureHint = uidl.hasAttribute("measurehint") ? uidl - .getIntAttribute("measurehint") : 0; + int childMeasureHint = uidl.hasAttribute("measurehint") + ? uidl.getIntAttribute("measurehint") : 0; getWidget().setChildMeasurementHint( ChildMeasurementHint.values()[childMeasureHint]); @@ -251,8 +252,8 @@ public class TableConnector extends AbstractFieldConnector implements // sanity check (in case the value has slipped beyond the total // amount of rows) - getWidget().scrollBody.setLastRendered(getWidget().scrollBody - .getLastRendered()); + getWidget().scrollBody + .setLastRendered(getWidget().scrollBody.getLastRendered()); getWidget().updateMaxIndent(); } else { getWidget().postponeSanityCheckForLastRendered = false; @@ -284,11 +285,11 @@ public class TableConnector extends AbstractFieldConnector implements showSavedContextMenu(contextMenuBeforeUpdate); if (!getWidget().isSelectable()) { - getWidget().scrollBody.addStyleName(getWidget() - .getStylePrimaryName() + "-body-noselection"); + getWidget().scrollBody.addStyleName( + getWidget().getStylePrimaryName() + "-body-noselection"); } else { - getWidget().scrollBody.removeStyleName(getWidget() - .getStylePrimaryName() + "-body-noselection"); + getWidget().scrollBody.removeStyleName( + getWidget().getStylePrimaryName() + "-body-noselection"); } getWidget().hideScrollPositionAnnotation(); @@ -326,21 +327,19 @@ public class TableConnector extends AbstractFieldConnector implements if (getWidget().focusedRow != null) { if (!getWidget().focusedRow.isAttached() - && !getWidget().rowRequestHandler.isRequestHandlerRunning()) { + && !getWidget().rowRequestHandler + .isRequestHandlerRunning()) { // focused row has been orphaned, can't focus - if (getWidget().selectedRowKeys.contains(getWidget().focusedRow - .getKey())) { + if (getWidget().selectedRowKeys + .contains(getWidget().focusedRow.getKey())) { // if row cache was refreshed, focused row should be // in selection and exists with same index - getWidget().setRowFocus( - getWidget().getRenderedRowByKey( - getWidget().focusedRow.getKey())); + getWidget().setRowFocus(getWidget().getRenderedRowByKey( + getWidget().focusedRow.getKey())); } else if (getWidget().selectedRowKeys.size() > 0) { // try to focus any row in selection - getWidget().setRowFocus( - getWidget().getRenderedRowByKey( - getWidget().selectedRowKeys.iterator() - .next())); + getWidget().setRowFocus(getWidget().getRenderedRowByKey( + getWidget().selectedRowKeys.iterator().next())); } else { // try to focus any row getWidget().focusRowFromBody(); @@ -356,7 +355,8 @@ public class TableConnector extends AbstractFieldConnector implements * (#8584) */ if (uidl.hasAttribute(TableConstants.ATTRIBUTE_KEY_MAPPER_RESET) - && uidl.getBooleanAttribute(TableConstants.ATTRIBUTE_KEY_MAPPER_RESET) + && uidl.getBooleanAttribute( + TableConstants.ATTRIBUTE_KEY_MAPPER_RESET) && getWidget().selectionRangeStart != null) { assert !getWidget().selectionRangeStart.isAttached(); getWidget().selectionRangeStart = getWidget().focusedRow; @@ -437,11 +437,11 @@ public class TableConnector extends AbstractFieldConnector implements getLayoutManager().setNeedsMeasure(TableConnector.this); ServerConnector parent = getParent(); if (parent instanceof ComponentConnector) { - getLayoutManager().setNeedsMeasure( - (ComponentConnector) parent); + getLayoutManager() + .setNeedsMeasure((ComponentConnector) parent); } - getLayoutManager().setNeedsVerticalLayout( - TableConnector.this); + getLayoutManager() + .setNeedsVerticalLayout(TableConnector.this); getLayoutManager().layoutNow(); } }); @@ -544,8 +544,8 @@ public class TableConnector extends AbstractFieldConnector implements @Override public HandlerRegistration addConnectorHierarchyChangeHandler( ConnectorHierarchyChangeHandler handler) { - return ensureHandlerManager().addHandler( - ConnectorHierarchyChangeEvent.TYPE, handler); + return ensureHandlerManager() + .addHandler(ConnectorHierarchyChangeEvent.TYPE, handler); } @Override diff --git a/client/src/main/java/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java b/client/src/main/java/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java index 9de415e74e..e1195ea8fe 100644 --- a/client/src/main/java/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java @@ -26,8 +26,8 @@ import com.vaadin.client.ui.VTabsheetBase; import com.vaadin.shared.ui.tabsheet.TabState; import com.vaadin.shared.ui.tabsheet.TabsheetState; -public abstract class TabsheetBaseConnector extends - AbstractComponentContainerConnector { +public abstract class TabsheetBaseConnector + extends AbstractComponentContainerConnector { /* * (non-Javadoc) @@ -57,8 +57,8 @@ public abstract class TabsheetBaseConnector extends // Widgets in the TabSheet before update ArrayList<Widget> oldWidgets = new ArrayList<Widget>(); - for (Iterator<Widget> iterator = getWidget().getWidgetIterator(); iterator - .hasNext();) { + for (Iterator<Widget> iterator = getWidget() + .getWidgetIterator(); iterator.hasNext();) { oldWidgets.add(iterator.next()); } diff --git a/client/src/main/java/com/vaadin/client/ui/tabsheet/TabsheetConnector.java b/client/src/main/java/com/vaadin/client/ui/tabsheet/TabsheetConnector.java index 1b043c8a51..f2b3823af6 100644 --- a/client/src/main/java/com/vaadin/client/ui/tabsheet/TabsheetConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/tabsheet/TabsheetConnector.java @@ -30,8 +30,8 @@ import com.vaadin.shared.ui.tabsheet.TabsheetClientRpc; import com.vaadin.ui.TabSheet; @Connect(TabSheet.class) -public class TabsheetConnector extends TabsheetBaseConnector implements - SimpleManagedLayout, MayScrollChildren { +public class TabsheetConnector extends TabsheetBaseConnector + implements SimpleManagedLayout, MayScrollChildren { public TabsheetConnector() { registerRpc(TabsheetClientRpc.class, new TabsheetClientRpc() { diff --git a/client/src/main/java/com/vaadin/client/ui/textarea/TextAreaConnector.java b/client/src/main/java/com/vaadin/client/ui/textarea/TextAreaConnector.java index ebfbcd736b..51e73aa58a 100644 --- a/client/src/main/java/com/vaadin/client/ui/textarea/TextAreaConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/textarea/TextAreaConnector.java @@ -57,7 +57,8 @@ public class TextAreaConnector extends LegacyTextFieldConnector { updateSize(element.getStyle().getHeight(), getState().height, "height"); - updateSize(element.getStyle().getWidth(), getState().width, "width"); + updateSize(element.getStyle().getWidth(), getState().width, + "width"); } /* @@ -82,8 +83,8 @@ public class TextAreaConnector extends LegacyTextFieldConnector { return; } - getConnection().updateVariable(getConnectorId(), sizeType, - sizeText, false); + getConnection().updateVariable(getConnectorId(), sizeType, sizeText, + false); } } diff --git a/client/src/main/java/com/vaadin/client/ui/tree/TreeConnector.java b/client/src/main/java/com/vaadin/client/ui/tree/TreeConnector.java index f49f44e802..b034780196 100644 --- a/client/src/main/java/com/vaadin/client/ui/tree/TreeConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/tree/TreeConnector.java @@ -43,8 +43,8 @@ import com.vaadin.shared.ui.tree.TreeState; import com.vaadin.ui.Tree; @Connect(Tree.class) -public class TreeConnector extends AbstractComponentConnector implements - Paintable { +public class TreeConnector extends AbstractComponentConnector + implements Paintable { protected final Map<TreeNode, TooltipInfo> tooltipMap = new HashMap<TreeNode, TooltipInfo>(); @@ -80,8 +80,8 @@ public class TreeConnector extends AbstractComponentConnector implements getWidget().disabled = !isEnabled(); getWidget().readonly = isReadOnly(); - getWidget().dragMode = uidl.hasAttribute("dragMode") ? uidl - .getIntAttribute("dragMode") : 0; + getWidget().dragMode = uidl.hasAttribute("dragMode") + ? uidl.getIntAttribute("dragMode") : 0; getWidget().isNullSelectionAllowed = uidl .getBooleanAttribute("nullselect"); @@ -133,8 +133,8 @@ public class TreeConnector extends AbstractComponentConnector implements // shift/ctrl keys (#8595) getWidget().multiSelectMode = MultiSelectMode.SIMPLE; } else { - getWidget().multiSelectMode = MultiSelectMode.valueOf(uidl - .getStringAttribute("multiselectmode")); + getWidget().multiSelectMode = MultiSelectMode + .valueOf(uidl.getStringAttribute("multiselectmode")); } } else { Roles.getTreeRole().setAriaMultiselectableProperty( @@ -148,8 +148,8 @@ public class TreeConnector extends AbstractComponentConnector implements // and keyboard navigation issues as described in #7057 and other // tickets. if (getWidget().lastSelection != null) { - getWidget().lastSelection = getWidget().getNodeByKey( - getWidget().lastSelection.key); + getWidget().lastSelection = getWidget() + .getNodeByKey(getWidget().lastSelection.key); } if (getWidget().focusedNode != null) { @@ -171,12 +171,10 @@ public class TreeConnector extends AbstractComponentConnector implements } } - if (getWidget().lastSelection == null - && getWidget().focusedNode == null + if (getWidget().lastSelection == null && getWidget().focusedNode == null && !getWidget().selectedIds.isEmpty()) { - getWidget().setFocusedNode( - getWidget().getNodeByKey( - getWidget().selectedIds.iterator().next())); + getWidget().setFocusedNode(getWidget() + .getNodeByKey(getWidget().selectedIds.iterator().next())); getWidget().focusedNode.setFocused(false); } @@ -200,8 +198,8 @@ public class TreeConnector extends AbstractComponentConnector implements } private void handleUpdate(UIDL uidl) { - final TreeNode rootNode = getWidget().getNodeByKey( - uidl.getStringAttribute("rootKey")); + final TreeNode rootNode = getWidget() + .getNodeByKey(uidl.getStringAttribute("rootKey")); if (rootNode != null) { if (!rootNode.getState()) { // expanding node happened server side @@ -237,8 +235,8 @@ public class TreeConnector extends AbstractComponentConnector implements String iconUrl = null; if (action.hasAttribute(TreeConstants.ATTRIBUTE_ACTION_ICON)) { iconUrl = getConnection() - .translateVaadinUri( - action.getStringAttribute(TreeConstants.ATTRIBUTE_ACTION_ICON)); + .translateVaadinUri(action.getStringAttribute( + TreeConstants.ATTRIBUTE_ACTION_ICON)); } getWidget().registerAction(key, caption, iconUrl); } @@ -283,8 +281,8 @@ public class TreeConnector extends AbstractComponentConnector implements String description = uidl.getStringAttribute("descr"); if (description != null) { - tooltipMap.put(treeNode, new TooltipInfo(description, null, - treeNode)); + tooltipMap.put(treeNode, + new TooltipInfo(description, null, treeNode)); } if (uidl.getBooleanAttribute("expanded") && !treeNode.getState()) { @@ -321,9 +319,8 @@ public class TreeConnector extends AbstractComponentConnector implements updateNodeFromUIDL(childTree, childUidl, level); containerNode.childNodeContainer.add(childTree); if (!i.hasNext()) { - childTree - .addStyleDependentName(childTree.isLeaf() ? "leaf-last" - : "last"); + childTree.addStyleDependentName( + childTree.isLeaf() ? "leaf-last" : "last"); childTree.childNodeContainer.addStyleDependentName("last"); } } diff --git a/client/src/main/java/com/vaadin/client/ui/tree/VTargetInSubtree.java b/client/src/main/java/com/vaadin/client/ui/tree/VTargetInSubtree.java index a9bddba65a..01ae22ce8e 100644 --- a/client/src/main/java/com/vaadin/client/ui/tree/VTargetInSubtree.java +++ b/client/src/main/java/com/vaadin/client/ui/tree/VTargetInSubtree.java @@ -36,8 +36,8 @@ final public class VTargetInSubtree extends VAcceptCriterion { VTree tree = (VTree) VDragAndDropManager.get().getCurrentDropHandler() .getConnector().getWidget(); - TreeNode treeNode = tree.getNodeByKey((String) drag.getDropDetails() - .get("itemIdOver")); + TreeNode treeNode = tree + .getNodeByKey((String) drag.getDropDetails().get("itemIdOver")); if (treeNode != null) { Widget parent2 = treeNode; int depth = configuration.getIntAttribute("depth"); diff --git a/client/src/main/java/com/vaadin/client/ui/treetable/TreeTableConnector.java b/client/src/main/java/com/vaadin/client/ui/treetable/TreeTableConnector.java index 0e0c190c11..555e86f510 100644 --- a/client/src/main/java/com/vaadin/client/ui/treetable/TreeTableConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/treetable/TreeTableConnector.java @@ -43,10 +43,11 @@ public class TreeTableConnector extends TableConnector { scrollPosition = widget.getScrollPosition(); } getWidget().animationsEnabled = uidl.getBooleanAttribute("animate"); - getWidget().colIndexOfHierarchy = uidl - .hasAttribute(TreeTableConstants.ATTRIBUTE_HIERARCHY_COLUMN_INDEX) ? uidl - .getIntAttribute(TreeTableConstants.ATTRIBUTE_HIERARCHY_COLUMN_INDEX) - : 0; + getWidget().colIndexOfHierarchy = uidl.hasAttribute( + TreeTableConstants.ATTRIBUTE_HIERARCHY_COLUMN_INDEX) + ? uidl.getIntAttribute( + TreeTableConstants.ATTRIBUTE_HIERARCHY_COLUMN_INDEX) + : 0; int oldTotalRows = getWidget().getTotalRows(); super.updateFromUIDL(uidl, client); @@ -57,8 +58,8 @@ public class TreeTableConnector extends TableConnector { if (getWidget().collapseRequest) { if (getWidget().collapsedRowKey != null && getWidget().scrollBody != null) { - VScrollTableRow row = getWidget().getRenderedRowByKey( - getWidget().collapsedRowKey); + VScrollTableRow row = getWidget() + .getRenderedRowByKey(getWidget().collapsedRowKey); if (row != null) { getWidget().setRowFocus(row); getWidget().focus(); @@ -76,9 +77,8 @@ public class TreeTableConnector extends TableConnector { } // Recalculate table size if collapse request, or if page length is zero // (not sent by server) and row count changes (#7908). - if (getWidget().collapseRequest - || (!uidl.hasAttribute("pagelength") && getWidget() - .getTotalRows() != oldTotalRows)) { + if (getWidget().collapseRequest || (!uidl.hasAttribute("pagelength") + && getWidget().getTotalRows() != oldTotalRows)) { /* * Ensure that possibly removed/added scrollbars are considered. * Triggers row calculations, removes cached rows etc. Basically @@ -107,8 +107,8 @@ public class TreeTableConnector extends TableConnector { // potential content changes pending PendingNavigationEvent event = getWidget().pendingNavigationEvents .removeFirst(); - getWidget() - .handleNavigation(event.keycode, event.ctrl, event.shift); + getWidget().handleNavigation(event.keycode, event.ctrl, + event.shift); } getWidget().rendering = false; } diff --git a/client/src/main/java/com/vaadin/client/ui/twincolselect/TwinColSelectConnector.java b/client/src/main/java/com/vaadin/client/ui/twincolselect/TwinColSelectConnector.java index 0994ac15c3..599c522eca 100644 --- a/client/src/main/java/com/vaadin/client/ui/twincolselect/TwinColSelectConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/twincolselect/TwinColSelectConnector.java @@ -26,8 +26,8 @@ import com.vaadin.shared.ui.twincolselect.TwinColSelectState; import com.vaadin.ui.TwinColSelect; @Connect(TwinColSelect.class) -public class TwinColSelectConnector extends OptionGroupBaseConnector implements - DirectionalManagedLayout { +public class TwinColSelectConnector extends OptionGroupBaseConnector + implements DirectionalManagedLayout { @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { diff --git a/client/src/main/java/com/vaadin/client/ui/ui/UIConnector.java b/client/src/main/java/com/vaadin/client/ui/ui/UIConnector.java index ca9cb879af..66e1fa46cc 100644 --- a/client/src/main/java/com/vaadin/client/ui/ui/UIConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/ui/UIConnector.java @@ -161,7 +161,8 @@ public class UIConnector extends AbstractSingleComponentContainerConnector @Override public void reportLayoutProblems(String json) { - VConsole.printLayoutProblems(getValueMap(json), getConnection()); + VConsole.printLayoutProblems(getValueMap(json), + getConnection()); } private native ValueMap getValueMap(String json) @@ -239,8 +240,8 @@ public class UIConnector extends AbstractSingleComponentContainerConnector while (childIndex < uidl.getChildCount() && "open".equals(uidl.getChildUIDL(childIndex).getTag())) { final UIDL open = uidl.getChildUIDL(childIndex); - final String url = client.translateVaadinUri(open - .getStringAttribute("src")); + final String url = client + .translateVaadinUri(open.getStringAttribute("src")); final String target = open.getStringAttribute("name"); if (target == null) { // source will be opened to this browser window, but we may have @@ -265,7 +266,8 @@ public class UIConnector extends AbstractSingleComponentContainerConnector } if (alwaysAsPopup) { if (open.hasAttribute("border")) { - if (open.getStringAttribute("border").equals("minimal")) { + if (open.getStringAttribute("border") + .equals("minimal")) { options = "menubar=yes,location=no,status=no"; } else { options = "menubar=no,location=no,status=no"; @@ -350,8 +352,7 @@ public class UIConnector extends AbstractSingleComponentContainerConnector + " but it is not focusable. The widget should implement either " + com.google.gwt.user.client.ui.Focusable.class .getName() - + " or " - + Focusable.class.getName()); + + " or " + Focusable.class.getName()); } } }); @@ -378,8 +379,8 @@ public class UIConnector extends AbstractSingleComponentContainerConnector int fragmentIndex = location.indexOf('#'); if (fragmentIndex >= 0) { // Decode fragment to avoid double encoding (#10769) - newFragment = URL.decodePathSegment(location - .substring(fragmentIndex + 1)); + newFragment = URL.decodePathSegment( + location.substring(fragmentIndex + 1)); if (newFragment.isEmpty() && Location.getHref().indexOf('#') == -1) { @@ -429,11 +430,10 @@ public class UIConnector extends AbstractSingleComponentContainerConnector // Check if we have resources to inject if (cssInjectionsUidl.getTag().equals("css-resource")) { - String url = getWidget().connection - .translateVaadinUri(cssInjectionsUidl - .getStringAttribute("url")); - LinkElement link = LinkElement.as(DOM - .createElement(LinkElement.TAG)); + String url = getWidget().connection.translateVaadinUri( + cssInjectionsUidl.getStringAttribute("url")); + LinkElement link = LinkElement + .as(DOM.createElement(LinkElement.TAG)); link.setRel("stylesheet"); link.setHref(url); link.setType("text/css"); @@ -468,8 +468,8 @@ public class UIConnector extends AbstractSingleComponentContainerConnector * the url to match with existing stylesheets */ private void removeStylesheet(String url) { - NodeList<Element> linkTags = getHead().getElementsByTagName( - LinkElement.TAG); + NodeList<Element> linkTags = getHead() + .getElementsByTagName(LinkElement.TAG); for (int i = 0; i < linkTags.getLength(); i++) { LinkElement link = LinkElement.as(linkTags.getItem(i)); if (!"stylesheet".equals(link.getRel())) { @@ -507,14 +507,13 @@ public class UIConnector extends AbstractSingleComponentContainerConnector @Override public void onKeyDown(KeyDownEvent event) { if (getWidget().actionHandler != null) { - Element target = Element.as(event.getNativeEvent() - .getEventTarget()); + Element target = Element + .as(event.getNativeEvent().getEventTarget()); if (target == Document.get().getBody() || getWidget().getElement().isOrHasChild(target)) { // Only react to body and elements inside the UI - getWidget().actionHandler - .handleKeyboardEvent((Event) event - .getNativeEvent().cast()); + getWidget().actionHandler.handleKeyboardEvent( + (Event) event.getNativeEvent().cast()); } } @@ -671,7 +670,8 @@ public class UIConnector extends AbstractSingleComponentContainerConnector } @Override - public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) { + public void onConnectorHierarchyChange( + ConnectorHierarchyChangeEvent event) { ComponentConnector oldChild = null; ComponentConnector newChild = getContent(); @@ -763,14 +763,14 @@ public class UIConnector extends AbstractSingleComponentContainerConnector if (stateChangeEvent.hasPropertyChanged("tooltipConfiguration")) { getConnection().getVTooltip().setCloseTimeout( getState().tooltipConfiguration.closeTimeout); - getConnection().getVTooltip().setOpenDelay( - getState().tooltipConfiguration.openDelay); + getConnection().getVTooltip() + .setOpenDelay(getState().tooltipConfiguration.openDelay); getConnection().getVTooltip().setQuickOpenDelay( getState().tooltipConfiguration.quickOpenDelay); getConnection().getVTooltip().setQuickOpenTimeout( getState().tooltipConfiguration.quickOpenTimeout); - getConnection().getVTooltip().setMaxWidth( - getState().tooltipConfiguration.maxWidth); + getConnection().getVTooltip() + .setMaxWidth(getState().tooltipConfiguration.maxWidth); } if (stateChangeEvent @@ -798,7 +798,8 @@ public class UIConnector extends AbstractSingleComponentContainerConnector getConnection().getMessageSender().setPushEnabled( getState().pushConfiguration.mode.isEnabled()); } - if (stateChangeEvent.hasPropertyChanged("reconnectDialogConfiguration")) { + if (stateChangeEvent + .hasPropertyChanged("reconnectDialogConfiguration")) { getConnection().getConnectionStateHandler().configurationUpdated(); } @@ -831,9 +832,9 @@ public class UIConnector extends AbstractSingleComponentContainerConnector pollTimer.scheduleRepeating(getState().pollInterval); } else { // Ensure no more polls are sent as polling has been disabled - getConnection().getServerRpcQueue().removeMatching( - new MethodInvocation(getConnectorId(), UIServerRpc.class - .getName(), "poll")); + getConnection().getServerRpcQueue() + .removeMatching(new MethodInvocation(getConnectorId(), + UIServerRpc.class.getName(), "poll")); } } @@ -856,8 +857,8 @@ public class UIConnector extends AbstractSingleComponentContainerConnector * the connector to locate */ public void showServerDebugInfo(ServerConnector serverConnector) { - getRpcProxy(DebugWindowServerRpc.class).showServerDebugInfo( - serverConnector); + getRpcProxy(DebugWindowServerRpc.class) + .showServerDebugInfo(serverConnector); } /** @@ -929,11 +930,10 @@ public class UIConnector extends AbstractSingleComponentContainerConnector if (tagToReplace == null) { getLogger() - .warning( - "Did not find the link tag for the old theme (" - + oldThemeUrl - + "), adding a new stylesheet for the new theme (" - + newThemeUrl + ")"); + .warning("Did not find the link tag for the old theme (" + + oldThemeUrl + + "), adding a new stylesheet for the new theme (" + + newThemeUrl + ")"); } } @@ -950,7 +950,8 @@ public class UIConnector extends AbstractSingleComponentContainerConnector } private void updateVaadinFavicon(String newTheme) { - NodeList<Element> iconElements = querySelectorAll("link[rel~=\"icon\"]"); + NodeList<Element> iconElements = querySelectorAll( + "link[rel~=\"icon\"]"); for (int i = 0; i < iconElements.getLength(); i++) { Element iconElement = iconElements.getItem(i); @@ -978,8 +979,8 @@ public class UIConnector extends AbstractSingleComponentContainerConnector * @return the link tag or null if no matching link tag was found */ private LinkElement findStylesheetTag(String url) { - NodeList<Element> linkTags = getHead().getElementsByTagName( - LinkElement.TAG); + NodeList<Element> linkTags = getHead() + .getElementsByTagName(LinkElement.TAG); for (int i = 0; i < linkTags.getLength(); i++) { final LinkElement link = LinkElement.as(linkTags.getItem(i)); if ("stylesheet".equals(link.getRel()) @@ -1014,22 +1015,20 @@ public class UIConnector extends AbstractSingleComponentContainerConnector @Override public void onLoad(ResourceLoadEvent event) { - getLogger().info( - "Loading of " + newTheme + " from " - + newThemeUrl + " completed"); + getLogger().info("Loading of " + newTheme + " from " + + newThemeUrl + " completed"); if (tagToReplace != null) { - tagToReplace.getParentElement().removeChild( - tagToReplace); + tagToReplace.getParentElement() + .removeChild(tagToReplace); } activateTheme(newTheme); } @Override public void onError(ResourceLoadEvent event) { - getLogger().warning( - "Could not load theme from " - + getThemeUrl(newTheme)); + getLogger().warning("Could not load theme from " + + getThemeUrl(newTheme)); } }, null); @@ -1051,8 +1050,8 @@ public class UIConnector extends AbstractSingleComponentContainerConnector protected void activateTheme(String newTheme) { if (activeTheme != null) { getWidget().getParent().removeStyleName(activeTheme); - VOverlay.getOverlayContainer(getConnection()).removeClassName( - activeTheme); + VOverlay.getOverlayContainer(getConnection()) + .removeClassName(activeTheme); } String oldThemeBase = getConnection().translateVaadinUri("theme://"); @@ -1061,8 +1060,8 @@ public class UIConnector extends AbstractSingleComponentContainerConnector if (newTheme != null) { getWidget().getParent().addStyleName(newTheme); - VOverlay.getOverlayContainer(getConnection()).addClassName( - activeTheme); + VOverlay.getOverlayContainer(getConnection()) + .addClassName(activeTheme); updateVaadinFavicon(newTheme); @@ -1109,9 +1108,9 @@ public class UIConnector extends AbstractSingleComponentContainerConnector * @return The URL the theme can be loaded from */ private String getThemeUrl(String theme) { - String themeUrl = getConnection().translateVaadinUri( - ApplicationConstants.VAADIN_PROTOCOL_PREFIX + "themes/" + theme - + "/styles" + ".css"); + String themeUrl = getConnection() + .translateVaadinUri(ApplicationConstants.VAADIN_PROTOCOL_PREFIX + + "themes/" + theme + "/styles" + ".css"); // Parameter appended to bypass caches after version upgrade. themeUrl += "?v=" + Version.getFullVersion(); return themeUrl; diff --git a/client/src/main/java/com/vaadin/client/ui/upload/UploadConnector.java b/client/src/main/java/com/vaadin/client/ui/upload/UploadConnector.java index 9e25770a17..f5f2033d69 100644 --- a/client/src/main/java/com/vaadin/client/ui/upload/UploadConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/upload/UploadConnector.java @@ -32,8 +32,8 @@ import com.vaadin.shared.ui.upload.UploadState; import com.vaadin.ui.Upload; @Connect(Upload.class) -public class UploadConnector extends AbstractComponentConnector implements - Paintable { +public class UploadConnector extends AbstractComponentConnector + implements Paintable { public UploadConnector() { registerRpc(UploadClientRpc.class, new UploadClientRpc() { @@ -52,8 +52,8 @@ public class UploadConnector extends AbstractComponentConnector implements @Override public void onChange(ChangeEvent event) { if (hasEventListener(EventId.CHANGE)) { - getRpcProxy(UploadServerRpc.class).change( - getWidget().fu.getFilename()); + getRpcProxy(UploadServerRpc.class) + .change(getWidget().fu.getFilename()); } } }); @@ -72,12 +72,12 @@ public class UploadConnector extends AbstractComponentConnector implements getWidget().client = client; getWidget().paintableId = uidl.getId(); getWidget().nextUploadId = uidl.getIntAttribute("nextid"); - final String action = client.translateVaadinUri(uidl - .getStringVariable("action")); + final String action = client + .translateVaadinUri(uidl.getStringVariable("action")); getWidget().element.setAction(action); if (uidl.hasAttribute("buttoncaption")) { - getWidget().submitButton.setText(uidl - .getStringAttribute("buttoncaption")); + getWidget().submitButton + .setText(uidl.getStringAttribute("buttoncaption")); getWidget().submitButton.setVisible(true); } else { getWidget().submitButton.setVisible(false); diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightCell.java b/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightCell.java index b77b752327..eba20f83f9 100644 --- a/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightCell.java +++ b/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightCell.java @@ -169,8 +169,8 @@ public class FlyweightCell { } private void adjustCellWidthForSpan(final int numberOfCells) { - final int cellsToTheRight = currentIterator.rawPeekNext( - numberOfCells - 1).size(); + final int cellsToTheRight = currentIterator + .rawPeekNext(numberOfCells - 1).size(); final double selfWidth = row.getColumnWidth(column); double widthsOfColumnsToTheRight = 0; @@ -193,8 +193,8 @@ public class FlyweightCell { } } else if (prevColSpan > numberOfCells) { for (int i = 0; i < affectedCells.size(); i++) { - affectedCells.get(numberOfCells + i - 1).getElement() - .getStyle().clearDisplay(); + affectedCells.get(numberOfCells + i - 1).getElement().getStyle() + .clearDisplay(); } } } diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightRow.java b/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightRow.java index 8628adb05f..832e40ebbc 100644 --- a/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightRow.java +++ b/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightRow.java @@ -237,12 +237,13 @@ public class FlyweightRow implements Row { public Iterable<FlyweightCell> getCells(final int offset, final int numberOfCells) { assertSetup(); - assert offset >= 0 && offset + numberOfCells <= cells.size() : "Invalid range of cells"; + assert offset >= 0 && offset + numberOfCells <= cells + .size() : "Invalid range of cells"; return new Iterable<FlyweightCell>() { @Override public Iterator<FlyweightCell> iterator() { - return CellIterator.attached(cells.subList(offset, offset - + numberOfCells)); + return CellIterator.attached( + cells.subList(offset, offset + numberOfCells)); } }; } @@ -265,12 +266,13 @@ public class FlyweightRow implements Row { public Iterable<FlyweightCell> getUnattachedCells(final int offset, final int numberOfCells) { assertSetup(); - assert offset >= 0 && offset + numberOfCells <= cells.size() : "Invalid range of cells"; + assert offset >= 0 && offset + numberOfCells <= cells + .size() : "Invalid range of cells"; return new Iterable<FlyweightCell>() { @Override public Iterator<FlyweightCell> iterator() { - return CellIterator.unattached(cells.subList(offset, offset - + numberOfCells)); + return CellIterator.unattached( + cells.subList(offset, offset + numberOfCells)); } }; } @@ -280,11 +282,12 @@ public class FlyweightRow implements Row { * access any of its data. */ private void assertSetup() { - assert element != null && row != BLANK && columnWidths != null : "Flyweight row was not " - + "properly initialized. Make sure the setup-method is " - + "called before retrieving data. This is either a bug " - + "in Escalator, or the instance of the flyweight row " - + "has been stored and accessed."; + assert element != null && row != BLANK + && columnWidths != null : "Flyweight row was not " + + "properly initialized. Make sure the setup-method is " + + "called before retrieving data. This is either a bug " + + "in Escalator, or the instance of the flyweight row " + + "has been stored and accessed."; } double getColumnWidth(int column) { diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java b/client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java index abab25046c..f81e71bf6c 100644 --- a/client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java +++ b/client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java @@ -120,7 +120,7 @@ public interface RowContainer { /** * An arbitrary pixel height of a row, before any autodetection for the row * height has been made. - * */ + */ public static final double INITIAL_DEFAULT_ROW_HEIGHT = 20; /** diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/RowVisibilityChangeEvent.java b/client/src/main/java/com/vaadin/client/widget/escalator/RowVisibilityChangeEvent.java index 5f1531e378..93738fc89b 100644 --- a/client/src/main/java/com/vaadin/client/widget/escalator/RowVisibilityChangeEvent.java +++ b/client/src/main/java/com/vaadin/client/widget/escalator/RowVisibilityChangeEvent.java @@ -25,8 +25,8 @@ import com.vaadin.shared.ui.grid.Range; * @since 7.4 * @author Vaadin Ltd */ -public class RowVisibilityChangeEvent extends - GwtEvent<RowVisibilityChangeHandler> { +public class RowVisibilityChangeEvent + extends GwtEvent<RowVisibilityChangeHandler> { /** * The type of this event. */ diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/ScrollbarBundle.java b/client/src/main/java/com/vaadin/client/widget/escalator/ScrollbarBundle.java index 151deb87d1..09f81251bd 100644 --- a/client/src/main/java/com/vaadin/client/widget/escalator/ScrollbarBundle.java +++ b/client/src/main/java/com/vaadin/client/widget/escalator/ScrollbarBundle.java @@ -137,8 +137,8 @@ public abstract class ScrollbarBundle implements DeferredWorker { void visibilityChanged(VisibilityChangeEvent event); } - public static class VisibilityChangeEvent extends - GwtEvent<VisibilityHandler> { + public static class VisibilityChangeEvent + extends GwtEvent<VisibilityHandler> { public static final Type<VisibilityHandler> TYPE = new Type<ScrollbarBundle.VisibilityHandler>() { @Override public String toString() { @@ -259,7 +259,8 @@ public abstract class ScrollbarBundle implements DeferredWorker { * * @see HorizontalScrollbarBundle#getElement() */ - public final static class HorizontalScrollbarBundle extends ScrollbarBundle { + public final static class HorizontalScrollbarBundle + extends ScrollbarBundle { @Override public void setStylePrimaryName(String primaryStyleName) { @@ -419,12 +420,13 @@ public abstract class ScrollbarBundle implements DeferredWorker { && newOffsetSizeIsGreaterThanScrollSize; if (offsetSizeBecomesGreaterThanScrollSize && getScrollPos() != 0) { // must be a field because Java insists. - offsetSizeTemporaryScrollHandler = addScrollHandler(new ScrollHandler() { - @Override - public void onScroll(ScrollEvent event) { - setOffsetSizeNow(px); - } - }); + offsetSizeTemporaryScrollHandler = addScrollHandler( + new ScrollHandler() { + @Override + public void onScroll(ScrollEvent event) { + setOffsetSizeNow(px); + } + }); setScrollPos(0); } else { setOffsetSizeNow(px); @@ -557,10 +559,10 @@ public abstract class ScrollbarBundle implements DeferredWorker { * @return the new scroll position in pixels */ public final double getScrollPos() { - assert internalGetScrollPos() == toInt32(scrollPos) : "calculated scroll position (" - + scrollPos - + ") did not match the DOM element scroll position (" - + internalGetScrollPos() + ")"; + assert internalGetScrollPos() == toInt32( + scrollPos) : "calculated scroll position (" + scrollPos + + ") did not match the DOM element scroll position (" + + internalGetScrollPos() + ")"; return scrollPos; } @@ -608,12 +610,13 @@ public abstract class ScrollbarBundle implements DeferredWorker { && newScrollSizeIsSmallerThanOffsetSize; if (scrollSizeBecomesSmallerThanOffsetSize && getScrollPos() != 0) { // must be a field because Java insists. - scrollSizeTemporaryScrollHandler = addScrollHandler(new ScrollHandler() { - @Override - public void onScroll(ScrollEvent event) { - setScrollSizeNow(px); - } - }); + scrollSizeTemporaryScrollHandler = addScrollHandler( + new ScrollHandler() { + @Override + public void onScroll(ScrollEvent event) { + setScrollSizeNow(px); + } + }); setScrollPos(0); } else { setScrollSizeNow(px); diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/events/RowHeightChangedHandler.java b/client/src/main/java/com/vaadin/client/widget/escalator/events/RowHeightChangedHandler.java index 40bd380de2..205d006326 100644 --- a/client/src/main/java/com/vaadin/client/widget/escalator/events/RowHeightChangedHandler.java +++ b/client/src/main/java/com/vaadin/client/widget/escalator/events/RowHeightChangedHandler.java @@ -29,7 +29,8 @@ public interface RowHeightChangedHandler extends EventHandler { * A row height changed event, fired by Escalator when the header, body or * footer row height has changed. * - * @param event Row height changed event + * @param event + * Row height changed event */ public void onRowHeightChanged(RowHeightChangedEvent event); } diff --git a/client/src/main/java/com/vaadin/client/widget/grid/AutoScroller.java b/client/src/main/java/com/vaadin/client/widget/grid/AutoScroller.java index 9cc238ac15..858e4a17ac 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/AutoScroller.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/AutoScroller.java @@ -159,7 +159,8 @@ public class AutoScroller { * direction has started. */ private static final int SCROLL_AREA_REBOUND_PX_PER_SEC = 1; - private static final double SCROLL_AREA_REBOUND_PX_PER_MS = SCROLL_AREA_REBOUND_PX_PER_SEC / 1000.0d; + private static final double SCROLL_AREA_REBOUND_PX_PER_MS = SCROLL_AREA_REBOUND_PX_PER_SEC + / 1000.0d; /** * The lowest y/x-coordinate on the {@link Event#getClientY() client-y} @@ -273,8 +274,8 @@ public class AutoScroller { return; } - int reboundPx = (int) Math.ceil(SCROLL_AREA_REBOUND_PX_PER_MS - * timeDiff); + int reboundPx = (int) Math + .ceil(SCROLL_AREA_REBOUND_PX_PER_MS * timeDiff); if (startBound < finalStartBound) { startBound += reboundPx; startBound = Math.min(startBound, finalStartBound); @@ -378,7 +379,8 @@ public class AutoScroller { final boolean startDidNotMove = oldTopBound == startBound; final boolean endDidNotMove = oldBottomBound == endBound; final boolean wasMovement = pageCordinate != scrollingAxisPageCoordinate; - scrollAreaShouldRebound = (startDidNotMove && endDidNotMove && wasMovement); + scrollAreaShouldRebound = (startDidNotMove && endDidNotMove + && wasMovement); } } } @@ -623,7 +625,8 @@ public class AutoScroller { private int getRealFrozenColumnCount() { if (grid.getFrozenColumnCount() < 0) { return 0; - } else if (grid.getSelectionModel().getSelectionColumnRenderer() != null) { + } else if (grid.getSelectionModel() + .getSelectionColumnRenderer() != null) { // includes the selection column return grid.getFrozenColumnCount() + 1; } else { @@ -633,7 +636,8 @@ public class AutoScroller { private double getMaxScrollLeft() { return grid.getScrollWidth() - - (getTableElement().getParentElement().getOffsetWidth() - getFrozenColumnsWidth()); + - (getTableElement().getParentElement().getOffsetWidth() + - getFrozenColumnsWidth()); } private double getMaxScrollTop() { diff --git a/client/src/main/java/com/vaadin/client/widget/grid/DefaultEditorEventHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/DefaultEditorEventHandler.java index e4a8783f54..2329f04878 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/DefaultEditorEventHandler.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/DefaultEditorEventHandler.java @@ -93,7 +93,8 @@ public class DefaultEditorEventHandler<T> implements Editor.EventHandler<T> { protected boolean isOpenEvent(EditorDomEvent<T> event) { final Event e = event.getDomEvent(); return e.getTypeInt() == Event.ONDBLCLICK - || (e.getTypeInt() == Event.ONKEYDOWN && e.getKeyCode() == KEYCODE_OPEN) + || (e.getTypeInt() == Event.ONKEYDOWN + && e.getKeyCode() == KEYCODE_OPEN) || isTouchOpenEvent(event); } @@ -172,8 +173,8 @@ public class DefaultEditorEventHandler<T> implements Editor.EventHandler<T> { // of range. if (rowDelta == 0) { if (colIndex >= columnCount - && rowIndex < event.getGrid().getDataSource() - .size() - 1) { + && rowIndex < event.getGrid().getDataSource().size() + - 1) { rowDelta = 1; colIndex = 0; } else if (colIndex < 0 && rowIndex > 0) { @@ -208,8 +209,8 @@ public class DefaultEditorEventHandler<T> implements Editor.EventHandler<T> { if (e.getType().equals(BrowserEvents.CLICK) && event.getRowIndex() == event.getCell().getRowIndex()) { - editRow(event, event.getRowIndex(), event.getCell() - .getColumnIndexDOM()); + editRow(event, event.getRowIndex(), + event.getCell().getColumnIndexDOM()); return true; @@ -268,7 +269,8 @@ public class DefaultEditorEventHandler<T> implements Editor.EventHandler<T> { return false; } - protected void editRow(EditorDomEvent<T> event, int rowIndex, int colIndex) { + protected void editRow(EditorDomEvent<T> event, int rowIndex, + int colIndex) { int rowCount = event.getGrid().getDataSource().size(); // Limit rowIndex between 0 and rowCount - 1 rowIndex = Math.max(0, Math.min(rowCount - 1, rowIndex)); @@ -312,8 +314,10 @@ public class DefaultEditorEventHandler<T> implements Editor.EventHandler<T> { final boolean handled; if (event.getGrid().isEditorActive()) { handled = handleCloseEvent(event) - || (!editor.isBuffered() && isBody && handleMoveEvent(event)) - || (editor.isBuffered() && isBody && handleBufferedMoveEvent(event)); + || (!editor.isBuffered() && isBody + && handleMoveEvent(event)) + || (editor.isBuffered() && isBody + && handleBufferedMoveEvent(event)); } else { handled = event.getGrid().isEnabled() && isBody && handleOpenEvent(event); diff --git a/client/src/main/java/com/vaadin/client/widget/grid/HeightAwareDetailsGenerator.java b/client/src/main/java/com/vaadin/client/widget/grid/HeightAwareDetailsGenerator.java index 5364de3411..db3db85c2a 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/HeightAwareDetailsGenerator.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/HeightAwareDetailsGenerator.java @@ -22,7 +22,7 @@ package com.vaadin.client.widget.grid; * temporary workaround and might be removed or renamed at any time. * </p> * - * @since 7.6.1 + * @since 7.6.1 * @author Vaadin Ltd */ @Deprecated diff --git a/client/src/main/java/com/vaadin/client/widget/grid/datasources/ListSorter.java b/client/src/main/java/com/vaadin/client/widget/grid/datasources/ListSorter.java index 69bea629b0..3e0d05a414 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/datasources/ListSorter.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/datasources/ListSorter.java @@ -129,8 +129,8 @@ public class ListSorter<T> { private void sort(final List<SortOrder> order) { DataSource<T> ds = grid.getDataSource(); if (!(ds instanceof ListDataSource)) { - throw new IllegalStateException("Grid " + grid - + " data source is not a ListDataSource!"); + throw new IllegalStateException( + "Grid " + grid + " data source is not a ListDataSource!"); } ((ListDataSource<T>) ds).sort(new Comparator<T>() { @@ -158,15 +158,16 @@ public class ListSorter<T> { } if (result != 0) { - return o.getDirection() == SortDirection.ASCENDING ? result - : -result; + return o.getDirection() == SortDirection.ASCENDING + ? result : -result; } } if (order.size() > 0) { - return order.get(0).getDirection() == SortDirection.ASCENDING ? a - .hashCode() - b.hashCode() - : b.hashCode() - a.hashCode(); + return order.get(0) + .getDirection() == SortDirection.ASCENDING + ? a.hashCode() - b.hashCode() + : b.hashCode() - a.hashCode(); } return a.hashCode() - b.hashCode(); } diff --git a/client/src/main/java/com/vaadin/client/widget/grid/events/AbstractGridKeyEventHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/AbstractGridKeyEventHandler.java index 120c32d380..9106523606 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/events/AbstractGridKeyEventHandler.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/events/AbstractGridKeyEventHandler.java @@ -26,18 +26,18 @@ import com.vaadin.client.widgets.Grid.AbstractGridKeyEvent; */ public abstract interface AbstractGridKeyEventHandler extends EventHandler { - public abstract interface GridKeyDownHandler extends - AbstractGridKeyEventHandler { + public abstract interface GridKeyDownHandler + extends AbstractGridKeyEventHandler { public void onKeyDown(GridKeyDownEvent event); } - public abstract interface GridKeyUpHandler extends - AbstractGridKeyEventHandler { + public abstract interface GridKeyUpHandler + extends AbstractGridKeyEventHandler { public void onKeyUp(GridKeyUpEvent event); } - public abstract interface GridKeyPressHandler extends - AbstractGridKeyEventHandler { + public abstract interface GridKeyPressHandler + extends AbstractGridKeyEventHandler { public void onKeyPress(GridKeyPressEvent event); } diff --git a/client/src/main/java/com/vaadin/client/widget/grid/events/AbstractGridMouseEventHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/AbstractGridMouseEventHandler.java index 15e22a6d57..e72b7df934 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/events/AbstractGridMouseEventHandler.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/events/AbstractGridMouseEventHandler.java @@ -26,13 +26,13 @@ import com.vaadin.client.widgets.Grid.AbstractGridMouseEvent; */ public abstract interface AbstractGridMouseEventHandler extends EventHandler { - public abstract interface GridClickHandler extends - AbstractGridMouseEventHandler { + public abstract interface GridClickHandler + extends AbstractGridMouseEventHandler { public void onClick(GridClickEvent event); } - public abstract interface GridDoubleClickHandler extends - AbstractGridMouseEventHandler { + public abstract interface GridDoubleClickHandler + extends AbstractGridMouseEventHandler { public void onDoubleClick(GridDoubleClickEvent event); } diff --git a/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeEvent.java index 63b788bcf2..96e7694251 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeEvent.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeEvent.java @@ -28,8 +28,8 @@ import com.vaadin.client.widgets.Grid.Column; * @since 7.5.0 * @author Vaadin Ltd */ -public class ColumnVisibilityChangeEvent<T> extends - GwtEvent<ColumnVisibilityChangeHandler<T>> { +public class ColumnVisibilityChangeEvent<T> + extends GwtEvent<ColumnVisibilityChangeHandler<T>> { private final static Type<ColumnVisibilityChangeHandler<?>> TYPE = new Type<ColumnVisibilityChangeHandler<?>>(); diff --git a/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeHandler.java index 542fe4e3c1..181a0e69a7 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeHandler.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeHandler.java @@ -21,8 +21,10 @@ import com.google.gwt.event.shared.EventHandler; * Handler for a Grid column visibility change event, called when the Grid's * columns have changed visibility to hidden or visible. * - * @param<T> The row type of the grid. The row type is the POJO type from where - * the data is retrieved into the column cells. + * @param<T> The + * row type of the grid. The row type is the POJO type from where + * the data is retrieved into the column cells. + * * @since 7.5.0 * @author Vaadin Ltd */ diff --git a/client/src/main/java/com/vaadin/client/widget/grid/events/GridClickEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/GridClickEvent.java index 33a4c923b7..6d5f5ae38b 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/events/GridClickEvent.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/events/GridClickEvent.java @@ -42,8 +42,10 @@ public class GridClickEvent extends AbstractGridMouseEvent<GridClickHandler> { @Override protected void doDispatch(GridClickHandler handler, Section section) { if ((section == Section.BODY && handler instanceof BodyClickHandler) - || (section == Section.HEADER && handler instanceof HeaderClickHandler) - || (section == Section.FOOTER && handler instanceof FooterClickHandler)) { + || (section == Section.HEADER + && handler instanceof HeaderClickHandler) + || (section == Section.FOOTER + && handler instanceof FooterClickHandler)) { handler.onClick(this); } } diff --git a/client/src/main/java/com/vaadin/client/widget/grid/events/GridDoubleClickEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/GridDoubleClickEvent.java index 64a1a88b42..f134f863ab 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/events/GridDoubleClickEvent.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/events/GridDoubleClickEvent.java @@ -28,8 +28,8 @@ import com.vaadin.shared.ui.grid.GridConstants.Section; * @since 7.4 * @author Vaadin Ltd */ -public class GridDoubleClickEvent extends - AbstractGridMouseEvent<GridDoubleClickHandler> { +public class GridDoubleClickEvent + extends AbstractGridMouseEvent<GridDoubleClickHandler> { public GridDoubleClickEvent(Grid<?> grid, CellReference<?> targetCell) { super(grid, targetCell); @@ -42,9 +42,12 @@ public class GridDoubleClickEvent extends @Override protected void doDispatch(GridDoubleClickHandler handler, Section section) { - if ((section == Section.BODY && handler instanceof BodyDoubleClickHandler) - || (section == Section.HEADER && handler instanceof HeaderDoubleClickHandler) - || (section == Section.FOOTER && handler instanceof FooterDoubleClickHandler)) { + if ((section == Section.BODY + && handler instanceof BodyDoubleClickHandler) + || (section == Section.HEADER + && handler instanceof HeaderDoubleClickHandler) + || (section == Section.FOOTER + && handler instanceof FooterDoubleClickHandler)) { handler.onDoubleClick(this); } } diff --git a/client/src/main/java/com/vaadin/client/widget/grid/events/GridKeyDownEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/GridKeyDownEvent.java index 9849137982..23efa56eb5 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/events/GridKeyDownEvent.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/events/GridKeyDownEvent.java @@ -38,8 +38,10 @@ public class GridKeyDownEvent extends AbstractGridKeyEvent<GridKeyDownHandler> { @Override protected void doDispatch(GridKeyDownHandler handler, Section section) { if ((section == Section.BODY && handler instanceof BodyKeyDownHandler) - || (section == Section.HEADER && handler instanceof HeaderKeyDownHandler) - || (section == Section.FOOTER && handler instanceof FooterKeyDownHandler)) { + || (section == Section.HEADER + && handler instanceof HeaderKeyDownHandler) + || (section == Section.FOOTER + && handler instanceof FooterKeyDownHandler)) { handler.onKeyDown(this); } } diff --git a/client/src/main/java/com/vaadin/client/widget/grid/events/GridKeyPressEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/GridKeyPressEvent.java index 35a3af0c2e..b159b1e0b1 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/events/GridKeyPressEvent.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/events/GridKeyPressEvent.java @@ -28,8 +28,8 @@ import com.vaadin.shared.ui.grid.GridConstants.Section; * @since 7.4 * @author Vaadin Ltd */ -public class GridKeyPressEvent extends - AbstractGridKeyEvent<GridKeyPressHandler> { +public class GridKeyPressEvent + extends AbstractGridKeyEvent<GridKeyPressHandler> { public GridKeyPressEvent(Grid<?> grid, CellReference<?> targetCell) { super(grid, targetCell); @@ -38,8 +38,10 @@ public class GridKeyPressEvent extends @Override protected void doDispatch(GridKeyPressHandler handler, Section section) { if ((section == Section.BODY && handler instanceof BodyKeyPressHandler) - || (section == Section.HEADER && handler instanceof HeaderKeyPressHandler) - || (section == Section.FOOTER && handler instanceof FooterKeyPressHandler)) { + || (section == Section.HEADER + && handler instanceof HeaderKeyPressHandler) + || (section == Section.FOOTER + && handler instanceof FooterKeyPressHandler)) { handler.onKeyPress(this); } } diff --git a/client/src/main/java/com/vaadin/client/widget/grid/events/GridKeyUpEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/GridKeyUpEvent.java index d273835233..ec1980b39b 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/events/GridKeyUpEvent.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/events/GridKeyUpEvent.java @@ -38,8 +38,10 @@ public class GridKeyUpEvent extends AbstractGridKeyEvent<GridKeyUpHandler> { @Override protected void doDispatch(GridKeyUpHandler handler, Section section) { if ((section == Section.BODY && handler instanceof BodyKeyUpHandler) - || (section == Section.HEADER && handler instanceof HeaderKeyUpHandler) - || (section == Section.FOOTER && handler instanceof FooterKeyUpHandler)) { + || (section == Section.HEADER + && handler instanceof HeaderKeyUpHandler) + || (section == Section.FOOTER + && handler instanceof FooterKeyUpHandler)) { handler.onKeyUp(this); } } diff --git a/client/src/main/java/com/vaadin/client/widget/grid/selection/AbstractRowHandleSelectionModel.java b/client/src/main/java/com/vaadin/client/widget/grid/selection/AbstractRowHandleSelectionModel.java index 6b7bbb6294..bcd8f9beb7 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/selection/AbstractRowHandleSelectionModel.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/selection/AbstractRowHandleSelectionModel.java @@ -29,8 +29,8 @@ import com.vaadin.client.data.DataSource.RowHandle; * The grid's row type * @since 7.4 */ -public abstract class AbstractRowHandleSelectionModel<T> implements - SelectionModel<T> { +public abstract class AbstractRowHandleSelectionModel<T> + implements SelectionModel<T> { /** * Select a row, based on its * {@link com.vaadin.client.data.DataSource.RowHandle RowHandle}. diff --git a/client/src/main/java/com/vaadin/client/widget/grid/selection/MultiSelectionRenderer.java b/client/src/main/java/com/vaadin/client/widget/grid/selection/MultiSelectionRenderer.java index f244682b49..9650a31b50 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/selection/MultiSelectionRenderer.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/selection/MultiSelectionRenderer.java @@ -55,8 +55,8 @@ import com.vaadin.client.widgets.Grid; * the type of the associated grid * @since 7.4 */ -public class MultiSelectionRenderer<T> extends - ClickableRenderer<Boolean, CheckBox> { +public class MultiSelectionRenderer<T> + extends ClickableRenderer<Boolean, CheckBox> { private static final String SELECTION_CHECKBOX_CLASSNAME = "-selection-checkbox"; @@ -91,16 +91,17 @@ public class MultiSelectionRenderer<T> extends @Override public void onMouseDown(MouseDownEvent event) { - if(checkBox.isEnabled()) { + if (checkBox.isEnabled()) { if (event.getNativeButton() == NativeEvent.BUTTON_LEFT) { - startDragSelect(event.getNativeEvent(), checkBox.getElement()); + startDragSelect(event.getNativeEvent(), + checkBox.getElement()); } } } @Override public void onTouchStart(TouchStartEvent event) { - if(checkBox.isEnabled()) { + if (checkBox.isEnabled()) { startDragSelect(event.getNativeEvent(), checkBox.getElement()); } } @@ -159,8 +160,8 @@ public class MultiSelectionRenderer<T> extends * Remember: targetElement is always where touchstart started, * not where the finger is pointing currently. */ - final Element targetElement = Element.as(event.getNativeEvent() - .getEventTarget()); + final Element targetElement = Element + .as(event.getNativeEvent().getEventTarget()); if (isInFirstColumn(targetElement)) { removeNativeHandler(); event.cancel(); @@ -222,7 +223,8 @@ public class MultiSelectionRenderer<T> extends * direction has started. */ private static final int SCROLL_AREA_REBOUND_PX_PER_SEC = 1; - private static final double SCROLL_AREA_REBOUND_PX_PER_MS = SCROLL_AREA_REBOUND_PX_PER_SEC / 1000.0d; + private static final double SCROLL_AREA_REBOUND_PX_PER_MS = SCROLL_AREA_REBOUND_PX_PER_SEC + / 1000.0d; /** * The lowest y-coordinate on the {@link Event#getClientY() client} from @@ -317,8 +319,8 @@ public class MultiSelectionRenderer<T> extends int constrainedPageY = Math.max(bodyAbsoluteTop, Math.min(bodyAbsoluteBottom, pageY)); - int logicalRow = getLogicalRowIndex(WidgetUtil.getElementFromPoint( - initialPageX, constrainedPageY)); + int logicalRow = getLogicalRowIndex(WidgetUtil + .getElementFromPoint(initialPageX, constrainedPageY)); int incrementOrDecrement = (logicalRow > lastModifiedLogicalRow) ? 1 : -1; @@ -346,8 +348,8 @@ public class MultiSelectionRenderer<T> extends return; } - int reboundPx = (int) Math.ceil(SCROLL_AREA_REBOUND_PX_PER_MS - * timeDiff); + int reboundPx = (int) Math + .ceil(SCROLL_AREA_REBOUND_PX_PER_MS * timeDiff); if (topBound < finalTopBound) { topBound += reboundPx; topBound = Math.min(topBound, finalTopBound); @@ -454,7 +456,8 @@ public class MultiSelectionRenderer<T> extends final boolean topDidNotMove = oldTopBound == topBound; final boolean bottomDidNotMove = oldBottomBound == bottomBound; final boolean wasVerticalMovement = pageY != this.pageY; - scrollAreaShouldRebound = (topDidNotMove && bottomDidNotMove && wasVerticalMovement); + scrollAreaShouldRebound = (topDidNotMove && bottomDidNotMove + && wasVerticalMovement); } } } @@ -604,8 +607,8 @@ public class MultiSelectionRenderer<T> extends @Override public CheckBox createWidget() { final CheckBox checkBox = GWT.create(CheckBox.class); - checkBox.setStylePrimaryName(grid.getStylePrimaryName() - + SELECTION_CHECKBOX_CLASSNAME); + checkBox.setStylePrimaryName( + grid.getStylePrimaryName() + SELECTION_CHECKBOX_CLASSNAME); CheckBoxEventHandler handler = new CheckBoxEventHandler(checkBox); @@ -653,13 +656,13 @@ public class MultiSelectionRenderer<T> extends public boolean onBrowserEvent(final CellReference<?> cell, final NativeEvent event) { if (BrowserEvents.TOUCHSTART.equals(event.getType()) - || (BrowserEvents.MOUSEDOWN.equals(event.getType()) && event - .getButton() == NativeEvent.BUTTON_LEFT)) { + || (BrowserEvents.MOUSEDOWN.equals(event.getType()) + && event.getButton() == NativeEvent.BUTTON_LEFT)) { startDragSelect(event, Element.as(event.getEventTarget())); return true; } else { - throw new IllegalStateException("received unexpected event: " - + event.getType()); + throw new IllegalStateException( + "received unexpected event: " + event.getType()); } } diff --git a/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModelNone.java b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModelNone.java index 4a8b203a94..23ad203072 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModelNone.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModelNone.java @@ -59,15 +59,15 @@ public class SelectionModelNone<T> extends AbstractRowHandleSelectionModel<T> @Override protected boolean selectByHandle(RowHandle<T> handle) throws UnsupportedOperationException { - throw new UnsupportedOperationException("This selection model " - + "does not support selection"); + throw new UnsupportedOperationException( + "This selection model " + "does not support selection"); } @Override protected boolean deselectByHandle(RowHandle<T> handle) throws UnsupportedOperationException { - throw new UnsupportedOperationException("This selection model " - + "does not support deselection"); + throw new UnsupportedOperationException( + "This selection model " + "does not support deselection"); } } diff --git a/client/src/main/java/com/vaadin/client/widget/grid/selection/SpaceSelectHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/selection/SpaceSelectHandler.java index 3e04a6dfac..42abb4592c 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/selection/SpaceSelectHandler.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/selection/SpaceSelectHandler.java @@ -65,8 +65,8 @@ public class SpaceSelectHandler<T> { @Override public void onDataAvailable( DataAvailableEvent dataAvailableEvent) { - if (dataAvailableEvent.getAvailableRows().contains( - rowIndex)) { + if (dataAvailableEvent.getAvailableRows() + .contains(rowIndex)) { setSelected(grid, rowIndex); scrollHandler.removeHandler(); scrollHandler = null; diff --git a/client/src/main/java/com/vaadin/client/widget/grid/sort/SortEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/sort/SortEvent.java index 2aad6e4f95..7945fbb8b5 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/sort/SortEvent.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/sort/SortEvent.java @@ -46,7 +46,8 @@ public class SortEvent<T> extends GwtEvent<SortHandler<?>> { * @param originator * a value indicating where this event originated from */ - public SortEvent(Grid<T> grid, List<SortOrder> order, boolean userOriginated) { + public SortEvent(Grid<T> grid, List<SortOrder> order, + boolean userOriginated) { this.grid = grid; this.order = order; this.userOriginated = userOriginated; diff --git a/client/src/main/java/com/vaadin/client/widgets/Escalator.java b/client/src/main/java/com/vaadin/client/widgets/Escalator.java index 52f981fe63..7e92087c22 100644 --- a/client/src/main/java/com/vaadin/client/widgets/Escalator.java +++ b/client/src/main/java/com/vaadin/client/widgets/Escalator.java @@ -239,7 +239,8 @@ abstract class JsniWorkaround { protected JsniWorkaround(final Escalator escalator) { scrollListenerFunction = createScrollListenerFunction(escalator); - mousewheelListenerFunction = createMousewheelListenerFunction(escalator); + mousewheelListenerFunction = createMousewheelListenerFunction( + escalator); touchHandlerBundle = new TouchHandlerBundle(escalator); touchStartFunction = touchHandlerBundle.getTouchStartHandler(); @@ -277,8 +278,8 @@ abstract class JsniWorkaround { * @since 7.4 * @author Vaadin Ltd */ -public class Escalator extends Widget implements RequiresResize, - DeferredWorker, SubPartAware { +public class Escalator extends Widget + implements RequiresResize, DeferredWorker, SubPartAware { // todo comments legend /* @@ -310,8 +311,8 @@ public class Escalator extends Widget implements RequiresResize, /** * A <a href= * "http://www.gwtproject.org/doc/latest/DevGuideCodingBasicsOverlay.html" - * >JavaScriptObject overlay</a> for the <a - * href="http://www.w3.org/TR/touch-events/">JavaScript + * >JavaScriptObject overlay</a> for the + * <a href="http://www.w3.org/TR/touch-events/">JavaScript * TouchEvent</a> object. * <p> * This needs to be used in the touch event handlers, since GWT's @@ -320,8 +321,8 @@ public class Escalator extends Widget implements RequiresResize, * {@link com.google.gwt.dom.client.NativeEvent NativeEvent} isn't * properly populated with the correct values. */ - private final static class CustomTouchEvent extends - JavaScriptObject { + private final static class CustomTouchEvent + extends JavaScriptObject { protected CustomTouchEvent() { } @@ -672,13 +673,13 @@ public class Escalator extends Widget implements RequiresResize, /*-{ var vScroll = esc.@com.vaadin.client.widgets.Escalator::verticalScrollbar; var vScrollElem = vScroll.@com.vaadin.client.widget.escalator.ScrollbarBundle::getElement()(); - + var hScroll = esc.@com.vaadin.client.widgets.Escalator::horizontalScrollbar; var hScrollElem = hScroll.@com.vaadin.client.widget.escalator.ScrollbarBundle::getElement()(); - + return $entry(function(e) { var target = e.target || e.srcElement; // IE8 uses e.scrElement - + // in case the scroll event was native (i.e. scrollbars were dragged, or // the scrollTop/Left was manually modified), the bundles have old cache // values. We need to make sure that the caches are kept up to date. @@ -699,29 +700,29 @@ public class Escalator extends Widget implements RequiresResize, return $entry(function(e) { var deltaX = e.deltaX ? e.deltaX : -0.5*e.wheelDeltaX; var deltaY = e.deltaY ? e.deltaY : -0.5*e.wheelDeltaY; - + // Delta mode 0 is in pixels; we don't need to do anything... - + // A delta mode of 1 means we're scrolling by lines instead of pixels // We need to scale the number of lines by the default line height if(e.deltaMode === 1) { var brc = esc.@com.vaadin.client.widgets.Escalator::body; deltaY *= brc.@com.vaadin.client.widgets.Escalator.AbstractRowContainer::getDefaultRowHeight()(); } - + // Other delta modes aren't supported if((e.deltaMode !== undefined) && (e.deltaMode >= 2 || e.deltaMode < 0)) { var msg = "Unsupported wheel delta mode \"" + e.deltaMode + "\""; - + // Print warning message esc.@com.vaadin.client.widgets.Escalator::logWarning(*)(msg); } - + // IE8 has only delta y if (isNaN(deltaY)) { deltaY = -0.5*e.wheelDelta; } - + @com.vaadin.client.widgets.Escalator.JsniUtil::moveScrollFromEvent(*)(esc, deltaX, deltaY, e); }); }-*/; @@ -738,8 +739,7 @@ public class Escalator extends Widget implements RequiresResize, double tableWrapperWidth = widthOfEscalator; boolean verticalScrollNeeded = scrollContentHeight > tableWrapperHeight - + WidgetUtil.PIXEL_EPSILON - - header.getHeightOfSection() + + WidgetUtil.PIXEL_EPSILON - header.getHeightOfSection() - footer.getHeightOfSection(); boolean horizontalScrollNeeded = scrollContentWidth > tableWrapperWidth + WidgetUtil.PIXEL_EPSILON; @@ -774,8 +774,8 @@ public class Escalator extends Widget implements RequiresResize, double footerHeight = footer.getHeightOfSection(); double headerHeight = header.getHeightOfSection(); - double vScrollbarHeight = Math.max(0, tableWrapperHeight - - footerHeight - headerHeight); + double vScrollbarHeight = Math.max(0, + tableWrapperHeight - footerHeight - headerHeight); verticalScrollbar.setOffsetSize(vScrollbarHeight); verticalScrollbar.setScrollSize(scrollContentHeight); @@ -795,8 +795,8 @@ public class Escalator extends Widget implements RequiresResize, double hScrollOffsetWidth = tableWrapperWidth - frozenPixels; horizontalScrollbar.setOffsetSize(hScrollOffsetWidth); horizontalScrollbar.setScrollSize(unfrozenPixels); - horizontalScrollbar.getElement().getStyle() - .setLeft(frozenPixels, Unit.PX); + horizontalScrollbar.getElement().getStyle().setLeft(frozenPixels, + Unit.PX); horizontalScrollbar.setScrollPos(prevScrollPos); /* @@ -1019,9 +1019,8 @@ public class Escalator extends Widget implements RequiresResize, + columnConfiguration.getColumnWidthActual(columnIndex); final double viewportStartPx = getScrollLeft(); - double viewportEndPx = viewportStartPx - + WidgetUtil - .getRequiredWidthBoundingClientRectDouble(getElement()) + double viewportEndPx = viewportStartPx + WidgetUtil + .getRequiredWidthBoundingClientRectDouble(getElement()) - frozenPixels; if (verticalScrollbar.showsScrollHandle()) { viewportEndPx -= WidgetUtil.getNativeScrollbarSize(); @@ -1070,7 +1069,9 @@ public class Escalator extends Widget implements RequiresResize, /** * The table section element ({@code <thead>}, {@code <tbody>} or - * {@code <tfoot>}) the rows (i.e. {@code <tr>} tags) are contained in. + * {@code <tfoot>}) the rows (i.e. {@code + * <tr> + * } tags) are contained in. */ protected final TableSectionElement root; @@ -1122,7 +1123,8 @@ public class Escalator extends Widget implements RequiresResize, * @see #hasColumnAndRowData() */ @Override - public void setEscalatorUpdater(final EscalatorUpdater escalatorUpdater) { + public void setEscalatorUpdater( + final EscalatorUpdater escalatorUpdater) { if (escalatorUpdater == null) { throw new IllegalArgumentException( "escalator updater cannot be null"); @@ -1214,8 +1216,8 @@ public class Escalator extends Widget implements RequiresResize, } protected void assertArgumentsAreValidAndWithinRange(final int index, - final int numberOfRows) throws IllegalArgumentException, - IndexOutOfBoundsException { + final int numberOfRows) + throws IllegalArgumentException, IndexOutOfBoundsException { if (numberOfRows < 1) { throw new IllegalArgumentException( "Number of rows must be 1 or greater (was " @@ -1223,8 +1225,8 @@ public class Escalator extends Widget implements RequiresResize, } if (index < 0 || index + numberOfRows > getRowCount()) { - throw new IndexOutOfBoundsException("The given " - + "row range (" + index + ".." + (index + numberOfRows) + throw new IndexOutOfBoundsException("The given " + "row range (" + + index + ".." + (index + numberOfRows) + ") was outside of the current number of rows (" + getRowCount() + ")"); } @@ -1295,8 +1297,8 @@ public class Escalator extends Widget implements RequiresResize, Map<Integer, Double> colWidths = new HashMap<Integer, Double>(); for (int i = 0; i < getColumnConfiguration() .getColumnCount(); i++) { - Double width = Double.valueOf(getColumnConfiguration() - .getColumnWidth(i)); + Double width = Double.valueOf( + getColumnConfiguration().getColumnWidth(i)); Integer col = Integer.valueOf(i); colWidths.put(col, width); } @@ -1337,15 +1339,18 @@ public class Escalator extends Widget implements RequiresResize, referenceRow = null; } - for (int row = visualIndex; row < visualIndex + numberOfRows; row++) { + for (int row = visualIndex; row < visualIndex + + numberOfRows; row++) { final TableRowElement tr = TableRowElement.as(DOM.createTR()); addedRows.add(tr); tr.addClassName(getStylePrimaryName() + "-row"); - for (int col = 0; col < columnConfiguration.getColumnCount(); col++) { + for (int col = 0; col < columnConfiguration + .getColumnCount(); col++) { final double colWidth = columnConfiguration .getColumnWidthActual(col); - final TableCellElement cellElem = createCellElement(colWidth); + final TableCellElement cellElem = createCellElement( + colWidth); tr.appendChild(cellElem); // Set stylename and position if new cell is frozen @@ -1447,8 +1452,8 @@ public class Escalator extends Widget implements RequiresResize, // overridden because of JavaDoc public void refreshRows(final int index, final int numberOfRows) { Range rowRange = Range.withLength(index, numberOfRows); - Range colRange = Range.withLength(0, getColumnConfiguration() - .getColumnCount()); + Range colRange = Range.withLength(0, + getColumnConfiguration().getColumnCount()); refreshCells(rowRange, colRange); } @@ -1464,8 +1469,8 @@ public class Escalator extends Widget implements RequiresResize, Range colRange) { flyweightRow.setup(tr, logicalRowIndex, columnConfiguration.getCalculatedColumnWidths()); - Iterable<FlyweightCell> cellsToUpdate = flyweightRow.getCells( - colRange.getStart(), colRange.length()); + Iterable<FlyweightCell> cellsToUpdate = flyweightRow + .getCells(colRange.getStart(), colRange.length()); updater.update(flyweightRow, cellsToUpdate); /* @@ -1484,8 +1489,8 @@ public class Escalator extends Widget implements RequiresResize, * @return a set-up empty cell element */ public TableCellElement createCellElement(final double width) { - final TableCellElement cellElem = TableCellElement.as(DOM - .createElement(getCellElementTagName())); + final TableCellElement cellElem = TableCellElement + .as(DOM.createElement(getCellElementTagName())); final double height = getDefaultRowHeight(); assert height >= 0 : "defaultRowHeight was negative. There's a setter leak somewhere."; @@ -1522,8 +1527,8 @@ public class Escalator extends Widget implements RequiresResize, flyweightRow.setup(row, i, columnConfiguration.getCalculatedColumnWidths()); - Iterable<FlyweightCell> attachedCells = flyweightRow.getCells( - offset, numberOfColumns); + Iterable<FlyweightCell> attachedCells = flyweightRow + .getCells(offset, numberOfColumns); getEscalatorUpdater().preDetach(flyweightRow, attachedCells); for (int j = 0; j < numberOfColumns; j++) { @@ -1576,15 +1581,17 @@ public class Escalator extends Widget implements RequiresResize, * the number of cells to insert */ private void paintInsertCells(final TableRowElement tr, - int logicalRowIndex, final int offset, final int numberOfCells) { + int logicalRowIndex, final int offset, + final int numberOfCells) { - assert root.isOrHasChild(tr) : "The row must be attached to the document"; + assert root.isOrHasChild( + tr) : "The row must be attached to the document"; flyweightRow.setup(tr, logicalRowIndex, columnConfiguration.getCalculatedColumnWidths()); - Iterable<FlyweightCell> cells = flyweightRow.getUnattachedCells( - offset, numberOfCells); + Iterable<FlyweightCell> cells = flyweightRow + .getUnattachedCells(offset, numberOfCells); for (FlyweightCell cell : cells) { final double colWidth = columnConfiguration @@ -1684,8 +1691,8 @@ public class Escalator extends Widget implements RequiresResize, * @return the pixel width of the widest element in the indicated column */ public double calculateMaxColWidth(int index) { - TableRowElement row = TableRowElement.as(root - .getFirstChildElement()); + TableRowElement row = TableRowElement + .as(root.getFirstChildElement()); double maxWidth = 0; while (row != null) { final TableCellElement cell = row.getCells().getItem(index); @@ -1740,7 +1747,8 @@ public class Escalator extends Widget implements RequiresResize, * Since browsers don't explode with overflowing colspans, escalator * shouldn't either. */ - if (spannedColumns.getEnd() > columnConfiguration.getColumnCount()) { + if (spannedColumns.getEnd() > columnConfiguration + .getColumnCount()) { spannedColumns = Range.between(columnIndex, columnConfiguration.getColumnCount()); } @@ -1752,8 +1760,9 @@ public class Escalator extends Widget implements RequiresResize, * Applies the total length of the columns to each row element. * <p> * <em>Note:</em> In contrast to {@link #reapplyColumnWidths()}, this - * method only modifies the width of the {@code <tr>} element, not the - * cells within. + * method only modifies the width of the {@code + * <tr> + * } element, not the cells within. */ protected void reapplyRowWidths() { double rowWidth = columnConfiguration.calculateRowWidth(); @@ -1796,8 +1805,8 @@ public class Escalator extends Widget implements RequiresResize, Element cell = TableRowElement.as(row).getCells().getItem(0); while (cell != null) { assert TableCellElement.is(cell); - UIObject.setStylePrimaryName(cell, primaryStyleName - + "-cell"); + UIObject.setStylePrimaryName(cell, + primaryStyleName + "-cell"); cell = cell.getNextSiblingElement(); } row = row.getNextSiblingElement(); @@ -1817,8 +1826,8 @@ public class Escalator extends Widget implements RequiresResize, public void setDefaultRowHeight(double px) throws IllegalArgumentException { if (px < 1) { - throw new IllegalArgumentException("Height must be positive. " - + px + " was given."); + throw new IllegalArgumentException( + "Height must be positive. " + px + " was given."); } defaultRowHeightShouldBeAutodetected = false; @@ -1963,7 +1972,8 @@ public class Escalator extends Widget implements RequiresResize, * hierarchy until reaching cell element. */ Element cellElementCandidate = element; - while (cellElementCandidate.getParentElement().getParentElement() != root) { + while (cellElementCandidate.getParentElement() + .getParentElement() != root) { cellElementCandidate = cellElementCandidate.getParentElement(); } final TableCellElement cellElement = TableCellElement @@ -1997,8 +2007,8 @@ public class Escalator extends Widget implements RequiresResize, * explicit dimensions, and measure that instead. */ - TableCellElement cellClone = TableCellElement.as((Element) cell - .cloneNode(withContent)); + TableCellElement cellClone = TableCellElement + .as((Element) cell.cloneNode(withContent)); cellClone.getStyle().clearHeight(); cellClone.getStyle().clearWidth(); @@ -2051,8 +2061,8 @@ public class Escalator extends Widget implements RequiresResize, private boolean cellIsPartOfSpan(TableCellElement cell) { boolean cellHasColspan = cell.getColSpan() > 1; - boolean cellIsHidden = Display.NONE.getCssName().equals( - cell.getStyle().getDisplay()); + boolean cellIsHidden = Display.NONE.getCssName() + .equals(cell.getStyle().getDisplay()); return cellHasColspan || cellIsHidden; } @@ -2082,13 +2092,14 @@ public class Escalator extends Widget implements RequiresResize, } - private abstract class AbstractStaticRowContainer extends - AbstractRowContainer { + private abstract class AbstractStaticRowContainer + extends AbstractRowContainer { /** The height of the combined rows in the DOM. Never negative. */ private double heightOfSection = 0; - public AbstractStaticRowContainer(final TableSectionElement headElement) { + public AbstractStaticRowContainer( + final TableSectionElement headElement) { super(headElement); } @@ -2098,7 +2109,8 @@ public class Escalator extends Widget implements RequiresResize, } @Override - protected void paintRemoveRows(final int index, final int numberOfRows) { + protected void paintRemoveRows(final int index, + final int numberOfRows) { for (int i = index; i < index + numberOfRows; i++) { final TableRowElement tr = root.getRows().getItem(index); paintRemoveRow(tr, index); @@ -2112,8 +2124,8 @@ public class Escalator extends Widget implements RequiresResize, if (index >= 0 && index < root.getChildCount()) { return root.getRows().getItem(index); } else { - throw new IndexOutOfBoundsException("No such visual index: " - + index); + throw new IndexOutOfBoundsException( + "No such visual index: " + index); } } @@ -2151,7 +2163,8 @@ public class Escalator extends Widget implements RequiresResize, return; } - Profiler.enter("Escalator.AbstractStaticRowContainer.reapplyDefaultRowHeights"); + Profiler.enter( + "Escalator.AbstractStaticRowContainer.reapplyDefaultRowHeights"); Element tr = root.getRows().getItem(0); while (tr != null) { @@ -2166,12 +2179,14 @@ public class Escalator extends Widget implements RequiresResize, */ recalculateSectionHeight(); - Profiler.leave("Escalator.AbstractStaticRowContainer.reapplyDefaultRowHeights"); + Profiler.leave( + "Escalator.AbstractStaticRowContainer.reapplyDefaultRowHeights"); } @Override protected void recalculateSectionHeight() { - Profiler.enter("Escalator.AbstractStaticRowContainer.recalculateSectionHeight"); + Profiler.enter( + "Escalator.AbstractStaticRowContainer.recalculateSectionHeight"); double newHeight = calculateTotalRowHeight(); if (newHeight != heightOfSection) { @@ -2185,15 +2200,16 @@ public class Escalator extends Widget implements RequiresResize, * body.verifyEscalatorCount. This is because the logical row * indices are calculated from the scrollbar position. */ - verticalScrollbar.setOffsetSize(heightOfEscalator - - header.getHeightOfSection() - - footer.getHeightOfSection()); + verticalScrollbar.setOffsetSize( + heightOfEscalator - header.getHeightOfSection() + - footer.getHeightOfSection()); body.verifyEscalatorCount(); body.spacerContainer.updateSpacerDecosVisibility(); } - Profiler.leave("Escalator.AbstractStaticRowContainer.recalculateSectionHeight"); + Profiler.leave( + "Escalator.AbstractStaticRowContainer.recalculateSectionHeight"); } /** @@ -2237,7 +2253,8 @@ public class Escalator extends Widget implements RequiresResize, @Override protected boolean rowCanBeFrozen(TableRowElement tr) { - assert root.isOrHasChild(tr) : "Row does not belong to this table section"; + assert root.isOrHasChild( + tr) : "Row does not belong to this table section"; return true; } @@ -2258,8 +2275,8 @@ public class Escalator extends Widget implements RequiresResize, bodyElem.getStyle().setMarginTop(heightOfSection, Unit.PX); spacerDecoContainer.getStyle().setMarginTop(heightOfSection, Unit.PX); - verticalScrollbar.getElement().getStyle() - .setTop(heightOfSection, Unit.PX); + verticalScrollbar.getElement().getStyle().setTop(heightOfSection, + Unit.PX); headerDeco.getStyle().setHeight(heightOfSection, Unit.PX); } @@ -2295,8 +2312,8 @@ public class Escalator extends Widget implements RequiresResize, protected void sectionHeightCalculated() { double headerHeight = header.getHeightOfSection(); double footerHeight = footer.getHeightOfSection(); - int vscrollHeight = (int) Math.floor(heightOfEscalator - - headerHeight - footerHeight); + int vscrollHeight = (int) Math + .floor(heightOfEscalator - headerHeight - footerHeight); final boolean horizontalScrollbarNeeded = columnConfiguration .calculateRowWidth() > widthOfEscalator; @@ -2311,8 +2328,8 @@ public class Escalator extends Widget implements RequiresResize, } } - private class BodyRowContainerImpl extends AbstractRowContainer implements - BodyRowContainer { + private class BodyRowContainerImpl extends AbstractRowContainer + implements BodyRowContainer { /* * TODO [[optimize]]: check whether a native JsArray might be faster * than LinkedList @@ -2338,13 +2355,14 @@ public class Escalator extends Widget implements RequiresResize, private void setTopRowLogicalIndex(int topRowLogicalIndex) { if (LogConfiguration.loggingIsEnabled(Level.INFO)) { - Logger.getLogger("Escalator.BodyRowContainer").fine( - "topRowLogicalIndex: " + this.topRowLogicalIndex + Logger.getLogger("Escalator.BodyRowContainer") + .fine("topRowLogicalIndex: " + this.topRowLogicalIndex + " -> " + topRowLogicalIndex); } assert topRowLogicalIndex >= 0 : "topRowLogicalIndex became negative (top left cell contents: " + visualRowOrder.getFirst().getCells().getItem(0) - .getInnerText() + ") "; + .getInnerText() + + ") "; /* * if there's a smart way of evaluating and asserting the max index, * this would be a nice place to put it. I haven't found out an @@ -2398,7 +2416,8 @@ public class Escalator extends Widget implements RequiresResize, private boolean sortIfConditionsMet() { boolean enoughFramesHavePassed = framesPassed >= REQUIRED_FRAMES_PASSED; - boolean enoughTimeHasPassed = (Duration.currentTimeMillis() - startTime) >= SORT_DELAY_MILLIS; + boolean enoughTimeHasPassed = (Duration.currentTimeMillis() + - startTime) >= SORT_DELAY_MILLIS; boolean notTouchActivity = !scroller.touchHandlerBundle.touching; boolean conditionsMet = enoughFramesHavePassed && enoughTimeHasPassed && notTouchActivity; @@ -2471,8 +2490,8 @@ public class Escalator extends Widget implements RequiresResize, double rowPx = getRowHeightsSumBetweenPx(scrollTop, topElementPosition); - int originalRowsToMove = (int) Math.ceil(rowPx - / getDefaultRowHeight()); + int originalRowsToMove = (int) Math + .ceil(rowPx / getDefaultRowHeight()); int rowsToMove = Math.min(originalRowsToMove, visualRowOrder.size()); @@ -2507,8 +2526,8 @@ public class Escalator extends Widget implements RequiresResize, * We scroll so little that we can just keep adding the rows * below the current escalator */ - logicalRowIndex = getLogicalRowIndex(visualRowOrder - .getLast()) + 1; + logicalRowIndex = getLogicalRowIndex( + visualRowOrder.getLast()) + 1; } else { /* * Since we're moving all escalator rows, we need to @@ -2573,8 +2592,8 @@ public class Escalator extends Widget implements RequiresResize, + originalRowsToMove; final int maxLogicalIndex = getRowCount() - visualRowOrder.size(); - setTopRowLogicalIndex(Math.min(naiveNewLogicalIndex, - maxLogicalIndex)); + setTopRowLogicalIndex( + Math.min(naiveNewLogicalIndex, maxLogicalIndex)); rowsWereMoved = true; } @@ -2602,7 +2621,8 @@ public class Escalator extends Widget implements RequiresResize, } @Override - protected void paintInsertRows(final int index, final int numberOfRows) { + protected void paintInsertRows(final int index, + final int numberOfRows) { if (numberOfRows == 0) { return; } @@ -2630,7 +2650,7 @@ public class Escalator extends Widget implements RequiresResize, * getDefaultRowHeight() < getScrollTop(); final boolean addedRowsBelowCurrentViewport = index * getDefaultRowHeight() > getScrollTop() - + getHeightOfSection(); + + getHeightOfSection(); if (addedRowsAboveCurrentViewport) { /* @@ -2651,8 +2671,8 @@ public class Escalator extends Widget implements RequiresResize, else { // some rows were added inside the current viewport final int unupdatedLogicalStart = index + addedRows.size(); - final int visualOffset = getLogicalRowIndex(visualRowOrder - .getFirst()); + final int visualOffset = getLogicalRowIndex( + visualRowOrder.getFirst()); /* * At this point, we have added new escalator rows, if so @@ -2665,8 +2685,9 @@ public class Escalator extends Widget implements RequiresResize, final int rowsStillNeeded = numberOfRows - addedRows.size(); if (rowsStillNeeded > 0) { - final Range unupdatedVisual = convertToVisual(Range - .withLength(unupdatedLogicalStart, rowsStillNeeded)); + final Range unupdatedVisual = convertToVisual( + Range.withLength(unupdatedLogicalStart, + rowsStillNeeded)); final int end = getDomRowCount(); final int start = end - unupdatedVisual.length(); final int visualTargetIndex = unupdatedLogicalStart @@ -2684,7 +2705,8 @@ public class Escalator extends Widget implements RequiresResize, // the order of operations is, in fact, wrong. try { final ListIterator<TableRowElement> i = visualRowOrder - .listIterator(visualTargetIndex + (end - start)); + .listIterator( + visualTargetIndex + (end - start)); int logicalRowIndexCursor = unupdatedLogicalStart; while (i.hasNext()) { @@ -2697,11 +2719,11 @@ public class Escalator extends Widget implements RequiresResize, } } catch (Exception e) { Logger logger = getLogger(); - logger.warning("Ignored out-of-bounds row element access"); + logger.warning( + "Ignored out-of-bounds row element access"); logger.warning("Escalator state: start=" + start + ", end=" + end + ", visualTargetIndex=" - + visualTargetIndex - + ", visualRowOrder.size()=" + + visualTargetIndex + ", visualRowOrder.size()=" + visualRowOrder.size()); logger.warning(e.toString()); } @@ -2743,15 +2765,16 @@ public class Escalator extends Widget implements RequiresResize, assert visualTargetIndex <= getDomRowCount() : "Visual target " + "must not be greater than the number of escalator rows (was " - + visualTargetIndex + ", escalator rows " - + getDomRowCount() + ")"; + + visualTargetIndex + ", escalator rows " + getDomRowCount() + + ")"; - assert logicalTargetIndex + visualSourceRange.length() <= getRowCount() : "Logical " - + "target leads to rows outside of the data range (" - + Range.withLength(logicalTargetIndex, - visualSourceRange.length()) - + " goes beyond " - + Range.withLength(0, getRowCount()) + ")"; + assert logicalTargetIndex + + visualSourceRange.length() <= getRowCount() : "Logical " + + "target leads to rows outside of the data range (" + + Range.withLength(logicalTargetIndex, + visualSourceRange.length()) + + " goes beyond " + + Range.withLength(0, getRowCount()) + ")"; /* * Since we move a range into another range, the indices might move @@ -2940,14 +2963,15 @@ public class Escalator extends Widget implements RequiresResize, } @Override - protected void paintRemoveRows(final int index, final int numberOfRows) { + protected void paintRemoveRows(final int index, + final int numberOfRows) { if (numberOfRows == 0) { return; } final Range viewportRange = getVisibleRowRange(); - final Range removedRowsRange = Range - .withLength(index, numberOfRows); + final Range removedRowsRange = Range.withLength(index, + numberOfRows); /* * Removing spacers as the very first step will correct the @@ -2965,7 +2989,8 @@ public class Escalator extends Widget implements RequiresResize, .partitionWith(viewportRange); final Range removedAbove = partitions[0]; final Range removedLogicalInside = partitions[1]; - final Range removedVisualInside = convertToVisual(removedLogicalInside); + final Range removedVisualInside = convertToVisual( + removedLogicalInside); /* * TODO: extract the following if-block to a separate method. I'll @@ -3000,7 +3025,8 @@ public class Escalator extends Widget implements RequiresResize, .getScrollPos() - yDelta < firstLogicalRowHeight; if (removedVisualInside.isEmpty() - && (!removalScrollsToShowFirstLogicalRow || !firstVisualRowIsRemoved)) { + && (!removalScrollsToShowFirstLogicalRow + || !firstVisualRowIsRemoved)) { /* * rows were removed from above the viewport, so all we need * to do is to adjust the scroll position to account for the @@ -3066,8 +3092,8 @@ public class Escalator extends Widget implements RequiresResize, */ final int rowsToUpdateDataOn = numberOfRows - escalatorRowsToRemove; - final int start = Math.max(0, escalatorRowCount - - rowsToUpdateDataOn); + final int start = Math.max(0, + escalatorRowCount - rowsToUpdateDataOn); final int end = escalatorRowCount; for (int i = start; i < end; i++) { final TableRowElement tr = visualRowOrder.get(i); @@ -3119,8 +3145,8 @@ public class Escalator extends Widget implements RequiresResize, */ double left = horizontalScrollbar.getScrollPos(); - double top = contentBottom - visualRowOrder.size() - * getDefaultRowHeight(); + double top = contentBottom + - visualRowOrder.size() * getDefaultRowHeight(); setBodyScrollPosition(left, top); Range allEscalatorRows = Range.withLength(0, @@ -3137,7 +3163,8 @@ public class Escalator extends Widget implements RequiresResize, * * TODO: Redesign how to keep it easy to track this. */ - updateTopRowLogicalIndex(-removedLogicalInside.length()); + updateTopRowLogicalIndex( + -removedLogicalInside.length()); /* * Scrolling the body to the correct location will be @@ -3166,7 +3193,8 @@ public class Escalator extends Widget implements RequiresResize, paintRemoveRowsAtBottom(removedLogicalInside, removedVisualInside); - updateTopRowLogicalIndex(-removedLogicalInside.length()); + updateTopRowLogicalIndex( + -removedLogicalInside.length()); } else { @@ -3219,12 +3247,13 @@ public class Escalator extends Widget implements RequiresResize, visualRowOrder.addLast(tr); } - for (int i = removedVisualInside.getStart(); i < escalatorRowCount; i++) { + for (int i = removedVisualInside + .getStart(); i < escalatorRowCount; i++) { final TableRowElement tr = visualRowOrder.get(i); setRowPosition(tr, 0, (int) newTop); newTop += getDefaultRowHeight(); - newTop += spacerContainer.getSpacerHeight(i - + removedLogicalInside.getStart()); + newTop += spacerContainer.getSpacerHeight( + i + removedLogicalInside.getStart()); } /* @@ -3254,9 +3283,9 @@ public class Escalator extends Widget implements RequiresResize, * automatically */ moveAndUpdateEscalatorRows( - Range.withOnly(escalatorRowCount - 1), - 0, - getLogicalRowIndex(visualRowOrder.getFirst()) - 1); + Range.withOnly(escalatorRowCount - 1), 0, + getLogicalRowIndex(visualRowOrder.getFirst()) + - 1); updateTopRowLogicalIndex(-1); /* @@ -3279,8 +3308,8 @@ public class Escalator extends Widget implements RequiresResize, - (removedVisualInside.length() - rowsScrolled); final Range visualRefreshRange = Range.between(start, escalatorRowCount); - final int logicalTargetIndex = getLogicalRowIndex(visualRowOrder - .getFirst()) + start; + final int logicalTargetIndex = getLogicalRowIndex( + visualRowOrder.getFirst()) + start; // in-place move simply re-renders the rows. moveAndUpdateEscalatorRows(visualRefreshRange, start, logicalTargetIndex); @@ -3312,10 +3341,9 @@ public class Escalator extends Widget implements RequiresResize, final int escalatorRowCount = visualRowOrder.size(); - final int logicalTargetIndex = getLogicalRowIndex(visualRowOrder - .getLast()) - - (removedVisualInside.length() - 1) - + logicalOffset; + final int logicalTargetIndex = getLogicalRowIndex( + visualRowOrder.getLast()) + - (removedVisualInside.length() - 1) + logicalOffset; moveAndUpdateEscalatorRows(removedVisualInside, escalatorRowCount, logicalTargetIndex); @@ -3323,15 +3351,15 @@ public class Escalator extends Widget implements RequiresResize, final ListIterator<TableRowElement> iterator = visualRowOrder .listIterator(removedVisualInside.getStart()); - double rowTop = getRowTop(removedLogicalInside.getStart() - + logicalOffset); + double rowTop = getRowTop( + removedLogicalInside.getStart() + logicalOffset); for (int i = removedVisualInside.getStart(); i < escalatorRowCount - removedVisualInside.length(); i++) { final TableRowElement tr = iterator.next(); setRowPosition(tr, 0, rowTop); rowTop += getDefaultRowHeight(); - rowTop += spacerContainer.getSpacerHeight(i - + removedLogicalInside.getStart()); + rowTop += spacerContainer + .getSpacerHeight(i + removedLogicalInside.getStart()); } } @@ -3345,8 +3373,8 @@ public class Escalator extends Widget implements RequiresResize, * |7| |7| */ - final int logicalTargetIndex = getLogicalRowIndex(visualRowOrder - .getFirst()) - removedVisualInside.length(); + final int logicalTargetIndex = getLogicalRowIndex( + visualRowOrder.getFirst()) - removedVisualInside.length(); moveAndUpdateEscalatorRows(removedVisualInside, 0, logicalTargetIndex); @@ -3361,14 +3389,15 @@ public class Escalator extends Widget implements RequiresResize, final TableRowElement tr = iterator.next(); setRowPosition(tr, 0, rowTop); rowTop += getDefaultRowHeight(); - rowTop += spacerContainer.getSpacerHeight(firstUpdatedIndex - + i++); + rowTop += spacerContainer + .getSpacerHeight(firstUpdatedIndex + i++); } } @Override protected int getLogicalRowIndex(final TableRowElement tr) { - assert tr.getParentNode() == root : "The given element isn't a row element in the body"; + assert tr + .getParentNode() == root : "The given element isn't a row element in the body"; int internalIndex = visualRowOrder.indexOf(tr); return getTopRowLogicalIndex() + internalIndex; } @@ -3414,11 +3443,11 @@ public class Escalator extends Widget implements RequiresResize, * spacers. */ final int maxEscalatorRows = getMaxEscalatorRowCapacity(); - final int currentTopRowIndex = getLogicalRowIndex(visualRowOrder - .getFirst()); + final int currentTopRowIndex = getLogicalRowIndex( + visualRowOrder.getFirst()); - final Range[] partitions = logicalRange.partitionWith(Range - .withLength(currentTopRowIndex, maxEscalatorRows)); + final Range[] partitions = logicalRange.partitionWith( + Range.withLength(currentTopRowIndex, maxEscalatorRows)); final Range insideRange = partitions[1]; return insideRange.offsetBy(-currentTopRowIndex); } @@ -3445,10 +3474,11 @@ public class Escalator extends Widget implements RequiresResize, final Range visualRange = convertToVisual(logicalRowRange); if (!visualRange.isEmpty()) { - final int firstLogicalRowIndex = getLogicalRowIndex(visualRowOrder - .getFirst()); - for (int rowNumber = visualRange.getStart(); rowNumber < visualRange - .getEnd(); rowNumber++) { + final int firstLogicalRowIndex = getLogicalRowIndex( + visualRowOrder.getFirst()); + for (int rowNumber = visualRange + .getStart(); rowNumber < visualRange + .getEnd(); rowNumber++) { refreshRow(visualRowOrder.get(rowNumber), firstLogicalRowIndex + rowNumber, colRange); } @@ -3463,16 +3493,16 @@ public class Escalator extends Widget implements RequiresResize, if (index >= 0 && index < visualRowOrder.size()) { return visualRowOrder.get(index); } else { - throw new IndexOutOfBoundsException("No such visual index: " - + index); + throw new IndexOutOfBoundsException( + "No such visual index: " + index); } } @Override public TableRowElement getRowElement(int index) { if (index < 0 || index >= getRowCount()) { - throw new IndexOutOfBoundsException("No such logical index: " - + index); + throw new IndexOutOfBoundsException( + "No such logical index: " + index); } int visualIndex = index - getLogicalRowIndex(visualRowOrder.getFirst()); @@ -3547,8 +3577,8 @@ public class Escalator extends Widget implements RequiresResize, final int index = visualRowOrder.size(); final int nextLastLogicalIndex; if (!visualRowOrder.isEmpty()) { - nextLastLogicalIndex = getLogicalRowIndex(visualRowOrder - .getLast()) + 1; + nextLastLogicalIndex = getLogicalRowIndex( + visualRowOrder.getLast()) + 1; } else { nextLastLogicalIndex = 0; } @@ -3630,13 +3660,13 @@ public class Escalator extends Widget implements RequiresResize, */ if (!visualRowOrder.isEmpty()) { - final double firstRowTop = getRowTop(visualRowOrder - .getFirst()); + final double firstRowTop = getRowTop( + visualRowOrder.getFirst()); final double firstRowMinTop = tBodyScrollTop - getDefaultRowHeight(); if (firstRowTop < firstRowMinTop) { - final int newLogicalIndex = getLogicalRowIndex(visualRowOrder - .getLast()) + 1; + final int newLogicalIndex = getLogicalRowIndex( + visualRowOrder.getLast()) + 1; moveAndUpdateEscalatorRows(Range.withOnly(0), visualRowOrder.size(), newLogicalIndex); } @@ -3656,7 +3686,8 @@ public class Escalator extends Widget implements RequiresResize, return; } - Profiler.enter("Escalator.BodyRowContainer.reapplyDefaultRowHeights"); + Profiler.enter( + "Escalator.BodyRowContainer.reapplyDefaultRowHeights"); /* step 1: resize and reposition rows */ for (int i = 0; i < visualRowOrder.size(); i++) { @@ -3686,13 +3717,17 @@ public class Escalator extends Widget implements RequiresResize, verticalScrollbar.getScrollPos()); scroller.onScroll(); - /* step 3: make sure we have the correct amount of escalator rows. */ + /* + * step 3: make sure we have the correct amount of escalator rows. + */ verifyEscalatorCount(); - int logicalLogical = (int) (getRowTop(visualRowOrder.getFirst()) / getDefaultRowHeight()); + int logicalLogical = (int) (getRowTop(visualRowOrder.getFirst()) + / getDefaultRowHeight()); setTopRowLogicalIndex(logicalLogical); - Profiler.leave("Escalator.BodyRowContainer.reapplyDefaultRowHeights"); + Profiler.leave( + "Escalator.BodyRowContainer.reapplyDefaultRowHeights"); } /** @@ -3712,9 +3747,11 @@ public class Escalator extends Widget implements RequiresResize, final TableRowElement focusedRow = getRowWithFocus(); if (focusedRow != null) { - assert focusedRow.getParentElement() == root : "Trying to sort around a row that doesn't exist in body"; + assert focusedRow + .getParentElement() == root : "Trying to sort around a row that doesn't exist in body"; assert visualRowOrder.contains(focusedRow) - || body.spacerContainer.isSpacer(focusedRow) : "Trying to sort around a row that doesn't exist in visualRowOrder or is not a spacer."; + || body.spacerContainer.isSpacer( + focusedRow) : "Trying to sort around a row that doesn't exist in visualRowOrder or is not a spacer."; } /* @@ -3745,8 +3782,8 @@ public class Escalator extends Widget implements RequiresResize, * viewport, but its parent row is still not shown */ for (int i = -1; i < visualRowOrder.size(); i++) { - SpacerContainer.SpacerImpl spacer = spacers.remove(Integer - .valueOf(getTopRowLogicalIndex() + i)); + SpacerContainer.SpacerImpl spacer = spacers + .remove(Integer.valueOf(getTopRowLogicalIndex() + i)); if (spacer != null) { orderedBodyRows.add(i + 1, spacer.getRootElement()); @@ -3887,10 +3924,11 @@ public class Escalator extends Widget implements RequiresResize, } else if (noRowsAreInView) { return Collections.emptyList(); } else { - int fromIndex = (logicalRow - visibleRowLogicalRange.getStart()) + 1; + int fromIndex = (logicalRow - visibleRowLogicalRange.getStart()) + + 1; int toIndex = visibleRowLogicalRange.length(); - List<TableRowElement> sublist = visualRowOrder.subList( - fromIndex, toIndex); + List<TableRowElement> sublist = visualRowOrder + .subList(fromIndex, toIndex); return Collections.unmodifiableList(sublist); } } @@ -4078,16 +4116,17 @@ public class Escalator extends Widget implements RequiresResize, } } - private void removeColumnsAdjustScrollbar(int index, int numberOfColumns) { + private void removeColumnsAdjustScrollbar(int index, + int numberOfColumns) { if (horizontalScrollbar.getOffsetSize() >= horizontalScrollbar .getScrollSize()) { return; } - double leftPosOfFirstColumnToRemove = getCalculatedColumnsWidth(Range - .between(0, index)); - double widthOfColumnsToRemove = getCalculatedColumnsWidth(Range - .withLength(index, numberOfColumns)); + double leftPosOfFirstColumnToRemove = getCalculatedColumnsWidth( + Range.between(0, index)); + double widthOfColumnsToRemove = getCalculatedColumnsWidth( + Range.withLength(index, numberOfColumns)); double scrollLeft = horizontalScrollbar.getScrollPos(); @@ -4110,7 +4149,8 @@ public class Escalator extends Widget implements RequiresResize, * @return the width of a row, in pixels */ public double calculateRowWidth() { - return getCalculatedColumnsWidth(Range.between(0, getColumnCount())); + return getCalculatedColumnsWidth( + Range.between(0, getColumnCount())); } private void assertArgumentsAreValidAndWithinRange(final int index, @@ -4167,11 +4207,11 @@ public class Escalator extends Widget implements RequiresResize, } // this needs to be before the scrollbar adjustment. - boolean scrollbarWasNeeded = horizontalScrollbar.getOffsetSize() < horizontalScrollbar - .getScrollSize(); + boolean scrollbarWasNeeded = horizontalScrollbar + .getOffsetSize() < horizontalScrollbar.getScrollSize(); scroller.recalculateScrollbarsForVirtualViewport(); - boolean scrollbarIsNowNeeded = horizontalScrollbar.getOffsetSize() < horizontalScrollbar - .getScrollSize(); + boolean scrollbarIsNowNeeded = horizontalScrollbar + .getOffsetSize() < horizontalScrollbar.getScrollSize(); if (!scrollbarWasNeeded && scrollbarIsNowNeeded) { body.verifyEscalatorCount(); } @@ -4201,10 +4241,10 @@ public class Escalator extends Widget implements RequiresResize, if (columnsWereAddedToTheLeftOfViewport) { double insertedColumnsWidth = columnConfiguration - .getCalculatedColumnsWidth(Range.withLength(index, - numberOfColumns)); - horizontalScrollbar.setScrollPos(scroller.lastScrollLeft - + insertedColumnsWidth); + .getCalculatedColumnsWidth( + Range.withLength(index, numberOfColumns)); + horizontalScrollbar.setScrollPos( + scroller.lastScrollLeft + insertedColumnsWidth); } /* @@ -4329,7 +4369,8 @@ public class Escalator extends Widget implements RequiresResize, } @Override - public double getColumnWidth(int index) throws IllegalArgumentException { + public double getColumnWidth(int index) + throws IllegalArgumentException { checkValidColumnIndex(index); return columns.get(index).getDefinedWidth(); } @@ -4376,11 +4417,11 @@ public class Escalator extends Widget implements RequiresResize, * This is an assert instead of an exception, since this is an * internal method. */ - assert columns.isSubsetOf(Range.between(0, getColumnCount())) : "Range " - + "was outside of current column range (i.e.: " - + Range.between(0, getColumnCount()) - + ", but was given :" - + columns; + assert columns + .isSubsetOf(Range.between(0, getColumnCount())) : "Range " + + "was outside of current column range (i.e.: " + + Range.between(0, getColumnCount()) + + ", but was given :" + columns; double sum = 0; for (int i = columns.getStart(); i < columns.getEnd(); i++) { @@ -4410,11 +4451,11 @@ public class Escalator extends Widget implements RequiresResize, } if (index < 0 || index + numberOfColumns > getColumnCount()) { - throw new IndexOutOfBoundsException("The given " - + "column range (" + index + ".." - + (index + numberOfColumns) - + ") was outside of the current number of columns (" - + getColumnCount() + ")"); + throw new IndexOutOfBoundsException( + "The given " + "column range (" + index + ".." + + (index + numberOfColumns) + + ") was outside of the current number of columns (" + + getColumnCount() + ")"); } header.refreshColumns(index, numberOfColumns); @@ -4472,14 +4513,15 @@ public class Escalator extends Widget implements RequiresResize, public void setupDom(double height) { assert !domHasBeenSetup : "DOM can't be set up twice."; - assert RootPanel.get().getElement().isOrHasChild(root) : "Root element should've been attached to the DOM by now."; + assert RootPanel.get().getElement().isOrHasChild( + root) : "Root element should've been attached to the DOM by now."; domHasBeenSetup = true; getRootElement().getStyle().setWidth(getInnerWidth(), Unit.PX); setHeight(height); - spacerElement.setColSpan(getColumnConfiguration() - .getColumnCount()); + spacerElement + .setColSpan(getColumnConfiguration().getColumnCount()); setStylePrimaryName(getStylePrimaryName()); } @@ -4495,8 +4537,8 @@ public class Escalator extends Widget implements RequiresResize, public void setPosition(double x, double y) { positions.set(getRootElement(), x, y); - positions - .set(getDecoElement(), 0, y - getSpacerDecoTopOffset()); + positions.set(getDecoElement(), 0, + y - getSpacerDecoTopOffset()); } private double getSpacerDecoTopOffset() { @@ -4523,8 +4565,9 @@ public class Escalator extends Widget implements RequiresResize, // amount of the border thickness if (defaultCellBorderBottomSize < 0) { defaultCellBorderBottomSize = WidgetUtil - .getBorderBottomThickness(body.getRowElement( - getVisibleRowRange().getStart()) + .getBorderBottomThickness(body + .getRowElement( + getVisibleRowRange().getStart()) .getFirstChildElement()); } root.getStyle().setHeight(height + defaultCellBorderBottomSize, @@ -4540,8 +4583,8 @@ public class Escalator extends Widget implements RequiresResize, */ boolean spacerIsGrowing = heightDiff > 0; if (spacerIsGrowing) { - verticalScrollbar.setScrollSize(verticalScrollbar - .getScrollSize() + heightDiff); + verticalScrollbar.setScrollSize( + verticalScrollbar.getScrollSize() + heightDiff); } /* @@ -4566,8 +4609,8 @@ public class Escalator extends Widget implements RequiresResize, */ for (TableRowElement row : body.visualRowOrder) { - body.setRowPosition(row, 0, body.getRowTop(row) - + heightDiff); + body.setRowPosition(row, 0, + body.getRowTop(row) + heightDiff); } double top = getTop(); @@ -4593,8 +4636,8 @@ public class Escalator extends Widget implements RequiresResize, } else { moveDiff = heightDiff; } - body.setBodyScrollPosition(tBodyScrollLeft, tBodyScrollTop - + moveDiff); + body.setBodyScrollPosition(tBodyScrollLeft, + tBodyScrollTop + moveDiff); verticalScrollbar.setScrollPosByDelta(moveDiff); } else { @@ -4602,8 +4645,8 @@ public class Escalator extends Widget implements RequiresResize, } if (!spacerIsGrowing) { - verticalScrollbar.setScrollSize(verticalScrollbar - .getScrollSize() + heightDiff); + verticalScrollbar.setScrollSize( + verticalScrollbar.getScrollSize() + heightDiff); } updateDecoratorGeometry(height); @@ -4792,8 +4835,8 @@ public class Escalator extends Widget implements RequiresResize, || padding != 0 : "destination/padding check should be done before this method"; if (!rowIndexToSpacer.containsKey(spacerIndex)) { - throw new IllegalArgumentException("No spacer open at index " - + spacerIndex); + throw new IllegalArgumentException( + "No spacer open at index " + spacerIndex); } SpacerImpl spacer = rowIndexToSpacer.get(spacerIndex); @@ -4827,9 +4870,9 @@ public class Escalator extends Widget implements RequiresResize, @SuppressWarnings("boxing") public void removeSpacers(Range removedRange) { - Map<Integer, SpacerImpl> removedSpacers = rowIndexToSpacer - .subMap(removedRange.getStart(), true, - removedRange.getEnd(), false); + Map<Integer, SpacerImpl> removedSpacers = rowIndexToSpacer.subMap( + removedRange.getStart(), true, removedRange.getEnd(), + false); if (removedSpacers.isEmpty()) { return; @@ -4881,8 +4924,8 @@ public class Escalator extends Widget implements RequiresResize, @SuppressWarnings("boxing") public Collection<SpacerImpl> getSpacersForRowAndAfter( int logicalRowIndex) { - return new ArrayList<SpacerImpl>(rowIndexToSpacer.tailMap( - logicalRowIndex, true).values()); + return new ArrayList<SpacerImpl>( + rowIndexToSpacer.tailMap(logicalRowIndex, true).values()); } /** @@ -5004,7 +5047,8 @@ public class Escalator extends Widget implements RequiresResize, && bottom <= rangeBottom; boolean bottomIsBelowRange = rangeBottom < bottom; - assert topIsAboveRange ^ topIsBelowRange ^ topIsInRange : "Bad top logic"; + assert topIsAboveRange ^ topIsBelowRange + ^ topIsInRange : "Bad top logic"; assert bottomIsAboveRange ^ bottomIsBelowRange ^ bottomIsInRange : "Bad bottom logic"; @@ -5097,8 +5141,8 @@ public class Escalator extends Widget implements RequiresResize, */ @SuppressWarnings("boxing") public double getSpacerHeightsSumUntilIndex(int logicalIndex) { - return getHeights(rowIndexToSpacer.headMap(logicalIndex, false) - .values()); + return getHeights( + rowIndexToSpacer.headMap(logicalIndex, false).values()); } private double getHeights(Collection<SpacerImpl> spacers) { @@ -5145,8 +5189,8 @@ public class Escalator extends Widget implements RequiresResize, calculateSpacerTop(rowIndex)); TableRowElement spacerRoot = spacer.getRootElement(); - spacerRoot.getStyle().setWidth( - columnConfiguration.calculateRowWidth(), Unit.PX); + spacerRoot.getStyle() + .setWidth(columnConfiguration.calculateRowWidth(), Unit.PX); body.getElement().appendChild(spacerRoot); spacer.setupDom(height); // set the deco position, requires that spacer is in the DOM @@ -5158,8 +5202,8 @@ public class Escalator extends Widget implements RequiresResize, getElement().appendChild(spacerDecoContainer); // calculate the spacer deco width, it won't change spacerDecoWidth = WidgetUtil - .getRequiredWidthBoundingClientRectDouble(spacer - .getDecoElement()); + .getRequiredWidthBoundingClientRectDouble( + spacer.getDecoElement()); } initSpacerContent(spacer); @@ -5208,11 +5252,15 @@ public class Escalator extends Widget implements RequiresResize, } private void destroySpacerContent(SpacerImpl spacer) { - assert getElement().isOrHasChild(spacer.getRootElement()) : "Spacer's root element somehow got detached from Escalator before detaching"; - assert getElement().isOrHasChild(spacer.getElement()) : "Spacer element somehow got detached from Escalator before detaching"; + assert getElement().isOrHasChild(spacer + .getRootElement()) : "Spacer's root element somehow got detached from Escalator before detaching"; + assert getElement().isOrHasChild(spacer + .getElement()) : "Spacer element somehow got detached from Escalator before detaching"; spacerUpdater.destroy(spacer); - assert getElement().isOrHasChild(spacer.getRootElement()) : "Spacer's root element somehow got detached from Escalator before detaching"; - assert getElement().isOrHasChild(spacer.getElement()) : "Spacer element somehow got detached from Escalator before detaching"; + assert getElement().isOrHasChild(spacer + .getRootElement()) : "Spacer's root element somehow got detached from Escalator before detaching"; + assert getElement().isOrHasChild(spacer + .getElement()) : "Spacer element somehow got detached from Escalator before detaching"; } private void initSpacerContent(Iterable<SpacerImpl> spacers) { @@ -5222,11 +5270,15 @@ public class Escalator extends Widget implements RequiresResize, } private void initSpacerContent(SpacerImpl spacer) { - assert getElement().isOrHasChild(spacer.getRootElement()) : "Spacer's root element somehow got detached from Escalator before attaching"; - assert getElement().isOrHasChild(spacer.getElement()) : "Spacer element somehow got detached from Escalator before attaching"; + assert getElement().isOrHasChild(spacer + .getRootElement()) : "Spacer's root element somehow got detached from Escalator before attaching"; + assert getElement().isOrHasChild(spacer + .getElement()) : "Spacer element somehow got detached from Escalator before attaching"; spacerUpdater.init(spacer); - assert getElement().isOrHasChild(spacer.getRootElement()) : "Spacer's root element somehow got detached from Escalator during attaching"; - assert getElement().isOrHasChild(spacer.getElement()) : "Spacer element somehow got detached from Escalator during attaching"; + assert getElement().isOrHasChild(spacer + .getRootElement()) : "Spacer's root element somehow got detached from Escalator during attaching"; + assert getElement().isOrHasChild(spacer + .getElement()) : "Spacer element somehow got detached from Escalator during attaching"; spacer.updateVisibility(); } @@ -5256,8 +5308,8 @@ public class Escalator extends Widget implements RequiresResize, @SuppressWarnings("boxing") private void shiftSpacerPositionsAfterRow(int changedRowIndex, double diffPx) { - for (SpacerImpl spacer : rowIndexToSpacer.tailMap(changedRowIndex, - false).values()) { + for (SpacerImpl spacer : rowIndexToSpacer + .tailMap(changedRowIndex, false).values()) { spacer.setPositionDiff(0, diffPx); } } @@ -5279,7 +5331,8 @@ public class Escalator extends Widget implements RequiresResize, */ public void shiftSpacersByRows(int index, int numberOfRows) { final double pxDiff = numberOfRows * body.getDefaultRowHeight(); - for (SpacerContainer.SpacerImpl spacer : getSpacersForRowAndAfter(index)) { + for (SpacerContainer.SpacerImpl spacer : getSpacersForRowAndAfter( + index)) { spacer.setPositionDiff(0, pxDiff); spacer.setRowIndex(spacer.getRow() + numberOfRows); } @@ -5287,9 +5340,10 @@ public class Escalator extends Widget implements RequiresResize, private void updateSpacerDecosVisibility() { final Range visibleRowRange = getVisibleRowRange(); - Collection<SpacerImpl> visibleSpacers = rowIndexToSpacer.subMap( - visibleRowRange.getStart() - 1, - visibleRowRange.getEnd() + 1).values(); + Collection<SpacerImpl> visibleSpacers = rowIndexToSpacer + .subMap(visibleRowRange.getStart() - 1, + visibleRowRange.getEnd() + 1) + .values(); if (!visibleSpacers.isEmpty()) { final double top = tableWrapper.getAbsoluteTop() + header.getHeightOfSection(); @@ -5383,8 +5437,8 @@ public class Escalator extends Widget implements RequiresResize, int[] indices = new int[splitArgs.length - 1]; for (int i = 0; i < indices.length; ++i) { String tmp = splitArgs[i + 1]; - indices[i] = Integer.parseInt(tmp.substring(0, - tmp.indexOf("]", 1))); + indices[i] = Integer + .parseInt(tmp.substring(0, tmp.indexOf("]", 1))); } return new SubPartArguments(type, indices); } @@ -5418,14 +5472,14 @@ public class Escalator extends Widget implements RequiresResize, private FlyweightRow flyweightRow = new FlyweightRow(); /** The {@code <thead/>} tag. */ - private final TableSectionElement headElem = TableSectionElement.as(DOM - .createTHead()); + private final TableSectionElement headElem = TableSectionElement + .as(DOM.createTHead()); /** The {@code <tbody/>} tag. */ - private final TableSectionElement bodyElem = TableSectionElement.as(DOM - .createTBody()); + private final TableSectionElement bodyElem = TableSectionElement + .as(DOM.createTBody()); /** The {@code <tfoot/>} tag. */ - private final TableSectionElement footElem = TableSectionElement.as(DOM - .createTFoot()); + private final TableSectionElement footElem = TableSectionElement + .as(DOM.createTFoot()); /** * TODO: investigate whether this field is now unnecessary, as @@ -5449,7 +5503,8 @@ public class Escalator extends Widget implements RequiresResize, private final HorizontalScrollbarBundle horizontalScrollbar = new HorizontalScrollbarBundle(); private final HeaderRowContainer header = new HeaderRowContainer(headElem); - private final BodyRowContainerImpl body = new BodyRowContainerImpl(bodyElem); + private final BodyRowContainerImpl body = new BodyRowContainerImpl( + bodyElem); private final FooterRowContainer footer = new FooterRowContainer(footElem); /** @@ -5462,12 +5517,12 @@ public class Escalator extends Widget implements RequiresResize, private final ColumnConfigurationImpl columnConfiguration = new ColumnConfigurationImpl(); private final DivElement tableWrapper; - private final DivElement horizontalScrollbarDeco = DivElement.as(DOM - .createDiv()); + private final DivElement horizontalScrollbarDeco = DivElement + .as(DOM.createDiv()); private final DivElement headerDeco = DivElement.as(DOM.createDiv()); private final DivElement footerDeco = DivElement.as(DOM.createDiv()); - private final DivElement spacerDecoContainer = DivElement.as(DOM - .createDiv()); + private final DivElement spacerDecoContainer = DivElement + .as(DOM.createDiv()); private PositionFunction position; @@ -5501,9 +5556,8 @@ public class Escalator extends Widget implements RequiresResize, public Escalator() { detectAndApplyPositionFunction(); - getLogger().info( - "Using " + position.getClass().getSimpleName() - + " for position"); + getLogger().info("Using " + position.getClass().getSimpleName() + + " for position"); final Element root = DOM.createDiv(); setElement(root); @@ -5584,8 +5638,8 @@ public class Escalator extends Widget implements RequiresResize, * http://edskes.net/ie/ie8overflowandexpandingboxbugs.htm */ Style vScrollStyle = verticalScrollbar.getElement().getStyle(); - vScrollStyle.setRight( - verticalScrollbar.getScrollbarThickness() - 1, Unit.PX); + vScrollStyle.setRight(verticalScrollbar.getScrollbarThickness() - 1, + Unit.PX); } root.appendChild(horizontalScrollbar.getElement()); @@ -5776,8 +5830,9 @@ public class Escalator extends Widget implements RequiresResize, * are columns */ private boolean hasColumnAndRowData() { - return (header.getRowCount() > 0 || body.getRowCount() > 0 || footer - .getRowCount() > 0) && columnConfiguration.getColumnCount() > 0; + return (header.getRowCount() > 0 || body.getRowCount() > 0 + || footer.getRowCount() > 0) + && columnConfiguration.getColumnCount() > 0; } /** @@ -5987,8 +6042,8 @@ public class Escalator extends Widget implements RequiresResize, verifyValidColumnIndex(columnIndex); if (columnIndex < columnConfiguration.frozenColumns) { - throw new IllegalArgumentException("The given column index " - + columnIndex + " is frozen."); + throw new IllegalArgumentException( + "The given column index " + columnIndex + " is frozen."); } scroller.scrollToColumn(columnIndex, destination, padding); @@ -6038,8 +6093,8 @@ public class Escalator extends Widget implements RequiresResize, private void verifyValidRowIndex(final int rowIndex) { if (rowIndex < 0 || rowIndex >= body.getRowCount()) { - throw new IndexOutOfBoundsException("The given row index " - + rowIndex + " does not exist."); + throw new IndexOutOfBoundsException( + "The given row index " + rowIndex + " does not exist."); } } @@ -6129,7 +6184,8 @@ public class Escalator extends Widget implements RequiresResize, final Range targetRange; if (spacer != null) { final int spacerTop = (int) Math.floor(spacer.getTop()); - final int spacerHeight = (int) Math.ceil(spacer.getHeight()); + final int spacerHeight = (int) Math + .ceil(spacer.getHeight()); Range spacerRange = Range.withLength(spacerTop, spacerHeight); @@ -6207,8 +6263,8 @@ public class Escalator extends Widget implements RequiresResize, * the threshold in ratio (0..1) between x and y for when to snap * @return a two-element array: <code>[snappedX, snappedY]</code> */ - private static double[] snapDeltas(final double deltaX, - final double deltaY, final double thresholdRatio) { + private static double[] snapDeltas(final double deltaX, final double deltaY, + final double thresholdRatio) { final double[] array = new double[2]; if (deltaX != 0 && deltaY != 0) { @@ -6244,10 +6300,10 @@ public class Escalator extends Widget implements RequiresResize, private void fireRowVisibilityChangeEvent() { if (!body.visualRowOrder.isEmpty()) { - int visibleRangeStart = body.getLogicalRowIndex(body.visualRowOrder - .getFirst()); - int visibleRangeEnd = body.getLogicalRowIndex(body.visualRowOrder - .getLast()) + 1; + int visibleRangeStart = body + .getLogicalRowIndex(body.visualRowOrder.getFirst()); + int visibleRangeEnd = body + .getLogicalRowIndex(body.visualRowOrder.getLast()) + 1; int visibleRowCount = visibleRangeEnd - visibleRangeStart; fireEvent(new RowVisibilityChangeEvent(visibleRangeStart, @@ -6306,10 +6362,10 @@ public class Escalator extends Widget implements RequiresResize, UIObject.setStylePrimaryName(tableWrapper, style + "-tablewrapper"); UIObject.setStylePrimaryName(headerDeco, style + "-header-deco"); UIObject.setStylePrimaryName(footerDeco, style + "-footer-deco"); - UIObject.setStylePrimaryName(horizontalScrollbarDeco, style - + "-horizontal-scrollbar-deco"); - UIObject.setStylePrimaryName(spacerDecoContainer, style - + "-spacer-deco-container"); + UIObject.setStylePrimaryName(horizontalScrollbarDeco, + style + "-horizontal-scrollbar-deco"); + UIObject.setStylePrimaryName(spacerDecoContainer, + style + "-spacer-deco-container"); header.setStylePrimaryName(style); body.setStylePrimaryName(style); @@ -6326,9 +6382,8 @@ public class Escalator extends Widget implements RequiresResize, * @param rows * the number of rows that should be visible in Escalator's body * @throws IllegalArgumentException - * if {@code rows} is ≤ 0, - * {@link Double#isInifinite(double) infinite} or - * {@link Double#isNaN(double) NaN}. + * if {@code rows} is ≤ 0, {@link Double#isInifinite(double) + * infinite} or {@link Double#isNaN(double) NaN}. * @see #setHeightMode(HeightMode) */ public void setHeightByRows(double rows) throws IllegalArgumentException { @@ -6364,15 +6419,16 @@ public class Escalator extends Widget implements RequiresResize, * define its height that way. */ private void applyHeightByRows() { - if (heightMode != HeightMode.ROW && heightMode != HeightMode.UNDEFINED) { + if (heightMode != HeightMode.ROW + && heightMode != HeightMode.UNDEFINED) { return; } double headerHeight = header.getHeightOfSection(); double footerHeight = footer.getHeightOfSection(); double bodyHeight = body.getDefaultRowHeight() * heightByRows; - double scrollbar = horizontalScrollbar.showsScrollHandle() ? horizontalScrollbar - .getScrollbarThickness() : 0; + double scrollbar = horizontalScrollbar.showsScrollHandle() + ? horizontalScrollbar.getScrollbarThickness() : 0; double spacerHeight = 0; // ignored if HeightMode.ROW if (heightMode == HeightMode.UNDEFINED) { spacerHeight = body.spacerContainer.getSpacerHeightsSum(); @@ -6484,8 +6540,8 @@ public class Escalator extends Widget implements RequiresResize, verticalScrollbar.setLocked(locked); break; default: - throw new UnsupportedOperationException("Unexpected value: " - + direction); + throw new UnsupportedOperationException( + "Unexpected value: " + direction); } } @@ -6503,8 +6559,8 @@ public class Escalator extends Widget implements RequiresResize, case VERTICAL: return verticalScrollbar.isLocked(); default: - throw new UnsupportedOperationException("Unexpected value: " - + direction); + throw new UnsupportedOperationException( + "Unexpected value: " + direction); } } @@ -6578,7 +6634,8 @@ public class Escalator extends Widget implements RequiresResize, @Override @SuppressWarnings("deprecation") - public com.google.gwt.user.client.Element getSubPartElement(String subPart) { + public com.google.gwt.user.client.Element getSubPartElement( + String subPart) { SubPartArguments args = SubPartArguments.create(subPart); Element tableStructureElement = getSubPartElementTableStructure(args); @@ -6656,7 +6713,8 @@ public class Escalator extends Widget implements RequiresResize, return targetElement; } - private static Element getCellFromRow(TableRowElement rowElement, int index) { + private static Element getCellFromRow(TableRowElement rowElement, + int index) { int childCount = rowElement.getCells().getLength(); if (index < 0 || index >= childCount) { return null; @@ -6689,7 +6747,8 @@ public class Escalator extends Widget implements RequiresResize, @Override @SuppressWarnings("deprecation") - public String getSubPartName(com.google.gwt.user.client.Element subElement) { + public String getSubPartName( + com.google.gwt.user.client.Element subElement) { /* * The spacer check needs to be before table structure check, because @@ -6718,9 +6777,9 @@ public class Escalator extends Widget implements RequiresResize, for (int i = 0; i < containers.size(); ++i) { RowContainer container = containers.get(i); - boolean containerRow = (subElement.getTagName().equalsIgnoreCase( - "tr") && subElement.getParentElement() == container - .getElement()); + boolean containerRow = (subElement.getTagName() + .equalsIgnoreCase("tr") + && subElement.getParentElement() == container.getElement()); if (containerRow) { /* * Wanted SubPart is row that is a child of containers root to diff --git a/client/src/main/java/com/vaadin/client/widgets/Grid.java b/client/src/main/java/com/vaadin/client/widgets/Grid.java index 7e5838be40..91d72518af 100644 --- a/client/src/main/java/com/vaadin/client/widgets/Grid.java +++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java @@ -224,8 +224,8 @@ import com.vaadin.shared.util.SharedUtil; * @since 7.4 * @author Vaadin Ltd */ -public class Grid<T> extends ResizeComposite implements - HasSelectionHandlers<T>, SubPartAware, DeferredWorker, Focusable, +public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, + SubPartAware, DeferredWorker, Focusable, com.google.gwt.user.client.ui.Focusable, HasWidgets, HasEnabled { private static final String STYLE_NAME = "v-grid"; @@ -359,7 +359,8 @@ public class Grid<T> extends ResizeComposite implements public Widget getWidget() { if (type != GridStaticCellType.WIDGET) { throw new IllegalStateException( - "Cannot fetch Widget from a cell with type " + type); + "Cannot fetch Widget from a cell with type " + + type); } return (Widget) content; } @@ -501,7 +502,8 @@ public class Grid<T> extends ResizeComposite implements for (Column<?, ?> column : columns) { if (!cells.containsKey(column)) { throw new IllegalArgumentException( - "Given column does not exists on row " + column); + "Given column does not exists on row " + + column); } else if (getCellGroupForColumn(column) != null) { throw new IllegalStateException( "Column is already in a group."); @@ -551,7 +553,8 @@ public class Grid<T> extends ResizeComposite implements return join(columns); } - private Set<Column<?, ?>> getCellGroupForColumn(Column<?, ?> column) { + private Set<Column<?, ?>> getCellGroupForColumn( + Column<?, ?> column) { for (Set<Column<?, ?>> group : cellGroups.keySet()) { if (group.contains(column)) { return group; @@ -818,8 +821,8 @@ public class Grid<T> extends ResizeComposite implements try { return rows.get(index); } catch (IndexOutOfBoundsException e) { - throw new IllegalArgumentException("Row with index " + index - + " does not exist"); + throw new IllegalArgumentException( + "Row with index " + index + " does not exist"); } } @@ -1340,8 +1343,8 @@ public class Grid<T> extends ResizeComposite implements private DivElement cellWrapper = DivElement.as(DOM.createDiv()); private DivElement frozenCellWrapper = DivElement.as(DOM.createDiv()); - private DivElement messageAndButtonsWrapper = DivElement.as(DOM - .createDiv()); + private DivElement messageAndButtonsWrapper = DivElement + .as(DOM.createDiv()); private DivElement messageWrapper = DivElement.as(DOM.createDiv()); private DivElement buttonsWrapper = DivElement.as(DOM.createDiv()); @@ -1571,12 +1574,13 @@ public class Grid<T> extends ResizeComposite implements } } if (columnIndex >= grid.getVisibleColumns().size()) { - throw new IllegalArgumentException("Edited column index " - + columnIndex - + " was bigger than visible column count."); + throw new IllegalArgumentException( + "Edited column index " + columnIndex + + " was bigger than visible column count."); } - if (this.rowIndex == rowIndex && focusedColumnIndex == columnIndex) { + if (this.rowIndex == rowIndex + && focusedColumnIndex == columnIndex) { // NO-OP return; } @@ -1618,9 +1622,8 @@ public class Grid<T> extends ResizeComposite implements } } }); - grid.scrollToRow(rowIndex, - isBuffered() ? ScrollDestination.MIDDLE - : ScrollDestination.ANY); + grid.scrollToRow(rowIndex, isBuffered() + ? ScrollDestination.MIDDLE : ScrollDestination.ANY); } } @@ -1658,8 +1661,8 @@ public class Grid<T> extends ResizeComposite implements private void updateSelectionCheckboxesAsNeeded(boolean isEnabled) { // FIXME: This is too much guessing. Define a better way to do this. - if (grid.selectionColumn != null - && grid.selectionColumn.getRenderer() instanceof MultiSelectionRenderer) { + if (grid.selectionColumn != null && grid.selectionColumn + .getRenderer() instanceof MultiSelectionRenderer) { grid.refreshBody(); CheckBox checkBox = (CheckBox) grid.getDefaultHeaderRow() .getCell(grid.selectionColumn).getWidget(); @@ -1838,17 +1841,17 @@ public class Grid<T> extends ResizeComposite implements for (int i = 0; i < tr.getCells().getLength(); i++) { Element cell = createCell(tr.getCells().getItem(i)); - cellHeight = Math.max(cellHeight, WidgetUtil - .getRequiredHeightBoundingClientRectDouble(tr - .getCells().getItem(i))); + cellHeight = Math.max(cellHeight, + WidgetUtil.getRequiredHeightBoundingClientRectDouble( + tr.getCells().getItem(i))); Column<?, T> column = grid.getVisibleColumn(i); if (i < frozenColumns) { frozenCellWrapper.appendChild(cell); frozenColumnsWidth += WidgetUtil - .getRequiredWidthBoundingClientRectDouble(tr - .getCells().getItem(i)); + .getRequiredWidthBoundingClientRectDouble( + tr.getCells().getItem(i)); } else { cellWrapper.appendChild(cell); } @@ -1889,8 +1892,8 @@ public class Grid<T> extends ResizeComposite implements // editor overlay since the original one is hidden by // the overlay final CheckBox checkBox = GWT.create(CheckBox.class); - checkBox.setValue(grid.isSelected(pinnedRowHandle - .getRow())); + checkBox.setValue( + grid.isSelected(pinnedRowHandle.getRow())); checkBox.sinkEvents(Event.ONCLICK); checkBox.addClickHandler(new ClickHandler() { @@ -1910,17 +1913,18 @@ public class Grid<T> extends ResizeComposite implements // Only enable CheckBox in non-buffered mode checkBox.setEnabled(!isBuffered()); - } else if (!(column.getRenderer() instanceof WidgetRenderer)) { + } else if (!(column + .getRenderer() instanceof WidgetRenderer)) { // Copy non-widget content directly - cell.setInnerHTML(tr.getCells().getItem(i) - .getInnerHTML()); + cell.setInnerHTML( + tr.getCells().getItem(i).getInnerHTML()); } } } setBounds(frozenCellWrapper, 0, 0, frozenColumnsWidth, 0); - setBounds(cellWrapper, frozenColumnsWidth, 0, tr.getOffsetWidth() - - frozenColumnsWidth, cellHeight); + setBounds(cellWrapper, frozenColumnsWidth, 0, + tr.getOffsetWidth() - frozenColumnsWidth, cellHeight); // Only add these elements once if (!messageAndButtonsWrapper.isOrHasChild(messageWrapper)) { @@ -1957,10 +1961,9 @@ public class Grid<T> extends ResizeComposite implements // overlay from the bottom editorOverlay.insertFirst(messageAndButtonsWrapper); int gridHeight = grid.getElement().getOffsetHeight(); - editorOverlay.getStyle() - .setBottom( - gridHeight - overlayTop - tr.getOffsetHeight(), - Unit.PX); + editorOverlay.getStyle().setBottom( + gridHeight - overlayTop - tr.getOffsetHeight(), + Unit.PX); editorOverlay.getStyle().clearTop(); } @@ -2177,7 +2180,8 @@ public class Grid<T> extends ResizeComposite implements return cancelButton.getText(); } - public void setEditorColumnError(Column<?, T> column, boolean hasError) { + public void setEditorColumnError(Column<?, T> column, + boolean hasError) { if (state != State.ACTIVE && state != State.SAVING) { throw new IllegalStateException("Cannot set cell error " + "status: editor is neither active nor saving."); @@ -2349,7 +2353,8 @@ public class Grid<T> extends ResizeComposite implements private final Type<HANDLER> associatedType = new Type<HANDLER>( getBrowserEventType(), this); - public AbstractGridMouseEvent(Grid<?> grid, CellReference<?> targetCell) { + public AbstractGridMouseEvent(Grid<?> grid, + CellReference<?> targetCell) { this.grid = grid; this.targetCell = targetCell; } @@ -2469,8 +2474,8 @@ public class Grid<T> extends ResizeComposite implements // Cell is correct but it does not have focused style if (cellWithFocusStyle != null) { // Remove old focus style - setStyleName(cellWithFocusStyle, - cellFocusStyleName, false); + setStyleName(cellWithFocusStyle, cellFocusStyleName, + false); } cellWithFocusStyle = cell.getElement(); @@ -2506,7 +2511,8 @@ public class Grid<T> extends ResizeComposite implements setStyleName(rowWithFocusStyle, rowFocusStyleName, true); } } else if (rowWithFocusStyle == row.getElement() - || (containerWithFocus != escalator.getBody() && rowWithFocusStyle != null)) { + || (containerWithFocus != escalator.getBody() + && rowWithFocusStyle != null)) { // Remove focus style. setStyleName(rowWithFocusStyle, rowFocusStyleName, false); rowWithFocusStyle = null; @@ -2528,8 +2534,7 @@ public class Grid<T> extends ResizeComposite implements */ private void setCellFocus(int rowIndex, int columnIndexDOM, RowContainer container) { - if (container == null - || rowIndex == rowWithFocus + if (container == null || rowIndex == rowWithFocus && cellFocusRange.contains(columnIndexDOM) && container == this.containerWithFocus) { return; @@ -2558,8 +2563,8 @@ public class Grid<T> extends ResizeComposite implements ++i; } while (cell != null); } - int columnIndex = getColumns().indexOf( - getVisibleColumn(columnIndexDOM)); + int columnIndex = getColumns() + .indexOf(getVisibleColumn(columnIndexDOM)); if (columnIndex >= escalator.getColumnConfiguration() .getFrozenColumnCount()) { escalator.scrollToColumn(columnIndexDOM, ScrollDestination.ANY, @@ -2678,7 +2683,8 @@ public class Grid<T> extends ResizeComposite implements case KeyCodes.KEY_PAGEDOWN: case KeyCodes.KEY_PAGEUP: if (newContainer.getRowCount() > 0) { - boolean down = event.getKeyCode() == KeyCodes.KEY_PAGEDOWN; + boolean down = event + .getKeyCode() == KeyCodes.KEY_PAGEDOWN; // If there is a visible focused cell, scroll by one // page from its position. Otherwise, use the first or // the last visible row as the scroll start position. @@ -2692,12 +2698,12 @@ public class Grid<T> extends ResizeComposite implements // Scroll by a little less than the visible area to // account for the possibility that the top and the // bottom row are only partially visible. - int moveFocusBy = Math.max(1, lastVisible - - firstVisible - 1); + int moveFocusBy = Math.max(1, + lastVisible - firstVisible - 1); moveFocusBy *= down ? 1 : -1; newRow += moveFocusBy; - newRow = Math.max(0, Math.min( - newContainer.getRowCount() - 1, newRow)); + newRow = Math.max(0, Math + .min(newContainer.getRowCount() - 1, newRow)); } break; default: @@ -2804,11 +2810,12 @@ public class Grid<T> extends ResizeComposite implements */ public void rowsAddedToBody(Range added) { boolean bodyHasFocus = (containerWithFocus == escalator.getBody()); - boolean insertionIsAboveFocusedCell = (added.getStart() <= rowWithFocus); + boolean insertionIsAboveFocusedCell = (added + .getStart() <= rowWithFocus); if (bodyHasFocus && insertionIsAboveFocusedCell) { rowWithFocus += added.length(); - rowWithFocus = Math.min(rowWithFocus, escalator.getBody() - .getRowCount() - 1); + rowWithFocus = Math.min(rowWithFocus, + escalator.getBody().getRowCount() - 1); refreshRow(rowWithFocus); } } @@ -2836,12 +2843,12 @@ public class Grid<T> extends ResizeComposite implements rowWithFocus = removed.getStart() - 1; } else { if (escalator.getHeader().getRowCount() > 0) { - rowWithFocus = Math.min(lastFocusedHeaderRow, escalator - .getHeader().getRowCount() - 1); + rowWithFocus = Math.min(lastFocusedHeaderRow, + escalator.getHeader().getRowCount() - 1); containerWithFocus = escalator.getHeader(); } else if (escalator.getFooter().getRowCount() > 0) { - rowWithFocus = Math.min(lastFocusedFooterRow, escalator - .getFooter().getRowCount() - 1); + rowWithFocus = Math.min(lastFocusedFooterRow, + escalator.getFooter().getRowCount() - 1); containerWithFocus = escalator.getFooter(); } } @@ -2851,7 +2858,7 @@ public class Grid<T> extends ResizeComposite implements } public final class SelectionColumn extends Column<Boolean, T> - implements GridEnabledHandler { + implements GridEnabledHandler { private boolean initDone = false; private boolean selected = false; @@ -2886,10 +2893,10 @@ public class Grid<T> extends ResizeComposite implements if (selectAllCheckBox == null) { selectAllCheckBox = GWT.create(CheckBox.class); - selectAllCheckBox.setStylePrimaryName(getStylePrimaryName() - + SELECT_ALL_CHECKBOX_CLASSNAME); - selectAllCheckBox - .addValueChangeHandler(new ValueChangeHandler<Boolean>() { + selectAllCheckBox.setStylePrimaryName( + getStylePrimaryName() + SELECT_ALL_CHECKBOX_CLASSNAME); + selectAllCheckBox.addValueChangeHandler( + new ValueChangeHandler<Boolean>() { @Override public void onValueChange( @@ -2909,11 +2916,11 @@ public class Grid<T> extends ResizeComposite implements @Override public void onClick(GridClickEvent event) { CellReference<?> targetCell = event.getTargetCell(); - int defaultRowIndex = getHeader().getRows().indexOf( - getDefaultHeaderRow()); + int defaultRowIndex = getHeader().getRows() + .indexOf(getDefaultHeaderRow()); - if (targetCell.getColumnIndex() == 0 - && targetCell.getRowIndex() == defaultRowIndex) { + if (targetCell.getColumnIndex() == 0 && targetCell + .getRowIndex() == defaultRowIndex) { selectAllCheckBox.setValue( !selectAllCheckBox.getValue(), true); } @@ -2927,12 +2934,13 @@ public class Grid<T> extends ResizeComposite implements if (event.getNativeKeyCode() != KeyCodes.KEY_SPACE) { return; } - HeaderRow targetHeaderRow = getHeader().getRow( - event.getFocusedCell().getRowIndex()); + HeaderRow targetHeaderRow = getHeader() + .getRow(event.getFocusedCell().getRowIndex()); if (!targetHeaderRow.isDefault()) { return; } - if (event.getFocusedCell().getColumn() == SelectionColumn.this) { + if (event.getFocusedCell() + .getColumn() == SelectionColumn.this) { // Send events to ensure state is updated selectAllCheckBox.setValue( !selectAllCheckBox.getValue(), true); @@ -2941,7 +2949,8 @@ public class Grid<T> extends ResizeComposite implements }); } else { for (HeaderRow row : header.getRows()) { - if (row.getCell(this).getType() == GridStaticCellType.WIDGET) { + if (row.getCell(this) + .getType() == GridStaticCellType.WIDGET) { // Detach from old header. row.getCell(this).setText(""); } @@ -3015,11 +3024,12 @@ public class Grid<T> extends ResizeComposite implements * Sets whether the selection column is enabled. * * @since 7.7 - * @param enabled <code>true</code> to enable the column, - * <code>false</code> to disable it. + * @param enabled + * <code>true</code> to enable the column, <code>false</code> + * to disable it. */ public void setEnabled(boolean enabled) { - if(selectAllCheckBox != null) { + if (selectAllCheckBox != null) { selectAllCheckBox.setEnabled(enabled); } } @@ -3247,8 +3257,8 @@ public class Grid<T> extends ResizeComposite implements for (int index = 0; index < columns.size(); index++) { selfWidths.put(index, columns.get(index).getWidth()); } - Grid.this.escalator.getColumnConfiguration().setColumnWidths( - selfWidths); + Grid.this.escalator.getColumnConfiguration() + .setColumnWidths(selfWidths); /* * Step 2: Make sure that each column ends up obeying their min/max @@ -3273,8 +3283,8 @@ public class Grid<T> extends ResizeComposite implements constrainedWidths.put(index, column.getMaximumWidth()); } } - Grid.this.escalator.getColumnConfiguration().setColumnWidths( - constrainedWidths); + Grid.this.escalator.getColumnConfiguration() + .setColumnWidths(constrainedWidths); } private void applyColumnWidthsWithExpansion() { @@ -3301,7 +3311,8 @@ public class Grid<T> extends ResizeComposite implements Math.min(getMaxWidth(column), widthAsIs), column.getMinimumWidth()); defaultExpandRatios = defaultExpandRatios - && (column.getExpandRatio() == -1 || column == selectionColumn); + && (column.getExpandRatio() == -1 + || column == selectionColumn); if (isFixedWidth) { columnSizes.put(visibleColumns.indexOf(column), widthFixed); @@ -3315,8 +3326,8 @@ public class Grid<T> extends ResizeComposite implements setColumnSizes(columnSizes); for (Column<?, T> column : nonFixedColumns) { - final int expandRatio = (defaultExpandRatios ? 1 : column - .getExpandRatio()); + final int expandRatio = (defaultExpandRatios ? 1 + : column.getExpandRatio()); final double maxWidth = getMaxWidth(column); final double newWidth = Math.min(maxWidth, column.getWidthActual()); @@ -3363,8 +3374,8 @@ public class Grid<T> extends ResizeComposite implements final int columnIndex = visibleColumns.indexOf(column); final double autoWidth = columnSizes.get(columnIndex); final double maxWidth = getMaxWidth(column); - double expandedWidth = autoWidth + widthPerRatio - * expandRatio; + double expandedWidth = autoWidth + + widthPerRatio * expandRatio; if (maxWidth <= expandedWidth) { i.remove(); @@ -3381,12 +3392,12 @@ public class Grid<T> extends ResizeComposite implements return; } assert pixelsToDistribute > 0 : "We've run out of pixels to distribute (" - + pixelsToDistribute - + "px to " - + totalRatios + + pixelsToDistribute + "px to " + totalRatios + " ratios between " + columnsToExpand.size() + " columns)"; - assert totalRatios > 0 && !columnsToExpand.isEmpty() : "Bookkeeping out of sync. Ratios: " - + totalRatios + " Columns: " + columnsToExpand.size(); + assert totalRatios > 0 && !columnsToExpand + .isEmpty() : "Bookkeeping out of sync. Ratios: " + + totalRatios + " Columns: " + + columnsToExpand.size(); /* * If we still have anything left, distribute the remaining pixels @@ -3399,8 +3410,8 @@ public class Grid<T> extends ResizeComposite implements // These browsers report subpixels as integers. this usually // results into issues.. widthPerRatio = (int) (pixelsToDistribute / totalRatios); - leftOver = (int) (pixelsToDistribute - widthPerRatio - * totalRatios); + leftOver = (int) (pixelsToDistribute + - widthPerRatio * totalRatios); } else { widthPerRatio = pixelsToDistribute / totalRatios; } @@ -3449,7 +3460,8 @@ public class Grid<T> extends ResizeComposite implements boolean hasAutoWidth = column.getWidth() < 0; if (hasAutoWidth && currentWidth < minWidth) { columnSizes.put(columnIndex, minWidth); - pixelsToRemoveFromOtherColumns += (minWidth - currentWidth); + pixelsToRemoveFromOtherColumns += (minWidth + - currentWidth); minWidthsCausedReflows = true; /* @@ -3475,8 +3487,8 @@ public class Grid<T> extends ResizeComposite implements final double pixelsToRemove = pixelsToRemovePerRatio * getExpandRatio(column, defaultExpandRatios); int colIndex = visibleColumns.indexOf(column); - columnSizes.put(colIndex, columnSizes.get(colIndex) - - pixelsToRemove); + columnSizes.put(colIndex, + columnSizes.get(colIndex) - pixelsToRemove); } } while (minWidthsCausedReflows); @@ -3557,10 +3569,10 @@ public class Grid<T> extends ResizeComposite implements try { detailsWidget = detailsGenerator.getDetails(rowIndex); } catch (Throwable e) { - getLogger().log( - Level.SEVERE, + getLogger().log(Level.SEVERE, "Exception while generating details for row " - + rowIndex, e); + + rowIndex, + e); } final double spacerHeight; @@ -3598,7 +3610,8 @@ public class Grid<T> extends ResizeComposite implements .getBorderTopAndBottomThickness(spacerElement); double measuredHeight = contentHeight + borderTopAndBottomHeight; - assert getElement().isOrHasChild(spacerElement) : "The spacer element wasn't in the DOM during measurement, but was assumed to be."; + assert getElement().isOrHasChild( + spacerElement) : "The spacer element wasn't in the DOM during measurement, but was assumed to be."; spacerHeight = measuredHeight; } @@ -3617,8 +3630,8 @@ public class Grid<T> extends ResizeComposite implements + "Grid's DOM. (row: " + spacer.getRow() + ", element: " + spacerElement + ")"; - Widget detailsWidget = elementToWidgetMap.remove(spacerElement - .getFirstChildElement()); + Widget detailsWidget = elementToWidgetMap + .remove(spacerElement.getFirstChildElement()); if (detailsWidget != null) { /* @@ -3629,8 +3642,8 @@ public class Grid<T> extends ResizeComposite implements assert spacerElement.getFirstChild() != null : "The " + "details row to destroy did not contain a widget - " + "probably removed by something else without " - + "permission? (row: " + spacer.getRow() - + ", element: " + spacerElement + ")"; + + "permission? (row: " + spacer.getRow() + ", element: " + + spacerElement + ")"; setParent(detailsWidget, null); spacerElement.removeAllChildren(); @@ -3747,8 +3760,8 @@ public class Grid<T> extends ResizeComposite implements && event.getKeyCode() == KeyCodes.KEY_ENTER) { final MenuItem item = getSelectedItem(); super.onBrowserEvent(event); - Scheduler.get().scheduleDeferred( - new ScheduledCommand() { + Scheduler.get() + .scheduleDeferred(new ScheduledCommand() { @Override public void execute() { @@ -3856,8 +3869,8 @@ public class Grid<T> extends ResizeComposite implements RowContainer header = grid.escalator.getHeader(); if (header.getRowCount() == 0 || !header.getRowElement(0).hasChildNodes()) { - getLogger() - .info("No header cell available when calculating sidebar button height"); + getLogger().info( + "No header cell available when calculating sidebar button height"); openCloseButton.setHeight(header.getDefaultRowHeight() + "px"); return; @@ -3942,8 +3955,8 @@ public class Grid<T> extends ResizeComposite implements } toggle.setStyleName("hidden", column.isHidden()); } else if (columnToHidingToggleMap.containsKey(column)) { - sidebar.menuBar.removeItem((columnToHidingToggleMap - .remove(column))); + sidebar.menuBar + .removeItem((columnToHidingToggleMap.remove(column))); } updateTogglesOrder(); } @@ -4079,8 +4092,11 @@ public class Grid<T> extends ResizeComposite implements * This is a workaround to make Chrome work like Firefox. In Chrome, * normally if you start a drag on one cell and release on: * <ul> - * <li>that same cell, the click event is that {@code <td>}. - * <li>a cell on that same row, the click event is the parent {@code <tr>}. + * <li>that same cell, the click event is that {@code + * <td>}. + * <li>a cell on that same row, the click event is the parent {@code + * <tr> + * }. * <li>a cell on another row, the click event is the table section ancestor * ({@code <thead>}, {@code <tbody>} or {@code <tfoot>}). * </ul> @@ -4179,8 +4195,8 @@ public class Grid<T> extends ResizeComposite implements } // update the style names on each run in case primary name has been // modified - tableHeader.setClassName(escalator.getHeader().getElement() - .getClassName()); + tableHeader.setClassName( + escalator.getHeader().getElement().getClassName()); dropMarker.setClassName(getStylePrimaryName() + "-drop-marker"); int topOffset = 0; for (int i = 0; i < eventCell.getRowIndex(); i++) { @@ -4213,9 +4229,11 @@ public class Grid<T> extends ResizeComposite implements .ceilingEntry(cursorXCoordinate); final Entry<Double, Integer> cellEdgeOnLeft = possibleDropPositions .floorEntry(cursorXCoordinate); - final double diffToRightEdge = cellEdgeOnRight == null ? Double.MAX_VALUE + final double diffToRightEdge = cellEdgeOnRight == null + ? Double.MAX_VALUE : cellEdgeOnRight.getKey() - cursorXCoordinate; - final double diffToLeftEdge = cellEdgeOnLeft == null ? Double.MAX_VALUE + final double diffToLeftEdge = cellEdgeOnLeft == null + ? Double.MAX_VALUE : cursorXCoordinate - cellEdgeOnLeft.getKey(); double dropMarkerLeft = 0 - scrollLeft; @@ -4231,7 +4249,8 @@ public class Grid<T> extends ResizeComposite implements final double frozenColumnsWidth = autoScroller .getFrozenColumnsWidth(); - final double rightBoundaryForDrag = getSidebarBoundaryComparedTo(dropMarkerLeft); + final double rightBoundaryForDrag = getSidebarBoundaryComparedTo( + dropMarkerLeft); final int visibleColumns = getVisibleColumns().size(); // First check if the drop marker should move left because of the @@ -4246,7 +4265,8 @@ public class Grid<T> extends ResizeComposite implements // Check if the drop marker shouldn't be shown at all else if (dropMarkerLeft < frozenColumnsWidth || dropMarkerLeft > Math.min(rightBoundaryForDrag, - escalator.getInnerWidth()) || dropMarkerLeft < 0) { + escalator.getInnerWidth()) + || dropMarkerLeft < 0) { dropMarkerLeft = -10000000; } dropMarker.getStyle().setLeft(dropMarkerLeft, Unit.PX); @@ -4269,8 +4289,8 @@ public class Grid<T> extends ResizeComposite implements // Do not show the drag element beyond the grid final double sidebarBoundary = getSidebarBoundaryComparedTo(left); final double gridBoundary = escalator.getInnerWidth(); - final double rightBoundary = Math - .min(sidebarBoundary, gridBoundary); + final double rightBoundary = Math.min(sidebarBoundary, + gridBoundary); // Do not show on left of the frozen columns (even if scrolled) final int frozenColumnsWidth = (int) autoScroller @@ -4343,13 +4363,15 @@ public class Grid<T> extends ResizeComposite implements final int colspan = header.getRow(eventCell.getRowIndex()) .getCell(eventCell.getColumn()).getColspan(); if (latestColumnDropIndex != draggedColumnIndex - && latestColumnDropIndex != (draggedColumnIndex + colspan)) { + && latestColumnDropIndex != (draggedColumnIndex + + colspan)) { List<Column<?, T>> columns = getColumns(); List<Column<?, T>> reordered = new ArrayList<Column<?, T>>(); if (draggedColumnIndex < latestColumnDropIndex) { reordered.addAll(columns.subList(0, draggedColumnIndex)); - reordered.addAll(columns.subList(draggedColumnIndex - + colspan, latestColumnDropIndex)); + reordered.addAll( + columns.subList(draggedColumnIndex + colspan, + latestColumnDropIndex)); reordered.addAll(columns.subList(draggedColumnIndex, draggedColumnIndex + colspan)); reordered.addAll(columns.subList(latestColumnDropIndex, @@ -4360,8 +4382,8 @@ public class Grid<T> extends ResizeComposite implements draggedColumnIndex + colspan)); reordered.addAll(columns.subList(latestColumnDropIndex, draggedColumnIndex)); - reordered.addAll(columns.subList(draggedColumnIndex - + colspan, columns.size())); + reordered.addAll(columns.subList( + draggedColumnIndex + colspan, columns.size())); } reordered.remove(selectionColumn); // since setColumnOrder will // add it anyway! @@ -4370,12 +4392,12 @@ public class Grid<T> extends ResizeComposite implements Cell focusedCell = cellFocusHandler.getFocusedCell(); if (focusedCell != null) { // take hidden columns into account - focusedColumnIndex = getColumns().indexOf( - getVisibleColumn(focusedCell.getColumn())); + focusedColumnIndex = getColumns() + .indexOf(getVisibleColumn(focusedCell.getColumn())); } - Column<?, T>[] array = reordered.toArray(new Column[reordered - .size()]); + Column<?, T>[] array = reordered + .toArray(new Column[reordered.size()]); setColumnOrder(array); transferCellFocusOnDrop(); } // else no reordering @@ -4392,11 +4414,11 @@ public class Grid<T> extends ResizeComposite implements .findRowContainer(focusedCell.getElement()); if (focusedColumnIndex == draggedColumnIndex) { // move with the dragged column - int adjustedDropIndex = latestColumnDropIndex > draggedColumnIndex ? latestColumnDropIndex - 1 - : latestColumnDropIndex; + int adjustedDropIndex = latestColumnDropIndex > draggedColumnIndex + ? latestColumnDropIndex - 1 : latestColumnDropIndex; // remove hidden columns from indexing - adjustedDropIndex = getVisibleColumns().indexOf( - getColumn(adjustedDropIndex)); + adjustedDropIndex = getVisibleColumns() + .indexOf(getColumn(adjustedDropIndex)); cellFocusHandler.setCellFocus(focusedRowIndex, adjustedDropIndex, rowContainer); } else if (latestColumnDropIndex <= focusedColumnIndex @@ -4454,8 +4476,8 @@ public class Grid<T> extends ResizeComposite implements possibleDropPositions.clear(); final int draggedColumnIndex = eventCell.getColumnIndex(); - final StaticRow<?> draggedCellRow = header.getRow(eventCell - .getRowIndex()); + final StaticRow<?> draggedCellRow = header + .getRow(eventCell.getRowIndex()); final int draggedColumnRightIndex = draggedColumnIndex + draggedCellRow.getCell(eventCell.getColumn()) .getColspan(); @@ -4625,9 +4647,8 @@ public class Grid<T> extends ResizeComposite implements @Override public void render(RendererCellReference cell, Object data) { if (!warned && !(data instanceof String)) { - getLogger().warning( - Column.this.toString() + ": " - + DEFAULT_RENDERER_WARNING); + getLogger().warning(Column.this.toString() + ": " + + DEFAULT_RENDERER_WARNING); warned = true; } @@ -4842,8 +4863,8 @@ public class Grid<T> extends ResizeComposite implements ColumnConfiguration conf = null; int index = 0; - if (grid != null - && (bodyRenderer instanceof WidgetRenderer || renderer instanceof WidgetRenderer)) { + if (grid != null && (bodyRenderer instanceof WidgetRenderer + || renderer instanceof WidgetRenderer)) { // Column needs to be recreated. index = grid.getColumns().indexOf(this); conf = grid.escalator.getColumnConfiguration(); @@ -4938,9 +4959,8 @@ public class Grid<T> extends ResizeComposite implements if (isHidden()) { return 0; } - return grid.escalator.getColumnConfiguration() - .getColumnWidthActual( - grid.getVisibleColumns().indexOf(this)); + return grid.escalator.getColumnConfiguration().getColumnWidthActual( + grid.getVisibleColumns().indexOf(this)); } void reapplyWidth() { @@ -5040,10 +5060,10 @@ public class Grid<T> extends ResizeComposite implements } else { this.hidden = hidden; - final int columnIndex = grid.getVisibleColumns().indexOf( - this); - grid.escalator.getColumnConfiguration().insertColumns( - columnIndex, 1); + final int columnIndex = grid.getVisibleColumns() + .indexOf(this); + grid.escalator.getColumnConfiguration() + .insertColumns(columnIndex, 1); // make sure column is set to frozen if it needs to be, // escalator doesn't handle situation where the added column @@ -5201,8 +5221,8 @@ public class Grid<T> extends ResizeComposite implements /** * Sets the maximum width for this column. * <p> - * This defines the maximum allowed pixel width of the column - * <em>when it is set to expand</em>. + * This defines the maximum allowed pixel width of the column <em>when + * it is set to expand</em>. * <p> * This action is done "finally", once the current execution loop * returns. This is done to reduce overhead of unintentionally always @@ -5387,16 +5407,17 @@ public class Grid<T> extends ResizeComposite implements Renderer<?> renderer = findRenderer(cell); if (renderer instanceof ComplexRenderer) { try { - Column<?, T> column = getVisibleColumn(cell.getColumn()); + Column<?, T> column = getVisibleColumn( + cell.getColumn()); rendererCellReference.set(cell, getColumns().indexOf(column), column); ((ComplexRenderer<?>) renderer) .init(rendererCellReference); } catch (RuntimeException e) { - getLogger().log( - Level.SEVERE, + getLogger().log(Level.SEVERE, "Error initing cell in column " - + cell.getColumn(), e); + + cell.getColumn(), + e); } } } @@ -5412,8 +5433,10 @@ public class Grid<T> extends ResizeComposite implements Widget widget = widgetRenderer.createWidget(); assert widget != null : "WidgetRenderer.createWidget() returned null. It should return a widget."; - assert widget.getParent() == null : "WidgetRenderer.createWidget() returned a widget which already is attached."; - assert cell.getElement().getChildCount() == 0 : "Cell content should be empty when adding Widget"; + assert widget + .getParent() == null : "WidgetRenderer.createWidget() returned a widget which already is attached."; + assert cell.getElement() + .getChildCount() == 0 : "Cell content should be empty when adding Widget"; // Physical attach cell.getElement().appendChild(widget.getElement()); @@ -5421,10 +5444,10 @@ public class Grid<T> extends ResizeComposite implements // Logical attach setParent(widget, Grid.this); } catch (RuntimeException e) { - getLogger().log( - Level.SEVERE, + getLogger().log(Level.SEVERE, "Error attaching child widget in column " - + cell.getColumn(), e); + + cell.getColumn(), + e); } } } @@ -5467,10 +5490,10 @@ public class Grid<T> extends ResizeComposite implements .getStyle(rowReference); setCustomStyleName(rowElement, rowStylename); } catch (RuntimeException e) { - getLogger().log( - Level.SEVERE, + getLogger().log(Level.SEVERE, "Error generating styles for row " - + row.getRow(), e); + + row.getRow(), + e); } } else { // Remove in case there was a generator previously @@ -5496,16 +5519,16 @@ public class Grid<T> extends ResizeComposite implements if (hasData && cellStyleGenerator != null) { try { - cellReference - .set(cell.getColumn(), columnIndex, column); + cellReference.set(cell.getColumn(), columnIndex, + column); String generatedStyle = cellStyleGenerator .getStyle(cellReference); setCustomStyleName(cell.getElement(), generatedStyle); } catch (RuntimeException e) { - getLogger().log( - Level.SEVERE, + getLogger().log(Level.SEVERE, "Error generating style for cell in column " - + cell.getColumn(), e); + + cell.getColumn(), + e); } } else if (hasData || usedToHaveData) { setCustomStyleName(cell.getElement(), null); @@ -5530,8 +5553,8 @@ public class Grid<T> extends ResizeComposite implements } else { // Prepare cell for no data - clxRenderer.setContentVisible( - rendererCellReference, false); + clxRenderer.setContentVisible(rendererCellReference, + false); } } else if (hasData) { @@ -5544,10 +5567,10 @@ public class Grid<T> extends ResizeComposite implements cell.getElement().removeAllChildren(); } } catch (RuntimeException e) { - getLogger().log( - Level.SEVERE, + getLogger().log(Level.SEVERE, "Error rendering cell in column " - + cell.getColumn(), e); + + cell.getColumn(), + e); } } } @@ -5558,8 +5581,8 @@ public class Grid<T> extends ResizeComposite implements Renderer<?> renderer = findRenderer(cell); if (renderer instanceof WidgetRenderer) { try { - Widget w = WidgetUtil.findWidget(cell.getElement() - .getFirstChildElement(), null); + Widget w = WidgetUtil.findWidget( + cell.getElement().getFirstChildElement(), null); if (w != null) { // Logical detach @@ -5569,10 +5592,10 @@ public class Grid<T> extends ResizeComposite implements cell.getElement().removeChild(w.getElement()); } } catch (RuntimeException e) { - getLogger().log( - Level.SEVERE, + getLogger().log(Level.SEVERE, "Error detaching widget in column " - + cell.getColumn(), e); + + cell.getColumn(), + e); } } } @@ -5588,16 +5611,17 @@ public class Grid<T> extends ResizeComposite implements Renderer<?> renderer = findRenderer(cell); if (renderer instanceof ComplexRenderer) { try { - Column<?, T> column = getVisibleColumn(cell.getColumn()); + Column<?, T> column = getVisibleColumn( + cell.getColumn()); rendererCellReference.set(cell, getColumns().indexOf(column), column); ((ComplexRenderer) renderer) .destroy(rendererCellReference); } catch (RuntimeException e) { - getLogger().log( - Level.SEVERE, + getLogger().log(Level.SEVERE, "Error destroying cell in column " - + cell.getColumn(), e); + + cell.getColumn(), + e); } } } @@ -5629,7 +5653,8 @@ public class Grid<T> extends ResizeComposite implements // Decorate default row with sorting indicators if (staticRow instanceof HeaderRow) { - addSortingIndicatorsToHeaderRow((HeaderRow) staticRow, cell); + addSortingIndicatorsToHeaderRow((HeaderRow) staticRow, + cell); } // Assign colspan to cell before rendering @@ -5658,10 +5683,8 @@ public class Grid<T> extends ResizeComposite implements content.setClassName(getStylePrimaryName() + "-column-footer-content"); } else { - getLogger().severe( - "Unhandled static row type " - + staticRow.getClass() - .getCanonicalName()); + getLogger().severe("Unhandled static row type " + + staticRow.getClass().getCanonicalName()); } td.appendChild(content); @@ -5691,11 +5714,12 @@ public class Grid<T> extends ResizeComposite implements && ((HeaderRow) staticRow).isDefault()) { final int column = cell.getColumn(); - DragHandle dragger = new DragHandle(getStylePrimaryName() - + "-column-resize-handle", + DragHandle dragger = new DragHandle( + getStylePrimaryName() + "-column-resize-handle", new DragHandleCallback() { - private Column<?, T> col = getVisibleColumn(column); + private Column<?, T> col = getVisibleColumn( + column); private double initialWidth = 0; private double minCellWidth; @@ -5710,9 +5734,8 @@ public class Grid<T> extends ResizeComposite implements public void onStart() { initialWidth = col.getWidthActual(); - minCellWidth = escalator - .getMinCellWidth(getColumns() - .indexOf(col)); + minCellWidth = escalator.getMinCellWidth( + getColumns().indexOf(col)); for (Column<?, T> c : getVisibleColumns()) { if (selectionColumn == c) { // Don't modify selection column. @@ -5848,8 +5871,8 @@ public class Grid<T> extends ResizeComposite implements List<Column<?, T>> columns = getVisibleColumns(); for (FlyweightCell cell : attachedCells) { - StaticSection.StaticCell metadata = gridRow.getCell(columns - .get(cell.getColumn())); + StaticSection.StaticCell metadata = gridRow + .getCell(columns.get(cell.getColumn())); /* * If the cell contains widgets that are not currently attached * then attach them now. @@ -5867,12 +5890,12 @@ public class Grid<T> extends ResizeComposite implements @Override public void preDetach(Row row, Iterable<FlyweightCell> cellsToDetach) { if (section.getRowCount() > row.getRow()) { - StaticSection.StaticRow<?> gridRow = section.getRow(row - .getRow()); + StaticSection.StaticRow<?> gridRow = section + .getRow(row.getRow()); List<Column<?, T>> columns = getVisibleColumns(); for (FlyweightCell cell : cellsToDetach) { - StaticSection.StaticCell metadata = gridRow.getCell(columns - .get(cell.getColumn())); + StaticSection.StaticCell metadata = gridRow + .getCell(columns.get(cell.getColumn())); if (GridStaticCellType.WIDGET.equals(metadata.getType()) && metadata.getWidget() != null @@ -5926,8 +5949,8 @@ public class Grid<T> extends ResizeComposite implements } }); - escalator - .addRowVisibilityChangeHandler(new RowVisibilityChangeHandler() { + escalator.addRowVisibilityChangeHandler( + new RowVisibilityChangeHandler() { @Override public void onRowVisibilityChange( RowVisibilityChangeEvent event) { @@ -6083,7 +6106,8 @@ public class Grid<T> extends ResizeComposite implements * <code>true</code> if we refreshing the header, else assumed * the footer */ - private void refreshRowContainer(RowContainer rows, StaticSection<?> section) { + private void refreshRowContainer(RowContainer rows, + StaticSection<?> section) { // Add or Remove rows on demand int rowDiff = section.getVisibleRowCount() - rows.getRowCount(); @@ -6111,10 +6135,11 @@ public class Grid<T> extends ResizeComposite implements final Range rowRange = Range.between(0, dataSource.size()); final Range columnRange = Range.between(0, getVisibleColumns().size()); - assert rowRange.contains(rowIndex) : "Illegal row index. Should be in range " - + rowRange; - assert columnRange.contains(columnIndex) : "Illegal column index. Should be in range " - + columnRange; + assert rowRange.contains( + rowIndex) : "Illegal row index. Should be in range " + rowRange; + assert columnRange.contains( + columnIndex) : "Illegal column index. Should be in range " + + columnRange; if (rowRange.contains(rowIndex) && columnRange.contains(columnIndex)) { cellFocusHandler.setCellFocus(rowIndex, columnIndex, @@ -6184,8 +6209,8 @@ public class Grid<T> extends ResizeComposite implements */ public <C extends Column<?, T>> C addColumn(C column, int index) { if (column == selectionColumn) { - throw new IllegalArgumentException("The selection column many " - + "not be added manually"); + throw new IllegalArgumentException( + "The selection column many " + "not be added manually"); } else if (selectionColumn != null && index == 0) { throw new IllegalStateException("A column cannot be inserted " + "before the selection column"); @@ -6277,8 +6302,8 @@ public class Grid<T> extends ResizeComposite implements int columnIndex = columns.indexOf(column); // Remove from column configuration - escalator.getColumnConfiguration().removeColumns( - getVisibleColumns().indexOf(column), 1); + escalator.getColumnConfiguration() + .removeColumns(getVisibleColumns().indexOf(column), 1); updateFrozenColumns(); @@ -6741,12 +6766,12 @@ public class Grid<T> extends ResizeComposite implements if (newSize > oldSize) { body.insertRows(oldSize, newSize - oldSize); - cellFocusHandler.rowsAddedToBody(Range.withLength(oldSize, - newSize - oldSize)); + cellFocusHandler.rowsAddedToBody( + Range.withLength(oldSize, newSize - oldSize)); } else if (newSize < oldSize) { body.removeRows(newSize, oldSize - newSize); - cellFocusHandler.rowsRemovedFromBody(Range.withLength( - newSize, oldSize - newSize)); + cellFocusHandler.rowsRemovedFromBody( + Range.withLength(newSize, oldSize - newSize)); } if (newSize > 0) { @@ -6822,8 +6847,8 @@ public class Grid<T> extends ResizeComposite implements } private void updateFrozenColumns() { - escalator.getColumnConfiguration().setFrozenColumnCount( - getVisibleFrozenColumnCount()); + escalator.getColumnConfiguration() + .setFrozenColumnCount(getVisibleFrozenColumnCount()); } private int getVisibleFrozenColumnCount() { @@ -6934,8 +6959,8 @@ public class Grid<T> extends ResizeComposite implements int maxsize = escalator.getBody().getRowCount() - 1; if (rowIndex < 0) { - throw new IllegalArgumentException("Row index (" + rowIndex - + ") is below zero!"); + throw new IllegalArgumentException( + "Row index (" + rowIndex + ") is below zero!"); } if (rowIndex > maxsize) { @@ -7294,7 +7319,8 @@ public class Grid<T> extends ResizeComposite implements if (gridColumn.getRenderer() instanceof ComplexRenderer) { ComplexRenderer<?> cplxRenderer = (ComplexRenderer<?>) gridColumn .getRenderer(); - if (cplxRenderer.getConsumedEvents().contains(event.getType())) { + if (cplxRenderer.getConsumedEvents() + .contains(event.getType())) { if (cplxRenderer.onBrowserEvent(eventCell, event)) { return true; } @@ -7393,10 +7419,10 @@ public class Grid<T> extends ResizeComposite implements event.preventDefault(); Touch touch = event.getChangedTouches().get(0); - double diffX = Math.abs(touch.getClientX() - - rowEventTouchStartingPoint.getX()); - double diffY = Math.abs(touch.getClientY() - - rowEventTouchStartingPoint.getY()); + double diffX = Math.abs( + touch.getClientX() - rowEventTouchStartingPoint.getX()); + double diffY = Math.abs( + touch.getClientY() - rowEventTouchStartingPoint.getY()); // Cancel long tap if finger strays too far from // starting point @@ -7442,7 +7468,8 @@ public class Grid<T> extends ResizeComposite implements @Override @SuppressWarnings("deprecation") - public com.google.gwt.user.client.Element getSubPartElement(String subPart) { + public com.google.gwt.user.client.Element getSubPartElement( + String subPart) { /* * handles details[] (translated to spacer[] for Escalator), cell[], @@ -7450,17 +7477,16 @@ public class Grid<T> extends ResizeComposite implements */ // "#header[0][0]/DRAGhANDLE" - Element escalatorElement = escalator.getSubPartElement(subPart - .replaceFirst("^details\\[", "spacer[")); + Element escalatorElement = escalator.getSubPartElement( + subPart.replaceFirst("^details\\[", "spacer[")); if (escalatorElement != null) { int detailIdx = subPart.indexOf("/"); if (detailIdx > 0) { String detail = subPart.substring(detailIdx + 1); - getLogger().severe( - "Looking up detail from index " + detailIdx - + " onward: \"" + detail + "\""); + getLogger().severe("Looking up detail from index " + detailIdx + + " onward: \"" + detail + "\""); if (detail.equalsIgnoreCase("content")) { // XXX: Fix this to look up by class name! return DOM.asOld(Element.as(escalatorElement.getChild(0))); @@ -7514,7 +7540,8 @@ public class Grid<T> extends ResizeComposite implements @Override @SuppressWarnings("deprecation") - public String getSubPartName(com.google.gwt.user.client.Element subElement) { + public String getSubPartName( + com.google.gwt.user.client.Element subElement) { String escalatorStructureName = escalator.getSubPartName(subElement); if (escalatorStructureName != null) { @@ -7538,7 +7565,8 @@ public class Grid<T> extends ResizeComposite implements int i = 0; for (Column<?, T> column : columns) { - if (editor.getWidget(column).getElement().isOrHasChild(subElement)) { + if (editor.getWidget(column).getElement() + .isOrHasChild(subElement)) { return "editor[" + i + "]"; } ++i; @@ -7608,8 +7636,8 @@ public class Grid<T> extends ResizeComposite implements this.selectionModel = selectionModel; selectionModel.setGrid(this); - setSelectColumnRenderer(this.selectionModel - .getSelectionColumnRenderer()); + setSelectColumnRenderer( + this.selectionModel.getSelectionColumnRenderer()); // Refresh rendered rows to update selection, if it has changed refreshBody(); @@ -7864,7 +7892,8 @@ public class Grid<T> extends ResizeComposite implements * @param handler * a select all event handler */ - public HandlerRegistration addSelectAllHandler(SelectAllHandler<T> handler) { + public HandlerRegistration addSelectAllHandler( + SelectAllHandler<T> handler) { return addHandler(handler, SelectAllEvent.getType()); } @@ -7887,8 +7916,8 @@ public class Grid<T> extends ResizeComposite implements @Override public void execute() { if (!dataIsBeingFetched) { - handler.onDataAvailable(new DataAvailableEvent( - currentDataAvailable)); + handler.onDataAvailable( + new DataAvailableEvent(currentDataAvailable)); } } }); @@ -7904,7 +7933,8 @@ public class Grid<T> extends ResizeComposite implements * the key handler to register * @return the registration for the event */ - public HandlerRegistration addBodyKeyDownHandler(BodyKeyDownHandler handler) { + public HandlerRegistration addBodyKeyDownHandler( + BodyKeyDownHandler handler) { return addHandler(handler, keyDown.getAssociatedType()); } @@ -7958,7 +7988,8 @@ public class Grid<T> extends ResizeComposite implements * the key handler to register * @return the registration for the event */ - public HandlerRegistration addHeaderKeyUpHandler(HeaderKeyUpHandler handler) { + public HandlerRegistration addHeaderKeyUpHandler( + HeaderKeyUpHandler handler) { return addHandler(handler, keyUp.getAssociatedType()); } @@ -7999,7 +8030,8 @@ public class Grid<T> extends ResizeComposite implements * the key handler to register * @return the registration for the event */ - public HandlerRegistration addFooterKeyUpHandler(FooterKeyUpHandler handler) { + public HandlerRegistration addFooterKeyUpHandler( + FooterKeyUpHandler handler) { return addHandler(handler, keyUp.getAssociatedType()); } @@ -8037,7 +8069,8 @@ public class Grid<T> extends ResizeComposite implements * the click handler to register * @return the registration for the event */ - public HandlerRegistration addHeaderClickHandler(HeaderClickHandler handler) { + public HandlerRegistration addHeaderClickHandler( + HeaderClickHandler handler) { return addHandler(handler, clickEvent.getAssociatedType()); } @@ -8049,7 +8082,8 @@ public class Grid<T> extends ResizeComposite implements * the click handler to register * @return the registration for the event */ - public HandlerRegistration addFooterClickHandler(FooterClickHandler handler) { + public HandlerRegistration addFooterClickHandler( + FooterClickHandler handler) { return addHandler(handler, clickEvent.getAssociatedType()); } @@ -8138,10 +8172,12 @@ public class Grid<T> extends ResizeComposite implements } /** - * Register a enabled status change handler to this Grid. - * The event for this handler is fired when the Grid changes from disabled - * to enabled and vice-versa. - * @param handler the handler for the event + * Register a enabled status change handler to this Grid. The event for this + * handler is fired when the Grid changes from disabled to enabled and + * vice-versa. + * + * @param handler + * the handler for the event * @return the registration for the event */ public HandlerRegistration addEnabledHandler(GridEnabledHandler handler) { @@ -8295,7 +8331,8 @@ public class Grid<T> extends ResizeComposite implements * the cell style generator to set, or <code>null</code> to * remove a previously set generator */ - public void setCellStyleGenerator(CellStyleGenerator<T> cellStyleGenerator) { + public void setCellStyleGenerator( + CellStyleGenerator<T> cellStyleGenerator) { this.cellStyleGenerator = cellStyleGenerator; refreshBody(); } @@ -8536,7 +8573,8 @@ public class Grid<T> extends ResizeComposite implements @Override public void execute() { - if (escalator.getInnerWidth() != autoColumnWidthsRecalculator.lastCalculatedInnerWidth) { + if (escalator + .getInnerWidth() != autoColumnWidthsRecalculator.lastCalculatedInnerWidth) { recalculateColumnWidths(); } diff --git a/client/src/main/java/com/vaadin/client/widgets/Overlay.java b/client/src/main/java/com/vaadin/client/widgets/Overlay.java index ee20e1a9f1..7d44b96892 100644 --- a/client/src/main/java/com/vaadin/client/widgets/Overlay.java +++ b/client/src/main/java/com/vaadin/client/widgets/Overlay.java @@ -71,8 +71,8 @@ import com.vaadin.client.WidgetUtil; * </p> * * <p> - * Read more about the DropShadow filter from <a - * href="http://msdn.microsoft.com/en-us/library/ms532985(v=vs.85).aspx" + * Read more about the DropShadow filter from + * <a href="http://msdn.microsoft.com/en-us/library/ms532985(v=vs.85).aspx" * >Microsoft Developer Network</a> * </p> * @@ -583,11 +583,12 @@ public class Overlay extends PopupPanel implements CloseHandler<PopupPanel> { public void onAnimationEnd(NativeEvent event) { String animationName = AnimationUtil .getAnimationName(event); - if (animationName - .contains(ADDITIONAL_CLASSNAME_ANIMATE_IN)) { + if (animationName.contains( + ADDITIONAL_CLASSNAME_ANIMATE_IN)) { AnimationUtil.removeAnimationEndListener( getElement(), animateInListener); - removeStyleDependentName(ADDITIONAL_CLASSNAME_ANIMATE_IN); + removeStyleDependentName( + ADDITIONAL_CLASSNAME_ANIMATE_IN); if (isShadowEnabled()) { shadow.removeClassName(CLASSNAME_SHADOW + "-" @@ -770,18 +771,12 @@ public class Overlay extends PopupPanel implements CloseHandler<PopupPanel> { // Opera fix, part 2 (ticket #2704) if (BrowserInfo.get().isOpera()) { // We'll fix the height of all the middle elements - DOM.getChild(shadow, 3) - .getStyle() - .setPropertyPx("height", - DOM.getChild(shadow, 3).getOffsetHeight()); - DOM.getChild(shadow, 4) - .getStyle() - .setPropertyPx("height", - DOM.getChild(shadow, 4).getOffsetHeight()); - DOM.getChild(shadow, 5) - .getStyle() - .setPropertyPx("height", - DOM.getChild(shadow, 5).getOffsetHeight()); + DOM.getChild(shadow, 3).getStyle().setPropertyPx("height", + DOM.getChild(shadow, 3).getOffsetHeight()); + DOM.getChild(shadow, 4).getStyle().setPropertyPx("height", + DOM.getChild(shadow, 4).getOffsetHeight()); + DOM.getChild(shadow, 5).getStyle().setPropertyPx("height", + DOM.getChild(shadow, 5).getOffsetHeight()); } } @@ -1019,14 +1014,13 @@ public class Overlay extends PopupPanel implements CloseHandler<PopupPanel> { if (BrowserInfo.get().isIE8() || BrowserInfo.get().isIE9()) { reallyHide(autoClosed); } else { - if (animateIn - && getStyleName().contains(ADDITIONAL_CLASSNAME_ANIMATE_IN)) { + if (animateIn && getStyleName() + .contains(ADDITIONAL_CLASSNAME_ANIMATE_IN)) { AnimationUtil.addAnimationEndListener(getElement(), new AnimationEndListener() { @Override public void onAnimationEnd(NativeEvent event) { - if (AnimationUtil - .getAnimationName(event) + if (AnimationUtil.getAnimationName(event) .contains( ADDITIONAL_CLASSNAME_ANIMATE_IN)) { reallyHide(autoClosed); @@ -1046,9 +1040,8 @@ public class Overlay extends PopupPanel implements CloseHandler<PopupPanel> { animationName = ""; } - if (animateOut - && animationName - .contains(ADDITIONAL_CLASSNAME_ANIMATE_OUT)) { + if (animateOut && animationName + .contains(ADDITIONAL_CLASSNAME_ANIMATE_OUT)) { // Disable GWT PopupPanel closing animation if used setAnimationEnabled(false); @@ -1058,21 +1051,24 @@ public class Overlay extends PopupPanel implements CloseHandler<PopupPanel> { public void onAnimationEnd(NativeEvent event) { String animationName = AnimationUtil .getAnimationName(event); - if (animationName - .contains(ADDITIONAL_CLASSNAME_ANIMATE_OUT)) { + if (animationName.contains( + ADDITIONAL_CLASSNAME_ANIMATE_OUT)) { AnimationUtil - .removeAllAnimationEndListeners(getElement()); + .removeAllAnimationEndListeners( + getElement()); // Remove both animation styles just in // case - removeStyleDependentName(ADDITIONAL_CLASSNAME_ANIMATE_IN); - removeStyleDependentName(ADDITIONAL_CLASSNAME_ANIMATE_OUT); + removeStyleDependentName( + ADDITIONAL_CLASSNAME_ANIMATE_IN); + removeStyleDependentName( + ADDITIONAL_CLASSNAME_ANIMATE_OUT); if (isShadowEnabled()) { - shadow.removeClassName(CLASSNAME_SHADOW - + "-" - + ADDITIONAL_CLASSNAME_ANIMATE_IN); - shadow.removeClassName(CLASSNAME_SHADOW - + "-" - + ADDITIONAL_CLASSNAME_ANIMATE_OUT); + shadow.removeClassName( + CLASSNAME_SHADOW + "-" + + ADDITIONAL_CLASSNAME_ANIMATE_IN); + shadow.removeClassName( + CLASSNAME_SHADOW + "-" + + ADDITIONAL_CLASSNAME_ANIMATE_OUT); } reallyHide(autoClosed); } diff --git a/client/src/test/java/com/vaadin/client/ApplicationConnectionURLGenerationTest.java b/client/src/test/java/com/vaadin/client/ApplicationConnectionURLGenerationTest.java index 4dd2ddbaa4..8a84208ea8 100644 --- a/client/src/test/java/com/vaadin/client/ApplicationConnectionURLGenerationTest.java +++ b/client/src/test/java/com/vaadin/client/ApplicationConnectionURLGenerationTest.java @@ -10,10 +10,8 @@ public class ApplicationConnectionURLGenerationTest { private static final String[] URIS = new String[] { "http://demo.vaadin.com/", // - "https://demo.vaadin.com/", - "http://demo.vaadin.com/foo", - "http://demo.vaadin.com/foo?f", - "http://demo.vaadin.com/foo?f=1", + "https://demo.vaadin.com/", "http://demo.vaadin.com/foo", + "http://demo.vaadin.com/foo?f", "http://demo.vaadin.com/foo?f=1", "http://demo.vaadin.com:1234/foo?a", "http://demo.vaadin.com:1234/foo#frag?fakeparam", // Jetspeed @@ -41,8 +39,7 @@ public class ApplicationConnectionURLGenerationTest { "http://demo.vaadin.com/foo?a=b&c=d#fragment", "http://demo.vaadin.com/foo?f&a=b&c=d#fragment", "http://demo.vaadin.com/foo?f=1&a=b&c=d#fragment", - "http://demo.vaadin.com:1234/foo?a&a=b&c=d#fragment", - "", + "http://demo.vaadin.com:1234/foo?a&a=b&c=d#fragment", "", "http://localhost:8080/jetspeed/portal/_ns:Z3RlbXBsYXRlLXRvcDJfX3BhZ2UtdGVtcGxhdGVfX2RwLTFfX1AtMTJjNTRkYjdlYjUtMTAwMDJ8YzB8ZDF8aVVJREx8Zg__?a=b&c=d#fragment", "http://vaadin.com/directory?p_p_id=Directory_WAR_Directory&p_p_lifecycle=2&p_p_state=normal&p_p_mode=view&p_p_resource_id=UIDL&p_p_cacheability=cacheLevelPage&p_p_col_id=row-1&p_p_col_count=1&a=b&c=d#fragment", @@ -60,14 +57,14 @@ public class ApplicationConnectionURLGenerationTest { // Fragments if (URIS_WITH_ABCD_PARAM_AND_FRAGMENT[i].length() > 0) { - assertEquals(URIS_WITH_ABCD_PARAM_AND_FRAGMENT[i], - SharedUtil.addGetParameters(URIS[i] + "#fragment", - "a=b&c=d")); + assertEquals(URIS_WITH_ABCD_PARAM_AND_FRAGMENT[i], SharedUtil + .addGetParameters(URIS[i] + "#fragment", "a=b&c=d")); // Empty fragment - assertEquals(URIS_WITH_ABCD_PARAM_AND_FRAGMENT[i].replace( - "#fragment", "#"), SharedUtil.addGetParameters(URIS[i] - + "#", "a=b&c=d")); + assertEquals( + URIS_WITH_ABCD_PARAM_AND_FRAGMENT[i] + .replace("#fragment", "#"), + SharedUtil.addGetParameters(URIS[i] + "#", "a=b&c=d")); } } } diff --git a/client/src/test/java/com/vaadin/client/DateTimeServiceTest.java b/client/src/test/java/com/vaadin/client/DateTimeServiceTest.java index e5e6cbd7db..97eb22e87d 100755 --- a/client/src/test/java/com/vaadin/client/DateTimeServiceTest.java +++ b/client/src/test/java/com/vaadin/client/DateTimeServiceTest.java @@ -94,9 +94,10 @@ public class DateTimeServiceTest { // System.out.println("Sample: " + d); int expected = isoWeekNumbers.get(d); int calculated = DateTimeService.getISOWeekNumber(d); - Assert.assertEquals(d + " should be week " + expected - + " (Java Calendar is wrong?)", expected, - getCalendarISOWeekNr(d)); + Assert.assertEquals( + d + " should be week " + expected + + " (Java Calendar is wrong?)", + expected, getCalendarISOWeekNr(d)); Assert.assertEquals(d + " should be week " + expected, expected, calculated); diff --git a/client/src/test/java/com/vaadin/client/VBrowserDetailsUserAgentParserTest.java b/client/src/test/java/com/vaadin/client/VBrowserDetailsUserAgentParserTest.java index 41e675cb3a..c7eaf306fe 100644 --- a/client/src/test/java/com/vaadin/client/VBrowserDetailsUserAgentParserTest.java +++ b/client/src/test/java/com/vaadin/client/VBrowserDetailsUserAgentParserTest.java @@ -415,7 +415,8 @@ public class VBrowserDetailsUserAgentParserTest { @Test public void testIE9InIE8CompatibilityMode() { - VBrowserDetails bd = new VBrowserDetails(IE9_BETA_IN_IE8_MODE_WINDOWS_7); + VBrowserDetails bd = new VBrowserDetails( + IE9_BETA_IN_IE8_MODE_WINDOWS_7); // bd.setIE8InCompatibilityMode(); /* @@ -621,8 +622,8 @@ public class VBrowserDetailsUserAgentParserTest { assertFalse(browserDetails.isAndroid()); } - private void assertAndroid(VBrowserDetails browserDetails, - int majorVersion, int minorVersion) { + private void assertAndroid(VBrowserDetails browserDetails, int majorVersion, + int minorVersion) { assertFalse(browserDetails.isLinux()); assertFalse(browserDetails.isWindows()); assertFalse(browserDetails.isMacOSX()); diff --git a/client/src/test/java/com/vaadin/client/ui/grid/ListDataSourceTest.java b/client/src/test/java/com/vaadin/client/ui/grid/ListDataSourceTest.java index 24ccd6c57e..89a2e80679 100644 --- a/client/src/test/java/com/vaadin/client/ui/grid/ListDataSourceTest.java +++ b/client/src/test/java/com/vaadin/client/ui/grid/ListDataSourceTest.java @@ -185,8 +185,8 @@ public class ListDataSourceTest { } }); - assertTrue(Arrays.equals(ds.asList().toArray(), new Integer[] { 1, 2, - 3, 3, 4 })); + assertTrue(Arrays.equals(ds.asList().toArray(), + new Integer[] { 1, 2, 3, 3, 4 })); } } diff --git a/server/src/main/java/com/vaadin/data/Buffered.java b/server/src/main/java/com/vaadin/data/Buffered.java index 4f34da5c7c..1f8924062b 100644 --- a/server/src/main/java/com/vaadin/data/Buffered.java +++ b/server/src/main/java/com/vaadin/data/Buffered.java @@ -110,8 +110,8 @@ public interface Buffered extends Serializable { * @since 3.0 */ @SuppressWarnings("serial") - public class SourceException extends RuntimeException implements - Serializable { + public class SourceException extends RuntimeException + implements Serializable { /** Source class implementing the buffered interface */ private final Buffered source; diff --git a/server/src/main/java/com/vaadin/data/BufferedValidatable.java b/server/src/main/java/com/vaadin/data/BufferedValidatable.java index 584f196a0c..4b5e131f34 100644 --- a/server/src/main/java/com/vaadin/data/BufferedValidatable.java +++ b/server/src/main/java/com/vaadin/data/BufferedValidatable.java @@ -30,8 +30,8 @@ import com.vaadin.legacy.data.Validatable; * @author Vaadin Ltd. * @since 3.0 */ -public interface BufferedValidatable extends Buffered, Validatable, - Serializable { +public interface BufferedValidatable + extends Buffered, Validatable, Serializable { /** * Tests if the invalid data is committed to datasource. The default is diff --git a/server/src/main/java/com/vaadin/data/Container.java b/server/src/main/java/com/vaadin/data/Container.java index fb7a93e832..746139ecb5 100644 --- a/server/src/main/java/com/vaadin/data/Container.java +++ b/server/src/main/java/com/vaadin/data/Container.java @@ -760,8 +760,9 @@ public interface Container extends Serializable { /** * Tests if the Item specified with <code>itemId</code> is a root Item. * The hierarchical container can have more than one root and must have - * at least one unless it is empty. The {@link #getParent(Object itemId)} - * method always returns <code>null</code> for root Items. + * at least one unless it is empty. The + * {@link #getParent(Object itemId)} method always returns + * <code>null</code> for root Items. * * @param itemId * ID of the Item whose root status is to be tested @@ -1248,6 +1249,7 @@ public interface Container extends Serializable { * {@link #removePropertySetChangeListener(PropertySetChangeListener)} **/ @Deprecated - public void removeListener(Container.PropertySetChangeListener listener); + public void removeListener( + Container.PropertySetChangeListener listener); } } diff --git a/server/src/main/java/com/vaadin/data/ContainerHelpers.java b/server/src/main/java/com/vaadin/data/ContainerHelpers.java index 817bec9474..cba93f9338 100644 --- a/server/src/main/java/com/vaadin/data/ContainerHelpers.java +++ b/server/src/main/java/com/vaadin/data/ContainerHelpers.java @@ -88,8 +88,7 @@ public class ContainerHelpers implements Serializable { Object idByIndex = container.getIdByIndex(i); if (idByIndex == null) { throw new RuntimeException( - "Unable to get item id for index: " - + i + "Unable to get item id for index: " + i + " from container using Container.Indexed#getIdByIndex() " + "even though container.size() > endIndex. " + "Returned item id was null. " diff --git a/server/src/main/java/com/vaadin/data/HasValue.java b/server/src/main/java/com/vaadin/data/HasValue.java index 6032fcb2be..4ab27e65b1 100644 --- a/server/src/main/java/com/vaadin/data/HasValue.java +++ b/server/src/main/java/com/vaadin/data/HasValue.java @@ -57,8 +57,8 @@ public interface HasValue<V> extends Serializable { * {@code true} if this event originates from the client, * {@code false} otherwise. */ - public <C extends ClientConnector & HasValue<V>> ValueChange( - C source, boolean userOriginated) { + public <C extends ClientConnector & HasValue<V>> ValueChange(C source, + boolean userOriginated) { super(source); this.value = source.getValue(); this.userOriginated = userOriginated; @@ -95,8 +95,8 @@ public interface HasValue<V> extends Serializable { * @see Registration */ @FunctionalInterface - public interface ValueChangeListener<V> extends Consumer<ValueChange<V>>, - ConnectorEventListener { + public interface ValueChangeListener<V> + extends Consumer<ValueChange<V>>, ConnectorEventListener { /** * Invoked when this listener receives a value change event from an diff --git a/server/src/main/java/com/vaadin/data/Property.java b/server/src/main/java/com/vaadin/data/Property.java index 74ae1f86ec..23af4ae306 100644 --- a/server/src/main/java/com/vaadin/data/Property.java +++ b/server/src/main/java/com/vaadin/data/Property.java @@ -304,7 +304,8 @@ public interface Property<T> extends Serializable { * @param listener * the new Listener to be registered */ - public void addValueChangeListener(Property.ValueChangeListener listener); + public void addValueChangeListener( + Property.ValueChangeListener listener); /** * @deprecated As of 7.0, replaced by diff --git a/server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java b/server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java index 67ff285647..2a9aeb8c7f 100644 --- a/server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java +++ b/server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java @@ -54,15 +54,15 @@ public class BeanFieldGroup<T> extends FieldGroup { propertyId.toString()); if (type == null) { throw new BindException( - "Cannot determine type of propertyId '" - + propertyId + "Cannot determine type of propertyId '" + propertyId + "'. The propertyId was not found in " + beanType.getName()); } return type; } catch (IntrospectionException e) { throw new BindException("Cannot determine type of propertyId '" - + propertyId + "'. Unable to introspect " + beanType, e); + + propertyId + "'. Unable to introspect " + beanType, + e); } } } @@ -71,7 +71,8 @@ public class BeanFieldGroup<T> extends FieldGroup { protected Object findPropertyId(java.lang.reflect.Field memberField) { String fieldName = memberField.getName(); Item dataSource = getItemDataSource(); - if (dataSource != null && dataSource.getItemProperty(fieldName) != null) { + if (dataSource != null + && dataSource.getItemProperty(fieldName) != null) { return fieldName; } else { String minifiedFieldName = minifyFieldName(fieldName); @@ -155,8 +156,8 @@ public class BeanFieldGroup<T> extends FieldGroup { } @Override - public <T extends LegacyField> T buildAndBind(String caption, Object propertyId, - Class<T> fieldType) throws BindException { + public <T extends LegacyField> T buildAndBind(String caption, + Object propertyId, Class<T> fieldType) throws BindException { ensureNestedPropertyAdded(propertyId); return super.buildAndBind(caption, propertyId, fieldType); } @@ -226,7 +227,8 @@ public class BeanFieldGroup<T> extends FieldGroup { * @param bean * the bean to be bound * @param objectWithMemberFields - * the class that contains {@link LegacyField}s for bean properties + * the class that contains {@link LegacyField}s for bean + * properties * @return the bean field group used to make binding */ public static <T> BeanFieldGroup<T> bindFieldsUnbuffered(T bean, @@ -247,7 +249,8 @@ public class BeanFieldGroup<T> extends FieldGroup { * @param bean * the bean to be bound * @param objectWithMemberFields - * the class that contains {@link LegacyField}s for bean properties + * the class that contains {@link LegacyField}s for bean + * properties * @return the bean field group used to make binding */ public static <T> BeanFieldGroup<T> bindFieldsBuffered(T bean, diff --git a/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java b/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java index fb2a579093..140912ec84 100644 --- a/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java +++ b/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java @@ -20,8 +20,8 @@ import java.io.Serializable; import com.vaadin.legacy.ui.LegacyField; /** - * Factory interface for creating new LegacyField-instances based on the data type - * that should be edited. + * Factory interface for creating new LegacyField-instances based on the data + * type that should be edited. * * @author Vaadin Ltd. * @since 7.0 @@ -33,10 +33,11 @@ public interface FieldGroupFieldFactory extends Serializable { * @param dataType * The type that we want to edit using the field * @param fieldType - * The type of field we want to create. If set to {@link LegacyField} - * then any type of field is accepted + * The type of field we want to create. If set to + * {@link LegacyField} then any type of field is accepted * @return A field that can be assigned to the given fieldType and that is * capable of editing the given type of data */ - <T extends LegacyField> T createField(Class<?> dataType, Class<T> fieldType); + <T extends LegacyField> T createField(Class<?> dataType, + Class<T> fieldType); } diff --git a/server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java b/server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java index c8be515c6d..3a31a79a7d 100644 --- a/server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java +++ b/server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java @@ -27,9 +27,9 @@ import java.lang.annotation.Target; * The automatic data binding in FieldGroup and BeanFieldGroup relies on a * naming convention by default: properties of an item are bound to similarly * named field components in given a editor object. If you want to map a - * property with a different name (ID) to a {@link com.vaadin.client.ui.LegacyField}, - * you can use this annotation for the member fields, with the name (ID) of the - * desired property as the parameter. + * property with a different name (ID) to a + * {@link com.vaadin.client.ui.LegacyField}, you can use this annotation for the + * member fields, with the name (ID) of the desired property as the parameter. * <p> * In following usage example, the text field would be bound to property "foo" * in the Entity class. <code> diff --git a/server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java b/server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java index 6dcfbb2b84..7b1e53c72f 100644 --- a/server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java +++ b/server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java @@ -60,9 +60,9 @@ import com.vaadin.data.util.filter.UnsupportedFilterException; * * @since 6.5 */ -public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends - AbstractInMemoryContainer<IDTYPE, String, BeanItem<BEANTYPE>> implements - Filterable, SimpleFilterable, Sortable, ValueChangeListener, +public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> + extends AbstractInMemoryContainer<IDTYPE, String, BeanItem<BEANTYPE>> + implements Filterable, SimpleFilterable, Sortable, ValueChangeListener, PropertySetChangeNotifier { /** @@ -78,8 +78,8 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends * * @since 6.5 */ - public static interface BeanIdResolver<IDTYPE, BEANTYPE> extends - Serializable { + public static interface BeanIdResolver<IDTYPE, BEANTYPE> + extends Serializable { /** * Return the item identifier for a bean. * @@ -95,8 +95,8 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends * The bean must have a getter for the property, and the getter must return * an object of type IDTYPE. */ - protected class PropertyBasedBeanIdResolver implements - BeanIdResolver<IDTYPE, BEANTYPE> { + protected class PropertyBasedBeanIdResolver + implements BeanIdResolver<IDTYPE, BEANTYPE> { private final Object propertyId; @@ -114,8 +114,8 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends throws IllegalArgumentException { VaadinPropertyDescriptor<BEANTYPE> pd = model.get(propertyId); if (null == pd) { - throw new IllegalStateException("Property " + propertyId - + " not found"); + throw new IllegalStateException( + "Property " + propertyId + " not found"); } try { Property<IDTYPE> property = (Property<IDTYPE>) pd @@ -618,8 +618,8 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends * if an identifier cannot be resolved for the bean */ protected BeanItem<BEANTYPE> addBeanAfter(IDTYPE previousItemId, - BEANTYPE bean) throws IllegalStateException, - IllegalArgumentException { + BEANTYPE bean) + throws IllegalStateException, IllegalArgumentException { if (bean == null) { return null; } @@ -698,7 +698,8 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends "Resolved identifier for a bean must not be null"); } - if (internalAddItemAtEnd(itemId, createBeanItem(bean), false) != null) { + if (internalAddItemAtEnd(itemId, createBeanItem(bean), + false) != null) { modified = true; } } @@ -862,8 +863,8 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends * @return true if the property was added */ public boolean addNestedContainerProperty(String propertyId) { - return addContainerProperty(propertyId, new NestedPropertyDescriptor( - propertyId, type)); + return addContainerProperty(propertyId, + new NestedPropertyDescriptor(propertyId, type)); } /** @@ -914,7 +915,8 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends model.remove(propertyId); // If remove the Property from all Items - for (final Iterator<IDTYPE> i = getAllItemIds().iterator(); i.hasNext();) { + for (final Iterator<IDTYPE> i = getAllItemIds().iterator(); i + .hasNext();) { getUnfilteredItem(i.next()).removeItemProperty(propertyId); } diff --git a/server/src/main/java/com/vaadin/data/util/AbstractContainer.java b/server/src/main/java/com/vaadin/data/util/AbstractContainer.java index dafdd15b06..c9c77be6e6 100644 --- a/server/src/main/java/com/vaadin/data/util/AbstractContainer.java +++ b/server/src/main/java/com/vaadin/data/util/AbstractContainer.java @@ -78,8 +78,8 @@ public abstract class AbstractContainer implements Container { * performed, but subclasses can add provide additional information about * the changes. */ - protected static class BaseItemSetChangeEvent extends EventObject implements - Container.ItemSetChangeEvent, Serializable { + protected static class BaseItemSetChangeEvent extends EventObject + implements Container.ItemSetChangeEvent, Serializable { protected BaseItemSetChangeEvent(Container source) { super(source); @@ -103,7 +103,8 @@ public abstract class AbstractContainer implements Container { protected void addPropertySetChangeListener( Container.PropertySetChangeListener listener) { if (getPropertySetChangeListeners() == null) { - setPropertySetChangeListeners(new LinkedList<Container.PropertySetChangeListener>()); + setPropertySetChangeListeners( + new LinkedList<Container.PropertySetChangeListener>()); } getPropertySetChangeListeners().add(listener); } @@ -137,7 +138,8 @@ public abstract class AbstractContainer implements Container { * {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} **/ @Deprecated - protected void removeListener(Container.PropertySetChangeListener listener) { + protected void removeListener( + Container.PropertySetChangeListener listener) { removePropertySetChangeListener(listener); } @@ -153,7 +155,8 @@ public abstract class AbstractContainer implements Container { protected void addItemSetChangeListener( Container.ItemSetChangeListener listener) { if (getItemSetChangeListeners() == null) { - setItemSetChangeListeners(new LinkedList<Container.ItemSetChangeListener>()); + setItemSetChangeListeners( + new LinkedList<Container.ItemSetChangeListener>()); } getItemSetChangeListeners().add(listener); } @@ -281,7 +284,8 @@ public abstract class AbstractContainer implements Container { } public Collection<?> getListeners(Class<?> eventType) { - if (Container.PropertySetChangeEvent.class.isAssignableFrom(eventType)) { + if (Container.PropertySetChangeEvent.class + .isAssignableFrom(eventType)) { if (propertySetChangeListeners == null) { return Collections.EMPTY_LIST; } else { diff --git a/server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java b/server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java index f7b1a4b0d8..095d4929a6 100644 --- a/server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java +++ b/server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java @@ -53,11 +53,11 @@ import com.vaadin.data.util.filter.UnsupportedFilterException; * * Features: * <ul> - * <li> {@link Container.Ordered} - * <li> {@link Container.Indexed} - * <li> {@link Filterable} and {@link SimpleFilterable} (internal implementation, + * <li>{@link Container.Ordered} + * <li>{@link Container.Indexed} + * <li>{@link Filterable} and {@link SimpleFilterable} (internal implementation, * does not implement the interface directly) - * <li> {@link Sortable} (internal implementation, does not implement the + * <li>{@link Sortable} (internal implementation, does not implement the * interface directly) * </ul> * @@ -94,8 +94,8 @@ import com.vaadin.data.util.filter.UnsupportedFilterException; * @since 6.6 */ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITEMCLASS extends Item> - extends AbstractContainer implements ItemSetChangeNotifier, - Container.Indexed { + extends AbstractContainer + implements ItemSetChangeNotifier, Container.Indexed { /** * An ordered {@link List} of all item identifiers in the container, @@ -363,8 +363,8 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE endIndex = getVisibleItemIds().size(); } - return Collections.unmodifiableList(getVisibleItemIds().subList( - startIndex, endIndex)); + return Collections.unmodifiableList( + getVisibleItemIds().subList(startIndex, endIndex)); } @@ -913,9 +913,8 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE if (previousItemId == null) { newItem = internalAddAt(0, newItemId, item); } else if (containsId(previousItemId)) { - newItem = internalAddAt( - getAllItemIds().indexOf(previousItemId) + 1, newItemId, - item); + newItem = internalAddAt(getAllItemIds().indexOf(previousItemId) + 1, + newItemId, item); } if (newItem != null && filter) { // TODO filter only this item, use fireItemAdded() @@ -990,7 +989,8 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE * @param item * the added item */ - protected void fireItemAdded(int position, ITEMIDTYPE itemId, ITEMCLASS item) { + protected void fireItemAdded(int position, ITEMIDTYPE itemId, + ITEMCLASS item) { fireItemsAdded(position, itemId, 1); } diff --git a/server/src/main/java/com/vaadin/data/util/BeanContainer.java b/server/src/main/java/com/vaadin/data/util/BeanContainer.java index 9b878d627e..c1dd3a93cf 100644 --- a/server/src/main/java/com/vaadin/data/util/BeanContainer.java +++ b/server/src/main/java/com/vaadin/data/util/BeanContainer.java @@ -68,8 +68,8 @@ import java.util.Collection; * * @since 6.5 */ -public class BeanContainer<IDTYPE, BEANTYPE> extends - AbstractBeanContainer<IDTYPE, BEANTYPE> { +public class BeanContainer<IDTYPE, BEANTYPE> + extends AbstractBeanContainer<IDTYPE, BEANTYPE> { public BeanContainer(Class<? super BEANTYPE> type) { super(type); diff --git a/server/src/main/java/com/vaadin/data/util/BeanItem.java b/server/src/main/java/com/vaadin/data/util/BeanItem.java index 71f51c3feb..2f34350f28 100644 --- a/server/src/main/java/com/vaadin/data/util/BeanItem.java +++ b/server/src/main/java/com/vaadin/data/util/BeanItem.java @@ -131,8 +131,8 @@ public class BeanItem<BT> extends PropertysetItem { this.bean = bean; // Create bean information - LinkedHashMap<String, VaadinPropertyDescriptor<BT>> pds = getPropertyDescriptors((Class<BT>) bean - .getClass()); + LinkedHashMap<String, VaadinPropertyDescriptor<BT>> pds = getPropertyDescriptors( + (Class<BT>) bean.getClass()); // Add all the bean properties as MethodProperties to this Item for (Object id : propertyIds) { @@ -248,8 +248,8 @@ public class BeanItem<BT> extends PropertysetItem { * property id to add. */ public void addNestedProperty(String nestedPropertyId) { - addItemProperty(nestedPropertyId, new NestedMethodProperty<Object>( - getBean(), nestedPropertyId)); + addItemProperty(nestedPropertyId, + new NestedMethodProperty<Object>(getBean(), nestedPropertyId)); } /** diff --git a/server/src/main/java/com/vaadin/data/util/BeanItemContainer.java b/server/src/main/java/com/vaadin/data/util/BeanItemContainer.java index d5d399f0f8..542254ca8d 100644 --- a/server/src/main/java/com/vaadin/data/util/BeanItemContainer.java +++ b/server/src/main/java/com/vaadin/data/util/BeanItemContainer.java @@ -52,8 +52,8 @@ import java.util.Collection; * @since 5.4 */ @SuppressWarnings("serial") -public class BeanItemContainer<BEANTYPE> extends - AbstractBeanContainer<BEANTYPE, BEANTYPE> { +public class BeanItemContainer<BEANTYPE> + extends AbstractBeanContainer<BEANTYPE, BEANTYPE> { /** * Bean identity resolver that returns the bean itself as its item @@ -67,8 +67,8 @@ public class BeanItemContainer<BEANTYPE> extends * * @since 6.5 */ - private static class IdentityBeanIdResolver<BT> implements - BeanIdResolver<BT, BT> { + private static class IdentityBeanIdResolver<BT> + implements BeanIdResolver<BT, BT> { @Override public BT getIdForBean(BT bean) { diff --git a/server/src/main/java/com/vaadin/data/util/BeanUtil.java b/server/src/main/java/com/vaadin/data/util/BeanUtil.java index 1356cf5359..408e014baf 100644 --- a/server/src/main/java/com/vaadin/data/util/BeanUtil.java +++ b/server/src/main/java/com/vaadin/data/util/BeanUtil.java @@ -100,12 +100,12 @@ public final class BeanUtil implements Serializable { // Find the rest from the sub type return getPropertyType(propertyBean, parts[1]); } else { - List<PropertyDescriptor> descriptors = getBeanPropertyDescriptor(clazz); + List<PropertyDescriptor> descriptors = getBeanPropertyDescriptor( + clazz); for (PropertyDescriptor descriptor : descriptors) { final Method getMethod = descriptor.getReadMethod(); - if (descriptor.getName().equals(propertyId) - && getMethod != null + if (descriptor.getName().equals(propertyId) && getMethod != null && getMethod.getDeclaringClass() != Object.class) { return descriptor.getPropertyType(); } @@ -122,8 +122,8 @@ public final class BeanUtil implements Serializable { descriptors.length); for (PropertyDescriptor descriptor : descriptors) { try { - Method readMethod = getMethodFromBridge(descriptor - .getReadMethod()); + Method readMethod = getMethodFromBridge( + descriptor.getReadMethod()); if (readMethod != null) { Method writeMethod = getMethodFromBridge( descriptor.getWriteMethod(), @@ -170,8 +170,8 @@ public final class BeanUtil implements Serializable { return null; } try { - return bridgeMethod.getDeclaringClass().getMethod( - bridgeMethod.getName(), paramTypes); + return bridgeMethod.getDeclaringClass() + .getMethod(bridgeMethod.getName(), paramTypes); } catch (NoSuchMethodException e) { return null; } diff --git a/server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java index 8590528f43..8e39255253 100644 --- a/server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java +++ b/server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java @@ -73,8 +73,8 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * A comparator that sorts the listed items before other items. Otherwise, * the order is undefined. */ - private static class ListedItemsFirstComparator implements - Comparator<Object>, Serializable { + private static class ListedItemsFirstComparator + implements Comparator<Object>, Serializable { private final Collection<?> itemIds; private ListedItemsFirstComparator(Collection<?> itemIds) { @@ -373,8 +373,8 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, // If the wrapped container implements the method directly, use it if (hierarchical) { - return ((Container.Hierarchical) container).setChildrenAllowed( - itemId, childrenAllowed); + return ((Container.Hierarchical) container) + .setChildrenAllowed(itemId, childrenAllowed); } // Check that the item is in the container @@ -457,7 +457,8 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, // Check that the new parent exists in container and can have // children - if (!containsId(newParentId) || noChildrenAllowed.contains(newParentId)) { + if (!containsId(newParentId) + || noChildrenAllowed.contains(newParentId)) { return false; } @@ -753,7 +754,8 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, Container.ItemSetChangeListener listener) { if (container instanceof Container.ItemSetChangeNotifier) { ((Container.ItemSetChangeNotifier) container) - .removeItemSetChangeListener(new PiggybackListener(listener)); + .removeItemSetChangeListener( + new PiggybackListener(listener)); } } @@ -777,8 +779,8 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, Container.PropertySetChangeListener listener) { if (container instanceof Container.PropertySetChangeNotifier) { ((Container.PropertySetChangeNotifier) container) - .addPropertySetChangeListener(new PiggybackListener( - listener)); + .addPropertySetChangeListener( + new PiggybackListener(listener)); } } @@ -802,8 +804,8 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, Container.PropertySetChangeListener listener) { if (container instanceof Container.PropertySetChangeNotifier) { ((Container.PropertySetChangeNotifier) container) - .removePropertySetChangeListener(new PiggybackListener( - listener)); + .removePropertySetChangeListener( + new PiggybackListener(listener)); } } @@ -823,8 +825,8 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * listener so that the correct listener gets removed. * */ - private class PiggybackListener implements - Container.PropertySetChangeListener, + private class PiggybackListener + implements Container.PropertySetChangeListener, Container.ItemSetChangeListener { Object listener; diff --git a/server/src/main/java/com/vaadin/data/util/ContainerOrderedWrapper.java b/server/src/main/java/com/vaadin/data/util/ContainerOrderedWrapper.java index 53f4840322..f9519c7282 100644 --- a/server/src/main/java/com/vaadin/data/util/ContainerOrderedWrapper.java +++ b/server/src/main/java/com/vaadin/data/util/ContainerOrderedWrapper.java @@ -565,7 +565,8 @@ public class ContainerOrderedWrapper implements Container.Ordered, Container.ItemSetChangeListener listener) { if (container instanceof Container.ItemSetChangeNotifier) { ((Container.ItemSetChangeNotifier) container) - .removeItemSetChangeListener(new PiggybackListener(listener)); + .removeItemSetChangeListener( + new PiggybackListener(listener)); } } @@ -589,8 +590,8 @@ public class ContainerOrderedWrapper implements Container.Ordered, Container.PropertySetChangeListener listener) { if (container instanceof Container.PropertySetChangeNotifier) { ((Container.PropertySetChangeNotifier) container) - .addPropertySetChangeListener(new PiggybackListener( - listener)); + .addPropertySetChangeListener( + new PiggybackListener(listener)); } } @@ -614,8 +615,8 @@ public class ContainerOrderedWrapper implements Container.Ordered, Container.PropertySetChangeListener listener) { if (container instanceof Container.PropertySetChangeNotifier) { ((Container.PropertySetChangeNotifier) container) - .removePropertySetChangeListener(new PiggybackListener( - listener)); + .removePropertySetChangeListener( + new PiggybackListener(listener)); } } @@ -686,8 +687,8 @@ public class ContainerOrderedWrapper implements Container.Ordered, * listener so that the correct listener gets removed. * */ - private class PiggybackListener implements - Container.PropertySetChangeListener, + private class PiggybackListener + implements Container.PropertySetChangeListener, Container.ItemSetChangeListener { Object listener; diff --git a/server/src/main/java/com/vaadin/data/util/DefaultItemSorter.java b/server/src/main/java/com/vaadin/data/util/DefaultItemSorter.java index 9728ccbd51..9bbbdd06e8 100644 --- a/server/src/main/java/com/vaadin/data/util/DefaultItemSorter.java +++ b/server/src/main/java/com/vaadin/data/util/DefaultItemSorter.java @@ -156,9 +156,8 @@ public class DefaultItemSorter implements ItemSorter { /* * (non-Javadoc) * - * @see - * com.vaadin.data.util.ItemSorter#setSortProperties(com.vaadin.data.Container - * .Sortable, java.lang.Object[], boolean[]) + * @see com.vaadin.data.util.ItemSorter#setSortProperties(com.vaadin.data. + * Container .Sortable, java.lang.Object[], boolean[]) */ @Override public void setSortProperties(Container.Sortable container, @@ -173,8 +172,8 @@ public class DefaultItemSorter implements ItemSorter { for (int i = 0; i < propertyId.length; i++) { if (sortable.contains(propertyId[i])) { ids.add(propertyId[i]); - orders.add(Boolean.valueOf(i < ascending.length ? ascending[i] - : true)); + orders.add(Boolean + .valueOf(i < ascending.length ? ascending[i] : true)); } } @@ -192,8 +191,8 @@ public class DefaultItemSorter implements ItemSorter { * compares can be cast to Comparable. * */ - public static class DefaultPropertyValueComparator implements - Comparator<Object>, Serializable { + public static class DefaultPropertyValueComparator + implements Comparator<Object>, Serializable { @Override @SuppressWarnings("unchecked") diff --git a/server/src/main/java/com/vaadin/data/util/FilesystemContainer.java b/server/src/main/java/com/vaadin/data/util/FilesystemContainer.java index 7ceda49918..ba7fcebb36 100644 --- a/server/src/main/java/com/vaadin/data/util/FilesystemContainer.java +++ b/server/src/main/java/com/vaadin/data/util/FilesystemContainer.java @@ -372,8 +372,8 @@ public class FilesystemContainer implements Container.Hierarchical { // Try to match all roots for (int i = 0; i < roots.length; i++) { try { - val |= ((File) itemId).getCanonicalPath().startsWith( - roots[i].getCanonicalPath()); + val |= ((File) itemId).getCanonicalPath() + .startsWith(roots[i].getCanonicalPath()); } catch (final IOException e) { // Exception ignored } diff --git a/server/src/main/java/com/vaadin/data/util/GeneratedPropertyContainer.java b/server/src/main/java/com/vaadin/data/util/GeneratedPropertyContainer.java index 1fbca5f817..13416cb472 100644 --- a/server/src/main/java/com/vaadin/data/util/GeneratedPropertyContainer.java +++ b/server/src/main/java/com/vaadin/data/util/GeneratedPropertyContainer.java @@ -59,8 +59,8 @@ import com.vaadin.shared.data.sort.SortDirection; * @since 7.4 * @author Vaadin Ltd */ -public class GeneratedPropertyContainer extends AbstractContainer implements - Container.Indexed, Container.Sortable, Container.Filterable, +public class GeneratedPropertyContainer extends AbstractContainer + implements Container.Indexed, Container.Sortable, Container.Filterable, Container.PropertySetChangeNotifier, Container.ItemSetChangeNotifier { private final Container.Indexed wrappedContainer; @@ -217,8 +217,8 @@ public class GeneratedPropertyContainer extends AbstractContainer implements * event is fired from wrapped container and needs to be reconstructed to * act like it actually came from this container. */ - protected abstract class GeneratedItemAddOrRemoveEvent implements - Serializable { + protected abstract class GeneratedItemAddOrRemoveEvent + implements Serializable { private Object firstItemId; private int firstIndex; @@ -248,12 +248,12 @@ public class GeneratedPropertyContainer extends AbstractContainer implements } }; - protected class GeneratedItemRemoveEvent extends - GeneratedItemAddOrRemoveEvent implements ItemRemoveEvent { + protected class GeneratedItemRemoveEvent + extends GeneratedItemAddOrRemoveEvent implements ItemRemoveEvent { protected GeneratedItemRemoveEvent(ItemRemoveEvent event) { - super(event.getFirstItemId(), event.getFirstIndex(), event - .getRemovedItemsCount()); + super(event.getFirstItemId(), event.getFirstIndex(), + event.getRemovedItemsCount()); } @Override @@ -266,8 +266,8 @@ public class GeneratedPropertyContainer extends AbstractContainer implements implements ItemAddEvent { protected GeneratedItemAddEvent(ItemAddEvent event) { - super(event.getFirstItemId(), event.getFirstIndex(), event - .getAddedItemsCount()); + super(event.getFirstItemId(), event.getFirstIndex(), + event.getAddedItemsCount()); } @Override @@ -308,8 +308,8 @@ public class GeneratedPropertyContainer extends AbstractContainer implements ItemSetChangeEvent event) { if (event instanceof ItemAddEvent) { final ItemAddEvent addEvent = (ItemAddEvent) event; - fireItemSetChange(new GeneratedItemAddEvent( - addEvent)); + fireItemSetChange( + new GeneratedItemAddEvent(addEvent)); } else if (event instanceof ItemRemoveEvent) { final ItemRemoveEvent removeEvent = (ItemRemoveEvent) event; fireItemSetChange(new GeneratedItemRemoveEvent( @@ -324,14 +324,15 @@ public class GeneratedPropertyContainer extends AbstractContainer implements // PropertySetChangeEvents if (wrappedContainer instanceof PropertySetChangeNotifier) { ((PropertySetChangeNotifier) wrappedContainer) - .addPropertySetChangeListener(new PropertySetChangeListener() { + .addPropertySetChangeListener( + new PropertySetChangeListener() { - @Override - public void containerPropertySetChange( - PropertySetChangeEvent event) { - fireContainerPropertySetChange(); - } - }); + @Override + public void containerPropertySetChange( + PropertySetChangeEvent event) { + fireContainerPropertySetChange(); + } + }); } } @@ -401,7 +402,8 @@ public class GeneratedPropertyContainer extends AbstractContainer implements } @Override - public void addPropertySetChangeListener(PropertySetChangeListener listener) { + public void addPropertySetChangeListener( + PropertySetChangeListener listener) { super.addPropertySetChangeListener(listener); } @@ -520,7 +522,8 @@ public class GeneratedPropertyContainer extends AbstractContainer implements // modify sort orders to work with original properties in the // container. for (SortOrder s : propertyGenerators.get(property) - .getSortProperties(new SortOrder(property, direction))) { + .getSortProperties( + new SortOrder(property, direction))) { actualSortProperties.add(s.getPropertyId()); actualSortDirections .add(s.getDirection() == SortDirection.ASCENDING); diff --git a/server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java b/server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java index 2235e77b34..3dd92db3b6 100644 --- a/server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java +++ b/server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java @@ -37,8 +37,8 @@ import com.vaadin.data.Item; * @since 3.0 */ @SuppressWarnings("serial") -public class HierarchicalContainer extends IndexedContainer implements - Container.Hierarchical { +public class HierarchicalContainer extends IndexedContainer + implements Container.Hierarchical { /** * Set of IDs of those contained Items that can't have children. @@ -304,7 +304,8 @@ public class HierarchicalContainer extends IndexedContainer implements // Checks that the new parent exists in container and can have // children - if (!containsId(newParentId) || noChildrenAllowed.contains(newParentId)) { + if (!containsId(newParentId) + || noChildrenAllowed.contains(newParentId)) { return false; } @@ -448,9 +449,8 @@ public class HierarchicalContainer extends IndexedContainer implements private void enableAndFireContentsChangeEvents() { if (contentChangedEventsDisabledCount <= 0) { - getLogger() - .log(Level.WARNING, - "Mismatched calls to disable and enable contents change events in HierarchicalContainer"); + getLogger().log(Level.WARNING, + "Mismatched calls to disable and enable contents change events in HierarchicalContainer"); contentChangedEventsDisabledCount = 0; } else { contentChangedEventsDisabledCount--; @@ -632,8 +632,8 @@ public class HierarchicalContainer extends IndexedContainer implements if (children2 != null) { Object[] array = children2.toArray(); for (int i = 0; i < array.length; i++) { - boolean removeItemRecursively = removeItemRecursively( - container, array[i]); + boolean removeItemRecursively = removeItemRecursively(container, + array[i]); if (!removeItemRecursively) { success = false; } @@ -746,7 +746,8 @@ public class HierarchicalContainer extends IndexedContainer implements for (Object itemId : filteredItemIds) { Object itemParent = parent.get(itemId); - if (itemParent == null || !filteredItemIds.contains(itemParent)) { + if (itemParent == null + || !filteredItemIds.contains(itemParent)) { // Parent is not included or this was a root, in both cases // this should be a filtered root filteredRoots.add(itemId); diff --git a/server/src/main/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java b/server/src/main/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java index 1c7960f954..6cfb38087c 100644 --- a/server/src/main/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java +++ b/server/src/main/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java @@ -27,8 +27,8 @@ import com.vaadin.data.Container.Hierarchical; * @see ContainerOrderedWrapper */ @SuppressWarnings({ "serial" }) -public class HierarchicalContainerOrderedWrapper extends - ContainerOrderedWrapper implements Hierarchical { +public class HierarchicalContainerOrderedWrapper extends ContainerOrderedWrapper + implements Hierarchical { private Hierarchical hierarchical; diff --git a/server/src/main/java/com/vaadin/data/util/ItemSorter.java b/server/src/main/java/com/vaadin/data/util/ItemSorter.java index 141f84ad43..0bbc2d324f 100644 --- a/server/src/main/java/com/vaadin/data/util/ItemSorter.java +++ b/server/src/main/java/com/vaadin/data/util/ItemSorter.java @@ -26,7 +26,8 @@ import com.vaadin.data.Container.Sortable; * The <code>ItemSorter</code> interface can be used in <code>Sortable</code> * implementations to provide a custom sorting method. */ -public interface ItemSorter extends Comparator<Object>, Cloneable, Serializable { +public interface ItemSorter + extends Comparator<Object>, Cloneable, Serializable { /** * Sets the parameters for an upcoming sort operation. The parameters diff --git a/server/src/main/java/com/vaadin/data/util/MethodProperty.java b/server/src/main/java/com/vaadin/data/util/MethodProperty.java index 83279afa53..5f6c970a2f 100644 --- a/server/src/main/java/com/vaadin/data/util/MethodProperty.java +++ b/server/src/main/java/com/vaadin/data/util/MethodProperty.java @@ -94,7 +94,8 @@ public class MethodProperty<T> extends AbstractProperty<T> { private static final Object[] DEFAULT_SET_ARGS = new Object[1]; /* Special serialization to handle method references */ - private void writeObject(java.io.ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) + throws IOException { out.defaultWriteObject(); SerializerHelper.writeClass(out, type); out.writeObject(instance); @@ -102,16 +103,16 @@ public class MethodProperty<T> extends AbstractProperty<T> { out.writeObject(getArgs); if (setMethod != null) { out.writeObject(setMethod.getName()); - SerializerHelper - .writeClassArray(out, setMethod.getParameterTypes()); + SerializerHelper.writeClassArray(out, + setMethod.getParameterTypes()); } else { out.writeObject(null); out.writeObject(null); } if (getMethod != null) { out.writeObject(getMethod.getName()); - SerializerHelper - .writeClassArray(out, getMethod.getParameterTypes()); + SerializerHelper.writeClassArray(out, + getMethod.getParameterTypes()); } else { out.writeObject(null); out.writeObject(null); @@ -119,8 +120,8 @@ public class MethodProperty<T> extends AbstractProperty<T> { } /* Special serialization to handle method references */ - private void readObject(java.io.ObjectInputStream in) throws IOException, - ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) + throws IOException, ClassNotFoundException { in.defaultReadObject(); try { @SuppressWarnings("unchecked") @@ -197,8 +198,8 @@ public class MethodProperty<T> extends AbstractProperty<T> { try { getMethod = initGetterMethod(beanPropertyName, beanClass); } catch (final java.lang.NoSuchMethodException ignored) { - throw new MethodException(this, "Bean property " + beanPropertyName - + " can not be found"); + throw new MethodException(this, + "Bean property " + beanPropertyName + " can not be found"); } // In case the get method is found, resolve the type @@ -216,9 +217,9 @@ public class MethodProperty<T> extends AbstractProperty<T> { if (returnType.isPrimitive()) { type = (Class<T>) convertPrimitiveType(returnType); if (type.isPrimitive()) { - throw new MethodException(this, "Bean property " - + beanPropertyName - + " getter return type must not be void"); + throw new MethodException(this, + "Bean property " + beanPropertyName + + " getter return type must not be void"); } } else { type = (Class<T>) returnType; @@ -332,8 +333,8 @@ public class MethodProperty<T> extends AbstractProperty<T> { if (setMethodName != null && setArgs == null) { throw new IndexOutOfBoundsException("The setArgs can not be null"); } - if (setMethodName != null - && (setArgumentIndex < 0 || setArgumentIndex >= setArgs.length)) { + if (setMethodName != null && (setArgumentIndex < 0 + || setArgumentIndex >= setArgs.length)) { throw new IndexOutOfBoundsException( "The setArgumentIndex must be >= 0 and < setArgs.length"); } @@ -391,8 +392,8 @@ public class MethodProperty<T> extends AbstractProperty<T> { } } if (found != true) { - throw new MethodException(this, "Could not find " + getMethodName - + "-method"); + throw new MethodException(this, + "Could not find " + getMethodName + "-method"); } // Finds set method @@ -444,8 +445,8 @@ public class MethodProperty<T> extends AbstractProperty<T> { } } if (found != true) { - throw new MethodException(this, "Could not identify " - + setMethodName + "-method"); + throw new MethodException(this, + "Could not identify " + setMethodName + "-method"); } } @@ -509,7 +510,8 @@ public class MethodProperty<T> extends AbstractProperty<T> { } // Gets the return type from get method - Class<? extends T> convertedType = (Class<? extends T>) convertPrimitiveType(type); + Class<? extends T> convertedType = (Class<? extends T>) convertPrimitiveType( + type); this.getMethod = getMethod; this.setMethod = setMethod; @@ -529,8 +531,8 @@ public class MethodProperty<T> extends AbstractProperty<T> { * @throws NoSuchMethodException * if no getter found */ - static Method initGetterMethod(String propertyName, final Class<?> beanClass) - throws NoSuchMethodException { + static Method initGetterMethod(String propertyName, + final Class<?> beanClass) throws NoSuchMethodException { propertyName = SharedUtil.capitalize(propertyName); Method getMethod = null; @@ -632,8 +634,8 @@ public class MethodProperty<T> extends AbstractProperty<T> { * * @param newValue * the New value of the property. - * @throws <code>Property.ReadOnlyException</code> if the object is in - * read-only mode. + * @throws <code>Property.ReadOnlyException</code> + * if the object is in read-only mode. * @see #invokeSetMethod(Object) */ @Override @@ -740,8 +742,8 @@ public class MethodProperty<T> extends AbstractProperty<T> { * @return MethodProperty or null if not a valid MethodProperty */ public MethodProperty getMethodProperty() { - return (property instanceof MethodProperty) ? (MethodProperty) property - : null; + return (property instanceof MethodProperty) + ? (MethodProperty) property : null; } /** diff --git a/server/src/main/java/com/vaadin/data/util/MethodPropertyDescriptor.java b/server/src/main/java/com/vaadin/data/util/MethodPropertyDescriptor.java index f94ee75ac3..b1f4d531c1 100644 --- a/server/src/main/java/com/vaadin/data/util/MethodPropertyDescriptor.java +++ b/server/src/main/java/com/vaadin/data/util/MethodPropertyDescriptor.java @@ -33,8 +33,8 @@ import com.vaadin.util.SerializerHelper; * * @since 6.6 */ -public class MethodPropertyDescriptor<BT> implements - VaadinPropertyDescriptor<BT> { +public class MethodPropertyDescriptor<BT> + implements VaadinPropertyDescriptor<BT> { private final String name; private Class<?> propertyType; @@ -64,7 +64,8 @@ public class MethodPropertyDescriptor<BT> implements } /* Special serialization to handle method references */ - private void writeObject(java.io.ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) + throws IOException { out.defaultWriteObject(); SerializerHelper.writeClass(out, propertyType); @@ -92,8 +93,8 @@ public class MethodPropertyDescriptor<BT> implements } /* Special serialization to handle method references */ - private void readObject(java.io.ObjectInputStream in) throws IOException, - ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) + throws IOException, ClassNotFoundException { in.defaultReadObject(); try { @SuppressWarnings("unchecked") diff --git a/server/src/main/java/com/vaadin/data/util/NestedMethodProperty.java b/server/src/main/java/com/vaadin/data/util/NestedMethodProperty.java index 29fe62f845..7790b8ab45 100644 --- a/server/src/main/java/com/vaadin/data/util/NestedMethodProperty.java +++ b/server/src/main/java/com/vaadin/data/util/NestedMethodProperty.java @@ -62,15 +62,16 @@ public class NestedMethodProperty<T> extends AbstractProperty<T> { private Class<? extends T> type; /* Special serialization to handle method references */ - private void writeObject(java.io.ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) + throws IOException { out.defaultWriteObject(); // getMethods and setMethod are reconstructed on read based on // propertyName } /* Special serialization to handle method references */ - private void readObject(java.io.ObjectInputStream in) throws IOException, - ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) + throws IOException, ClassNotFoundException { in.defaultReadObject(); initialize(instance.getClass(), propertyName); @@ -132,8 +133,8 @@ public class NestedMethodProperty<T> extends AbstractProperty<T> { Class<?> propertyClass = beanClass; String[] simplePropertyNames = propertyName.split("\\."); if (propertyName.endsWith(".") || 0 == simplePropertyNames.length) { - throw new IllegalArgumentException("Invalid property name '" - + propertyName + "'"); + throw new IllegalArgumentException( + "Invalid property name '" + propertyName + "'"); } for (int i = 0; i < simplePropertyNames.length; i++) { String simplePropertyName = simplePropertyNames[i].trim(); @@ -217,8 +218,8 @@ public class NestedMethodProperty<T> extends AbstractProperty<T> { * * @param newValue * the New value of the property. - * @throws <code>Property.ReadOnlyException</code> if the object is in - * read-only mode. + * @throws <code>Property.ReadOnlyException</code> + * if the object is in read-only mode. * @see #invokeSetMethod(Object) */ @Override diff --git a/server/src/main/java/com/vaadin/data/util/NestedPropertyDescriptor.java b/server/src/main/java/com/vaadin/data/util/NestedPropertyDescriptor.java index ca423b34ed..84704568cd 100644 --- a/server/src/main/java/com/vaadin/data/util/NestedPropertyDescriptor.java +++ b/server/src/main/java/com/vaadin/data/util/NestedPropertyDescriptor.java @@ -29,8 +29,8 @@ import com.vaadin.data.Property; * * @since 6.6 */ -public class NestedPropertyDescriptor<BT> implements - VaadinPropertyDescriptor<BT> { +public class NestedPropertyDescriptor<BT> + implements VaadinPropertyDescriptor<BT> { private final String name; private final Class<?> propertyType; diff --git a/server/src/main/java/com/vaadin/data/util/ObjectProperty.java b/server/src/main/java/com/vaadin/data/util/ObjectProperty.java index 8a2daa443c..595bfd51e4 100644 --- a/server/src/main/java/com/vaadin/data/util/ObjectProperty.java +++ b/server/src/main/java/com/vaadin/data/util/ObjectProperty.java @@ -124,8 +124,8 @@ public class ObjectProperty<T> extends AbstractProperty<T> { * * @param newValue * the New value of the property. - * @throws <code>Property.ReadOnlyException</code> if the object is in - * read-only mode + * @throws <code>Property.ReadOnlyException</code> + * if the object is in read-only mode */ @Override public void setValue(T newValue) throws Property.ReadOnlyException { diff --git a/server/src/main/java/com/vaadin/data/util/PropertyValueGenerator.java b/server/src/main/java/com/vaadin/data/util/PropertyValueGenerator.java index a09ab33d2d..b9f3416c39 100644 --- a/server/src/main/java/com/vaadin/data/util/PropertyValueGenerator.java +++ b/server/src/main/java/com/vaadin/data/util/PropertyValueGenerator.java @@ -94,9 +94,10 @@ public abstract class PropertyValueGenerator<T> implements Serializable { * if the implementation doesn't support modifying the provided * filter */ - public Filter modifyFilter(Filter filter) throws UnsupportedFilterException { - throw new UnsupportedFilterException("Filter" + filter - + " is not supported"); + public Filter modifyFilter(Filter filter) + throws UnsupportedFilterException { + throw new UnsupportedFilterException( + "Filter" + filter + " is not supported"); } } diff --git a/server/src/main/java/com/vaadin/data/util/PropertysetItem.java b/server/src/main/java/com/vaadin/data/util/PropertysetItem.java index f463a52f54..5a5b7a383f 100644 --- a/server/src/main/java/com/vaadin/data/util/PropertysetItem.java +++ b/server/src/main/java/com/vaadin/data/util/PropertysetItem.java @@ -36,8 +36,8 @@ import com.vaadin.data.Property; * @since 3.0 */ @SuppressWarnings("serial") -public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, - Cloneable { +public class PropertysetItem + implements Item, Item.PropertySetChangeNotifier, Cloneable { /* Private representation of the item */ @@ -155,7 +155,8 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, public String toString() { String retValue = ""; - for (final Iterator<?> i = getItemPropertyIds().iterator(); i.hasNext();) { + for (final Iterator<?> i = getItemPropertyIds().iterator(); i + .hasNext();) { final Object propertyId = i.next(); retValue += getItemProperty(propertyId).getValue(); if (i.hasNext()) { @@ -175,8 +176,8 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, * @author Vaadin Ltd. * @since 3.0 */ - private static class PropertySetChangeEvent extends EventObject implements - Item.PropertySetChangeEvent { + private static class PropertySetChangeEvent extends EventObject + implements Item.PropertySetChangeEvent { private PropertySetChangeEvent(Item source) { super(source); @@ -297,8 +298,10 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, final PropertysetItem npsi = new PropertysetItem(); npsi.list = list != null ? (LinkedList<Object>) list.clone() : null; - npsi.propertySetChangeListeners = propertySetChangeListeners != null ? (LinkedList<PropertySetChangeListener>) propertySetChangeListeners - .clone() : null; + npsi.propertySetChangeListeners = propertySetChangeListeners != null + ? (LinkedList<PropertySetChangeListener>) propertySetChangeListeners + .clone() + : null; npsi.map = (HashMap<Object, Property<?>>) map.clone(); return npsi; @@ -335,10 +338,10 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, } } if (other.propertySetChangeListeners != propertySetChangeListeners) { - boolean thisEmpty = (propertySetChangeListeners == null || propertySetChangeListeners - .isEmpty()); - boolean otherEmpty = (other.propertySetChangeListeners == null || other.propertySetChangeListeners - .isEmpty()); + boolean thisEmpty = (propertySetChangeListeners == null + || propertySetChangeListeners.isEmpty()); + boolean otherEmpty = (other.propertySetChangeListeners == null + || other.propertySetChangeListeners.isEmpty()); if (thisEmpty && otherEmpty) { return true; } @@ -364,7 +367,8 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, return (list == null ? 0 : list.hashCode()) ^ (map == null ? 0 : map.hashCode()) - ^ ((propertySetChangeListeners == null || propertySetChangeListeners - .isEmpty()) ? 0 : propertySetChangeListeners.hashCode()); + ^ ((propertySetChangeListeners == null + || propertySetChangeListeners.isEmpty()) ? 0 + : propertySetChangeListeners.hashCode()); } } diff --git a/server/src/main/java/com/vaadin/data/util/TextFileProperty.java b/server/src/main/java/com/vaadin/data/util/TextFileProperty.java index 22fd8168a1..c33b220fe3 100644 --- a/server/src/main/java/com/vaadin/data/util/TextFileProperty.java +++ b/server/src/main/java/com/vaadin/data/util/TextFileProperty.java @@ -139,8 +139,9 @@ public class TextFileProperty extends AbstractProperty<String> { try { FileOutputStream fos = new FileOutputStream(file); - OutputStreamWriter osw = charset == null ? new OutputStreamWriter( - fos) : new OutputStreamWriter(fos, charset); + OutputStreamWriter osw = charset == null + ? new OutputStreamWriter(fos) + : new OutputStreamWriter(fos, charset); BufferedWriter w = new BufferedWriter(osw); w.append(newValue.toString()); w.flush(); diff --git a/server/src/main/java/com/vaadin/data/util/filter/AbstractJunctionFilter.java b/server/src/main/java/com/vaadin/data/util/filter/AbstractJunctionFilter.java index 28e6cda34e..8403f2dc74 100644 --- a/server/src/main/java/com/vaadin/data/util/filter/AbstractJunctionFilter.java +++ b/server/src/main/java/com/vaadin/data/util/filter/AbstractJunctionFilter.java @@ -34,8 +34,8 @@ public abstract class AbstractJunctionFilter implements Filter { protected final Collection<Filter> filters; public AbstractJunctionFilter(Filter... filters) { - this.filters = Collections.unmodifiableCollection(Arrays - .asList(filters)); + this.filters = Collections + .unmodifiableCollection(Arrays.asList(filters)); } /** diff --git a/server/src/main/java/com/vaadin/data/util/filter/Compare.java b/server/src/main/java/com/vaadin/data/util/filter/Compare.java index 60523f2d42..3a06ef64df 100644 --- a/server/src/main/java/com/vaadin/data/util/filter/Compare.java +++ b/server/src/main/java/com/vaadin/data/util/filter/Compare.java @@ -277,9 +277,8 @@ public abstract class Compare implements Filter { return (otherValue == value); } else if (value == otherValue) { return true; - } else if (value instanceof Comparable - && otherValue.getClass() - .isAssignableFrom(getValue().getClass())) { + } else if (value instanceof Comparable && otherValue.getClass() + .isAssignableFrom(getValue().getClass())) { return ((Comparable) value).compareTo(otherValue) == 0; } else { return value.equals(otherValue); @@ -331,8 +330,8 @@ public abstract class Compare implements Filter { if (getOperation() != o.getOperation()) { return false; } - return (null == getValue()) ? null == o.getValue() : getValue().equals( - o.getValue()); + return (null == getValue()) ? null == o.getValue() + : getValue().equals(o.getValue()); } @Override diff --git a/server/src/main/java/com/vaadin/data/util/filter/IsNull.java b/server/src/main/java/com/vaadin/data/util/filter/IsNull.java index 9bcfe40c03..cd89800ec4 100644 --- a/server/src/main/java/com/vaadin/data/util/filter/IsNull.java +++ b/server/src/main/java/com/vaadin/data/util/filter/IsNull.java @@ -73,8 +73,9 @@ public final class IsNull implements Filter { final IsNull o = (IsNull) obj; // Checks the properties one by one - return (null != getPropertyId()) ? getPropertyId().equals( - o.getPropertyId()) : null == o.getPropertyId(); + return (null != getPropertyId()) + ? getPropertyId().equals(o.getPropertyId()) + : null == o.getPropertyId(); } @Override diff --git a/server/src/main/java/com/vaadin/data/util/filter/Like.java b/server/src/main/java/com/vaadin/data/util/filter/Like.java index 9b7b2af292..ec771ea9ab 100644 --- a/server/src/main/java/com/vaadin/data/util/filter/Like.java +++ b/server/src/main/java/com/vaadin/data/util/filter/Like.java @@ -95,10 +95,11 @@ public class Like implements Filter { final Like o = (Like) obj; // Checks the properties one by one - boolean propertyIdEqual = (null != getPropertyId()) ? getPropertyId() - .equals(o.getPropertyId()) : null == o.getPropertyId(); - boolean valueEqual = (null != getValue()) ? getValue().equals( - o.getValue()) : null == o.getValue(); + boolean propertyIdEqual = (null != getPropertyId()) + ? getPropertyId().equals(o.getPropertyId()) + : null == o.getPropertyId(); + boolean valueEqual = (null != getValue()) + ? getValue().equals(o.getValue()) : null == o.getValue(); return propertyIdEqual && valueEqual; } } diff --git a/server/src/main/java/com/vaadin/data/util/filter/SimpleStringFilter.java b/server/src/main/java/com/vaadin/data/util/filter/SimpleStringFilter.java index ea5e93277e..2ae51bbbfb 100644 --- a/server/src/main/java/com/vaadin/data/util/filter/SimpleStringFilter.java +++ b/server/src/main/java/com/vaadin/data/util/filter/SimpleStringFilter.java @@ -61,8 +61,8 @@ public final class SimpleStringFilter implements Filter { if (propertyValue == null) { return false; } - final String value = ignoreCase ? propertyValue.toString() - .toLowerCase() : propertyValue.toString(); + final String value = ignoreCase ? propertyValue.toString().toLowerCase() + : propertyValue.toString(); if (onlyMatchPrefix) { if (!value.startsWith(filterString)) { return false; diff --git a/server/src/main/java/com/vaadin/data/util/filter/UnsupportedFilterException.java b/server/src/main/java/com/vaadin/data/util/filter/UnsupportedFilterException.java index 42a7784da8..a3f617c45e 100644 --- a/server/src/main/java/com/vaadin/data/util/filter/UnsupportedFilterException.java +++ b/server/src/main/java/com/vaadin/data/util/filter/UnsupportedFilterException.java @@ -28,8 +28,8 @@ import java.io.Serializable; * * @since 6.6 */ -public class UnsupportedFilterException extends RuntimeException implements - Serializable { +public class UnsupportedFilterException extends RuntimeException + implements Serializable { public UnsupportedFilterException() { } diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java index 12d806a8d5..454f2746ba 100644 --- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java +++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java @@ -87,10 +87,9 @@ class CacheFlushNotifier implements Serializable { /* Compare QueryDelegate types and tableName/queryString */ QueryDelegate wrQd = wrc.getQueryDelegate(); QueryDelegate qd = c.getQueryDelegate(); - if (wrQd instanceof TableQuery - && qd instanceof TableQuery - && ((TableQuery) wrQd).getTableName().equals( - ((TableQuery) qd).getTableName())) { + if (wrQd instanceof TableQuery && qd instanceof TableQuery + && ((TableQuery) wrQd).getTableName() + .equals(((TableQuery) qd).getTableName())) { wrc.refresh(); } else if (wrQd instanceof FreeformQuery && qd instanceof FreeformQuery diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/RowId.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/RowId.java index 79c16b0f60..5bb8b01d07 100644 --- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/RowId.java +++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/RowId.java @@ -37,7 +37,8 @@ public class RowId implements Serializable { public RowId(Object... id) { if (id == null) { - throw new IllegalArgumentException("id parameter must not be null!"); + throw new IllegalArgumentException( + "id parameter must not be null!"); } this.id = id; } diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java index 86e9069e90..c620d9eb5e 100644 --- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java +++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java @@ -100,7 +100,9 @@ public class SQLContainer implements Container, Container.Filterable, /** ItemSetChangeListeners */ private LinkedList<Container.ItemSetChangeListener> itemSetChangeListeners; - /** Temporary storage for modified items and items to be removed and added */ + /** + * Temporary storage for modified items and items to be removed and added + */ private final Map<RowId, RowItem> removedItems = new HashMap<RowId, RowItem>(); private final List<RowItem> addedItems = new ArrayList<RowItem>(); private final List<RowItem> modifiedItems = new ArrayList<RowItem>(); @@ -235,8 +237,8 @@ public class SQLContainer implements Container, Container.Filterable, if (itemId instanceof RowId && !(itemId instanceof TemporaryRowId)) { try { - return queryDelegate.containsRowWithKey(((RowId) itemId) - .getId()); + return queryDelegate + .containsRowWithKey(((RowId) itemId).getId()); } catch (Exception e) { /* Query failed, just return false. */ getLogger().log(Level.WARNING, "containsId query failed", e); @@ -357,8 +359,8 @@ public class SQLContainer implements Container, Container.Filterable, rs.close(); queryDelegate.commit(); } catch (SQLException e) { - getLogger().log(Level.WARNING, - "getItemIds() failed, rolling back.", e); + getLogger().log(Level.WARNING, "getItemIds() failed, rolling back.", + e); try { queryDelegate.rollback(); } catch (SQLException e1) { @@ -570,8 +572,8 @@ public class SQLContainer implements Container, Container.Filterable, } /* Generate Filter -object */ - String likeStr = onlyMatchPrefix ? filterString + "%" : "%" - + filterString + "%"; + String likeStr = onlyMatchPrefix ? filterString + "%" + : "%" + filterString + "%"; Like like = new Like(propertyId.toString(), likeStr); like.setCaseSensitive(!ignoreCase); filters.add(like); @@ -693,8 +695,8 @@ public class SQLContainer implements Container, Container.Filterable, @Override public Object getIdByIndex(int index) { if (index < 0) { - throw new IndexOutOfBoundsException("Index is negative! index=" - + index); + throw new IndexOutOfBoundsException( + "Index is negative! index=" + index); } // make sure the size field is valid updateCount(); @@ -716,8 +718,8 @@ public class SQLContainer implements Container, Container.Filterable, @Override public List<Object> getItemIds(int startIndex, int numberOfIds) { // TODO create a better implementation - return (List<Object>) ContainerHelpers.getItemIdsUsingGetIdByIndex( - startIndex, numberOfIds, this); + return (List<Object>) ContainerHelpers + .getItemIdsUsingGetIdByIndex(startIndex, numberOfIds, this); } /**********************************************/ @@ -1019,8 +1021,9 @@ public class SQLContainer implements Container, Container.Filterable, + item.getId()); } } catch (IllegalArgumentException e) { - throw new SQLException("Removal failed for row with ID: " - + item.getId(), e); + throw new SQLException( + "Removal failed for row with ID: " + item.getId(), + e); } } /* Perform buffered modifications */ @@ -1149,9 +1152,8 @@ public class SQLContainer implements Container, Container.Filterable, * Fetches new count of rows from the data source, if needed. */ private void updateCount() { - if (!sizeDirty - && new Date().getTime() < sizeUpdated.getTime() - + sizeValidMilliSeconds) { + if (!sizeDirty && new Date().getTime() < sizeUpdated.getTime() + + sizeValidMilliSeconds) { return; } try { @@ -1175,8 +1177,8 @@ public class SQLContainer implements Container, Container.Filterable, // Size is up to date so don't set it back to dirty in refresh() refresh(false); } - getLogger().log(Level.FINER, - "Updated row count. New count is: {0}", size); + getLogger().log(Level.FINER, "Updated row count. New count is: {0}", + size); } catch (SQLException e) { throw new RuntimeException("Failed to update item set size.", e); } @@ -1247,9 +1249,9 @@ public class SQLContainer implements Container, Container.Filterable, propertyPersistable.put(colName, persistable); propertyNullable.put(colName, rsmd.isNullable(i) == ResultSetMetaData.columnNullable); - propertyPrimaryKey.put(colName, queryDelegate - .getPrimaryKeyColumns() - .contains(rsmd.getColumnLabel(i))); + propertyPrimaryKey.put(colName, + queryDelegate.getPrimaryKeyColumns() + .contains(rsmd.getColumnLabel(i))); propertyTypes.put(colName, type); } rs.getStatement().close(); @@ -1371,8 +1373,8 @@ public class SQLContainer implements Container, Container.Filterable, if (modifiedIndex != -1) { cachedItems.put(id, modifiedItems.get(modifiedIndex)); } else { - cachedItems.put(id, new RowItem(this, id, - itemProperties)); + cachedItems.put(id, + new RowItem(this, id, itemProperties)); } rowCount++; @@ -1384,8 +1386,8 @@ public class SQLContainer implements Container, Container.Filterable, getLogger().log(Level.FINER, "Fetched {0} rows starting from {1}", new Object[] { fetchedRows, currentOffset }); } catch (SQLException e) { - getLogger().log(Level.WARNING, - "Failed to fetch rows, rolling back", e); + getLogger().log(Level.WARNING, "Failed to fetch rows, rolling back", + e); try { queryDelegate.rollback(); } catch (SQLException e1) { @@ -1640,8 +1642,8 @@ public class SQLContainer implements Container, Container.Filterable, * Simple ItemSetChangeEvent implementation. */ @SuppressWarnings("serial") - public static class ItemSetChangeEvent extends EventObject implements - Container.ItemSetChangeEvent { + public static class ItemSetChangeEvent extends EventObject + implements Container.ItemSetChangeEvent { private ItemSetChangeEvent(SQLContainer source) { super(source); @@ -1796,13 +1798,13 @@ public class SQLContainer implements Container, Container.Filterable, "Reference to the given SQLContainer not defined."); } try { - getContainerProperty(itemId, r.getReferencingColumn()).setValue( - refdCont.getContainerProperty(refdItemId, + getContainerProperty(itemId, r.getReferencingColumn()) + .setValue(refdCont.getContainerProperty(refdItemId, r.getReferencedColumn())); return true; } catch (Exception e) { - getLogger() - .log(Level.WARNING, "Setting referenced item failed.", e); + getLogger().log(Level.WARNING, "Setting referenced item failed.", + e); return false; } } @@ -1849,12 +1851,13 @@ public class SQLContainer implements Container, Container.Filterable, return refdCont.getItem(getReferencedItemId(itemId, refdCont)); } - private void writeObject(java.io.ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) + throws IOException { out.defaultWriteObject(); } - private void readObject(java.io.ObjectInputStream in) throws IOException, - ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) + throws IOException, ClassNotFoundException { in.defaultReadObject(); if (notificationsEnabled) { /* diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLUtil.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLUtil.java index e5282c867a..83c3bd0f03 100644 --- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLUtil.java +++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLUtil.java @@ -22,9 +22,12 @@ public class SQLUtil implements Serializable { * Escapes different special characters in strings that are passed to SQL. * Replaces the following: * - * <list> <li>' is replaced with ''</li> <li>\x00 is removed</li> <li>\ is - * replaced with \\</li> <li>" is replaced with \"</li> <li> - * \x1a is removed</li> </list> + * <list> + * <li>' is replaced with ''</li> + * <li>\x00 is removed</li> + * <li>\ is replaced with \\</li> + * <li>" is replaced with \"</li> + * <li>\x1a is removed</li> </list> * * Also note! The escaping done here may or may not be enough to prevent any * and all SQL injections so it is recommended to check user input before diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java index acad5beed9..0cb367a92b 100644 --- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java +++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java @@ -70,8 +70,8 @@ public class J2EEConnectionPool implements JDBCConnectionPool { try { conn.close(); } catch (SQLException e) { - Logger.getLogger(J2EEConnectionPool.class.getName()).log( - Level.FINE, "Could not release SQL connection", e); + Logger.getLogger(J2EEConnectionPool.class.getName()) + .log(Level.FINE, "Could not release SQL connection", e); } } } diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java index 57ea188cb4..551468efd3 100644 --- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java +++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java @@ -172,7 +172,8 @@ public class SimpleJDBCConnectionPool implements JDBCConnectionPool { } - private void writeObject(java.io.ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) + throws IOException { initialized = false; out.defaultWriteObject(); } diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java index e7fd9f4aa4..d20d873012 100644 --- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java +++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java @@ -52,8 +52,8 @@ public abstract class AbstractTransactionalQuery implements Serializable { * @throws SQLException * if a connection could not be obtained or configured */ - public void beginTransaction() throws UnsupportedOperationException, - SQLException { + public void beginTransaction() + throws UnsupportedOperationException, SQLException { if (isInTransaction()) { throw new IllegalStateException("A transaction is already active!"); } diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java index 6b800cb965..89d6e3fa73 100644 --- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java +++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java @@ -34,8 +34,8 @@ import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder; @SuppressWarnings("serial") -public class FreeformQuery extends AbstractTransactionalQuery implements - QueryDelegate { +public class FreeformQuery extends AbstractTransactionalQuery + implements QueryDelegate { FreeformQueryDelegate delegate = null; private String queryString; @@ -211,7 +211,8 @@ public class FreeformQuery extends AbstractTransactionalQuery implements */ @Override @SuppressWarnings({ "deprecation", "finally" }) - public ResultSet getResults(int offset, int pagelength) throws SQLException { + public ResultSet getResults(int offset, int pagelength) + throws SQLException { ensureTransaction(); String query = queryString; if (delegate != null) { @@ -220,8 +221,8 @@ public class FreeformQuery extends AbstractTransactionalQuery implements try { StatementHelper sh = ((FreeformStatementDelegate) delegate) .getQueryStatement(offset, pagelength); - PreparedStatement pstmt = getConnection().prepareStatement( - sh.getQueryString()); + PreparedStatement pstmt = getConnection() + .prepareStatement(sh.getQueryString()); sh.setParameterValuesToStatement(pstmt); return pstmt.executeQuery(); } catch (UnsupportedOperationException e) { @@ -339,9 +340,8 @@ public class FreeformQuery extends AbstractTransactionalQuery implements /* * (non-Javadoc) * - * @see - * com.vaadin.data.util.sqlcontainer.query.QueryDelegate#removeRow(com.vaadin - * .data.util.sqlcontainer.RowItem) + * @see com.vaadin.data.util.sqlcontainer.query.QueryDelegate#removeRow(com. + * vaadin .data.util.sqlcontainer.RowItem) */ @Override public boolean removeRow(RowItem row) throws SQLException { @@ -366,23 +366,22 @@ public class FreeformQuery extends AbstractTransactionalQuery implements } @Override - public synchronized void commit() throws UnsupportedOperationException, - SQLException { + public synchronized void commit() + throws UnsupportedOperationException, SQLException { super.commit(); } @Override - public synchronized void rollback() throws UnsupportedOperationException, - SQLException { + public synchronized void rollback() + throws UnsupportedOperationException, SQLException { super.rollback(); } /* * (non-Javadoc) * - * @see - * com.vaadin.data.util.sqlcontainer.query.QueryDelegate#getPrimaryKeyColumns - * () + * @see com.vaadin.data.util.sqlcontainer.query.QueryDelegate# + * getPrimaryKeyColumns () */ @Override public List<String> getPrimaryKeyColumns() { @@ -485,7 +484,8 @@ public class FreeformQuery extends AbstractTransactionalQuery implements return queryString + " WHERE " + where; } - private void writeObject(java.io.ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) + throws IOException { try { rollback(); } catch (SQLException ignored) { diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java index 413dd55ab9..d58146c75f 100644 --- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java +++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java @@ -97,8 +97,8 @@ public interface QueryDelegate extends Serializable { * @throws UnsupportedOperationException * if the implementation is read only. */ - public int storeRow(RowItem row) throws UnsupportedOperationException, - SQLException; + public int storeRow(RowItem row) + throws UnsupportedOperationException, SQLException; /** * Removes the given RowItem from the database. @@ -109,8 +109,8 @@ public interface QueryDelegate extends Serializable { * @throws UnsupportedOperationException * @throws SQLException */ - public boolean removeRow(RowItem row) throws UnsupportedOperationException, - SQLException; + public boolean removeRow(RowItem row) + throws UnsupportedOperationException, SQLException; /** * Starts a new database transaction. Used when storing multiple changes. diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java index 9a41766a31..13a9511165 100644 --- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java +++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java @@ -47,8 +47,8 @@ import com.vaadin.data.util.sqlcontainer.query.generator.SQLGenerator; import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; @SuppressWarnings("serial") -public class TableQuery extends AbstractTransactionalQuery implements - QueryDelegate, QueryDelegate.RowIdChangeNotifier { +public class TableQuery extends AbstractTransactionalQuery + implements QueryDelegate, QueryDelegate.RowIdChangeNotifier { /** * Table name (without catalog or schema information). @@ -232,7 +232,8 @@ public class TableQuery extends AbstractTransactionalQuery implements * int) */ @Override - public ResultSet getResults(int offset, int pagelength) throws SQLException { + public ResultSet getResults(int offset, int pagelength) + throws SQLException { StatementHelper sh; /* * If no ordering is explicitly set, results will be ordered by the @@ -271,10 +272,11 @@ public class TableQuery extends AbstractTransactionalQuery implements * .addon.sqlcontainer.RowItem) */ @Override - public int storeRow(RowItem row) throws UnsupportedOperationException, - SQLException { + public int storeRow(RowItem row) + throws UnsupportedOperationException, SQLException { if (row == null) { - throw new IllegalArgumentException("Row argument must be non-null."); + throw new IllegalArgumentException( + "Row argument must be non-null."); } StatementHelper sh; int result = 0; @@ -320,8 +322,8 @@ public class TableQuery extends AbstractTransactionalQuery implements /* Set version column, if one is provided */ setVersionColumnFlagInProperty(row); /* Generate query */ - StatementHelper sh = sqlGenerator.generateInsertQuery( - getFullTableName(), row); + StatementHelper sh = sqlGenerator + .generateInsertQuery(getFullTableName(), row); Connection connection = null; PreparedStatement pstmt = null; ResultSet generatedKeys = null; @@ -389,8 +391,8 @@ public class TableQuery extends AbstractTransactionalQuery implements * @see com.vaadin.addon.sqlcontainer.query.QueryDelegate#beginTransaction() */ @Override - public void beginTransaction() throws UnsupportedOperationException, - SQLException { + public void beginTransaction() + throws UnsupportedOperationException, SQLException { getLogger().log(Level.FINE, "DB -> begin transaction"); super.beginTransaction(); } @@ -611,16 +613,15 @@ public class TableQuery extends AbstractTransactionalQuery implements tables = dbmd.getTables(catalogName, schemaName, tableName, null); if (!tables.next()) { - String catalog = (catalogName != null) ? catalogName - .toUpperCase() : null; - String schema = (schemaName != null) ? schemaName - .toUpperCase() : null; + String catalog = (catalogName != null) + ? catalogName.toUpperCase() : null; + String schema = (schemaName != null) + ? schemaName.toUpperCase() : null; tables = dbmd.getTables(catalog, schema, tableName.toUpperCase(), null); if (!tables.next()) { throw new IllegalArgumentException( - "Table with the name \"" - + getFullTableName() + "Table with the name \"" + getFullTableName() + "\" was not found. Check your database contents."); } else { catalogName = catalog; @@ -692,8 +693,8 @@ public class TableQuery extends AbstractTransactionalQuery implements for (String s : primaryKeyColumns) { if (!((ColumnProperty) row.getItemProperty(s)) .isReadOnlyChangeAllowed()) { - newRowId.add(values.get(values.keySet().iterator() - .next())); + newRowId.add(values + .get(values.keySet().iterator().next())); } else { newRowId.add(values.get(s)); } @@ -706,10 +707,9 @@ public class TableQuery extends AbstractTransactionalQuery implements } return new RowId(newRowId.toArray()); } catch (Exception e) { - getLogger() - .log(Level.FINE, - "Failed to fetch key values on insert: {0}", - e.getMessage()); + getLogger().log(Level.FINE, + "Failed to fetch key values on insert: {0}", + e.getMessage()); return null; } } @@ -722,8 +722,8 @@ public class TableQuery extends AbstractTransactionalQuery implements * .addon.sqlcontainer.RowItem) */ @Override - public boolean removeRow(RowItem row) throws UnsupportedOperationException, - SQLException { + public boolean removeRow(RowItem row) + throws UnsupportedOperationException, SQLException { if (getLogger().isLoggable(Level.FINE)) { getLogger().log(Level.FINE, "Removing row with id: {0}", row.getId().getId()[0]); @@ -788,7 +788,8 @@ public class TableQuery extends AbstractTransactionalQuery implements /** * Custom writeObject to call rollback() if object is serialized. */ - private void writeObject(java.io.ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) + throws IOException { try { rollback(); } catch (SQLException ignored) { @@ -799,8 +800,8 @@ public class TableQuery extends AbstractTransactionalQuery implements /** * Simple RowIdChangeEvent implementation. */ - public static class RowIdChangeEvent extends EventObject implements - QueryDelegate.RowIdChangeEvent { + public static class RowIdChangeEvent extends EventObject + implements QueryDelegate.RowIdChangeEvent { private final RowId oldId; private final RowId newId; diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java index 2fc7ebd544..843dae1b74 100644 --- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java +++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java @@ -66,8 +66,8 @@ public class DefaultSQLGenerator implements SQLGenerator { * the identifier (character) denoting the end of a quoted string */ public DefaultSQLGenerator(String quoteStart, String quoteEnd) { - QueryBuilder.setStringDecorator(new StringDecorator(quoteStart, - quoteEnd)); + QueryBuilder + .setStringDecorator(new StringDecorator(quoteStart, quoteEnd)); } /** @@ -101,8 +101,8 @@ public class DefaultSQLGenerator implements SQLGenerator { toSelect = toSelect == null ? "*" : toSelect; StatementHelper sh = getStatementHelper(); StringBuffer query = new StringBuffer(); - query.append("SELECT " + toSelect + " FROM ").append( - SQLUtil.escapeSQL(tableName)); + query.append("SELECT " + toSelect + " FROM ") + .append(SQLUtil.escapeSQL(tableName)); if (filters != null) { query.append(QueryBuilder.getWhereStringForFilters(filters, sh)); } @@ -148,8 +148,8 @@ public class DefaultSQLGenerator implements SQLGenerator { } else { query.append(", " + QueryBuilder.quote(column) + " = ?"); } - sh.addParameterValue(columnToValueMap.get(column), item - .getItemProperty(column).getType()); + sh.addParameterValue(columnToValueMap.get(column), + item.getItemProperty(column).getType()); first = false; } /* Generate identifiers for the row to be updated */ @@ -160,8 +160,8 @@ public class DefaultSQLGenerator implements SQLGenerator { } else { query.append(" AND " + QueryBuilder.quote(column) + " = ?"); } - sh.addParameterValue(rowIdentifiers.get(column), item - .getItemProperty(column).getType()); + sh.addParameterValue(rowIdentifiers.get(column), + item.getItemProperty(column).getType()); first = false; } sh.setQueryString(query.toString()); @@ -211,8 +211,8 @@ public class DefaultSQLGenerator implements SQLGenerator { query.append(", "); } query.append("?"); - sh.addParameterValue(columnToValueMap.get(column), item - .getItemProperty(column).getType()); + sh.addParameterValue(columnToValueMap.get(column), + item.getItemProperty(column).getType()); first = false; } query.append(")"); @@ -229,7 +229,8 @@ public class DefaultSQLGenerator implements SQLGenerator { */ @Override public StatementHelper generateDeleteQuery(String tableName, - List<String> primaryKeyColumns, String versionColumn, RowItem item) { + List<String> primaryKeyColumns, String versionColumn, + RowItem item) { if (tableName == null || tableName.trim().equals("")) { throw new IllegalArgumentException("Table name must be given."); } @@ -246,7 +247,8 @@ public class DefaultSQLGenerator implements SQLGenerator { query.append("DELETE FROM ").append(tableName).append(" WHERE "); int count = 1; for (String keyColName : primaryKeyColumns) { - if ((this instanceof MSSQLGenerator || this instanceof OracleGenerator) + if ((this instanceof MSSQLGenerator + || this instanceof OracleGenerator) && keyColName.equalsIgnoreCase("rownum")) { count++; continue; @@ -256,8 +258,9 @@ public class DefaultSQLGenerator implements SQLGenerator { } if (item.getItemProperty(keyColName).getValue() != null) { query.append(QueryBuilder.quote(keyColName) + " = ?"); - sh.addParameterValue(item.getItemProperty(keyColName) - .getValue(), item.getItemProperty(keyColName).getType()); + sh.addParameterValue( + item.getItemProperty(keyColName).getValue(), + item.getItemProperty(keyColName).getType()); } count++; } @@ -270,9 +273,8 @@ public class DefaultSQLGenerator implements SQLGenerator { query.append(String.format(" AND %s = ?", QueryBuilder.quote(versionColumn))); - sh.addParameterValue( - item.getItemProperty(versionColumn).getValue(), item - .getItemProperty(versionColumn).getType()); + sh.addParameterValue(item.getItemProperty(versionColumn).getValue(), + item.getItemProperty(versionColumn).getType()); } sh.setQueryString(query.toString()); @@ -329,7 +331,8 @@ public class DefaultSQLGenerator implements SQLGenerator { for (Object id : item.getItemPropertyIds()) { ColumnProperty cp = (ColumnProperty) item.getItemProperty(id); /* Prevent "rownum" usage as a column name if MSSQL or ORACLE */ - if ((this instanceof MSSQLGenerator || this instanceof OracleGenerator) + if ((this instanceof MSSQLGenerator + || this instanceof OracleGenerator) && cp.getPropertyId().equalsIgnoreCase("rownum")) { continue; } @@ -345,7 +348,8 @@ public class DefaultSQLGenerator implements SQLGenerator { for (Object id : item.getItemPropertyIds()) { ColumnProperty cp = (ColumnProperty) item.getItemProperty(id); /* Prevent "rownum" usage as a column name if MSSQL or ORACLE */ - if ((this instanceof MSSQLGenerator || this instanceof OracleGenerator) + if ((this instanceof MSSQLGenerator + || this instanceof OracleGenerator) && cp.getPropertyId().equalsIgnoreCase("rownum")) { continue; } diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java index 5a1f2003cd..00266de380 100644 --- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java +++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java @@ -71,7 +71,8 @@ public class MSSQLGenerator extends DefaultSQLGenerator { "SELECT COUNT(*) AS %s FROM (SELECT * FROM %s", QueryBuilder.quote("rowcount"), tableName)); if (filters != null && !filters.isEmpty()) { - query.append(QueryBuilder.getWhereStringForFilters(filters, sh)); + query.append( + QueryBuilder.getWhereStringForFilters(filters, sh)); } query.append(") AS t"); sh.setQueryString(query.toString()); @@ -83,7 +84,8 @@ public class MSSQLGenerator extends DefaultSQLGenerator { query.append("SELECT ").append(toSelect).append(" FROM ") .append(tableName); if (filters != null) { - query.append(QueryBuilder.getWhereStringForFilters(filters, sh)); + query.append( + QueryBuilder.getWhereStringForFilters(filters, sh)); } if (orderBys != null) { for (OrderBy o : orderBys) { diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java index 86508d37c4..cdf7628984 100644 --- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java +++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java @@ -28,7 +28,8 @@ public class OracleGenerator extends DefaultSQLGenerator { } - public OracleGenerator(Class<? extends StatementHelper> statementHelperClazz) { + public OracleGenerator( + Class<? extends StatementHelper> statementHelperClazz) { super(statementHelperClazz); } @@ -80,7 +81,8 @@ public class OracleGenerator extends DefaultSQLGenerator { "SELECT COUNT(*) AS %s FROM (SELECT * FROM %s", QueryBuilder.quote("rowcount"), tableName)); if (filters != null && !filters.isEmpty()) { - query.append(QueryBuilder.getWhereStringForFilters(filters, sh)); + query.append( + QueryBuilder.getWhereStringForFilters(filters, sh)); } query.append(")"); sh.setQueryString(query.toString()); @@ -92,7 +94,8 @@ public class OracleGenerator extends DefaultSQLGenerator { query.append("SELECT ").append(toSelect).append(" FROM ") .append(tableName); if (filters != null) { - query.append(QueryBuilder.getWhereStringForFilters(filters, sh)); + query.append( + QueryBuilder.getWhereStringForFilters(filters, sh)); } if (orderBys != null) { for (OrderBy o : orderBys) { @@ -104,9 +107,9 @@ public class OracleGenerator extends DefaultSQLGenerator { } /* Remaining SELECT cases are handled here */ - query.append(String - .format("SELECT * FROM (SELECT x.*, ROWNUM AS %s FROM (SELECT %s FROM %s", - QueryBuilder.quote("rownum"), toSelect, tableName)); + query.append(String.format( + "SELECT * FROM (SELECT x.*, ROWNUM AS %s FROM (SELECT %s FROM %s", + QueryBuilder.quote("rownum"), toSelect, tableName)); if (filters != null) { query.append(QueryBuilder.getWhereStringForFilters(filters, sh)); } diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java index a3d9b90705..761d5d33b5 100644 --- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java +++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java @@ -28,8 +28,8 @@ public class AndTranslator implements FilterTranslator { @Override public String getWhereStringForFilter(Filter filter, StatementHelper sh) { - return QueryBuilder.group(QueryBuilder.getJoinedFilterString( - ((And) filter).getFilters(), "AND", sh)); + return QueryBuilder.group(QueryBuilder + .getJoinedFilterString(((And) filter).getFilters(), "AND", sh)); } } diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java index 00b4d5421b..9834f24ad4 100644 --- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java +++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java @@ -28,8 +28,8 @@ public class OrTranslator implements FilterTranslator { @Override public String getWhereStringForFilter(Filter filter, StatementHelper sh) { - return QueryBuilder.group(QueryBuilder.getJoinedFilterString( - ((Or) filter).getFilters(), "OR", sh)); + return QueryBuilder.group(QueryBuilder + .getJoinedFilterString(((Or) filter).getFilters(), "OR", sh)); } } diff --git a/server/src/main/java/com/vaadin/event/ActionManager.java b/server/src/main/java/com/vaadin/event/ActionManager.java index 6eb698d08a..e4b0b98a4a 100644 --- a/server/src/main/java/com/vaadin/event/ActionManager.java +++ b/server/src/main/java/com/vaadin/event/ActionManager.java @@ -39,8 +39,8 @@ import com.vaadin.ui.Component; * * */ -public class ActionManager implements Action.Container, Action.Handler, - Action.Notifier { +public class ActionManager + implements Action.Container, Action.Handler, Action.Notifier { private static final long serialVersionUID = 1641868163608066491L; @@ -227,8 +227,8 @@ public class ActionManager implements Action.Container, Action.Handler, @Override public void handleAction(Action action, Object sender, Object target) { if (actionHandlers != null) { - Handler[] array = actionHandlers.toArray(new Handler[actionHandlers - .size()]); + Handler[] array = actionHandlers + .toArray(new Handler[actionHandlers.size()]); for (Handler handler : array) { handler.handleAction(action, sender, target); } diff --git a/server/src/main/java/com/vaadin/event/ConnectorActionManager.java b/server/src/main/java/com/vaadin/event/ConnectorActionManager.java index 0816ba48df..15fa0e8132 100644 --- a/server/src/main/java/com/vaadin/event/ConnectorActionManager.java +++ b/server/src/main/java/com/vaadin/event/ConnectorActionManager.java @@ -72,9 +72,8 @@ public class ConnectorActionManager extends ActionManager { @Override public void handleAction(Action action, Object sender, Object target) { if (!connector.isConnectorEnabled()) { - getLogger().warning( - ServerRpcHandler.getIgnoredDisabledError("action", - connector)); + getLogger().warning(ServerRpcHandler + .getIgnoredDisabledError("action", connector)); return; } diff --git a/server/src/main/java/com/vaadin/event/ContextClickEvent.java b/server/src/main/java/com/vaadin/event/ContextClickEvent.java index 5b15634105..56a9be1c7b 100644 --- a/server/src/main/java/com/vaadin/event/ContextClickEvent.java +++ b/server/src/main/java/com/vaadin/event/ContextClickEvent.java @@ -32,9 +32,9 @@ import com.vaadin.util.ReflectTools; */ public class ContextClickEvent extends ClickEvent { - public static final Method CONTEXT_CLICK_METHOD = ReflectTools - .findMethod(ContextClickListener.class, "contextClick", - ContextClickEvent.class); + public static final Method CONTEXT_CLICK_METHOD = ReflectTools.findMethod( + ContextClickListener.class, "contextClick", + ContextClickEvent.class); public ContextClickEvent(Component source, MouseEventDetails mouseEventDetails) { diff --git a/server/src/main/java/com/vaadin/event/EventRouter.java b/server/src/main/java/com/vaadin/event/EventRouter.java index b662dfcb36..7d83574bbe 100644 --- a/server/src/main/java/com/vaadin/event/EventRouter.java +++ b/server/src/main/java/com/vaadin/event/EventRouter.java @@ -63,7 +63,8 @@ public class EventRouter implements MethodEventSource { * here, we use the default documentation from implemented interface. */ @Override - public void addListener(Class<?> eventType, Object object, String methodName) { + public void addListener(Class<?> eventType, Object object, + String methodName) { if (listenerList == null) { listenerList = new LinkedHashSet<ListenerMethod>(); } @@ -95,7 +96,8 @@ public class EventRouter implements MethodEventSource { * implemented interface. */ @Override - public void removeListener(Class<?> eventType, Object target, Method method) { + public void removeListener(Class<?> eventType, Object target, + Method method) { if (listenerList != null) { final Iterator<ListenerMethod> i = listenerList.iterator(); while (i.hasNext()) { diff --git a/server/src/main/java/com/vaadin/event/LayoutEvents.java b/server/src/main/java/com/vaadin/event/LayoutEvents.java index e4432b7c7a..5b7cb4372d 100644 --- a/server/src/main/java/com/vaadin/event/LayoutEvents.java +++ b/server/src/main/java/com/vaadin/event/LayoutEvents.java @@ -114,8 +114,8 @@ public interface LayoutEvents { private final Component childComponent; public LayoutClickEvent(Component source, - MouseEventDetails mouseEventDetails, - Component clickedComponent, Component childComponent) { + MouseEventDetails mouseEventDetails, Component clickedComponent, + Component childComponent) { super(source, mouseEventDetails); this.clickedComponent = clickedComponent; this.childComponent = childComponent; diff --git a/server/src/main/java/com/vaadin/event/ListenerMethod.java b/server/src/main/java/com/vaadin/event/ListenerMethod.java index 3311ed705e..979da5a06b 100644 --- a/server/src/main/java/com/vaadin/event/ListenerMethod.java +++ b/server/src/main/java/com/vaadin/event/ListenerMethod.java @@ -83,7 +83,8 @@ public class ListenerMethod implements EventListener, Serializable { private int eventArgumentIndex; /* Special serialization to handle method references */ - private void writeObject(java.io.ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) + throws IOException { try { out.defaultWriteObject(); String name = method.getName(); @@ -91,18 +92,17 @@ public class ListenerMethod implements EventListener, Serializable { out.writeObject(name); out.writeObject(paramTypes); } catch (NotSerializableException e) { - getLogger() - .log(Level.WARNING, - "Error in serialization of the application: Class {0} must implement serialization.", - target.getClass().getName()); + getLogger().log(Level.WARNING, + "Error in serialization of the application: Class {0} must implement serialization.", + target.getClass().getName()); throw e; } } /* Special serialization to handle method references */ - private void readObject(java.io.ObjectInputStream in) throws IOException, - ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) + throws IOException, ClassNotFoundException { in.defaultReadObject(); try { String name = (String) in.readObject(); @@ -126,8 +126,8 @@ public class ListenerMethod implements EventListener, Serializable { } } if (cls.getSuperclass() != null) { - Method parentMethod = findHighestMethod(cls.getSuperclass(), - method, paramTypes); + Method parentMethod = findHighestMethod(cls.getSuperclass(), method, + paramTypes); if (parentMethod != null) { return parentMethod; } @@ -180,26 +180,26 @@ public class ListenerMethod implements EventListener, Serializable { // Checks that the object is of correct type if (!method.getDeclaringClass().isAssignableFrom(target.getClass())) { - throw new java.lang.IllegalArgumentException("The method " - + method.getName() - + " cannot be used for the given target: " - + target.getClass().getName()); + throw new java.lang.IllegalArgumentException( + "The method " + method.getName() + + " cannot be used for the given target: " + + target.getClass().getName()); } // Checks that the event argument is null if (eventArgumentIndex >= 0 && arguments[eventArgumentIndex] != null) { - throw new java.lang.IllegalArgumentException("argument[" - + eventArgumentIndex + "] must be null"); + throw new java.lang.IllegalArgumentException( + "argument[" + eventArgumentIndex + "] must be null"); } // Checks the event type is supported by the method if (eventArgumentIndex >= 0 && !method.getParameterTypes()[eventArgumentIndex] .isAssignableFrom(eventType)) { - throw new java.lang.IllegalArgumentException("The method " - + method.getName() - + " does not accept the given eventType: " - + eventType.getName()); + throw new java.lang.IllegalArgumentException( + "The method " + method.getName() + + " does not accept the given eventType: " + + eventType.getName()); } this.eventType = eventType; @@ -259,18 +259,18 @@ public class ListenerMethod implements EventListener, Serializable { // Checks that the event argument is null if (eventArgumentIndex >= 0 && arguments[eventArgumentIndex] != null) { - throw new java.lang.IllegalArgumentException("argument[" - + eventArgumentIndex + "] must be null"); + throw new java.lang.IllegalArgumentException( + "argument[" + eventArgumentIndex + "] must be null"); } // Checks the event type is supported by the method if (eventArgumentIndex >= 0 && !method.getParameterTypes()[eventArgumentIndex] .isAssignableFrom(eventType)) { - throw new java.lang.IllegalArgumentException("The method " - + method.getName() - + " does not accept the given eventType: " - + eventType.getName()); + throw new java.lang.IllegalArgumentException( + "The method " + method.getName() + + " does not accept the given eventType: " + + eventType.getName()); } this.eventType = eventType; @@ -311,10 +311,10 @@ public class ListenerMethod implements EventListener, Serializable { // Check that the object is of correct type if (!method.getDeclaringClass().isAssignableFrom(target.getClass())) { - throw new java.lang.IllegalArgumentException("The method " - + method.getName() - + " cannot be used for the given target: " - + target.getClass().getName()); + throw new java.lang.IllegalArgumentException( + "The method " + method.getName() + + " cannot be used for the given target: " + + target.getClass().getName()); } this.eventType = eventType; @@ -404,10 +404,10 @@ public class ListenerMethod implements EventListener, Serializable { // Checks that the object is of correct type if (!method.getDeclaringClass().isAssignableFrom(target.getClass())) { - throw new java.lang.IllegalArgumentException("The method " - + method.getName() - + " cannot be used for the given target: " - + target.getClass().getName()); + throw new java.lang.IllegalArgumentException( + "The method " + method.getName() + + " cannot be used for the given target: " + + target.getClass().getName()); } this.eventType = eventType; @@ -419,7 +419,8 @@ public class ListenerMethod implements EventListener, Serializable { if (params.length == 0) { arguments = new Object[0]; - } else if (params.length == 1 && params[0].isAssignableFrom(eventType)) { + } else if (params.length == 1 + && params[0].isAssignableFrom(eventType)) { arguments = new Object[] { null }; eventArgumentIndex = 0; } else { @@ -479,7 +480,8 @@ public class ListenerMethod implements EventListener, Serializable { if (params.length == 0) { arguments = new Object[0]; - } else if (params.length == 1 && params[0].isAssignableFrom(eventType)) { + } else if (params.length == 1 + && params[0].isAssignableFrom(eventType)) { arguments = new Object[] { null }; eventArgumentIndex = 0; } else { @@ -525,9 +527,9 @@ public class ListenerMethod implements EventListener, Serializable { } catch (final java.lang.reflect.InvocationTargetException e) { // An exception was thrown by the invocation target. Throw it // forwards. - throw new MethodException("Invocation of method " - + method.getName() + " in " - + target.getClass().getName() + " failed.", + throw new MethodException( + "Invocation of method " + method.getName() + " in " + + target.getClass().getName() + " failed.", e.getTargetException()); } } @@ -570,9 +572,8 @@ public class ListenerMethod implements EventListener, Serializable { * equals with the method stored in this object */ public boolean matches(Class<?> eventType, Object target, Method method) { - return (this.target == target) - && (eventType.equals(this.eventType) && method - .equals(this.method)); + return (this.target == target) && (eventType.equals(this.eventType) + && method.equals(this.method)); } @Override @@ -603,14 +604,14 @@ public class ListenerMethod implements EventListener, Serializable { ListenerMethod t = (ListenerMethod) obj; return eventArgumentIndex == t.eventArgumentIndex - && (eventType == t.eventType || (eventType != null && eventType - .equals(t.eventType))) - && (target == t.target || (target != null && target - .equals(t.target))) - && (method == t.method || (method != null && method - .equals(t.method))) - && (arguments == t.arguments || (Arrays.equals(arguments, - t.arguments))); + && (eventType == t.eventType + || (eventType != null && eventType.equals(t.eventType))) + && (target == t.target + || (target != null && target.equals(t.target))) + && (method == t.method + || (method != null && method.equals(t.method))) + && (arguments == t.arguments + || (Arrays.equals(arguments, t.arguments))); } /** @@ -622,8 +623,8 @@ public class ListenerMethod implements EventListener, Serializable { * @author Vaadin Ltd. * @since 3.0 */ - public class MethodException extends RuntimeException implements - Serializable { + public class MethodException extends RuntimeException + implements Serializable { private MethodException(String message, Throwable cause) { super(message, cause); diff --git a/server/src/main/java/com/vaadin/event/MethodEventSource.java b/server/src/main/java/com/vaadin/event/MethodEventSource.java index ddfc87ca8c..43fcb901e1 100644 --- a/server/src/main/java/com/vaadin/event/MethodEventSource.java +++ b/server/src/main/java/com/vaadin/event/MethodEventSource.java @@ -91,7 +91,8 @@ public interface MethodEventSource extends Serializable { * unless <code>method</code> has exactly one match in * <code>object</code> */ - public void addListener(Class<?> eventType, Object object, String methodName); + public void addListener(Class<?> eventType, Object object, + String methodName); /** * Removes all registered listeners matching the given parameters. Since @@ -132,7 +133,8 @@ public interface MethodEventSource extends Serializable { * the method owned by the target that's registered to listen to * events of type eventType. */ - public void removeListener(Class<?> eventType, Object target, Method method); + public void removeListener(Class<?> eventType, Object target, + Method method); /** * <p> diff --git a/server/src/main/java/com/vaadin/event/MouseEvents.java b/server/src/main/java/com/vaadin/event/MouseEvents.java index b32ce06587..855c073125 100644 --- a/server/src/main/java/com/vaadin/event/MouseEvents.java +++ b/server/src/main/java/com/vaadin/event/MouseEvents.java @@ -62,7 +62,8 @@ public interface MouseEvents { public static final MouseButton BUTTON_RIGHT = MouseButton.RIGHT; private MouseEventDetails details; - public ClickEvent(Component source, MouseEventDetails mouseEventDetails) { + public ClickEvent(Component source, + MouseEventDetails mouseEventDetails) { super(source); details = mouseEventDetails; } @@ -193,8 +194,8 @@ public interface MouseEvents { */ public interface ClickListener extends ConnectorEventListener { - public static final Method clickMethod = ReflectTools.findMethod( - ClickListener.class, "click", ClickEvent.class); + public static final Method clickMethod = ReflectTools + .findMethod(ClickListener.class, "click", ClickEvent.class); /** * Called when a {@link Component} has been clicked. A reference to the diff --git a/server/src/main/java/com/vaadin/event/SelectionEvent.java b/server/src/main/java/com/vaadin/event/SelectionEvent.java index 09cf57167f..5f11818af9 100644 --- a/server/src/main/java/com/vaadin/event/SelectionEvent.java +++ b/server/src/main/java/com/vaadin/event/SelectionEvent.java @@ -109,8 +109,8 @@ public class SelectionEvent extends EventObject { } /** - * The interface for adding and removing listeners for - * {@link SelectionEvent SelectionEvents}. + * The interface for adding and removing listeners for {@link SelectionEvent + * SelectionEvents}. */ public interface SelectionNotifier extends Serializable { /** diff --git a/server/src/main/java/com/vaadin/event/ShortcutAction.java b/server/src/main/java/com/vaadin/event/ShortcutAction.java index dd511c23c0..2d719cd8e1 100644 --- a/server/src/main/java/com/vaadin/event/ShortcutAction.java +++ b/server/src/main/java/com/vaadin/event/ShortcutAction.java @@ -112,21 +112,21 @@ public class ShortcutAction extends Action { public static final char SHORTHAND_CHAR_CTRL = '^'; // regex-quote (escape) the characters - private static final String SHORTHAND_ALT = Pattern.quote(Character - .toString(SHORTHAND_CHAR_ALT)); - private static final String SHORTHAND_SHIFT = Pattern.quote(Character - .toString(SHORTHAND_CHAR_SHIFT)); - private static final String SHORTHAND_CTRL = Pattern.quote(Character - .toString(SHORTHAND_CHAR_CTRL)); + private static final String SHORTHAND_ALT = Pattern + .quote(Character.toString(SHORTHAND_CHAR_ALT)); + private static final String SHORTHAND_SHIFT = Pattern + .quote(Character.toString(SHORTHAND_CHAR_SHIFT)); + private static final String SHORTHAND_CTRL = Pattern + .quote(Character.toString(SHORTHAND_CHAR_CTRL)); // Used for replacing escaped chars, e.g && with & - private static final Pattern SHORTHAND_ESCAPE = Pattern.compile("(" - + SHORTHAND_ALT + "?)" + SHORTHAND_ALT + "|(" + SHORTHAND_SHIFT - + "?)" + SHORTHAND_SHIFT + "|(" + SHORTHAND_CTRL + "?)" - + SHORTHAND_CTRL); + private static final Pattern SHORTHAND_ESCAPE = Pattern + .compile("(" + SHORTHAND_ALT + "?)" + SHORTHAND_ALT + "|(" + + SHORTHAND_SHIFT + "?)" + SHORTHAND_SHIFT + "|(" + + SHORTHAND_CTRL + "?)" + SHORTHAND_CTRL); // Used for removing escaped chars, only leaving real shorthands - private static final Pattern SHORTHAND_REMOVE = Pattern.compile("([" - + SHORTHAND_ALT + "|" + SHORTHAND_SHIFT + "|" + SHORTHAND_CTRL - + "])\\1"); + private static final Pattern SHORTHAND_REMOVE = Pattern + .compile("([" + SHORTHAND_ALT + "|" + SHORTHAND_SHIFT + "|" + + SHORTHAND_CTRL + "])\\1"); // Mnemonic char, optionally followed by another, and optionally a third private static final Pattern SHORTHANDS = Pattern.compile("(" + SHORTHAND_ALT + "|" + SHORTHAND_SHIFT + "|" + SHORTHAND_CTRL @@ -186,8 +186,8 @@ public class ShortcutAction extends Action { String match = matcher.group(); // KeyCode from last char in match, uppercase - keyCode = Character.toUpperCase(matcher.group().charAt( - match.length() - 1)); + keyCode = Character + .toUpperCase(matcher.group().charAt(match.length() - 1)); // Given modifiers override this indicated in the caption if (modifierKeys != null) { diff --git a/server/src/main/java/com/vaadin/event/ShortcutListener.java b/server/src/main/java/com/vaadin/event/ShortcutListener.java index ccfe68d6fb..850791f176 100644 --- a/server/src/main/java/com/vaadin/event/ShortcutListener.java +++ b/server/src/main/java/com/vaadin/event/ShortcutListener.java @@ -18,8 +18,8 @@ package com.vaadin.event; import com.vaadin.event.Action.Listener; import com.vaadin.server.Resource; -public abstract class ShortcutListener extends ShortcutAction implements - Listener { +public abstract class ShortcutListener extends ShortcutAction + implements Listener { private static final long serialVersionUID = 1L; diff --git a/server/src/main/java/com/vaadin/event/UIEvents.java b/server/src/main/java/com/vaadin/event/UIEvents.java index e986386da8..9e051e6682 100644 --- a/server/src/main/java/com/vaadin/event/UIEvents.java +++ b/server/src/main/java/com/vaadin/event/UIEvents.java @@ -39,8 +39,8 @@ public interface UIEvents { * @author Vaadin Ltd */ public interface PollListener extends Serializable { - public static final Method POLL_METHOD = ReflectTools.findMethod( - PollListener.class, "poll", PollEvent.class); + public static final Method POLL_METHOD = ReflectTools + .findMethod(PollListener.class, "poll", PollEvent.class); /** * A poll request has been received by the server. diff --git a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java index 6bb227a95e..7fae2ee87b 100644 --- a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java +++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java @@ -32,8 +32,8 @@ import com.vaadin.server.PaintTarget; * * @since 6.3 */ -public abstract class ClientSideCriterion implements Serializable, - AcceptCriterion { +public abstract class ClientSideCriterion + implements Serializable, AcceptCriterion { /* * All criteria that extend this must be completely validatable on client diff --git a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java index 8b769ee031..4449ec22c4 100644 --- a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java +++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java @@ -38,8 +38,8 @@ import com.vaadin.server.PaintTarget; * * @since 6.3 */ -public abstract class ServerSideCriterion implements Serializable, - AcceptCriterion { +public abstract class ServerSideCriterion + implements Serializable, AcceptCriterion { private static final long serialVersionUID = 2128510128911628902L; diff --git a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIs.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIs.java index 8e9fdecdae..2b2be484b3 100644 --- a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIs.java +++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIs.java @@ -51,11 +51,10 @@ public class SourceIs extends ClientSideCriterion { if (c.isAttached()) { target.addAttribute("component" + paintedComponents++, c); } else { - Logger.getLogger(SourceIs.class.getName()) - .log(Level.WARNING, - "SourceIs component {0} at index {1} is not attached to the component hierachy and will thus be ignored", - new Object[] { c.getClass().getName(), - Integer.valueOf(i) }); + Logger.getLogger(SourceIs.class.getName()).log(Level.WARNING, + "SourceIs component {0} at index {1} is not attached to the component hierachy and will thus be ignored", + new Object[] { c.getClass().getName(), + Integer.valueOf(i) }); } } target.addAttribute("c", paintedComponents); diff --git a/server/src/main/java/com/vaadin/legacy/data/Validator.java b/server/src/main/java/com/vaadin/legacy/data/Validator.java index 319f4ae138..3d4052329a 100644 --- a/server/src/main/java/com/vaadin/legacy/data/Validator.java +++ b/server/src/main/java/com/vaadin/legacy/data/Validator.java @@ -25,8 +25,8 @@ import com.vaadin.server.VaadinServlet; * valid or not. * <p> * Implementors of this class can be added to any - * {@link com.vaadin.legacy.data.Validatable Validatable} implementor to verify its - * value. + * {@link com.vaadin.legacy.data.Validatable Validatable} implementor to verify + * its value. * </p> * <p> * {@link #validate(Object)} can be used to check if a value is valid. An diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyAbstractStringToNumberConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyAbstractStringToNumberConverter.java index 4b14f66df9..1191c5cd29 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyAbstractStringToNumberConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyAbstractStringToNumberConverter.java @@ -32,8 +32,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.1 */ -public abstract class LegacyAbstractStringToNumberConverter<T> implements - LegacyConverter<String, T> { +public abstract class LegacyAbstractStringToNumberConverter<T> + implements LegacyConverter<String, T> { /** * Returns the format used by {@link #convertToPresentation(Object, Locale)} diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverter.java index 1fdd0755b9..d9e9c8d35a 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverter.java @@ -122,8 +122,8 @@ public interface LegacyConverter<PRESENTATION, MODEL> extends Serializable { /** * An exception that signals that the value passed to * {@link LegacyConverter#convertToPresentation(Object, Class, Locale)} or - * {@link LegacyConverter#convertToModel(Object, Class, Locale)} could not be - * converted. + * {@link LegacyConverter#convertToModel(Object, Class, Locale)} could not + * be converted. * * @author Vaadin Ltd * @since 7.0 diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverterUtil.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverterUtil.java index 42d268f781..3afd4e288e 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverterUtil.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverterUtil.java @@ -84,8 +84,8 @@ public class LegacyConverterUtil implements Serializable { public static <PRESENTATIONTYPE, MODELTYPE> PRESENTATIONTYPE convertFromModel( MODELTYPE modelValue, Class<? extends PRESENTATIONTYPE> presentationType, - LegacyConverter<PRESENTATIONTYPE, MODELTYPE> converter, Locale locale) - throws LegacyConverter.ConversionException { + LegacyConverter<PRESENTATIONTYPE, MODELTYPE> converter, + Locale locale) throws LegacyConverter.ConversionException { if (converter != null) { /* * If there is a converter, always use it. It must convert or throw @@ -116,8 +116,7 @@ public class LegacyConverterUtil implements Serializable { throw new LegacyConverter.ConversionException( "Unable to convert value of type " + modelValue.getClass().getName() - + " to presentation type " - + presentationType + + " to presentation type " + presentationType + ". No converter is set and the types are not compatible."); } } @@ -146,8 +145,8 @@ public class LegacyConverterUtil implements Serializable { */ public static <MODELTYPE, PRESENTATIONTYPE> MODELTYPE convertToModel( PRESENTATIONTYPE presentationValue, Class<MODELTYPE> modelType, - LegacyConverter<PRESENTATIONTYPE, MODELTYPE> converter, Locale locale) - throws LegacyConverter.ConversionException { + LegacyConverter<PRESENTATIONTYPE, MODELTYPE> converter, + Locale locale) throws LegacyConverter.ConversionException { if (converter != null) { /* * If there is a converter, always use it. It must convert or throw @@ -181,8 +180,7 @@ public class LegacyConverterUtil implements Serializable { throw new LegacyConverter.ConversionException( "Unable to convert value of type " + presentationValue.getClass().getName() - + " to model type " - + modelType + + " to model type " + modelType + ". No converter is set and the types are not compatible."); } @@ -235,8 +233,9 @@ public class LegacyConverterUtil implements Serializable { * @return true if the converter possibly support conversion between the * given presentation and model type, false otherwise */ - public static boolean canConverterPossiblyHandle(LegacyConverter<?, ?> converter, - Class<?> presentationType, Class<?> modelType) { + public static boolean canConverterPossiblyHandle( + LegacyConverter<?, ?> converter, Class<?> presentationType, + Class<?> modelType) { if (converter == null) { return false; } diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToLongConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToLongConverter.java index 04d037b12f..b4e5801db2 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToLongConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToLongConverter.java @@ -55,9 +55,9 @@ public class LegacyDateToLongConverter implements LegacyConverter<Date, Long> { public Date convertToPresentation(Long value, Class<? extends Date> targetType, Locale locale) { if (targetType != getPresentationType()) { - throw new ConversionException("Converter only supports " - + getPresentationType().getName() + " (targetType was " - + targetType.getName() + ")"); + throw new ConversionException( + "Converter only supports " + getPresentationType().getName() + + " (targetType was " + targetType.getName() + ")"); } if (value == null) { return null; diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToSqlDateConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToSqlDateConverter.java index 1ea4eaca8c..e6ac11e020 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToSqlDateConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToSqlDateConverter.java @@ -32,16 +32,17 @@ import java.util.Locale; * @since 7.1 * @author Vaadin Ltd */ -public class LegacyDateToSqlDateConverter implements LegacyConverter<Date, java.sql.Date> { +public class LegacyDateToSqlDateConverter + implements LegacyConverter<Date, java.sql.Date> { @Override public java.sql.Date convertToModel(Date value, Class<? extends java.sql.Date> targetType, Locale locale) throws ConversionException { if (targetType != getModelType()) { - throw new ConversionException("Converter only supports " - + getModelType().getName() + " (targetType was " - + targetType.getName() + ")"); + throw new ConversionException( + "Converter only supports " + getModelType().getName() + + " (targetType was " + targetType.getName() + ")"); } if (value == null) { @@ -56,9 +57,9 @@ public class LegacyDateToSqlDateConverter implements LegacyConverter<Date, java. Class<? extends Date> targetType, Locale locale) throws ConversionException { if (targetType != getPresentationType()) { - throw new ConversionException("Converter only supports " - + getPresentationType().getName() + " (targetType was " - + targetType.getName() + ")"); + throw new ConversionException( + "Converter only supports " + getPresentationType().getName() + + " (targetType was " + targetType.getName() + ")"); } if (value == null) { diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDefaultConverterFactory.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDefaultConverterFactory.java index c647981650..f578ad6a2d 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDefaultConverterFactory.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDefaultConverterFactory.java @@ -24,8 +24,9 @@ import java.util.logging.Logger; import com.vaadin.server.VaadinSession; /** - * Default implementation of {@link LegacyConverterFactory}. Provides converters for - * standard types like {@link String}, {@link Double} and {@link Date}. </p> + * Default implementation of {@link LegacyConverterFactory}. Provides converters + * for standard types like {@link String}, {@link Double} and {@link Date}. + * </p> * <p> * Custom converters can be provided by extending this class and using * {@link VaadinSession#setConverterFactory(LegacyConverterFactory)}. @@ -56,7 +57,8 @@ public class LegacyDefaultConverterFactory implements LegacyConverterFactory { if (reverseConverter != null) { log.finest(getClass().getName() + " created a reverse " + reverseConverter.getClass()); - return new LegacyReverseConverter<PRESENTATION, MODEL>(reverseConverter); + return new LegacyReverseConverter<PRESENTATION, MODEL>( + reverseConverter); } log.finest(getClass().getName() + " could not find a converter for " @@ -70,13 +72,15 @@ public class LegacyDefaultConverterFactory implements LegacyConverterFactory { Class<PRESENTATION> presentationType, Class<MODEL> modelType) { if (presentationType == String.class) { // TextField converters and more - LegacyConverter<PRESENTATION, MODEL> converter = (LegacyConverter<PRESENTATION, MODEL>) createStringConverter(modelType); + LegacyConverter<PRESENTATION, MODEL> converter = (LegacyConverter<PRESENTATION, MODEL>) createStringConverter( + modelType); if (converter != null) { return converter; } } else if (presentationType == Date.class) { // DateField converters and more - LegacyConverter<PRESENTATION, MODEL> converter = (LegacyConverter<PRESENTATION, MODEL>) createDateConverter(modelType); + LegacyConverter<PRESENTATION, MODEL> converter = (LegacyConverter<PRESENTATION, MODEL>) createDateConverter( + modelType); if (converter != null) { return converter; } @@ -86,7 +90,8 @@ public class LegacyDefaultConverterFactory implements LegacyConverterFactory { } - protected LegacyConverter<Date, ?> createDateConverter(Class<?> sourceType) { + protected LegacyConverter<Date, ?> createDateConverter( + Class<?> sourceType) { if (Long.class.isAssignableFrom(sourceType)) { return new LegacyDateToLongConverter(); } else if (java.sql.Date.class.isAssignableFrom(sourceType)) { @@ -96,7 +101,8 @@ public class LegacyDefaultConverterFactory implements LegacyConverterFactory { } } - protected LegacyConverter<String, ?> createStringConverter(Class<?> sourceType) { + protected LegacyConverter<String, ?> createStringConverter( + Class<?> sourceType) { if (Double.class.isAssignableFrom(sourceType)) { return new LegacyStringToDoubleConverter(); } else if (Float.class.isAssignableFrom(sourceType)) { diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyReverseConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyReverseConverter.java index 6841e99b6e..4750b3358f 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyReverseConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyReverseConverter.java @@ -19,8 +19,8 @@ package com.vaadin.legacy.data.util.converter; import java.util.Locale; /** - * A converter that wraps another {@link LegacyConverter} and reverses source and - * target types. + * A converter that wraps another {@link LegacyConverter} and reverses source + * and target types. * * @param <MODEL> * The source type @@ -30,8 +30,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.0 */ -public class LegacyReverseConverter<PRESENTATION, MODEL> implements - LegacyConverter<PRESENTATION, MODEL> { +public class LegacyReverseConverter<PRESENTATION, MODEL> + implements LegacyConverter<PRESENTATION, MODEL> { private LegacyConverter<MODEL, PRESENTATION> realConverter; @@ -42,7 +42,8 @@ public class LegacyReverseConverter<PRESENTATION, MODEL> implements * @param converter * The converter to use in a reverse fashion */ - public LegacyReverseConverter(LegacyConverter<MODEL, PRESENTATION> converter) { + public LegacyReverseConverter( + LegacyConverter<MODEL, PRESENTATION> converter) { this.realConverter = converter; } diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigDecimalConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigDecimalConverter.java index 4b6c2151a0..0a3b40389f 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigDecimalConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigDecimalConverter.java @@ -34,8 +34,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.2 */ -public class LegacyStringToBigDecimalConverter extends - LegacyAbstractStringToNumberConverter<BigDecimal> { +public class LegacyStringToBigDecimalConverter + extends LegacyAbstractStringToNumberConverter<BigDecimal> { @Override protected NumberFormat getFormat(Locale locale) { NumberFormat numberFormat = super.getFormat(locale); diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigIntegerConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigIntegerConverter.java index f2d3754dd2..0ff70a4788 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigIntegerConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigIntegerConverter.java @@ -35,8 +35,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.4 */ -public class LegacyStringToBigIntegerConverter extends - LegacyAbstractStringToNumberConverter<BigInteger> { +public class LegacyStringToBigIntegerConverter + extends LegacyAbstractStringToNumberConverter<BigInteger> { @Override protected NumberFormat getFormat(Locale locale) { diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBooleanConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBooleanConverter.java index 7d36a9d248..11f96d3e6d 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBooleanConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBooleanConverter.java @@ -19,22 +19,30 @@ package com.vaadin.legacy.data.util.converter; import java.util.Locale; /** - * A converter that converts from {@link String} to {@link Boolean} and back. The String representation is given by - * {@link Boolean#toString()} or provided in constructor {@link #StringToBooleanConverter(String, String)}. - * <p> Leading and trailing white spaces are ignored when converting from a String. </p> - * <p> For language-dependent representation, subclasses should overwrite {@link #getFalseString(Locale)} and {@link #getTrueString(Locale)}</p> + * A converter that converts from {@link String} to {@link Boolean} and back. + * The String representation is given by {@link Boolean#toString()} or provided + * in constructor {@link #StringToBooleanConverter(String, String)}. + * <p> + * Leading and trailing white spaces are ignored when converting from a String. + * </p> + * <p> + * For language-dependent representation, subclasses should overwrite + * {@link #getFalseString(Locale)} and {@link #getTrueString(Locale)} + * </p> * * @author Vaadin Ltd * @since 7.0 */ -public class LegacyStringToBooleanConverter implements LegacyConverter<String, Boolean> { +public class LegacyStringToBooleanConverter + implements LegacyConverter<String, Boolean> { private final String trueString; private final String falseString; /** - * Creates converter with default string representations - "true" and "false" + * Creates converter with default string representations - "true" and + * "false" * */ public LegacyStringToBooleanConverter() { @@ -45,10 +53,13 @@ public class LegacyStringToBooleanConverter implements LegacyConverter<String, B * Creates converter with custom string representation. * * @since 7.5.4 - * @param falseString string representation for <code>false</code> - * @param trueString string representation for <code>true</code> + * @param falseString + * string representation for <code>false</code> + * @param trueString + * string representation for <code>true</code> */ - public LegacyStringToBooleanConverter(String trueString, String falseString) { + public LegacyStringToBooleanConverter(String trueString, + String falseString) { this.trueString = trueString; this.falseString = falseString; } @@ -82,7 +93,8 @@ public class LegacyStringToBooleanConverter implements LegacyConverter<String, B } /** - * Gets the string representation for true. Default is "true", if not set in constructor. + * Gets the string representation for true. Default is "true", if not set in + * constructor. * * @return the string representation for true */ @@ -91,7 +103,8 @@ public class LegacyStringToBooleanConverter implements LegacyConverter<String, B } /** - * Gets the string representation for false. Default is "false", if not set in constructor. + * Gets the string representation for false. Default is "false", if not set + * in constructor. * * @return the string representation for false */ @@ -121,11 +134,12 @@ public class LegacyStringToBooleanConverter implements LegacyConverter<String, B } /** - * Gets the locale-depended string representation for false. - * Default is locale-independent value provided by {@link #getFalseString()} + * Gets the locale-depended string representation for false. Default is + * locale-independent value provided by {@link #getFalseString()} * * @since 7.5.4 - * @param locale to be used + * @param locale + * to be used * @return the string representation for false */ protected String getFalseString(Locale locale) { @@ -133,11 +147,12 @@ public class LegacyStringToBooleanConverter implements LegacyConverter<String, B } /** - * Gets the locale-depended string representation for true. - * Default is locale-independent value provided by {@link #getTrueString()} + * Gets the locale-depended string representation for true. Default is + * locale-independent value provided by {@link #getTrueString()} * * @since 7.5.4 - * @param locale to be used + * @param locale + * to be used * @return the string representation for true */ protected String getTrueString(Locale locale) { diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToByteConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToByteConverter.java index 0531322663..dd0d2e4b05 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToByteConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToByteConverter.java @@ -30,8 +30,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.4 */ -public class LegacyStringToByteConverter extends - LegacyAbstractStringToNumberConverter<Byte> { +public class LegacyStringToByteConverter + extends LegacyAbstractStringToNumberConverter<Byte> { /** * Returns the format used by diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToCollectionConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToCollectionConverter.java index 59321d5fb3..aa057630ca 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToCollectionConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToCollectionConverter.java @@ -38,8 +38,8 @@ import java.util.Locale; * * @author Vaadin Ltd */ -public class LegacyStringToCollectionConverter implements - LegacyConverter<String, Collection> { +public class LegacyStringToCollectionConverter + implements LegacyConverter<String, Collection> { private final String delimiter; private final LegacyConverter<String, ?> tokenConverter; @@ -77,8 +77,8 @@ public class LegacyStringToCollectionConverter implements * @param tokenType * expected token model type */ - public LegacyStringToCollectionConverter(LegacyConverter<String, ?> tokenConverter, - Class<?> tokenType) { + public LegacyStringToCollectionConverter( + LegacyConverter<String, ?> tokenConverter, Class<?> tokenType) { this(", ", tokenConverter, tokenType); } @@ -205,7 +205,8 @@ public class LegacyStringToCollectionConverter implements public static class DefaultCollectionFactory implements CollectionFactory { @Override - public Collection<?> createCollection(Class<? extends Collection> type) { + public Collection<?> createCollection( + Class<? extends Collection> type) { if (type.isAssignableFrom(ArrayList.class)) { return new ArrayList(); } else if (type.isAssignableFrom(HashSet.class)) { diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDateConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDateConverter.java index 40780bfdd0..035410dd5a 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDateConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDateConverter.java @@ -34,7 +34,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.0 */ -public class LegacyStringToDateConverter implements LegacyConverter<String, Date> { +public class LegacyStringToDateConverter + implements LegacyConverter<String, Date> { /** * Returns the format used by @@ -68,9 +69,9 @@ public class LegacyStringToDateConverter implements LegacyConverter<String, Date Locale locale) throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { if (targetType != getModelType()) { - throw new ConversionException("Converter only supports " - + getModelType().getName() + " (targetType was " - + targetType.getName() + ")"); + throw new ConversionException( + "Converter only supports " + getModelType().getName() + + " (targetType was " + targetType.getName() + ")"); } if (value == null) { diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDoubleConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDoubleConverter.java index 191648fba9..9232c37c7e 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDoubleConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDoubleConverter.java @@ -33,8 +33,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.0 */ -public class LegacyStringToDoubleConverter extends - LegacyAbstractStringToNumberConverter<Double> { +public class LegacyStringToDoubleConverter + extends LegacyAbstractStringToNumberConverter<Double> { /* * (non-Javadoc) diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToEnumConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToEnumConverter.java index ef1dec64eb..19c9ce2cd5 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToEnumConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToEnumConverter.java @@ -36,7 +36,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.4 */ -public class LegacyStringToEnumConverter implements LegacyConverter<String, Enum> { +public class LegacyStringToEnumConverter + implements LegacyConverter<String, Enum> { @Override public Enum convertToModel(String value, Class<? extends Enum> targetType, @@ -71,8 +72,8 @@ public class LegacyStringToEnumConverter implements LegacyConverter<String, Enum } if (!enumType.isEnum()) { - throw new ConversionException(enumType.getName() - + " is not an enum type"); + throw new ConversionException( + enumType.getName() + " is not an enum type"); } // First test for the human-readable value since that's the more likely @@ -128,8 +129,8 @@ public class LegacyStringToEnumConverter implements LegacyConverter<String, Enum // FOO_BAR -> Foo bar // _FOO -> _foo String result = enumString.substring(0, 1).toUpperCase(locale); - result += enumString.substring(1).toLowerCase(locale) - .replace('_', ' '); + result += enumString.substring(1).toLowerCase(locale).replace('_', + ' '); return result; } else { return enumString; diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToFloatConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToFloatConverter.java index 0d24e16a35..5a4eb3ca1c 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToFloatConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToFloatConverter.java @@ -33,8 +33,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.0 */ -public class LegacyStringToFloatConverter extends - LegacyAbstractStringToNumberConverter<Float> { +public class LegacyStringToFloatConverter + extends LegacyAbstractStringToNumberConverter<Float> { /* * (non-Javadoc) @@ -44,9 +44,8 @@ public class LegacyStringToFloatConverter extends * java.util.Locale) */ @Override - public Float convertToModel(String value, - Class<? extends Float> targetType, Locale locale) - throws ConversionException { + public Float convertToModel(String value, Class<? extends Float> targetType, + Locale locale) throws ConversionException { Number n = convertToNumber(value, targetType, locale); return n == null ? null : n.floatValue(); } diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToIntegerConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToIntegerConverter.java index 37c00b7c3e..b481dc23ae 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToIntegerConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToIntegerConverter.java @@ -30,8 +30,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.0 */ -public class LegacyStringToIntegerConverter extends - LegacyAbstractStringToNumberConverter<Integer> { +public class LegacyStringToIntegerConverter + extends LegacyAbstractStringToNumberConverter<Integer> { /** * Returns the format used by diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToLongConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToLongConverter.java index 0de27bc3f3..481a3892b4 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToLongConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToLongConverter.java @@ -30,8 +30,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.2 */ -public class LegacyStringToLongConverter extends - LegacyAbstractStringToNumberConverter<Long> { +public class LegacyStringToLongConverter + extends LegacyAbstractStringToNumberConverter<Long> { /** * Returns the format used by diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToShortConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToShortConverter.java index 8b1646542f..aad0eba9f7 100644 --- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToShortConverter.java +++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToShortConverter.java @@ -30,8 +30,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.4 */ -public class LegacyStringToShortConverter extends - LegacyAbstractStringToNumberConverter<Short> { +public class LegacyStringToShortConverter + extends LegacyAbstractStringToNumberConverter<Short> { /** * Returns the format used by @@ -58,9 +58,8 @@ public class LegacyStringToShortConverter extends * java.lang.Class, java.util.Locale) */ @Override - public Short convertToModel(String value, - Class<? extends Short> targetType, Locale locale) - throws ConversionException { + public Short convertToModel(String value, Class<? extends Short> targetType, + Locale locale) throws ConversionException { Number n = convertToNumber(value, targetType, locale); if (n == null) { diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractStringValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractStringValidator.java index 3610a01dec..c8a01ff021 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractStringValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractStringValidator.java @@ -28,7 +28,8 @@ package com.vaadin.legacy.data.validator; * @since 5.4 */ @SuppressWarnings("serial") -public abstract class LegacyAbstractStringValidator extends LegacyAbstractValidator<String> { +public abstract class LegacyAbstractStringValidator + extends LegacyAbstractValidator<String> { /** * Constructs a validator for strings. @@ -41,7 +42,7 @@ public abstract class LegacyAbstractStringValidator extends LegacyAbstractValida * @param errorMessage * the message to be included in an {@link InvalidValueException} * (with "{0}" replaced by the value that failed validation). - * */ + */ public LegacyAbstractStringValidator(String errorMessage) { super(errorMessage); } diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractValidator.java index a496e96663..035f0c822d 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractValidator.java @@ -18,8 +18,8 @@ package com.vaadin.legacy.data.validator; import com.vaadin.legacy.data.Validator; /** - * Abstract {@link com.vaadin.legacy.data.Validator Validator} implementation that - * provides a basic Validator implementation except the + * Abstract {@link com.vaadin.legacy.data.Validator Validator} implementation + * that provides a basic Validator implementation except the * {@link #isValidValue(Object)} method. * <p> * To include the value that failed validation in the exception message you can diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBeanValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBeanValidator.java index 823001a419..1c973dda4b 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBeanValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBeanValidator.java @@ -119,10 +119,11 @@ public class LegacyBeanValidator implements Validator { for (Object v : violations) { final ConstraintViolation<?> violation = (ConstraintViolation<?>) v; String msg = getJavaxBeanValidatorFactory() - .getMessageInterpolator().interpolate( - violation.getMessageTemplate(), - new SimpleContext(value, violation - .getConstraintDescriptor()), locale); + .getMessageInterpolator() + .interpolate(violation.getMessageTemplate(), + new SimpleContext(value, + violation.getConstraintDescriptor()), + locale); causes[i] = new InvalidValueException(msg); ++i; } diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigDecimalRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigDecimalRangeValidator.java index 46d8c99437..2280619835 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigDecimalRangeValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigDecimalRangeValidator.java @@ -24,7 +24,8 @@ import java.math.BigDecimal; * @since 7.4 */ @SuppressWarnings("serial") -public class LegacyBigDecimalRangeValidator extends LegacyRangeValidator<BigDecimal> { +public class LegacyBigDecimalRangeValidator + extends LegacyRangeValidator<BigDecimal> { /** * Creates a validator for checking that an BigDecimal is within a given @@ -42,8 +43,8 @@ public class LegacyBigDecimalRangeValidator extends LegacyRangeValidator<BigDeci * @param maxValue * The maximum value to accept or null for no limit */ - public LegacyBigDecimalRangeValidator(String errorMessage, BigDecimal minValue, - BigDecimal maxValue) { + public LegacyBigDecimalRangeValidator(String errorMessage, + BigDecimal minValue, BigDecimal maxValue) { super(errorMessage, BigDecimal.class, minValue, maxValue); } diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigIntegerRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigIntegerRangeValidator.java index 4e11a65c78..456a63a15e 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigIntegerRangeValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigIntegerRangeValidator.java @@ -24,7 +24,8 @@ import java.math.BigInteger; * @since 7.4 */ @SuppressWarnings("serial") -public class LegacyBigIntegerRangeValidator extends LegacyRangeValidator<BigInteger> { +public class LegacyBigIntegerRangeValidator + extends LegacyRangeValidator<BigInteger> { /** * Creates a validator for checking that an BigInteger is within a given @@ -42,8 +43,8 @@ public class LegacyBigIntegerRangeValidator extends LegacyRangeValidator<BigInte * @param maxValue * The maximum value to accept or null for no limit */ - public LegacyBigIntegerRangeValidator(String errorMessage, BigInteger minValue, - BigInteger maxValue) { + public LegacyBigIntegerRangeValidator(String errorMessage, + BigInteger minValue, BigInteger maxValue) { super(errorMessage, BigInteger.class, minValue, maxValue); } diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyByteRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyByteRangeValidator.java index 1f795d1e42..4186168d23 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyByteRangeValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyByteRangeValidator.java @@ -39,7 +39,8 @@ public class LegacyByteRangeValidator extends LegacyRangeValidator<Byte> { * @param maxValue * The maximum value to accept or null for no limit */ - public LegacyByteRangeValidator(String errorMessage, Byte minValue, Byte maxValue) { + public LegacyByteRangeValidator(String errorMessage, Byte minValue, + Byte maxValue) { super(errorMessage, Byte.class, minValue, maxValue); } diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleValidator.java index dd45f365d0..7f72d831ca 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleValidator.java @@ -20,14 +20,14 @@ import com.vaadin.legacy.data.util.converter.LegacyStringToDoubleConverter; /** * String validator for a double precision floating point number. See - * {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} for more - * information. + * {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} for + * more information. * * @author Vaadin Ltd. * @since 5.4 - * @deprecated As of 7.0. Use a {@link LegacyStringToDoubleConverter} converter on the - * field instead or bind the field to a {@link Property} of type - * {@link Double}. + * @deprecated As of 7.0. Use a {@link LegacyStringToDoubleConverter} converter + * on the field instead or bind the field to a {@link Property} of + * type {@link Double}. */ @Deprecated @SuppressWarnings("serial") @@ -40,8 +40,8 @@ public class LegacyDoubleValidator extends LegacyAbstractStringValidator { * @param errorMessage * the message to display in case the value does not validate. * @deprecated As of 7.0. Use a Double converter on the field instead and/or - * use a {@link LegacyDoubleRangeValidator} for validating that the - * value is inside a given range. + * use a {@link LegacyDoubleRangeValidator} for validating that + * the value is inside a given range. */ @Deprecated public LegacyDoubleValidator(String errorMessage) { diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyEmailValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyEmailValidator.java index d6a7cdd485..fec2519871 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyEmailValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyEmailValidator.java @@ -20,8 +20,8 @@ package com.vaadin.legacy.data.validator; * complete according to RFC 822 but handles the vast majority of valid e-mail * addresses correctly. * - * See {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} for more - * information. + * See {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} + * for more information. * * <p> * An empty string or a null is always accepted - use the required flag on @@ -43,8 +43,7 @@ public class LegacyEmailValidator extends LegacyRegexpValidator { * the message to display in case the value does not validate. */ public LegacyEmailValidator(String errorMessage) { - super( - "^([a-zA-Z0-9_\\.\\-+])+@(([a-zA-Z0-9-])+\\.)+([a-zA-Z0-9]{2,4})+$", + super("^([a-zA-Z0-9_\\.\\-+])+@(([a-zA-Z0-9-])+\\.)+([a-zA-Z0-9]{2,4})+$", true, errorMessage); } } diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerValidator.java index dc34215680..31a5c0dc26 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerValidator.java @@ -20,14 +20,14 @@ import com.vaadin.legacy.data.util.converter.LegacyStringToIntegerConverter; /** * String validator for integers. See - * {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} for more - * information. + * {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} for + * more information. * * @author Vaadin Ltd. * @since 5.4 - * @deprecated As of 7.0. Use a {@link LegacyStringToIntegerConverter} converter on - * the field instead or bind the field to a {@link Property} of type - * {@link Integer}. + * @deprecated As of 7.0. Use a {@link LegacyStringToIntegerConverter} converter + * on the field instead or bind the field to a {@link Property} of + * type {@link Integer}. */ @SuppressWarnings("serial") @Deprecated @@ -40,8 +40,8 @@ public class LegacyIntegerValidator extends LegacyAbstractStringValidator { * @param errorMessage * the message to display in case the value does not validate. * @deprecated As of 7.0. Use an Integer converter on the field instead - * and/or use an {@link LegacyIntegerRangeValidator} for validating - * that the value is inside a given range. + * and/or use an {@link LegacyIntegerRangeValidator} for + * validating that the value is inside a given range. */ @Deprecated public LegacyIntegerValidator(String errorMessage) { diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyLongRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyLongRangeValidator.java index 4fb38de459..c7db9be6d3 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyLongRangeValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyLongRangeValidator.java @@ -39,7 +39,8 @@ public class LegacyLongRangeValidator extends LegacyRangeValidator<Long> { * @param maxValue * The maximum value to accept or null for no limit */ - public LegacyLongRangeValidator(String errorMessage, Long minValue, Long maxValue) { + public LegacyLongRangeValidator(String errorMessage, Long minValue, + Long maxValue) { super(errorMessage, Long.class, minValue, maxValue); } diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRangeValidator.java index d9106e9bc6..10eddd0cbf 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRangeValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRangeValidator.java @@ -24,8 +24,8 @@ package com.vaadin.legacy.data.validator; * {@link LegacyIntegerRangeValidator}, {@link LegacyDoubleRangeValidator} or * {@link LegacyDateRangeValidator} in applications. * <p> - * Note that {@link LegacyRangeValidator} always accept null values. Make a field - * required to ensure that no empty values are accepted or override + * Note that {@link LegacyRangeValidator} always accept null values. Make a + * field required to ensure that no empty values are accepted or override * {@link #isValidValue(Comparable)}. * </p> * @@ -35,7 +35,8 @@ package com.vaadin.legacy.data.validator; * @author Vaadin Ltd. * @since 7.0 */ -public class LegacyRangeValidator<T extends Comparable> extends LegacyAbstractValidator<T> { +public class LegacyRangeValidator<T extends Comparable> + extends LegacyAbstractValidator<T> { private T minValue = null; private boolean minValueIncluded = true; diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRegexpValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRegexpValidator.java index 0bc93f44b2..a843b1aff7 100644 --- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRegexpValidator.java +++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRegexpValidator.java @@ -27,8 +27,8 @@ import java.util.regex.Pattern; * {@link java.util.regex.Pattern#sum} * </p> * <p> - * See {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} for more - * information. + * See {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} + * for more information. * </p> * <p> * An empty string or a null is always accepted - use the required flag on @@ -71,7 +71,8 @@ public class LegacyRegexpValidator extends LegacyAbstractStringValidator { * @param errorMessage * the message to display in case the value does not validate. */ - public LegacyRegexpValidator(String regexp, boolean complete, String errorMessage) { + public LegacyRegexpValidator(String regexp, boolean complete, + String errorMessage) { super(errorMessage); pattern = Pattern.compile(regexp); this.complete = complete; diff --git a/server/src/main/java/com/vaadin/legacy/ui/LegacyCheckBox.java b/server/src/main/java/com/vaadin/legacy/ui/LegacyCheckBox.java index baa98a4c19..94cd322d0f 100644 --- a/server/src/main/java/com/vaadin/legacy/ui/LegacyCheckBox.java +++ b/server/src/main/java/com/vaadin/legacy/ui/LegacyCheckBox.java @@ -66,7 +66,8 @@ public class LegacyCheckBox extends LegacyAbstractField<Boolean> { } }; - FocusAndBlurServerRpcImpl focusBlurRpc = new FocusAndBlurServerRpcImpl(this) { + FocusAndBlurServerRpcImpl focusBlurRpc = new FocusAndBlurServerRpcImpl( + this) { @Override protected void fireEvent(Event event) { LegacyCheckBox.this.fireEvent(event); @@ -130,8 +131,8 @@ public class LegacyCheckBox extends LegacyAbstractField<Boolean> { /* * Overridden to keep the shared state in sync with the LegacyAbstractField - * internal value. Should be removed once LegacyAbstractField is refactored to use - * shared state. + * internal value. Should be removed once LegacyAbstractField is refactored + * to use shared state. * * See tickets #10921 and #11064. */ @@ -221,9 +222,8 @@ public class LegacyCheckBox extends LegacyAbstractField<Boolean> { public void readDesign(Element design, DesignContext designContext) { super.readDesign(design, designContext); if (design.hasAttr("checked")) { - this.setValue( - DesignAttributeHandler.readAttribute("checked", - design.attributes(), Boolean.class), false, true); + this.setValue(DesignAttributeHandler.readAttribute("checked", + design.attributes(), Boolean.class), false, true); } } @@ -248,7 +248,8 @@ public class LegacyCheckBox extends LegacyAbstractField<Boolean> { @Override public void writeDesign(Element design, DesignContext designContext) { super.writeDesign(design, designContext); - LegacyCheckBox def = (LegacyCheckBox) designContext.getDefaultInstance(this); + LegacyCheckBox def = (LegacyCheckBox) designContext + .getDefaultInstance(this); Attributes attr = design.attributes(); DesignAttributeHandler.writeAttribute("checked", attr, getValue(), def.getValue(), Boolean.class); diff --git a/server/src/main/java/com/vaadin/legacy/ui/LegacyInlineDateField.java b/server/src/main/java/com/vaadin/legacy/ui/LegacyInlineDateField.java index d7f5fc520f..f85e680e39 100644 --- a/server/src/main/java/com/vaadin/legacy/ui/LegacyInlineDateField.java +++ b/server/src/main/java/com/vaadin/legacy/ui/LegacyInlineDateField.java @@ -37,7 +37,8 @@ public class LegacyInlineDateField extends LegacyDateField { super(); } - public LegacyInlineDateField(Property dataSource) throws IllegalArgumentException { + public LegacyInlineDateField(Property dataSource) + throws IllegalArgumentException { super(dataSource); } diff --git a/server/src/main/java/com/vaadin/legacy/ui/LegacyPopupDateField.java b/server/src/main/java/com/vaadin/legacy/ui/LegacyPopupDateField.java index 05091b8663..681ec40b09 100644 --- a/server/src/main/java/com/vaadin/legacy/ui/LegacyPopupDateField.java +++ b/server/src/main/java/com/vaadin/legacy/ui/LegacyPopupDateField.java @@ -42,7 +42,8 @@ public class LegacyPopupDateField extends LegacyDateField { super(); } - public LegacyPopupDateField(Property dataSource) throws IllegalArgumentException { + public LegacyPopupDateField(Property dataSource) + throws IllegalArgumentException { super(dataSource); } diff --git a/server/src/main/java/com/vaadin/navigator/Navigator.java b/server/src/main/java/com/vaadin/navigator/Navigator.java index 1fb18adde1..71a2115c46 100644 --- a/server/src/main/java/com/vaadin/navigator/Navigator.java +++ b/server/src/main/java/com/vaadin/navigator/Navigator.java @@ -100,8 +100,8 @@ public class Navigator implements Serializable { * This class is mostly for internal use by Navigator, and is only public * and static to enable testing. */ - public static class UriFragmentManager implements NavigationStateManager, - UriFragmentChangedListener { + public static class UriFragmentManager + implements NavigationStateManager, UriFragmentChangedListener { private final Page page; private Navigator navigator; @@ -195,8 +195,8 @@ public class Navigator implements Serializable { container.removeAllComponents(); container.addComponent((Component) view); } else { - throw new IllegalArgumentException("View is not a component: " - + view); + throw new IllegalArgumentException( + "View is not a component: " + view); } } } @@ -209,8 +209,8 @@ public class Navigator implements Serializable { * Attempting to display a view that is not a component causes an exception * to be thrown. */ - public static class SingleComponentContainerViewDisplay implements - ViewDisplay { + public static class SingleComponentContainerViewDisplay + implements ViewDisplay { private final SingleComponentContainer container; @@ -228,8 +228,8 @@ public class Navigator implements Serializable { if (view instanceof Component) { container.setContent((Component) view); } else { - throw new IllegalArgumentException("View is not a component: " - + view); + throw new IllegalArgumentException( + "View is not a component: " + view); } } } @@ -561,8 +561,7 @@ public class Navigator implements Serializable { if (viewWithLongestName == null) { throw new IllegalArgumentException( - "Trying to navigate to an unknown state '" - + navigationState + "Trying to navigate to an unknown state '" + navigationState + "' and an error view provider not present"); } @@ -576,7 +575,8 @@ public class Navigator implements Serializable { } if (getCurrentView() == null || !SharedUtil.equals(getCurrentView(), viewWithLongestName) - || !SharedUtil.equals(currentNavigationState, navigationState)) { + || !SharedUtil.equals(currentNavigationState, + navigationState)) { navigateTo(viewWithLongestName, longestViewName, parameters); } else { updateNavigationState(new ViewChangeEvent(this, getCurrentView(), @@ -722,7 +722,8 @@ public class Navigator implements Serializable { // a copy of the listener list is needed to avoid // ConcurrentModificationException as a listener can add/remove // listeners - for (ViewChangeListener l : new ArrayList<ViewChangeListener>(listeners)) { + for (ViewChangeListener l : new ArrayList<ViewChangeListener>( + listeners)) { if (!l.beforeViewChange(event)) { return false; } @@ -785,7 +786,8 @@ public class Navigator implements Serializable { // a copy of the listener list is needed to avoid // ConcurrentModificationException as a listener can add/remove // listeners - for (ViewChangeListener l : new ArrayList<ViewChangeListener>(listeners)) { + for (ViewChangeListener l : new ArrayList<ViewChangeListener>( + listeners)) { l.afterViewChange(event); } } @@ -1002,9 +1004,8 @@ public class Navigator implements Serializable { ViewProvider longestViewNameProvider = null; for (ViewProvider provider : providers) { String viewName = provider.getViewName(state); - if (null != viewName - && (longestViewName == null || viewName.length() > longestViewName - .length())) { + if (null != viewName && (longestViewName == null + || viewName.length() > longestViewName.length())) { longestViewName = viewName; longestViewNameProvider = provider; } diff --git a/server/src/main/java/com/vaadin/server/AbstractClientConnector.java b/server/src/main/java/com/vaadin/server/AbstractClientConnector.java index c624663d50..85e87b297d 100644 --- a/server/src/main/java/com/vaadin/server/AbstractClientConnector.java +++ b/server/src/main/java/com/vaadin/server/AbstractClientConnector.java @@ -54,8 +54,8 @@ import elemental.json.JsonObject; * @author Vaadin Ltd * @since 7.0.0 */ -public abstract class AbstractClientConnector implements ClientConnector, - MethodEventSource { +public abstract class AbstractClientConnector + implements ClientConnector, MethodEventSource { /** * A map from client to server RPC interface class name to the RPC call * manager that handles incoming RPC calls for that interface. @@ -135,7 +135,9 @@ public abstract class AbstractClientConnector implements ClientConnector, /* Documentation copied from interface */ @Override public void markAsDirty() { - assert getSession() == null || getSession().hasLock() : buildLockAssertMessage("markAsDirty()"); + assert getSession() == null + || getSession().hasLock() : buildLockAssertMessage( + "markAsDirty()"); UI uI = getUI(); if (uI != null) { uI.getConnectorTracker().markDirty(this); @@ -167,8 +169,8 @@ public abstract class AbstractClientConnector implements ClientConnector, */ protected <T extends ServerRpc> void registerRpc(T implementation, Class<T> rpcInterfaceType) { - rpcManagerMap.put(rpcInterfaceType.getName(), new ServerRpcManager<T>( - implementation, rpcInterfaceType)); + rpcManagerMap.put(rpcInterfaceType.getName(), + new ServerRpcManager<T>(implementation, rpcInterfaceType)); } /** @@ -202,7 +204,8 @@ public abstract class AbstractClientConnector implements ClientConnector, } @SuppressWarnings("unchecked") - private Class<ServerRpc> getServerRpcInterface(Class<?> implementationClass) { + private Class<ServerRpc> getServerRpcInterface( + Class<?> implementationClass) { Class<ServerRpc> serverRpcClass = null; if (implementationClass != null) { for (Class<?> candidateInterface : implementationClass @@ -247,7 +250,9 @@ public abstract class AbstractClientConnector implements ClientConnector, * @see #getState() */ protected SharedState getState(boolean markAsDirty) { - assert getSession() == null || getSession().hasLock() : buildLockAssertMessage("getState()"); + assert getSession() == null + || getSession().hasLock() : buildLockAssertMessage( + "getState()"); if (null == sharedState) { sharedState = createState(); @@ -288,9 +293,9 @@ public abstract class AbstractClientConnector implements ClientConnector, try { return getStateType().newInstance(); } catch (Exception e) { - throw new RuntimeException( - "Error creating state of type " + getStateType().getName() - + " for " + getClass().getName(), e); + throw new RuntimeException("Error creating state of type " + + getStateType().getName() + " for " + getClass().getName(), + e); } } @@ -326,11 +331,11 @@ public abstract class AbstractClientConnector implements ClientConnector, // Try in superclass instead class1 = class1.getSuperclass(); } - throw new NoSuchMethodException(getClass().getCanonicalName() - + ".getState()"); + throw new NoSuchMethodException( + getClass().getCanonicalName() + ".getState()"); } catch (Exception e) { - throw new RuntimeException("Error finding state type for " - + getClass().getName(), e); + throw new RuntimeException( + "Error finding state type for " + getClass().getName(), e); } } @@ -365,8 +370,8 @@ public abstract class AbstractClientConnector implements ClientConnector, } } - private class RpcInvocationHandler implements InvocationHandler, - Serializable { + private class RpcInvocationHandler + implements InvocationHandler, Serializable { private String rpcInterfaceName; @@ -708,8 +713,8 @@ public abstract class AbstractClientConnector implements ClientConnector, * association. */ protected void setResource(String key, Resource resource) { - ResourceReference resourceReference = ResourceReference.create( - resource, this, key); + ResourceReference resourceReference = ResourceReference.create(resource, + this, key); if (resourceReference == null) { getState().resources.remove(key); @@ -883,7 +888,8 @@ public abstract class AbstractClientConnector implements ClientConnector, */ @Override @Deprecated - public void addListener(Class<?> eventType, Object target, String methodName) { + public void addListener(Class<?> eventType, Object target, + String methodName) { if (eventRouter == null) { eventRouter = new EventRouter(); } @@ -935,7 +941,8 @@ public abstract class AbstractClientConnector implements ClientConnector, * listen to events of type <code>eventType</code>. */ @Override - public void removeListener(Class<?> eventType, Object target, Method method) { + public void removeListener(Class<?> eventType, Object target, + Method method) { if (eventRouter != null) { eventRouter.removeListener(eventType, target, method); } diff --git a/server/src/main/java/com/vaadin/server/AbstractDeploymentConfiguration.java b/server/src/main/java/com/vaadin/server/AbstractDeploymentConfiguration.java index 2554e421c8..709c7930dd 100644 --- a/server/src/main/java/com/vaadin/server/AbstractDeploymentConfiguration.java +++ b/server/src/main/java/com/vaadin/server/AbstractDeploymentConfiguration.java @@ -23,8 +23,8 @@ package com.vaadin.server; * * @author Vaadin Ltd */ -public abstract class AbstractDeploymentConfiguration implements - DeploymentConfiguration { +public abstract class AbstractDeploymentConfiguration + implements DeploymentConfiguration { @Override public String getUIClassName() { diff --git a/server/src/main/java/com/vaadin/server/AbstractJavaScriptExtension.java b/server/src/main/java/com/vaadin/server/AbstractJavaScriptExtension.java index 0bfee4c20f..ae7bafb142 100644 --- a/server/src/main/java/com/vaadin/server/AbstractJavaScriptExtension.java +++ b/server/src/main/java/com/vaadin/server/AbstractJavaScriptExtension.java @@ -92,13 +92,15 @@ import elemental.json.JsonValue; * the field, that function is called whenever the contents of the shared state * is changed.</li> * <li><code>onUnregister</code> - If the JavaScript code assigns a function to - * the field, that function is called when the connector has been unregistered.</li> + * the field, that function is called when the connector has been + * unregistered.</li> * <li>Any field name corresponding to a call to * {@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 #callFunction(String, Object...)} - * on the server will be called if a function has been assigned to the field.</li> + * on the server will be called if a function has been assigned to the + * field.</li> * </ul> * <p> * @@ -113,7 +115,8 @@ import elemental.json.JsonValue; * <li>Java Strings are represented by JavaScript strings.</li> * <li>Java Dates are represented by JavaScript numbers containing the timestamp * </li> - * <li>List, Set and all arrays in Java are represented by JavaScript arrays.</li> + * <li>List, Set and all arrays in Java are represented by JavaScript + * arrays.</li> * <li>Map<String, ?> in Java is represented by JavaScript object with * fields corresponding to the map keys.</li> * <li>Any other Java Map is represented by a JavaScript array containing two @@ -177,7 +180,8 @@ public abstract class AbstractJavaScriptExtension extends AbstractExtension { * the {@link JavaScriptFunction} object that will be invoked * when the JavaScript function is called */ - protected void addFunction(String functionName, JavaScriptFunction function) { + protected void addFunction(String functionName, + JavaScriptFunction function) { callbackHelper.registerCallback(functionName, function); } diff --git a/server/src/main/java/com/vaadin/server/BootstrapHandler.java b/server/src/main/java/com/vaadin/server/BootstrapHandler.java index c139d5443c..74707842d8 100644 --- a/server/src/main/java/com/vaadin/server/BootstrapHandler.java +++ b/server/src/main/java/com/vaadin/server/BootstrapHandler.java @@ -134,8 +134,8 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler { UICreateEvent event = new UICreateEvent(getRequest(), getUIClass()); - pushMode = getBootstrapResponse().getUIProvider().getPushMode( - event); + pushMode = getBootstrapResponse().getUIProvider() + .getPushMode(event); if (pushMode == null) { pushMode = getRequest().getService() .getDeploymentConfiguration().getPushMode(); @@ -192,8 +192,8 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler { @Override protected String getVaadinDirUrl() { - return context.getApplicationParameters().getString( - ApplicationConstants.VAADIN_DIR_URL); + return context.getApplicationParameters() + .getString(ApplicationConstants.VAADIN_DIR_URL); } @Override @@ -203,12 +203,14 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler { @Override protected String getServiceUrlParameterName() { - return getConfigOrNull(ApplicationConstants.SERVICE_URL_PARAMETER_NAME); + return getConfigOrNull( + ApplicationConstants.SERVICE_URL_PARAMETER_NAME); } @Override protected String getServiceUrl() { - String serviceUrl = getConfigOrNull(ApplicationConstants.SERVICE_URL); + String serviceUrl = getConfigOrNull( + ApplicationConstants.SERVICE_URL); if (serviceUrl == null) { return "./"; } else if (!serviceUrl.endsWith("/")) { @@ -303,8 +305,8 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler { if (vaadinService.isStandalone(request)) { Map<String, Object> headers = new LinkedHashMap<String, Object>(); Document document = Document.createShell(""); - BootstrapPageResponse pageResponse = new BootstrapPageResponse( - this, request, context.getSession(), context.getUIClass(), + BootstrapPageResponse pageResponse = new BootstrapPageResponse(this, + request, context.getSession(), context.getUIClass(), document, headers, fragmentResponse.getUIProvider()); List<Node> fragmentNodes = fragmentResponse.getFragmentNodes(); Element body = document.body(); @@ -342,7 +344,8 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler { response.setDateHeader(header.getKey(), ((Long) value).longValue()); } else { - throw new RuntimeException("Unsupported header value: " + value); + throw new RuntimeException( + "Unsupported header value: " + value); } } } @@ -350,8 +353,8 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler { private void writeBootstrapPage(VaadinResponse response, String html) throws IOException { response.setContentType("text/html"); - BufferedWriter writer = new BufferedWriter(new OutputStreamWriter( - response.getOutputStream(), "UTF-8")); + BufferedWriter writer = new BufferedWriter( + new OutputStreamWriter(response.getOutputStream(), "UTF-8")); writer.append(html); writer.close(); } @@ -403,13 +406,14 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler { } catch (Exception e) { throw new RuntimeException( "Error processing viewport generator " - + viewportGeneratorClass.getCanonicalName(), e); + + viewportGeneratorClass.getCanonicalName(), + e); } } if (viewportContent != null) { - head.appendElement("meta").attr("name", "viewport") - .attr("content", viewportContent); + head.appendElement("meta").attr("name", "viewport").attr("content", + viewportContent); } String title = response.getUIProvider().getPageTitle( @@ -477,12 +481,12 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler { UICreateEvent event = new UICreateEvent(context.getRequest(), context.getUIClass()); - WidgetsetInfo widgetset = context.getBootstrapResponse() - .getUIProvider().getWidgetsetInfo(event); + WidgetsetInfo widgetset = context.getBootstrapResponse().getUIProvider() + .getWidgetsetInfo(event); if (widgetset == null) { // TODO do we want to move WidgetsetInfoImpl elsewhere? - widgetset = new WidgetsetInfoImpl(request.getService() - .getConfiguredWidgetset(request)); + widgetset = new WidgetsetInfoImpl( + request.getService().getConfiguredWidgetset(request)); } return widgetset; @@ -523,8 +527,8 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler { mainDiv.attr("style", style); } mainDiv.appendElement("div").addClass("v-app-loading"); - mainDiv.appendElement("noscript") - .append("You have to enable javascript in your browser to use an application built with Vaadin."); + mainDiv.appendElement("noscript").append( + "You have to enable javascript in your browser to use an application built with Vaadin."); fragmentNodes.add(mainDiv); VaadinRequest request = context.getRequest(); @@ -548,28 +552,29 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler { pushJS += versionQueryParam; - fragmentNodes.add(new Element(Tag.valueOf("script"), "").attr( - "type", "text/javascript").attr("src", pushJS)); + fragmentNodes.add(new Element(Tag.valueOf("script"), "") + .attr("type", "text/javascript").attr("src", pushJS)); } String bootstrapLocation = vaadinLocation + ApplicationConstants.VAADIN_BOOTSTRAP_JS + versionQueryParam; - 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"); + 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(); builder.append("//<![CDATA[\n"); - builder.append("if (!window.vaadin) alert(" - + JsonUtil.quote("Failed to load the bootstrap javascript: " - + bootstrapLocation) + ");\n"); + builder.append("if (!window.vaadin) alert(" + JsonUtil.quote( + "Failed to load the bootstrap javascript: " + bootstrapLocation) + + ");\n"); appendMainScriptTagContents(context, builder); builder.append("//]]>"); - mainScriptTag.appendChild(new DataNode(builder.toString(), - mainScriptTag.baseUri())); + mainScriptTag.appendChild( + new DataNode(builder.toString(), mainScriptTag.baseUri())); fragmentNodes.add(mainScriptTag); } @@ -587,9 +592,11 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler { * side Profiler if another implementation hasn't already been * added. */ - builder.append("if (typeof window.__gwtStatsEvent != 'function') {\n"); + builder.append( + "if (typeof window.__gwtStatsEvent != 'function') {\n"); builder.append("vaadin.gwtStatsEvents = [];\n"); - builder.append("window.__gwtStatsEvent = function(event) {vaadin.gwtStatsEvents.push(event); return true;};\n"); + builder.append( + "window.__gwtStatsEvent = function(event) {vaadin.gwtStatsEvents.push(event); return true;};\n"); builder.append("}\n"); } @@ -622,8 +629,8 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler { } // Ignore restartApplication that might be passed to UI init - if (request - .getParameter(VaadinService.URL_PARAMETER_RESTART_APPLICATION) != null) { + if (request.getParameter( + VaadinService.URL_PARAMETER_RESTART_APPLICATION) != null) { appConfig.put("extraParams", "&" + IGNORE_RESTART_PARAM + "=1"); } diff --git a/server/src/main/java/com/vaadin/server/BrowserWindowOpener.java b/server/src/main/java/com/vaadin/server/BrowserWindowOpener.java index c1b8cbe91e..de6ab10527 100644 --- a/server/src/main/java/com/vaadin/server/BrowserWindowOpener.java +++ b/server/src/main/java/com/vaadin/server/BrowserWindowOpener.java @@ -91,8 +91,9 @@ public class BrowserWindowOpener extends AbstractExtension { */ public BrowserWindowOpener(Class<? extends UI> uiClass, String path) { // Create a Resource with a translated URL going to the VaadinService - this(new ExternalResource(ApplicationConstants.APP_PROTOCOL_PREFIX - + path), new BrowserWindowOpenerUIProvider(uiClass, path)); + this(new ExternalResource( + ApplicationConstants.APP_PROTOCOL_PREFIX + path), + new BrowserWindowOpenerUIProvider(uiClass, path)); } /** diff --git a/server/src/main/java/com/vaadin/server/ClassResource.java b/server/src/main/java/com/vaadin/server/ClassResource.java index 5fb30095ed..e02590208c 100644 --- a/server/src/main/java/com/vaadin/server/ClassResource.java +++ b/server/src/main/java/com/vaadin/server/ClassResource.java @@ -102,9 +102,9 @@ public class ClassResource implements ConnectorResource, Serializable { @Override public DownloadStream getStream() { - final DownloadStream ds = new DownloadStream(getAssociatedClass() - .getResourceAsStream(resourceName), getMIMEType(), - getFilename()); + final DownloadStream ds = new DownloadStream( + getAssociatedClass().getResourceAsStream(resourceName), + getMIMEType(), getFilename()); ds.setBufferSize(getBufferSize()); ds.setCacheTime(getCacheTime()); return ds; diff --git a/server/src/main/java/com/vaadin/server/ClientConnector.java b/server/src/main/java/com/vaadin/server/ClientConnector.java index ae988457c0..b9584eff7d 100644 --- a/server/src/main/java/com/vaadin/server/ClientConnector.java +++ b/server/src/main/java/com/vaadin/server/ClientConnector.java @@ -55,8 +55,8 @@ public interface ClientConnector extends Connector { * */ public static interface AttachListener extends ConnectorEventListener { - public static final Method attachMethod = ReflectTools.findMethod( - AttachListener.class, "attach", AttachEvent.class); + public static final Method attachMethod = ReflectTools + .findMethod(AttachListener.class, "attach", AttachEvent.class); /** * Called when a AttachListener is notified of a AttachEvent. @@ -83,8 +83,8 @@ public interface ClientConnector extends Connector { * */ public static interface DetachListener extends ConnectorEventListener { - public static final Method detachMethod = ReflectTools.findMethod( - DetachListener.class, "detach", DetachEvent.class); + public static final Method detachMethod = ReflectTools + .findMethod(DetachListener.class, "detach", DetachEvent.class); /** * Called when a DetachListener is notified of a DetachEvent. @@ -108,8 +108,8 @@ public interface ClientConnector extends Connector { * to find the connector where the error occurred or {@link #getComponent()} * to find the nearest parent component. */ - public static class ConnectorErrorEvent extends - com.vaadin.server.ErrorEvent { + public static class ConnectorErrorEvent + extends com.vaadin.server.ErrorEvent { private Connector connector; diff --git a/server/src/main/java/com/vaadin/server/ClientMethodInvocation.java b/server/src/main/java/com/vaadin/server/ClientMethodInvocation.java index 77849c83df..99458ac00e 100644 --- a/server/src/main/java/com/vaadin/server/ClientMethodInvocation.java +++ b/server/src/main/java/com/vaadin/server/ClientMethodInvocation.java @@ -33,8 +33,8 @@ import elemental.json.impl.JsonUtil; * * @since 7.0 */ -public class ClientMethodInvocation implements Serializable, - Comparable<ClientMethodInvocation> { +public class ClientMethodInvocation + implements Serializable, Comparable<ClientMethodInvocation> { private final ClientConnector connector; private final String interfaceName; private final String methodName; @@ -121,8 +121,8 @@ public class ClientMethodInvocation implements Serializable, stream.writeObject(serializedParameters); } - private void readObject(ObjectInputStream stream) throws IOException, - ClassNotFoundException { + private void readObject(ObjectInputStream stream) + throws IOException, ClassNotFoundException { // Reverses the serialization done in writeObject. Basically just // parsing the serialized type back to the non-serializable type. stream.defaultReadObject(); diff --git a/server/src/main/java/com/vaadin/server/ConnectorResourceHandler.java b/server/src/main/java/com/vaadin/server/ConnectorResourceHandler.java index 8715134773..e10248cb31 100644 --- a/server/src/main/java/com/vaadin/server/ConnectorResourceHandler.java +++ b/server/src/main/java/com/vaadin/server/ConnectorResourceHandler.java @@ -88,11 +88,11 @@ public class ConnectorResourceHandler implements RequestHandler { .setCurrent(ui); try { if (!connector.handleConnectorRequest(request, response, key)) { - return error(request, response, connector.getClass() - .getSimpleName() - + " (" - + connector.getConnectorId() - + ") did not handle connector request for " + key); + return error(request, response, + connector.getClass().getSimpleName() + " (" + + connector.getConnectorId() + + ") did not handle connector request for " + + key); } } catch (Exception e) { session.lock(); @@ -120,16 +120,15 @@ public class ConnectorResourceHandler implements RequestHandler { if (!loggedDecodingWarning) { loggedDecodingWarning = true; - getLogger() - .warning( - "Request path contains a new line character. This typically means that the server is incorrectly configured to use something else than UTF-8 for URL decoding (requestPath: " - + requestPath + ")"); + getLogger().warning( + "Request path contains a new line character. This typically means that the server is incorrectly configured to use something else than UTF-8 for URL decoding (requestPath: " + + requestPath + ")"); } } } - private static boolean error(VaadinRequest request, - VaadinResponse response, String logMessage) throws IOException { + private static boolean error(VaadinRequest request, VaadinResponse response, + String logMessage) throws IOException { getLogger().log(Level.WARNING, logMessage); response.sendError(HttpServletResponse.SC_NOT_FOUND, request.getPathInfo() + " can not be found"); diff --git a/server/src/main/java/com/vaadin/server/CustomizedSystemMessages.java b/server/src/main/java/com/vaadin/server/CustomizedSystemMessages.java index 0a7f864f40..b1c48c450e 100644 --- a/server/src/main/java/com/vaadin/server/CustomizedSystemMessages.java +++ b/server/src/main/java/com/vaadin/server/CustomizedSystemMessages.java @@ -49,8 +49,8 @@ import java.io.Serializable; * </p> */ -public class CustomizedSystemMessages extends SystemMessages implements - Serializable { +public class CustomizedSystemMessages extends SystemMessages + implements Serializable { /** * Sets the URL to go to when the session has expired. @@ -130,7 +130,8 @@ public class CustomizedSystemMessages extends SystemMessages implements * @param authenticationErrorCaption * the caption */ - public void setAuthenticationErrorCaption(String authenticationErrorCaption) { + public void setAuthenticationErrorCaption( + String authenticationErrorCaption) { this.authenticationErrorCaption = authenticationErrorCaption; } @@ -141,7 +142,8 @@ public class CustomizedSystemMessages extends SystemMessages implements * @param authenticationErrorMessage * the message */ - public void setAuthenticationErrorMessage(String authenticationErrorMessage) { + public void setAuthenticationErrorMessage( + String authenticationErrorMessage) { this.authenticationErrorMessage = authenticationErrorMessage; } diff --git a/server/src/main/java/com/vaadin/server/DefaultErrorHandler.java b/server/src/main/java/com/vaadin/server/DefaultErrorHandler.java index fa0729e011..bb59d0e5f8 100644 --- a/server/src/main/java/com/vaadin/server/DefaultErrorHandler.java +++ b/server/src/main/java/com/vaadin/server/DefaultErrorHandler.java @@ -38,9 +38,8 @@ public class DefaultErrorHandler implements ErrorHandler { Throwable t = event.getThrowable(); if (t instanceof SocketException) { // Most likely client browser closed socket - getLogger().info( - "SocketException in CommunicationManager." - + " Most likely client (browser) closed socket."); + getLogger().info("SocketException in CommunicationManager." + + " Most likely client (browser) closed socket."); return; } @@ -110,8 +109,8 @@ public class DefaultErrorHandler implements ErrorHandler { public static AbstractComponent findAbstractComponent( com.vaadin.server.ErrorEvent event) { if (event instanceof ConnectorErrorEvent) { - Component c = findComponent(((ConnectorErrorEvent) event) - .getConnector()); + Component c = findComponent( + ((ConnectorErrorEvent) event).getConnector()); if (c instanceof AbstractComponent) { return (AbstractComponent) c; } diff --git a/server/src/main/java/com/vaadin/server/DefaultUIProvider.java b/server/src/main/java/com/vaadin/server/DefaultUIProvider.java index 38525fc020..cbf1768cc0 100644 --- a/server/src/main/java/com/vaadin/server/DefaultUIProvider.java +++ b/server/src/main/java/com/vaadin/server/DefaultUIProvider.java @@ -29,8 +29,9 @@ public class DefaultUIProvider extends UIProvider { if (uiClassName != null) { ClassLoader classLoader = request.getService().getClassLoader(); try { - Class<? extends UI> uiClass = Class.forName(uiClassName, true, - classLoader).asSubclass(UI.class); + Class<? extends UI> uiClass = Class + .forName(uiClassName, true, classLoader) + .asSubclass(UI.class); return uiClass; } catch (ClassNotFoundException e) { diff --git a/server/src/main/java/com/vaadin/server/DownloadStream.java b/server/src/main/java/com/vaadin/server/DownloadStream.java index 65ef560974..02b43d6bfe 100644 --- a/server/src/main/java/com/vaadin/server/DownloadStream.java +++ b/server/src/main/java/com/vaadin/server/DownloadStream.java @@ -287,7 +287,8 @@ public class DownloadStream implements Serializable { // Content-Disposition: attachment generally forces download String contentDisposition = getParameter(CONTENT_DISPOSITION); if (contentDisposition == null) { - contentDisposition = getContentDispositionFilename(getFileName()); + contentDisposition = getContentDispositionFilename( + getFileName()); } response.setHeader(CONTENT_DISPOSITION, contentDisposition); diff --git a/server/src/main/java/com/vaadin/server/DragAndDropService.java b/server/src/main/java/com/vaadin/server/DragAndDropService.java index 4a894b3bff..421fa71799 100644 --- a/server/src/main/java/com/vaadin/server/DragAndDropService.java +++ b/server/src/main/java/com/vaadin/server/DragAndDropService.java @@ -67,17 +67,15 @@ public class DragAndDropService implements VariableOwner, ClientConnector { .get("component"); if (sourceComponent != null && !sourceComponent.isConnectorEnabled()) { // source component not supposed to be enabled - getLogger().warning( - "Client dropped from " + sourceComponent - + " even though it's disabled"); + getLogger().warning("Client dropped from " + sourceComponent + + " even though it's disabled"); return; } // Validate drop handler owner if (!(owner instanceof DropTarget)) { - getLogger() - .severe("DropHandler owner " + owner - + " must implement DropTarget"); + getLogger().severe("DropHandler owner " + owner + + " must implement DropTarget"); return; } // owner cannot be null here @@ -85,10 +83,8 @@ public class DragAndDropService implements VariableOwner, ClientConnector { DropTarget dropTarget = (DropTarget) owner; if (!dropTarget.isConnectorEnabled()) { - getLogger() - .warning( - "Client dropped on " + owner - + " even though it's disabled"); + getLogger().warning("Client dropped on " + owner + + " even though it's disabled"); return; } @@ -127,8 +123,10 @@ public class DragAndDropService implements VariableOwner, ClientConnector { * operation based on the info passed from the client widgets (drag * source for Transferable, drop target for DragDropDetails). */ - Transferable transferable = constructTransferable(dropTarget, variables); - TargetDetails dropData = constructDragDropDetails(dropTarget, variables); + Transferable transferable = constructTransferable(dropTarget, + variables); + TargetDetails dropData = constructDragDropDetails(dropTarget, + variables); DragAndDropEvent dropEvent = new DragAndDropEvent(transferable, dropData); if (dropHandler.getAcceptCriterion().accept(dropEvent)) { @@ -153,7 +151,8 @@ public class DragAndDropService implements VariableOwner, ClientConnector { * operation based on the info passed from the client widgets (drag * source for Transferable, current target for DragDropDetails). */ - Transferable transferable = constructTransferable(dropTarget, variables); + Transferable transferable = constructTransferable(dropTarget, + variables); TargetDetails dragDropDetails = constructDragDropDetails(dropTarget, variables); diff --git a/server/src/main/java/com/vaadin/server/FileDownloader.java b/server/src/main/java/com/vaadin/server/FileDownloader.java index b0c3bb1120..ad3742b5c8 100644 --- a/server/src/main/java/com/vaadin/server/FileDownloader.java +++ b/server/src/main/java/com/vaadin/server/FileDownloader.java @@ -144,9 +144,8 @@ public class FileDownloader extends AbstractExtension { String contentDisposition = stream .getParameter(DownloadStream.CONTENT_DISPOSITION); if (contentDisposition == null) { - contentDisposition = "attachment; " - + DownloadStream.getContentDispositionFilename(stream - .getFileName()); + contentDisposition = "attachment; " + DownloadStream + .getContentDispositionFilename(stream.getFileName()); } stream.setParameter(DownloadStream.CONTENT_DISPOSITION, diff --git a/server/src/main/java/com/vaadin/server/FileResource.java b/server/src/main/java/com/vaadin/server/FileResource.java index 28de124fe9..cc361f2dc1 100644 --- a/server/src/main/java/com/vaadin/server/FileResource.java +++ b/server/src/main/java/com/vaadin/server/FileResource.java @@ -66,16 +66,17 @@ public class FileResource implements ConnectorResource { @Override public DownloadStream getStream() { try { - final DownloadStream ds = new DownloadStream(new FileInputStream( - sourceFile), getMIMEType(), getFilename()); + final DownloadStream ds = new DownloadStream( + new FileInputStream(sourceFile), getMIMEType(), + getFilename()); ds.setParameter("Content-Length", String.valueOf(sourceFile.length())); ds.setCacheTime(cacheTime); return ds; } catch (final FileNotFoundException e) { - throw new RuntimeException("File not found: " - + sourceFile.getName(), e); + throw new RuntimeException( + "File not found: " + sourceFile.getName(), e); } } diff --git a/server/src/main/java/com/vaadin/server/FontAwesome.java b/server/src/main/java/com/vaadin/server/FontAwesome.java index 2a07a0b1a6..c3b41cbe75 100644 --- a/server/src/main/java/com/vaadin/server/FontAwesome.java +++ b/server/src/main/java/com/vaadin/server/FontAwesome.java @@ -787,8 +787,8 @@ public enum FontAwesome implements FontIcon { return f; } } - throw new IllegalArgumentException("Codepoint " + codepoint - + " not found in FontAwesome"); + throw new IllegalArgumentException( + "Codepoint " + codepoint + " not found in FontAwesome"); } } diff --git a/server/src/main/java/com/vaadin/server/GAEVaadinServlet.java b/server/src/main/java/com/vaadin/server/GAEVaadinServlet.java index 2429fde746..fdbcd0b019 100644 --- a/server/src/main/java/com/vaadin/server/GAEVaadinServlet.java +++ b/server/src/main/java/com/vaadin/server/GAEVaadinServlet.java @@ -139,41 +139,31 @@ public class GAEVaadinServlet extends VaadinServlet { protected void sendDeadlineExceededNotification( VaadinServletRequest request, VaadinServletResponse response) throws IOException { - criticalNotification( - request, - response, - "Deadline Exceeded", + criticalNotification(request, response, "Deadline Exceeded", "I'm sorry, but the operation took too long to complete. We'll try reloading to see where we're at, please take note of any unsaved data...", "", null); } - protected void sendNotSerializableNotification( - VaadinServletRequest request, VaadinServletResponse response) - throws IOException { - criticalNotification( - request, - response, - "NotSerializableException", + protected void sendNotSerializableNotification(VaadinServletRequest request, + VaadinServletResponse response) throws IOException { + criticalNotification(request, response, "NotSerializableException", "I'm sorry, but there seems to be a serious problem, please contact the administrator. And please take note of any unsaved data...", - "", getApplicationUrl(request).toString() - + "?restartApplication"); + "", + getApplicationUrl(request).toString() + "?restartApplication"); } protected void sendCriticalErrorNotification(VaadinServletRequest request, VaadinServletResponse response) throws IOException { - criticalNotification( - request, - response, - "Critical error", + criticalNotification(request, response, "Critical error", "I'm sorry, but there seems to be a serious problem, please contact the administrator. And please take note of any unsaved data...", - "", getApplicationUrl(request).toString() - + "?restartApplication"); + "", + getApplicationUrl(request).toString() + "?restartApplication"); } @Override protected void service(HttpServletRequest unwrappedRequest, - HttpServletResponse unwrappedResponse) throws ServletException, - IOException { + HttpServletResponse unwrappedResponse) + throws ServletException, IOException { VaadinServletRequest request = new VaadinServletRequest( unwrappedRequest, getService()); VaadinServletResponse response = new VaadinServletResponse( @@ -200,8 +190,8 @@ public class GAEVaadinServlet extends VaadinServlet { return; } - final HttpSession session = request.getSession(getService() - .requestCanCreateSession(request)); + final HttpSession session = request + .getSession(getService().requestCanCreateSession(request)); if (session == null) { try { getService().handleSessionExpired(request, response); @@ -219,7 +209,8 @@ public class GAEVaadinServlet extends VaadinServlet { try { // try to get lock long started = System.currentTimeMillis(); - while (System.currentTimeMillis() - started < MAX_UIDL_WAIT_MILLISECONDS) { + while (System.currentTimeMillis() + - started < MAX_UIDL_WAIT_MILLISECONDS) { locked = memcache.put(mutex, 1, Expiration.byDeltaSeconds(40), MemcacheService.SetPolicy.ADD_ONLY_IF_NOT_PRESENT); if (locked || ServletPortletHelper.isUIDLRequest(request)) { @@ -233,8 +224,8 @@ public class GAEVaadinServlet extends VaadinServlet { try { Thread.sleep(RETRY_AFTER_MILLISECONDS); } catch (InterruptedException e) { - getLogger().finer( - "Thread.sleep() interrupted while waiting for lock. Trying again. " + getLogger() + .finer("Thread.sleep() interrupted while waiting for lock. Trying again. " + e); } } @@ -244,7 +235,8 @@ public class GAEVaadinServlet extends VaadinServlet { // client to retry response.setStatus(HttpServletResponse.SC_SERVICE_UNAVAILABLE); // Note: currently interpreting Retry-After as ms, not sec - response.setHeader("Retry-After", "" + RETRY_AFTER_MILLISECONDS); + response.setHeader("Retry-After", + "" + RETRY_AFTER_MILLISECONDS); return; } @@ -264,8 +256,8 @@ public class GAEVaadinServlet extends VaadinServlet { started = new Date().getTime(); String id = AC_BASE + session.getId(); - Date expire = new Date(started - + (getMaxInactiveIntervalSeconds(session) * 1000)); + Date expire = new Date( + started + (getMaxInactiveIntervalSeconds(session) * 1000)); Expiration expires = Expiration.onDate(expire); memcache.put(id, bytes, expires); @@ -310,9 +302,8 @@ public class GAEVaadinServlet extends VaadinServlet { protected int getMaxInactiveIntervalSeconds(final HttpSession session) { int interval = session.getMaxInactiveInterval(); if (interval <= 0) { - getLogger() - .log(Level.FINE, - "Undefined session expiration time, using default value instead."); + getLogger().log(Level.FINE, + "Undefined session expiration time, using default value instead."); return DEFAULT_MAX_INACTIVE_INTERVAL; } return interval; @@ -336,11 +327,9 @@ public class GAEVaadinServlet extends VaadinServlet { Blob blob = (Blob) entity.getProperty(PROPERTY_DATA); serializedAC = blob.getBytes(); // bring it to memcache - memcache.put( - AC_BASE + session.getId(), - serializedAC, - Expiration - .byDeltaSeconds(getMaxInactiveIntervalSeconds(session)), + memcache.put(AC_BASE + session.getId(), serializedAC, + Expiration.byDeltaSeconds( + getMaxInactiveIntervalSeconds(session)), MemcacheService.SetPolicy.ADD_ONLY_IF_NOT_PRESENT); } } @@ -353,17 +342,17 @@ public class GAEVaadinServlet extends VaadinServlet { getService().storeSession(vaadinSession, new WrappedHttpSession(session)); } catch (IOException e) { - getLogger().log( - Level.WARNING, + getLogger().log(Level.WARNING, "Could not de-serialize ApplicationContext for " + session.getId() - + " A new one will be created. ", e); + + " A new one will be created. ", + e); } catch (ClassNotFoundException e) { - getLogger().log( - Level.WARNING, + getLogger().log(Level.WARNING, "Could not de-serialize ApplicationContext for " + session.getId() - + " A new one will be created. ", e); + + " A new one will be created. ", + e); } } @@ -430,16 +419,15 @@ public class GAEVaadinServlet extends VaadinServlet { Query q = new Query(AC_BASE); q.setKeysOnly(); - q.addFilter(PROPERTY_EXPIRES, - FilterOperator.LESS_THAN_OR_EQUAL, expire); + q.addFilter(PROPERTY_EXPIRES, FilterOperator.LESS_THAN_OR_EQUAL, + expire); PreparedQuery pq = ds.prepare(q); - List<Entity> entities = pq.asList(Builder - .withLimit(CLEANUP_LIMIT)); + List<Entity> entities = pq + .asList(Builder.withLimit(CLEANUP_LIMIT)); if (entities != null) { - getLogger() - .log(Level.INFO, - "Vaadin cleanup deleting {0} expired Vaadin sessions.", - entities.size()); + getLogger().log(Level.INFO, + "Vaadin cleanup deleting {0} expired Vaadin sessions.", + entities.size()); List<Key> keys = new ArrayList<Key>(); for (Entity e : entities) { keys.add(e.getKey()); @@ -454,13 +442,12 @@ public class GAEVaadinServlet extends VaadinServlet { q.addFilter(PROPERTY_APPENGINE_EXPIRES, FilterOperator.LESS_THAN_OR_EQUAL, expire); PreparedQuery pq = ds.prepare(q); - List<Entity> entities = pq.asList(Builder - .withLimit(CLEANUP_LIMIT)); + List<Entity> entities = pq + .asList(Builder.withLimit(CLEANUP_LIMIT)); if (entities != null) { - getLogger() - .log(Level.INFO, - "Vaadin cleanup deleting {0} expired appengine sessions.", - entities.size()); + getLogger().log(Level.INFO, + "Vaadin cleanup deleting {0} expired appengine sessions.", + entities.size()); List<Key> keys = new ArrayList<Key>(); for (Entity e : entities) { keys.add(e.getKey()); diff --git a/server/src/main/java/com/vaadin/server/GlobalResourceHandler.java b/server/src/main/java/com/vaadin/server/GlobalResourceHandler.java index d1ef125534..3b9639793f 100644 --- a/server/src/main/java/com/vaadin/server/GlobalResourceHandler.java +++ b/server/src/main/java/com/vaadin/server/GlobalResourceHandler.java @@ -61,9 +61,9 @@ public class GlobalResourceHandler implements RequestHandler { private int nextLegacyId = 0; // APP/global/[uiid]/[type]/[id] - private static final Pattern pattern = Pattern.compile("^/?" - + ApplicationConstants.APP_PATH + '/' + RESOURCE_REQUEST_PATH - + "(\\d+)/(([^/]+)(/.*))"); + private static final Pattern pattern = Pattern + .compile("^/?" + ApplicationConstants.APP_PATH + '/' + + RESOURCE_REQUEST_PATH + "(\\d+)/(([^/]+)(/.*))"); @Override public boolean handleRequest(VaadinSession session, VaadinRequest request, @@ -83,8 +83,8 @@ public class GlobalResourceHandler implements RequestHandler { String key = matcher.group(2); if (key == null) { - return error(request, response, pathInfo - + " is not a valid global resource path"); + return error(request, response, + pathInfo + " is not a valid global resource path"); } session.lock(); Map<Class<?>, CurrentInstance> oldInstances = null; @@ -104,14 +104,14 @@ public class GlobalResourceHandler implements RequestHandler { } if (resource == null) { - return error(request, response, "Global resource " + key - + " not found"); + return error(request, response, + "Global resource " + key + " not found"); } stream = resource.getStream(); if (stream == null) { - return error(request, response, "Resource " + resource - + " didn't produce any stream."); + return error(request, response, + "Resource " + resource + " didn't produce any stream."); } } finally { session.unlock(); @@ -189,7 +189,8 @@ public class GlobalResourceHandler implements RequestHandler { * @return an URI string, or <code>null</code> if the resource is not * registered. */ - public String getUri(ClientConnector connector, ConnectorResource resource) { + public String getUri(ClientConnector connector, + ConnectorResource resource) { // app://APP/global/[ui]/[type]/[id] String uri = legacyResourceKeys.get(resource); if (uri != null && !uri.isEmpty()) { @@ -230,8 +231,8 @@ public class GlobalResourceHandler implements RequestHandler { return Logger.getLogger(GlobalResourceHandler.class.getName()); } - private static boolean error(VaadinRequest request, - VaadinResponse response, String logMessage) throws IOException { + private static boolean error(VaadinRequest request, VaadinResponse response, + String logMessage) throws IOException { getLogger().log(Level.WARNING, logMessage); response.sendError(HttpServletResponse.SC_NOT_FOUND, request.getPathInfo() + " can not be found"); diff --git a/server/src/main/java/com/vaadin/server/JavaScriptCallbackHelper.java b/server/src/main/java/com/vaadin/server/JavaScriptCallbackHelper.java index ac4a586d00..ea30b4a4cd 100644 --- a/server/src/main/java/com/vaadin/server/JavaScriptCallbackHelper.java +++ b/server/src/main/java/com/vaadin/server/JavaScriptCallbackHelper.java @@ -89,13 +89,12 @@ public class JavaScriptCallbackHelper implements Serializable { public void invokeCallback(String name, Object... arguments) { if (callbacks.containsKey(name)) { - throw new IllegalStateException( - "Can't call callback " - + name - + " on the client because a callback with the same name is registered on the server."); + throw new IllegalStateException("Can't call callback " + name + + " on the client because a callback with the same name is registered on the server."); } - JsonArray args = (JsonArray) JsonCodec.encode(arguments, null, - Object[].class, null).getEncodedValue(); + JsonArray args = (JsonArray) JsonCodec + .encode(arguments, null, Object[].class, null) + .getEncodedValue(); connector.addMethodInvocationToQueue( JavaScriptCallbackRpc.class.getName(), CALL_METHOD, new Object[] { name, args }); diff --git a/server/src/main/java/com/vaadin/server/JsonCodec.java b/server/src/main/java/com/vaadin/server/JsonCodec.java index 8b685bb046..6cdad94720 100644 --- a/server/src/main/java/com/vaadin/server/JsonCodec.java +++ b/server/src/main/java/com/vaadin/server/JsonCodec.java @@ -417,7 +417,8 @@ public class JsonCodec implements Serializable { connectorTracker); } else if (JsonConstants.VTYPE_STRINGARRAY.equals(transportType)) { - return decodeArray(String.class, (JsonArray) encodedJsonValue, null); + return decodeArray(String.class, (JsonArray) encodedJsonValue, + null); } // Special Vaadin types @@ -467,7 +468,8 @@ public class JsonCodec implements Serializable { } } - if (!restrictToInternalTypes && targetType instanceof ParameterizedType) { + if (!restrictToInternalTypes + && targetType instanceof ParameterizedType) { Type keyType = ((ParameterizedType) targetType) .getActualTypeArguments()[0]; Type valueType = ((ParameterizedType) targetType) @@ -489,14 +491,16 @@ public class JsonCodec implements Serializable { } private static Map<Object, Object> decodeObjectMap(Type keyType, - Type valueType, JsonArray jsonMap, ConnectorTracker connectorTracker) { + Type valueType, JsonArray jsonMap, + ConnectorTracker connectorTracker) { JsonArray keys = jsonMap.getArray(0); JsonArray values = jsonMap.getArray(1); assert (keys.length() == values.length()); - Map<Object, Object> map = new HashMap<Object, Object>(keys.length() * 2); + Map<Object, Object> map = new HashMap<Object, Object>( + keys.length() * 2); for (int i = 0; i < keys.length(); i++) { Object key = decodeInternalOrCustomType(keyType, keys.get(i), connectorTracker); @@ -554,7 +558,8 @@ public class JsonCodec implements Serializable { private static Object decodeParametrizedType(Type targetType, boolean restrictToInternalTypes, int typeIndex, JsonValue value, ConnectorTracker connectorTracker) { - if (!restrictToInternalTypes && targetType instanceof ParameterizedType) { + if (!restrictToInternalTypes + && targetType instanceof ParameterizedType) { Type childType = ((ParameterizedType) targetType) .getActualTypeArguments()[typeIndex]; // Only decode the given type @@ -569,7 +574,8 @@ public class JsonCodec implements Serializable { } } - private static Object decodeEnum(Class<? extends Enum> cls, JsonString value) { + private static Object decodeEnum(Class<? extends Enum> cls, + JsonString value) { return Enum.valueOf(cls, value.getString()); } @@ -616,8 +622,8 @@ public class JsonCodec implements Serializable { String fieldName = property.getName(); JsonValue encodedFieldValue = serializedObject.get(fieldName); Type fieldType = property.getType(); - Object decodedFieldValue = decodeInternalOrCustomType( - fieldType, encodedFieldValue, connectorTracker); + Object decodedFieldValue = decodeInternalOrCustomType(fieldType, + encodedFieldValue, connectorTracker); property.setValue(decodedObject, decodedFieldValue); } @@ -654,11 +660,11 @@ public class JsonCodec implements Serializable { toReturn = encodeCollection(valueType, (Collection<?>) value, connectorTracker); } else if (value instanceof Map) { - toReturn = encodeMap(valueType, (Map<?, ?>) value, connectorTracker); + toReturn = encodeMap(valueType, (Map<?, ?>) value, + connectorTracker); } else if (value instanceof Connector) { - if (value instanceof Component - && !(LegacyCommunicationManager - .isComponentVisibleToClient((Component) value))) { + if (value instanceof Component && !(LegacyCommunicationManager + .isComponentVisibleToClient((Component) value))) { // an encoded null is cached, return it directly. return ENCODE_RESULT_NULL; } @@ -724,12 +730,11 @@ public class JsonCodec implements Serializable { Object fieldValue = property.getValue(value); if (encoded.hasKey(fieldName)) { - throw new RuntimeException( - "Can't encode " - + valueType.getName() - + " as it has multiple properties with the name " - + fieldName.toLowerCase() - + ". This can happen if there are getters and setters for a public field (the framework can't know which to ignore) or if there are properties with only casing distinguishing between the names (e.g. getFoo() and getFOO())"); + throw new RuntimeException("Can't encode " + + valueType.getName() + + " as it has multiple properties with the name " + + fieldName.toLowerCase() + + ". This can happen if there are getters and setters for a public field (the framework can't know which to ignore) or if there are properties with only casing distinguishing between the names (e.g. getFoo() and getFOO())"); } JsonValue fieldReference; @@ -746,7 +751,8 @@ public class JsonCodec implements Serializable { fieldType, connectorTracker); encoded.put(fieldName, encodeResult.getEncodedValue()); - if (valueChanged(encodeResult.getEncodedValue(), fieldReference)) { + if (valueChanged(encodeResult.getEncodedValue(), + fieldReference)) { diff.put(fieldName, encodeResult.getDiffOrValue()); } } @@ -896,7 +902,8 @@ public class JsonCodec implements Serializable { if (mapType instanceof ParameterizedType) { keyType = ((ParameterizedType) mapType).getActualTypeArguments()[0]; - valueType = ((ParameterizedType) mapType).getActualTypeArguments()[1]; + valueType = ((ParameterizedType) mapType) + .getActualTypeArguments()[1]; } else { throw new JsonException("Map is missing generics"); } diff --git a/server/src/main/java/com/vaadin/server/JsonPaintTarget.java b/server/src/main/java/com/vaadin/server/JsonPaintTarget.java index a885acccbc..4483387e9a 100644 --- a/server/src/main/java/com/vaadin/server/JsonPaintTarget.java +++ b/server/src/main/java/com/vaadin/server/JsonPaintTarget.java @@ -87,8 +87,8 @@ public class JsonPaintTarget implements PaintTarget { * @throws PaintException * if the paint operation failed. */ - public JsonPaintTarget(LegacyCommunicationManager manager, - Writer outWriter, boolean cachingRequired) throws PaintException { + public JsonPaintTarget(LegacyCommunicationManager manager, Writer outWriter, + boolean cachingRequired) throws PaintException { this.manager = manager; @@ -341,7 +341,8 @@ public class JsonPaintTarget implements PaintTarget { } @Override - public void addAttribute(String name, Resource value) throws PaintException { + public void addAttribute(String name, Resource value) + throws PaintException { if (value == null) { throw new NullPointerException(); } @@ -417,8 +418,7 @@ public class JsonPaintTarget implements PaintTarget { } sb.append("\":"); if (mapValue instanceof Float || mapValue instanceof Integer - || mapValue instanceof Double - || mapValue instanceof Boolean + || mapValue instanceof Double || mapValue instanceof Boolean || mapValue instanceof Alignment) { sb.append(mapValue); } else { @@ -465,7 +465,8 @@ public class JsonPaintTarget implements PaintTarget { @Override public void addVariable(VariableOwner owner, String name, Component value) throws PaintException { - tag.addVariable(new StringVariable(owner, name, value.getConnectorId())); + tag.addVariable( + new StringVariable(owner, name, value.getConnectorId())); } @Override @@ -661,9 +662,7 @@ public class JsonPaintTarget implements PaintTarget { boolean topLevelPaintable = openPaintables.isEmpty(); if (getLogger().isLoggable(Level.FINE)) { - getLogger().log( - Level.FINE, - "startPaintable for {0}@{1}", + getLogger().log(Level.FINE, "startPaintable for {0}@{1}", new Object[] { connector.getClass().getName(), Integer.toHexString(connector.hashCode()) }); } @@ -689,9 +688,7 @@ public class JsonPaintTarget implements PaintTarget { @Override public void endPaintable(Component paintable) throws PaintException { if (getLogger().isLoggable(Level.FINE)) { - getLogger().log( - Level.FINE, - "endPaintable for {0}@{1}", + getLogger().log(Level.FINE, "endPaintable for {0}@{1}", new Object[] { paintable.getClass().getName(), Integer.toHexString(paintable.hashCode()) }); } @@ -823,7 +820,8 @@ public class JsonPaintTarget implements PaintTarget { final StringBuilder buf = new StringBuilder(); buf.append(startField()); buf.append("{"); - for (final Iterator<Object> iter = attr.iterator(); iter.hasNext();) { + for (final Iterator<Object> iter = attr.iterator(); iter + .hasNext();) { final String element = (String) iter.next(); buf.append(element); if (iter.hasNext()) { @@ -1010,8 +1008,8 @@ public class JsonPaintTarget implements PaintTarget { @Override public void addVariable(VariableOwner owner, String name, StreamVariable value) throws PaintException { - String url = manager.getStreamVariableTargetUrl( - (ClientConnector) owner, name, value); + String url = manager.getStreamVariableTargetUrl((ClientConnector) owner, + name, value); if (url != null) { addVariable(owner, name, url); } // else { //NOP this was just a cleanup by component } diff --git a/server/src/main/java/com/vaadin/server/LegacyApplicationUIProvider.java b/server/src/main/java/com/vaadin/server/LegacyApplicationUIProvider.java index 0977071806..3c5012b115 100644 --- a/server/src/main/java/com/vaadin/server/LegacyApplicationUIProvider.java +++ b/server/src/main/java/com/vaadin/server/LegacyApplicationUIProvider.java @@ -129,8 +129,8 @@ public abstract class LegacyApplicationUIProvider extends UIProvider { URL applicationUrl; try { - applicationUrl = VaadinService.getCurrent().getApplicationUrl( - VaadinService.getCurrentRequest()); + applicationUrl = VaadinService.getCurrent() + .getApplicationUrl(VaadinService.getCurrentRequest()); } catch (MalformedURLException e) { throw new RuntimeException(e); } diff --git a/server/src/main/java/com/vaadin/server/LegacyCommunicationManager.java b/server/src/main/java/com/vaadin/server/LegacyCommunicationManager.java index 87b484a65f..987b524708 100644 --- a/server/src/main/java/com/vaadin/server/LegacyCommunicationManager.java +++ b/server/src/main/java/com/vaadin/server/LegacyCommunicationManager.java @@ -174,10 +174,9 @@ public class LegacyCommunicationManager implements Serializable { if (publishedFileContexts.containsKey(name)) { Class<?> oldContext = publishedFileContexts.get(name); if (oldContext != context) { - getLogger() - .log(Level.WARNING, - "{0} published by both {1} and {2}. File from {2} will be used.", - new Object[] { name, context, oldContext }); + getLogger().log(Level.WARNING, + "{0} published by both {1} and {2}. File from {2} will be used.", + new Object[] { name, context, oldContext }); } } else { publishedFileContexts.put(name, context); @@ -214,7 +213,8 @@ public class LegacyCommunicationManager implements Serializable { * <code>false</code> otherwise */ @Deprecated - public static boolean isConnectorVisibleToClient(ClientConnector connector) { + public static boolean isConnectorVisibleToClient( + ClientConnector connector) { if (connector instanceof Component) { return isComponentVisibleToClient((Component) connector); } else { @@ -299,8 +299,8 @@ public class LegacyCommunicationManager implements Serializable { * @deprecated As of 7.1. Will be removed in the future. */ @Deprecated - public static class InvalidUIDLSecurityKeyException extends - GeneralSecurityException { + public static class InvalidUIDLSecurityKeyException + extends GeneralSecurityException { public InvalidUIDLSecurityKeyException(String message) { super(message); @@ -363,8 +363,8 @@ public class LegacyCommunicationManager implements Serializable { * @deprecated As of 7.1. See #11411. */ @Deprecated - public String getStreamVariableTargetUrl(ClientConnector owner, - String name, StreamVariable value) { + public String getStreamVariableTargetUrl(ClientConnector owner, String name, + StreamVariable value) { /* * We will use the same APP/* URI space as ApplicationResources but * prefix url with UPLOAD @@ -414,9 +414,8 @@ public class LegacyCommunicationManager implements Serializable { * Requests that the given UI should be fully re-rendered on the client * side. * - * @since 7.1 - * @deprecated. As of 7.1. Should be refactored once locales are fixed - * (#11378) + * @since 7.1 @deprecated. As of 7.1. Should be refactored once locales are + * fixed (#11378) */ @Deprecated public void repaintAll(UI ui) { diff --git a/server/src/main/java/com/vaadin/server/LocaleService.java b/server/src/main/java/com/vaadin/server/LocaleService.java index ccdc49f690..b7ea7812d4 100644 --- a/server/src/main/java/com/vaadin/server/LocaleService.java +++ b/server/src/main/java/com/vaadin/server/LocaleService.java @@ -159,12 +159,11 @@ public class LocaleService implements Serializable { * Date formatting (MM/DD/YYYY etc.) */ - DateFormat dateFormat = DateFormat.getDateTimeInstance( - DateFormat.SHORT, DateFormat.SHORT, locale); + DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, + DateFormat.SHORT, locale); if (!(dateFormat instanceof SimpleDateFormat)) { - getLogger().warning( - "Unable to get default date pattern for locale " - + locale.toString()); + getLogger().warning("Unable to get default date pattern for locale " + + locale.toString()); dateFormat = new SimpleDateFormat(); } final String df = ((SimpleDateFormat) dateFormat).toPattern(); diff --git a/server/src/main/java/com/vaadin/server/Page.java b/server/src/main/java/com/vaadin/server/Page.java index 74d79ade50..0d9531cdf3 100644 --- a/server/src/main/java/com/vaadin/server/Page.java +++ b/server/src/main/java/com/vaadin/server/Page.java @@ -222,9 +222,9 @@ public class Page implements Serializable { } } - private static final Method BROWSER_RESIZE_METHOD = ReflectTools - .findMethod(BrowserWindowResizeListener.class, - "browserWindowResized", BrowserWindowResizeEvent.class); + private static final Method BROWSER_RESIZE_METHOD = ReflectTools.findMethod( + BrowserWindowResizeListener.class, "browserWindowResized", + BrowserWindowResizeEvent.class); /** * @deprecated As of 7.0, use {@link BorderStyle#NONE} instead. @@ -491,7 +491,8 @@ public class Page implements Serializable { eventRouter.addListener(eventType, target, method); } - private void removeListener(Class<?> eventType, Object target, Method method) { + private void removeListener(Class<?> eventType, Object target, + Method method) { if (hasEventRouter()) { eventRouter.removeListener(eventType, target, method); } @@ -579,9 +580,8 @@ public class Page implements Serializable { // instead set it to the empty string newUriFragment = ""; } - if (newUriFragment == oldUriFragment - || (newUriFragment != null && newUriFragment - .equals(oldUriFragment))) { + if (newUriFragment == oldUriFragment || (newUriFragment != null + && newUriFragment.equals(oldUriFragment))) { return; } try { @@ -858,8 +858,7 @@ public class Page implements Serializable { n.getDescription()); } if (n.getIcon() != null) { - target.addAttribute( - UIConstants.ATTRIBUTE_NOTIFICATION_ICON, + target.addAttribute(UIConstants.ATTRIBUTE_NOTIFICATION_ICON, n.getIcon()); } if (!n.isHtmlContentAllowed()) { @@ -867,9 +866,8 @@ public class Page implements Serializable { UIConstants.NOTIFICATION_HTML_CONTENT_NOT_ALLOWED, true); } - target.addAttribute( - UIConstants.ATTRIBUTE_NOTIFICATION_POSITION, n - .getPosition().ordinal()); + target.addAttribute(UIConstants.ATTRIBUTE_NOTIFICATION_POSITION, + n.getPosition().ordinal()); target.addAttribute(UIConstants.ATTRIBUTE_NOTIFICATION_DELAY, n.getDelayMsec()); if (n.getStyleName() != null) { @@ -908,8 +906,8 @@ public class Page implements Serializable { * the URI to show */ public void setLocation(String uri) { - openList.add(new OpenResource(uri, "_self", -1, -1, BORDER_DEFAULT, - false)); + openList.add( + new OpenResource(uri, "_self", -1, -1, BORDER_DEFAULT, false)); uI.markAsDirty(); } @@ -939,8 +937,8 @@ public class Page implements Serializable { * @return The browser location URI. */ public URI getLocation() { - if (location == null - && !uI.getSession().getConfiguration().isSendUrlsAsParameters()) { + if (location == null && !uI.getSession().getConfiguration() + .isSendUrlsAsParameters()) { throw new IllegalStateException("Location is not available as the " + Constants.SERVLET_PARAMETER_SENDURLSASPARAMETERS + " parameter is configured as false"); @@ -1122,8 +1120,8 @@ public class Page implements Serializable { */ public void open(String url, String windowName, int width, int height, BorderStyle border) { - openList.add(new OpenResource(url, windowName, width, height, border, - true)); + openList.add( + new OpenResource(url, windowName, width, height, border, true)); uI.markAsDirty(); } diff --git a/server/src/main/java/com/vaadin/server/ResourceReference.java b/server/src/main/java/com/vaadin/server/ResourceReference.java index aeb06394b7..72f6980836 100644 --- a/server/src/main/java/com/vaadin/server/ResourceReference.java +++ b/server/src/main/java/com/vaadin/server/ResourceReference.java @@ -87,8 +87,8 @@ public class ResourceReference extends URLReference { String uri = ApplicationConstants.APP_PROTOCOL_PREFIX + ApplicationConstants.APP_PATH + '/' + ConnectorResource.CONNECTOR_PATH + '/' - + connector.getUI().getUIId() + '/' - + connector.getConnectorId() + '/' + encodeFileName(filename); + + connector.getUI().getUIId() + '/' + connector.getConnectorId() + + '/' + encodeFileName(filename); return uri; } diff --git a/server/src/main/java/com/vaadin/server/RestrictedRenderResponse.java b/server/src/main/java/com/vaadin/server/RestrictedRenderResponse.java index 5bee476cff..0fd9476944 100644 --- a/server/src/main/java/com/vaadin/server/RestrictedRenderResponse.java +++ b/server/src/main/java/com/vaadin/server/RestrictedRenderResponse.java @@ -149,7 +149,8 @@ class RestrictedRenderResponse implements RenderResponse, Serializable { } @Override - public void setNextPossiblePortletModes(Collection<PortletMode> portletModes) { + public void setNextPossiblePortletModes( + Collection<PortletMode> portletModes) { // NOP // TODO throw? } diff --git a/server/src/main/java/com/vaadin/server/ServerRpcManager.java b/server/src/main/java/com/vaadin/server/ServerRpcManager.java index ae99622a4a..55b2753ead 100644 --- a/server/src/main/java/com/vaadin/server/ServerRpcManager.java +++ b/server/src/main/java/com/vaadin/server/ServerRpcManager.java @@ -111,17 +111,17 @@ public class ServerRpcManager<T extends ServerRpc> implements Serializable { * @throws RpcInvocationException */ public static void applyInvocation(ClientConnector target, - ServerRpcMethodInvocation invocation) throws RpcInvocationException { - ServerRpcManager<?> manager = target.getRpcManager(invocation - .getInterfaceName()); + ServerRpcMethodInvocation invocation) + throws RpcInvocationException { + ServerRpcManager<?> manager = target + .getRpcManager(invocation.getInterfaceName()); if (manager != null) { manager.applyInvocation(invocation); } else { - getLogger() - .log(Level.WARNING, - "RPC call received for RpcTarget {0} ({1}) but the target has not registered any RPC interfaces", - new Object[] { target.getClass().getName(), - invocation.getConnectorId() }); + getLogger().log(Level.WARNING, + "RPC call received for RpcTarget {0} ({1}) but the target has not registered any RPC interfaces", + new Object[] { target.getClass().getName(), + invocation.getConnectorId() }); } } @@ -157,9 +157,10 @@ public class ServerRpcManager<T extends ServerRpc> implements Serializable { try { method.invoke(implementation, arguments); } catch (Exception e) { - throw new RpcInvocationException("Unable to invoke method " - + invocation.getMethodName() + " in " - + invocation.getInterfaceName(), e); + throw new RpcInvocationException( + "Unable to invoke method " + invocation.getMethodName() + + " in " + invocation.getInterfaceName(), + e); } } diff --git a/server/src/main/java/com/vaadin/server/ServletPortletHelper.java b/server/src/main/java/com/vaadin/server/ServletPortletHelper.java index 33ecf16e17..55add64d5f 100644 --- a/server/src/main/java/com/vaadin/server/ServletPortletHelper.java +++ b/server/src/main/java/com/vaadin/server/ServletPortletHelper.java @@ -50,37 +50,39 @@ public class ServletPortletHelper implements Serializable { } try { - return classLoader.loadClass(applicationParameter).asSubclass( - LegacyApplication.class); + return classLoader.loadClass(applicationParameter) + .asSubclass(LegacyApplication.class); } catch (final ClassNotFoundException e) { - throw new ServiceException("Failed to load application class: " - + applicationParameter, e); + throw new ServiceException( + "Failed to load application class: " + applicationParameter, + e); } } private static void verifyUIClass(String className, ClassLoader classLoader) throws ServiceException { if (className == null) { - throw new ServiceException(VaadinSession.UI_PARAMETER - + " init parameter not defined"); + throw new ServiceException( + VaadinSession.UI_PARAMETER + " init parameter not defined"); } // Check that the UI layout class can be found try { Class<?> uiClass = classLoader.loadClass(className); if (!UI.class.isAssignableFrom(uiClass)) { - throw new ServiceException(className + " does not implement UI"); + throw new ServiceException( + className + " does not implement UI"); } // Try finding a default constructor, else throw exception uiClass.getConstructor(); } catch (ClassNotFoundException e) { throw new ServiceException(className + " could not be loaded", e); } catch (SecurityException e) { - throw new ServiceException("Could not access " + className - + " class", e); + throw new ServiceException( + "Could not access " + className + " class", e); } catch (NoSuchMethodException e) { - throw new ServiceException(className - + " doesn't have a public no-args constructor"); + throw new ServiceException( + className + " doesn't have a public no-args constructor"); } } @@ -125,8 +127,8 @@ public class ServletPortletHelper implements Serializable { } public static boolean isPublishedFileRequest(VaadinRequest request) { - return hasPathPrefix(request, ApplicationConstants.PUBLISHED_FILE_PATH - + "/"); + return hasPathPrefix(request, + ApplicationConstants.PUBLISHED_FILE_PATH + "/"); } public static boolean isUIDLRequest(VaadinRequest request) { @@ -138,7 +140,8 @@ public class ServletPortletHelper implements Serializable { } public static boolean isHeartbeatRequest(VaadinRequest request) { - return hasPathPrefix(request, ApplicationConstants.HEARTBEAT_PATH + '/'); + return hasPathPrefix(request, + ApplicationConstants.HEARTBEAT_PATH + '/'); } public static boolean isPushRequest(VaadinRequest request) { @@ -175,17 +178,19 @@ public class ServletPortletHelper implements Serializable { .asSubclass(UIProvider.class); return subclass.newInstance(); } catch (ClassNotFoundException e) { - throw new ServiceException("Could not load UIProvider class " - + uiProviderProperty, e); + throw new ServiceException( + "Could not load UIProvider class " + uiProviderProperty, e); } catch (ClassCastException e) { throw new ServiceException("UIProvider class " + uiProviderProperty + " does not extend UIProvider", e); } catch (InstantiationException e) { - throw new ServiceException("Could not instantiate UIProvider " - + uiProviderProperty, e); + throw new ServiceException( + "Could not instantiate UIProvider " + uiProviderProperty, + e); } catch (IllegalAccessException e) { - throw new ServiceException("Could not instantiate UIProvider " - + uiProviderProperty, e); + throw new ServiceException( + "Could not instantiate UIProvider " + uiProviderProperty, + e); } } @@ -194,7 +199,8 @@ public class ServletPortletHelper implements Serializable { if (session.getUIProviders().isEmpty()) { throw new ServiceException( "No UIProvider has been added and there is no \"" - + VaadinSession.UI_PARAMETER + "\" init parameter."); + + VaadinSession.UI_PARAMETER + + "\" init parameter."); } } diff --git a/server/src/main/java/com/vaadin/server/Sizeable.java b/server/src/main/java/com/vaadin/server/Sizeable.java index ede5e6ab3b..59754b60cd 100644 --- a/server/src/main/java/com/vaadin/server/Sizeable.java +++ b/server/src/main/java/com/vaadin/server/Sizeable.java @@ -199,8 +199,8 @@ public interface Sizeable extends Serializable { * The empty string ("") or null will unset the height and set the units to * pixels. * - * See <a - * href="http://www.w3.org/TR/REC-CSS2/syndata.html#value-def-length">CSS + * See + * <a href="http://www.w3.org/TR/REC-CSS2/syndata.html#value-def-length">CSS * specification</a> for more details. * * @param height @@ -239,8 +239,8 @@ public interface Sizeable extends Serializable { * The empty string ("") or null will unset the width and set the units to * pixels. * - * See <a - * href="http://www.w3.org/TR/REC-CSS2/syndata.html#value-def-length">CSS + * See + * <a href="http://www.w3.org/TR/REC-CSS2/syndata.html#value-def-length">CSS * specification</a> for more details. * * @param width diff --git a/server/src/main/java/com/vaadin/server/SystemMessages.java b/server/src/main/java/com/vaadin/server/SystemMessages.java index 3bcf0a90fa..e61b9cfb1e 100644 --- a/server/src/main/java/com/vaadin/server/SystemMessages.java +++ b/server/src/main/java/com/vaadin/server/SystemMessages.java @@ -31,13 +31,13 @@ import java.io.Serializable; * <li><b>sessionExpiredURL</b> = null</li> * <li><b>sessionExpiredNotificationEnabled</b> = true</li> * <li><b>sessionExpiredCaption</b> = ""</li> - * <li><b>sessionExpiredMessage</b> = - * "Take note of any unsaved data, and <u>click here</u> to continue."</li> + * <li><b>sessionExpiredMessage</b> = "Take note of any unsaved data, and + * <u>click here</u> to continue."</li> * <li><b>communicationErrorURL</b> = null</li> * <li><b>communicationErrorNotificationEnabled</b> = true</li> * <li><b>communicationErrorCaption</b> = "Communication problem"</li> - * <li><b>communicationErrorMessage</b> = - * "Take note of any unsaved data, and <u>click here</u> to continue."</li> + * <li><b>communicationErrorMessage</b> = "Take note of any unsaved data, and + * <u>click here</u> to continue."</li> * <li><b>internalErrorURL</b> = null</li> * <li><b>internalErrorNotificationEnabled</b> = true</li> * <li><b>internalErrorCaption</b> = "Internal error"</li> @@ -48,7 +48,8 @@ import java.io.Serializable; * <li><b>cookiesDisabledCaption</b> = "Cookies disabled"</li> * <li><b>cookiesDisabledMessage</b> = "This application requires cookies to * function.<br/> - * Please enable cookies in your browser and <u>click here</u> to try again.</li> + * Please enable cookies in your browser and <u>click here</u> to try + * again.</li> * </ul> * </p> * @@ -110,8 +111,8 @@ public class SystemMessages implements Serializable { } /** - * @return - * "Take note of any unsaved data, and <u>click here</u> to continue." + * @return "Take note of any unsaved data, and <u>click here</u> to + * continue." */ public String getSessionExpiredMessage() { return (sessionExpiredNotificationEnabled ? sessionExpiredMessage @@ -136,17 +137,17 @@ public class SystemMessages implements Serializable { * @return "Communication problem" */ public String getCommunicationErrorCaption() { - return (communicationErrorNotificationEnabled ? communicationErrorCaption - : null); + return (communicationErrorNotificationEnabled + ? communicationErrorCaption : null); } /** - * @return - * "Take note of any unsaved data, and <u>click here</u> to continue." + * @return "Take note of any unsaved data, and <u>click here</u> to + * continue." */ public String getCommunicationErrorMessage() { - return (communicationErrorNotificationEnabled ? communicationErrorMessage - : null); + return (communicationErrorNotificationEnabled + ? communicationErrorMessage : null); } /** @@ -168,17 +169,17 @@ public class SystemMessages implements Serializable { * @return "Authentication problem" */ public String getAuthenticationErrorCaption() { - return (authenticationErrorNotificationEnabled ? authenticationErrorCaption - : null); + return (authenticationErrorNotificationEnabled + ? authenticationErrorCaption : null); } /** - * @return - * "Take note of any unsaved data, and <u>click here</u> to continue." + * @return "Take note of any unsaved data, and <u>click here</u> to + * continue." */ public String getAuthenticationErrorMessage() { - return (authenticationErrorNotificationEnabled ? authenticationErrorMessage - : null); + return (authenticationErrorNotificationEnabled + ? authenticationErrorMessage : null); } /** diff --git a/server/src/main/java/com/vaadin/server/UIProvider.java b/server/src/main/java/com/vaadin/server/UIProvider.java index 31a6f2a662..e0222933d3 100644 --- a/server/src/main/java/com/vaadin/server/UIProvider.java +++ b/server/src/main/java/com/vaadin/server/UIProvider.java @@ -188,8 +188,8 @@ public abstract class UIProvider implements Serializable { // third case: we have an AppWidgetset.gwt.xml file else { - InputStream resource = event.getUIClass().getResourceAsStream( - "/" + APP_WIDGETSET_NAME + ".gwt.xml"); + InputStream resource = event.getUIClass() + .getResourceAsStream("/" + APP_WIDGETSET_NAME + ".gwt.xml"); if (resource != null) { return new WidgetsetInfoImpl(false, null, APP_WIDGETSET_NAME); } @@ -224,15 +224,14 @@ public abstract class UIProvider implements Serializable { try { return cls.newInstance(); } catch (InstantiationException e) { - getLogger().log( - Level.INFO, + getLogger().log(Level.INFO, "Unexpected trying to instantiate class " - + cls.getName(), e); + + cls.getName(), + e); } catch (IllegalAccessException e) { - getLogger() - .log(Level.INFO, - "Unexpected trying to access class " - + cls.getName(), e); + getLogger().log(Level.INFO, + "Unexpected trying to access class " + cls.getName(), + e); } } return null; diff --git a/server/src/main/java/com/vaadin/server/UnsupportedBrowserHandler.java b/server/src/main/java/com/vaadin/server/UnsupportedBrowserHandler.java index e5ea55b116..56615faa08 100644 --- a/server/src/main/java/com/vaadin/server/UnsupportedBrowserHandler.java +++ b/server/src/main/java/com/vaadin/server/UnsupportedBrowserHandler.java @@ -64,29 +64,30 @@ public class UnsupportedBrowserHandler extends SynchronizedRequestHandler { Writer page = response.getWriter(); WebBrowser b = VaadinSession.getCurrent().getBrowser(); - page.write("<html><body><h1>I'm sorry, but your browser is not supported</h1>" - + "<p>The version (" - + b.getBrowserMajorVersion() - + "." - + b.getBrowserMinorVersion() - + ") of the browser you are using " - + " is outdated and not supported.</p>" - + "<p>You should <b>consider upgrading</b> to a more up-to-date browser.</p> " - + "<p>The most popular browsers are <b>" - + " <a href=\"https://www.google.com/chrome\">Chrome</a>," - + " <a href=\"http://www.mozilla.com/firefox\">Firefox</a>," - + (b.isWindows() ? " <a href=\"http://windows.microsoft.com/en-US/internet-explorer/downloads/ie\">Internet Explorer</a>," - : "") - + " <a href=\"http://www.opera.com/browser\">Opera</a>" - + " and <a href=\"http://www.apple.com/safari\">Safari</a>.</b><br/>" - + "Upgrading to the latest version of one of these <b>will make the web safer, faster and better looking.</b></p>" - + (b.isIE() ? "<script type=\"text/javascript\" src=\"http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js\"></script>" - + "<p>If you can not upgrade your browser, please consider trying <a onclick=\"CFInstall.check({mode:'overlay'});return false;\" href=\"http://www.google.com/chromeframe\">Chrome Frame</a>.</p>" - : "") // - + "<p><sub><a onclick=\"document.cookie='" - + FORCE_LOAD_COOKIE - + "';window.location.reload();return false;\" href=\"#\">Continue without updating</a> (not recommended)</sub></p>" - + "</body>\n" + "</html>"); + page.write( + "<html><body><h1>I'm sorry, but your browser is not supported</h1>" + + "<p>The version (" + b.getBrowserMajorVersion() + "." + + b.getBrowserMinorVersion() + + ") of the browser you are using " + + " is outdated and not supported.</p>" + + "<p>You should <b>consider upgrading</b> to a more up-to-date browser.</p> " + + "<p>The most popular browsers are <b>" + + " <a href=\"https://www.google.com/chrome\">Chrome</a>," + + " <a href=\"http://www.mozilla.com/firefox\">Firefox</a>," + + (b.isWindows() + ? " <a href=\"http://windows.microsoft.com/en-US/internet-explorer/downloads/ie\">Internet Explorer</a>," + : "") + + " <a href=\"http://www.opera.com/browser\">Opera</a>" + + " and <a href=\"http://www.apple.com/safari\">Safari</a>.</b><br/>" + + "Upgrading to the latest version of one of these <b>will make the web safer, faster and better looking.</b></p>" + + (b.isIE() + ? "<script type=\"text/javascript\" src=\"http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js\"></script>" + + "<p>If you can not upgrade your browser, please consider trying <a onclick=\"CFInstall.check({mode:'overlay'});return false;\" href=\"http://www.google.com/chromeframe\">Chrome Frame</a>.</p>" + : "") // + + "<p><sub><a onclick=\"document.cookie='" + + FORCE_LOAD_COOKIE + + "';window.location.reload();return false;\" href=\"#\">Continue without updating</a> (not recommended)</sub></p>" + + "</body>\n" + "</html>"); page.close(); } diff --git a/server/src/main/java/com/vaadin/server/VaadinPortlet.java b/server/src/main/java/com/vaadin/server/VaadinPortlet.java index 5c91b6669c..8f4299e350 100644 --- a/server/src/main/java/com/vaadin/server/VaadinPortlet.java +++ b/server/src/main/java/com/vaadin/server/VaadinPortlet.java @@ -55,15 +55,15 @@ import com.vaadin.util.CurrentInstance; * * @author Vaadin Ltd */ -public class VaadinPortlet extends GenericPortlet implements Constants, - Serializable { +public class VaadinPortlet extends GenericPortlet + implements Constants, Serializable { /** * Base class for portlet requests that need access to HTTP servlet * requests. */ - public static abstract class VaadinHttpAndPortletRequest extends - VaadinPortletRequest { + public static abstract class VaadinHttpAndPortletRequest + extends VaadinPortletRequest { /** * Constructs a new {@link VaadinHttpAndPortletRequest}. @@ -178,8 +178,8 @@ public class VaadinPortlet extends GenericPortlet implements Constants, /** * Portlet request for Liferay. */ - public static class VaadinLiferayRequest extends - VaadinHttpAndPortletRequest { + public static class VaadinLiferayRequest + extends VaadinHttpAndPortletRequest { /** * The PortalUtil class to use. Set to either * {@link #LIFERAY_6_PORTAL_UTIL} or {@link #LIFERAY_7_PORTAL_UTIL} the @@ -288,7 +288,8 @@ public class VaadinPortlet extends GenericPortlet implements Constants, /** * Portlet request for GateIn. */ - public static class VaadinGateInRequest extends VaadinHttpAndPortletRequest { + public static class VaadinGateInRequest + extends VaadinHttpAndPortletRequest { public VaadinGateInRequest(PortletRequest request, VaadinPortletService vaadinService) { super(request, vaadinService); @@ -297,8 +298,8 @@ public class VaadinPortlet extends GenericPortlet implements Constants, @Override protected HttpServletRequest getServletRequest(PortletRequest request) { try { - Method getRealReq = request.getClass().getMethod( - "getRealRequest"); + Method getRealReq = request.getClass() + .getMethod("getRealRequest"); HttpServletRequestWrapper origRequest = (HttpServletRequestWrapper) getRealReq .invoke(request); return origRequest; @@ -312,8 +313,8 @@ public class VaadinPortlet extends GenericPortlet implements Constants, /** * Portlet request for WebSphere Portal. */ - public static class VaadinWebSpherePortalRequest extends - VaadinHttpAndPortletRequest { + public static class VaadinWebSpherePortalRequest + extends VaadinHttpAndPortletRequest { public VaadinWebSpherePortalRequest(PortletRequest request, VaadinPortletService vaadinService) { @@ -323,8 +324,8 @@ public class VaadinPortlet extends GenericPortlet implements Constants, @Override protected HttpServletRequest getServletRequest(PortletRequest request) { try { - Class<?> portletUtils = Class - .forName("com.ibm.ws.portletcontainer.portlet.PortletUtils"); + Class<?> portletUtils = Class.forName( + "com.ibm.ws.portletcontainer.portlet.PortletUtils"); Method getHttpServletRequest = portletUtils.getMethod( "getHttpServletRequest", PortletRequest.class); @@ -340,8 +341,8 @@ public class VaadinPortlet extends GenericPortlet implements Constants, /** * Portlet request for WebSphere Portal. */ - public static class VaadinWebLogicPortalRequest extends - VaadinHttpAndPortletRequest { + public static class VaadinWebLogicPortalRequest + extends VaadinHttpAndPortletRequest { private static boolean warningLogged = false; private static Method servletRequestMethod = null; @@ -355,8 +356,8 @@ public class VaadinPortlet extends GenericPortlet implements Constants, protected HttpServletRequest getServletRequest(PortletRequest request) { try { if (servletRequestMethod == null) { - Class<?> portletRequestClass = Class - .forName("com.bea.portlet.container.PortletRequestImpl"); + Class<?> portletRequestClass = Class.forName( + "com.bea.portlet.container.PortletRequestImpl"); servletRequestMethod = portletRequestClass .getDeclaredMethod("getInternalRequest", new Class[] {}); @@ -368,10 +369,9 @@ public class VaadinPortlet extends GenericPortlet implements Constants, } catch (Exception e) { if (!warningLogged) { warningLogged = true; - getLogger() - .log(Level.WARNING, - "Could not determine underlying servlet request for WebLogic Portal portlet request", - e); + getLogger().log(Level.WARNING, + "Could not determine underlying servlet request for WebLogic Portal portlet request", + e); } return null; } @@ -440,11 +440,13 @@ public class VaadinPortlet extends GenericPortlet implements Constants, initParameters.setProperty(name, config.getInitParameter(name)); } - DeploymentConfiguration deploymentConfiguration = createDeploymentConfiguration(initParameters); + DeploymentConfiguration deploymentConfiguration = createDeploymentConfiguration( + initParameters); try { vaadinService = createPortletService(deploymentConfiguration); } catch (ServiceException e) { - throw new PortletException("Could not initialized VaadinPortlet", e); + throw new PortletException("Could not initialized VaadinPortlet", + e); } // Sets current service even though there are no request and response vaadinService.setCurrentInstances(null, null); @@ -504,7 +506,8 @@ public class VaadinPortlet extends GenericPortlet implements Constants, return RequestType.UIDL; } else if (PortletUIInitHandler.isUIInitRequest(vaadinRequest)) { return RequestType.BROWSER_DETAILS; - } else if (ServletPortletHelper.isFileUploadRequest(vaadinRequest)) { + } else if (ServletPortletHelper + .isFileUploadRequest(vaadinRequest)) { return RequestType.FILE_UPLOAD; } else if (ServletPortletHelper .isPublishedFileRequest(vaadinRequest)) { @@ -513,7 +516,8 @@ public class VaadinPortlet extends GenericPortlet implements Constants, return RequestType.APP; } else if (ServletPortletHelper.isHeartbeatRequest(vaadinRequest)) { return RequestType.HEARTBEAT; - } else if (PortletDummyRequestHandler.isDummyRequest(vaadinRequest)) { + } else if (PortletDummyRequestHandler + .isDummyRequest(vaadinRequest)) { return RequestType.DUMMY; } else { return RequestType.STATIC_FILE; @@ -578,7 +582,8 @@ public class VaadinPortlet extends GenericPortlet implements Constants, return new VaadinPortletRequest(request, service); } - private VaadinPortletResponse createVaadinResponse(PortletResponse response) { + private VaadinPortletResponse createVaadinResponse( + PortletResponse response) { return new VaadinPortletResponse(response, getService()); } @@ -621,8 +626,8 @@ public class VaadinPortlet extends GenericPortlet implements Constants, } @Override - public void serveResource(ResourceRequest request, ResourceResponse response) - throws PortletException, IOException { + public void serveResource(ResourceRequest request, + ResourceResponse response) throws PortletException, IOException { handleRequest(request, response); } diff --git a/server/src/main/java/com/vaadin/server/VaadinPortletRequest.java b/server/src/main/java/com/vaadin/server/VaadinPortletRequest.java index 93e06d7f45..9b11444158 100644 --- a/server/src/main/java/com/vaadin/server/VaadinPortletRequest.java +++ b/server/src/main/java/com/vaadin/server/VaadinPortletRequest.java @@ -40,8 +40,8 @@ import com.vaadin.shared.ApplicationConstants; * @see VaadinRequest * @see VaadinPortletResponse */ -public class VaadinPortletRequest extends PortletRequestWrapper implements - VaadinRequest { +public class VaadinPortletRequest extends PortletRequestWrapper + implements VaadinRequest { private final VaadinPortletService vaadinService; diff --git a/server/src/main/java/com/vaadin/server/VaadinPortletResponse.java b/server/src/main/java/com/vaadin/server/VaadinPortletResponse.java index 0e830666e1..a8d2cf3368 100644 --- a/server/src/main/java/com/vaadin/server/VaadinPortletResponse.java +++ b/server/src/main/java/com/vaadin/server/VaadinPortletResponse.java @@ -125,7 +125,8 @@ public class VaadinPortletResponse implements VaadinResponse { @Override public void setDateHeader(String name, long timestamp) { - response.setProperty(name, HTTP_DATE_FORMAT.format(new Date(timestamp))); + response.setProperty(name, + HTTP_DATE_FORMAT.format(new Date(timestamp))); } @Override diff --git a/server/src/main/java/com/vaadin/server/VaadinPortletService.java b/server/src/main/java/com/vaadin/server/VaadinPortletService.java index 5f22dd7d7c..7d0d2227ea 100644 --- a/server/src/main/java/com/vaadin/server/VaadinPortletService.java +++ b/server/src/main/java/com/vaadin/server/VaadinPortletService.java @@ -72,7 +72,8 @@ public class VaadinPortletService extends VaadinService { return portlet; } - private String getPortalProperty(VaadinRequest request, String propertyName) { + private String getPortalProperty(VaadinRequest request, + String propertyName) { return ((VaadinPortletRequest) request).getPortalProperty(propertyName); } @@ -179,11 +180,10 @@ public class VaadinPortletService extends VaadinService { return new File(url.getFile()); } catch (final Exception e) { // FIXME: Handle exception - getLogger() - .log(Level.INFO, - "Cannot access base directory, possible security issue " - + "with Application Server or Servlet Container", - e); + getLogger().log(Level.INFO, + "Cannot access base directory, possible security issue " + + "with Application Server or Servlet Container", + e); } } return null; @@ -232,8 +232,8 @@ public class VaadinPortletService extends VaadinService { */ @Deprecated protected RequestType getRequestType(VaadinRequest request) { - RequestType type = (RequestType) request.getAttribute(RequestType.class - .getName()); + RequestType type = (RequestType) request + .getAttribute(RequestType.class.getName()); if (type == null) { type = getPortlet().getRequestType((VaadinPortletRequest) request); request.setAttribute(RequestType.class.getName(), type); @@ -303,7 +303,8 @@ public class VaadinPortletService extends VaadinService { * Always preserve UIs in portlets to make portlet actions work. */ @Override - public boolean preserveUIOnRefresh(UIProvider provider, UICreateEvent event) { + public boolean preserveUIOnRefresh(UIProvider provider, + UICreateEvent event) { return true; } @@ -313,9 +314,9 @@ public class VaadinPortletService extends VaadinService { VaadinPortletSession session = (VaadinPortletSession) uI.getSession(); PortletContext portletContext = session.getPortletSession() .getPortletContext(); - return portletContext.getResourceAsStream("/" - + VaadinPortlet.THEME_DIR_PATH + '/' + themeName + "/" - + resource); + return portletContext + .getResourceAsStream("/" + VaadinPortlet.THEME_DIR_PATH + '/' + + themeName + "/" + resource); } @Override diff --git a/server/src/main/java/com/vaadin/server/VaadinPortletSession.java b/server/src/main/java/com/vaadin/server/VaadinPortletSession.java index 23b5027b03..5634924634 100644 --- a/server/src/main/java/com/vaadin/server/VaadinPortletSession.java +++ b/server/src/main/java/com/vaadin/server/VaadinPortletSession.java @@ -145,8 +145,8 @@ public class VaadinPortletSession extends VaadinSession { RenderResponse response) { for (PortletListener l : new ArrayList<PortletListener>( portletListeners)) { - l.handleRenderRequest(request, new RestrictedRenderResponse( - response), uI); + l.handleRenderRequest(request, + new RestrictedRenderResponse(response), uI); } } diff --git a/server/src/main/java/com/vaadin/server/VaadinService.java b/server/src/main/java/com/vaadin/server/VaadinService.java index b08597d37c..f638047aff 100644 --- a/server/src/main/java/com/vaadin/server/VaadinService.java +++ b/server/src/main/java/com/vaadin/server/VaadinService.java @@ -165,12 +165,13 @@ public abstract class VaadinService implements Serializable { .loadClass(classLoaderName); final Constructor<?> c = classLoaderClass .getConstructor(new Class[] { ClassLoader.class }); - setClassLoader((ClassLoader) c - .newInstance(new Object[] { getClass().getClassLoader() })); + setClassLoader((ClassLoader) c.newInstance( + new Object[] { getClass().getClassLoader() })); } catch (final Exception e) { throw new RuntimeException( "Could not find specified class loader: " - + classLoaderName, e); + + classLoaderName, + e); } } @@ -372,7 +373,8 @@ public abstract class VaadinService implements Serializable { * @param request * @return the system messages to use */ - public SystemMessages getSystemMessages(Locale locale, VaadinRequest request) { + public SystemMessages getSystemMessages(Locale locale, + VaadinRequest request) { SystemMessagesInfo systemMessagesInfo = new SystemMessagesInfo(); systemMessagesInfo.setLocale(locale); systemMessagesInfo.setService(this); @@ -485,8 +487,9 @@ public abstract class VaadinService implements Serializable { // for now, use the session error handler; in the future, could // have an API for using some other handler for session init and // destroy listeners - eventRouter.fireEvent(new SessionDestroyEvent( - VaadinService.this, session), session.getErrorHandler()); + eventRouter.fireEvent( + new SessionDestroyEvent(VaadinService.this, session), + session.getErrorHandler()); session.setState(State.CLOSED); } @@ -553,7 +556,8 @@ public abstract class VaadinService implements Serializable { } Object currentSessionLock = wrappedSession .getAttribute(getLockAttributeName()); - assert (currentSessionLock == null || currentSessionLock == lock) : "Changing the lock for a session is not allowed"; + assert (currentSessionLock == null + || currentSessionLock == lock) : "Changing the lock for a session is not allowed"; wrappedSession.setAttribute(getLockAttributeName(), lock); } @@ -665,7 +669,8 @@ public abstract class VaadinService implements Serializable { } try { - return doFindOrCreateVaadinSession(request, requestCanCreateSession); + return doFindOrCreateVaadinSession(request, + requestCanCreateSession); } finally { unlockSession(wrappedSession); } @@ -684,8 +689,8 @@ public abstract class VaadinService implements Serializable { * @throws ServiceException */ private VaadinSession doFindOrCreateVaadinSession(VaadinRequest request, - boolean requestCanCreateSession) throws SessionExpiredException, - ServiceException { + boolean requestCanCreateSession) + throws SessionExpiredException, ServiceException { assert ((ReentrantLock) getSessionLock(request.getWrappedSession())) .isHeldByCurrentThread() : "Session has not been locked by this thread"; @@ -768,7 +773,8 @@ public abstract class VaadinService implements Serializable { Locale locale = request.getLocale(); session.setLocale(locale); session.setConfiguration(getDeploymentConfiguration()); - session.setCommunicationManager(new LegacyCommunicationManager(session)); + session.setCommunicationManager( + new LegacyCommunicationManager(session)); ServletPortletHelper.initDefaultUIProvider(session, this); onVaadinSessionStarted(request, session); @@ -1020,7 +1026,8 @@ public abstract class VaadinService implements Serializable { * <code>false</code> if a new UI instance should be initialized on * refreshed. */ - public boolean preserveUIOnRefresh(UIProvider provider, UICreateEvent event) { + public boolean preserveUIOnRefresh(UIProvider provider, + UICreateEvent event) { return provider.isPreservedOnRefresh(event); } @@ -1237,7 +1244,8 @@ public abstract class VaadinService implements Serializable { */ private int getHeartbeatTimeout() { // Permit three missed heartbeats before closing the UI - return (int) (getDeploymentConfiguration().getHeartbeatInterval() * (3.1)); + return (int) (getDeploymentConfiguration().getHeartbeatInterval() + * (3.1)); } /** @@ -1260,8 +1268,8 @@ public abstract class VaadinService implements Serializable { * timeout never occurs. */ private int getUidlRequestTimeout(VaadinSession session) { - return getDeploymentConfiguration().isCloseIdleSessions() ? session - .getSession().getMaxInactiveInterval() : -1; + return getDeploymentConfiguration().isCloseIdleSessions() + ? session.getSession().getMaxInactiveInterval() : -1; } /** @@ -1445,12 +1453,10 @@ public abstract class VaadinService implements Serializable { // if this was an UIDL request, send UIDL back to the client if (ServletPortletHelper.isUIDLRequest(request)) { - SystemMessages ci = getSystemMessages( - ServletPortletHelper.findLocale(null, vaadinSession, - request), request); + SystemMessages ci = getSystemMessages(ServletPortletHelper + .findLocale(null, vaadinSession, request), request); try { - writeStringResponse( - response, + writeStringResponse(response, JsonConstants.JSON_CONTENT_TYPE, createCriticalNotificationJSON( ci.getInternalErrorCaption(), @@ -1459,10 +1465,9 @@ public abstract class VaadinService implements Serializable { } catch (IOException e) { // An exception occured while writing the response. Log // it and continue handling only the original error. - getLogger() - .log(Level.WARNING, - "Failed to write critical notification response to the client", - e); + getLogger().log(Level.WARNING, + "Failed to write critical notification response to the client", + e); } } else { // Re-throw other exceptions @@ -1488,14 +1493,14 @@ public abstract class VaadinService implements Serializable { * @throws IOException * If an error occured while writing the response */ - public void writeStringResponse(VaadinResponse response, - String contentType, String reponseString) throws IOException { + public void writeStringResponse(VaadinResponse response, String contentType, + String reponseString) throws IOException { response.setContentType(contentType); final OutputStream out = response.getOutputStream(); - final PrintWriter outWriter = new PrintWriter(new BufferedWriter( - new OutputStreamWriter(out, "UTF-8"))); + final PrintWriter outWriter = new PrintWriter( + new BufferedWriter(new OutputStreamWriter(out, "UTF-8"))); outWriter.print(reponseString); outWriter.close(); } @@ -1517,8 +1522,8 @@ public abstract class VaadinService implements Serializable { for (RequestHandler handler : getRequestHandlers()) { if (handler instanceof SessionExpiredHandler) { try { - if (((SessionExpiredHandler) handler).handleSessionExpired( - request, response)) { + if (((SessionExpiredHandler) handler) + .handleSessionExpired(request, response)) { return; } } catch (IOException e) { @@ -1652,8 +1657,7 @@ public abstract class VaadinService implements Serializable { } if (!Constants.REQUIRED_ATMOSPHERE_RUNTIME_VERSION.equals(rawVersion)) { - getLogger().log( - Level.WARNING, + getLogger().log(Level.WARNING, Constants.INVALID_ATMOSPHERE_VERSION_WARNING, new Object[] { Constants.REQUIRED_ATMOSPHERE_RUNTIME_VERSION, @@ -1763,7 +1767,8 @@ public abstract class VaadinService implements Serializable { * @return a future that can be used to check for task completion and to * cancel the task */ - public Future<Void> accessSession(VaadinSession session, Runnable runnable) { + public Future<Void> accessSession(VaadinSession session, + Runnable runnable) { FutureAccess future = new FutureAccess(session, runnable); session.getPendingAccessQueue().add(future); @@ -1831,11 +1836,12 @@ public abstract class VaadinService implements Serializable { FutureAccess pendingAccess; try { - while ((pendingAccess = session.getPendingAccessQueue().poll()) != null) { + while ((pendingAccess = session.getPendingAccessQueue() + .poll()) != null) { if (!pendingAccess.isCancelled()) { CurrentInstance.clearAll(); - CurrentInstance.restoreInstances(pendingAccess - .getCurrentInstances()); + CurrentInstance.restoreInstances( + pendingAccess.getCurrentInstances()); CurrentInstance.setCurrent(session); pendingAccess.run(); @@ -1911,8 +1917,8 @@ public abstract class VaadinService implements Serializable { */ protected void setDefaultClassLoader() { try { - setClassLoader(VaadinServiceClassLoaderUtil - .findDefaultClassLoader()); + setClassLoader( + VaadinServiceClassLoaderUtil.findDefaultClassLoader()); } catch (SecurityException e) { getLogger().log(Level.SEVERE, Constants.CANNOT_ACQUIRE_CLASSLOADER_SEVERE, e); diff --git a/server/src/main/java/com/vaadin/server/VaadinServiceClassLoaderUtil.java b/server/src/main/java/com/vaadin/server/VaadinServiceClassLoaderUtil.java index 8c85a6b3b3..16f4cb7fd7 100644 --- a/server/src/main/java/com/vaadin/server/VaadinServiceClassLoaderUtil.java +++ b/server/src/main/java/com/vaadin/server/VaadinServiceClassLoaderUtil.java @@ -26,8 +26,8 @@ import java.security.PrivilegedAction; */ class VaadinServiceClassLoaderUtil { - private static class GetClassLoaderPrivilegedAction implements - PrivilegedAction<ClassLoader> { + private static class GetClassLoaderPrivilegedAction + implements PrivilegedAction<ClassLoader> { @Override public ClassLoader run() { return Thread.currentThread().getContextClassLoader(); @@ -50,8 +50,8 @@ class VaadinServiceClassLoaderUtil { */ static protected ClassLoader findDefaultClassLoader() throws SecurityException { - return AccessController - .doPrivileged(new VaadinServiceClassLoaderUtil.GetClassLoaderPrivilegedAction()); + return AccessController.doPrivileged( + new VaadinServiceClassLoaderUtil.GetClassLoaderPrivilegedAction()); } } diff --git a/server/src/main/java/com/vaadin/server/VaadinServlet.java b/server/src/main/java/com/vaadin/server/VaadinServlet.java index eef3bcd8ee..73403f155c 100644 --- a/server/src/main/java/com/vaadin/server/VaadinServlet.java +++ b/server/src/main/java/com/vaadin/server/VaadinServlet.java @@ -125,25 +125,27 @@ public class VaadinServlet extends HttpServlet implements Constants { long lastModified = -1L; if (file.exists()) { lastModified = file.lastModified(); - } else if (resource != null && resource.getProtocol().equals("file")) { + } else if (resource != null + && resource.getProtocol().equals("file")) { try { file = new File(resource.toURI()); if (file.exists()) { lastModified = file.lastModified(); } } catch (URISyntaxException e) { - getLogger().log(Level.WARNING, "Could not resolve timestamp for " + resource, e); + getLogger().log(Level.WARNING, + "Could not resolve timestamp for " + resource, + e); } } if (lastModified == -1L && resource == null) { /* - * Ignore missing files found in the classpath, - * report problem and abort for other files. + * Ignore missing files found in the classpath, report + * problem and abort for other files. */ - getLogger() - .log(Level.WARNING, - "Could not resolve timestamp for {0}, Scss on the fly caching will be disabled", - uri); + getLogger().log(Level.WARNING, + "Could not resolve timestamp for {0}, Scss on the fly caching will be disabled", + uri); // -1 means this cache entry will never be valid return -1; } @@ -219,7 +221,8 @@ public class VaadinServlet extends HttpServlet implements Constants { servletConfig.getInitParameter(name)); } - DeploymentConfiguration deploymentConfiguration = createDeploymentConfiguration(initParameters); + DeploymentConfiguration deploymentConfiguration = createDeploymentConfiguration( + initParameters); try { servletService = createServletService(deploymentConfiguration); } catch (ServiceException e) { @@ -236,7 +239,8 @@ public class VaadinServlet extends HttpServlet implements Constants { private void readUiFromEnclosingClass(Properties initParameters) { Class<?> enclosingClass = getClass().getEnclosingClass(); - if (enclosingClass != null && UI.class.isAssignableFrom(enclosingClass)) { + if (enclosingClass != null + && UI.class.isAssignableFrom(enclosingClass)) { initParameters.put(VaadinSession.UI_PARAMETER, enclosingClass.getName()); } @@ -269,7 +273,8 @@ public class VaadinServlet extends HttpServlet implements Constants { // This should never happen throw new ServletException( "Could not read @VaadinServletConfiguration value " - + method.getName(), e); + + method.getName(), + e); } } } @@ -501,8 +506,7 @@ public class VaadinServlet extends HttpServlet implements Constants { SystemMessages systemMessages = getService().getSystemMessages( ServletPortletHelper.findLocale(null, null, request), request); - getService().writeStringResponse( - response, + getService().writeStringResponse(response, JsonConstants.JSON_CONTENT_TYPE, VaadinService.createCriticalNotificationJSON( systemMessages.getCookiesDisabledCaption(), @@ -588,13 +592,13 @@ public class VaadinServlet extends HttpServlet implements Constants { * Output to write (UTF-8 encoded) * @throws IOException */ - private void writeResponse(HttpServletResponse response, - String contentType, String output) throws IOException { + private void writeResponse(HttpServletResponse response, String contentType, + String output) throws IOException { response.setContentType(contentType); final OutputStream out = response.getOutputStream(); // Set the response type - final PrintWriter outWriter = new PrintWriter(new BufferedWriter( - new OutputStreamWriter(out, "UTF-8"))); + final PrintWriter outWriter = new PrintWriter( + new BufferedWriter(new OutputStreamWriter(out, "UTF-8"))); outWriter.print(output); outWriter.flush(); outWriter.close(); @@ -755,11 +759,10 @@ public class VaadinServlet extends HttpServlet implements Constants { return; } else { // cannot serve requested file - getLogger() - .log(Level.INFO, - "Requested resource [{0}] not found from filesystem or through class loader." - + " Add widgetset and/or theme JAR to your classpath or add files to WebContent/VAADIN folder.", - filename); + getLogger().log(Level.INFO, + "Requested resource [{0}] not found from filesystem or through class loader." + + " Add widgetset and/or theme JAR to your classpath or add files to WebContent/VAADIN folder.", + filename); response.setStatus(HttpServletResponse.SC_NOT_FOUND); } return; @@ -768,10 +771,9 @@ public class VaadinServlet extends HttpServlet implements Constants { // security check: do not permit navigation out of the VAADIN // directory if (!isAllowedVAADINResourceUrl(request, resourceUrl)) { - getLogger() - .log(Level.INFO, - "Requested resource [{0}] not accessible in the VAADIN directory or access to it is forbidden.", - filename); + getLogger().log(Level.INFO, + "Requested resource [{0}] not accessible in the VAADIN directory or access to it is forbidden.", + filename); response.setStatus(HttpServletResponse.SC_FORBIDDEN); return; } @@ -782,8 +784,8 @@ public class VaadinServlet extends HttpServlet implements Constants { cacheControl = "max-age=" + String.valueOf(resourceCacheTime); } response.setHeader("Cache-Control", cacheControl); - response.setDateHeader("Expires", System.currentTimeMillis() - + (resourceCacheTime * 1000)); + response.setDateHeader("Expires", + System.currentTimeMillis() + (resourceCacheTime * 1000)); // Find the modification timestamp long lastModifiedTime = 0; @@ -803,10 +805,9 @@ public class VaadinServlet extends HttpServlet implements Constants { } } catch (Exception e) { // Failed to find out last modified timestamp. Continue without it. - getLogger() - .log(Level.FINEST, - "Failed to find out last modified timestamp. Continuing without it.", - e); + getLogger().log(Level.FINEST, + "Failed to find out last modified timestamp. Continuing without it.", + e); } finally { try { // Explicitly close the input stream to prevent it @@ -899,10 +900,10 @@ public class VaadinServlet extends HttpServlet implements Constants { } catch (IOException e) { // NOP: will be still tried with non gzipped version } catch (Exception e) { - getLogger().log( - Level.FINE, + getLogger().log(Level.FINE, "Unexpected exception looking for gzipped version of resource " - + urlStr, e); + + urlStr, + e); } } if (is == null) { @@ -959,10 +960,8 @@ public class VaadinServlet extends HttpServlet implements Constants { protected boolean allowServePrecompressedResource( HttpServletRequest request, String url) { String accept = request.getHeader("Accept-Encoding"); - return accept != null - && accept.contains("gzip") - && (url.endsWith(".js") || url.endsWith(".css") || url - .endsWith(".html")); + return accept != null && accept.contains("gzip") && (url.endsWith(".js") + || url.endsWith(".css") || url.endsWith(".html")); } private void streamContent(HttpServletResponse response, InputStream is) @@ -1018,10 +1017,9 @@ public class VaadinServlet extends HttpServlet implements Constants { // security check: do not permit navigation out of the VAADIN // directory if (!isAllowedVAADINResourceUrl(request, scssUrl)) { - getLogger() - .log(Level.INFO, - "Requested resource [{0}] not accessible in the VAADIN directory or access to it is forbidden.", - filename); + getLogger().log(Level.INFO, + "Requested resource [{0}] not accessible in the VAADIN directory or access to it is forbidden.", + filename); response.setStatus(HttpServletResponse.SC_FORBIDDEN); // Handled, return true so no further processing is done @@ -1029,10 +1027,9 @@ public class VaadinServlet extends HttpServlet implements Constants { } if (getService().getDeploymentConfiguration().isProductionMode()) { // This is not meant for production mode. - getLogger() - .log(Level.INFO, - "Request for {0} not handled by sass compiler while in production mode", - filename); + getLogger().log(Level.INFO, + "Request for {0} not handled by sass compiler while in production mode", + filename); response.setStatus(HttpServletResponse.SC_NOT_FOUND); // Handled, return true so no further processing is done return true; @@ -1110,10 +1107,9 @@ public class VaadinServlet extends HttpServlet implements Constants { } if (scss == null) { - getLogger() - .log(Level.WARNING, - "Scss file {0} exists but ScssStylesheet was not able to find it", - scssFilename); + getLogger().log(Level.WARNING, + "Scss file {0} exists but ScssStylesheet was not able to find it", + scssFilename); return null; } try { @@ -1162,10 +1158,9 @@ public class VaadinServlet extends HttpServlet implements Constants { // loader sees it. if (!resourceUrl.getPath().contains("!/VAADIN/")) { - getLogger() - .log(Level.INFO, - "Blocked attempt to access a JAR entry not starting with /VAADIN/: {0}", - resourceUrl); + getLogger().log(Level.INFO, + "Blocked attempt to access a JAR entry not starting with /VAADIN/: {0}", + resourceUrl); return false; } getLogger().log(Level.FINE, @@ -1279,8 +1274,8 @@ public class VaadinServlet extends HttpServlet implements Constants { } protected boolean isStaticResourceRequest(HttpServletRequest request) { - return request.getRequestURI().startsWith( - request.getContextPath() + "/VAADIN/"); + return request.getRequestURI() + .startsWith(request.getContextPath() + "/VAADIN/"); } /** @@ -1332,19 +1327,20 @@ public class VaadinServlet extends HttpServlet implements Constants { @Deprecated protected URL getApplicationUrl(HttpServletRequest request) throws MalformedURLException { - final URL reqURL = new URL( - (request.isSecure() ? "https://" : "http://") - + request.getServerName() - + ((request.isSecure() && request.getServerPort() == 443) - || (!request.isSecure() && request - .getServerPort() == 80) ? "" : ":" - + request.getServerPort()) - + request.getRequestURI()); + final URL reqURL = new URL((request.isSecure() ? "https://" : "http://") + + request.getServerName() + + ((request.isSecure() && request.getServerPort() == 443) + || (!request.isSecure() + && request.getServerPort() == 80) ? "" + : ":" + request.getServerPort()) + + request.getRequestURI()); String servletPath = ""; - if (request.getAttribute("javax.servlet.include.servlet_path") != null) { + if (request + .getAttribute("javax.servlet.include.servlet_path") != null) { // this is an include request - servletPath = request.getAttribute( - "javax.servlet.include.context_path").toString() + servletPath = request + .getAttribute("javax.servlet.include.context_path") + .toString() + request .getAttribute("javax.servlet.include.servlet_path"); @@ -1375,10 +1371,9 @@ public class VaadinServlet extends HttpServlet implements Constants { String scssFileName = cacheEntry.getScssFileName(); if (scssFileName == null) { if (!scssCompileWarWarningEmitted) { - getLogger() - .warning( - "Could not persist scss cache because no real file was found for the compiled scss file. " - + "This might happen e.g. if serving the scss file directly from a .war file."); + getLogger().warning( + "Could not persist scss cache because no real file was found for the compiled scss file. " + + "This might happen e.g. if serving the scss file directly from a .war file."); scssCompileWarWarningEmitted = true; } return; @@ -1390,7 +1385,8 @@ public class VaadinServlet extends HttpServlet implements Constants { String cacheEntryJsonString = cacheEntry.asJson(); try { - writeFile(cacheEntryJsonString, cacheFile, Charset.forName("UTF-8")); + writeFile(cacheEntryJsonString, cacheFile, + Charset.forName("UTF-8")); } catch (IOException e) { getLogger().log(Level.WARNING, "Error persisting scss cache " + cacheFile, e); @@ -1430,12 +1426,13 @@ public class VaadinServlet extends HttpServlet implements Constants { } private static File getScssCacheFile(File scssFile) { - return new File(scssFile.getParentFile(), scssFile.getName() + ".cache"); + return new File(scssFile.getParentFile(), + scssFile.getName() + ".cache"); } /** - * Escapes characters to html entities. An exception is made for some - * "safe characters" to keep the text somewhat readable. + * Escapes characters to html entities. An exception is made for some "safe + * characters" to keep the text somewhat readable. * * @param unsafe * @return a safe string to be added inside an html tag diff --git a/server/src/main/java/com/vaadin/server/VaadinServletRequest.java b/server/src/main/java/com/vaadin/server/VaadinServletRequest.java index c68eefedb1..b575614721 100644 --- a/server/src/main/java/com/vaadin/server/VaadinServletRequest.java +++ b/server/src/main/java/com/vaadin/server/VaadinServletRequest.java @@ -29,8 +29,8 @@ import javax.servlet.http.HttpSession; * @see VaadinRequest * @see VaadinServletResponse */ -public class VaadinServletRequest extends HttpServletRequestWrapper implements - VaadinRequest { +public class VaadinServletRequest extends HttpServletRequestWrapper + implements VaadinRequest { private final VaadinServletService vaadinService; diff --git a/server/src/main/java/com/vaadin/server/VaadinServletResponse.java b/server/src/main/java/com/vaadin/server/VaadinServletResponse.java index fd688a594c..721532c2ab 100644 --- a/server/src/main/java/com/vaadin/server/VaadinServletResponse.java +++ b/server/src/main/java/com/vaadin/server/VaadinServletResponse.java @@ -28,8 +28,8 @@ import javax.servlet.http.HttpServletResponseWrapper; * @see VaadinResponse * @see VaadinServletRequest */ -public class VaadinServletResponse extends HttpServletResponseWrapper implements - VaadinResponse { +public class VaadinServletResponse extends HttpServletResponseWrapper + implements VaadinResponse { private VaadinServletService vaadinService; @@ -68,10 +68,10 @@ public class VaadinServletResponse extends HttpServletResponseWrapper implements response.setHeader("Pragma", "no-cache"); response.setDateHeader("Expires", 0); } else { - response.setHeader("Cache-Control", "max-age=" + milliseconds - / 1000); - response.setDateHeader("Expires", System.currentTimeMillis() - + milliseconds); + response.setHeader("Cache-Control", + "max-age=" + milliseconds / 1000); + response.setDateHeader("Expires", + System.currentTimeMillis() + milliseconds); // Required to apply caching in some Tomcats response.setHeader("Pragma", "cache"); } diff --git a/server/src/main/java/com/vaadin/server/VaadinServletService.java b/server/src/main/java/com/vaadin/server/VaadinServletService.java index 7025d5f491..f09b0b92d0 100644 --- a/server/src/main/java/com/vaadin/server/VaadinServletService.java +++ b/server/src/main/java/com/vaadin/server/VaadinServletService.java @@ -56,10 +56,9 @@ public class VaadinServletService extends VaadinService { // Atmosphere init failed. Push won't work but we don't throw a // service exception as we don't want to prevent non-push // applications from working - getLogger() - .log(Level.WARNING, - "Error initializing Atmosphere. Push will not work.", - e); + getLogger().log(Level.WARNING, + "Error initializing Atmosphere. Push will not work.", + e); } } return handlers; @@ -118,8 +117,8 @@ public class VaadinServletService extends VaadinService { @Override public String getConfiguredWidgetset(VaadinRequest request) { - return getDeploymentConfiguration().getWidgetset( - VaadinServlet.DEFAULT_WIDGETSET); + return getDeploymentConfiguration() + .getWidgetset(VaadinServlet.DEFAULT_WIDGETSET); } @Override @@ -140,8 +139,8 @@ public class VaadinServletService extends VaadinService { @Override public File getBaseDirectory() { - final String realPath = VaadinServlet.getResourcePath( - servlet.getServletContext(), "/"); + final String realPath = VaadinServlet + .getResourcePath(servlet.getServletContext(), "/"); if (realPath == null) { return null; } @@ -172,8 +171,8 @@ public class VaadinServletService extends VaadinService { && !ServletPortletHelper.isFileUploadRequest(request) && !ServletPortletHelper.isHeartbeatRequest(request) && !ServletPortletHelper.isPublishedFileRequest(request) - && !ServletPortletHelper.isUIDLRequest(request) && !ServletPortletHelper - .isPushRequest(request)); + && !ServletPortletHelper.isUIDLRequest(request) + && !ServletPortletHelper.isPushRequest(request)); } @Override @@ -211,10 +210,9 @@ public class VaadinServletService extends VaadinService { // security check: do not permit navigation out of the VAADIN // directory if (!servlet.isAllowedVAADINResourceUrl(null, resourceUrl)) { - throw new IOException( - String.format( - "Requested resource [{0}] not accessible in the VAADIN directory or access to it is forbidden.", - filename)); + throw new IOException(String.format( + "Requested resource [{0}] not accessible in the VAADIN directory or access to it is forbidden.", + filename)); } return resourceUrl.openStream(); @@ -228,8 +226,8 @@ public class VaadinServletService extends VaadinService { Class<? extends UI> uiClass) { String appId = null; try { - URL appUrl = getServlet().getApplicationUrl( - (VaadinServletRequest) request); + URL appUrl = getServlet() + .getApplicationUrl((VaadinServletRequest) request); appId = appUrl.getPath(); } catch (MalformedURLException e) { // Just ignore problem here diff --git a/server/src/main/java/com/vaadin/server/VaadinSession.java b/server/src/main/java/com/vaadin/server/VaadinSession.java index d7a85cecfd..b7ce79d0da 100644 --- a/server/src/main/java/com/vaadin/server/VaadinSession.java +++ b/server/src/main/java/com/vaadin/server/VaadinSession.java @@ -204,9 +204,9 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable { 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); + private static final Method BOOTSTRAP_PAGE_METHOD = ReflectTools.findMethod( + BootstrapListener.class, "modifyBootstrapPage", + BootstrapPageResponse.class); /** * Configuration for the session. @@ -299,17 +299,17 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable { // closing // Notify the service if (service == null) { - getLogger() - .warning( - "A VaadinSession instance not associated to any service is getting unbound. " - + "Session destroy events will not be fired and UIs in the session will not get detached. " - + "This might happen if a session is deserialized but never used before it expires."); + getLogger().warning( + "A VaadinSession instance not associated to any service is getting unbound. " + + "Session destroy events will not be fired and UIs in the session will not get detached. " + + "This might happen if a session is deserialized but never used before it expires."); } else if (VaadinService.getCurrentRequest() != null && getCurrent() == this) { assert hasLock(); // Ignore if the session is being moved to a different backing // session or if GAEVaadinServlet is doing its normal cleanup. - if (getAttribute(VaadinService.PRESERVE_UNBOUND_SESSION_ATTRIBUTE) == Boolean.TRUE) { + if (getAttribute( + VaadinService.PRESERVE_UNBOUND_SESSION_ATTRIBUTE) == Boolean.TRUE) { return; } @@ -506,7 +506,8 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable { * Updates the transient session lock from VaadinService. */ private void refreshLock() { - assert lock == null || lock == service.getSessionLock(session) : "Cannot change the lock from one instance to another"; + assert lock == null || lock == service.getSessionLock( + session) : "Cannot change the lock from one instance to another"; assert hasLock(service, session); lock = service.getSessionLock(session); } @@ -608,15 +609,15 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable { * Sets the {@link LegacyConverterFactory} used to locate a suitable * {@link LegacyConverter} for fields in the session. * <p> - * The {@link LegacyConverterFactory} is used to find a suitable converter when - * binding data to a UI component and the data type does not match the UI - * component type, e.g. binding a Double to a TextField (which is based on a - * String). + * The {@link LegacyConverterFactory} is used to find a suitable converter + * when binding data to a UI component and the data type does not match the + * UI component type, e.g. binding a Double to a TextField (which is based + * on a String). * </p> * <p> - * The {@link LegacyConverter} for an individual field can be overridden using - * {@link LegacyAbstractField#setConverter(LegacyConverter)} and for individual property - * ids in a {@link Table} using + * The {@link LegacyConverter} for an individual field can be overridden + * using {@link LegacyAbstractField#setConverter(LegacyConverter)} and for + * individual property ids in a {@link Table} using * {@link Table#setConverter(Object, LegacyConverter)}. * </p> * <p> @@ -892,7 +893,8 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable { * * @since 7.0.0 */ - public GlobalResourceHandler getGlobalResourceHandler(boolean createOnDemand) { + public GlobalResourceHandler getGlobalResourceHandler( + boolean createOnDemand) { assert hasLock(); if (globalResourceHandler == null && createOnDemand) { globalResourceHandler = new GlobalResourceHandler(); @@ -990,7 +992,8 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable { getService().runPendingAccessTasks(this); for (UI ui : getUIs()) { - if (ui.getPushConfiguration().getPushMode() == PushMode.AUTOMATIC) { + if (ui.getPushConfiguration() + .getPushMode() == PushMode.AUTOMATIC) { Map<Class<?>, CurrentInstance> oldCurrent = CurrentInstance .setCurrent(ui); try { @@ -1052,7 +1055,8 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable { * <code>null</code> clears the stored value. * <p> * The fully qualified name of the type is used as the name when storing the - * value. The outcome of calling this method is thus the same as if calling<br /> + * value. The outcome of calling this method is thus the same as if + * calling<br /> * <br /> * <code>setAttribute(type.getName(), value);</code> * @@ -1071,9 +1075,8 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable { throw new IllegalArgumentException("type can not be null"); } if (value != null && !type.isInstance(value)) { - throw new IllegalArgumentException("value of type " - + type.getName() + " expected but got " - + value.getClass().getName()); + throw new IllegalArgumentException("value of type " + type.getName() + + " expected but got " + value.getClass().getName()); } setAttribute(type.getName(), value); } @@ -1104,7 +1107,8 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable { * <code>null</code> is returned. * <p> * The fully qualified name of the type is used as the name when getting the - * value. The outcome of calling this method is thus the same as if calling<br /> + * value. The outcome of calling this method is thus the same as if + * calling<br /> * <br /> * <code>getAttribute(type.getName());</code> * @@ -1164,8 +1168,8 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable { Integer previousUiId = embedIdMap.put(embedId, uiId); if (previousUiId != null) { UI previousUi = uIs.get(previousUiId); - assert previousUi != null - && embedId.equals(previousUi.getEmbedId()) : "UI id map and embed id map not in sync"; + assert previousUi != null && embedId.equals(previousUi + .getEmbedId()) : "UI id map and embed id map not in sync"; // Will fire cleanup events at the end of the request handling. previousUi.close(); @@ -1409,8 +1413,8 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable { * Override default deserialization logic to account for transient * {@link #pendingAccessQueue}. */ - private void readObject(ObjectInputStream stream) throws IOException, - ClassNotFoundException { + private void readObject(ObjectInputStream stream) + throws IOException, ClassNotFoundException { Map<Class<?>, CurrentInstance> old = CurrentInstance.setCurrent(this); try { stream.defaultReadObject(); diff --git a/server/src/main/java/com/vaadin/server/WebBrowser.java b/server/src/main/java/com/vaadin/server/WebBrowser.java index 5b7d795793..f07034ea83 100644 --- a/server/src/main/java/com/vaadin/server/WebBrowser.java +++ b/server/src/main/java/com/vaadin/server/WebBrowser.java @@ -508,8 +508,7 @@ public class WebBrowser implements Serializable { if (request.getParameter("v-sw") != null) { updateClientSideDetails(request.getParameter("v-sw"), - request.getParameter("v-sh"), - request.getParameter("v-tzo"), + request.getParameter("v-sh"), request.getParameter("v-tzo"), request.getParameter("v-rtzo"), request.getParameter("v-dstd"), request.getParameter("v-dston"), diff --git a/server/src/main/java/com/vaadin/server/WidgetsetInfoImpl.java b/server/src/main/java/com/vaadin/server/WidgetsetInfoImpl.java index a887b0b7ac..373bc05b4c 100644 --- a/server/src/main/java/com/vaadin/server/WidgetsetInfoImpl.java +++ b/server/src/main/java/com/vaadin/server/WidgetsetInfoImpl.java @@ -24,8 +24,8 @@ package com.vaadin.server; * BootstrapHandler. * <p> * This class is intended primarily for internal use. It is recommended to - * implement WidgetsetInfo directly rather than extending or using this - * class outside the framework, and this class is subject to changes. + * implement WidgetsetInfo directly rather than extending or using this class + * outside the framework, and this class is subject to changes. * * @since 7.7 */ diff --git a/server/src/main/java/com/vaadin/server/WrappedPortletSession.java b/server/src/main/java/com/vaadin/server/WrappedPortletSession.java index 9f0f1ac10f..bd5f3d9cc6 100644 --- a/server/src/main/java/com/vaadin/server/WrappedPortletSession.java +++ b/server/src/main/java/com/vaadin/server/WrappedPortletSession.java @@ -147,8 +147,8 @@ public class WrappedPortletSession implements WrappedSession { * @since 7.6 */ public Set<String> getAttributeNames(int scope) { - return WrappedHttpSession.enumerationToSet(session - .getAttributeNames(scope)); + return WrappedHttpSession + .enumerationToSet(session.getAttributeNames(scope)); } @Override diff --git a/server/src/main/java/com/vaadin/server/communication/AtmospherePushConnection.java b/server/src/main/java/com/vaadin/server/communication/AtmospherePushConnection.java index 5c0d2e14d4..d8e1fae359 100644 --- a/server/src/main/java/com/vaadin/server/communication/AtmospherePushConnection.java +++ b/server/src/main/java/com/vaadin/server/communication/AtmospherePushConnection.java @@ -230,9 +230,9 @@ public class AtmospherePushConnection implements PushConnection { /** * Associates this {@code AtmospherePushConnection} with the given - * {@AtmosphereResource} representing an established - * push connection. If already connected, calls {@link #disconnect()} first. - * If there is a deferred push, carries it out via the new connection. + * {@AtmosphereResource} representing an established push connection. If + * already connected, calls {@link #disconnect()} first. If there is a + * deferred push, carries it out via the new connection. * * @since 7.2 */ @@ -279,8 +279,8 @@ public class AtmospherePushConnection implements PushConnection { if (resource == null) { // Already disconnected. Should not happen but if it does, we don't // want to cause NPEs - getLogger() - .fine("AtmospherePushConnection.disconnect() called twice, this should not happen"); + getLogger().fine( + "AtmospherePushConnection.disconnect() called twice, this should not happen"); return; } if (resource.isResumed()) { @@ -297,13 +297,11 @@ public class AtmospherePushConnection implements PushConnection { try { outgoingMessage.get(1000, TimeUnit.MILLISECONDS); } catch (TimeoutException e) { - getLogger() - .log(Level.INFO, - "Timeout waiting for messages to be sent to client before disconnect"); + getLogger().log(Level.INFO, + "Timeout waiting for messages to be sent to client before disconnect"); } catch (Exception e) { - getLogger() - .log(Level.INFO, - "Error waiting for messages to be sent to client before disconnect"); + getLogger().log(Level.INFO, + "Error waiting for messages to be sent to client before disconnect"); } outgoingMessage = null; } @@ -311,8 +309,8 @@ public class AtmospherePushConnection implements PushConnection { try { resource.close(); } catch (IOException e) { - getLogger() - .log(Level.INFO, "Error when closing push connection", e); + getLogger().log(Level.INFO, "Error when closing push connection", + e); } connectionLost(); } @@ -345,8 +343,8 @@ public class AtmospherePushConnection implements PushConnection { * is initially in disconnected state; the client will handle the * reconnecting. */ - private void readObject(ObjectInputStream stream) throws IOException, - ClassNotFoundException { + private void readObject(ObjectInputStream stream) + throws IOException, ClassNotFoundException { stream.defaultReadObject(); state = State.DISCONNECTED; } diff --git a/server/src/main/java/com/vaadin/server/communication/ClientRpcWriter.java b/server/src/main/java/com/vaadin/server/communication/ClientRpcWriter.java index 2ecf81287e..20bbc4754c 100644 --- a/server/src/main/java/com/vaadin/server/communication/ClientRpcWriter.java +++ b/server/src/main/java/com/vaadin/server/communication/ClientRpcWriter.java @@ -59,20 +59,21 @@ public class ClientRpcWriter implements Serializable { */ public void write(UI ui, Writer writer) throws IOException { - Collection<ClientMethodInvocation> pendingInvocations = collectPendingRpcCalls(ui - .getConnectorTracker().getDirtyVisibleConnectors()); + Collection<ClientMethodInvocation> pendingInvocations = collectPendingRpcCalls( + ui.getConnectorTracker().getDirtyVisibleConnectors()); JsonArray rpcCalls = Json.createArray(); for (ClientMethodInvocation invocation : pendingInvocations) { // add invocation to rpcCalls try { JsonArray invocationJson = Json.createArray(); - invocationJson.set(0, invocation.getConnector() - .getConnectorId()); + invocationJson.set(0, + invocation.getConnector().getConnectorId()); invocationJson.set(1, invocation.getInterfaceName()); invocationJson.set(2, invocation.getMethodName()); JsonArray paramJson = Json.createArray(); - for (int i = 0; i < invocation.getParameterTypes().length; ++i) { + for (int i = 0; i < invocation + .getParameterTypes().length; ++i) { Type parameterType = invocation.getParameterTypes()[i]; JsonValue referenceParameter = null; // TODO Use default values for RPC parameter types @@ -98,7 +99,8 @@ public class ClientRpcWriter implements Serializable { + invocation.getConnector().getConnectorId() + " method " + invocation.getInterfaceName() + "." + invocation.getMethodName() + ": " - + e.getMessage(), e); + + e.getMessage(), + e); } } writer.write(JsonUtil.stringify(rpcCalls)); @@ -128,14 +130,15 @@ public class ClientRpcWriter implements Serializable { // merge two ordered comparable lists for (int destIndex = 0, oldIndex = 0, paintableIndex = 0; destIndex < totalCalls; destIndex++) { if (paintableIndex >= paintablePendingRpc.size() - || (oldIndex < oldPendingRpc.size() && ((Comparable<ClientMethodInvocation>) oldPendingRpc - .get(oldIndex)) - .compareTo(paintablePendingRpc - .get(paintableIndex)) <= 0)) { + || (oldIndex < oldPendingRpc.size() + && ((Comparable<ClientMethodInvocation>) oldPendingRpc + .get(oldIndex)).compareTo( + paintablePendingRpc.get( + paintableIndex)) <= 0)) { pendingInvocations.add(oldPendingRpc.get(oldIndex++)); } else { - pendingInvocations.add(paintablePendingRpc - .get(paintableIndex++)); + pendingInvocations + .add(paintablePendingRpc.get(paintableIndex++)); } } } diff --git a/server/src/main/java/com/vaadin/server/communication/ConnectorHierarchyWriter.java b/server/src/main/java/com/vaadin/server/communication/ConnectorHierarchyWriter.java index 16ed9985c4..e458da1960 100644 --- a/server/src/main/java/com/vaadin/server/communication/ConnectorHierarchyWriter.java +++ b/server/src/main/java/com/vaadin/server/communication/ConnectorHierarchyWriter.java @@ -85,7 +85,8 @@ public class ConnectorHierarchyWriter implements Serializable { throw new PaintException( "Failed to send hierarchy information about " + connectorId + " to the client: " - + e.getMessage(), e); + + e.getMessage(), + e); } } } @@ -100,8 +101,9 @@ public class ConnectorHierarchyWriter implements Serializable { Set<String> stateUpdateConnectors) { VaadinRequest request = VaadinService.getCurrentRequest(); if (request != null) { - request.setAttribute(ConnectorHierarchyWriter.class.getName() - + ".hierarchyInfo", hierarchyInfo); + request.setAttribute( + ConnectorHierarchyWriter.class.getName() + ".hierarchyInfo", + hierarchyInfo); request.setAttribute(ConnectorHierarchyWriter.class.getName() + ".stateUpdateConnectors", stateUpdateConnectors); } diff --git a/server/src/main/java/com/vaadin/server/communication/ConnectorTypeWriter.java b/server/src/main/java/com/vaadin/server/communication/ConnectorTypeWriter.java index d534987061..1c02eff001 100644 --- a/server/src/main/java/com/vaadin/server/communication/ConnectorTypeWriter.java +++ b/server/src/main/java/com/vaadin/server/communication/ConnectorTypeWriter.java @@ -67,7 +67,8 @@ public class ConnectorTypeWriter implements Serializable { throw new PaintException( "Failed to send connector type for connector " + connector.getConnectorId() + ": " - + e.getMessage(), e); + + e.getMessage(), + e); } } writer.write(JsonUtil.stringify(connectorTypes)); diff --git a/server/src/main/java/com/vaadin/server/communication/FileUploadHandler.java b/server/src/main/java/com/vaadin/server/communication/FileUploadHandler.java index b9eaff3bd1..152ca4d80c 100644 --- a/server/src/main/java/com/vaadin/server/communication/FileUploadHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/FileUploadHandler.java @@ -192,7 +192,8 @@ public class FileUploadHandler implements RequestHandler { } } if (b == -1) { - throw new IOException("The multipart stream ended unexpectedly"); + throw new IOException( + "The multipart stream ended unexpectedly"); } return b; } @@ -227,7 +228,9 @@ public class FileUploadHandler implements RequestHandler { private static final String DASHDASH = "--"; - /* Same as in apache commons file upload library that was previously used. */ + /* + * Same as in apache commons file upload library that was previously used. + */ private static final int MAX_UPLOAD_BUFFER_SIZE = 4 * 1024; /* Minimum interval which will be used for streaming progress events. */ @@ -266,8 +269,8 @@ public class FileUploadHandler implements RequestHandler { UI uI = session.getUIById(Integer.parseInt(uiId)); UI.setCurrent(uI); - streamVariable = uI.getConnectorTracker().getStreamVariable( - connectorId, variableName); + streamVariable = uI.getConnectorTracker() + .getStreamVariable(connectorId, variableName); String secKey = uI.getConnectorTracker().getSeckey(streamVariable); if (secKey == null || !secKey.equals(parts[3])) { // TODO Should rethink error handling @@ -299,7 +302,8 @@ public class FileUploadHandler implements RequestHandler { int readByte = stream.read(); while (readByte != LF) { if (readByte == -1) { - throw new IOException("The multipart stream ended unexpectedly"); + throw new IOException( + "The multipart stream ended unexpectedly"); } bout.write(readByte); readByte = stream.read(); @@ -374,8 +378,8 @@ public class FileUploadHandler implements RequestHandler { } } - contentLength -= (boundary.length() + CRLF.length() + 2 - * DASHDASH.length() + CRLF.length()); + contentLength -= (boundary.length() + CRLF.length() + + 2 * DASHDASH.length() + CRLF.length()); /* * Reads bytes from the underlying stream. Compares the read bytes to @@ -404,8 +408,8 @@ public class FileUploadHandler implements RequestHandler { streamVariable, filename, mimeType, contentLength, owner, variableName); } catch (UploadException e) { - session.getCommunicationManager().handleConnectorRelatedException( - owner, e); + session.getCommunicationManager() + .handleConnectorRelatedException(owner, e); } sendUploadResponse(request, response); @@ -510,8 +514,8 @@ public class FileUploadHandler implements RequestHandler { handleFileUploadValidationAndData(session, stream, streamVariable, filename, mimeType, contentLength, owner, variableName); } catch (UploadException e) { - session.getCommunicationManager().handleConnectorRelatedException( - owner, e); + session.getCommunicationManager() + .handleConnectorRelatedException(owner, e); } sendUploadResponse(request, response); } @@ -680,8 +684,8 @@ public class FileUploadHandler implements RequestHandler { VaadinResponse response) throws IOException { response.setContentType("text/html"); final OutputStream out = response.getOutputStream(); - final PrintWriter outWriter = new PrintWriter(new BufferedWriter( - new OutputStreamWriter(out, "UTF-8"))); + final PrintWriter outWriter = new PrintWriter( + new BufferedWriter(new OutputStreamWriter(out, "UTF-8"))); outWriter.print("<html><body>download handled</body></html>"); outWriter.flush(); out.close(); diff --git a/server/src/main/java/com/vaadin/server/communication/HeartbeatHandler.java b/server/src/main/java/com/vaadin/server/communication/HeartbeatHandler.java index c6711d1d18..9b5be83f14 100644 --- a/server/src/main/java/com/vaadin/server/communication/HeartbeatHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/HeartbeatHandler.java @@ -40,8 +40,8 @@ import com.vaadin.ui.UI; * @author Vaadin Ltd * @since 7.1 */ -public class HeartbeatHandler extends SynchronizedRequestHandler implements - SessionExpiredHandler { +public class HeartbeatHandler extends SynchronizedRequestHandler + implements SessionExpiredHandler { @Override protected boolean canHandleRequest(VaadinRequest request) { @@ -68,7 +68,8 @@ public class HeartbeatHandler extends SynchronizedRequestHandler implements // complain about the empty response body (#12182) response.setHeader("Content-Type", "text/plain"); } else { - response.sendError(HttpServletResponse.SC_NOT_FOUND, "UI not found"); + response.sendError(HttpServletResponse.SC_NOT_FOUND, + "UI not found"); } return true; diff --git a/server/src/main/java/com/vaadin/server/communication/JSR356WebsocketInitializer.java b/server/src/main/java/com/vaadin/server/communication/JSR356WebsocketInitializer.java index fc4dc53714..3ec3424801 100644 --- a/server/src/main/java/com/vaadin/server/communication/JSR356WebsocketInitializer.java +++ b/server/src/main/java/com/vaadin/server/communication/JSR356WebsocketInitializer.java @@ -91,8 +91,8 @@ public class JSR356WebsocketInitializer implements ServletContextListener { @Override public Enumeration<String> getInitParameterNames() { - return Collections.enumeration(servletRegistration - .getInitParameters().keySet()); + return Collections.enumeration( + servletRegistration.getInitParameters().keySet()); } } @@ -118,10 +118,10 @@ public class JSR356WebsocketInitializer implements ServletContextListener { initAtmosphereForVaadinServlet(servletRegistration, servletContext); } catch (Exception e) { - getLogger().log( - Level.WARNING, + getLogger().log(Level.WARNING, "Failed to initialize Atmosphere for " - + servletName, e); + + servletName, + e); } } } @@ -149,9 +149,8 @@ public class JSR356WebsocketInitializer implements ServletContextListener { return; } getLogger().finer("Creating AtmosphereFramework for " + servletName); - AtmosphereFramework framework = PushRequestHandler - .initAtmosphere(new FakeServletConfig(servletRegistration, - servletContext)); + AtmosphereFramework framework = PushRequestHandler.initAtmosphere( + new FakeServletConfig(servletRegistration, servletContext)); servletContext.setAttribute(attributeName, framework); getLogger().finer("Created AtmosphereFramework for " + servletName); @@ -179,9 +178,10 @@ public class JSR356WebsocketInitializer implements ServletContextListener { * @return <code>true</code> if the attribute name matches the convention, * <code>false</code> otherwise */ - private static boolean isAtmosphereFrameworkAttribute(String attributeName) { - return attributeName.startsWith(JSR356WebsocketInitializer.class - .getName() + "."); + private static boolean isAtmosphereFrameworkAttribute( + String attributeName) { + return attributeName + .startsWith(JSR356WebsocketInitializer.class.getName() + "."); } /** diff --git a/server/src/main/java/com/vaadin/server/communication/LegacyUidlWriter.java b/server/src/main/java/com/vaadin/server/communication/LegacyUidlWriter.java index 3f70a25c5b..c5a84c29a7 100644 --- a/server/src/main/java/com/vaadin/server/communication/LegacyUidlWriter.java +++ b/server/src/main/java/com/vaadin/server/communication/LegacyUidlWriter.java @@ -73,9 +73,9 @@ public class LegacyUidlWriter implements Serializable { writer.write("["); for (Component c : legacyComponents) { - getLogger().fine( - "Painting LegacyComponent " + c.getClass().getName() + "@" - + Integer.toHexString(c.hashCode())); + getLogger() + .fine("Painting LegacyComponent " + c.getClass().getName() + + "@" + Integer.toHexString(c.hashCode())); target.startTag("change"); final String pid = c.getConnectorId(); target.addAttribute("pid", pid); diff --git a/server/src/main/java/com/vaadin/server/communication/MetadataWriter.java b/server/src/main/java/com/vaadin/server/communication/MetadataWriter.java index 9c46e64692..1df7713b1a 100644 --- a/server/src/main/java/com/vaadin/server/communication/MetadataWriter.java +++ b/server/src/main/java/com/vaadin/server/communication/MetadataWriter.java @@ -89,8 +89,8 @@ public class MetadataWriter implements Serializable { writer.write(","); } writer.write("\"timedRedirect\":{\"interval\":" - + (newTimeoutInterval + 15) + ",\"url\":\"" - + escapedURL + "\"}"); + + (newTimeoutInterval + 15) + ",\"url\":\"" + escapedURL + + "\"}"); metaOpen = true; } timeoutInterval = newTimeoutInterval; diff --git a/server/src/main/java/com/vaadin/server/communication/PortletBootstrapHandler.java b/server/src/main/java/com/vaadin/server/communication/PortletBootstrapHandler.java index 289309b631..db35329586 100644 --- a/server/src/main/java/com/vaadin/server/communication/PortletBootstrapHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/PortletBootstrapHandler.java @@ -74,7 +74,8 @@ public class PortletBootstrapHandler extends BootstrapHandler { // applications will load this exactly once String portalTheme = ((VaadinPortletRequest) context.getRequest()) .getPortalProperty(VaadinPortlet.PORTAL_PARAMETER_VAADIN_THEME); - if (portalTheme != null && !portalTheme.equals(context.getThemeName())) { + if (portalTheme != null + && !portalTheme.equals(context.getThemeName())) { String portalThemeUri = getThemeUri(context, portalTheme); // XSS safe - originates from portal properties builder.append("vaadin.loadTheme('" + portalThemeUri + "');"); diff --git a/server/src/main/java/com/vaadin/server/communication/PortletDummyRequestHandler.java b/server/src/main/java/com/vaadin/server/communication/PortletDummyRequestHandler.java index a79f5e96f2..e8af147559 100644 --- a/server/src/main/java/com/vaadin/server/communication/PortletDummyRequestHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/PortletDummyRequestHandler.java @@ -60,8 +60,8 @@ public class PortletDummyRequestHandler implements RequestHandler { final OutputStream out = ((ResourceResponse) response) .getPortletOutputStream(); - final PrintWriter outWriter = new PrintWriter(new BufferedWriter( - new OutputStreamWriter(out, "UTF-8"))); + final PrintWriter outWriter = new PrintWriter( + new BufferedWriter(new OutputStreamWriter(out, "UTF-8"))); outWriter.print("<html><body>dummy page</body></html>"); outWriter.close(); diff --git a/server/src/main/java/com/vaadin/server/communication/PortletUIInitHandler.java b/server/src/main/java/com/vaadin/server/communication/PortletUIInitHandler.java index b3cda44592..4c25119a47 100644 --- a/server/src/main/java/com/vaadin/server/communication/PortletUIInitHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/PortletUIInitHandler.java @@ -34,8 +34,8 @@ public class PortletUIInitHandler extends UIInitHandler { return false; } - return UIInitHandler.BROWSER_DETAILS_PARAMETER.equals(resourceRequest - .getResourceID()); + return UIInitHandler.BROWSER_DETAILS_PARAMETER + .equals(resourceRequest.getResourceID()); } /** diff --git a/server/src/main/java/com/vaadin/server/communication/PublishedFileHandler.java b/server/src/main/java/com/vaadin/server/communication/PublishedFileHandler.java index 56edffd16d..9e56d739d7 100644 --- a/server/src/main/java/com/vaadin/server/communication/PublishedFileHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/PublishedFileHandler.java @@ -62,16 +62,16 @@ public class PublishedFileHandler implements RequestHandler { String pathInfo = request.getPathInfo(); // + 2 to also remove beginning and ending slashes - String fileName = pathInfo - .substring(ApplicationConstants.PUBLISHED_FILE_PATH.length() + 2); + String fileName = pathInfo.substring( + ApplicationConstants.PUBLISHED_FILE_PATH.length() + 2); final String mimetype = response.getService().getMimeType(fileName); // Security check: avoid accidentally serving from the UI of the // classpath instead of relative to the context class if (fileName.startsWith("/")) { - getLogger().warning( - "Published file request starting with / rejected: " + getLogger() + .warning("Published file request starting with / rejected: " + fileName); response.sendError(HttpServletResponse.SC_NOT_FOUND, fileName); return true; @@ -100,12 +100,10 @@ public class PublishedFileHandler implements RequestHandler { // Resolve file relative to the location of the context class InputStream in = context.getResourceAsStream(fileName); if (in == null) { - getLogger().warning( - fileName + " published by " + context.getName() - + " not found. Verify that the file " - + context.getPackage().getName().replace('.', '/') - + '/' + fileName - + " is available on the classpath."); + getLogger().warning(fileName + " published by " + context.getName() + + " not found. Verify that the file " + + context.getPackage().getName().replace('.', '/') + '/' + + fileName + " is available on the classpath."); response.sendError(HttpServletResponse.SC_NOT_FOUND, fileName); return true; } diff --git a/server/src/main/java/com/vaadin/server/communication/PushAtmosphereHandler.java b/server/src/main/java/com/vaadin/server/communication/PushAtmosphereHandler.java index 50279a1a74..b60e113739 100644 --- a/server/src/main/java/com/vaadin/server/communication/PushAtmosphereHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/PushAtmosphereHandler.java @@ -47,12 +47,12 @@ public class PushAtmosphereHandler extends AbstractReflectorAtmosphereHandler } @Override - public void onStateChange(AtmosphereResourceEvent event) throws IOException { + public void onStateChange(AtmosphereResourceEvent event) + throws IOException { super.onStateChange(event); if (pushHandler == null) { - getLogger() - .warning( - "AtmosphereHandler.onStateChange called before PushHandler has been set. This should really not happen"); + getLogger().warning( + "AtmosphereHandler.onStateChange called before PushHandler has been set. This should really not happen"); return; } @@ -64,9 +64,8 @@ public class PushAtmosphereHandler extends AbstractReflectorAtmosphereHandler @Override public void onRequest(AtmosphereResource resource) { if (pushHandler == null) { - getLogger() - .warning( - "AtmosphereHandler.onRequest called before PushHandler has been set. This should really not happen"); + getLogger().warning( + "AtmosphereHandler.onRequest called before PushHandler has been set. This should really not happen"); return; } diff --git a/server/src/main/java/com/vaadin/server/communication/PushHandler.java b/server/src/main/java/com/vaadin/server/communication/PushHandler.java index 0b4fe28b77..c64a6026e3 100644 --- a/server/src/main/java/com/vaadin/server/communication/PushHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/PushHandler.java @@ -90,13 +90,12 @@ public class PushHandler { resource.getResponse().addHeader("Connection", "close"); } - String requestToken = resource.getRequest().getParameter( - ApplicationConstants.CSRF_TOKEN_PARAMETER); + String requestToken = resource.getRequest() + .getParameter(ApplicationConstants.CSRF_TOKEN_PARAMETER); if (!VaadinService.isCsrfTokenValid(session, requestToken)) { - getLogger() - .log(Level.WARNING, - "Invalid CSRF token in new connection received from {0}", - resource.getRequest().getRemoteHost()); + getLogger().log(Level.WARNING, + "Invalid CSRF token in new connection received from {0}", + resource.getRequest().getRemoteHost()); // Refresh on client side, create connection just for // sending a message sendRefreshAndDisconnect(resource); @@ -217,11 +216,10 @@ public class PushHandler { "Could not get session. This should never happen", e); return; } catch (SessionExpiredException e) { - SystemMessages msg = service.getSystemMessages( - ServletPortletHelper.findLocale(null, null, - vaadinRequest), vaadinRequest); - sendNotificationAndDisconnect( - resource, + SystemMessages msg = service + .getSystemMessages(ServletPortletHelper.findLocale(null, + null, vaadinRequest), vaadinRequest); + sendNotificationAndDisconnect(resource, VaadinService.createCriticalNotificationJSON( msg.getSessionExpiredCaption(), msg.getSessionExpiredMessage(), null, @@ -236,18 +234,17 @@ public class PushHandler { assert UI.getCurrent() == ui; if (ui == null) { - sendNotificationAndDisconnect(resource, - UidlRequestHandler.getUINotFoundErrorJSON(service, - vaadinRequest)); + sendNotificationAndDisconnect(resource, UidlRequestHandler + .getUINotFoundErrorJSON(service, vaadinRequest)); } else { callback.run(resource, ui); } } catch (final IOException e) { callErrorHandler(session, e); } catch (final Exception e) { - SystemMessages msg = service.getSystemMessages( - ServletPortletHelper.findLocale(null, null, - vaadinRequest), vaadinRequest); + SystemMessages msg = service + .getSystemMessages(ServletPortletHelper.findLocale(null, + null, vaadinRequest), vaadinRequest); AtmosphereResource errorResource = resource; if (ui != null && ui.getPushConnection() != null) { @@ -259,8 +256,7 @@ public class PushHandler { .getPushConnection()).getResource(); } - sendNotificationAndDisconnect( - errorResource, + sendNotificationAndDisconnect(errorResource, VaadinService.createCriticalNotificationJSON( msg.getInternalErrorCaption(), msg.getInternalErrorMessage(), null, @@ -334,10 +330,9 @@ public class PushHandler { // preserving the session. After restart the client reconnects, gets // a session expired notification and then closes the connection and // ends up here - getLogger() - .log(Level.FINER, - "Session expired before push disconnect event was received", - e); + getLogger().log(Level.FINER, + "Session expired before push disconnect event was received", + e); return; } @@ -360,18 +355,16 @@ public class PushHandler { ui = findUiUsingResource(resource, session.getUIs()); if (ui == null) { - getLogger() - .log(Level.FINE, - "Could not get UI. This should never happen," - + " except when reloading in Firefox and Chrome -" - + " see http://dev.vaadin.com/ticket/14251."); + getLogger().log(Level.FINE, + "Could not get UI. This should never happen," + + " except when reloading in Firefox and Chrome -" + + " see http://dev.vaadin.com/ticket/14251."); return; } else { - getLogger() - .log(Level.INFO, - "No UI was found based on data in the request," - + " but a slower lookup based on the AtmosphereResource succeeded." - + " See http://dev.vaadin.com/ticket/14251 for more details."); + getLogger().log(Level.INFO, + "No UI was found based on data in the request," + + " but a slower lookup based on the AtmosphereResource succeeded." + + " See http://dev.vaadin.com/ticket/14251 for more details."); } } @@ -381,10 +374,9 @@ public class PushHandler { String id = resource.uuid(); if (pushConnection == null) { - getLogger() - .log(Level.WARNING, - "Could not find push connection to close: {0} with transport {1}", - new Object[] { id, resource.transport() }); + getLogger().log(Level.WARNING, + "Could not find push connection to close: {0} with transport {1}", + new Object[] { id, resource.transport() }); } else { if (!pushMode.isEnabled()) { /* @@ -398,10 +390,9 @@ public class PushHandler { * Unexpected cancel, e.g. if the user closes the browser * tab. */ - getLogger() - .log(Level.FINER, - "Connection unexpectedly closed for resource {0} with transport {1}", - new Object[] { id, resource.transport() }); + getLogger().log(Level.FINER, + "Connection unexpectedly closed for resource {0} with transport {1}", + new Object[] { id, resource.transport() }); } pushConnection.connectionLost(); @@ -425,7 +416,8 @@ public class PushHandler { for (UI ui : uIs) { PushConnection pushConnection = ui.getPushConnection(); if (pushConnection instanceof AtmospherePushConnection) { - if (((AtmospherePushConnection) pushConnection).getResource() == resource) { + if (((AtmospherePushConnection) pushConnection) + .getResource() == resource) { return ui; } } @@ -448,9 +440,8 @@ public class PushHandler { */ private static void sendRefreshAndDisconnect(AtmosphereResource resource) throws IOException { - sendNotificationAndDisconnect(resource, - VaadinService.createCriticalNotificationJSON(null, null, null, - null)); + sendNotificationAndDisconnect(resource, VaadinService + .createCriticalNotificationJSON(null, null, null, null)); } /** @@ -465,8 +456,8 @@ public class PushHandler { && !((AtmosphereResourceImpl) resource).isInScope()) { // The resource is no longer valid so we should not write // anything to it - getLogger() - .fine("sendNotificationAndDisconnect called for resource no longer in scope"); + getLogger().fine( + "sendNotificationAndDisconnect called for resource no longer in scope"); return; } resource.getResponse().getWriter().write(notificationJson); diff --git a/server/src/main/java/com/vaadin/server/communication/ResourceWriter.java b/server/src/main/java/com/vaadin/server/communication/ResourceWriter.java index 2834b3cea5..1d8287cbf8 100644 --- a/server/src/main/java/com/vaadin/server/communication/ResourceWriter.java +++ b/server/src/main/java/com/vaadin/server/communication/ResourceWriter.java @@ -69,8 +69,8 @@ public class ResourceWriter implements Serializable { final String resource = (String) i.next(); InputStream is = null; try { - is = ui.getSession().getService() - .getThemeResourceAsStream(ui, ui.getTheme(), resource); + is = ui.getSession().getService().getThemeResourceAsStream(ui, + ui.getTheme(), resource); } catch (final Exception e) { // FIXME: Handle exception getLogger().log(Level.FINER, @@ -78,8 +78,8 @@ public class ResourceWriter implements Serializable { } if (is != null) { - writer.write((resourceIndex++ > 0 ? ", " : "") + "\"" - + resource + "\" : "); + writer.write((resourceIndex++ > 0 ? ", " : "") + "\"" + resource + + "\" : "); final StringBuffer layout = new StringBuffer(); try { diff --git a/server/src/main/java/com/vaadin/server/communication/ServerRpcHandler.java b/server/src/main/java/com/vaadin/server/communication/ServerRpcHandler.java index 03770d683e..dfdeed70ae 100644 --- a/server/src/main/java/com/vaadin/server/communication/ServerRpcHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/ServerRpcHandler.java @@ -257,8 +257,8 @@ public class ServerRpcHandler implements Serializable { // Just a duplicate message due to a bad connection or similar // It has already been handled by the server so it is safe to // ignore - getLogger().fine( - "Ignoring old message from the client. Expected: " + getLogger() + .fine("Ignoring old message from the client. Expected: " + expectedId + ", got: " + rpcRequest.getClientToServerId()); } else { @@ -274,8 +274,8 @@ public class ServerRpcHandler implements Serializable { rpcRequest.getRpcInvocationsData()); } - ui.getConnectorTracker().cleanConcurrentlyRemovedConnectorIds( - rpcRequest.getSyncId()); + ui.getConnectorTracker() + .cleanConcurrentlyRemovedConnectorIds(rpcRequest.getSyncId()); if (rpcRequest.isResynchronize()) { ui.getSession().getCommunicationManager().repaintAll(ui); @@ -299,9 +299,8 @@ public class ServerRpcHandler implements Serializable { } if (!Version.getFullVersion().equals(widgetsetVersion)) { - getLogger().warning( - String.format(Constants.WIDGETSET_MISMATCH_INFO, - Version.getFullVersion(), widgetsetVersion)); + getLogger().warning(String.format(Constants.WIDGETSET_MISMATCH_INFO, + Version.getFullVersion(), widgetsetVersion)); } } @@ -355,12 +354,11 @@ public class ServerRpcHandler implements Serializable { final ClientConnector connector = connectorTracker .getConnector(invocation.getConnectorId()); if (connector == null) { - getLogger() - .log(Level.WARNING, - "Received RPC call for unknown connector with id {0} (tried to invoke {1}.{2})", - new Object[] { invocation.getConnectorId(), - invocation.getInterfaceName(), - invocation.getMethodName() }); + getLogger().log(Level.WARNING, + "Received RPC call for unknown connector with id {0} (tried to invoke {1}.{2})", + new Object[] { invocation.getConnectorId(), + invocation.getInterfaceName(), + invocation.getMethodName() }); continue; } @@ -389,7 +387,8 @@ public class ServerRpcHandler implements Serializable { continue; } // DragAndDropService has null UI - if (connector.getUI() != null && connector.getUI().isClosing()) { + if (connector.getUI() != null + && connector.getUI().isClosing()) { String msg = "Ignoring RPC call for connector " + connector.getClass().getName(); if (connector instanceof Component) { @@ -413,9 +412,8 @@ public class ServerRpcHandler implements Serializable { } } } catch (JsonException e) { - getLogger().warning( - "Unable to parse RPC call from the client: " - + e.getMessage()); + getLogger().warning("Unable to parse RPC call from the client: " + + e.getMessage()); throw new RuntimeException(e); } } @@ -464,8 +462,7 @@ public class ServerRpcHandler implements Serializable { } else { throw new IllegalStateException( "Received a legacy variable change for " - + connector.getClass().getName() - + " (" + + connector.getClass().getName() + " (" + connector.getConnectorId() + ") which is not a VariableOwner. The client-side connector sent these legacy variables: " + changes.keySet()); @@ -524,21 +521,15 @@ public class ServerRpcHandler implements Serializable { String interfaceName = invocationJson.getString(1); String methodName = invocationJson.getString(2); - if (connectorTracker.getConnector(connectorId) == null - && !connectorId - .equals(ApplicationConstants.DRAG_AND_DROP_CONNECTOR_ID)) { + if (connectorTracker.getConnector(connectorId) == null && !connectorId + .equals(ApplicationConstants.DRAG_AND_DROP_CONNECTOR_ID)) { if (!connectorTracker.connectorWasPresentAsRequestWasSent( connectorId, lastSyncIdSeenByClient)) { - getLogger() - .log(Level.WARNING, - "RPC call to " - + interfaceName - + "." - + methodName - + " received for connector " - + connectorId - + " but no such connector could be found. Resynchronizing client."); + getLogger().log(Level.WARNING, "RPC call to " + interfaceName + + "." + methodName + " received for connector " + + connectorId + + " but no such connector could be found. Resynchronizing client."); // This is likely an out of sync issue (client tries to update a // connector which is not present). Force resync. connectorTracker.markAllConnectorsDirty(); @@ -548,8 +539,8 @@ public class ServerRpcHandler implements Serializable { JsonArray parametersJson = invocationJson.getArray(3); - if (LegacyChangeVariablesInvocation.isLegacyVariableChange( - interfaceName, methodName)) { + if (LegacyChangeVariablesInvocation + .isLegacyVariableChange(interfaceName, methodName)) { if (!(previousInvocation instanceof LegacyChangeVariablesInvocation)) { previousInvocation = null; } @@ -603,11 +594,10 @@ public class ServerRpcHandler implements Serializable { * corresponding to the received method invocation has been * registered. */ - getLogger().warning( - "Ignoring RPC call to " + interfaceName + "." + methodName - + " in connector " + connector.getClass().getName() - + "(" + connectorId - + ") as no RPC implementation is registered"); + getLogger().warning("Ignoring RPC call to " + interfaceName + "." + + methodName + " in connector " + + connector.getClass().getName() + "(" + connectorId + + ") as no RPC implementation is registered"); return null; } diff --git a/server/src/main/java/com/vaadin/server/communication/ServletBootstrapHandler.java b/server/src/main/java/com/vaadin/server/communication/ServletBootstrapHandler.java index 46909cecee..ae41a0280f 100644 --- a/server/src/main/java/com/vaadin/server/communication/ServletBootstrapHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/ServletBootstrapHandler.java @@ -38,8 +38,8 @@ public class ServletBootstrapHandler extends BootstrapHandler { @Override public String getThemeName(BootstrapContext context) { - String themeName = context.getRequest().getParameter( - VaadinServlet.URL_PARAMETER_THEME); + String themeName = context.getRequest() + .getParameter(VaadinServlet.URL_PARAMETER_THEME); if (themeName == null) { themeName = super.getThemeName(context); } diff --git a/server/src/main/java/com/vaadin/server/communication/ServletUIInitHandler.java b/server/src/main/java/com/vaadin/server/communication/ServletUIInitHandler.java index b3b1684809..e2ac14ccb1 100644 --- a/server/src/main/java/com/vaadin/server/communication/ServletUIInitHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/ServletUIInitHandler.java @@ -25,9 +25,8 @@ public class ServletUIInitHandler extends UIInitHandler { } public static boolean isUIInitRequest(VaadinRequest request) { - return "POST".equals(request.getMethod()) - && request - .getParameter(UIInitHandler.BROWSER_DETAILS_PARAMETER) != null; + return "POST".equals(request.getMethod()) && request + .getParameter(UIInitHandler.BROWSER_DETAILS_PARAMETER) != null; } } diff --git a/server/src/main/java/com/vaadin/server/communication/SharedStateWriter.java b/server/src/main/java/com/vaadin/server/communication/SharedStateWriter.java index 06b59ad4cc..012ea93cc5 100644 --- a/server/src/main/java/com/vaadin/server/communication/SharedStateWriter.java +++ b/server/src/main/java/com/vaadin/server/communication/SharedStateWriter.java @@ -74,7 +74,8 @@ public class SharedStateWriter implements Serializable { throw new PaintException( "Failed to serialize shared state for connector " + connector.getClass().getName() + " (" - + connectorId + "): " + e.getMessage(), e); + + connectorId + "): " + e.getMessage(), + e); } } writer.write(JsonUtil.stringify(sharedStates)); diff --git a/server/src/main/java/com/vaadin/server/communication/StreamingEndEventImpl.java b/server/src/main/java/com/vaadin/server/communication/StreamingEndEventImpl.java index 6d87d0cc8b..33a1e7d451 100644 --- a/server/src/main/java/com/vaadin/server/communication/StreamingEndEventImpl.java +++ b/server/src/main/java/com/vaadin/server/communication/StreamingEndEventImpl.java @@ -18,10 +18,11 @@ package com.vaadin.server.communication; import com.vaadin.server.StreamVariable.StreamingEndEvent; @SuppressWarnings("serial") -final class StreamingEndEventImpl extends AbstractStreamingEvent implements - StreamingEndEvent { +final class StreamingEndEventImpl extends AbstractStreamingEvent + implements StreamingEndEvent { - public StreamingEndEventImpl(String filename, String type, long totalBytes) { + public StreamingEndEventImpl(String filename, String type, + long totalBytes) { super(filename, type, totalBytes, totalBytes); } diff --git a/server/src/main/java/com/vaadin/server/communication/StreamingErrorEventImpl.java b/server/src/main/java/com/vaadin/server/communication/StreamingErrorEventImpl.java index a96f759216..db6575b2fe 100644 --- a/server/src/main/java/com/vaadin/server/communication/StreamingErrorEventImpl.java +++ b/server/src/main/java/com/vaadin/server/communication/StreamingErrorEventImpl.java @@ -18,8 +18,8 @@ package com.vaadin.server.communication; import com.vaadin.server.StreamVariable.StreamingErrorEvent; @SuppressWarnings("serial") -final class StreamingErrorEventImpl extends AbstractStreamingEvent implements - StreamingErrorEvent { +final class StreamingErrorEventImpl extends AbstractStreamingEvent + implements StreamingErrorEvent { private final Exception exception; diff --git a/server/src/main/java/com/vaadin/server/communication/StreamingProgressEventImpl.java b/server/src/main/java/com/vaadin/server/communication/StreamingProgressEventImpl.java index 7f2428a55d..c466f2cf29 100644 --- a/server/src/main/java/com/vaadin/server/communication/StreamingProgressEventImpl.java +++ b/server/src/main/java/com/vaadin/server/communication/StreamingProgressEventImpl.java @@ -18,8 +18,8 @@ package com.vaadin.server.communication; import com.vaadin.server.StreamVariable.StreamingProgressEvent; @SuppressWarnings("serial") -final class StreamingProgressEventImpl extends AbstractStreamingEvent implements - StreamingProgressEvent { +final class StreamingProgressEventImpl extends AbstractStreamingEvent + implements StreamingProgressEvent { public StreamingProgressEventImpl(final String filename, final String type, long contentLength, long bytesReceived) { diff --git a/server/src/main/java/com/vaadin/server/communication/StreamingStartEventImpl.java b/server/src/main/java/com/vaadin/server/communication/StreamingStartEventImpl.java index a2ce075458..36c9f83abe 100644 --- a/server/src/main/java/com/vaadin/server/communication/StreamingStartEventImpl.java +++ b/server/src/main/java/com/vaadin/server/communication/StreamingStartEventImpl.java @@ -18,8 +18,8 @@ package com.vaadin.server.communication; import com.vaadin.server.StreamVariable.StreamingStartEvent; @SuppressWarnings("serial") -final class StreamingStartEventImpl extends AbstractStreamingEvent implements - StreamingStartEvent { +final class StreamingStartEventImpl extends AbstractStreamingEvent + implements StreamingStartEvent { private boolean disposed; diff --git a/server/src/main/java/com/vaadin/server/communication/UIInitHandler.java b/server/src/main/java/com/vaadin/server/communication/UIInitHandler.java index f380a6df6e..180a62ba03 100644 --- a/server/src/main/java/com/vaadin/server/communication/UIInitHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/UIInitHandler.java @@ -122,7 +122,8 @@ public abstract class UIInitHandler extends SynchronizedRequestHandler { return true; } - private UI getBrowserDetailsUI(VaadinRequest request, VaadinSession session) { + private UI getBrowserDetailsUI(VaadinRequest request, + VaadinSession session) { VaadinService vaadinService = request.getService(); List<UIProvider> uiProviders = session.getUIProviders(); @@ -162,17 +163,16 @@ public abstract class UIInitHandler extends SynchronizedRequestHandler { UI retainedUI = session.getUIByEmbedId(embedId); if (retainedUI != null) { - if (vaadinService.preserveUIOnRefresh(provider, new UICreateEvent( - request, uiClass))) { + if (vaadinService.preserveUIOnRefresh(provider, + new UICreateEvent(request, uiClass))) { if (uiClass.isInstance(retainedUI)) { reinitUI(retainedUI, request); return retainedUI; } else { - getLogger().info( - "Not using the preserved UI " + embedId - + " because it is of type " - + retainedUI.getClass() + " but " + uiClass - + " is expected for the request."); + getLogger().info("Not using the preserved UI " + embedId + + " because it is of type " + retainedUI.getClass() + + " but " + uiClass + + " is expected for the request."); } } /* @@ -218,9 +218,8 @@ public abstract class UIInitHandler extends SynchronizedRequestHandler { // Warn if the window can't be preserved if (embedId == null && vaadinService.preserveUIOnRefresh(provider, event)) { - getLogger().warning( - "There is no embed id available for UI " + uiClass - + " that should be preserved."); + getLogger().warning("There is no embed id available for UI " + + uiClass + " that should be preserved."); } return ui; diff --git a/server/src/main/java/com/vaadin/server/communication/UidlRequestHandler.java b/server/src/main/java/com/vaadin/server/communication/UidlRequestHandler.java index 20b906c3e6..69b8fb6281 100644 --- a/server/src/main/java/com/vaadin/server/communication/UidlRequestHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/UidlRequestHandler.java @@ -46,8 +46,8 @@ import elemental.json.JsonException; * @author Vaadin Ltd * @since 7.1 */ -public class UidlRequestHandler extends SynchronizedRequestHandler implements - SessionExpiredHandler { +public class UidlRequestHandler extends SynchronizedRequestHandler + implements SessionExpiredHandler { public static final String UIDL_PATH = "UIDL/"; @@ -186,8 +186,8 @@ public class UidlRequestHandler extends SynchronizedRequestHandler implements */ static String getUINotFoundErrorJSON(VaadinService service, VaadinRequest vaadinRequest) { - SystemMessages ci = service.getSystemMessages( - vaadinRequest.getLocale(), vaadinRequest); + SystemMessages ci = service.getSystemMessages(vaadinRequest.getLocale(), + vaadinRequest); // Session Expired is not really the correct message as the // session exists but the requested UI does not. // Using Communication Error for now. diff --git a/server/src/main/java/com/vaadin/server/communication/UidlWriter.java b/server/src/main/java/com/vaadin/server/communication/UidlWriter.java index 8a4e62fb24..e6816bc9fc 100644 --- a/server/src/main/java/com/vaadin/server/communication/UidlWriter.java +++ b/server/src/main/java/com/vaadin/server/communication/UidlWriter.java @@ -116,17 +116,15 @@ public class UidlWriter implements Serializable { } } - getLogger().log( - Level.FINE, - "Found " + processedConnectors.size() - + " dirty connectors to paint"); + getLogger().log(Level.FINE, "Found " + processedConnectors.size() + + " dirty connectors to paint"); uiConnectorTracker.setWritingResponse(true); try { int syncId = service.getDeploymentConfiguration() - .isSyncIdCheckEnabled() ? uiConnectorTracker - .getCurrentSyncId() : -1; + .isSyncIdCheckEnabled() + ? uiConnectorTracker.getCurrentSyncId() : -1; writer.write("\"" + ApplicationConstants.SERVER_SYNC_ID + "\": " + syncId + ", "); if (repaintAll) { @@ -159,8 +157,8 @@ public class UidlWriter implements Serializable { // processing. writer.write("\"state\":"); - Set<String> stateUpdateConnectors = new SharedStateWriter().write( - ui, writer); + Set<String> stateUpdateConnectors = new SharedStateWriter() + .write(ui, writer); writer.write(", "); // close states // TODO This should be optimized. The type only needs to be @@ -241,8 +239,8 @@ public class UidlWriter implements Serializable { if (typeMappingsOpen) { // send the whole type inheritance map if any new mappings for (Class<? extends ClientConnector> class1 : usedClientConnectors) { - if (!ClientConnector.class.isAssignableFrom(class1 - .getSuperclass())) { + if (!ClientConnector.class + .isAssignableFrom(class1.getSuperclass())) { continue; } if (!typeInheritanceMapOpen) { @@ -254,8 +252,8 @@ public class UidlWriter implements Serializable { writer.write("\""); writer.write(manager.getTagForType(class1)); writer.write("\" : "); - writer.write(manager - .getTagForType((Class<? extends ClientConnector>) class1 + writer.write(manager.getTagForType( + (Class<? extends ClientConnector>) class1 .getSuperclass())); } if (typeInheritanceMapOpen) { @@ -294,8 +292,8 @@ public class UidlWriter implements Serializable { .getAnnotation(JavaScript.class); if (jsAnnotation != null) { for (String uri : jsAnnotation.value()) { - scriptDependencies.add(manager.registerDependency(uri, - class1)); + scriptDependencies + .add(manager.registerDependency(uri, class1)); } } @@ -303,8 +301,8 @@ public class UidlWriter implements Serializable { .getAnnotation(StyleSheet.class); if (styleAnnotation != null) { for (String uri : styleAnnotation.value()) { - styleDependencies.add(manager.registerDependency(uri, - class1)); + styleDependencies + .add(manager.registerDependency(uri, class1)); } } } @@ -327,7 +325,8 @@ public class UidlWriter implements Serializable { uiConnectorTracker.markClientSideInitialized(connector); } - assert (uiConnectorTracker.getDirtyConnectors().isEmpty()) : "Connectors have been marked as dirty during the end of the paint phase. This is most certainly not intended."; + assert (uiConnectorTracker.getDirtyConnectors() + .isEmpty()) : "Connectors have been marked as dirty during the end of the paint phase. This is most certainly not intended."; writePerformanceData(ui, writer); } finally { @@ -354,9 +353,9 @@ public class UidlWriter implements Serializable { private void writePerformanceData(UI ui, Writer writer) throws IOException { if (!ui.getSession().getService().getDeploymentConfiguration() .isProductionMode()) { - writer.write(String.format(", \"timings\":[%d, %d]", ui - .getSession().getCumulativeRequestDuration(), ui - .getSession().getLastRequestDuration())); + writer.write(String.format(", \"timings\":[%d, %d]", + ui.getSession().getCumulativeRequestDuration(), + ui.getSession().getLastRequestDuration())); } } diff --git a/server/src/main/java/com/vaadin/server/communication/data/RpcDataProviderExtension.java b/server/src/main/java/com/vaadin/server/communication/data/RpcDataProviderExtension.java index 08c70c14cf..f10a2dec1d 100644 --- a/server/src/main/java/com/vaadin/server/communication/data/RpcDataProviderExtension.java +++ b/server/src/main/java/com/vaadin/server/communication/data/RpcDataProviderExtension.java @@ -199,8 +199,8 @@ public class RpcDataProviderExtension extends AbstractExtension { private void internalAddColumns(Collection<Column> addedColumns) { for (final Column column : addedColumns) { - final Property<?> property = item.getItemProperty(column - .getPropertyId()); + final Property<?> property = item + .getItemProperty(column.getPropertyId()); if (property instanceof ValueChangeNotifier) { ((ValueChangeNotifier) property) .addValueChangeListener(this); @@ -210,8 +210,8 @@ public class RpcDataProviderExtension extends AbstractExtension { public void removeColumns(Collection<Column> removedColumns) { for (final Column column : removedColumns) { - final Property<?> property = item.getItemProperty(column - .getPropertyId()); + final Property<?> property = item + .getItemProperty(column.getPropertyId()); if (property instanceof ValueChangeNotifier) { ((ValueChangeNotifier) property) .removeValueChangeListener(this); @@ -297,8 +297,8 @@ public class RpcDataProviderExtension extends AbstractExtension { @Override public void dropRows(JsonArray rowKeys) { for (int i = 0; i < rowKeys.length(); ++i) { - activeItemHandler.dropActiveItem(getKeyMapper().get( - rowKeys.getString(i))); + activeItemHandler.dropActiveItem( + getKeyMapper().get(rowKeys.getString(i))); } } }); @@ -383,7 +383,8 @@ public class RpcDataProviderExtension extends AbstractExtension { diff = cached.length(); } - for (int i = 0; i < newRange.length() && i + diff < itemIds.size(); ++i) { + for (int i = 0; i < newRange.length() + && i + diff < itemIds.size(); ++i) { Object itemId = itemIds.get(i + diff); Item item = container.getItem(itemId); diff --git a/server/src/main/java/com/vaadin/server/data/BackEndDataSource.java b/server/src/main/java/com/vaadin/server/data/BackEndDataSource.java index 556d9cb25c..add1f375c5 100644 --- a/server/src/main/java/com/vaadin/server/data/BackEndDataSource.java +++ b/server/src/main/java/com/vaadin/server/data/BackEndDataSource.java @@ -27,8 +27,7 @@ import java.util.stream.Stream; * @param <T> * data source data type */ -public class BackEndDataSource<T> implements - DataSource<T> { +public class BackEndDataSource<T> implements DataSource<T> { private Function<Query, Stream<T>> request; private Function<Query, Integer> sizeCallback; @@ -64,7 +63,8 @@ public class BackEndDataSource<T> implements * Sets a default sorting order to the data source. * * @param sortOrders - * a list of sorting information containing field ids and directions + * a list of sorting information containing field ids and + * directions * @return new data source with modified sorting */ public BackEndDataSource<T> sortingBy(List<SortOrder<String>> sortOrders) { diff --git a/server/src/main/java/com/vaadin/server/data/DataSource.java b/server/src/main/java/com/vaadin/server/data/DataSource.java index 167ef07606..aedfadc6e7 100644 --- a/server/src/main/java/com/vaadin/server/data/DataSource.java +++ b/server/src/main/java/com/vaadin/server/data/DataSource.java @@ -32,8 +32,8 @@ import java.util.stream.Stream; * @see ListDataSource * @see BackEndDataSource */ -public interface DataSource<T> extends Function<Query, Stream<T>>, - Serializable { +public interface DataSource<T> + extends Function<Query, Stream<T>>, Serializable { /** * Gets whether the DataSource content all available in memory or does it @@ -53,9 +53,9 @@ public interface DataSource<T> extends Function<Query, Stream<T>>, int size(Query t); /** - * This method creates a new {@link ListDataSource} from a given - * Collection. The ListDataSource creates a protective List copy of all - * the contents in the Collection. + * This method creates a new {@link ListDataSource} from a given Collection. + * The ListDataSource creates a protective List copy of all the contents in + * the Collection. * * @param data * collection of data @@ -66,9 +66,9 @@ public interface DataSource<T> extends Function<Query, Stream<T>>, } /** - * This method creates a new {@link ListDataSource} from given - * objects.The ListDataSource creates a protective List copy of all the - * contents in the array. + * This method creates a new {@link ListDataSource} from given objects.The + * ListDataSource creates a protective List copy of all the contents in the + * array. * * @param data * data objects diff --git a/server/src/main/java/com/vaadin/server/data/ListDataSource.java b/server/src/main/java/com/vaadin/server/data/ListDataSource.java index fe478996c3..389e836d2e 100644 --- a/server/src/main/java/com/vaadin/server/data/ListDataSource.java +++ b/server/src/main/java/com/vaadin/server/data/ListDataSource.java @@ -48,9 +48,9 @@ public class ListDataSource<T> implements DataSource<T> { } /** - * Chaining constructor for making modified {@link ListDataSource}s. - * This Constructor is used internally for making sorted and filtered - * variants of a base data source with actual data. + * Chaining constructor for making modified {@link ListDataSource}s. This + * Constructor is used internally for making sorted and filtered variants of + * a base data source with actual data. * * @param request * request for the new data source @@ -72,8 +72,7 @@ public class ListDataSource<T> implements DataSource<T> { * @return new data source with modified sorting */ public ListDataSource<T> sortingBy(Comparator<T> sortOrder) { - return new ListDataSource<>(q -> request.apply(q) - .sorted(sortOrder)); + return new ListDataSource<>(q -> request.apply(q).sorted(sortOrder)); } /** diff --git a/server/src/main/java/com/vaadin/server/data/SortOrder.java b/server/src/main/java/com/vaadin/server/data/SortOrder.java index cf2cd7e208..a10c297303 100644 --- a/server/src/main/java/com/vaadin/server/data/SortOrder.java +++ b/server/src/main/java/com/vaadin/server/data/SortOrder.java @@ -33,9 +33,10 @@ public class SortOrder<T> implements Serializable { * Constructs a field sorting information * * @param sorted - * sorting information, usually field id or {@link java.util.Comparator} + * sorting information, usually field id or + * {@link java.util.Comparator} * @param direction - * sorting direction + * sorting direction */ public SortOrder(T sorted, SortDirection direction) { this.sorted = sorted; diff --git a/server/src/main/java/com/vaadin/server/themeutils/SASSAddonImportFileCreator.java b/server/src/main/java/com/vaadin/server/themeutils/SASSAddonImportFileCreator.java index cfee2a320e..33eba6cfab 100644 --- a/server/src/main/java/com/vaadin/server/themeutils/SASSAddonImportFileCreator.java +++ b/server/src/main/java/com/vaadin/server/themeutils/SASSAddonImportFileCreator.java @@ -87,8 +87,8 @@ public class SASSAddonImportFileCreator { .getAvailableWidgetSetsAndStylesheets(); try { - PrintStream printStream = new PrintStream(new FileOutputStream( - addonImports)); + PrintStream printStream = new PrintStream( + new FileOutputStream(addonImports)); printStream.println("/* " + ADDON_IMPORTS_FILE_TEXT + " */"); @@ -119,8 +119,8 @@ public class SASSAddonImportFileCreator { List<String> mixins = new ArrayList<String>(); for (String path : paths) { - mixins.addAll(addImport(printStream, path, - addonThemes.get(path))); + mixins.addAll( + addImport(printStream, path, addonThemes.get(path))); printStream.println(); } @@ -187,7 +187,8 @@ public class SASSAddonImportFileCreator { private static void createAddonsMixin(PrintStream stream, List<String> mixins) { - stream.println("/* Import and include this mixin into your project theme to include the addon themes */"); + stream.println( + "/* Import and include this mixin into your project theme to include the addon themes */"); stream.println("@mixin addons {"); for (String addon : mixins) { stream.println("\t@include " + addon + ";"); diff --git a/server/src/main/java/com/vaadin/server/widgetsetutils/ClassPathExplorer.java b/server/src/main/java/com/vaadin/server/widgetsetutils/ClassPathExplorer.java index 45bd3751d3..8d032d4a22 100644 --- a/server/src/main/java/com/vaadin/server/widgetsetutils/ClassPathExplorer.java +++ b/server/src/main/java/com/vaadin/server/widgetsetutils/ClassPathExplorer.java @@ -80,7 +80,8 @@ public class ClassPathExplorer { private final Map<String, URL> addonStyles; - public LocationInfo(Map<String, URL> widgetsets, Map<String, URL> themes) { + public LocationInfo(Map<String, URL> widgetsets, + Map<String, URL> themes) { this.widgetsets = widgetsets; addonStyles = themes; } @@ -107,7 +108,8 @@ public class ClassPathExplorer { * slash, or a URL for a JAR file) to the corresponding URLs. This is * constructed from the class path. */ - private static Map<String, URL> classpathLocations = getClasspathLocations(rawClasspathEntries); + private static Map<String, URL> classpathLocations = getClasspathLocations( + rawClasspathEntries); private static boolean debug = false; @@ -192,9 +194,8 @@ public class ClassPathExplorer { * separators) to a URL (see {@link #classpathLocations}) - new * entries are added to this map */ - private static void searchForWidgetSetsAndAddonStyles( - String locationString, Map<String, URL> widgetsets, - Map<String, URL> addonStyles) { + private static void searchForWidgetSetsAndAddonStyles(String locationString, + Map<String, URL> widgetsets, Map<String, URL> addonStyles) { URL location = classpathLocations.get(locationString); File directory = new File(location.getFile()); @@ -210,8 +211,8 @@ public class ClassPathExplorer { // remove the .gwt.xml extension String classname = files[i].substring(0, files[i].length() - 8); - String packageName = locationString.substring(locationString - .lastIndexOf("/") + 1); + String packageName = locationString + .substring(locationString.lastIndexOf("/") + 1); classname = packageName + "." + classname; if (!WidgetSetBuilder.isWidgetset(classname)) { @@ -222,8 +223,8 @@ public class ClassPathExplorer { if (!widgetsets.containsKey(classname)) { String packagePath = packageName.replaceAll("\\.", "/"); - String basePath = location.getFile().replaceAll( - "/" + packagePath + "$", ""); + String basePath = location.getFile() + .replaceAll("/" + packagePath + "$", ""); try { URL url = new URL(location.getProtocol(), location.getHost(), location.getPort(), @@ -255,8 +256,8 @@ public class ClassPathExplorer { } // Check for widgetset attribute - String value = manifest.getMainAttributes().getValue( - "Vaadin-Widgetsets"); + String value = manifest.getMainAttributes() + .getValue("Vaadin-Widgetsets"); if (value != null) { String[] widgetsetNames = value.split(","); for (int i = 0; i < widgetsetNames.length; i++) { @@ -268,8 +269,8 @@ public class ClassPathExplorer { } // Check for theme attribute - value = manifest.getMainAttributes().getValue( - "Vaadin-Stylesheets"); + value = manifest.getMainAttributes() + .getValue("Vaadin-Stylesheets"); if (value != null) { String[] stylesheets = value.split(","); for (int i = 0; i < stylesheets.length; i++) { @@ -390,10 +391,12 @@ public class ClassPathExplorer { if (manifest != null) { Attributes mainAttributes = manifest .getMainAttributes(); - if (mainAttributes.getValue("Vaadin-Widgetsets") != null) { + if (mainAttributes + .getValue("Vaadin-Widgetsets") != null) { return true; } - if (mainAttributes.getValue("Vaadin-Stylesheets") != null) { + if (mainAttributes + .getValue("Vaadin-Stylesheets") != null) { return true; } } @@ -541,7 +544,8 @@ public class ClassPathExplorer { } if (widgetsetFileName == null - || new File(directory, widgetsetFileName).exists()) { + || new File(directory, widgetsetFileName) + .exists()) { return directoryUrl; } } catch (MalformedURLException e) { diff --git a/server/src/main/java/com/vaadin/server/widgetsetutils/WidgetSetBuilder.java b/server/src/main/java/com/vaadin/server/widgetsetutils/WidgetSetBuilder.java index b0d8cdd004..08852b5394 100644 --- a/server/src/main/java/com/vaadin/server/widgetsetutils/WidgetSetBuilder.java +++ b/server/src/main/java/com/vaadin/server/widgetsetutils/WidgetSetBuilder.java @@ -83,28 +83,25 @@ public class WidgetSetBuilder { } } widgetsetFile.createNewFile(); - PrintStream printStream = new PrintStream(new FileOutputStream( - widgetsetFile)); - printStream - .print("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" - + "<!DOCTYPE module PUBLIC \"-//Google Inc.//DTD Google Web Toolkit 2.5.1//EN\" \"http://google-web-toolkit.googlecode.com/svn/tags/2.5.1/distro-source/core/src/gwt-module.dtd\">\n"); + PrintStream printStream = new PrintStream( + new FileOutputStream(widgetsetFile)); + printStream.print("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + + "<!DOCTYPE module PUBLIC \"-//Google Inc.//DTD Google Web Toolkit 2.5.1//EN\" \"http://google-web-toolkit.googlecode.com/svn/tags/2.5.1/distro-source/core/src/gwt-module.dtd\">\n"); printStream.print("<module>\n"); - printStream - .print(" <!--\n" - + " Uncomment the following to compile the widgetset for one browser only.\n\n" - + " Multiple browsers can be specified as a comma separated list. The\n" - + " supported user agents at the moment of writing were:\n" - + " ie8,ie9,gecko1_8,safari,opera\n\n" - + " The value gecko1_8 is used for Firefox and safari is used for webkit\n" - + " based browsers including Google Chrome.\n" - + " -->\n" - + " <!-- <set-property name=\"user.agent\" value=\"safari\"/> -->\n\n" - + " <!--\n" - + " To enable SuperDevMode, uncomment this line.\n\n" - + " See https://vaadin.com/wiki/-/wiki/Main/Using%20SuperDevMode for more\n" - + " information and instructions.\n" - + " -->\n" - + " <!-- <set-configuration-property name=\"devModeRedirectEnabled\" value=\"true\" /> -->\n\n"); + printStream.print(" <!--\n" + + " Uncomment the following to compile the widgetset for one browser only.\n\n" + + " Multiple browsers can be specified as a comma separated list. The\n" + + " supported user agents at the moment of writing were:\n" + + " ie8,ie9,gecko1_8,safari,opera\n\n" + + " The value gecko1_8 is used for Firefox and safari is used for webkit\n" + + " based browsers including Google Chrome.\n" + + " -->\n" + + " <!-- <set-property name=\"user.agent\" value=\"safari\"/> -->\n\n" + + " <!--\n" + + " To enable SuperDevMode, uncomment this line.\n\n" + + " See https://vaadin.com/wiki/-/wiki/Main/Using%20SuperDevMode for more\n" + + " information and instructions.\n" + " -->\n" + + " <!-- <set-configuration-property name=\"devModeRedirectEnabled\" value=\"true\" /> -->\n\n"); printStream.print("\n</module>\n"); printStream.close(); changed = true; @@ -114,7 +111,8 @@ public class WidgetSetBuilder { if (isEditable(content)) { String originalContent = content; - Collection<String> oldInheritedWidgetsets = getCurrentInheritedWidgetsets(content); + Collection<String> oldInheritedWidgetsets = getCurrentInheritedWidgetsets( + content); // add widgetsets that do not exist Iterator<String> i = availableWidgetSets.keySet().iterator(); @@ -157,14 +155,15 @@ public class WidgetSetBuilder { private static void commitChanges(String widgetsetfilename, String content) throws IOException { BufferedWriter bufferedWriter = new BufferedWriter( - new OutputStreamWriter(new FileOutputStream(widgetsetfilename))); + new OutputStreamWriter( + new FileOutputStream(widgetsetfilename))); bufferedWriter.write(content); bufferedWriter.close(); } private static String addWidgetSet(String ws, String content) { - return content.replace("</module>", "\n <inherits name=\"" + ws - + "\" />" + "\n</module>"); + return content.replace("</module>", + "\n <inherits name=\"" + ws + "\" />" + "\n</module>"); } private static Collection<String> getCurrentInheritedWidgetsets( @@ -208,7 +207,8 @@ public class WidgetSetBuilder { o.println(" 2. Give the widgetsetname (to be created or updated)" + " as first parameter"); o.println(); - o.println("All found vaadin widgetsets will be inherited in given widgetset"); + o.println( + "All found vaadin widgetsets will be inherited in given widgetset"); } diff --git a/server/src/main/java/com/vaadin/ui/AbsoluteLayout.java b/server/src/main/java/com/vaadin/ui/AbsoluteLayout.java index c62da24612..dae8f2d28a 100644 --- a/server/src/main/java/com/vaadin/ui/AbsoluteLayout.java +++ b/server/src/main/java/com/vaadin/ui/AbsoluteLayout.java @@ -43,8 +43,8 @@ import com.vaadin.ui.declarative.DesignContext; * */ @SuppressWarnings("serial") -public class AbsoluteLayout extends AbstractLayout implements - LayoutClickNotifier { +public class AbsoluteLayout extends AbstractLayout + implements LayoutClickNotifier { // constants for design attributes private static final String ATTR_TOP = ":top"; @@ -103,7 +103,8 @@ public class AbsoluteLayout extends AbstractLayout implements * old components position. */ @Override - public void replaceComponent(Component oldComponent, Component newComponent) { + public void replaceComponent(Component oldComponent, + Component newComponent) { ComponentPosition position = getPosition(oldComponent); removeComponent(oldComponent); addComponent(newComponent, position); @@ -112,9 +113,8 @@ public class AbsoluteLayout extends AbstractLayout implements /* * (non-Javadoc) * - * @see - * com.vaadin.ui.AbstractComponentContainer#addComponent(com.vaadin.ui.Component - * ) + * @see com.vaadin.ui.AbstractComponentContainer#addComponent(com.vaadin.ui. + * Component ) */ @Override public void addComponent(Component c) { @@ -194,8 +194,8 @@ public class AbsoluteLayout extends AbstractLayout implements Map<String, String> connectorToPosition = new HashMap<String, String>(); for (Iterator<Component> ci = getComponentIterator(); ci.hasNext();) { Component c = ci.next(); - connectorToPosition.put(c.getConnectorId(), getPosition(c) - .getCSSString()); + connectorToPosition.put(c.getConnectorId(), + getPosition(c).getCSSString()); } getState().connectorToCssPosition = connectorToPosition; @@ -730,19 +730,22 @@ public class AbsoluteLayout extends AbstractLayout implements // handle position ComponentPosition position = getPosition(child); - writePositionAttribute(childElement, ATTR_TOP, position - .getTopUnits().getSymbol(), position.getTopValue()); - writePositionAttribute(childElement, ATTR_RIGHT, position - .getRightUnits().getSymbol(), position.getRightValue()); - writePositionAttribute(childElement, ATTR_BOTTOM, position - .getBottomUnits().getSymbol(), position.getBottomValue()); - writePositionAttribute(childElement, ATTR_LEFT, position - .getLeftUnits().getSymbol(), position.getLeftValue()); + writePositionAttribute(childElement, ATTR_TOP, + position.getTopUnits().getSymbol(), position.getTopValue()); + writePositionAttribute(childElement, ATTR_RIGHT, + position.getRightUnits().getSymbol(), + position.getRightValue()); + writePositionAttribute(childElement, ATTR_BOTTOM, + position.getBottomUnits().getSymbol(), + position.getBottomValue()); + writePositionAttribute(childElement, ATTR_LEFT, + position.getLeftUnits().getSymbol(), + position.getLeftValue()); // handle z-index if (position.getZIndex() >= 0) { - childElement - .attr(ATTR_Z_INDEX, String.valueOf(position.zIndex)); + childElement.attr(ATTR_Z_INDEX, + String.valueOf(position.zIndex)); } } } @@ -763,8 +766,8 @@ public class AbsoluteLayout extends AbstractLayout implements private void writePositionAttribute(Node node, String key, String symbol, Float value) { if (value != null) { - String valueString = DesignAttributeHandler.getFormatter().format( - value); + String valueString = DesignAttributeHandler.getFormatter() + .format(value); node.attr(key, valueString + symbol); } } diff --git a/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java b/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java index 4ce4e46d6a..0935406d5a 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java +++ b/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java @@ -40,8 +40,8 @@ import com.vaadin.ui.declarative.DesignContext; * * @since 7.0.0 */ -public abstract class AbstractColorPicker extends AbstractComponent implements - CloseListener, ColorSelector { +public abstract class AbstractColorPicker extends AbstractComponent + implements CloseListener, ColorSelector { private static final Method COLOR_CHANGE_METHOD; static { try { @@ -547,13 +547,14 @@ public abstract class AbstractColorPicker extends AbstractComponent implements Attributes attributes = design.attributes(); if (design.hasAttr("color")) { // Ignore the # character - String hexColor = DesignAttributeHandler.readAttribute("color", - attributes, String.class).substring(1); + String hexColor = DesignAttributeHandler + .readAttribute("color", attributes, String.class) + .substring(1); setColor(new Color(Integer.parseInt(hexColor, 16))); } if (design.hasAttr("popup-style")) { - setPopupStyle(PopupStyle.valueOf("POPUP_" - + attributes.get("popup-style").toUpperCase())); + setPopupStyle(PopupStyle.valueOf( + "POPUP_" + attributes.get("popup-style").toUpperCase())); } if (design.hasAttr("position")) { String[] position = attributes.get("position").split(","); @@ -572,8 +573,8 @@ public abstract class AbstractColorPicker extends AbstractComponent implements DesignAttributeHandler.writeAttribute("popup-style", attribute, (popupStyle == PopupStyle.POPUP_NORMAL ? "normal" : "simple"), "normal", String.class); - DesignAttributeHandler.writeAttribute("position", attribute, positionX - + "," + positionY, "0,0", String.class); + DesignAttributeHandler.writeAttribute("position", attribute, + positionX + "," + positionY, "0,0", String.class); } @Override diff --git a/server/src/main/java/com/vaadin/ui/AbstractComponent.java b/server/src/main/java/com/vaadin/ui/AbstractComponent.java index 61cd991116..fcaa765767 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractComponent.java +++ b/server/src/main/java/com/vaadin/ui/AbstractComponent.java @@ -176,8 +176,8 @@ public abstract class AbstractComponent extends AbstractClientConnector public String getStyleName() { String s = ""; if (ComponentStateUtil.hasStyles(getState(false))) { - for (final Iterator<String> it = getState(false).styles.iterator(); it - .hasNext();) { + for (final Iterator<String> it = getState(false).styles + .iterator(); it.hasNext();) { s += it.next(); if (it.hasNext()) { s += " "; @@ -559,8 +559,8 @@ public abstract class AbstractComponent extends AbstractClientConnector } if (parent != null && this.parent != null) { - throw new IllegalStateException(getClass().getName() - + " already has a parent."); + throw new IllegalStateException( + getClass().getName() + " already has a parent."); } // Send a detach event if the component is currently attached @@ -750,17 +750,15 @@ public abstract class AbstractComponent extends AbstractClientConnector super.beforeClientResponse(initial); // TODO This logic should be on the client side and the state should // simply be a data object with "width" and "height". - if (getHeight() >= 0 - && (getHeightUnits() != Unit.PERCENTAGE || ComponentSizeValidator - .parentCanDefineHeight(this))) { + if (getHeight() >= 0 && (getHeightUnits() != Unit.PERCENTAGE + || ComponentSizeValidator.parentCanDefineHeight(this))) { getState().height = "" + getCSSHeight(); } else { getState().height = ""; } - if (getWidth() >= 0 - && (getWidthUnits() != Unit.PERCENTAGE || ComponentSizeValidator - .parentCanDefineWidth(this))) { + if (getWidth() >= 0 && (getWidthUnits() != Unit.PERCENTAGE + || ComponentSizeValidator.parentCanDefineWidth(this))) { getState().width = "" + getCSSWidth(); } else { getState().width = ""; @@ -1007,8 +1005,8 @@ public abstract class AbstractComponent extends AbstractClientConnector } // handle immediate if (attr.hasKey("immediate")) { - setImmediate(DesignAttributeHandler.getFormatter().parse( - attr.get("immediate"), Boolean.class)); + setImmediate(DesignAttributeHandler.getFormatter() + .parse(attr.get("immediate"), Boolean.class)); } // handle locale @@ -1019,15 +1017,14 @@ public abstract class AbstractComponent extends AbstractClientConnector readSize(attr); // handle component error if (attr.hasKey("error")) { - UserError error = new UserError(attr.get("error"), - ContentMode.HTML, ErrorLevel.ERROR); + UserError error = new UserError(attr.get("error"), ContentMode.HTML, + ErrorLevel.ERROR); setComponentError(error); } // Tab index when applicable if (design.hasAttr("tabindex") && this instanceof Focusable) { - ((Focusable) this).setTabIndex(DesignAttributeHandler - .readAttribute("tabindex", design.attributes(), - Integer.class)); + ((Focusable) this).setTabIndex(DesignAttributeHandler.readAttribute( + "tabindex", design.attributes(), Integer.class)); } // check for unsupported attributes @@ -1060,8 +1057,8 @@ public abstract class AbstractComponent extends AbstractClientConnector } String[] parts = localeString.split("_"); if (parts.length > 3) { - throw new RuntimeException("Cannot parse the locale string: " - + localeString); + throw new RuntimeException( + "Cannot parse the locale string: " + localeString); } switch (parts.length) { case 1: @@ -1135,7 +1132,8 @@ public abstract class AbstractComponent extends AbstractClientConnector } // read height - if (attributes.hasKey("height-auto") || attributes.hasKey("size-auto")) { + if (attributes.hasKey("height-auto") + || attributes.hasKey("size-auto")) { this.setHeight(null); } else if (attributes.hasKey("height-full") || attributes.hasKey("size-full")) { @@ -1300,18 +1298,17 @@ public abstract class AbstractComponent extends AbstractClientConnector explicitImmediateValue, def.isImmediate(), Boolean.class); } // handle locale - if (getLocale() != null - && (getParent() == null || !getLocale().equals( - getParent().getLocale()))) { + if (getLocale() != null && (getParent() == null + || !getLocale().equals(getParent().getLocale()))) { design.attr("locale", getLocale().toString()); } // handle size writeSize(attr, def); // handle component error - String errorMsg = getComponentError() != null ? getComponentError() - .getFormattedHtmlMessage() : null; - String defErrorMsg = def.getComponentError() != null ? def - .getComponentError().getFormattedHtmlMessage() : null; + String errorMsg = getComponentError() != null + ? getComponentError().getFormattedHtmlMessage() : null; + String defErrorMsg = def.getComponentError() != null + ? def.getComponentError().getFormattedHtmlMessage() : null; if (!SharedUtil.equals(errorMsg, defErrorMsg)) { attr.put("error", errorMsg); } @@ -1418,7 +1415,8 @@ public abstract class AbstractComponent extends AbstractClientConnector @Override public void removeContextClickListener(ContextClickListener listener) { - removeListener(EventId.CONTEXT_CLICK, ContextClickEvent.class, listener); + removeListener(EventId.CONTEXT_CLICK, ContextClickEvent.class, + listener); } private static final Logger getLogger() { diff --git a/server/src/main/java/com/vaadin/ui/AbstractComponentContainer.java b/server/src/main/java/com/vaadin/ui/AbstractComponentContainer.java index 1095331602..f3405a8a1c 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractComponentContainer.java +++ b/server/src/main/java/com/vaadin/ui/AbstractComponentContainer.java @@ -65,7 +65,8 @@ public abstract class AbstractComponentContainer extends AbstractComponent final LinkedList<Component> l = new LinkedList<Component>(); // Adds all components - for (final Iterator<Component> i = getComponentIterator(); i.hasNext();) { + for (final Iterator<Component> i = getComponentIterator(); i + .hasNext();) { l.add(i.next()); } @@ -88,7 +89,8 @@ public abstract class AbstractComponentContainer extends AbstractComponent components.add(i.next()); } - for (final Iterator<Component> i = components.iterator(); i.hasNext();) { + for (final Iterator<Component> i = components.iterator(); i + .hasNext();) { final Component c = i.next(); source.removeComponent(c); addComponent(c); @@ -114,7 +116,8 @@ public abstract class AbstractComponentContainer extends AbstractComponent /* documented in interface */ @Override - public void removeComponentAttachListener(ComponentAttachListener listener) { + public void removeComponentAttachListener( + ComponentAttachListener listener) { removeListener(ComponentAttachEvent.class, listener, ComponentAttachListener.attachMethod); } @@ -148,7 +151,8 @@ public abstract class AbstractComponentContainer extends AbstractComponent /* documented in interface */ @Override - public void removeComponentDetachListener(ComponentDetachListener listener) { + public void removeComponentDetachListener( + ComponentDetachListener listener) { removeListener(ComponentDetachEvent.class, listener, ComponentDetachListener.detachMethod); } @@ -241,8 +245,9 @@ public abstract class AbstractComponentContainer extends AbstractComponent dirtyChildren = getInvalidSizedChildren(false); } else if ((width == SIZE_UNDEFINED && getWidth() != SIZE_UNDEFINED) || (unit == Unit.PERCENTAGE - && getWidthUnits() != Unit.PERCENTAGE && !ComponentSizeValidator - .parentCanDefineWidth(this))) { + && getWidthUnits() != Unit.PERCENTAGE + && !ComponentSizeValidator + .parentCanDefineWidth(this))) { /* * relative width children may get to invalid state if width becomes * invalid. Width may also become invalid if units become percentage @@ -256,15 +261,15 @@ public abstract class AbstractComponentContainer extends AbstractComponent false); } - private void repaintChangedChildTrees( - Collection<Component> invalidChildren, + private void repaintChangedChildTrees(Collection<Component> invalidChildren, boolean childrenMayBecomeUndefined, boolean vertical) { if (childrenMayBecomeUndefined) { Collection<Component> previouslyInvalidComponents = invalidChildren; invalidChildren = getInvalidSizedChildren(vertical); - if (previouslyInvalidComponents != null && invalidChildren != null) { - for (Iterator<Component> iterator = invalidChildren.iterator(); iterator - .hasNext();) { + if (previouslyInvalidComponents != null + && invalidChildren != null) { + for (Iterator<Component> iterator = invalidChildren + .iterator(); iterator.hasNext();) { Component component = iterator.next(); if (previouslyInvalidComponents.contains(component)) { // still invalid don't repaint @@ -273,7 +278,8 @@ public abstract class AbstractComponentContainer extends AbstractComponent } } } else if (invalidChildren != null) { - Collection<Component> stillInvalidChildren = getInvalidSizedChildren(vertical); + Collection<Component> stillInvalidChildren = getInvalidSizedChildren( + vertical); if (stillInvalidChildren != null) { for (Component component : stillInvalidChildren) { // didn't become valid @@ -286,12 +292,13 @@ public abstract class AbstractComponentContainer extends AbstractComponent } } - private Collection<Component> getInvalidSizedChildren(final boolean vertical) { + private Collection<Component> getInvalidSizedChildren( + final boolean vertical) { HashSet<Component> components = null; for (Component component : this) { - boolean valid = vertical ? ComponentSizeValidator - .checkHeights(component) : ComponentSizeValidator - .checkWidths(component); + boolean valid = vertical + ? ComponentSizeValidator.checkHeights(component) + : ComponentSizeValidator.checkWidths(component); if (!valid) { if (components == null) { components = new HashSet<Component>(); @@ -321,8 +328,9 @@ public abstract class AbstractComponentContainer extends AbstractComponent dirtyChildren = getInvalidSizedChildren(true); } else if ((height == SIZE_UNDEFINED && getHeight() != SIZE_UNDEFINED) || (unit == Unit.PERCENTAGE - && getHeightUnits() != Unit.PERCENTAGE && !ComponentSizeValidator - .parentCanDefineHeight(this))) { + && getHeightUnits() != Unit.PERCENTAGE + && !ComponentSizeValidator + .parentCanDefineHeight(this))) { /* * relative height children may get to invalid state if height * becomes invalid. Height may also become invalid if units become diff --git a/server/src/main/java/com/vaadin/ui/AbstractEmbedded.java b/server/src/main/java/com/vaadin/ui/AbstractEmbedded.java index a38e9bb788..4bfebe7cf5 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractEmbedded.java +++ b/server/src/main/java/com/vaadin/ui/AbstractEmbedded.java @@ -28,8 +28,7 @@ import com.vaadin.ui.declarative.DesignContext; * Abstract base for embedding components. * * @author Vaadin Ltd. - * @version - * @VERSION@ + * @version @VERSION@ * @since 7.0 */ @SuppressWarnings("serial") diff --git a/server/src/main/java/com/vaadin/ui/AbstractJavaScriptComponent.java b/server/src/main/java/com/vaadin/ui/AbstractJavaScriptComponent.java index 68ee132b76..9821c598e7 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractJavaScriptComponent.java +++ b/server/src/main/java/com/vaadin/ui/AbstractJavaScriptComponent.java @@ -106,13 +106,15 @@ import elemental.json.JsonValue; * the field, that function is called whenever the contents of the shared state * is changed.</li> * <li><code>onUnregister</code> - If the JavaScript code assigns a function to - * the field, that function is called when the connector has been unregistered.</li> + * the field, that function is called when the connector has been + * unregistered.</li> * <li>Any field name corresponding to a call to * {@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 #callFunction(String, Object...)} - * on the server will be called if a function has been assigned to the field.</li> + * on the server will be called if a function has been assigned to the + * field.</li> * </ul> * <p> * @@ -127,7 +129,8 @@ import elemental.json.JsonValue; * <li>Java Strings are represented by JavaScript strings.</li> * <li>Java Dates are represented by JavaScript numbers containing the timestamp * </li> - * <li>List, Set and all arrays in Java are represented by JavaScript arrays.</li> + * <li>List, Set and all arrays in Java are represented by JavaScript + * arrays.</li> * <li>Map<String, ?> in Java is represented by JavaScript object with * fields corresponding to the map keys.</li> * <li>Any other Java Map is represented by a JavaScript array containing two @@ -170,7 +173,8 @@ public abstract class AbstractJavaScriptComponent extends AbstractComponent { * the {@link JavaScriptFunction} object that will be invoked * when the JavaScript function is called */ - protected void addFunction(String functionName, JavaScriptFunction function) { + protected void addFunction(String functionName, + JavaScriptFunction function) { callbackHelper.registerCallback(functionName, function); } diff --git a/server/src/main/java/com/vaadin/ui/AbstractLayout.java b/server/src/main/java/com/vaadin/ui/AbstractLayout.java index 0770670680..547e1122d5 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractLayout.java +++ b/server/src/main/java/com/vaadin/ui/AbstractLayout.java @@ -66,16 +66,15 @@ public abstract class AbstractLayout extends AbstractComponentContainer boolean left = DesignAttributeHandler.readAttribute("margin-left", design.attributes(), defMargin.hasLeft(), boolean.class); - boolean right = DesignAttributeHandler.readAttribute( - "margin-right", design.attributes(), defMargin.hasRight(), - boolean.class); + boolean right = DesignAttributeHandler.readAttribute("margin-right", + design.attributes(), defMargin.hasRight(), boolean.class); boolean top = DesignAttributeHandler.readAttribute("margin-top", design.attributes(), defMargin.hasTop(), boolean.class); boolean bottom = DesignAttributeHandler.readAttribute( - "margin-bottom", design.attributes(), - defMargin.hasBottom(), boolean.class); + "margin-bottom", design.attributes(), defMargin.hasBottom(), + boolean.class); return new MarginInfo(top, right, bottom, left); } @@ -102,9 +101,8 @@ public abstract class AbstractLayout extends AbstractComponentContainer protected void writeMargin(Element design, MarginInfo margin, MarginInfo defMargin, DesignContext context) { if (margin.hasAll()) { - DesignAttributeHandler.writeAttribute("margin", - design.attributes(), margin.hasAll(), defMargin.hasAll(), - boolean.class); + DesignAttributeHandler.writeAttribute("margin", design.attributes(), + margin.hasAll(), defMargin.hasAll(), boolean.class); } else { DesignAttributeHandler.writeAttribute("margin-left", diff --git a/server/src/main/java/com/vaadin/ui/AbstractMedia.java b/server/src/main/java/com/vaadin/ui/AbstractMedia.java index a0344624d7..1d961832f7 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractMedia.java +++ b/server/src/main/java/com/vaadin/ui/AbstractMedia.java @@ -78,17 +78,17 @@ public abstract class AbstractMedia extends AbstractComponent { /** * Adds an alternative media file to the sources list. Which of the sources * is used is selected by the browser depending on which file formats it - * supports. See <a - * href="http://en.wikipedia.org/wiki/HTML5_video#Table">wikipedia</a> for a - * table of formats supported by different browsers. + * supports. See + * <a href="http://en.wikipedia.org/wiki/HTML5_video#Table">wikipedia</a> + * for a table of formats supported by different browsers. * * @param source */ public void addSource(Resource source) { if (source != null) { List<URLReference> sources = getState().sources; - sources.add(new ResourceReference(source, this, Integer - .toString(sources.size()))); + sources.add(new ResourceReference(source, this, + Integer.toString(sources.size()))); getState().sourceTypes.add(source.getMIMEType()); } } @@ -135,9 +135,9 @@ public abstract class AbstractMedia extends AbstractComponent { /** * Set multiple sources at once. Which of the sources is used is selected by - * the browser depending on which file formats it supports. See <a - * href="http://en.wikipedia.org/wiki/HTML5_video#Table">wikipedia</a> for a - * table of formats supported by different browsers. + * the browser depending on which file formats it supports. See + * <a href="http://en.wikipedia.org/wiki/HTML5_video#Table">wikipedia</a> + * for a table of formats supported by different browsers. * * @param sources */ diff --git a/server/src/main/java/com/vaadin/ui/AbstractOrderedLayout.java b/server/src/main/java/com/vaadin/ui/AbstractOrderedLayout.java index d6df3f372a..c239990292 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractOrderedLayout.java +++ b/server/src/main/java/com/vaadin/ui/AbstractOrderedLayout.java @@ -39,9 +39,9 @@ import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; @SuppressWarnings("serial") -public abstract class AbstractOrderedLayout extends AbstractLayout implements - Layout.AlignmentHandler, Layout.SpacingHandler, LayoutClickNotifier, - Layout.MarginHandler { +public abstract class AbstractOrderedLayout extends AbstractLayout + implements Layout.AlignmentHandler, Layout.SpacingHandler, + LayoutClickNotifier, Layout.MarginHandler { private AbstractOrderedLayoutServerRpc rpc = new AbstractOrderedLayoutServerRpc() { @@ -203,13 +203,15 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements /* Documented in superclass */ @Override - public void replaceComponent(Component oldComponent, Component newComponent) { + public void replaceComponent(Component oldComponent, + Component newComponent) { // Gets the locations int oldLocation = -1; int newLocation = -1; int location = 0; - for (final Iterator<Component> i = components.iterator(); i.hasNext();) { + for (final Iterator<Component> i = components.iterator(); i + .hasNext();) { final Component component = i.next(); if (component == oldComponent) { @@ -503,8 +505,8 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements float ratio = Float.valueOf(value); setExpandRatio(newChild, ratio); } catch (NumberFormatException nfe) { - getLogger().info( - "Failed to parse expand ratio " + value); + getLogger() + .info("Failed to parse expand ratio " + value); } } else { setExpandRatio(newChild, 1.0f); diff --git a/server/src/main/java/com/vaadin/ui/AbstractSelect.java b/server/src/main/java/com/vaadin/ui/AbstractSelect.java index 16b3cd709f..40d0dec5a2 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractSelect.java +++ b/server/src/main/java/com/vaadin/ui/AbstractSelect.java @@ -79,8 +79,9 @@ import com.vaadin.ui.declarative.DesignFormatter; */ @SuppressWarnings("serial") // TODO currently cannot specify type more precisely in case of multi-select -public abstract class AbstractSelect extends LegacyAbstractField<Object> implements - Container, Container.Viewer, Container.PropertySetChangeListener, +public abstract class AbstractSelect extends LegacyAbstractField<Object> + implements Container, Container.Viewer, + Container.PropertySetChangeListener, Container.PropertySetChangeNotifier, Container.ItemSetChangeNotifier, Container.ItemSetChangeListener, LegacyComponent { @@ -481,7 +482,8 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> impleme } } - if (!isNullSelectionAllowed() && acceptedSelections.size() < 1) { + if (!isNullSelectionAllowed() + && acceptedSelections.size() < 1) { // empty selection not allowed, keep old value markAsDirty(); return; @@ -491,7 +493,8 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> impleme // (non-visible items can not be deselected) Collection<?> visibleNotSelected = getVisibleItemIds(); if (visibleNotSelected != null) { - visibleNotSelected = new HashSet<Object>(visibleNotSelected); + visibleNotSelected = new HashSet<Object>( + visibleNotSelected); // Don't remove those that will be added to preserve order visibleNotSelected.removeAll(acceptedSelections); @@ -510,7 +513,8 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> impleme // Single select mode if (!isNullSelectionAllowed() && (clientSideSelectedKeys.length == 0 - || clientSideSelectedKeys[0] == null || clientSideSelectedKeys[0] == getNullSelectionItemId())) { + || clientSideSelectedKeys[0] == null + || clientSideSelectedKeys[0] == getNullSelectionItemId())) { markAsDirty(); return; } @@ -595,7 +599,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> impleme if (getItemCaptionPropertyId() != null) { getContainerProperty(newItemCaption, getItemCaptionPropertyId()) - .setValue(newItemCaption); + .setValue(newItemCaption); } if (isMultiSelect()) { Set values = new HashSet((Collection) getValue()); @@ -718,11 +722,12 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> impleme if (newFieldValue == null) { super.setValue(new LinkedHashSet<Object>(), repaintIsNotNeeded, ignoreReadOnly); - } else if (Collection.class.isAssignableFrom(newFieldValue - .getClass())) { - super.setValue(new LinkedHashSet<Object>( - (Collection<?>) newFieldValue), repaintIsNotNeeded, - ignoreReadOnly); + } else if (Collection.class + .isAssignableFrom(newFieldValue.getClass())) { + super.setValue( + new LinkedHashSet<Object>( + (Collection<?>) newFieldValue), + repaintIsNotNeeded, ignoreReadOnly); } } else if (newFieldValue == null || items.containsId(newFieldValue)) { super.setValue(newFieldValue, repaintIsNotNeeded, ignoreReadOnly); @@ -916,7 +921,8 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> impleme * if the underlying container don't support adding items with * identifiers */ - public void addItems(Object... itemId) throws UnsupportedOperationException { + public void addItems(Object... itemId) + throws UnsupportedOperationException { for (Object id : itemId) { addItem(id); } @@ -1214,8 +1220,8 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> impleme break; case INDEX: if (items instanceof Container.Indexed) { - caption = String.valueOf(((Container.Indexed) items) - .indexOfId(itemId)); + caption = String + .valueOf(((Container.Indexed) items).indexOfId(itemId)); } else { caption = "ERROR: Container is not indexed"; } @@ -1258,7 +1264,8 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> impleme private String idToCaption(Object itemId) { try { LegacyConverter<String, Object> c = (LegacyConverter<String, Object>) LegacyConverterUtil - .getConverter(String.class, itemId.getClass(), getSession()); + .getConverter(String.class, itemId.getClass(), + getSession()); return LegacyConverterUtil.convertFromModel(itemId, String.class, c, getLocale()); } catch (Exception e) { @@ -1502,8 +1509,8 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> impleme return ((Set<?>) getValue()).contains(itemId); } else { final Object value = getValue(); - return itemId.equals(value == null ? getNullSelectionItemId() - : value); + return itemId + .equals(value == null ? getNullSelectionItemId() : value); } } @@ -1736,8 +1743,8 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> impleme /** * Implementation of item set change event. */ - private static class ItemSetChangeEvent extends EventObject implements - Serializable, Container.ItemSetChangeEvent { + private static class ItemSetChangeEvent extends EventObject + implements Serializable, Container.ItemSetChangeEvent { private ItemSetChangeEvent(Container source) { super(source); @@ -1758,8 +1765,8 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> impleme /** * Implementation of property set change event. */ - private static class PropertySetChangeEvent extends EventObject implements - Container.PropertySetChangeEvent, Serializable { + private static class PropertySetChangeEvent extends EventObject + implements Container.PropertySetChangeEvent, Serializable { private PropertySetChangeEvent(Container source) { super(source); @@ -1789,9 +1796,8 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> impleme return super.isEmpty(); } else { Object value = getValue(); - return super.isEmpty() - || (value instanceof Collection && ((Collection<?>) value) - .isEmpty()); + return super.isEmpty() || (value instanceof Collection + && ((Collection<?>) value).isEmpty()); } } @@ -1921,7 +1927,8 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> impleme } if (i instanceof Item.PropertySetChangeNotifier) { ((Item.PropertySetChangeNotifier) i) - .addPropertySetChangeListener(getCaptionChangeListener()); + .addPropertySetChangeListener( + getCaptionChangeListener()); captionChangeNotifiers.add(i); } Collection<?> pids = i.getItemPropertyIds(); @@ -1931,7 +1938,8 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> impleme if (p != null && p instanceof Property.ValueChangeNotifier) { ((Property.ValueChangeNotifier) p) - .addValueChangeListener(getCaptionChangeListener()); + .addValueChangeListener( + getCaptionChangeListener()); captionChangeNotifiers.add(p); } } @@ -1966,17 +1974,20 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> impleme Object notifier = it.next(); if (notifier instanceof Item.PropertySetChangeNotifier) { ((Item.PropertySetChangeNotifier) notifier) - .removePropertySetChangeListener(getCaptionChangeListener()); + .removePropertySetChangeListener( + getCaptionChangeListener()); } else { ((Property.ValueChangeNotifier) notifier) - .removeValueChangeListener(getCaptionChangeListener()); + .removeValueChangeListener( + getCaptionChangeListener()); } } captionChangeNotifiers.clear(); } @Override - public void valueChange(com.vaadin.data.Property.ValueChangeEvent event) { + public void valueChange( + com.vaadin.data.Property.ValueChangeEvent event) { markAsDirty(); } @@ -2028,12 +2039,13 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> impleme * @since 6.3 * */ - private static abstract class AbstractItemSetCriterion extends - ClientSideCriterion { + private static abstract class AbstractItemSetCriterion + extends ClientSideCriterion { protected final Collection<Object> itemIds = new HashSet<Object>(); protected AbstractSelect select; - public AbstractItemSetCriterion(AbstractSelect select, Object... itemId) { + public AbstractItemSetCriterion(AbstractSelect select, + Object... itemId) { if (itemIds == null || select == null) { throw new IllegalArgumentException( "Accepted item identifiers must be accepted."); @@ -2114,7 +2126,8 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> impleme * corresponding item Id * */ - protected AbstractSelectTargetDetails(Map<String, Object> rawVariables) { + protected AbstractSelectTargetDetails( + Map<String, Object> rawVariables) { super(rawVariables, (DropTarget) AbstractSelect.this); // eagar fetch itemid, mapper may be emptied String keyover = (String) getData("itemIdOver"); @@ -2252,10 +2265,8 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> impleme } if (child.hasAttr("icon")) { - setItemIcon( - itemId, - DesignAttributeHandler.readAttribute("icon", - child.attributes(), Resource.class)); + setItemIcon(itemId, DesignAttributeHandler.readAttribute("icon", + child.attributes(), Resource.class)); } if (child.hasAttr("selected")) { diff --git a/server/src/main/java/com/vaadin/ui/AbstractSingleComponentContainer.java b/server/src/main/java/com/vaadin/ui/AbstractSingleComponentContainer.java index 0854ffe9c2..6064d307bf 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractSingleComponentContainer.java +++ b/server/src/main/java/com/vaadin/ui/AbstractSingleComponentContainer.java @@ -36,8 +36,8 @@ import com.vaadin.ui.declarative.DesignException; * * @since 7.0 */ -public abstract class AbstractSingleComponentContainer extends - AbstractComponent implements SingleComponentContainer { +public abstract class AbstractSingleComponentContainer extends AbstractComponent + implements SingleComponentContainer { private Component content; @@ -65,7 +65,8 @@ public abstract class AbstractSingleComponentContainer extends /* documented in interface */ @Override - public void removeComponentAttachListener(ComponentAttachListener listener) { + public void removeComponentAttachListener( + ComponentAttachListener listener) { removeListener(ComponentAttachEvent.class, listener, ComponentAttachListener.attachMethod); } @@ -79,7 +80,8 @@ public abstract class AbstractSingleComponentContainer extends /* documented in interface */ @Override - public void removeComponentDetachListener(ComponentDetachListener listener) { + public void removeComponentDetachListener( + ComponentDetachListener listener) { removeListener(ComponentDetachEvent.class, listener, ComponentDetachListener.detachMethod); } @@ -208,8 +210,9 @@ public abstract class AbstractSingleComponentContainer extends dirtyChild = getInvalidSizedChild(false); } else if ((width == SIZE_UNDEFINED && getWidth() != SIZE_UNDEFINED) || (unit == Unit.PERCENTAGE - && getWidthUnits() != Unit.PERCENTAGE && !ComponentSizeValidator - .parentCanDefineWidth(this))) { + && getWidthUnits() != Unit.PERCENTAGE + && !ComponentSizeValidator + .parentCanDefineWidth(this))) { /* * relative width children may get to invalid state if width becomes * invalid. Width may also become invalid if units become percentage @@ -265,8 +268,9 @@ public abstract class AbstractSingleComponentContainer extends dirtyChild = getInvalidSizedChild(true); } else if ((height == SIZE_UNDEFINED && getHeight() != SIZE_UNDEFINED) || (unit == Unit.PERCENTAGE - && getHeightUnits() != Unit.PERCENTAGE && !ComponentSizeValidator - .parentCanDefineHeight(this))) { + && getHeightUnits() != Unit.PERCENTAGE + && !ComponentSizeValidator + .parentCanDefineHeight(this))) { /* * relative height children may get to invalid state if height * becomes invalid. Height may also become invalid if units become @@ -311,11 +315,12 @@ public abstract class AbstractSingleComponentContainer extends * @throws DesignException * if a child element could not be parsed as a Component */ - protected void readDesignChildren(Elements children, DesignContext context) { + protected void readDesignChildren(Elements children, + DesignContext context) { if (children.size() > 1) { - throw new DesignException("The container of type " - + getClass().toString() - + " can have only one child component."); + throw new DesignException( + "The container of type " + getClass().toString() + + " can have only one child component."); } else if (children.size() == 1) { setContent(context.readDesign(children.first())); } diff --git a/server/src/main/java/com/vaadin/ui/AbstractSplitPanel.java b/server/src/main/java/com/vaadin/ui/AbstractSplitPanel.java index 0561996277..c2fd23cf63 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractSplitPanel.java +++ b/server/src/main/java/com/vaadin/ui/AbstractSplitPanel.java @@ -79,8 +79,8 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { * Modifiable and Serializable Iterator for the components, used by * {@link AbstractSplitPanel#getComponentIterator()}. */ - private class ComponentIterator implements Iterator<Component>, - Serializable { + private class ComponentIterator + implements Iterator<Component>, Serializable { int i = 0; @@ -258,7 +258,8 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { /* Documented in superclass */ @Override - public void replaceComponent(Component oldComponent, Component newComponent) { + public void replaceComponent(Component oldComponent, + Component newComponent) { if (oldComponent == getFirstComponent()) { setFirstComponent(newComponent); } else if (oldComponent == getSecondComponent()) { @@ -456,7 +457,8 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { private void setSplitPositionLimits(float minPos, Unit minPosUnit, float maxPos, Unit maxPosUnit) { if ((minPosUnit != Unit.PERCENTAGE && minPosUnit != Unit.PIXELS) - || (maxPosUnit != Unit.PERCENTAGE && maxPosUnit != Unit.PIXELS)) { + || (maxPosUnit != Unit.PERCENTAGE + && maxPosUnit != Unit.PIXELS)) { throw new IllegalArgumentException( "Only percentage and pixel units are allowed"); } @@ -530,7 +532,8 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { * * @since 7.5.0 */ - public interface SplitPositionChangeListener extends ConnectorEventListener { + public interface SplitPositionChangeListener + extends ConnectorEventListener { public static final Method moveMethod = ReflectTools.findMethod( SplitPositionChangeListener.class, "onSplitPositionChanged", @@ -587,8 +590,8 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { } public void removeSplitterClickListener(SplitterClickListener listener) { - removeListener(EventId.CLICK_EVENT_IDENTIFIER, - SplitterClickEvent.class, listener); + removeListener(EventId.CLICK_EVENT_IDENTIFIER, SplitterClickEvent.class, + listener); } /** @@ -640,7 +643,8 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { } private SplitterState getSplitterState(boolean markAsDirty) { - return ((AbstractSplitPanelState) super.getState(markAsDirty)).splitterState; + return ((AbstractSplitPanelState) super.getState( + markAsDirty)).splitterState; } /* @@ -722,15 +726,13 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { + getSplitPositionUnit(); design.attr("split-position", splitPositionString); } - if (getMinSplitPosition() != def.getMinSplitPosition() - || !def.getMinSplitPositionUnit().equals( - getMinSplitPositionUnit())) { + if (getMinSplitPosition() != def.getMinSplitPosition() || !def + .getMinSplitPositionUnit().equals(getMinSplitPositionUnit())) { design.attr("min-split-position", asString(getMinSplitPosition()) + getMinSplitPositionUnit()); } - if (getMaxSplitPosition() != def.getMaxSplitPosition() - || !def.getMaxSplitPositionUnit().equals( - getMaxSplitPositionUnit())) { + if (getMaxSplitPosition() != def.getMaxSplitPosition() || !def + .getMaxSplitPositionUnit().equals(getMaxSplitPositionUnit())) { design.attr("max-split-position", asString(getMaxSplitPosition()) + getMaxSplitPositionUnit()); } diff --git a/server/src/main/java/com/vaadin/ui/Alignment.java b/server/src/main/java/com/vaadin/ui/Alignment.java index 57131494ac..5810c153b8 100644 --- a/server/src/main/java/com/vaadin/ui/Alignment.java +++ b/server/src/main/java/com/vaadin/ui/Alignment.java @@ -26,12 +26,12 @@ import com.vaadin.shared.ui.AlignmentInfo.Bits; @SuppressWarnings("serial") public final class Alignment implements Serializable { - public static final Alignment TOP_RIGHT = new Alignment(Bits.ALIGNMENT_TOP - + Bits.ALIGNMENT_RIGHT); - public static final Alignment TOP_LEFT = new Alignment(Bits.ALIGNMENT_TOP - + Bits.ALIGNMENT_LEFT); - public static final Alignment TOP_CENTER = new Alignment(Bits.ALIGNMENT_TOP - + Bits.ALIGNMENT_HORIZONTAL_CENTER); + public static final Alignment TOP_RIGHT = new Alignment( + Bits.ALIGNMENT_TOP + Bits.ALIGNMENT_RIGHT); + public static final Alignment TOP_LEFT = new Alignment( + Bits.ALIGNMENT_TOP + Bits.ALIGNMENT_LEFT); + public static final Alignment TOP_CENTER = new Alignment( + Bits.ALIGNMENT_TOP + Bits.ALIGNMENT_HORIZONTAL_CENTER); public static final Alignment MIDDLE_RIGHT = new Alignment( Bits.ALIGNMENT_VERTICAL_CENTER + Bits.ALIGNMENT_RIGHT); public static final Alignment MIDDLE_LEFT = new Alignment( @@ -104,7 +104,8 @@ public final class Alignment implements Serializable { * @return true if aligned bottom */ public boolean isMiddle() { - return (bitMask & Bits.ALIGNMENT_VERTICAL_CENTER) == Bits.ALIGNMENT_VERTICAL_CENTER; + return (bitMask + & Bits.ALIGNMENT_VERTICAL_CENTER) == Bits.ALIGNMENT_VERTICAL_CENTER; } /** @@ -114,7 +115,8 @@ public final class Alignment implements Serializable { * @return true if aligned center */ public boolean isCenter() { - return (bitMask & Bits.ALIGNMENT_HORIZONTAL_CENTER) == Bits.ALIGNMENT_HORIZONTAL_CENTER; + return (bitMask + & Bits.ALIGNMENT_HORIZONTAL_CENTER) == Bits.ALIGNMENT_HORIZONTAL_CENTER; } /** diff --git a/server/src/main/java/com/vaadin/ui/Audio.java b/server/src/main/java/com/vaadin/ui/Audio.java index 8b9fad2196..2ba7b447fd 100644 --- a/server/src/main/java/com/vaadin/ui/Audio.java +++ b/server/src/main/java/com/vaadin/ui/Audio.java @@ -33,8 +33,8 @@ import com.vaadin.shared.ui.audio.AudioState; * >Mozilla Developer Network</a>. * * Multiple sources can be specified. Which of the sources is used is selected - * by the browser depending on which file formats it supports. See <a - * href="http://en.wikipedia.org/wiki/HTML5_video#Table">wikipedia</a> for a + * by the browser depending on which file formats it supports. See + * <a href="http://en.wikipedia.org/wiki/HTML5_video#Table">wikipedia</a> for a * table of formats supported by different browsers. * * @author Vaadin Ltd diff --git a/server/src/main/java/com/vaadin/ui/BrowserFrame.java b/server/src/main/java/com/vaadin/ui/BrowserFrame.java index 5717941ac5..8a2e8e6cfa 100644 --- a/server/src/main/java/com/vaadin/ui/BrowserFrame.java +++ b/server/src/main/java/com/vaadin/ui/BrowserFrame.java @@ -23,8 +23,7 @@ import com.vaadin.shared.ui.browserframe.BrowserFrameState; * <code>iframe</code> element. * * @author Vaadin Ltd. - * @version - * @VERSION@ + * @version @VERSION@ * @since 7.0 */ public class BrowserFrame extends AbstractEmbedded { diff --git a/server/src/main/java/com/vaadin/ui/Button.java b/server/src/main/java/com/vaadin/ui/Button.java index 677e8cac7d..1c35cf91a6 100644 --- a/server/src/main/java/com/vaadin/ui/Button.java +++ b/server/src/main/java/com/vaadin/ui/Button.java @@ -44,8 +44,8 @@ import com.vaadin.util.ReflectTools; * @since 3.0 */ @SuppressWarnings("serial") -public class Button extends AbstractFocusable implements - Action.ShortcutNotifier { +public class Button extends AbstractFocusable + implements Action.ShortcutNotifier { private ButtonServerRpc rpc = new ButtonServerRpc() { @@ -576,8 +576,8 @@ public class Button extends AbstractFocusable implements Attributes attr = design.attributes(); String content; // plain-text (default is html) - Boolean plain = DesignAttributeHandler.readAttribute( - DESIGN_ATTR_PLAIN_TEXT, attr, Boolean.class); + Boolean plain = DesignAttributeHandler + .readAttribute(DESIGN_ATTR_PLAIN_TEXT, attr, Boolean.class); if (plain == null || !plain) { setHtmlContentAllowed(true); content = design.html(); @@ -588,13 +588,13 @@ public class Button extends AbstractFocusable implements } setCaption(content); if (attr.hasKey("icon-alt")) { - setIconAlternateText(DesignAttributeHandler.readAttribute( - "icon-alt", attr, String.class)); + setIconAlternateText(DesignAttributeHandler + .readAttribute("icon-alt", attr, String.class)); } // click-shortcut removeClickShortcut(); - ShortcutAction action = DesignAttributeHandler.readAttribute( - "click-shortcut", attr, ShortcutAction.class); + ShortcutAction action = DesignAttributeHandler + .readAttribute("click-shortcut", attr, ShortcutAction.class); if (action != null) { setClickShortcut(action.getKeyCode(), action.getModifiers()); } diff --git a/server/src/main/java/com/vaadin/ui/Calendar.java b/server/src/main/java/com/vaadin/ui/Calendar.java index 028a094cb5..41f99049dc 100644 --- a/server/src/main/java/com/vaadin/ui/Calendar.java +++ b/server/src/main/java/com/vaadin/ui/Calendar.java @@ -116,8 +116,8 @@ import com.vaadin.ui.declarative.DesignContext; * @author Vaadin Ltd. */ @SuppressWarnings("serial") -public class Calendar extends AbstractComponent implements - CalendarComponentEvents.NavigationNotifier, +public class Calendar extends AbstractComponent + implements CalendarComponentEvents.NavigationNotifier, CalendarComponentEvents.EventMoveNotifier, CalendarComponentEvents.RangeSelectNotifier, CalendarComponentEvents.EventResizeNotifier, @@ -436,11 +436,12 @@ public class Calendar extends AbstractComponent implements } private void setupCalendarEvents() { - int durationInDays = (int) (((endDate.getTime()) - startDate.getTime()) / DateConstants.DAYINMILLIS); + int durationInDays = (int) (((endDate.getTime()) - startDate.getTime()) + / DateConstants.DAYINMILLIS); durationInDays++; if (durationInDays > 60) { - throw new RuntimeException("Daterange is too big (max 60) = " - + durationInDays); + throw new RuntimeException( + "Daterange is too big (max 60) = " + durationInDays); } Date firstDateToShow = expandStartDate(startDate, durationInDays > 7); @@ -460,10 +461,10 @@ public class Calendar extends AbstractComponent implements event.dateTo = df_date.format(e.getEnd()); event.timeFrom = df_time.format(e.getStart()); event.timeTo = df_time.format(e.getEnd()); - event.description = e.getDescription() == null ? "" : e - .getDescription(); - event.styleName = e.getStyleName() == null ? "" : e - .getStyleName(); + event.description = e.getDescription() == null ? "" + : e.getDescription(); + event.styleName = e.getStyleName() == null ? "" + : e.getStyleName(); event.allDay = e.isAllDay(); calendarStateEvents.add(event); } @@ -498,11 +499,12 @@ public class Calendar extends AbstractComponent implements endDate = getEndDate(); } - int durationInDays = (int) (((endDate.getTime()) - startDate.getTime()) / DateConstants.DAYINMILLIS); + int durationInDays = (int) (((endDate.getTime()) - startDate.getTime()) + / DateConstants.DAYINMILLIS); durationInDays++; if (durationInDays > 60) { - throw new RuntimeException("Daterange is too big (max 60) = " - + durationInDays); + throw new RuntimeException( + "Daterange is too big (max 60) = " + durationInDays); } state.dayNames = getDayNamesShort(); @@ -551,8 +553,8 @@ public class Calendar extends AbstractComponent implements for (Action.Handler actionHandler : actionHandlers) { // Create calendar which omits time - GregorianCalendar cal = new GregorianCalendar( - getTimeZone(), getLocale()); + GregorianCalendar cal = new GregorianCalendar(getTimeZone(), + getLocale()); cal.clear(); cal.set(currentCalendar.get(java.util.Calendar.YEAR), currentCalendar.get(java.util.Calendar.MONTH), @@ -604,8 +606,8 @@ public class Calendar extends AbstractComponent implements } private void setActionsForEachHalfHour( - Map<CalendarDateRange, Set<Action>> actionMap, Date start, - Date end, Action.Handler actionHandler) { + Map<CalendarDateRange, Set<Action>> actionMap, Date start, Date end, + Action.Handler actionHandler) { GregorianCalendar cal = new GregorianCalendar(getTimeZone(), getLocale()); cal.setTime(start); @@ -613,7 +615,8 @@ public class Calendar extends AbstractComponent implements Date s = cal.getTime(); cal.add(java.util.Calendar.MINUTE, 30); Date e = cal.getTime(); - CalendarDateRange range = new CalendarDateRange(s, e, getTimeZone()); + CalendarDateRange range = new CalendarDateRange(s, e, + getTimeZone()); Action[] actions = actionHandler.getActions(range, this); if (actions != null) { Set<Action> actionSet = new LinkedHashSet<Action>( @@ -623,9 +626,8 @@ public class Calendar extends AbstractComponent implements } } - private void setActionsForDay( - Map<CalendarDateRange, Set<Action>> actionMap, Date start, - Date end, Action.Handler actionHandler) { + private void setActionsForDay(Map<CalendarDateRange, Set<Action>> actionMap, + Date start, Date end, Action.Handler actionHandler) { CalendarDateRange range = new CalendarDateRange(start, end, getTimeZone()); Action[] actions = actionHandler.getActions(range, this); @@ -648,7 +650,8 @@ public class Calendar extends AbstractComponent implements DateConstants.ACTION_DATE_FORMAT_PATTERN); formatter.setTimeZone(getTimeZone()); - for (Entry<CalendarDateRange, Set<Action>> entry : actionMap.entrySet()) { + for (Entry<CalendarDateRange, Set<Action>> entry : actionMap + .entrySet()) { CalendarDateRange range = entry.getKey(); Set<Action> actions = entry.getValue(); for (Action action : actions) { @@ -680,8 +683,8 @@ public class Calendar extends AbstractComponent implements f = (SimpleDateFormat) SimpleDateFormat .getTimeInstance(SimpleDateFormat.SHORT); } else { - f = (SimpleDateFormat) SimpleDateFormat.getTimeInstance( - SimpleDateFormat.SHORT, getLocale()); + f = (SimpleDateFormat) SimpleDateFormat + .getTimeInstance(SimpleDateFormat.SHORT, getLocale()); } String p = f.toPattern(); if (p.indexOf("HH") != -1 || p.indexOf("H") != -1) { @@ -693,8 +696,8 @@ public class Calendar extends AbstractComponent implements } /** - * Example: <code>setTimeFormat(TimeFormat.Format12H);</code></br> Set to - * null, if you want the format being defined by the locale. + * Example: <code>setTimeFormat(TimeFormat.Format12H);</code></br> + * Set to null, if you want the format being defined by the locale. * * @param format * Set 12h or 24h format. Default is defined by the locale. @@ -898,8 +901,8 @@ public class Calendar extends AbstractComponent implements */ public void setWeeklyCaptionFormat(String dateFormatPattern) { if ((weeklyCaptionFormat == null && dateFormatPattern != null) - || (weeklyCaptionFormat != null && !weeklyCaptionFormat - .equals(dateFormatPattern))) { + || (weeklyCaptionFormat != null + && !weeklyCaptionFormat.equals(dateFormatPattern))) { weeklyCaptionFormat = dateFormatPattern; markAsDirty(); } @@ -1527,13 +1530,15 @@ public class Calendar extends AbstractComponent implements */ public void setContainerDataSource(Container.Indexed container) { ContainerEventProvider provider = new ContainerEventProvider(container); - provider.addEventSetChangeListener(new CalendarEventProvider.EventSetChangeListener() { - @Override - public void eventSetChange(EventSetChangeEvent changeEvent) { - // Repaint if events change - markAsDirty(); - } - }); + provider.addEventSetChangeListener( + new CalendarEventProvider.EventSetChangeListener() { + @Override + public void eventSetChange( + EventSetChangeEvent changeEvent) { + // Repaint if events change + markAsDirty(); + } + }); provider.addEventChangeListener(new EventChangeListener() { @Override public void eventChange(EventChangeEvent changeEvent) { @@ -1577,13 +1582,15 @@ public class Calendar extends AbstractComponent implements provider.setStartDateProperty(startDateProperty); provider.setEndDateProperty(endDateProperty); provider.setStyleNameProperty(styleNameProperty); - provider.addEventSetChangeListener(new CalendarEventProvider.EventSetChangeListener() { - @Override - public void eventSetChange(EventSetChangeEvent changeEvent) { - // Repaint if events change - markAsDirty(); - } - }); + provider.addEventSetChangeListener( + new CalendarEventProvider.EventSetChangeListener() { + @Override + public void eventSetChange( + EventSetChangeEvent changeEvent) { + // Repaint if events change + markAsDirty(); + } + }); provider.addEventChangeListener(new EventChangeListener() { @Override public void eventChange(EventChangeEvent changeEvent) { @@ -1955,8 +1962,8 @@ public class Calendar extends AbstractComponent implements Attributes attr = design.attributes(); if (design.hasAttr("time-format")) { - setTimeFormat(TimeFormat.valueOf("Format" - + design.attr("time-format").toUpperCase())); + setTimeFormat(TimeFormat.valueOf( + "Format" + design.attr("time-format").toUpperCase())); } if (design.hasAttr("start-date")) { @@ -1975,7 +1982,8 @@ public class Calendar extends AbstractComponent implements if (currentTimeFormat != null) { design.attr("time-format", - (currentTimeFormat == TimeFormat.Format12H ? "12h" : "24h")); + (currentTimeFormat == TimeFormat.Format12H ? "12h" + : "24h")); } if (startDate != null) { design.attr("start-date", df_date.format(getStartDate())); @@ -2009,12 +2017,11 @@ public class Calendar extends AbstractComponent implements public void setFirstDayOfWeek(Integer dayOfWeek) { int minimalSupported = java.util.Calendar.SUNDAY; int maximalSupported = java.util.Calendar.SATURDAY; - if (dayOfWeek != null - && (dayOfWeek < minimalSupported || dayOfWeek > maximalSupported)) { - throw new IllegalArgumentException( - String.format( - "Day of week must be between %s and %s. Actually received: %s", - minimalSupported, maximalSupported, dayOfWeek)); + if (dayOfWeek != null && (dayOfWeek < minimalSupported + || dayOfWeek > maximalSupported)) { + throw new IllegalArgumentException(String.format( + "Day of week must be between %s and %s. Actually received: %s", + minimalSupported, maximalSupported, dayOfWeek)); } customFirstDayOfWeek = dayOfWeek; markAsDirty(); diff --git a/server/src/main/java/com/vaadin/ui/CheckBox.java b/server/src/main/java/com/vaadin/ui/CheckBox.java index 1519c64955..b04eb4b063 100644 --- a/server/src/main/java/com/vaadin/ui/CheckBox.java +++ b/server/src/main/java/com/vaadin/ui/CheckBox.java @@ -65,7 +65,8 @@ public class CheckBox extends AbstractField<Boolean> { } }; - FocusAndBlurServerRpcImpl focusBlurRpc = new FocusAndBlurServerRpcImpl(this) { + FocusAndBlurServerRpcImpl focusBlurRpc = new FocusAndBlurServerRpcImpl( + this) { @Override protected void fireEvent(Event event) { CheckBox.this.fireEvent(event); @@ -123,7 +124,8 @@ public class CheckBox extends AbstractField<Boolean> { @Override public void setValue(Boolean value) { if (value == null) { - throw new IllegalArgumentException("CheckBox value must not be null"); + throw new IllegalArgumentException( + "CheckBox value must not be null"); } super.setValue(value); } @@ -171,9 +173,8 @@ public class CheckBox extends AbstractField<Boolean> { public void readDesign(Element design, DesignContext designContext) { super.readDesign(design, designContext); if (design.hasAttr("checked")) { - this.setValue( - DesignAttributeHandler.readAttribute("checked", - design.attributes(), Boolean.class), false); + this.setValue(DesignAttributeHandler.readAttribute("checked", + design.attributes(), Boolean.class), false); } } diff --git a/server/src/main/java/com/vaadin/ui/Component.java b/server/src/main/java/com/vaadin/ui/Component.java index 9bfd823fc4..4c32973389 100644 --- a/server/src/main/java/com/vaadin/ui/Component.java +++ b/server/src/main/java/com/vaadin/ui/Component.java @@ -881,9 +881,9 @@ public interface Component extends ClientConnector, Sizeable, Serializable { * getWindow().showNotification("Click!"); * * // Display source component and event class names - * status.setValue("Event from " + event.getSource().getClass() - * .getName() - * + ": " + event.getClass().getName()); + * status.setValue( + * "Event from " + event.getSource().getClass().getName() + * + ": " + event.getClass().getName()); * } * } * @@ -907,14 +907,14 @@ public interface Component extends ClientConnector, Sizeable, Serializable { * <pre> * public void componentEvent(Event event) { * // Act according to the source of the event - * if (event.getSource() == ok && event - * .getClass() == Button.ClickEvent.class) + * if (event.getSource() == ok + * && event.getClass() == Button.ClickEvent.class) * getWindow().showNotification("Click!"); * * // Display source component and event class names - * status.setValue("Event from " + event.getSource().getClass() - * .getName() - * + ": " + event.getClass().getName()); + * status.setValue( + * "Event from " + event.getSource().getClass().getName() + ": " + * + event.getClass().getName()); * } * </pre> * @@ -961,9 +961,9 @@ public interface Component extends ClientConnector, Sizeable, Serializable { * if (event.getSource() == ok) * getWindow().showNotification("Click!"); * - * status.setValue("Event from " + event.getSource().getClass() - * .getName() - * + ": " + event.getClass().getName()); + * status.setValue( + * "Event from " + event.getSource().getClass().getName() + * + ": " + event.getClass().getName()); * } * } * diff --git a/server/src/main/java/com/vaadin/ui/ComponentContainer.java b/server/src/main/java/com/vaadin/ui/ComponentContainer.java index 2d5b4ffa9a..ce8cb891e1 100644 --- a/server/src/main/java/com/vaadin/ui/ComponentContainer.java +++ b/server/src/main/java/com/vaadin/ui/ComponentContainer.java @@ -28,8 +28,8 @@ import com.vaadin.ui.HasComponents.ComponentAttachDetachNotifier; * @author Vaadin Ltd. * @since 3.0 */ -public interface ComponentContainer extends HasComponents, - ComponentAttachDetachNotifier { +public interface ComponentContainer + extends HasComponents, ComponentAttachDetachNotifier { /** * Adds the component into this container. @@ -78,7 +78,8 @@ public interface ComponentContainer extends HasComponents, * @param newComponent * the new component to be replaced. */ - public void replaceComponent(Component oldComponent, Component newComponent); + public void replaceComponent(Component oldComponent, + Component newComponent); /** * Gets an iterator to the collection of contained components. Using this diff --git a/server/src/main/java/com/vaadin/ui/ConnectorTracker.java b/server/src/main/java/com/vaadin/ui/ConnectorTracker.java index 159bd09c0d..3cf03a134d 100644 --- a/server/src/main/java/com/vaadin/ui/ConnectorTracker.java +++ b/server/src/main/java/com/vaadin/ui/ConnectorTracker.java @@ -140,9 +140,7 @@ public class ConnectorTracker implements Serializable { connectorIdToConnector.put(connectorId, connector); uninitializedConnectors.add(connector); if (getLogger().isLoggable(Level.FINE)) { - getLogger().log( - Level.FINE, - "Registered {0} ({1})", + getLogger().log(Level.FINE, "Registered {0} ({1})", new Object[] { connector.getClass().getSimpleName(), connectorId }); } @@ -150,12 +148,10 @@ public class ConnectorTracker implements Serializable { throw new RuntimeException("A connector with id " + connectorId + " is already registered!"); } else if (!wasUnregistered) { - getLogger() - .log(Level.WARNING, - "An already registered connector was registered again: {0} ({1})", - new Object[] { - connector.getClass().getSimpleName(), - connectorId }); + getLogger().log(Level.WARNING, + "An already registered connector was registered again: {0} ({1})", + new Object[] { connector.getClass().getSimpleName(), + connectorId }); } dirtyConnectors.add(connector); } @@ -174,8 +170,7 @@ public class ConnectorTracker implements Serializable { public void unregisterConnector(ClientConnector connector) { String connectorId = connector.getConnectorId(); if (!connectorIdToConnector.containsKey(connectorId)) { - getLogger().log( - Level.WARNING, + getLogger().log(Level.WARNING, "Tried to unregister {0} ({1}) which is not registered", new Object[] { connector.getClass().getSimpleName(), connectorId }); @@ -199,15 +194,12 @@ public class ConnectorTracker implements Serializable { dirtyConnectors.remove(connector); if (unregisteredConnectors.add(connector)) { if (getLogger().isLoggable(Level.FINE)) { - getLogger().log( - Level.FINE, - "Unregistered {0} ({1})", + getLogger().log(Level.FINE, "Unregistered {0} ({1})", new Object[] { connector.getClass().getSimpleName(), connectorId }); } } else { - getLogger().log( - Level.WARNING, + getLogger().log(Level.WARNING, "Unregistered {0} ({1}) that was already unregistered.", new Object[] { connector.getClass().getSimpleName(), connectorId }); @@ -226,7 +218,8 @@ public class ConnectorTracker implements Serializable { * already know anything about the connector. */ public boolean isClientSideInitialized(ClientConnector connector) { - assert connectorIdToConnector.get(connector.getConnectorId()) == connector : "Connector should be registered with this ConnectorTracker"; + assert connectorIdToConnector.get(connector + .getConnectorId()) == connector : "Connector should be registered with this ConnectorTracker"; return !uninitializedConnectors.contains(connector); } @@ -313,10 +306,9 @@ public class ConnectorTracker implements Serializable { // This code should never be called as cleanup should take place // in detach() - getLogger() - .log(Level.WARNING, - "cleanConnectorMap unregistered connector {0}. This should have been done when the connector was detached.", - getConnectorAndParentInfo(connector)); + getLogger().log(Level.WARNING, + "cleanConnectorMap unregistered connector {0}. This should have been done when the connector was detached.", + getConnectorAndParentInfo(connector)); if (globalResourceHandler != null) { globalResourceHandler.unregisterConnector(connector); @@ -331,16 +323,13 @@ public class ConnectorTracker implements Serializable { diffStates.remove(connector); assert isRemovalSentToClient(connector) : "Connector " - + connector - + " (id = " - + connector.getConnectorId() + + connector + " (id = " + connector.getConnectorId() + ") is no longer visible to the client, but no corresponding hierarchy change is being sent."; if (getLogger().isLoggable(Level.FINE)) { - getLogger() - .log(Level.FINE, - "cleanConnectorMap removed state for {0} as it is not visible", - getConnectorAndParentInfo(connector)); + getLogger().log(Level.FINE, + "cleanConnectorMap removed state for {0} as it is not visible", + getConnectorAndParentInfo(connector)); } } } @@ -361,7 +350,8 @@ public class ConnectorTracker implements Serializable { if (hierarchyInfoObj instanceof JsonObject) { JsonObject hierachyInfo = (JsonObject) hierarchyInfoObj; - ClientConnector firstVisibleParent = findFirstVisibleParent(connector); + ClientConnector firstVisibleParent = findFirstVisibleParent( + connector); if (firstVisibleParent == null) { // Connector is detached, not our business return true; @@ -385,22 +375,20 @@ public class ConnectorTracker implements Serializable { .getAttribute(attributeName); if (stateUpdateConnectorsObj instanceof Set<?>) { Set<?> stateUpdateConnectors = (Set<?>) stateUpdateConnectorsObj; - if (!stateUpdateConnectors.contains(firstVisibleParent - .getConnectorId())) { + if (!stateUpdateConnectors + .contains(firstVisibleParent.getConnectorId())) { // Not the optimization case if the parent is not marked // as dirty return false; } } else { - getLogger().warning( - "Request attribute " + attributeName - + " is not a Set"); + getLogger().warning("Request attribute " + attributeName + + " is not a Set"); } } } else { - getLogger().warning( - "Request attribute " + attributeName - + " is not a JsonObject"); + getLogger().warning("Request attribute " + attributeName + + " is not a JsonObject"); } return true; @@ -466,25 +454,21 @@ public class ConnectorTracker implements Serializable { if (!connector.equals(child.getParent())) { noErrors = false; - getLogger() - .log(Level.WARNING, - "{0} claims that {1} is its child, but the child claims {2} is its parent.", - new Object[] { - getConnectorString(connector), - getConnectorString(child), - getConnectorString(child - .getParent()) }); + getLogger().log(Level.WARNING, + "{0} claims that {1} is its child, but the child claims {2} is its parent.", + new Object[] { getConnectorString(connector), + getConnectorString(child), + getConnectorString(child.getParent()) }); } } } for (ClientConnector dangling : danglingConnectors) { noErrors = false; - getLogger() - .log(Level.WARNING, - "{0} claims that {1} is its parent, but the parent does not acknowledge the parenthood.", - new Object[] { getConnectorString(dangling), - getConnectorString(dangling.getParent()) }); + getLogger().log(Level.WARNING, + "{0} claims that {1} is its parent, but the parent does not acknowledge the parenthood.", + new Object[] { getConnectorString(dangling), + getConnectorString(dangling.getParent()) }); } return noErrors; @@ -717,7 +701,8 @@ public class ConnectorTracker implements Serializable { } /* Special serialization to JsonObjects which are not serializable */ - private void writeObject(java.io.ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) + throws IOException { out.defaultWriteObject(); // Convert JsonObjects in diff state to String representation as // JsonObject is not serializable @@ -730,8 +715,8 @@ public class ConnectorTracker implements Serializable { } /* Special serialization to JsonObjects which are not serializable */ - private void readObject(java.io.ObjectInputStream in) throws IOException, - ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) + throws IOException, ClassNotFoundException { in.defaultReadObject(); // Read String versions of JsonObjects and parse into JsonObjects as @@ -930,11 +915,11 @@ public class ConnectorTracker implements Serializable { * Maintains the bookkeeping connector removal and concurrency by removing * entries that have become too old. * <p> - * <em>It is important to run this call for each transmission from the client</em> - * , otherwise the bookkeeping gets out of date and the results form - * {@link #connectorWasPresentAsRequestWasSent(String, long)} will become - * invalid (that is, even though the client knew the component was removed, - * the aforementioned method would start claiming otherwise). + * <em>It is important to run this call for each transmission from the + * client</em> , otherwise the bookkeeping gets out of date and the results + * form {@link #connectorWasPresentAsRequestWasSent(String, long)} will + * become invalid (that is, even though the client knew the component was + * removed, the aforementioned method would start claiming otherwise). * <p> * Entries that both client and server agree upon are removed. Since * argument is the last sync id that the client has seen from the server, we @@ -949,7 +934,8 @@ public class ConnectorTracker implements Serializable { * the sync id the client has most recently received from the * server. */ - public void cleanConcurrentlyRemovedConnectorIds(int lastSyncIdSeenByClient) { + public void cleanConcurrentlyRemovedConnectorIds( + int lastSyncIdSeenByClient) { if (lastSyncIdSeenByClient == -1) { // Sync id checking is not in use, so we should just clear the // entire map to avoid leaking memory diff --git a/server/src/main/java/com/vaadin/ui/CssLayout.java b/server/src/main/java/com/vaadin/ui/CssLayout.java index dbedfa53ff..38ce0ba458 100644 --- a/server/src/main/java/com/vaadin/ui/CssLayout.java +++ b/server/src/main/java/com/vaadin/ui/CssLayout.java @@ -78,8 +78,8 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier { @Override public void layoutClick(MouseEventDetails mouseDetails, Connector clickedConnector) { - fireEvent(LayoutClickEvent.createEvent(CssLayout.this, - mouseDetails, clickedConnector)); + fireEvent(LayoutClickEvent.createEvent(CssLayout.this, mouseDetails, + clickedConnector)); } }; /** @@ -259,13 +259,15 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier { /* Documented in superclass */ @Override - public void replaceComponent(Component oldComponent, Component newComponent) { + public void replaceComponent(Component oldComponent, + Component newComponent) { // Gets the locations int oldLocation = -1; int newLocation = -1; int location = 0; - for (final Iterator<Component> i = components.iterator(); i.hasNext();) { + for (final Iterator<Component> i = components.iterator(); i + .hasNext();) { final Component component = i.next(); if (component == oldComponent) { diff --git a/server/src/main/java/com/vaadin/ui/CustomComponent.java b/server/src/main/java/com/vaadin/ui/CustomComponent.java index 55f9d7db03..9ecee07eaa 100644 --- a/server/src/main/java/com/vaadin/ui/CustomComponent.java +++ b/server/src/main/java/com/vaadin/ui/CustomComponent.java @@ -53,7 +53,8 @@ import java.util.Iterator; * @since 3.0 */ @SuppressWarnings("serial") -public class CustomComponent extends AbstractComponent implements HasComponents { +public class CustomComponent extends AbstractComponent + implements HasComponents { /** * The root component implementing the custom component. diff --git a/server/src/main/java/com/vaadin/ui/CustomField.java b/server/src/main/java/com/vaadin/ui/CustomField.java index 311a2069a3..69160db5e2 100644 --- a/server/src/main/java/com/vaadin/ui/CustomField.java +++ b/server/src/main/java/com/vaadin/ui/CustomField.java @@ -24,9 +24,10 @@ import com.vaadin.legacy.ui.LegacyField; import com.vaadin.legacy.ui.LegacyAbstractField; /** - * A {@link LegacyField} whose UI content can be constructed by the user, enabling the - * creation of e.g. form fields by composing Vaadin components. Customization of - * both the visual presentation and the logic of the field is possible. + * A {@link LegacyField} whose UI content can be constructed by the user, + * enabling the creation of e.g. form fields by composing Vaadin components. + * Customization of both the visual presentation and the logic of the field is + * possible. * * Subclasses must implement {@link #getType()} and {@link #initContent()}. * @@ -45,8 +46,8 @@ import com.vaadin.legacy.ui.LegacyAbstractField; * * @since 7.0 */ -public abstract class CustomField<T> extends LegacyAbstractField<T> implements - HasComponents { +public abstract class CustomField<T> extends LegacyAbstractField<T> + implements HasComponents { /** * The root component implementing the custom component. @@ -127,8 +128,8 @@ public abstract class CustomField<T> extends LegacyAbstractField<T> implements // ComponentContainer methods - private class ComponentIterator implements Iterator<Component>, - Serializable { + private class ComponentIterator + implements Iterator<Component>, Serializable { boolean first = (root != null); @Override diff --git a/server/src/main/java/com/vaadin/ui/CustomLayout.java b/server/src/main/java/com/vaadin/ui/CustomLayout.java index d64f70e95e..2de64865e4 100644 --- a/server/src/main/java/com/vaadin/ui/CustomLayout.java +++ b/server/src/main/java/com/vaadin/ui/CustomLayout.java @@ -108,8 +108,8 @@ public class CustomLayout extends AbstractLayout implements LegacyComponent { protected void initTemplateContentsFromInputStream( InputStream templateStream) throws IOException { - BufferedReader reader = new BufferedReader(new InputStreamReader( - templateStream, "UTF-8")); + BufferedReader reader = new BufferedReader( + new InputStreamReader(templateStream, "UTF-8")); StringBuilder builder = new StringBuilder(BUFFER_SIZE); try { char[] cbuf = new char[BUFFER_SIZE]; @@ -230,12 +230,14 @@ public class CustomLayout extends AbstractLayout implements LegacyComponent { /* Documented in superclass */ @Override - public void replaceComponent(Component oldComponent, Component newComponent) { + public void replaceComponent(Component oldComponent, + Component newComponent) { // Gets the locations String oldLocation = null; String newLocation = null; - for (final Iterator<String> i = slots.keySet().iterator(); i.hasNext();) { + for (final Iterator<String> i = slots.keySet().iterator(); i + .hasNext();) { final String location = i.next(); final Component component = slots.get(location); if (component == oldComponent) { diff --git a/server/src/main/java/com/vaadin/ui/DefaultFieldFactory.java b/server/src/main/java/com/vaadin/ui/DefaultFieldFactory.java index 9078c6095e..82e4753433 100644 --- a/server/src/main/java/com/vaadin/ui/DefaultFieldFactory.java +++ b/server/src/main/java/com/vaadin/ui/DefaultFieldFactory.java @@ -77,8 +77,8 @@ public class DefaultFieldFactory implements TableFieldFactory { /** * Creates fields based on the property type. * <p> - * The default field type is {@link LegacyTextField}. Other field types generated - * by this method: + * The default field type is {@link LegacyTextField}. Other field types + * generated by this method: * <p> * <b>Boolean</b>: {@link CheckBox}.<br/> * <b>Date</b>: {@link LegacyDateField}(resolution: day).<br/> diff --git a/server/src/main/java/com/vaadin/ui/DragAndDropWrapper.java b/server/src/main/java/com/vaadin/ui/DragAndDropWrapper.java index 29179ddca7..77a827985f 100644 --- a/server/src/main/java/com/vaadin/ui/DragAndDropWrapper.java +++ b/server/src/main/java/com/vaadin/ui/DragAndDropWrapper.java @@ -44,8 +44,8 @@ import com.vaadin.shared.ui.draganddropwrapper.DragAndDropWrapperServerRpc; import com.vaadin.ui.declarative.DesignContext; @SuppressWarnings("serial") -public class DragAndDropWrapper extends CustomComponent implements DropTarget, - DragSource, LegacyComponent { +public class DragAndDropWrapper extends CustomComponent + implements DropTarget, DragSource, LegacyComponent { public class WrapperTransferable extends TransferableImpl { @@ -318,7 +318,8 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget, } @Override - public Transferable getTransferable(final Map<String, Object> rawVariables) { + public Transferable getTransferable( + final Map<String, Object> rawVariables) { return new WrapperTransferable(this, rawVariables); } @@ -379,16 +380,16 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget, @Override public void onProgress(StreamingProgressEvent event) { - file.getStreamVariable().onProgress( - new ReceivingEventWrapper(event)); + file.getStreamVariable() + .onProgress(new ReceivingEventWrapper(event)); } @Override public void streamingStarted(StreamingStartEvent event) { listenProgressOfUploadedFile = file.getStreamVariable() != null; if (listenProgressOfUploadedFile) { - file.getStreamVariable().streamingStarted( - new ReceivingEventWrapper(event)); + file.getStreamVariable() + .streamingStarted(new ReceivingEventWrapper(event)); } // no need tell to the client about this receiver on next paint receivers.remove(id); @@ -401,16 +402,16 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget, @Override public void streamingFinished(StreamingEndEvent event) { if (listenProgressOfUploadedFile) { - file.getStreamVariable().streamingFinished( - new ReceivingEventWrapper(event)); + file.getStreamVariable() + .streamingFinished(new ReceivingEventWrapper(event)); } } @Override public void streamingFailed(final StreamingErrorEvent event) { if (listenProgressOfUploadedFile) { - file.getStreamVariable().streamingFailed( - new ReceivingEventWrapper(event)); + file.getStreamVariable() + .streamingFailed(new ReceivingEventWrapper(event)); } } diff --git a/server/src/main/java/com/vaadin/ui/Flash.java b/server/src/main/java/com/vaadin/ui/Flash.java index 6e99d2fe35..e5aa2a4d0c 100644 --- a/server/src/main/java/com/vaadin/ui/Flash.java +++ b/server/src/main/java/com/vaadin/ui/Flash.java @@ -30,8 +30,7 @@ import com.vaadin.ui.declarative.DesignContext; * A component for displaying Adobe® Flash® content. * * @author Vaadin Ltd. - * @version - * @VERSION@ + * @version @VERSION@ * @since 7.0 */ @SuppressWarnings("serial") @@ -87,8 +86,8 @@ public class Flash extends AbstractEmbedded { * The base path */ public void setCodebase(String codebase) { - if (codebase != getState().codebase - || (codebase != null && !codebase.equals(getState().codebase))) { + if (codebase != getState().codebase || (codebase != null + && !codebase.equals(getState().codebase))) { getState().codebase = codebase; requestRepaint(); } @@ -116,8 +115,8 @@ public class Flash extends AbstractEmbedded { * the codetype to set. */ public void setCodetype(String codetype) { - if (codetype != getState().codetype - || (codetype != null && !codetype.equals(getState().codetype))) { + if (codetype != getState().codetype || (codetype != null + && !codetype.equals(getState().codetype))) { getState().codetype = codetype; requestRepaint(); } @@ -216,8 +215,8 @@ public class Flash extends AbstractEmbedded { * @return the Value of parameter or null if not found. */ public String getParameter(String name) { - return getState(false).embedParams != null ? getState(false).embedParams - .get(name) : null; + return getState(false).embedParams != null + ? getState(false).embedParams.get(name) : null; } /** @@ -246,8 +245,8 @@ public class Flash extends AbstractEmbedded { Collections.sort(paramNames); for (String param : paramNames) { - design.appendElement("parameter").attr("name", param) - .attr("value", getParameter(param)); + design.appendElement("parameter").attr("name", param).attr("value", + getParameter(param)); } } diff --git a/server/src/main/java/com/vaadin/ui/Grid.java b/server/src/main/java/com/vaadin/ui/Grid.java index c9887c1db3..67be288d73 100644 --- a/server/src/main/java/com/vaadin/ui/Grid.java +++ b/server/src/main/java/com/vaadin/ui/Grid.java @@ -134,9 +134,9 @@ import elemental.json.JsonValue; * <p> * Each column has its own {@link Renderer} that displays data into something * that can be displayed in the browser. That data is first converted with a - * {@link com.vaadin.legacy.data.util.converter.LegacyConverter Converter} into something - * that the Renderer can process. This can also be an implicit step - if a - * column has a simple data type, like a String, no explicit assignment is + * {@link com.vaadin.legacy.data.util.converter.LegacyConverter Converter} into + * something that the Renderer can process. This can also be an implicit step - + * if a column has a simple data type, like a String, no explicit assignment is * needed. * <p> * Usually a renderer takes some kind of object, and converts it into a @@ -306,8 +306,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, * * @since 7.6.1 */ - public final static class DetailComponentManager extends - AbstractGridExtension implements DataGenerator { + public final static class DetailComponentManager + extends AbstractGridExtension implements DataGenerator { /** * The user-defined details generator. @@ -375,10 +375,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, if (details != null) { if (details.getParent() != null) { String name = detailsGenerator.getClass().getName(); - throw new IllegalStateException(name - + " generated a details component that already " - + "was attached. (itemId: " + itemId - + ", component: " + details + ")"); + throw new IllegalStateException( + name + " generated a details component that already " + + "was attached. (itemId: " + itemId + + ", component: " + details + ")"); } itemIdToDetailsComponent.put(itemId, details); @@ -462,10 +462,9 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, Component detailsComponent = itemIdToDetailsComponent .get(itemId); - rowData.put( - GridState.JSONKEY_DETAILS_VISIBLE, - (detailsComponent != null ? detailsComponent - .getConnectorId() : "")); + rowData.put(GridState.JSONKEY_DETAILS_VISIBLE, + (detailsComponent != null + ? detailsComponent.getConnectorId() : "")); } } @@ -543,8 +542,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, @Override protected <T extends LegacyField> T build(String caption, - Class<?> dataType, - Class<T> fieldType) throws BindException { + Class<?> dataType, Class<T> fieldType) throws BindException { T field = super.build(caption, dataType, fieldType); if (field instanceof LegacyCheckBox) { field.setCaption(null); @@ -559,8 +557,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, * Aims to fields of suitable type and with suitable size for use in the * editor row. */ - public static class EditorFieldFactory extends - DefaultFieldGroupFieldFactory { + public static class EditorFieldFactory + extends DefaultFieldGroupFieldFactory { private static final EditorFieldFactory INSTANCE = new EditorFieldFactory(); protected EditorFieldFactory() { @@ -887,12 +885,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, */ public interface EditorListener extends Serializable { - public static final Method EDITOR_OPEN_METHOD = ReflectTools - .findMethod(EditorListener.class, "editorOpened", - EditorOpenEvent.class); - public static final Method EDITOR_MOVE_METHOD = ReflectTools - .findMethod(EditorListener.class, "editorMoved", - EditorMoveEvent.class); + public static final Method EDITOR_OPEN_METHOD = ReflectTools.findMethod( + EditorListener.class, "editorOpened", EditorOpenEvent.class); + public static final Method EDITOR_MOVE_METHOD = ReflectTools.findMethod( + EditorListener.class, "editorMoved", EditorMoveEvent.class); public static final Method EDITOR_CLOSE_METHOD = ReflectTools .findMethod(EditorListener.class, "editorClosed", EditorCloseEvent.class); @@ -1277,8 +1273,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, * if given itemId does not exist in the container of * Grid */ - boolean select(Object itemId) throws IllegalStateException, - IllegalArgumentException; + boolean select(Object itemId) + throws IllegalStateException, IllegalArgumentException; /** * Gets the item id of the currently selected item. @@ -1412,8 +1408,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, * the complete {@link Collection} of the itemIds that are * selected <em>after</em> this event happened */ - protected void fireSelectionEvent( - final Collection<Object> oldSelection, + protected void fireSelectionEvent(final Collection<Object> oldSelection, final Collection<Object> newSelection) { getParentGrid().fireSelectionEvent(oldSelection, newSelection); } @@ -1653,8 +1648,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, final boolean selectionWillChange = !selection.containsAll(itemIds) && selection.size() < selectionLimit; if (selectionWillChange) { - final HashSet<Object> oldSelection = new HashSet<>( - selection); + final HashSet<Object> oldSelection = new HashSet<>(selection); if (selection.size() + itemIds.size() >= selectionLimit) { // Add one at a time if there's a risk of overflow Iterator<?> iterator = itemIds.iterator(); @@ -1741,8 +1735,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, final boolean hasCommonElements = !Collections.disjoint(itemIds, selection); if (hasCommonElements) { - final HashSet<Object> oldSelection = new HashSet<>( - selection); + final HashSet<Object> oldSelection = new HashSet<>(selection); selection.removeAll(itemIds); fireSelectionEvent(oldSelection, selection); } @@ -2244,8 +2237,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, protected void addCell(Object propertyId) { CELLTYPE cell = createCell(); - cell.setColumnId(section.grid.getColumn(propertyId) - .getState().id); + cell.setColumnId( + section.grid.getColumn(propertyId).getState().id); cells.put(propertyId, cell); rowState.cells.add(cell.getCellState()); } @@ -2420,8 +2413,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, for (Entry<Set<CELLTYPE>, CELLTYPE> entry : cellGroups .entrySet()) { if (entry.getValue() == cell) { - cellElement.attr("colspan", "" - + entry.getKey().size()); + cellElement.attr("colspan", + "" + entry.getKey().size()); break; } } @@ -2467,8 +2460,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, totalColSpans += colspan - 1; join(cells).readDesign(element, designContext); } else { - cells.iterator().next() - .readDesign(element, designContext); + cells.iterator().next().readDesign(element, + designContext); } } } @@ -2656,8 +2649,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, cellElement.append(getHtml()); break; case WIDGET: - cellElement.appendChild(designContext - .createElement(getComponent())); + cellElement.appendChild( + designContext.createElement(getComponent())); break; } } @@ -2676,15 +2669,15 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, if (!cellElement.hasAttr("plain-text")) { if (cellElement.children().size() > 0 && cellElement.child(0).tagName().contains("-")) { - setComponent(designContext.readDesign(cellElement - .child(0))); + setComponent( + designContext.readDesign(cellElement.child(0))); } else { setHtml(cellElement.html()); } } else { // text – need to unescape HTML entities - setText(DesignFormatter.decodeFromTextNode(cellElement - .html())); + setText(DesignFormatter + .decodeFromTextNode(cellElement.html())); } } @@ -2733,8 +2726,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, */ public ROWTYPE removeRow(int rowIndex) { if (rowIndex >= rows.size() || rowIndex < 0) { - throw new IllegalArgumentException("No row at given index " - + rowIndex); + throw new IllegalArgumentException( + "No row at given index " + rowIndex); } ROWTYPE row = rows.remove(rowIndex); row.detach(); @@ -2775,8 +2768,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, */ public ROWTYPE getRow(int rowIndex) { if (rowIndex >= rows.size() || rowIndex < 0) { - throw new IllegalArgumentException("No row at given index " - + rowIndex); + throw new IllegalArgumentException( + "No row at given index " + rowIndex); } return rows.get(rowIndex); } @@ -3117,8 +3110,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, DesignContext designContext) { super.readDesign(trElement, designContext); - boolean defaultRow = DesignAttributeHandler.readAttribute( - "default", trElement.attributes(), false, boolean.class); + boolean defaultRow = DesignAttributeHandler.readAttribute("default", + trElement.attributes(), false, boolean.class); if (defaultRow) { section.grid.setDefaultHeaderRow(this); } @@ -3222,8 +3215,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, /** * A check for allowing the * {@link #Column(Grid, GridColumnState, Object) constructor} to call - * {@link #setConverter(LegacyConverter)} with a <code>null</code>, even if - * model and renderer aren't compatible. + * {@link #setConverter(LegacyConverter)} with a <code>null</code>, even + * if model and renderer aren't compatible. */ private boolean isFirstConverterAssignment = true; @@ -3300,8 +3293,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, HeaderRow row = grid.getHeader().getDefaultRow(); if (row != null) { - row.getCell(grid.getPropertyIdByColumnId(state.id)).setText( - caption); + row.getCell(grid.getPropertyIdByColumnId(state.id)) + .setText(caption); } return this; } @@ -3374,13 +3367,13 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, * @throws IllegalArgumentException * thrown if pixel width is less than zero */ - public Column setWidth(double pixelWidth) throws IllegalStateException, - IllegalArgumentException { + public Column setWidth(double pixelWidth) + throws IllegalStateException, IllegalArgumentException { checkColumnIsAttached(); if (pixelWidth < 0) { throw new IllegalArgumentException( - "Pixel width should be greated than 0 (in " - + toString() + ")"); + "Pixel width should be greated than 0 (in " + toString() + + ")"); } if (state.width != pixelWidth) { state.width = pixelWidth; @@ -3444,8 +3437,9 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, */ public Column setLastFrozenColumn() { checkColumnIsAttached(); - grid.setFrozenColumnCount(grid.getState(false).columnOrder - .indexOf(getState().id) + 1); + grid.setFrozenColumnCount( + grid.getState(false).columnOrder.indexOf(getState().id) + + 1); return this; } @@ -3556,17 +3550,14 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, Class<?> rendererPresentationType = getRenderer() .getPresentationType(); - if (!isFirstConverterAssignment - && !rendererPresentationType - .isAssignableFrom(modelType)) { + if (!isFirstConverterAssignment && !rendererPresentationType + .isAssignableFrom(modelType)) { throw new IllegalArgumentException( "Cannot remove converter, " + "as renderer's presentation type " + rendererPresentationType.getName() - + " and column's " - + "model " - + modelType.getName() - + " type aren't " + + " and column's " + "model " + + modelType.getName() + " type aren't " + "directly compatible with each other (in " + toString() + ")"); } @@ -3632,8 +3623,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, } private Class<?> getModelType() { - return grid.getContainerDataSource().getType( - grid.getPropertyIdByColumnId(state.id)); + return grid.getContainerDataSource() + .getType(grid.getPropertyIdByColumnId(state.id)); } /** @@ -3659,16 +3650,14 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, if (sortable) { if (!(grid.datasource instanceof Sortable)) { - throw new IllegalStateException( - "Can't set column " - + toString() - + " sortable. The Container of Grid does not implement Sortable"); + throw new IllegalStateException("Can't set column " + + toString() + + " sortable. The Container of Grid does not implement Sortable"); } else if (!((Sortable) grid.datasource) - .getSortableContainerPropertyIds().contains( - propertyId)) { + .getSortableContainerPropertyIds() + .contains(propertyId)) { throw new IllegalStateException( - "Can't set column " - + toString() + "Can't set column " + toString() + " sortable. Container doesn't support sorting by property " + propertyId); } @@ -4106,12 +4095,12 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, attributes, Double.class)); } if (design.hasAttr("min-width")) { - setMinimumWidth(DesignAttributeHandler.readAttribute( - "min-width", attributes, Double.class)); + setMinimumWidth(DesignAttributeHandler + .readAttribute("min-width", attributes, Double.class)); } if (design.hasAttr("max-width")) { - setMaximumWidth(DesignAttributeHandler.readAttribute( - "max-width", attributes, Double.class)); + setMaximumWidth(DesignAttributeHandler + .readAttribute("max-width", attributes, Double.class)); } if (design.hasAttr("expand")) { if (design.attr("expand").isEmpty()) { @@ -4134,8 +4123,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, * @param <T> * the type this renderer knows how to present */ - public static abstract class AbstractRenderer<T> extends - AbstractGridExtension implements Renderer<T> { + public static abstract class AbstractRenderer<T> + extends AbstractGridExtension implements Renderer<T> { private final Class<T> presentationType; @@ -4211,8 +4200,9 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, * @return a JSON representation of the given value */ protected <U> JsonValue encode(U value, Class<U> type) { - return JsonCodec.encode(value, null, type, - getUI().getConnectorTracker()).getEncodedValue(); + return JsonCodec + .encode(value, null, type, getUI().getConnectorTracker()) + .getEncodedValue(); } /** @@ -4256,13 +4246,13 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, } } } else { - assert presentationType.isAssignableFrom(converter - .getPresentationType()); + assert presentationType + .isAssignableFrom(converter.getPresentationType()); @SuppressWarnings("unchecked") LegacyConverter<T, Object> safeConverter = (LegacyConverter<T, Object>) converter; - presentationValue = safeConverter - .convertToPresentation(modelValue, - safeConverter.getPresentationType(), locale); + presentationValue = safeConverter.convertToPresentation( + modelValue, safeConverter.getPresentationType(), + locale); } JsonValue encodedValue; @@ -4291,8 +4281,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, * * @since 7.5 */ - public static abstract class AbstractGridExtension extends - AbstractExtension { + public static abstract class AbstractGridExtension + extends AbstractExtension { /** * Constructs a new Grid extension. @@ -4447,8 +4437,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, @Override public void containerPropertySetChange(PropertySetChangeEvent event) { - Collection<?> properties = new HashSet<Object>(event.getContainer() - .getContainerPropertyIds()); + Collection<?> properties = new HashSet<Object>( + event.getContainer().getContainerPropertyIds()); // Find columns that need to be removed. List<Column> removedColumns = new LinkedList<>(); @@ -4485,8 +4475,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, .getSortableContainerPropertyIds(); for (Object propertyId : columns.keySet()) { Column column = columns.get(propertyId); - if (!sortables.contains(propertyId) && column - .isSortable()) { + if (!sortables.contains(propertyId) + && column.isSortable()) { column.setSortable(false); } } @@ -4552,13 +4542,13 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, private static final Method SORT_ORDER_CHANGE_METHOD = ReflectTools .findMethod(SortListener.class, "sort", SortEvent.class); - private static final Method COLUMN_REORDER_METHOD = ReflectTools - .findMethod(ColumnReorderListener.class, "columnReorder", - ColumnReorderEvent.class); + private static final Method COLUMN_REORDER_METHOD = ReflectTools.findMethod( + ColumnReorderListener.class, "columnReorder", + ColumnReorderEvent.class); - private static final Method COLUMN_RESIZE_METHOD = ReflectTools - .findMethod(ColumnResizeListener.class, "columnResize", - ColumnResizeEvent.class); + private static final Method COLUMN_RESIZE_METHOD = ReflectTools.findMethod( + ColumnResizeListener.class, "columnResize", + ColumnResizeEvent.class); private static final Method COLUMN_VISIBILITY_METHOD = ReflectTools .findMethod(ColumnVisibilityChangeListener.class, @@ -4626,8 +4616,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, boolean userOriginated) { assert columnIds.length == directions.length; - List<SortOrder> order = new ArrayList<>( - columnIds.length); + List<SortOrder> order = new ArrayList<>(columnIds.length); for (int i = 0; i < columnIds.length; i++) { Object propertyId = getPropertyIdByColumnId(columnIds[i]); order.add(new SortOrder(propertyId, directions[i])); @@ -4673,12 +4662,13 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, getState(false).columnOrder = newColumnOrder; // write changes to diffState so that possible reverting the // column order is sent to client - assert diffState.hasKey( - diffStateKey) : "Field name has changed"; + assert diffState + .hasKey(diffStateKey) : "Field name has changed"; Type type = null; try { - type = (getState(false).getClass().getDeclaredField( - diffStateKey).getGenericType()); + type = (getState(false).getClass() + .getDeclaredField(diffStateKey) + .getGenericType()); } catch (NoSuchFieldException e) { e.printStackTrace(); } catch (SecurityException e) { @@ -4713,12 +4703,13 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, JsonObject diffState = connectorTracker .getDiffState(Grid.this); - assert diffState.hasKey( - diffStateKey) : "Field name has changed"; + assert diffState + .hasKey(diffStateKey) : "Field name has changed"; Type type = null; try { - type = (getState(false).getClass().getDeclaredField( - diffStateKey).getGenericType()); + type = (getState(false).getClass() + .getDeclaredField(diffStateKey) + .getGenericType()); } catch (NoSuchFieldException e) { e.printStackTrace(); } catch (SecurityException e) { @@ -4743,9 +4734,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, if (rowKey != null) { itemId = getKeyMapper().get(rowKey); } - fireEvent(new GridContextClickEvent(Grid.this, details, - section, rowIndex, itemId, - getPropertyIdByColumnId(columnId))); + fireEvent(new GridContextClickEvent(Grid.this, details, section, + rowIndex, itemId, getPropertyIdByColumnId(columnId))); } @Override @@ -4816,8 +4806,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, success = true; } catch (CommitException e) { try { - CommitErrorEvent event = new CommitErrorEvent( - Grid.this, e); + CommitErrorEvent event = new CommitErrorEvent(Grid.this, + e); getEditorErrorHandler().commitError(event); errorMessage = event.getUserErrorMessage(); @@ -4839,8 +4829,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, } private void handleError(Exception e) { - com.vaadin.server.ErrorEvent.findErrorHandler(Grid.this).error( - new ConnectorErrorEvent(Grid.this, e)); + com.vaadin.server.ErrorEvent.findErrorHandler(Grid.this) + .error(new ConnectorErrorEvent(Grid.this, e)); } }); } @@ -4992,8 +4982,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, // Initial sorting is defined by container if (datasource instanceof Sortable) { column.setSortable(((Sortable) datasource) - .getSortableContainerPropertyIds().contains( - propertyId)); + .getSortableContainerPropertyIds() + .contains(propertyId)); } else { column.setSortable(false); } @@ -5004,8 +4994,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, if (!properties.contains(property)) { throw new IllegalStateException( "Found at least one column in Grid that does not exist in the given container: " - + property - + " with the header \"" + + property + " with the header \"" + getColumn(property).getHeaderCaption() + "\". " + "Call removeAllColumns() before setContainerDataSource() if you want to reconfigure the columns based on the new container."); @@ -5013,8 +5002,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, if (!(datasource instanceof Sortable) || !((Sortable) datasource) - .getSortableContainerPropertyIds().contains( - property)) { + .getSortableContainerPropertyIds() + .contains(property)) { columns.get(property).setSortable(false); } } @@ -5079,13 +5068,13 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, addColumnProperty(propertyId, String.class, ""); } else { if (columns.containsKey(propertyId)) { - throw new IllegalStateException("A column for property id '" - + propertyId.toString() - + "' already exists in this grid"); + throw new IllegalStateException( + "A column for property id '" + propertyId.toString() + + "' already exists in this grid"); } else { - throw new IllegalStateException("Property id '" - + propertyId.toString() - + "' does not exist in the container"); + throw new IllegalStateException( + "Property id '" + propertyId.toString() + + "' does not exist in the container"); } } @@ -5136,9 +5125,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, if (!datasource.getContainerPropertyIds().contains(propertyId)) { datasource.addContainerProperty(propertyId, type, defaultValue); } else { - Property<?> containerProperty = datasource - .getContainerProperty(datasource.firstItemId(), - propertyId); + Property<?> containerProperty = datasource.getContainerProperty( + datasource.firstItemId(), propertyId); if (containerProperty.getType() == type) { appendColumn(propertyId); } else { @@ -5252,9 +5240,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, header.addColumn(datasourcePropertyId); footer.addColumn(datasourcePropertyId); - String humanFriendlyPropertyId = SharedUtil - .propertyIdToHumanFriendly(String.valueOf( - datasourcePropertyId)); + String humanFriendlyPropertyId = SharedUtil.propertyIdToHumanFriendly( + String.valueOf(datasourcePropertyId)); column.setHeaderCaption(humanFriendlyPropertyId); if (datasource instanceof Sortable @@ -5676,10 +5663,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, + "(the current selection model is " + selectionModel.getClass().getName() + ")."); } else if (selectionModel instanceof SelectionModel.None) { - throw new IllegalStateException("Cannot get selected row: " - + "Grid selection is disabled " - + "(the current selection model is " - + selectionModel.getClass().getName() + ")."); + throw new IllegalStateException( + "Cannot get selected row: " + "Grid selection is disabled " + + "(the current selection model is " + + selectionModel.getClass().getName() + ")."); } else { throw new IllegalStateException("Cannot get selected row: " + "Grid selection model does not implement " @@ -5715,8 +5702,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, * {@code SelectionModel.Single} or {@code SelectionModel.Multi} */ // keep this javadoc in sync with SelectionModel.Single.select - public boolean select(Object itemId) throws IllegalArgumentException, - IllegalStateException { + public boolean select(Object itemId) + throws IllegalArgumentException, IllegalStateException { if (selectionModel instanceof SelectionModel.Single) { return ((SelectionModel.Single) selectionModel).select(itemId); } else if (selectionModel instanceof SelectionModel.Multi) { @@ -5810,10 +5797,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, } else if (selectionModel instanceof SelectionModel.Multi) { return ((SelectionModel.Multi) selectionModel).deselectAll(); } else if (selectionModel instanceof SelectionModel.None) { - throw new IllegalStateException("Cannot deselect all rows" - + ": Grid selection is disabled " - + "(the current selection model is " - + selectionModel.getClass().getName() + ")."); + throw new IllegalStateException( + "Cannot deselect all rows" + ": Grid selection is disabled " + + "(the current selection model is " + + selectionModel.getClass().getName() + ")."); } else { throw new IllegalStateException("Cannot deselect all rows:" + " Grid selection model does not implement " @@ -6027,10 +6014,9 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, for (SortOrder o : order) { if (!sortableProps.contains(o.getPropertyId())) { - throw new IllegalArgumentException( - "Property " - + o.getPropertyId() - + " does not exist or is not sortable in the current container"); + throw new IllegalArgumentException("Property " + + o.getPropertyId() + + " does not exist or is not sortable in the current container"); } } @@ -6627,9 +6613,9 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, List<String> columnOrder = getState(false).columnOrder; if (values.length != columnOrder.size()) { - throw new IllegalArgumentException("There are " - + columnOrder.size() + " visible columns, but " - + values.length + " cell values were provided."); + throw new IllegalArgumentException( + "There are " + columnOrder.size() + " visible columns, but " + + values.length + " cell values were provided."); } // First verify all parameter types @@ -6802,8 +6788,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, * if the {@code itemId} is not in the backing container * @see #setEditorEnabled(boolean) */ - public void editItem(Object itemId) throws IllegalStateException, - IllegalArgumentException { + public void editItem(Object itemId) + throws IllegalStateException, IllegalArgumentException { if (!isEditorEnabled()) { throw new IllegalStateException("Item editor is not enabled"); } else if (isEditorBuffered() && editedItemId != null) { @@ -6824,8 +6810,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, editorFieldGroup.setItemDataSource(item); for (Column column : getColumns()) { - column.getState().editorConnector = getEditorField(column - .getPropertyId()); + column.getState().editorConnector = getEditorField( + column.getPropertyId()); } editorActive = true; @@ -6876,8 +6862,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, */ public void cancelEditor() { if (isEditorActive()) { - getEditorRpc().cancel( - getContainerDataSource().indexOfId(editedItemId)); + getEditorRpc() + .cancel(getContainerDataSource().indexOfId(editedItemId)); doCancelEditor(); } } @@ -7268,8 +7254,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, // Read frozen columns after columns are read. if (attrs.hasKey("frozen-columns")) { - setFrozenColumnCount(DesignAttributeHandler.readAttribute( - "frozen-columns", attrs, int.class)); + setFrozenColumnCount(DesignAttributeHandler + .readAttribute("frozen-columns", attrs, int.class)); } } @@ -7295,8 +7281,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, if (selectionModel.getClass().equals(SingleSelectionModel.class)) { selectionMode = SelectionMode.SINGLE; - } else if (selectionModel.getClass().equals( - MultiSelectionModel.class)) { + } else if (selectionModel.getClass() + .equals(MultiSelectionModel.class)) { selectionMode = SelectionMode.MULTI; } else if (selectionModel.getClass().equals(NoSelectionModel.class)) { selectionMode = SelectionMode.NONE; @@ -7334,8 +7320,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, for (Column c : getColumns()) { Object value = datasource.getItem(itemId) .getItemProperty(c.getPropertyId()).getValue(); - tableRow.appendElement("td").append( - (value != null ? DesignFormatter + tableRow.appendElement("td") + .append((value != null ? DesignFormatter .encodeForTextNode(value.toString()) : "")); } } diff --git a/server/src/main/java/com/vaadin/ui/GridLayout.java b/server/src/main/java/com/vaadin/ui/GridLayout.java index e0fe7c18b7..112c118a27 100644 --- a/server/src/main/java/com/vaadin/ui/GridLayout.java +++ b/server/src/main/java/com/vaadin/ui/GridLayout.java @@ -73,9 +73,9 @@ import com.vaadin.ui.declarative.DesignContext; * @since 3.0 */ @SuppressWarnings("serial") -public class GridLayout extends AbstractLayout implements - Layout.AlignmentHandler, Layout.SpacingHandler, Layout.MarginHandler, - LayoutClickNotifier { +public class GridLayout extends AbstractLayout + implements Layout.AlignmentHandler, Layout.SpacingHandler, + Layout.MarginHandler, LayoutClickNotifier { private GridLayoutServerRpc rpc = new GridLayoutServerRpc() { @@ -191,8 +191,8 @@ public class GridLayout extends AbstractLayout implements * if the cells are outside the grid area. */ public void addComponent(Component component, int column1, int row1, - int column2, int row2) throws OverlapsException, - OutOfBoundsException { + int column2, int row2) + throws OverlapsException, OutOfBoundsException { if (component == null) { throw new NullPointerException("Component must not be null"); @@ -282,8 +282,8 @@ public class GridLayout extends AbstractLayout implements .entrySet()) { if (componentsOverlap(entry.getValue(), area.childData)) { // Component not added, overlaps with existing component - throw new OverlapsException(new Area(entry.getValue(), - (Component) entry.getKey())); + throw new OverlapsException( + new Area(entry.getValue(), (Component) entry.getKey())); } } } @@ -413,7 +413,8 @@ public class GridLayout extends AbstractLayout implements public void removeComponent(int column, int row) { // Finds the area - for (final Iterator<Component> i = components.iterator(); i.hasNext();) { + for (final Iterator<Component> i = components.iterator(); i + .hasNext();) { final Component component = i.next(); final ChildComponentData childData = getState().childData .get(component); @@ -870,7 +871,8 @@ public class GridLayout extends AbstractLayout implements /* Documented in superclass */ @Override - public void replaceComponent(Component oldComponent, Component newComponent) { + public void replaceComponent(Component oldComponent, + Component newComponent) { // Gets the locations ChildComponentData oldLocation = getState().childData.get(oldComponent); @@ -1132,8 +1134,8 @@ public class GridLayout extends AbstractLayout implements * @return Component in given cell or null if empty */ public Component getComponent(int x, int y) { - for (Entry<Connector, ChildComponentData> entry : getState(false).childData - .entrySet()) { + for (Entry<Connector, ChildComponentData> entry : getState( + false).childData.entrySet()) { ChildComponentData childData = entry.getValue(); if (childData.column1 <= x && x <= childData.column2 && childData.row1 <= y && y <= childData.row2) { @@ -1208,9 +1210,8 @@ public class GridLayout extends AbstractLayout implements /* * (non-Javadoc) * - * @see - * com.vaadin.ui.Layout.MarginHandler#setMargin(com.vaadin.shared.ui.MarginInfo - * ) + * @see com.vaadin.ui.Layout.MarginHandler#setMargin(com.vaadin.shared.ui. + * MarginInfo ) */ @Override public void setMargin(MarginInfo marginInfo) { @@ -1345,13 +1346,14 @@ public class GridLayout extends AbstractLayout implements attr, 1, int.class); for (int rowIndex = row; rowIndex < row + rowspan; ++rowIndex) { - for (int colIndex = column; colIndex < column + colspan; ++colIndex) { + for (int colIndex = column; colIndex < column + + colspan; ++colIndex) { if (rowIndex == rows.size()) { // Rowspan with not enough rows. Fix by adding rows. rows.add(new HashMap<Integer, Component>()); } - rows.get(rowIndex) - .put(colIndex + skippedColumns, child); + rows.get(rowIndex).put(colIndex + skippedColumns, + child); } } @@ -1492,8 +1494,8 @@ public class GridLayout extends AbstractLayout implements col.appendChild(childElement); if (coords.row1 != coords.row2) { - col.attr("rowspan", "" - + (1 + coords.row2 - coords.row1)); + col.attr("rowspan", + "" + (1 + coords.row2 - coords.row1)); } colspan = 1 + coords.column2 - coords.column1; @@ -1503,8 +1505,8 @@ public class GridLayout extends AbstractLayout implements } else { boolean hasExpands = false; - if (i == 0 - && lastComponentOnRow(componentMap[i], j, visited)) { + if (i == 0 && lastComponentOnRow(componentMap[i], j, + visited)) { // A column with expand and no content in the end of // first row needs to be present. for (int c = j; c < componentMap[i].length; ++c) { @@ -1528,7 +1530,8 @@ public class GridLayout extends AbstractLayout implements ++colspan; } - int rowspan = getRowSpan(componentMap, i, j, colspan, child); + int rowspan = getRowSpan(componentMap, i, j, colspan, + child); if (colspan > 1) { col.attr("colspan", "" + colspan); } @@ -1596,7 +1599,8 @@ public class GridLayout extends AbstractLayout implements private int getRowSpan(Component[][] compMap, int i, int j, int colspan, Component child) { int rowspan = 1; - while (i + rowspan < compMap.length && compMap[i + rowspan][j] == child) { + while (i + rowspan < compMap.length + && compMap[i + rowspan][j] == child) { for (int k = 0; k < colspan; ++k) { if (compMap[i + rowspan][j + k] != child) { return rowspan; diff --git a/server/src/main/java/com/vaadin/ui/HasComponents.java b/server/src/main/java/com/vaadin/ui/HasComponents.java index 6273e8053b..fed8676f7e 100644 --- a/server/src/main/java/com/vaadin/ui/HasComponents.java +++ b/server/src/main/java/com/vaadin/ui/HasComponents.java @@ -53,7 +53,8 @@ public interface HasComponents extends Component, Iterable<Component> { * @param listener * the listener to add. */ - public void addComponentAttachListener(ComponentAttachListener listener); + public void addComponentAttachListener( + ComponentAttachListener listener); /** * Stops the listening component attach events. @@ -67,7 +68,8 @@ public interface HasComponents extends Component, Iterable<Component> { /** * Listens the component detach events. */ - public void addComponentDetachListener(ComponentDetachListener listener); + public void addComponentDetachListener( + ComponentDetachListener listener); /** * Stops the listening component detach events. @@ -100,8 +102,8 @@ public interface HasComponents extends Component, Iterable<Component> { public interface ComponentDetachListener extends Serializable { public static final Method detachMethod = ReflectTools.findMethod( - ComponentDetachListener.class, - "componentDetachedFromContainer", ComponentDetachEvent.class); + ComponentDetachListener.class, "componentDetachedFromContainer", + ComponentDetachEvent.class); /** * A component has been detached from container. diff --git a/server/src/main/java/com/vaadin/ui/Image.java b/server/src/main/java/com/vaadin/ui/Image.java index 7b0294a450..abac7b95c5 100644 --- a/server/src/main/java/com/vaadin/ui/Image.java +++ b/server/src/main/java/com/vaadin/ui/Image.java @@ -27,8 +27,7 @@ import com.vaadin.shared.ui.image.ImageState; * Component for embedding images. * * @author Vaadin Ltd. - * @version - * @VERSION@ + * @version @VERSION@ * @since 7.0 */ @SuppressWarnings("serial") diff --git a/server/src/main/java/com/vaadin/ui/LegacyComponent.java b/server/src/main/java/com/vaadin/ui/LegacyComponent.java index 7f71162c94..bb379534c1 100644 --- a/server/src/main/java/com/vaadin/ui/LegacyComponent.java +++ b/server/src/main/java/com/vaadin/ui/LegacyComponent.java @@ -33,8 +33,8 @@ import com.vaadin.server.VariableOwner; * @since 7.0.0 */ @Deprecated -public interface LegacyComponent extends VariableOwner, Component, - ConnectorEventListener { +public interface LegacyComponent + extends VariableOwner, Component, ConnectorEventListener { /** * <p> diff --git a/server/src/main/java/com/vaadin/ui/LegacyWindow.java b/server/src/main/java/com/vaadin/ui/LegacyWindow.java index fe71d14430..8dca9143f7 100644 --- a/server/src/main/java/com/vaadin/ui/LegacyWindow.java +++ b/server/src/main/java/com/vaadin/ui/LegacyWindow.java @@ -278,7 +278,7 @@ public class LegacyWindow extends UI { * @param tryToOpenAsPopup * Whether to try to force the resource to be opened in a new * window - * */ + */ public void open(Resource resource, String windowName, boolean tryToOpenAsPopup) { getPage().open(resource, windowName, tryToOpenAsPopup); @@ -432,7 +432,8 @@ public class LegacyWindow extends UI { * {@link ComponentContainer} (default {@link VerticalLayout} or explicitly * set). */ - public void replaceComponent(Component oldComponent, Component newComponent) { + public void replaceComponent(Component oldComponent, + Component newComponent) { getContent().replaceComponent(oldComponent, newComponent); } diff --git a/server/src/main/java/com/vaadin/ui/LoadingIndicatorConfiguration.java b/server/src/main/java/com/vaadin/ui/LoadingIndicatorConfiguration.java index 46fe7ead35..b8833ebeb8 100644 --- a/server/src/main/java/com/vaadin/ui/LoadingIndicatorConfiguration.java +++ b/server/src/main/java/com/vaadin/ui/LoadingIndicatorConfiguration.java @@ -81,8 +81,8 @@ public interface LoadingIndicatorConfiguration extends Serializable { public int getThirdDelay(); } -class LoadingIndicatorConfigurationImpl implements - LoadingIndicatorConfiguration { +class LoadingIndicatorConfigurationImpl + implements LoadingIndicatorConfiguration { private UI ui; public LoadingIndicatorConfigurationImpl(UI ui) { diff --git a/server/src/main/java/com/vaadin/ui/LoginForm.java b/server/src/main/java/com/vaadin/ui/LoginForm.java index 297f253e81..9debafb96b 100644 --- a/server/src/main/java/com/vaadin/ui/LoginForm.java +++ b/server/src/main/java/com/vaadin/ui/LoginForm.java @@ -102,12 +102,13 @@ public class LoginForm extends AbstractSingleComponentContainer { * Internal stream source for the login URL - always returns "Success" and * ignores the values received. */ - private static class LoginStreamSource implements StreamResource.StreamSource { + private static class LoginStreamSource + implements StreamResource.StreamSource { @Override public InputStream getStream() { try { - return new ByteArrayInputStream("<html>Success</html>".toString().getBytes( - "UTF-8")); + return new ByteArrayInputStream( + "<html>Success</html>".toString().getBytes("UTF-8")); } catch (UnsupportedEncodingException e) { return null; } @@ -115,7 +116,6 @@ public class LoginForm extends AbstractSingleComponentContainer { } } - static { try { ON_LOGIN_METHOD = LoginListener.class.getDeclaredMethod("onLogin", @@ -204,7 +204,8 @@ public class LoginForm extends AbstractSingleComponentContainer { * As an alternative to calling this method, the method * {@link #createPasswordField()} can be overridden. * - * @param cap new caption + * @param cap + * new caption */ public void setPasswordCaption(String cap) { passwordCaption = cap; @@ -241,7 +242,8 @@ public class LoginForm extends AbstractSingleComponentContainer { * As an alternative to calling this method, the method * {@link #createLoginButton()} can be overridden. * - * @param cap new caption + * @param cap + * new caption */ public void setLoginButtonCaption(String cap) { loginButtonCaption = cap; diff --git a/server/src/main/java/com/vaadin/ui/MenuBar.java b/server/src/main/java/com/vaadin/ui/MenuBar.java index 9f05df7869..039bde7ea2 100644 --- a/server/src/main/java/com/vaadin/ui/MenuBar.java +++ b/server/src/main/java/com/vaadin/ui/MenuBar.java @@ -45,8 +45,8 @@ import com.vaadin.ui.declarative.DesignContext; * </p> */ @SuppressWarnings("serial") -public class MenuBar extends AbstractComponent implements LegacyComponent, - Focusable { +public class MenuBar extends AbstractComponent + implements LegacyComponent, Focusable { // Items of the top-level menu private final List<MenuItem> menuItems; @@ -139,8 +139,7 @@ public class MenuBar extends AbstractComponent implements LegacyComponent, String description = item.getDescription(); if (description != null && description.length() > 0) { - target.addAttribute( - MenuBarConstants.ATTRIBUTE_ITEM_DESCRIPTION, + target.addAttribute(MenuBarConstants.ATTRIBUTE_ITEM_DESCRIPTION, description); } if (item.isCheckable()) { @@ -188,7 +187,7 @@ public class MenuBar extends AbstractComponent implements LegacyComponent, } } - }// while + } // while // If we got the clicked item, launch the command. if (found && tmpItem.isEnabled()) { @@ -199,7 +198,7 @@ public class MenuBar extends AbstractComponent implements LegacyComponent, tmpItem.getCommand().menuSelected(tmpItem); } } - }// if + } // if }// changeVariables /** @@ -473,7 +472,8 @@ public class MenuBar extends AbstractComponent implements LegacyComponent, * The command to be fired * @throws IllegalArgumentException */ - public MenuItem(String caption, Resource icon, MenuBar.Command command) { + public MenuItem(String caption, Resource icon, + MenuBar.Command command) { if (caption == null) { throw new IllegalArgumentException("caption cannot be null"); } @@ -521,7 +521,8 @@ public class MenuBar extends AbstractComponent implements LegacyComponent, * @param command * the command for the menu item */ - public MenuBar.MenuItem addItem(String caption, MenuBar.Command command) { + public MenuBar.MenuItem addItem(String caption, + MenuBar.Command command) { return addItem(caption, null, command); } @@ -950,7 +951,8 @@ public class MenuBar extends AbstractComponent implements LegacyComponent, } // in many cases there seems to be an empty more menu item - if (getMoreMenuItem() != null && !getMoreMenuItem().getText().isEmpty()) { + if (getMoreMenuItem() != null + && !getMoreMenuItem().getText().isEmpty()) { Element moreMenu = createMenuElement(getMoreMenuItem()); moreMenu.attr("more", true); design.appendChild(moreMenu); @@ -971,14 +973,14 @@ public class MenuBar extends AbstractComponent implements LegacyComponent, def.getIcon(), Resource.class); DesignAttributeHandler.writeAttribute("disabled", attr, !item.isEnabled(), !def.isEnabled(), boolean.class); - DesignAttributeHandler.writeAttribute("visible", attr, - item.isVisible(), def.isVisible(), boolean.class); + DesignAttributeHandler.writeAttribute("visible", attr, item.isVisible(), + def.isVisible(), boolean.class); DesignAttributeHandler.writeAttribute("separator", attr, item.isSeparator(), def.isSeparator(), boolean.class); DesignAttributeHandler.writeAttribute("checkable", attr, item.isCheckable(), def.isCheckable(), boolean.class); - DesignAttributeHandler.writeAttribute("checked", attr, - item.isChecked(), def.isChecked(), boolean.class); + DesignAttributeHandler.writeAttribute("checked", attr, item.isChecked(), + def.isChecked(), boolean.class); DesignAttributeHandler.writeAttribute("description", attr, item.getDescription(), def.getDescription(), String.class); DesignAttributeHandler.writeAttribute("style-name", attr, @@ -998,8 +1000,8 @@ public class MenuBar extends AbstractComponent implements LegacyComponent, protected MenuItem readMenuElement(Element menuElement) { Resource icon = null; if (menuElement.hasAttr("icon")) { - icon = DesignAttributeHandler.getFormatter().parse( - menuElement.attr("icon"), Resource.class); + icon = DesignAttributeHandler.getFormatter() + .parse(menuElement.attr("icon"), Resource.class); } String caption = ""; @@ -1040,12 +1042,12 @@ public class MenuBar extends AbstractComponent implements LegacyComponent, attr, boolean.class)); } if (menuElement.hasAttr("description")) { - menu.setDescription(DesignAttributeHandler.readAttribute( - "description", attr, String.class)); + menu.setDescription(DesignAttributeHandler + .readAttribute("description", attr, String.class)); } if (menuElement.hasAttr("style-name")) { - menu.setStyleName(DesignAttributeHandler.readAttribute( - "style-name", attr, String.class)); + menu.setStyleName(DesignAttributeHandler.readAttribute("style-name", + attr, String.class)); } if (!subMenus.isEmpty()) { diff --git a/server/src/main/java/com/vaadin/ui/Notification.java b/server/src/main/java/com/vaadin/ui/Notification.java index aaf25a9e9d..6a619ed543 100644 --- a/server/src/main/java/com/vaadin/ui/Notification.java +++ b/server/src/main/java/com/vaadin/ui/Notification.java @@ -63,8 +63,8 @@ import com.vaadin.shared.Position; */ public class Notification implements Serializable { public enum Type { - HUMANIZED_MESSAGE("humanized"), WARNING_MESSAGE("warning"), ERROR_MESSAGE( - "error"), TRAY_NOTIFICATION("tray"), + HUMANIZED_MESSAGE("humanized"), WARNING_MESSAGE( + "warning"), ERROR_MESSAGE("error"), TRAY_NOTIFICATION("tray"), /** * @since 7.2 */ diff --git a/server/src/main/java/com/vaadin/ui/NotificationConfiguration.java b/server/src/main/java/com/vaadin/ui/NotificationConfiguration.java index 925c888a51..0a6137ff23 100644 --- a/server/src/main/java/com/vaadin/ui/NotificationConfiguration.java +++ b/server/src/main/java/com/vaadin/ui/NotificationConfiguration.java @@ -86,8 +86,8 @@ public interface NotificationConfiguration extends Serializable { * Sets the WAI-ARIA role for a notification type. * <p> * This role defines how an assistive device handles a notification. - * Available roles are alert and status (@see <a - * href="http://www.w3.org/TR/2011/CR-wai-aria-20110118/roles">Roles + * Available roles are alert and status (@see + * <a href="http://www.w3.org/TR/2011/CR-wai-aria-20110118/roles">Roles * Model</a>). * * The default role is alert. @@ -103,8 +103,8 @@ public interface NotificationConfiguration extends Serializable { * Gets the WAI-ARIA role for a notification type. * <p> * This role defines how an assistive device handles a notification. - * Available roles are alert and status (@see <a - * href="http://www.w3.org/TR/2011/CR-wai-aria-20110118/roles">Roles + * Available roles are alert and status (@see + * <a href="http://www.w3.org/TR/2011/CR-wai-aria-20110118/roles">Roles * Model</a>) * <p> * The default role is alert. diff --git a/server/src/main/java/com/vaadin/ui/Panel.java b/server/src/main/java/com/vaadin/ui/Panel.java index 6458d5f57d..daa4974e7e 100644 --- a/server/src/main/java/com/vaadin/ui/Panel.java +++ b/server/src/main/java/com/vaadin/ui/Panel.java @@ -43,8 +43,8 @@ import com.vaadin.ui.declarative.DesignContext; * @since 3.0 */ @SuppressWarnings("serial") -public class Panel extends AbstractSingleComponentContainer implements - Scrollable, Action.Notifier, Focusable, LegacyComponent { +public class Panel extends AbstractSingleComponentContainer + implements Scrollable, Action.Notifier, Focusable, LegacyComponent { /** * Keeps track of the Actions added to this component, and manages the diff --git a/server/src/main/java/com/vaadin/ui/PopupView.java b/server/src/main/java/com/vaadin/ui/PopupView.java index 73c93b29f3..4beb8c87ac 100644 --- a/server/src/main/java/com/vaadin/ui/PopupView.java +++ b/server/src/main/java/com/vaadin/ui/PopupView.java @@ -288,8 +288,8 @@ public class PopupView extends AbstractComponent implements HasComponents { super.writeDesign(design, designContext); Element popupContent = new Element(Tag.valueOf("popup-content"), ""); - popupContent.appendChild(designContext.createElement(content - .getPopupComponent())); + popupContent.appendChild( + designContext.createElement(content.getPopupComponent())); String minimizedHTML = content.getMinimizedValueAsHTML(); if (minimizedHTML != null && !minimizedHTML.isEmpty()) { @@ -364,7 +364,8 @@ public class PopupView extends AbstractComponent implements HasComponents { * @see PopupVisibilityListener * @see #addListener(PopupVisibilityListener) */ - public void removePopupVisibilityListener(PopupVisibilityListener listener) { + public void removePopupVisibilityListener( + PopupVisibilityListener listener) { removeListener(PopupVisibilityEvent.class, listener, POPUP_VISIBILITY_METHOD); } diff --git a/server/src/main/java/com/vaadin/ui/ProgressBar.java b/server/src/main/java/com/vaadin/ui/ProgressBar.java index 3182563eda..f9935de8c6 100644 --- a/server/src/main/java/com/vaadin/ui/ProgressBar.java +++ b/server/src/main/java/com/vaadin/ui/ProgressBar.java @@ -35,8 +35,8 @@ import com.vaadin.ui.declarative.DesignContext; * @since 7.1 * @author Vaadin Ltd */ -public class ProgressBar extends LegacyAbstractField<Float> implements - Property.Viewer, Property.ValueChangeListener { +public class ProgressBar extends LegacyAbstractField<Float> + implements Property.Viewer, Property.ValueChangeListener { private static final float DEFAULT_VALUE = 0f; @@ -142,8 +142,8 @@ public class ProgressBar extends LegacyAbstractField<Float> implements /* * Overridden to keep the shared state in sync with the LegacyAbstractField - * internal value. Should be removed once LegacyAbstractField is refactored to use - * shared state. + * internal value. Should be removed once LegacyAbstractField is refactored + * to use shared state. * * See tickets #10921 and #11064. */ @@ -160,9 +160,8 @@ public class ProgressBar extends LegacyAbstractField<Float> implements public void readDesign(Element design, DesignContext designContext) { super.readDesign(design, designContext); if (design.hasAttr("value") && !design.attr("value").isEmpty()) { - setValue( - DesignAttributeHandler.readAttribute("value", - design.attributes(), Float.class), false, true); + setValue(DesignAttributeHandler.readAttribute("value", + design.attributes(), Float.class), false, true); } } diff --git a/server/src/main/java/com/vaadin/ui/PushConfiguration.java b/server/src/main/java/com/vaadin/ui/PushConfiguration.java index 6ef323cea8..43060ad408 100644 --- a/server/src/main/java/com/vaadin/ui/PushConfiguration.java +++ b/server/src/main/java/com/vaadin/ui/PushConfiguration.java @@ -184,9 +184,8 @@ class PushConfigurationImpl implements PushConfiguration { /* * (non-Javadoc) * - * @see - * com.vaadin.ui.PushConfiguration#setPushMode(com.vaadin.shared.communication - * .PushMode) + * @see com.vaadin.ui.PushConfiguration#setPushMode(com.vaadin.shared. + * communication .PushMode) */ @Override public void setPushMode(PushMode pushMode) { @@ -203,7 +202,8 @@ class PushConfigurationImpl implements PushConfiguration { assert session.hasLock(); - if (pushMode.isEnabled() && !session.getService().ensurePushAvailable()) { + if (pushMode.isEnabled() + && !session.getService().ensurePushAvailable()) { throw new IllegalStateException( "Push is not available. See previous log messages for more information."); } @@ -240,8 +240,8 @@ class PushConfigurationImpl implements PushConfiguration { @Override public Transport getTransport() { try { - Transport tr = Transport - .getByIdentifier(getParameter(PushConfigurationState.TRANSPORT_PARAM)); + Transport tr = Transport.getByIdentifier( + getParameter(PushConfigurationState.TRANSPORT_PARAM)); if (tr == Transport.WEBSOCKET && getState(false).alwaysUseXhrForServerRequests) { return Transport.WEBSOCKET_XHR; @@ -282,8 +282,8 @@ class PushConfigurationImpl implements PushConfiguration { @Override public Transport getFallbackTransport() { try { - return Transport - .valueOf(getParameter(PushConfigurationState.FALLBACK_TRANSPORT_PARAM)); + return Transport.valueOf(getParameter( + PushConfigurationState.FALLBACK_TRANSPORT_PARAM)); } catch (IllegalArgumentException e) { return null; } @@ -338,8 +338,8 @@ class PushConfigurationImpl implements PushConfiguration { @Override public Collection<String> getParameterNames() { - return Collections.unmodifiableCollection(getState(false).parameters - .keySet()); + return Collections + .unmodifiableCollection(getState(false).parameters.keySet()); } } diff --git a/server/src/main/java/com/vaadin/ui/ReconnectDialogConfiguration.java b/server/src/main/java/com/vaadin/ui/ReconnectDialogConfiguration.java index 92eb1e785f..69df4f6211 100644 --- a/server/src/main/java/com/vaadin/ui/ReconnectDialogConfiguration.java +++ b/server/src/main/java/com/vaadin/ui/ReconnectDialogConfiguration.java @@ -160,7 +160,8 @@ class ReconnectDialogConfigurationImpl implements ReconnectDialogConfiguration { @Override public int getReconnectAttempts() { - return ui.getState(false).reconnectDialogConfiguration.reconnectAttempts; + return ui + .getState(false).reconnectDialogConfiguration.reconnectAttempts; } @Override @@ -170,7 +171,8 @@ class ReconnectDialogConfigurationImpl implements ReconnectDialogConfiguration { @Override public int getReconnectInterval() { - return ui.getState(false).reconnectDialogConfiguration.reconnectInterval; + return ui + .getState(false).reconnectDialogConfiguration.reconnectInterval; } @Override @@ -180,7 +182,8 @@ class ReconnectDialogConfigurationImpl implements ReconnectDialogConfiguration { @Override public int getDialogGracePeriod() { - return ui.getState(false).reconnectDialogConfiguration.dialogGracePeriod; + return ui + .getState(false).reconnectDialogConfiguration.dialogGracePeriod; } @Override diff --git a/server/src/main/java/com/vaadin/ui/RichTextArea.java b/server/src/main/java/com/vaadin/ui/RichTextArea.java index 499abcab59..ea3adfba47 100644 --- a/server/src/main/java/com/vaadin/ui/RichTextArea.java +++ b/server/src/main/java/com/vaadin/ui/RichTextArea.java @@ -35,8 +35,8 @@ import com.vaadin.ui.declarative.DesignContext; * {@link RichTextArea} may produce unexpected results as formatting is counted * into length of field. */ -public class RichTextArea extends LegacyAbstractField<String> implements - LegacyComponent { +public class RichTextArea extends LegacyAbstractField<String> + implements LegacyComponent { /** * Null representation. @@ -175,8 +175,7 @@ public class RichTextArea extends LegacyAbstractField<String> implements String newValue = (String) variables.get("text"); final String oldValue = getValue(); - if (newValue != null - && (oldValue == null || isNullSettingAllowed()) + if (newValue != null && (oldValue == null || isNullSettingAllowed()) && newValue.equals(getNullRepresentation())) { newValue = null; } diff --git a/server/src/main/java/com/vaadin/ui/SingleComponentContainer.java b/server/src/main/java/com/vaadin/ui/SingleComponentContainer.java index 9feee84f15..bb05b2e403 100644 --- a/server/src/main/java/com/vaadin/ui/SingleComponentContainer.java +++ b/server/src/main/java/com/vaadin/ui/SingleComponentContainer.java @@ -27,8 +27,8 @@ import com.vaadin.ui.HasComponents.ComponentAttachDetachNotifier; * * @since 7.0 */ -public interface SingleComponentContainer extends HasComponents, - ComponentAttachDetachNotifier { +public interface SingleComponentContainer + extends HasComponents, ComponentAttachDetachNotifier { /** * Gets the number of children this {@link SingleComponentContainer} has. diff --git a/server/src/main/java/com/vaadin/ui/Table.java b/server/src/main/java/com/vaadin/ui/Table.java index b60fe473b1..051b616d97 100644 --- a/server/src/main/java/com/vaadin/ui/Table.java +++ b/server/src/main/java/com/vaadin/ui/Table.java @@ -759,8 +759,8 @@ public class Table extends AbstractSelect implements Action.Container, this.columnHeaders.clear(); int i = 0; - for (final Iterator<Object> it = visibleColumns.iterator(); it - .hasNext() && i < columnHeaders.length; i++) { + for (final Iterator<Object> it = visibleColumns.iterator(); it.hasNext() + && i < columnHeaders.length; i++) { this.columnHeaders.put(it.next(), columnHeaders[i]); } @@ -818,8 +818,8 @@ public class Table extends AbstractSelect implements Action.Container, this.columnIcons.clear(); int i = 0; - for (final Iterator<Object> it = visibleColumns.iterator(); it - .hasNext() && i < columnIcons.length; i++) { + for (final Iterator<Object> it = visibleColumns.iterator(); it.hasNext() + && i < columnIcons.length; i++) { this.columnIcons.put(it.next(), columnIcons[i]); } @@ -886,8 +886,8 @@ public class Table extends AbstractSelect implements Action.Container, // Resets the alignments final HashMap<Object, Align> newCA = new HashMap<Object, Align>(); int i = 0; - for (final Iterator<Object> it = visibleColumns.iterator(); it - .hasNext() && i < columnAlignments.length; i++) { + for (final Iterator<Object> it = visibleColumns.iterator(); it.hasNext() + && i < columnAlignments.length; i++) { newCA.put(it.next(), columnAlignments[i]); } this.columnAlignments = newCA; @@ -1247,7 +1247,8 @@ public class Table extends AbstractSelect implements Action.Container, } String header = columnHeaders.get(propertyId); - if ((header == null && getColumnHeaderMode() == ColumnHeaderMode.EXPLICIT_DEFAULTS_ID) + if ((header == null + && getColumnHeaderMode() == ColumnHeaderMode.EXPLICIT_DEFAULTS_ID) || getColumnHeaderMode() == ColumnHeaderMode.ID) { header = propertyId.toString(); } @@ -1490,7 +1491,8 @@ public class Table extends AbstractSelect implements Action.Container, return currentPageFirstItemIndex; } - void setCurrentPageFirstItemIndex(int newIndex, boolean needsPageBufferReset) { + void setCurrentPageFirstItemIndex(int newIndex, + boolean needsPageBufferReset) { if (newIndex < 0) { newIndex = 0; @@ -1704,8 +1706,8 @@ public class Table extends AbstractSelect implements Action.Container, final int pagelen = getPageLength(); int rows, totalRows; rows = totalRows = size(); - int firstIndex = Math - .min(getCurrentPageFirstItemIndex(), totalRows - 1); + int firstIndex = Math.min(getCurrentPageFirstItemIndex(), + totalRows - 1); if (rows > 0 && firstIndex >= 0) { rows -= firstIndex; } @@ -1846,7 +1848,8 @@ public class Table extends AbstractSelect implements Action.Container, firstCacheRowToRemoveInPageBuffer = maxPageBufferIndex + 1; } - if (firstCacheRowToRemoveInPageBuffer - pageBufferFirstIndex < currentlyCachedRowCount) { + if (firstCacheRowToRemoveInPageBuffer + - pageBufferFirstIndex < currentlyCachedRowCount) { /* * Unregister all components that fall beyond the cache limits after * inserting the new rows. @@ -1974,7 +1977,8 @@ public class Table extends AbstractSelect implements Action.Container, pageBuffer = newPageBuffer; } - private Object[][] getVisibleCellsUpdateCacheRows(int firstIndex, int rows) { + private Object[][] getVisibleCellsUpdateCacheRows(int firstIndex, + int rows) { Object[][] cells = getVisibleCellsNoCache(firstIndex, rows, false); int cacheIx = firstIndex - pageBufferFirstIndex; // update the new rows in the cache. @@ -1997,11 +2001,11 @@ public class Table extends AbstractSelect implements Action.Container, * too small. * @return */ - private Object[][] getVisibleCellsInsertIntoCache(int firstIndex, int rows) { - getLogger() - .log(Level.FINEST, - "Insert {0} rows at index {1} to existing page buffer requested", - new Object[] { rows, firstIndex }); + private Object[][] getVisibleCellsInsertIntoCache(int firstIndex, + int rows) { + getLogger().log(Level.FINEST, + "Insert {0} rows at index {1} to existing page buffer requested", + new Object[] { rows, firstIndex }); int minPageBufferIndex = getMinPageBufferIndex(); int maxPageBufferIndex = getMaxPageBufferIndex(); @@ -2051,9 +2055,9 @@ public class Table extends AbstractSelect implements Action.Container, * IF there is space remaining in the buffer after the rows have been * inserted, we can keep more rows. */ - int numberOfOldRowsAfterInsertedRows = Math.min(pageBufferFirstIndex - + currentlyCachedRowCount + rows, maxPageBufferIndex + 1) - - (firstIndex + rows - 1); + int numberOfOldRowsAfterInsertedRows = Math.min( + pageBufferFirstIndex + currentlyCachedRowCount + rows, + maxPageBufferIndex + 1) - (firstIndex + rows - 1); if (numberOfOldRowsAfterInsertedRows > 0) { firstCacheRowToRemove += numberOfOldRowsAfterInsertedRows; } @@ -2071,11 +2075,12 @@ public class Table extends AbstractSelect implements Action.Container, // Calculate the new cache size int newCachedRowCount = maxBufferSize; - if (pageBufferFirstIndex + currentlyCachedRowCount + rows - 1 < maxPageBufferIndex) { + if (pageBufferFirstIndex + currentlyCachedRowCount + rows + - 1 < maxPageBufferIndex) { // there aren't enough rows to fill the whole potential -> use what // there is - newCachedRowCount -= maxPageBufferIndex - - (pageBufferFirstIndex + currentlyCachedRowCount + rows - 1); + newCachedRowCount -= maxPageBufferIndex - (pageBufferFirstIndex + + currentlyCachedRowCount + rows - 1); } else if (minPageBufferIndex < pageBufferFirstIndex) { newCachedRowCount -= pageBufferFirstIndex - minPageBufferIndex; } @@ -2105,23 +2110,21 @@ public class Table extends AbstractSelect implements Action.Container, newPageBuffer[i][row] = cells[i][row - firstIndexInNewPageBuffer]; } - for (int row = firstIndexInNewPageBuffer + rows; row < newCachedRowCount; row++) { + for (int row = firstIndexInNewPageBuffer + + rows; row < newCachedRowCount; row++) { // Move the old rows down below the newly inserted rows newPageBuffer[i][row] = pageBuffer[i][rowsFromBeginning + row - rows]; } } pageBuffer = newPageBuffer; - pageBufferFirstIndex = Math.max(pageBufferFirstIndex - + rowsFromBeginning, minPageBufferIndex); + pageBufferFirstIndex = Math.max( + pageBufferFirstIndex + rowsFromBeginning, minPageBufferIndex); if (getLogger().isLoggable(Level.FINEST)) { - getLogger().log( - Level.FINEST, + getLogger().log(Level.FINEST, "Page Buffer now contains {0} rows ({1}-{2})", - new Object[] { - pageBuffer[CELL_ITEMID].length, - pageBufferFirstIndex, - (pageBufferFirstIndex + new Object[] { pageBuffer[CELL_ITEMID].length, + pageBufferFirstIndex, (pageBufferFirstIndex + pageBuffer[CELL_ITEMID].length - 1) }); } return cells; @@ -2223,7 +2226,8 @@ public class Table extends AbstractSelect implements Action.Container, for (int i = 0; i < rows && i < itemIds.size(); i++) { Object id = itemIds.get(i); if (id == null) { - throw new IllegalStateException("Null itemId returned from container"); + throw new IllegalStateException( + "Null itemId returned from container"); } // Start by parsing the values, id should already be set parseItemIdToCells(cells, id, i, firstIndex, headmode, cols, @@ -2272,8 +2276,8 @@ public class Table extends AbstractSelect implements Action.Container, } protected List<Object> getItemIds(int firstIndex, int rows) { - return (List<Object>) ((Container.Indexed) items).getItemIds( - firstIndex, rows); + return (List<Object>) ((Container.Indexed) items).getItemIds(firstIndex, + rows); } /** @@ -2311,8 +2315,8 @@ public class Table extends AbstractSelect implements Action.Container, } } - GeneratedRow generatedRow = rowGenerator != null ? rowGenerator - .generateRow(this, id) : null; + GeneratedRow generatedRow = rowGenerator != null + ? rowGenerator.generateRow(this, id) : null; cells[CELL_GENERATED_ROW][i] = generatedRow; for (int j = 0; j < cols; j++) { @@ -2351,7 +2355,8 @@ public class Table extends AbstractSelect implements Action.Container, if (index < firstIndexNotInCache && index >= pageBufferFirstIndex && pageBuffer[CELL_GENERATED_ROW][indexInOldBuffer] == null - && id.equals(pageBuffer[CELL_ITEMID][indexInOldBuffer])) { + && id.equals( + pageBuffer[CELL_ITEMID][indexInOldBuffer])) { // we already have data in our cache, // recycle it instead of fetching it via // getValue/getPropertyValue @@ -2423,11 +2428,8 @@ public class Table extends AbstractSelect implements Action.Container, } protected void registerComponent(Component component) { - getLogger().log( - Level.FINEST, - "Registered {0}: {1}", - new Object[] { component.getClass().getSimpleName(), - component.getCaption() }); + getLogger().log(Level.FINEST, "Registered {0}: {1}", new Object[] { + component.getClass().getSimpleName(), component.getCaption() }); if (!equals(component.getParent())) { component.setParent(this); } @@ -2457,7 +2459,8 @@ public class Table extends AbstractSelect implements Action.Container, * to page buffer. * @param count */ - private void unregisterComponentsAndPropertiesInRows(int firstIx, int count) { + private void unregisterComponentsAndPropertiesInRows(int firstIx, + int count) { if (getLogger().isLoggable(Level.FINEST)) { getLogger().log(Level.FINEST, "Unregistering components in rows {0}-{1}", @@ -2506,8 +2509,8 @@ public class Table extends AbstractSelect implements Action.Container, HashSet<Property<?>> oldListenedProperties, HashSet<Component> oldVisibleComponents) { if (oldVisibleComponents != null) { - for (final Iterator<Component> i = oldVisibleComponents.iterator(); i - .hasNext();) { + for (final Iterator<Component> i = oldVisibleComponents + .iterator(); i.hasNext();) { Component c = i.next(); if (!visibleComponents.contains(c)) { unregisterComponent(c); @@ -2542,11 +2545,8 @@ public class Table extends AbstractSelect implements Action.Container, * component that should be unregistered. */ protected void unregisterComponent(Component component) { - getLogger().log( - Level.FINEST, - "Unregistered {0}: {1}", - new Object[] { component.getClass().getSimpleName(), - component.getCaption() }); + getLogger().log(Level.FINEST, "Unregistered {0}: {1}", new Object[] { + component.getClass().getSimpleName(), component.getCaption() }); component.setParent(null); /* * Also remove property data sources to unregister listeners keeping the @@ -2785,8 +2785,8 @@ public class Table extends AbstractSelect implements Action.Container, } } } - propertyValueConverters.keySet().retainAll( - retainableValueConverters); + propertyValueConverters.keySet() + .retainAll(retainableValueConverters); } // Assures that the data source is ordered by making unordered @@ -2794,8 +2794,8 @@ public class Table extends AbstractSelect implements Action.Container, if (newDataSource instanceof Container.Ordered) { super.setContainerDataSource(newDataSource); } else { - super.setContainerDataSource(new ContainerOrderedWrapper( - newDataSource)); + super.setContainerDataSource( + new ContainerOrderedWrapper(newDataSource)); } // Resets page position @@ -3032,9 +3032,7 @@ public class Table extends AbstractSelect implements Action.Container, } } if (getLogger().isLoggable(Level.FINEST)) { - getLogger().log( - Level.FINEST, - "Client wants rows {0}-{1}", + getLogger().log(Level.FINEST, "Client wants rows {0}-{1}", new Object[] { reqFirstRowToPaint, (reqFirstRowToPaint + reqRowsToPaint - 1) }); } @@ -3046,7 +3044,8 @@ public class Table extends AbstractSelect implements Action.Container, boolean doSort = false; if (variables.containsKey("sortcolumn")) { final String colId = (String) variables.get("sortcolumn"); - if (colId != null && !"".equals(colId) && !"null".equals(colId)) { + if (colId != null && !"".equals(colId) + && !"null".equals(colId)) { final Object id = columnIdMap.get(colId); setSortContainerPropertyId(id, false); doSort = true; @@ -3077,8 +3076,8 @@ public class Table extends AbstractSelect implements Action.Container, for (Object id : ids) { idSet.add(columnIdMap.get(id.toString())); } - for (final Iterator<Object> it = visibleColumns.iterator(); it - .hasNext();) { + for (final Iterator<Object> it = visibleColumns + .iterator(); it.hasNext();) { Object propertyId = it.next(); if (isColumnCollapsed(propertyId)) { if (!idSet.contains(propertyId)) { @@ -3366,7 +3365,8 @@ public class Table extends AbstractSelect implements Action.Container, if (keyMapperReset) { keyMapperReset = false; - target.addAttribute(TableConstants.ATTRIBUTE_KEY_MAPPER_RESET, true); + target.addAttribute(TableConstants.ATTRIBUTE_KEY_MAPPER_RESET, + true); } if (dropHandler != null) { @@ -3384,8 +3384,8 @@ public class Table extends AbstractSelect implements Action.Container, return rowCacheInvalidated; } - private void paintPartialRowUpdate(PaintTarget target, Set<Action> actionSet) - throws PaintException { + private void paintPartialRowUpdate(PaintTarget target, + Set<Action> actionSet) throws PaintException { paintPartialRowUpdates(target, actionSet); paintPartialRowAdditions(target, actionSet); } @@ -3561,9 +3561,8 @@ public class Table extends AbstractSelect implements Action.Container, target.addAttribute("cols", getVisibleColumns().length); target.addAttribute("rows", rows); - target.addAttribute("firstrow", - (reqFirstRowToPaint >= 0 ? reqFirstRowToPaint - : firstToBeRenderedInClient)); + target.addAttribute("firstrow", (reqFirstRowToPaint >= 0 + ? reqFirstRowToPaint : firstToBeRenderedInClient)); target.addAttribute("totalrows", total); if (getPageLength() != 0) { target.addAttribute("pagelength", getPageLength()); @@ -3632,8 +3631,8 @@ public class Table extends AbstractSelect implements Action.Container, } } if (!Align.LEFT.equals(getColumnAlignment(colId))) { - target.addAttribute("align", getColumnAlignment(colId) - .toString()); + target.addAttribute("align", + getColumnAlignment(colId).toString()); } paintColumnWidth(target, colId); paintColumnExpandRatio(target, colId); @@ -3827,8 +3826,8 @@ public class Table extends AbstractSelect implements Action.Container, target.addAttribute("multiselectmode", multiSelectMode.ordinal()); } if (isSelectable()) { - target.addAttribute("selectmode", (isMultiSelect() ? "multi" - : "single")); + target.addAttribute("selectmode", + (isMultiSelect() ? "multi" : "single")); } else { target.addAttribute("selectmode", "none"); } @@ -3938,20 +3937,21 @@ public class Table extends AbstractSelect implements Action.Container, } } - if ((iscomponent[currentColumn] || iseditable || cells[CELL_GENERATED_ROW][indexInRowbuffer] != null) + if ((iscomponent[currentColumn] || iseditable + || cells[CELL_GENERATED_ROW][indexInRowbuffer] != null) && Component.class.isInstance(cells[CELL_FIRSTCOL + currentColumn][indexInRowbuffer])) { final Component c = (Component) cells[CELL_FIRSTCOL + currentColumn][indexInRowbuffer]; - if (c == null - || !LegacyCommunicationManager - .isComponentVisibleToClient(c)) { + if (c == null || !LegacyCommunicationManager + .isComponentVisibleToClient(c)) { target.addText(""); } else { LegacyPaint.paint(c, target); } } else { - target.addText((String) cells[CELL_FIRSTCOL + currentColumn][indexInRowbuffer]); + target.addText((String) cells[CELL_FIRSTCOL + + currentColumn][indexInRowbuffer]); } paintCellTooltips(target, itemId, columnId); } @@ -4034,7 +4034,8 @@ public class Table extends AbstractSelect implements Action.Container, int indexInRowBuffer) throws PaintException { GeneratedRow generatedRow = (GeneratedRow) cells[CELL_GENERATED_ROW][indexInRowBuffer]; if (generatedRow != null) { - target.addAttribute("gen_html", generatedRow.isHtmlContentAllowed()); + target.addAttribute("gen_html", + generatedRow.isHtmlContentAllowed()); target.addAttribute("gen_span", generatedRow.isSpanColumns()); target.addAttribute("gen_widget", generatedRow.getValue() instanceof Component); @@ -4104,8 +4105,8 @@ public class Table extends AbstractSelect implements Action.Container, protected Object getPropertyValue(Object rowId, Object colId, Property property) { if (isEditable() && fieldFactory != null) { - final LegacyField<?> f = fieldFactory.createField( - getContainerDataSource(), rowId, colId, this); + final LegacyField<?> f = fieldFactory + .createField(getContainerDataSource(), rowId, colId, this); if (f != null) { // Remember that we have made this association so we can remove // it when the component is removed @@ -4168,8 +4169,8 @@ public class Table extends AbstractSelect implements Action.Container, if (hasConverter(colId)) { converter = getConverter(colId); } else { - converter = (LegacyConverter) LegacyConverterUtil.getConverter(String.class, - property.getType(), getSession()); + converter = (LegacyConverter) LegacyConverterUtil.getConverter( + String.class, property.getType(), getSession()); } Object value = property.getValue(); if (converter != null) { @@ -4328,7 +4329,8 @@ public class Table extends AbstractSelect implements Action.Container, public boolean removeItem(Object itemId) { final Object nextItemId = nextItemId(itemId); final boolean ret = super.removeItem(itemId); - if (ret && (itemId != null) && (itemId.equals(currentPageFirstItemId))) { + if (ret && (itemId != null) + && (itemId.equals(currentPageFirstItemId))) { currentPageFirstItemId = nextItemId; } if (!(items instanceof Container.ItemSetChangeNotifier)) { @@ -4618,8 +4620,8 @@ public class Table extends AbstractSelect implements Action.Container, for (Iterator<Object> iterator = newVisibleColumns.iterator(); iterator .hasNext();) { Object id = iterator.next(); - if (!(containerPropertyIds.contains(id) || columnGenerators - .containsKey(id))) { + if (!(containerPropertyIds.contains(id) + || columnGenerators.containsKey(id))) { iterator.remove(); } } @@ -4628,8 +4630,8 @@ public class Table extends AbstractSelect implements Action.Container, for (Iterator<Object> iterator = collapsedColumns.iterator(); iterator .hasNext();) { Object id = iterator.next(); - if (!(containerPropertyIds.contains(id) || columnGenerators - .containsKey(id))) { + if (!(containerPropertyIds.contains(id) + || columnGenerators.containsKey(id))) { iterator.remove(); } } @@ -4791,8 +4793,8 @@ public class Table extends AbstractSelect implements Action.Container, /** * Is table editable. * - * If table is editable a editor of type LegacyField is created for each table - * cell. The assigned FieldFactory is used to create the instances. + * If table is editable a editor of type LegacyField is created for each + * table cell. The assigned FieldFactory is used to create the instances. * * To provide custom editors for table cells create a class implementing the * FieldFactory interface, and assign it to table, and set the editable @@ -4810,8 +4812,8 @@ public class Table extends AbstractSelect implements Action.Container, /** * Sets the editable property. * - * If table is editable a editor of type LegacyField is created for each table - * cell. The assigned FieldFactory is used to create the instances. + * If table is editable a editor of type LegacyField is created for each + * table cell. The assigned FieldFactory is used to create the instances. * * To provide custom editors for table cells create a class implementing the * FieldFactory interface, and assign it to table, and set the editable @@ -4931,8 +4933,8 @@ public class Table extends AbstractSelect implements Action.Container, * @param doSort */ private void setSortContainerPropertyId(Object propertyId, boolean doSort) { - if ((sortContainerPropertyId != null && !sortContainerPropertyId - .equals(propertyId)) + if ((sortContainerPropertyId != null + && !sortContainerPropertyId.equals(propertyId)) || (sortContainerPropertyId == null && propertyId != null)) { sortContainerPropertyId = propertyId; @@ -5129,8 +5131,8 @@ public class Table extends AbstractSelect implements Action.Container, @Override public void removeItemClickListener(ItemClickListener listener) { - removeListener(TableConstants.ITEM_CLICK_EVENT_ID, - ItemClickEvent.class, listener); + removeListener(TableConstants.ITEM_CLICK_EVENT_ID, ItemClickEvent.class, + listener); } /** @@ -5272,7 +5274,8 @@ public class Table extends AbstractSelect implements Action.Container, * initialized from server and no subsequent requests requests are needed * during that drag and drop operation. */ - public static abstract class TableDropCriterion extends ServerSideCriterion { + public static abstract class TableDropCriterion + extends ServerSideCriterion { private Table table; @@ -5895,7 +5898,8 @@ public class Table extends AbstractSelect implements Action.Container, */ public void addColumnCollapseListener(ColumnCollapseListener listener) { addListener(TableConstants.COLUMN_COLLAPSE_EVENT_ID, - ColumnCollapseEvent.class, listener, ColumnCollapseEvent.METHOD); + ColumnCollapseEvent.class, listener, + ColumnCollapseEvent.METHOD); } /** @@ -5917,7 +5921,8 @@ public class Table extends AbstractSelect implements Action.Container, * @param generator * The generator to use or null to disable */ - public void setItemDescriptionGenerator(ItemDescriptionGenerator generator) { + public void setItemDescriptionGenerator( + ItemDescriptionGenerator generator) { if (generator != itemDescriptionGenerator) { itemDescriptionGenerator = generator; // Assures the visual refresh. No need to reset the page buffer @@ -6071,17 +6076,18 @@ public class Table extends AbstractSelect implements Action.Container, * @param converter * The converter to use for the property id */ - public void setConverter(Object propertyId, LegacyConverter<String, ?> converter) { + public void setConverter(Object propertyId, + LegacyConverter<String, ?> converter) { if (!getContainerPropertyIds().contains(propertyId)) { - throw new IllegalArgumentException("PropertyId " + propertyId - + " must be in the container"); + throw new IllegalArgumentException( + "PropertyId " + propertyId + " must be in the container"); } if (!typeIsCompatible(converter.getModelType(), getType(propertyId))) { - throw new IllegalArgumentException("Property type (" - + getType(propertyId) - + ") must match converter source type (" - + converter.getModelType() + ")"); + throw new IllegalArgumentException( + "Property type (" + getType(propertyId) + + ") must match converter source type (" + + converter.getModelType() + ")"); } propertyValueConverters.put(propertyId, (LegacyConverter<String, Object>) converter); @@ -6172,10 +6178,8 @@ public class Table extends AbstractSelect implements Action.Container, addContainerProperty(id, String.class, null); if (col.hasAttr("width")) { - setColumnWidth( - id, - DesignAttributeHandler.readAttribute("width", - col.attributes(), Integer.class)); + setColumnWidth(id, DesignAttributeHandler.readAttribute( + "width", col.attributes(), Integer.class)); } if (col.hasAttr("center")) { setColumnAlignment(id, Align.CENTER); @@ -6197,9 +6201,8 @@ public class Table extends AbstractSelect implements Action.Container, col.attributes(), boolean.class)); } if (col.hasAttr("collapsed")) { - setColumnCollapsed(id, - DesignAttributeHandler.readAttribute("collapsed", - col.attributes(), boolean.class)); + setColumnCollapsed(id, DesignAttributeHandler.readAttribute( + "collapsed", col.attributes(), boolean.class)); } } setVisibleColumns(pIds.toArray()); @@ -6241,14 +6244,13 @@ public class Table extends AbstractSelect implements Action.Container, } Iterator<?> propertyIt = propertyIds.iterator(); for (Element e : elems) { - String columnValue = DesignFormatter.decodeFromTextNode(e - .html()); + String columnValue = DesignFormatter + .decodeFromTextNode(e.html()); Object propertyId = propertyIt.next(); if (header) { setColumnHeader(propertyId, columnValue); if (e.hasAttr("icon")) { - setColumnIcon( - propertyId, + setColumnIcon(propertyId, DesignAttributeHandler.readAttribute("icon", e.attributes(), Resource.class)); } @@ -6345,9 +6347,9 @@ public class Table extends AbstractSelect implements Action.Container, col.attributes(), isColumnCollapsible(id), def.isColumnCollapsible(null), boolean.class); - DesignAttributeHandler.writeAttribute("collapsed", - col.attributes(), isColumnCollapsed(id), - def.isColumnCollapsed(null), boolean.class); + DesignAttributeHandler.writeAttribute("collapsed", col.attributes(), + isColumnCollapsed(id), def.isColumnCollapsed(null), + boolean.class); } } diff --git a/server/src/main/java/com/vaadin/ui/TableFieldFactory.java b/server/src/main/java/com/vaadin/ui/TableFieldFactory.java index e77dc0ec35..3c955746fe 100644 --- a/server/src/main/java/com/vaadin/ui/TableFieldFactory.java +++ b/server/src/main/java/com/vaadin/ui/TableFieldFactory.java @@ -50,7 +50,7 @@ public interface TableFieldFactory extends Serializable { * @return A field suitable for editing the specified data or null if the * property should not be editable. */ - LegacyField<?> createField(Container container, Object itemId, Object propertyId, - Component uiContext); + LegacyField<?> createField(Container container, Object itemId, + Object propertyId, Component uiContext); } diff --git a/server/src/main/java/com/vaadin/ui/Tree.java b/server/src/main/java/com/vaadin/ui/Tree.java index 5e6ac55027..844295d824 100644 --- a/server/src/main/java/com/vaadin/ui/Tree.java +++ b/server/src/main/java/com/vaadin/ui/Tree.java @@ -637,8 +637,8 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, // Paint tree attributes if (isSelectable()) { - target.addAttribute("selectmode", (isMultiSelect() ? "multi" - : "single")); + target.addAttribute("selectmode", + (isMultiSelect() ? "multi" : "single")); if (isMultiSelect()) { target.addAttribute("multiselectmode", multiSelectMode.toString()); @@ -737,8 +737,8 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, } if (itemStyleGenerator != null) { - String stylename = itemStyleGenerator - .getStyle(this, itemId); + String stylename = itemStyleGenerator.getStyle(this, + itemId); if (stylename != null) { target.addAttribute(TreeConstants.ATTRIBUTE_NODE_STYLE, stylename); @@ -921,7 +921,8 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * boolean) */ @Override - public boolean setChildrenAllowed(Object itemId, boolean areChildrenAllowed) { + public boolean setChildrenAllowed(Object itemId, + boolean areChildrenAllowed) { final boolean success = ((Container.Hierarchical) items) .setChildrenAllowed(itemId, areChildrenAllowed); if (success) { @@ -938,8 +939,8 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, */ @Override public boolean setParent(Object itemId, Object newParentId) { - final boolean success = ((Container.Hierarchical) items).setParent( - itemId, newParentId); + final boolean success = ((Container.Hierarchical) items) + .setParent(itemId, newParentId); if (success) { markAsDirty(); } @@ -961,12 +962,12 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, // Assure that the data source is ordered by making unordered // containers ordered by wrapping them - if (Container.Hierarchical.class.isAssignableFrom(newDataSource - .getClass())) { + if (Container.Hierarchical.class + .isAssignableFrom(newDataSource.getClass())) { super.setContainerDataSource(newDataSource); } else { - super.setContainerDataSource(new ContainerHierarchicalWrapper( - newDataSource)); + super.setContainerDataSource( + new ContainerHierarchicalWrapper(newDataSource)); } /* @@ -1729,7 +1730,8 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, return false; } // return true if directly over - return eventDetails.getDropLocation() == VerticalDropLocation.MIDDLE; + return eventDetails + .getDropLocation() == VerticalDropLocation.MIDDLE; } catch (Exception e) { return false; } @@ -1816,7 +1818,8 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * @param generator * The generator to use or null to disable */ - public void setItemDescriptionGenerator(ItemDescriptionGenerator generator) { + public void setItemDescriptionGenerator( + ItemDescriptionGenerator generator) { if (generator != itemDescriptionGenerator) { itemDescriptionGenerator = generator; markAsDirty(); diff --git a/server/src/main/java/com/vaadin/ui/TreeTable.java b/server/src/main/java/com/vaadin/ui/TreeTable.java index bf38148aa9..df10992e5e 100644 --- a/server/src/main/java/com/vaadin/ui/TreeTable.java +++ b/server/src/main/java/com/vaadin/ui/TreeTable.java @@ -296,8 +296,8 @@ public class TreeTable extends Table implements Hierarchical { private void addVisibleChildTree(Object id) { if (isNodeOpen(id)) { - Collection<?> children = getContainerDataSource().getChildren( - id); + Collection<?> children = getContainerDataSource() + .getChildren(id); if (children != null) { for (Object childId : children) { preOrder.add(childId); @@ -408,7 +408,8 @@ public class TreeTable extends Table implements Hierarchical { int indexInRowbuffer) throws PaintException { // always paint if present (in parent only if row headers visible) if (getRowHeaderMode() == ROW_HEADER_MODE_HIDDEN) { - Resource itemIcon = getItemIcon(cells[CELL_ITEMID][indexInRowbuffer]); + Resource itemIcon = getItemIcon( + cells[CELL_ITEMID][indexInRowbuffer]); if (itemIcon != null) { target.addAttribute("icon", itemIcon); } @@ -531,7 +532,8 @@ public class TreeTable extends Table implements Hierarchical { @Override protected int getAddedRowCount() { - return countSubNodesRecursively(getContainerDataSource(), toggledItemId); + return countSubNodesRecursively(getContainerDataSource(), + toggledItemId); } private int countSubNodesRecursively(Hierarchical hc, Object itemId) { @@ -567,7 +569,8 @@ public class TreeTable extends Table implements Hierarchical { return !getContainerStrategy().isNodeOpen(toggledItemId); } - private void toggleChildVisibility(Object itemId, boolean forceFullRefresh) { + private void toggleChildVisibility(Object itemId, + boolean forceFullRefresh) { getContainerStrategy().toggleChildVisibility(itemId); // ensure that page still has first item in page, DON'T clear the // caches. @@ -604,7 +607,8 @@ public class TreeTable extends Table implements Hierarchical { // FIXME: This disables partial updates until TreeTable is fixed so it // does not change component hierarchy during paint - containerSupportsPartialUpdates = (newDataSource instanceof ItemSetChangeNotifier) && false; + containerSupportsPartialUpdates = (newDataSource instanceof ItemSetChangeNotifier) + && false; if (newDataSource != null && !(newDataSource instanceof Hierarchical)) { newDataSource = new ContainerHierarchicalWrapper(newDataSource); @@ -935,8 +939,8 @@ public class TreeTable extends Table implements Hierarchical { Object itemId = super.readItem(tr, selected, context); if (tr.hasAttr("collapsed")) { - boolean collapsed = DesignAttributeHandler.readAttribute( - "collapsed", tr.attributes(), boolean.class); + boolean collapsed = DesignAttributeHandler + .readAttribute("collapsed", tr.attributes(), boolean.class); setCollapsed(itemId, collapsed); } diff --git a/server/src/main/java/com/vaadin/ui/UI.java b/server/src/main/java/com/vaadin/ui/UI.java index 0a0cd46816..299cecd92a 100644 --- a/server/src/main/java/com/vaadin/ui/UI.java +++ b/server/src/main/java/com/vaadin/ui/UI.java @@ -104,9 +104,9 @@ import com.vaadin.util.CurrentInstance; * * @since 7.0 */ -public abstract class UI extends AbstractSingleComponentContainer implements - Action.Container, Action.Notifier, PollNotifier, LegacyComponent, - Focusable { +public abstract class UI extends AbstractSingleComponentContainer + implements Action.Container, Action.Notifier, PollNotifier, + LegacyComponent, Focusable { /** * The application to which this UI belongs @@ -214,16 +214,15 @@ public abstract class UI extends AbstractSingleComponentContainer implements } } json.append("]}"); - getRpcProxy(DebugWindowClientRpc.class).reportLayoutProblems( - json.toString()); + getRpcProxy(DebugWindowClientRpc.class) + .reportLayoutProblems(json.toString()); } @Override public void showServerDesign(Connector connector) { if (!(connector instanceof Component)) { - getLogger().severe( - "Tried to output declarative design for " + connector - + ", which is not a component"); + getLogger().severe("Tried to output declarative design for " + + connector + ", which is not a component"); return; } if (connector instanceof UI) { @@ -234,10 +233,9 @@ public abstract class UI extends AbstractSingleComponentContainer implements ByteArrayOutputStream baos = new ByteArrayOutputStream(); try { Design.write((Component) connector, baos); - getLogger().info( - "Design for " + connector - + " requested from debug window:\n" - + baos.toString("UTF-8")); + getLogger().info("Design for " + connector + + " requested from debug window:\n" + + baos.toString("UTF-8")); } catch (IOException e) { getLogger().log(Level.WARNING, "Error producing design for " + connector, e); @@ -360,9 +358,8 @@ public abstract class UI extends AbstractSingleComponentContainer implements if (pendingFocus != null) { // ensure focused component is still attached to this main window - if (equals(pendingFocus.getUI()) - || (pendingFocus.getUI() != null && equals(pendingFocus - .getUI().getParent()))) { + if (equals(pendingFocus.getUI()) || (pendingFocus.getUI() != null + && equals(pendingFocus.getUI().getParent()))) { target.addAttribute("focused", pendingFocus); } pendingFocus = null; @@ -521,8 +518,8 @@ public abstract class UI extends AbstractSingleComponentContainer implements * @throws NullPointerException * if the given <code>Window</code> is <code>null</code>. */ - public void addWindow(Window window) throws IllegalArgumentException, - NullPointerException { + public void addWindow(Window window) + throws IllegalArgumentException, NullPointerException { if (window == null) { throw new NullPointerException("Argument must not be null"); @@ -1098,7 +1095,8 @@ public abstract class UI extends AbstractSingleComponentContainer implements @Deprecated public void showNotification(String caption, String description, Notification.Type type) { - Notification notification = new Notification(caption, description, type); + Notification notification = new Notification(caption, description, + type); notification.setHtmlContentAllowed(true);// Backwards compatibility getPage().showNotification(notification); } @@ -1130,10 +1128,8 @@ public abstract class UI extends AbstractSingleComponentContainer implements @Deprecated public void showNotification(String caption, String description, Notification.Type type, boolean htmlContentAllowed) { - getPage() - .showNotification( - new Notification(caption, description, type, - htmlContentAllowed)); + getPage().showNotification(new Notification(caption, description, type, + htmlContentAllowed)); } /** @@ -1240,7 +1236,8 @@ public abstract class UI extends AbstractSingleComponentContainer implements public void close() { closing = true; - boolean sessionExpired = (session == null || session.getState() != State.OPEN); + boolean sessionExpired = (session == null + || session.getState() != State.OPEN); getRpcProxy(UIClientRpc.class).uiClosed(sessionExpired); if (getPushConnection() != null) { // Push the Rpc to the client. The connection will be closed when @@ -1568,7 +1565,8 @@ public abstract class UI extends AbstractSingleComponentContainer implements * not available. */ public PushConnection getPushConnection() { - assert !(getPushConfiguration().getPushMode().isEnabled() && pushConnection == null); + assert !(getPushConfiguration().getPushMode().isEnabled() + && pushConnection == null); return pushConnection; } diff --git a/server/src/main/java/com/vaadin/ui/Upload.java b/server/src/main/java/com/vaadin/ui/Upload.java index 0a88b40215..8f50f5f905 100644 --- a/server/src/main/java/com/vaadin/ui/Upload.java +++ b/server/src/main/java/com/vaadin/ui/Upload.java @@ -73,8 +73,8 @@ import com.vaadin.util.ReflectTools; * @since 3.0 */ @SuppressWarnings("serial") -public class Upload extends AbstractComponent implements Component.Focusable, - LegacyComponent { +public class Upload extends AbstractComponent + implements Component.Focusable, LegacyComponent { /** * Should the field be focused on next repaint? @@ -233,9 +233,8 @@ public class Upload extends AbstractComponent implements Component.Focusable, "uploadFailed", new Class[] { FailedEvent.class }); UPLOAD_STARTED_METHOD = StartedListener.class.getDeclaredMethod( "uploadStarted", new Class[] { StartedEvent.class }); - UPLOAD_SUCCEEDED_METHOD = SucceededListener.class - .getDeclaredMethod("uploadSucceeded", - new Class[] { SucceededEvent.class }); + UPLOAD_SUCCEEDED_METHOD = SucceededListener.class.getDeclaredMethod( + "uploadSucceeded", new Class[] { SucceededEvent.class }); } catch (final java.lang.NoSuchMethodException e) { // This should never happen throw new java.lang.RuntimeException( @@ -907,8 +906,8 @@ public class Upload extends AbstractComponent implements Component.Focusable, // this is implemented differently than other listeners to maintain // backwards compatibility if (progressListeners != null) { - for (Iterator<ProgressListener> it = progressListeners.iterator(); it - .hasNext();) { + for (Iterator<ProgressListener> it = progressListeners + .iterator(); it.hasNext();) { ProgressListener l = it.next(); l.updateProgress(totalBytes, contentLength); } @@ -1115,8 +1114,8 @@ public class Upload extends AbstractComponent implements Component.Focusable, @Override public boolean listenProgress() { - return (progressListeners != null && !progressListeners - .isEmpty()); + return (progressListeners != null + && !progressListeners.isEmpty()); } @Override diff --git a/server/src/main/java/com/vaadin/ui/Video.java b/server/src/main/java/com/vaadin/ui/Video.java index 46a4293b36..02498533cd 100644 --- a/server/src/main/java/com/vaadin/ui/Video.java +++ b/server/src/main/java/com/vaadin/ui/Video.java @@ -42,8 +42,8 @@ import com.vaadin.ui.declarative.DesignContext; * >Mozilla Developer Network</a>. * * Multiple sources can be specified. Which of the sources is used is selected - * by the browser depending on which file formats it supports. See <a - * href="http://en.wikipedia.org/wiki/HTML5_video#Table">wikipedia</a> for a + * by the browser depending on which file formats it supports. See + * <a href="http://en.wikipedia.org/wiki/HTML5_video#Table">wikipedia</a> for a * table of formats supported by different browsers. * * @author Vaadin Ltd diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvents.java b/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvents.java index f01b465dd2..4b088cb2e1 100644 --- a/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvents.java +++ b/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvents.java @@ -136,8 +136,8 @@ public interface CalendarComponentEvents extends Serializable { /** * Handler interface for day or time cell drag-marking with mouse. */ - public interface RangeSelectNotifier extends Serializable, - CalendarEventNotifier { + public interface RangeSelectNotifier + extends Serializable, CalendarEventNotifier { /** * Set the RangeSelectHandler that listens for drag-marking. @@ -224,9 +224,9 @@ public interface CalendarComponentEvents extends Serializable { public interface RangeSelectHandler extends EventListener, Serializable { /** Trigger method for the RangeSelectEvent. */ - public static final Method rangeSelectMethod = ReflectTools - .findMethod(RangeSelectHandler.class, "rangeSelect", - RangeSelectEvent.class); + public static final Method rangeSelectMethod = ReflectTools.findMethod( + RangeSelectHandler.class, "rangeSelect", + RangeSelectEvent.class); /** * This method will be called when day or time cells are drag-marked diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java b/server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java index 2f51b21f7c..5610f037c4 100644 --- a/server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java +++ b/server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java @@ -50,10 +50,10 @@ import com.vaadin.ui.components.calendar.event.CalendarEventProvider.EventSetCha * @author Vaadin Ltd. */ @SuppressWarnings("serial") -public class ContainerEventProvider implements CalendarEditableEventProvider, - EventSetChangeNotifier, EventChangeNotifier, EventMoveHandler, - EventResizeHandler, Container.ItemSetChangeListener, - Property.ValueChangeListener { +public class ContainerEventProvider + implements CalendarEditableEventProvider, EventSetChangeNotifier, + EventChangeNotifier, EventMoveHandler, EventResizeHandler, + Container.ItemSetChangeListener, Property.ValueChangeListener { // Default property ids public static final String CAPTION_PROPERTY = "caption"; @@ -180,7 +180,8 @@ public class ContainerEventProvider implements CalendarEditableEventProvider, // Check the event cache first for (CalendarEvent e : eventCache) { if (e instanceof ContainerCalendarEvent - && ((ContainerCalendarEvent) e).getContainerIndex() == index) { + && ((ContainerCalendarEvent) e) + .getContainerIndex() == index) { return e; } else if (container.getIdByIndex(index) == e) { return e; @@ -206,18 +207,18 @@ public class ContainerEventProvider implements CalendarEditableEventProvider, // Set values from property values if (captionProperty != null && item.getItemPropertyIds().contains(captionProperty)) { - basicEvent.setCaption(String.valueOf(item.getItemProperty( - captionProperty).getValue())); + basicEvent.setCaption(String.valueOf( + item.getItemProperty(captionProperty).getValue())); } - if (descriptionProperty != null - && item.getItemPropertyIds().contains(descriptionProperty)) { - basicEvent.setDescription(String.valueOf(item.getItemProperty( - descriptionProperty).getValue())); + if (descriptionProperty != null && item.getItemPropertyIds() + .contains(descriptionProperty)) { + basicEvent.setDescription(String.valueOf( + item.getItemProperty(descriptionProperty).getValue())); } if (startDateProperty != null && item.getItemPropertyIds().contains(startDateProperty)) { - basicEvent.setStart((Date) item.getItemProperty( - startDateProperty).getValue()); + basicEvent.setStart((Date) item + .getItemProperty(startDateProperty).getValue()); } if (endDateProperty != null && item.getItemPropertyIds().contains(endDateProperty)) { @@ -226,13 +227,13 @@ public class ContainerEventProvider implements CalendarEditableEventProvider, } if (styleNameProperty != null && item.getItemPropertyIds().contains(styleNameProperty)) { - basicEvent.setStyleName(String.valueOf(item.getItemProperty( - styleNameProperty).getValue())); + basicEvent.setStyleName(String.valueOf( + item.getItemProperty(styleNameProperty).getValue())); } if (allDayProperty != null && item.getItemPropertyIds().contains(allDayProperty)) { - basicEvent.setAllDay((Boolean) item.getItemProperty( - allDayProperty).getValue()); + basicEvent.setAllDay((Boolean) item + .getItemProperty(allDayProperty).getValue()); } event = basicEvent; } @@ -264,8 +265,8 @@ public class ContainerEventProvider implements CalendarEditableEventProvider, } } if (add && endDate != null) { - Date eventStart = (Date) item - .getItemProperty(startDateProperty).getValue(); + Date eventStart = (Date) item.getItemProperty(startDateProperty) + .getValue(); if (eventStart.compareTo(endDate) >= 0) { break; // because container is sorted, all further events // will be even later @@ -281,8 +282,8 @@ public class ContainerEventProvider implements CalendarEditableEventProvider, /* * (non-Javadoc) * - * @see - * com.vaadin.addon.calendar.event.CalendarEventProvider.EventSetChangeNotifier + * @see com.vaadin.addon.calendar.event.CalendarEventProvider. + * EventSetChangeNotifier * #addListener(com.vaadin.addon.calendar.event.CalendarEventProvider. * EventSetChangeListener) */ @@ -296,8 +297,8 @@ public class ContainerEventProvider implements CalendarEditableEventProvider, /* * (non-Javadoc) * - * @see - * com.vaadin.addon.calendar.event.CalendarEventProvider.EventSetChangeNotifier + * @see com.vaadin.addon.calendar.event.CalendarEventProvider. + * EventSetChangeNotifier * #removeListener(com.vaadin.addon.calendar.event.CalendarEventProvider. * EventSetChangeListener) */ @@ -309,8 +310,8 @@ public class ContainerEventProvider implements CalendarEditableEventProvider, /* * (non-Javadoc) * - * @see - * com.vaadin.addon.calendar.event.CalendarEvent.EventChangeNotifier#addListener + * @see com.vaadin.addon.calendar.event.CalendarEvent.EventChangeNotifier# + * addListener * (com.vaadin.addon.calendar.event.CalendarEvent.EventChangeListener) */ @Override @@ -477,8 +478,8 @@ public class ContainerEventProvider implements CalendarEditableEventProvider, ignoreContainerEvents(); Item item = container.getItem(container.getIdByIndex(index)); - item.getItemProperty(startDateProperty).setValue( - event.getNewStart()); + item.getItemProperty(startDateProperty) + .setValue(event.getNewStart()); item.getItemProperty(endDateProperty).setValue(newEnd); listenToContainerEvents(); } @@ -504,8 +505,8 @@ public class ContainerEventProvider implements CalendarEditableEventProvider, } ignoreContainerEvents(); Item item = container.getItem(container.getIdByIndex(index)); - item.getItemProperty(startDateProperty).setValue( - event.getNewStart()); + item.getItemProperty(startDateProperty) + .setValue(event.getNewStart()); item.getItemProperty(endDateProperty).setValue(event.getNewEnd()); listenToContainerEvents(); } @@ -539,15 +540,15 @@ public class ContainerEventProvider implements CalendarEditableEventProvider, item = container.getItem(container.addItem()); } if (item != null) { - item.getItemProperty(getCaptionProperty()).setValue( - event.getCaption()); - item.getItemProperty(getStartDateProperty()).setValue( - event.getStart()); + item.getItemProperty(getCaptionProperty()) + .setValue(event.getCaption()); + item.getItemProperty(getStartDateProperty()) + .setValue(event.getStart()); item.getItemProperty(getEndDateProperty()).setValue(event.getEnd()); - item.getItemProperty(getStyleNameProperty()).setValue( - event.getStyleName()); - item.getItemProperty(getDescriptionProperty()).setValue( - event.getDescription()); + item.getItemProperty(getStyleNameProperty()) + .setValue(event.getStyleName()); + item.getItemProperty(getDescriptionProperty()) + .setValue(event.getDescription()); } } diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEvent.java b/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEvent.java index a1ccad2712..bd15e316f4 100644 --- a/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEvent.java +++ b/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEvent.java @@ -22,9 +22,9 @@ import java.util.List; import com.vaadin.ui.components.calendar.event.CalendarEvent.EventChangeNotifier; /** - * Simple implementation of - * {@link com.vaadin.addon.calendar.event.CalendarEvent CalendarEvent}. Has - * setters for all required fields and fires events when this event is changed. + * Simple implementation of {@link com.vaadin.addon.calendar.event.CalendarEvent + * CalendarEvent}. Has setters for all required fields and fires events when + * this event is changed. * * @since 7.1.0 * @author Vaadin Ltd. diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEventProvider.java b/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEventProvider.java index 9fa6baadad..0e18a382a2 100644 --- a/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEventProvider.java +++ b/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEventProvider.java @@ -93,11 +93,10 @@ public class BasicEventProvider implements CalendarEditableEventProvider, /* * (non-Javadoc) * - * @see - * com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventSetChangeNotifier - * #addListener - * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventSetChangeListener - * ) + * @see com.vaadin.addon.calendar.ui.CalendarComponentEvents. + * EventSetChangeNotifier #addListener + * (com.vaadin.addon.calendar.ui.CalendarComponentEvents. + * EventSetChangeListener ) */ @Override public void addEventSetChangeListener(EventSetChangeListener listener) { @@ -108,11 +107,10 @@ public class BasicEventProvider implements CalendarEditableEventProvider, /* * (non-Javadoc) * - * @see - * com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventSetChangeNotifier - * #removeListener - * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventSetChangeListener - * ) + * @see com.vaadin.addon.calendar.ui.CalendarComponentEvents. + * EventSetChangeNotifier #removeListener + * (com.vaadin.addon.calendar.ui.CalendarComponentEvents. + * EventSetChangeListener ) */ @Override public void removeEventSetChangeListener(EventSetChangeListener listener) { diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEvent.java b/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEvent.java index 2ad8c777ff..c6d2e03ebb 100644 --- a/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEvent.java +++ b/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEvent.java @@ -68,7 +68,8 @@ public interface CalendarEvent extends Serializable { * Gets style name of event. In the client, style name will be set to the * event's element class name and can be styled by CSS * </p> - * Styling example:</br> <code>Java code: </br> + * Styling example:</br> + * <code>Java code: </br> * event.setStyleName("color1"); * </br></br> * CSS:</br> diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java index 0e99b26856..41250a61e5 100644 --- a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java +++ b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java @@ -45,7 +45,8 @@ public class BasicBackwardHandler implements BackwardHandler { Date end = event.getComponent().getEndDate(); // calculate amount to move back - int durationInDays = (int) (((end.getTime()) - start.getTime()) / DateConstants.DAYINMILLIS); + int durationInDays = (int) (((end.getTime()) - start.getTime()) + / DateConstants.DAYINMILLIS); durationInDays++; // for week view durationInDays = -7, for day view durationInDays = -1 durationInDays = -durationInDays; diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java index 418e03d24a..5a9c27300b 100644 --- a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java +++ b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java @@ -52,8 +52,8 @@ public class BasicEventMoveHandler implements EventMoveHandler { // Update event dates long length = editableEvent.getEnd().getTime() - editableEvent.getStart().getTime(); - setDates(editableEvent, newFromTime, new Date(newFromTime.getTime() - + length)); + setDates(editableEvent, newFromTime, + new Date(newFromTime.getTime() + length)); } } diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java index 45b44cb673..6ba405364f 100644 --- a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java +++ b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java @@ -34,8 +34,8 @@ public class BasicForwardHandler implements ForwardHandler { /* * (non-Javadoc) * - * @see - * com.vaadin.addon.calendar.ui.CalendarComponentEvents.ForwardHandler#forward + * @see com.vaadin.addon.calendar.ui.CalendarComponentEvents.ForwardHandler# + * forward * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.ForwardEvent) */ @Override @@ -44,7 +44,8 @@ public class BasicForwardHandler implements ForwardHandler { Date end = event.getComponent().getEndDate(); // calculate amount to move forward - int durationInDays = (int) (((end.getTime()) - start.getTime()) / DateConstants.DAYINMILLIS); + int durationInDays = (int) (((end.getTime()) - start.getTime()) + / DateConstants.DAYINMILLIS); // for week view durationInDays = 7, for day view durationInDays = 1 durationInDays++; diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java index 81b178e4f0..dac20cba42 100644 --- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java +++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java @@ -28,8 +28,8 @@ import com.vaadin.ui.AbstractComponent; * * @since 7.0.0 */ -public class ColorPickerGradient extends AbstractComponent implements - ColorSelector { +public class ColorPickerGradient extends AbstractComponent + implements ColorSelector { private static final Method COLOR_CHANGE_METHOD; static { diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java index 002f36d99d..fdeb4ce8ff 100644 --- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java +++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java @@ -30,7 +30,8 @@ import com.vaadin.ui.AbstractComponent; * * @since 7.0.0 */ -public class ColorPickerGrid extends AbstractComponent implements ColorSelector { +public class ColorPickerGrid extends AbstractComponent + implements ColorSelector { private static final String STYLENAME = "v-colorpicker-grid"; diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java index a3297a282c..9c1f252c5a 100644 --- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java +++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java @@ -31,8 +31,8 @@ import com.vaadin.ui.CustomComponent; * * @since 7.0.0 */ -public class ColorPickerHistory extends CustomComponent implements - ColorSelector, ColorChangeListener { +public class ColorPickerHistory extends CustomComponent + implements ColorSelector, ColorChangeListener { private static final String STYLENAME = "v-colorpicker-history"; @@ -96,8 +96,8 @@ public class ColorPickerHistory extends CustomComponent implements @SuppressWarnings("unchecked") private ArrayBlockingQueue<Color> getColorHistory() { if (isAttached()) { - Object colorHistory = getSession().getAttribute( - "colorPickerHistory"); + Object colorHistory = getSession() + .getAttribute("colorPickerHistory"); if (colorHistory instanceof ArrayBlockingQueue<?>) { return (ArrayBlockingQueue<Color>) colorHistory; } diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java index d9055df35a..2fed3faae3 100644 --- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java +++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java @@ -29,8 +29,8 @@ import com.vaadin.ui.CssLayout; * * @since 7.0.0 */ -public class ColorPickerPreview extends CssLayout implements ColorSelector, - ValueChangeListener { +public class ColorPickerPreview extends CssLayout + implements ColorSelector, ValueChangeListener { private static final String STYLE_DARK_COLOR = "v-textfield-dark"; private static final String STYLE_LIGHT_COLOR = "v-textfield-light"; @@ -98,7 +98,8 @@ public class ColorPickerPreview extends CssLayout implements ColorSelector, // Set the text color field.removeStyleName(STYLE_DARK_COLOR); field.removeStyleName(STYLE_LIGHT_COLOR); - if (this.color.getRed() + this.color.getGreen() + this.color.getBlue() < 3 * 128) { + if (this.color.getRed() + this.color.getGreen() + + this.color.getBlue() < 3 * 128) { field.addStyleName(STYLE_DARK_COLOR); } else { field.addStyleName(STYLE_LIGHT_COLOR); @@ -147,7 +148,8 @@ public class ColorPickerPreview extends CssLayout implements ColorSelector, int green = Integer.parseInt(colors[1]); int blue = Integer.parseInt(colors[2]); if (colors.length > 3) { - int alpha = (int) (Double.parseDouble(colors[3]) * 255d); + int alpha = (int) (Double.parseDouble(colors[3]) + * 255d); color = new Color(red, green, blue, alpha); } else { color = new Color(red, green, blue); @@ -159,14 +161,15 @@ public class ColorPickerPreview extends CssLayout implements ColorSelector, value.length() - 1).split(","); int hue = Integer.parseInt(colors[0]); - int saturation = Integer.parseInt(colors[1] - .replace("%", "")); + int saturation = Integer + .parseInt(colors[1].replace("%", "")); int lightness = Integer .parseInt(colors[2].replace("%", "")); int rgb = Color.HSLtoRGB(hue, saturation, lightness); if (colors.length > 3) { - int alpha = (int) (Double.parseDouble(colors[3]) * 255d); + int alpha = (int) (Double.parseDouble(colors[3]) + * 255d); color = new Color(rgb); color.setAlpha(alpha); } else { diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java index 8e441b25ee..5ae3173ce0 100644 --- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java +++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java @@ -27,8 +27,8 @@ import com.vaadin.ui.VerticalLayout; * * @since 7.0.0 */ -public class ColorPickerSelect extends CustomComponent implements - ColorSelector, ValueChangeListener { +public class ColorPickerSelect extends CustomComponent + implements ColorSelector, ValueChangeListener { /** The range. */ private final ComboBox range; @@ -130,8 +130,8 @@ public class ColorPickerSelect extends CustomComponent implements value = 1f - ((row - (rows / 2f)) / (rows / 2f)); } - colors[row][col] = new Color(Color.HSVtoRGB(hue, - saturation, value)); + colors[row][col] = new Color( + Color.HSVtoRGB(hue, saturation, value)); } // The last row should have the black&white gradient @@ -140,8 +140,8 @@ public class ColorPickerSelect extends CustomComponent implements float saturation = 0f; float value = 1f - ((float) col / (float) columns); - colors[row][col] = new Color(Color.HSVtoRGB(hue, - saturation, value)); + colors[row][col] = new Color( + Color.HSVtoRGB(hue, saturation, value)); } } } @@ -182,12 +182,12 @@ public class ColorPickerSelect extends CustomComponent implements / (((float) rows * (float) columns) / 2f); } else { index -= ((rows * columns) / 2); - value = 1f - index - / (((float) rows * (float) columns) / 2f); + value = 1f + - index / (((float) rows * (float) columns) / 2f); } - colors[row][col] = new Color(Color.HSVtoRGB(hue, saturation, - value)); + colors[row][col] = new Color( + Color.HSVtoRGB(hue, saturation, value)); } } @@ -224,9 +224,11 @@ public class ColorPickerSelect extends CustomComponent implements grid.setColorGrid(createAllColors(14, 10)); } else if (event.getProperty().getValue() == ColorRangePropertyId.RED) { grid.setColorGrid(createColors(new Color(0xFF, 0, 0), 14, 10)); - } else if (event.getProperty().getValue() == ColorRangePropertyId.GREEN) { + } else if (event.getProperty() + .getValue() == ColorRangePropertyId.GREEN) { grid.setColorGrid(createColors(new Color(0, 0xFF, 0), 14, 10)); - } else if (event.getProperty().getValue() == ColorRangePropertyId.BLUE) { + } else if (event.getProperty() + .getValue() == ColorRangePropertyId.BLUE) { grid.setColorGrid(createColors(new Color(0, 0, 0xFF), 14, 10)); } } diff --git a/server/src/main/java/com/vaadin/ui/declarative/Design.java b/server/src/main/java/com/vaadin/ui/declarative/Design.java index a12cd65557..5c81a1efa2 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/Design.java +++ b/server/src/main/java/com/vaadin/ui/declarative/Design.java @@ -133,7 +133,8 @@ public class Design implements Serializable { * the design context for which the tag name is needed * @return the tag name corresponding to the component */ - public String componentToTag(Component component, DesignContext context); + public String componentToTag(Component component, + DesignContext context); } /** @@ -156,8 +157,7 @@ public class Design implements Serializable { int lastDot = fullyQualifiedClassName.lastIndexOf('.'); if (lastDot != -1) { String qualifiedInnerClassName = fullyQualifiedClassName - .substring(0, lastDot) - + "$" + .substring(0, lastDot) + "$" + fullyQualifiedClassName.substring(lastDot + 1); return createComponent(qualifiedInnerClassName, context); } else { @@ -165,14 +165,17 @@ public class Design implements Serializable { } } - assert Component.class.isAssignableFrom(componentClass) : "resolveComponentClass returned " - + componentClass + " which is not a Vaadin Component class"; + assert Component.class.isAssignableFrom( + componentClass) : "resolveComponentClass returned " + + componentClass + + " which is not a Vaadin Component class"; try { return componentClass.newInstance(); } catch (Exception e) { - throw new DesignException("Could not create component " - + fullyQualifiedClassName, e); + throw new DesignException( + "Could not create component " + fullyQualifiedClassName, + e); } } @@ -192,8 +195,8 @@ public class Design implements Serializable { Class<?> componentClass = Class.forName(qualifiedClassName); return componentClass.asSubclass(Component.class); } catch (ClassNotFoundException e) { - throw new DesignException( - "Unable to load component for design", e); + throw new DesignException("Unable to load component for design", + e); } } @@ -235,8 +238,8 @@ public class Design implements Serializable { } String qualifiedClassName = packageName + "." + className; - Component component = componentFactory.createComponent( - qualifiedClassName, context); + Component component = componentFactory + .createComponent(qualifiedClassName, context); if (component == null) { throw new DesignException("Got unexpected null component from " @@ -248,18 +251,19 @@ public class Design implements Serializable { } @Override - public String componentToTag(Component component, DesignContext context) { + public String componentToTag(Component component, + DesignContext context) { Class<?> componentClass = component.getClass(); String packageName = getPackageName(componentClass); String prefix = context.getPackagePrefix(packageName); if (prefix == null) { - prefix = packageName.replace('.', '_').toLowerCase( - Locale.ENGLISH); + prefix = packageName.replace('.', '_') + .toLowerCase(Locale.ENGLISH); context.addPackagePrefix(prefix, packageName); } prefix = prefix + "-"; - String className = classNameToElementName(componentClass - .getSimpleName()); + String className = classNameToElementName( + componentClass.getSimpleName()); String tagName = prefix + className; return tagName; @@ -488,8 +492,8 @@ public class Design implements Serializable { designContext.removeComponentCreationListener(creationListener); } else { // createChild creates the entire component hierarchy - componentRoot = element == null ? null : designContext - .readDesign(element); + componentRoot = element == null ? null + : designContext.readDesign(element); } designContext.setRootComponent(componentRoot); return designContext; @@ -559,10 +563,9 @@ public class Design implements Serializable { Class<? extends Component> annotatedClass = findClassWithAnnotation( rootComponent.getClass(), DesignRoot.class); if (annotatedClass == null) { - throw new IllegalArgumentException( - "The class " - + rootComponent.getClass().getName() - + " or any of its superclasses do not have an @DesignRoot annotation"); + throw new IllegalArgumentException("The class " + + rootComponent.getClass().getName() + + " or any of its superclasses do not have an @DesignRoot annotation"); } DesignRoot designAnnotation = annotatedClass @@ -649,12 +652,12 @@ public class Design implements Serializable { */ public static DesignContext read(String filename, Component rootComponent) throws DesignException { - InputStream stream = rootComponent.getClass().getResourceAsStream( - filename); + InputStream stream = rootComponent.getClass() + .getResourceAsStream(filename); if (stream == null) { - throw new DesignException("File " + filename - + " was not found in the package " - + rootComponent.getClass().getPackage().getName()); + throw new DesignException( + "File " + filename + " was not found in the package " + + rootComponent.getClass().getPackage().getName()); } try { return read(stream, rootComponent); @@ -687,7 +690,8 @@ public class Design implements Serializable { * @throws DesignException * If the design could not be loaded */ - public static DesignContext read(InputStream stream, Component rootComponent) { + public static DesignContext read(InputStream stream, + Component rootComponent) { if (stream == null) { throw new DesignException("Stream cannot be null"); } diff --git a/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java b/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java index 35cbf755d4..34ed98f113 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java +++ b/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java @@ -107,7 +107,8 @@ public class DesignAttributeHandler implements Serializable { } boolean success = false; try { - Method setter = findSetterForAttribute(target.getClass(), attribute); + Method setter = findSetterForAttribute(target.getClass(), + attribute); if (setter == null) { // if we don't have the setter, there is no point in continuing success = false; @@ -119,15 +120,12 @@ public class DesignAttributeHandler implements Serializable { success = true; } } catch (Exception e) { - getLogger().log( - Level.WARNING, - "Failed to set value \"" + value + "\" to attribute " - + attribute, e); + getLogger().log(Level.WARNING, "Failed to set value \"" + value + + "\" to attribute " + attribute, e); } if (!success) { - getLogger().info( - "property " + attribute - + " ignored by default attribute handler"); + getLogger().info("property " + attribute + + " ignored by default attribute handler"); } return success; } @@ -170,11 +168,12 @@ public class DesignAttributeHandler implements Serializable { + clazz.getName()); } AttributeCacheEntry entry = new AttributeCacheEntry(); - for (PropertyDescriptor descriptor : beanInfo.getPropertyDescriptors()) { + for (PropertyDescriptor descriptor : beanInfo + .getPropertyDescriptors()) { Method getter = descriptor.getReadMethod(); Method setter = descriptor.getWriteMethod(); - if (getter != null && setter != null - && getFormatter().canConvert(descriptor.getPropertyType())) { + if (getter != null && setter != null && getFormatter() + .canConvert(descriptor.getPropertyType())) { String attribute = toAttributeName(descriptor.getName()); entry.addAttribute(attribute, getter, setter); } @@ -210,10 +209,9 @@ public class DesignAttributeHandler implements Serializable { writeAttribute(attribute, attr, value, defaultValue, (Class) getter.getReturnType()); } catch (Exception e) { - getLogger() - .log(Level.SEVERE, - "Failed to invoke getter for attribute " - + attribute, e); + getLogger().log(Level.SEVERE, + "Failed to invoke getter for attribute " + attribute, + e); } } } @@ -234,15 +232,16 @@ public class DesignAttributeHandler implements Serializable { * the type of the input value */ public static <T> void writeAttribute(String attribute, - Attributes attributes, T value, T defaultValue, Class<T> inputType) { + Attributes attributes, T value, T defaultValue, + Class<T> inputType) { if (!getFormatter().canConvert(inputType)) { - throw new IllegalArgumentException("input type: " - + inputType.getName() + " not supported"); + throw new IllegalArgumentException( + "input type: " + inputType.getName() + " not supported"); } if (!SharedUtil.equals(value, defaultValue)) { String attributeValue = toAttributeValue(inputType, value); - if ("".equals(attributeValue) - && (inputType == boolean.class || inputType == Boolean.class)) { + if ("".equals(attributeValue) && (inputType == boolean.class + || inputType == Boolean.class)) { attributes.put(attribute, true); } else { attributes.put(attribute, attributeValue); @@ -288,8 +287,8 @@ public class DesignAttributeHandler implements Serializable { public static <T> T readAttribute(String attribute, Attributes attributes, Class<T> outputType) { if (!getFormatter().canConvert(outputType)) { - throw new IllegalArgumentException("output type: " - + outputType.getName() + " not supported"); + throw new IllegalArgumentException( + "output type: " + outputType.getName() + " not supported"); } if (!attributes.hasKey(attribute)) { return null; @@ -298,8 +297,8 @@ public class DesignAttributeHandler implements Serializable { String value = attributes.get(attribute); return getFormatter().parse(value, outputType); } catch (Exception e) { - throw new DesignException("Failed to read attribute " - + attribute, e); + throw new DesignException( + "Failed to read attribute " + attribute, e); } } } @@ -346,13 +345,12 @@ public class DesignAttributeHandler implements Serializable { // if this is a beginning of the string, the whole matched group is // written in lower case if (matcher.group(1).isEmpty()) { - matcher.appendReplacement(result, matched.toLowerCase() - + matcher.group(3)); + matcher.appendReplacement(result, + matched.toLowerCase() + matcher.group(3)); // otherwise the first character of the group stays uppercase, // while the others are lower case } else { - matcher.appendReplacement( - result, + matcher.appendReplacement(result, matcher.group(1) + matched.substring(0, 1) + matched.substring(1).toLowerCase() + matcher.group(3)); @@ -381,8 +379,8 @@ public class DesignAttributeHandler implements Serializable { // value is not null. How to represent null value in attributes? return ""; } - LegacyConverter<String, Object> converter = getFormatter().findConverterFor( - sourceType); + LegacyConverter<String, Object> converter = getFormatter() + .findConverterFor(sourceType); if (converter != null) { return converter.convertToPresentation(value, String.class, null); } else { @@ -431,7 +429,8 @@ public class DesignAttributeHandler implements Serializable { private static class AttributeCacheEntry implements Serializable { private Map<String, Method[]> accessMethods = new ConcurrentHashMap<String, Method[]>(); - private void addAttribute(String attribute, Method getter, Method setter) { + private void addAttribute(String attribute, Method getter, + Method setter) { Method[] methods = new Method[2]; methods[0] = getter; methods[1] = setter; @@ -492,7 +491,8 @@ public class DesignAttributeHandler implements Serializable { * @param alignment * the component alignment */ - public static void writeAlignment(Element childElement, Alignment alignment) { + public static void writeAlignment(Element childElement, + Alignment alignment) { if (alignment.isMiddle()) { childElement.attr(":middle", true); } else if (alignment.isBottom()) { diff --git a/server/src/main/java/com/vaadin/ui/declarative/DesignContext.java b/server/src/main/java/com/vaadin/ui/declarative/DesignContext.java index 82f1450adc..d153e1b13e 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/DesignContext.java +++ b/server/src/main/java/com/vaadin/ui/declarative/DesignContext.java @@ -391,8 +391,8 @@ public class DesignContext implements Serializable { if ("meta".equals(childElement.tagName())) { Attributes attributes = childElement.attributes(); if (attributes.hasKey("name") - && attributes.hasKey("content") - && "package-mapping".equals(attributes.get("name"))) { + && attributes.hasKey("content") && "package-mapping" + .equals(attributes.get("name"))) { String contentString = attributes.get("content"); String[] parts = contentString.split(":"); if (parts.length != 2) { @@ -422,7 +422,8 @@ public class DesignContext implements Serializable { for (String prefix : getPackagePrefixes()) { // Only store the prefix-name mapping if it is not a default mapping // (such as "vaadin" -> "com.vaadin.ui") - if (!VAADIN_PREFIX.equals(prefix) && !LEGACY_PREFIX.equals(prefix)) { + if (!VAADIN_PREFIX.equals(prefix) + && !LEGACY_PREFIX.equals(prefix)) { Node newNode = doc.createElement("meta"); newNode.attr("name", "package-mapping"); String prefixToPackageName = prefix + ":" + getPackage(prefix); @@ -623,7 +624,8 @@ public class DesignContext implements Serializable { * @param listener * the component creation listener to be added */ - public void addComponentCreationListener(ComponentCreationListener listener) { + public void addComponentCreationListener( + ComponentCreationListener listener) { listeners.add(listener); } @@ -646,7 +648,8 @@ public class DesignContext implements Serializable { * @param component * the component that was created */ - private void fireComponentCreatedEvent(String localId, Component component) { + private void fireComponentCreatedEvent(String localId, + Component component) { ComponentCreatedEvent event = new ComponentCreatedEvent(localId, component); for (ComponentCreationListener listener : listeners) { diff --git a/server/src/main/java/com/vaadin/ui/declarative/DesignException.java b/server/src/main/java/com/vaadin/ui/declarative/DesignException.java index 01482f84b0..85204cad14 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/DesignException.java +++ b/server/src/main/java/com/vaadin/ui/declarative/DesignException.java @@ -19,7 +19,7 @@ package com.vaadin.ui.declarative; /** * An exception that is used when reading or writing a design fails. * - * @since 7.4 + * @since 7.4 * @author Vaadin Ltd */ public class DesignException extends RuntimeException { diff --git a/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java b/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java index c5b67a06d8..bced72f98f 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java @@ -145,12 +145,13 @@ public class DesignFormatter implements Serializable { final DecimalFormat bigDecimalFmt = new DecimalFormat("0.###", symbols); bigDecimalFmt.setGroupingUsed(false); bigDecimalFmt.setParseBigDecimal(true); - converterMap.put(BigDecimal.class, new LegacyStringToBigDecimalConverter() { - @Override - protected NumberFormat getFormat(Locale locale) { - return bigDecimalFmt; - }; - }); + converterMap.put(BigDecimal.class, + new LegacyStringToBigDecimalConverter() { + @Override + protected NumberFormat getFormat(Locale locale) { + return bigDecimalFmt; + }; + }); // strings do nothing converterMap.put(String.class, new LegacyConverter<String, String>() { @@ -275,7 +276,8 @@ public class DesignFormatter implements Serializable { * registered converter. */ public String format(Object object) { - return format(object, object == null ? Object.class : object.getClass()); + return format(object, + object == null ? Object.class : object.getClass()); } /** @@ -292,8 +294,8 @@ public class DesignFormatter implements Serializable { if (object == null) { return null; } else { - LegacyConverter<String, Object> converter = findConverterFor(object - .getClass()); + LegacyConverter<String, Object> converter = findConverterFor( + object.getClass()); return converter.convertToPresentation(object, String.class, null); } } @@ -339,7 +341,8 @@ public class DesignFormatter implements Serializable { } else if (!strict) { for (Class<?> supported : converterMap.keySet()) { if (supported.isAssignableFrom(sourceType)) { - return ((LegacyConverter<String, T>) converterMap.get(supported)); + return ((LegacyConverter<String, T>) converterMap + .get(supported)); } } } @@ -388,8 +391,8 @@ public class DesignFormatter implements Serializable { if (input == null) { return null; } - return input.replace("&", "&").replace(">", ">") - .replace("<", "<"); + return input.replace("&", "&").replace(">", ">").replace("<", + "<"); } /** diff --git a/server/src/main/java/com/vaadin/ui/declarative/FieldBinder.java b/server/src/main/java/com/vaadin/ui/declarative/FieldBinder.java index 3766458175..74dca23639 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/FieldBinder.java +++ b/server/src/main/java/com/vaadin/ui/declarative/FieldBinder.java @@ -152,9 +152,8 @@ public class FieldBinder implements Serializable { if (!success) { String idInfo = "localId: " + localId + " id: " + instance.getId() + " caption: " + instance.getCaption(); - getLogger().finest( - "Could not bind component to a field " - + instance.getClass().getName() + " " + idInfo); + getLogger().finest("Could not bind component to a field " + + instance.getClass().getName() + " " + idInfo); } return success; } @@ -173,7 +172,8 @@ public class FieldBinder implements Serializable { * @throws FieldBindingException * if error occurs when trying to bind the instance to a field */ - private boolean bindFieldByIdentifier(String identifier, Component instance) { + private boolean bindFieldByIdentifier(String identifier, + Component instance) { try { // create and validate field name String fieldName = asFieldName(identifier); @@ -183,27 +183,26 @@ public class FieldBinder implements Serializable { // validate that the field can be found Field field = fieldMap.get(fieldName.toLowerCase(Locale.ENGLISH)); if (field == null) { - getLogger().fine( - "No field was found by identifier " + identifier); + getLogger() + .fine("No field was found by identifier " + identifier); return false; } // validate that the field is not set Object fieldValue = getFieldValue(bindTarget, field); if (fieldValue != null) { - getLogger().fine( - "The field \"" + fieldName - + "\" was already mapped. Ignoring."); + getLogger().fine("The field \"" + fieldName + + "\" was already mapped. Ignoring."); } else { // set the field value field.set(bindTarget, instance); } return true; } catch (IllegalAccessException e) { - throw new FieldBindingException("Field binding failed for " - + identifier, e); + throw new FieldBindingException( + "Field binding failed for " + identifier, e); } catch (IllegalArgumentException e) { - throw new FieldBindingException("Field binding failed for " - + identifier, e); + throw new FieldBindingException( + "Field binding failed for " + identifier, e); } } diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java index 57a1682261..a006d88bf6 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java @@ -40,7 +40,8 @@ import com.vaadin.ui.declarative.DesignAttributeHandler; * @author Vaadin Ltd */ @SuppressWarnings("serial") -public class DesignResourceConverter implements LegacyConverter<String, Resource> { +public class DesignResourceConverter + implements LegacyConverter<String, Resource> { @Override public Resource convertToModel(String value, @@ -73,8 +74,8 @@ public class DesignResourceConverter implements LegacyConverter<String, Resource if (byType != null) { return byType.format(value); } else { - throw new LegacyConverter.ConversionException("unknown Resource type - " - + value.getClass().getName()); + throw new LegacyConverter.ConversionException( + "unknown Resource type - " + value.getClass().getName()); } } @@ -94,8 +95,8 @@ public class DesignResourceConverter implements LegacyConverter<String, Resource public Resource parse(String value); } - private static enum ResourceConverterByProtocol implements - ProtocolResourceConverter { + private static enum ResourceConverterByProtocol + implements ProtocolResourceConverter { HTTP, HTTPS, FTP, FTPS, THEME { @@ -125,7 +126,8 @@ public class DesignResourceConverter implements LegacyConverter<String, Resource } catch (IllegalArgumentException iae) { throw new ConversionException( "Unknown codepoint in FontAwesome: " - + codepoint, iae); + + codepoint, + iae); } } @@ -154,17 +156,17 @@ public class DesignResourceConverter implements LegacyConverter<String, Resource try { return FontAwesome.valueOf(iconName); } catch (IllegalArgumentException iae) { - throw new ConversionException("Unknown FontIcon constant: " - + iconName, iae); + throw new ConversionException( + "Unknown FontIcon constant: " + iconName, iae); } } @Override public String format(Resource value) throws LegacyConverter.ConversionException { - throw new UnsupportedOperationException("Use " - + ResourceConverterByProtocol.FONTICON.toString() - + " instead"); + throw new UnsupportedOperationException( + "Use " + ResourceConverterByProtocol.FONTICON.toString() + + " instead"); } }, FILE { diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java index e310222d46..04738f4043 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java @@ -32,8 +32,8 @@ import com.vaadin.legacy.data.util.converter.LegacyConverter; * @since 7.4 * @author Vaadin Ltd */ -public class DesignShortcutActionConverter implements - LegacyConverter<String, ShortcutAction> { +public class DesignShortcutActionConverter + implements LegacyConverter<String, ShortcutAction> { private final Map<Integer, String> keyCodeMap; private final Map<String, Integer> presentationMap; @@ -135,8 +135,8 @@ public class DesignShortcutActionConverter implements String keyCodePart = parts[parts.length - 1]; int keyCode = getKeycodeForString(keyCodePart); if (keyCode < 0) { - throw new IllegalArgumentException("Invalid key '" - + keyCodePart + "'"); + throw new IllegalArgumentException( + "Invalid key '" + keyCodePart + "'"); } // handle modifiers int[] modifiers = null; @@ -148,14 +148,15 @@ public class DesignShortcutActionConverter implements if (modifier > 0) { modifiers[i] = modifier; } else { - throw new IllegalArgumentException("Invalid modifier '" - + parts[i] + "'"); + throw new IllegalArgumentException( + "Invalid modifier '" + parts[i] + "'"); } } return new ShortcutAction(data.length == 2 ? data[1] : null, keyCode, modifiers); } catch (Exception e) { - throw new ConversionException("Invalid shortcut '" + value + "'", e); + throw new ConversionException("Invalid shortcut '" + value + "'", + e); } } diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java index a15231b10f..2fe66285c8 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java @@ -28,7 +28,8 @@ import com.vaadin.ui.declarative.DesignAttributeHandler; * @since 7.4 * @author Vaadin Ltd */ -public class DesignTimeZoneConverter implements LegacyConverter<String, TimeZone> { +public class DesignTimeZoneConverter + implements LegacyConverter<String, TimeZone> { @Override public TimeZone convertToModel(String value, diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignToStringConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignToStringConverter.java index 0af6905dc8..8878b1b4f1 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignToStringConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignToStringConverter.java @@ -30,7 +30,8 @@ import com.vaadin.ui.declarative.DesignAttributeHandler; * @param <TYPE> * Type of the data being converted. */ -public class DesignToStringConverter<TYPE> implements LegacyConverter<String, TYPE> { +public class DesignToStringConverter<TYPE> + implements LegacyConverter<String, TYPE> { private final Class<? extends TYPE> type; @@ -74,9 +75,8 @@ public class DesignToStringConverter<TYPE> implements LegacyConverter<String, TY public TYPE convertToModel(String value, Class<? extends TYPE> targetType, Locale locale) throws LegacyConverter.ConversionException { try { - return type.cast(type - .getMethod(this.staticMethodName, String.class).invoke( - null, value)); + return type.cast(type.getMethod(this.staticMethodName, String.class) + .invoke(null, value)); } catch (IllegalAccessException e) { throw new LegacyConverter.ConversionException(e); } catch (IllegalArgumentException e) { diff --git a/server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java index 91a5c0ea45..f032d13cae 100644 --- a/server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java +++ b/server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java @@ -109,7 +109,8 @@ import elemental.json.JsonValue; * @author Vaadin Ltd * @since 7.4 */ -public abstract class AbstractJavaScriptRenderer<T> extends AbstractRenderer<T> { +public abstract class AbstractJavaScriptRenderer<T> + extends AbstractRenderer<T> { private JavaScriptCallbackHelper callbackHelper = new JavaScriptCallbackHelper( this); @@ -143,7 +144,8 @@ public abstract class AbstractJavaScriptRenderer<T> extends AbstractRenderer<T> * the {@link JavaScriptFunction} object that will be invoked * when the JavaScript function is called */ - protected void addFunction(String functionName, JavaScriptFunction function) { + protected void addFunction(String functionName, + JavaScriptFunction function) { callbackHelper.registerCallback(functionName, function); } diff --git a/server/src/main/java/com/vaadin/ui/renderers/DateRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/DateRenderer.java index dddeb6cd77..9f846c16e4 100644 --- a/server/src/main/java/com/vaadin/ui/renderers/DateRenderer.java +++ b/server/src/main/java/com/vaadin/ui/renderers/DateRenderer.java @@ -87,8 +87,8 @@ public class DateRenderer extends AbstractRenderer<Date> { * the format string with which to format the date * @throws IllegalArgumentException * if {@code formatString} is {@code null} - * @see <a - * href="http://docs.oracle.com/javase/7/docs/api/java/util/Formatter.html#syntax">Format + * @see <a href= + * "http://docs.oracle.com/javase/7/docs/api/java/util/Formatter.html#syntax">Format * String Syntax</a> */ public DateRenderer(String formatString) throws IllegalArgumentException { @@ -107,8 +107,8 @@ public class DateRenderer extends AbstractRenderer<Date> { * the textual representation of {@code null} value * @throws IllegalArgumentException * if {@code formatString} is {@code null} - * @see <a - * href="http://docs.oracle.com/javase/7/docs/api/java/util/Formatter.html#syntax">Format + * @see <a href= + * "http://docs.oracle.com/javase/7/docs/api/java/util/Formatter.html#syntax">Format * String Syntax</a> */ public DateRenderer(String formatString, String nullRepresentation) @@ -128,8 +128,8 @@ public class DateRenderer extends AbstractRenderer<Date> { * the locale to use * @throws IllegalArgumentException * if either argument is {@code null} - * @see <a - * href="http://docs.oracle.com/javase/7/docs/api/java/util/Formatter.html#syntax">Format + * @see <a href= + * "http://docs.oracle.com/javase/7/docs/api/java/util/Formatter.html#syntax">Format * String Syntax</a> */ public DateRenderer(String formatString, Locale locale) @@ -151,8 +151,8 @@ public class DateRenderer extends AbstractRenderer<Date> { * the textual representation of {@code null} value * @throws IllegalArgumentException * if either argument is {@code null} - * @see <a - * href="http://docs.oracle.com/javase/7/docs/api/java/util/Formatter.html#syntax">Format + * @see <a href= + * "http://docs.oracle.com/javase/7/docs/api/java/util/Formatter.html#syntax">Format * String Syntax</a> */ public DateRenderer(String formatString, Locale locale, diff --git a/server/src/main/java/com/vaadin/ui/renderers/ImageRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/ImageRenderer.java index ad7d5cae2b..dbd73b14ed 100644 --- a/server/src/main/java/com/vaadin/ui/renderers/ImageRenderer.java +++ b/server/src/main/java/com/vaadin/ui/renderers/ImageRenderer.java @@ -55,7 +55,8 @@ public class ImageRenderer extends ClickableRenderer<Resource> { @Override public JsonValue encode(Resource resource) { - if (!(resource == null || resource instanceof ExternalResource || resource instanceof ThemeResource)) { + if (!(resource == null || resource instanceof ExternalResource + || resource instanceof ThemeResource)) { throw new IllegalArgumentException( "ImageRenderer only supports ExternalResource and ThemeResource (" + resource.getClass().getSimpleName() + " given)"); diff --git a/server/src/main/java/com/vaadin/ui/renderers/NumberRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/NumberRenderer.java index b1ba309c9a..a795bdc8c1 100644 --- a/server/src/main/java/com/vaadin/ui/renderers/NumberRenderer.java +++ b/server/src/main/java/com/vaadin/ui/renderers/NumberRenderer.java @@ -128,8 +128,8 @@ public class NumberRenderer extends AbstractRenderer<Number> { * the format string with which to format the number * @throws IllegalArgumentException * if {@code formatString} is {@code null} - * @see <a - * href="http://docs.oracle.com/javase/7/docs/api/java/util/Formatter.html#syntax">Format + * @see <a href= + * "http://docs.oracle.com/javase/7/docs/api/java/util/Formatter.html#syntax">Format * String Syntax</a> */ public NumberRenderer(String formatString) throws IllegalArgumentException { @@ -148,8 +148,8 @@ public class NumberRenderer extends AbstractRenderer<Number> { * the locale in which to present numbers * @throws IllegalArgumentException * if either argument is {@code null} - * @see <a - * href="http://docs.oracle.com/javase/7/docs/api/java/util/Formatter.html#syntax">Format + * @see <a href= + * "http://docs.oracle.com/javase/7/docs/api/java/util/Formatter.html#syntax">Format * String Syntax</a> */ public NumberRenderer(String formatString, Locale locale, @@ -179,9 +179,9 @@ public class NumberRenderer extends AbstractRenderer<Number> { } else if (numberFormat != null) { stringValue = numberFormat.format(value); } else { - throw new IllegalStateException(String.format("Internal bug: " - + "%s is in an illegal state: " - + "[locale: %s, numberFormat: %s, formatString: %s]", + throw new IllegalStateException(String.format( + "Internal bug: " + "%s is in an illegal state: " + + "[locale: %s, numberFormat: %s, formatString: %s]", getClass().getSimpleName(), locale, numberFormat, formatString)); } diff --git a/server/src/main/java/com/vaadin/ui/themes/Reindeer.java b/server/src/main/java/com/vaadin/ui/themes/Reindeer.java index e0ab792a15..1d7b2a10da 100644 --- a/server/src/main/java/com/vaadin/ui/themes/Reindeer.java +++ b/server/src/main/java/com/vaadin/ui/themes/Reindeer.java @@ -165,7 +165,7 @@ public class Reindeer extends BaseTheme { * {@link FormLayout}, {@link CssLayout}, {@link VerticalSplitPanel} and * {@link HorizontalSplitPanel}. * <p> - * <em>Does not revert any contained components back to normal if some + * <em>Does not revert any contained components back to normal if some * parent layout has style {@link #LAYOUT_BLACK} applied.</em> */ public static final String LAYOUT_WHITE = "white"; @@ -176,7 +176,7 @@ public class Reindeer extends BaseTheme { * {@link FormLayout}, {@link CssLayout}, {@link VerticalSplitPanel} and * {@link HorizontalSplitPanel}. * <p> - * <em>Does not revert any contained components back to normal if some + * <em>Does not revert any contained components back to normal if some * parent layout has style {@link #LAYOUT_BLACK} applied.</em> */ public static final String LAYOUT_BLUE = "blue"; diff --git a/server/src/main/java/com/vaadin/util/CurrentInstance.java b/server/src/main/java/com/vaadin/util/CurrentInstance.java index e6b58ec65c..62fffb91d4 100644 --- a/server/src/main/java/com/vaadin/util/CurrentInstance.java +++ b/server/src/main/java/com/vaadin/util/CurrentInstance.java @@ -134,7 +134,8 @@ public class CurrentInstance implements Serializable { } } - private static void removeStaleInstances(Map<Class<?>, CurrentInstance> map) { + private static void removeStaleInstances( + Map<Class<?>, CurrentInstance> map) { for (Iterator<Entry<Class<?>, CurrentInstance>> iterator = map .entrySet().iterator(); iterator.hasNext();) { Entry<Class<?>, CurrentInstance> entry = iterator.next(); @@ -203,14 +204,12 @@ public class CurrentInstance implements Serializable { instances.set(map); } - previousInstance = map.put(type, new CurrentInstance(instance, - inheritable)); + previousInstance = map.put(type, + new CurrentInstance(instance, inheritable)); if (previousInstance != null) { assert previousInstance.inheritable == inheritable : "Inheritable status mismatch for " - + type - + " (previous was " - + previousInstance.inheritable - + ", new is " + + type + " (previous was " + + previousInstance.inheritable + ", new is " + inheritable + ")"; } } diff --git a/server/src/main/java/com/vaadin/util/SerializerHelper.java b/server/src/main/java/com/vaadin/util/SerializerHelper.java index 793488d892..c0f852923f 100644 --- a/server/src/main/java/com/vaadin/util/SerializerHelper.java +++ b/server/src/main/java/com/vaadin/util/SerializerHelper.java @@ -142,8 +142,8 @@ public class SerializerHelper { * @throws IOException * Rethrows IOExceptions from the ObjectInputStream */ - public static Class<?> readClass(ObjectInputStream in) throws IOException, - ClassNotFoundException { + public static Class<?> readClass(ObjectInputStream in) + throws IOException, ClassNotFoundException { String className = (String) in.readObject(); if (className == null) { return null; diff --git a/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTest.java b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTest.java index b9769edbd9..e4aa59cdd7 100644 --- a/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTest.java +++ b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTest.java @@ -67,13 +67,14 @@ public class FieldGroupTest { group.bind(field, "name"); Property propertyDataSource = field.getPropertyDataSource(); - Assert.assertTrue("Custom implementation of transactional property " - + "has not been used", + Assert.assertTrue( + "Custom implementation of transactional property " + + "has not been used", propertyDataSource instanceof TransactionalPropertyImpl); } - public static class TransactionalPropertyImpl<T> extends - TransactionalPropertyWrapper<T> { + public static class TransactionalPropertyImpl<T> + extends TransactionalPropertyWrapper<T> { public TransactionalPropertyImpl(Property<T> wrappedProperty) { super(wrappedProperty); diff --git a/server/src/test/java/com/vaadin/data/util/AbstractBeanContainerTestBase.java b/server/src/test/java/com/vaadin/data/util/AbstractBeanContainerTestBase.java index 3d8f08a7ef..9073168016 100644 --- a/server/src/test/java/com/vaadin/data/util/AbstractBeanContainerTestBase.java +++ b/server/src/test/java/com/vaadin/data/util/AbstractBeanContainerTestBase.java @@ -6,8 +6,8 @@ package com.vaadin.data.util; * Only a limited subset of the functionality is tested here, the rest in tests * of subclasses including {@link BeanItemContainer} and {@link BeanContainer}. */ -public abstract class AbstractBeanContainerTestBase extends - AbstractInMemoryContainerTestBase { +public abstract class AbstractBeanContainerTestBase + extends AbstractInMemoryContainerTestBase { public static class Person { private String name; diff --git a/server/src/test/java/com/vaadin/data/util/AbstractContainerTestBase.java b/server/src/test/java/com/vaadin/data/util/AbstractContainerTestBase.java index 644f703d9e..955b609735 100644 --- a/server/src/test/java/com/vaadin/data/util/AbstractContainerTestBase.java +++ b/server/src/test/java/com/vaadin/data/util/AbstractContainerTestBase.java @@ -82,8 +82,8 @@ public abstract class AbstractContainerTestBase { // current containers protected void validateContainer(Container container, Object expectedFirstItemId, Object expectedLastItemId, - Object itemIdInSet, Object itemIdNotInSet, - boolean checkGetItemNull, int expectedSize) { + Object itemIdInSet, Object itemIdNotInSet, boolean checkGetItemNull, + int expectedSize) { Container.Indexed indexed = null; if (container instanceof Container.Indexed) { indexed = (Container.Indexed) container; @@ -115,8 +115,8 @@ public abstract class AbstractContainerTestBase { // getContainerProperty for (Object propId : container.getContainerPropertyIds()) { if (checkGetItemNull) { - assertNull(container.getContainerProperty(itemIdNotInSet, - propId)); + assertNull( + container.getContainerProperty(itemIdNotInSet, propId)); } assertNotNull(container.getContainerProperty(itemIdInSet, propId)); } @@ -154,8 +154,8 @@ public abstract class AbstractContainerTestBase { } // getItemProperty - Assert.assertNull(container.getItem(itemIdInSet).getItemProperty( - "notinset")); + Assert.assertNull( + container.getItem(itemIdInSet).getItemProperty("notinset")); } @@ -271,7 +271,8 @@ public abstract class AbstractContainerTestBase { Assert.assertNotNull(item); Assert.assertTrue(container.containsId("foo")); Assert.assertEquals(item, container.getItem("foo")); - Assert.assertEquals("foo", container.getItemIds().iterator().next()); + Assert.assertEquals("foo", + container.getItemIds().iterator().next()); Item itemAtEnd = container.addItemAfter(0, "atend"); Assert.assertNotNull(itemAtEnd); @@ -466,7 +467,8 @@ public abstract class AbstractContainerTestBase { container.addItemAt(itemPosition, newItemId); Assert.assertEquals(itemPosition, container.indexOfId(newItemId)); Assert.assertEquals(itemPosition + 1, container.indexOfId(itemId)); - Assert.assertEquals(newItemId, container.getIdByIndex(itemPosition)); + Assert.assertEquals(newItemId, + container.getIdByIndex(itemPosition)); Assert.assertEquals(itemId, container.getIdByIndex(itemPosition + 1)); Assert.assertTrue(container.removeItem(newItemId)); @@ -504,7 +506,8 @@ public abstract class AbstractContainerTestBase { container.addContainerFilter(filter1); assertTrue(container.getContainerFilters().size() == 1); - assertEquals(filter1, container.getContainerFilters().iterator().next()); + assertEquals(filter1, + container.getContainerFilters().iterator().next()); validateContainer(container, "com.vaadin.data.BufferedValidatable", "com.vaadin.ui.TabSheet", @@ -521,7 +524,8 @@ public abstract class AbstractContainerTestBase { container.addContainerFilter(filter2); assertTrue(container.getContainerFilters().size() == 1); - assertEquals(filter2, container.getContainerFilters().iterator().next()); + assertEquals(filter2, + container.getContainerFilters().iterator().next()); validateContainer(container, "com.vaadin.data.Buffered", "com.vaadin.server.ComponentSizeValidator", @@ -540,7 +544,8 @@ public abstract class AbstractContainerTestBase { return true; } - protected void testContainerSortingAndFiltering(Container.Sortable sortable) { + protected void testContainerSortingAndFiltering( + Container.Sortable sortable) { Filterable filterable = (Filterable) sortable; initializeContainer(sortable); @@ -550,8 +555,8 @@ public abstract class AbstractContainerTestBase { FULLY_QUALIFIED_NAME, "ab", false, false)); // Must be able to sort based on PROP1 for this test - assertTrue(sortable.getSortableContainerPropertyIds().contains( - FULLY_QUALIFIED_NAME)); + assertTrue(sortable.getSortableContainerPropertyIds() + .contains(FULLY_QUALIFIED_NAME)); sortable.sort(new Object[] { FULLY_QUALIFIED_NAME }, new boolean[] { true }); @@ -568,10 +573,10 @@ public abstract class AbstractContainerTestBase { initializeContainer(container); // Must be able to sort based on PROP1 for this test - assertTrue(sortable.getSortableContainerPropertyIds().contains( - FULLY_QUALIFIED_NAME)); - assertTrue(sortable.getSortableContainerPropertyIds().contains( - REVERSE_FULLY_QUALIFIED_NAME)); + assertTrue(sortable.getSortableContainerPropertyIds() + .contains(FULLY_QUALIFIED_NAME)); + assertTrue(sortable.getSortableContainerPropertyIds() + .contains(REVERSE_FULLY_QUALIFIED_NAME)); sortable.sort(new Object[] { FULLY_QUALIFIED_NAME }, new boolean[] { true }); @@ -609,10 +614,10 @@ public abstract class AbstractContainerTestBase { Item item = container.addItem(id); item.getItemProperty(FULLY_QUALIFIED_NAME).setValue(sampleData[i]); - item.getItemProperty(SIMPLE_NAME).setValue( - getSimpleName(sampleData[i])); - item.getItemProperty(REVERSE_FULLY_QUALIFIED_NAME).setValue( - reverse(sampleData[i])); + item.getItemProperty(SIMPLE_NAME) + .setValue(getSimpleName(sampleData[i])); + item.getItemProperty(REVERSE_FULLY_QUALIFIED_NAME) + .setValue(reverse(sampleData[i])); item.getItemProperty(ID_NUMBER).setValue(i); } } @@ -817,13 +822,11 @@ public abstract class AbstractContainerTestBase { "com.vaadin.server.widgetsetutils.WidgetMapGenerator", "com.vaadin.server.widgetsetutils.WidgetSetBuilder", "com.vaadin.server.KeyMapper", "com.vaadin.server.Paintable", - "com.vaadin.server.PaintException", - "com.vaadin.server.PaintTarget", + "com.vaadin.server.PaintException", "com.vaadin.server.PaintTarget", "com.vaadin.server.ParameterHandler", "com.vaadin.server.Resource", "com.vaadin.server.Scrollable", "com.vaadin.server.Sizeable", - "com.vaadin.server.StreamResource", - "com.vaadin.server.SystemError", "com.vaadin.server.Terminal", - "com.vaadin.server.ThemeResource", + "com.vaadin.server.StreamResource", "com.vaadin.server.SystemError", + "com.vaadin.server.Terminal", "com.vaadin.server.ThemeResource", "com.vaadin.server.UploadStream", "com.vaadin.server.URIHandler", "com.vaadin.server.UserError", "com.vaadin.server.VariableOwner", "com.vaadin.tools.ReflectTools", @@ -845,19 +848,19 @@ public abstract class AbstractContainerTestBase { "com.vaadin.ui.Form", "com.vaadin.ui.FormFieldFactory", "com.vaadin.ui.FormLayout", "com.vaadin.ui.GridLayout", "com.vaadin.ui.HorizontalLayout", "com.vaadin.ui.InlineDateField", - "com.vaadin.ui.Label", "com.vaadin.ui.Layout", - "com.vaadin.ui.Link", "com.vaadin.ui.ListSelect", - "com.vaadin.ui.LoginForm", "com.vaadin.ui.MenuBar", - "com.vaadin.ui.NativeButton", "com.vaadin.ui.NativeSelect", - "com.vaadin.ui.OptionGroup", "com.vaadin.ui.OrderedLayout", - "com.vaadin.ui.Panel", "com.vaadin.ui.PopupDateField", - "com.vaadin.ui.PopupView", "com.vaadin.ui.ProgressIndicator", - "com.vaadin.ui.RichTextArea", "com.vaadin.ui.Select", - "com.vaadin.ui.Slider", "com.vaadin.ui.SplitPanel", - "com.vaadin.ui.Table", "com.vaadin.ui.TableFieldFactory", - "com.vaadin.ui.TabSheet", "com.vaadin.ui.TextField", - "com.vaadin.ui.Tree", "com.vaadin.ui.TwinColSelect", - "com.vaadin.ui.Upload", "com.vaadin.ui.UriFragmentUtility", - "com.vaadin.ui.VerticalLayout", "com.vaadin.ui.Window", - "com.vaadin.util.SerializerHelper", "org.vaadin.test.LastClass" }; + "com.vaadin.ui.Label", "com.vaadin.ui.Layout", "com.vaadin.ui.Link", + "com.vaadin.ui.ListSelect", "com.vaadin.ui.LoginForm", + "com.vaadin.ui.MenuBar", "com.vaadin.ui.NativeButton", + "com.vaadin.ui.NativeSelect", "com.vaadin.ui.OptionGroup", + "com.vaadin.ui.OrderedLayout", "com.vaadin.ui.Panel", + "com.vaadin.ui.PopupDateField", "com.vaadin.ui.PopupView", + "com.vaadin.ui.ProgressIndicator", "com.vaadin.ui.RichTextArea", + "com.vaadin.ui.Select", "com.vaadin.ui.Slider", + "com.vaadin.ui.SplitPanel", "com.vaadin.ui.Table", + "com.vaadin.ui.TableFieldFactory", "com.vaadin.ui.TabSheet", + "com.vaadin.ui.TextField", "com.vaadin.ui.Tree", + "com.vaadin.ui.TwinColSelect", "com.vaadin.ui.Upload", + "com.vaadin.ui.UriFragmentUtility", "com.vaadin.ui.VerticalLayout", + "com.vaadin.ui.Window", "com.vaadin.util.SerializerHelper", + "org.vaadin.test.LastClass" }; } diff --git a/server/src/test/java/com/vaadin/data/util/AbstractHierarchicalContainerTestBase.java b/server/src/test/java/com/vaadin/data/util/AbstractHierarchicalContainerTestBase.java index 7a07c553f7..f3eda74100 100644 --- a/server/src/test/java/com/vaadin/data/util/AbstractHierarchicalContainerTestBase.java +++ b/server/src/test/java/com/vaadin/data/util/AbstractHierarchicalContainerTestBase.java @@ -13,8 +13,8 @@ import com.vaadin.data.Container.Hierarchical; import com.vaadin.data.Container.Sortable; import com.vaadin.data.Item; -public abstract class AbstractHierarchicalContainerTestBase extends - AbstractContainerTestBase { +public abstract class AbstractHierarchicalContainerTestBase + extends AbstractContainerTestBase { /** * @param container @@ -45,9 +45,8 @@ public abstract class AbstractHierarchicalContainerTestBase extends */ protected void validateHierarchicalContainer(Hierarchical container, Object expectedFirstItemId, Object expectedLastItemId, - Object itemIdInSet, Object itemIdNotInSet, - boolean checkGetItemNull, int expectedSize, int expectedRootSize, - boolean rootsHaveChildren) { + Object itemIdInSet, Object itemIdNotInSet, boolean checkGetItemNull, + int expectedSize, int expectedRootSize, boolean rootsHaveChildren) { validateContainer(container, expectedFirstItemId, expectedLastItemId, itemIdInSet, itemIdNotInSet, checkGetItemNull, expectedSize); @@ -166,10 +165,10 @@ public abstract class AbstractHierarchicalContainerTestBase extends initializeContainer(container); // Must be able to sort based on PROP1 and PROP2 for this test - assertTrue(sortable.getSortableContainerPropertyIds().contains( - FULLY_QUALIFIED_NAME)); - assertTrue(sortable.getSortableContainerPropertyIds().contains( - REVERSE_FULLY_QUALIFIED_NAME)); + assertTrue(sortable.getSortableContainerPropertyIds() + .contains(FULLY_QUALIFIED_NAME)); + assertTrue(sortable.getSortableContainerPropertyIds() + .contains(REVERSE_FULLY_QUALIFIED_NAME)); sortable.sort(new Object[] { FULLY_QUALIFIED_NAME }, new boolean[] { true }); @@ -218,8 +217,8 @@ public abstract class AbstractHierarchicalContainerTestBase extends Item item = container.getItem(path); item.getItemProperty(FULLY_QUALIFIED_NAME).setValue(path); item.getItemProperty(SIMPLE_NAME).setValue(getSimpleName(path)); - item.getItemProperty(REVERSE_FULLY_QUALIFIED_NAME).setValue( - reverse(path)); + item.getItemProperty(REVERSE_FULLY_QUALIFIED_NAME) + .setValue(reverse(path)); item.getItemProperty(ID_NUMBER).setValue(1); } for (int j = 1; j < paths.length; j++) { @@ -233,16 +232,15 @@ public abstract class AbstractHierarchicalContainerTestBase extends Item item = container.getItem(path); item.getItemProperty(FULLY_QUALIFIED_NAME).setValue(path); - item.getItemProperty(SIMPLE_NAME).setValue( - getSimpleName(path)); + item.getItemProperty(SIMPLE_NAME) + .setValue(getSimpleName(path)); item.getItemProperty(REVERSE_FULLY_QUALIFIED_NAME) .setValue(reverse(path)); item.getItemProperty(ID_NUMBER).setValue(1); } assertTrue(container.setChildrenAllowed(parent, true)); - assertTrue( - "Failed to set " + parent + " as parent for " + path, + assertTrue("Failed to set " + parent + " as parent for " + path, container.setParent(path, parent)); } @@ -251,10 +249,10 @@ public abstract class AbstractHierarchicalContainerTestBase extends String parent = id.substring(0, id.lastIndexOf('.')); assertTrue(container.setParent(id, parent)); item.getItemProperty(FULLY_QUALIFIED_NAME).setValue(sampleData[i]); - item.getItemProperty(SIMPLE_NAME).setValue( - getSimpleName(sampleData[i])); - item.getItemProperty(REVERSE_FULLY_QUALIFIED_NAME).setValue( - reverse(sampleData[i])); + item.getItemProperty(SIMPLE_NAME) + .setValue(getSimpleName(sampleData[i])); + item.getItemProperty(REVERSE_FULLY_QUALIFIED_NAME) + .setValue(reverse(sampleData[i])); item.getItemProperty(ID_NUMBER).setValue(i % 2); } } diff --git a/server/src/test/java/com/vaadin/data/util/AbstractInMemoryContainerTestBase.java b/server/src/test/java/com/vaadin/data/util/AbstractInMemoryContainerTestBase.java index d2c1a17bf8..3858504bc7 100644 --- a/server/src/test/java/com/vaadin/data/util/AbstractInMemoryContainerTestBase.java +++ b/server/src/test/java/com/vaadin/data/util/AbstractInMemoryContainerTestBase.java @@ -1,6 +1,6 @@ package com.vaadin.data.util; -public abstract class AbstractInMemoryContainerTestBase extends - AbstractContainerTestBase { +public abstract class AbstractInMemoryContainerTestBase + extends AbstractContainerTestBase { } diff --git a/server/src/test/java/com/vaadin/data/util/BeanContainerTest.java b/server/src/test/java/com/vaadin/data/util/BeanContainerTest.java index d990f3d123..bdf6ba1958 100644 --- a/server/src/test/java/com/vaadin/data/util/BeanContainerTest.java +++ b/server/src/test/java/com/vaadin/data/util/BeanContainerTest.java @@ -23,8 +23,8 @@ import com.vaadin.data.util.AbstractBeanContainer.BeanIdResolver; public class BeanContainerTest extends AbstractBeanContainerTestBase { - protected static class PersonNameResolver implements - BeanIdResolver<String, Person> { + protected static class PersonNameResolver + implements BeanIdResolver<String, Person> { @Override public String getIdForBean(Person bean) { @@ -33,8 +33,8 @@ public class BeanContainerTest extends AbstractBeanContainerTestBase { } - protected static class NullResolver implements - BeanIdResolver<String, Person> { + protected static class NullResolver + implements BeanIdResolver<String, Person> { @Override public String getIdForBean(Person bean) { @@ -367,8 +367,8 @@ public class BeanContainerTest extends AbstractBeanContainerTestBase { BeanContainer<String, Person> container = new BeanContainer<String, Person>( Person.class); // resolver that returns null as item id - container - .setBeanIdResolver(new BeanIdResolver<String, AbstractBeanContainerTestBase.Person>() { + container.setBeanIdResolver( + new BeanIdResolver<String, AbstractBeanContainerTestBase.Person>() { @Override public String getIdForBean(Person bean) { @@ -434,8 +434,8 @@ public class BeanContainerTest extends AbstractBeanContainerTestBase { assertNotNull(container.addBeanAfter(null, new Person("Jane"))); assertNotNull(container.addBeanAt(0, new Person("Jack"))); - container.addAll(Arrays.asList(new Person[] { new Person("Jill"), - new Person("Joe") })); + container.addAll(Arrays.asList( + new Person[] { new Person("Jill"), new Person("Joe") })); assertTrue(container.containsId("John")); assertTrue(container.containsId("Jane")); @@ -470,8 +470,8 @@ public class BeanContainerTest extends AbstractBeanContainerTestBase { assertNotNull(container.addBeanAfter(null, new Person("Jane"))); assertNotNull(container.addBeanAt(0, new Person("Jack"))); - container.addAll(Arrays.asList(new Person[] { new Person("Jill"), - new Person("Joe") })); + container.addAll(Arrays.asList( + new Person[] { new Person("Jill"), new Person("Joe") })); assertTrue(container.containsId("John")); assertTrue(container.containsId("Jane")); @@ -493,9 +493,8 @@ public class BeanContainerTest extends AbstractBeanContainerTestBase { new NestedMethodPropertyTest.Address("Ruukinkatu 2-4", 20540))); assertTrue(container.addNestedContainerProperty("address.street")); - assertEquals("Ruukinkatu 2-4", - container.getContainerProperty("John", "address.street") - .getValue()); + assertEquals("Ruukinkatu 2-4", container + .getContainerProperty("John", "address.street").getValue()); } @Test diff --git a/server/src/test/java/com/vaadin/data/util/BeanItemContainerTest.java b/server/src/test/java/com/vaadin/data/util/BeanItemContainerTest.java index 0298e57dcc..1c572e61eb 100644 --- a/server/src/test/java/com/vaadin/data/util/BeanItemContainerTest.java +++ b/server/src/test/java/com/vaadin/data/util/BeanItemContainerTest.java @@ -69,16 +69,15 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { @Override protected void validateContainer(Container container, Object expectedFirstItemId, Object expectedLastItemId, - Object itemIdInSet, Object itemIdNotInSet, - boolean checkGetItemNull, int expectedSize) { + Object itemIdInSet, Object itemIdNotInSet, boolean checkGetItemNull, + int expectedSize) { Object notInSet = nameToBean.get(itemIdNotInSet); if (notInSet == null && itemIdNotInSet != null) { notInSet = new ClassName(String.valueOf(itemIdNotInSet), 9999); } super.validateContainer(container, nameToBean.get(expectedFirstItemId), - nameToBean.get(expectedLastItemId), - nameToBean.get(itemIdInSet), notInSet, checkGetItemNull, - expectedSize); + nameToBean.get(expectedLastItemId), nameToBean.get(itemIdInSet), + notInSet, checkGetItemNull, expectedSize); } @Override @@ -236,13 +235,15 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { public void testEmptyCollectionConstructor() { try { new BeanItemContainer<ClassName>((Collection<ClassName>) null); - Assert.fail("Initializing BeanItemContainer from a null collection should not work!"); + Assert.fail( + "Initializing BeanItemContainer from a null collection should not work!"); } catch (IllegalArgumentException e) { // success } try { new BeanItemContainer<ClassName>(new ArrayList<ClassName>()); - Assert.fail("Initializing BeanItemContainer from an empty collection should not work!"); + Assert.fail( + "Initializing BeanItemContainer from an empty collection should not work!"); } catch (IllegalArgumentException e) { // success } @@ -276,8 +277,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { counter.reset(); container.addItemAfter(null, cn1); counter.assertOnce(); - Assert.assertEquals( - "com.example.Test", + Assert.assertEquals("com.example.Test", container.getContainerProperty(container.firstItemId(), FULLY_QUALIFIED_NAME).getValue()); @@ -285,8 +285,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { counter.reset(); container.addItemAfter(container.firstItemId(), cn1); counter.assertOnce(); - Assert.assertEquals( - "com.example.Test", + Assert.assertEquals("com.example.Test", container.getContainerProperty(container.getIdByIndex(1), FULLY_QUALIFIED_NAME).getValue()); @@ -294,8 +293,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { counter.reset(); container.addItemAfter(container.lastItemId(), cn1); counter.assertOnce(); - Assert.assertEquals( - "com.example.Test", + Assert.assertEquals("com.example.Test", container.getContainerProperty(container.lastItemId(), FULLY_QUALIFIED_NAME).getValue()); @@ -303,8 +301,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { counter.reset(); container.addItemAt(0, cn1); counter.assertOnce(); - Assert.assertEquals( - "com.example.Test", + Assert.assertEquals("com.example.Test", container.getContainerProperty(container.firstItemId(), FULLY_QUALIFIED_NAME).getValue()); @@ -312,8 +309,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { counter.reset(); container.addItemAt(1, cn1); counter.assertOnce(); - Assert.assertEquals( - "com.example.Test", + Assert.assertEquals("com.example.Test", container.getContainerProperty(container.getIdByIndex(1), FULLY_QUALIFIED_NAME).getValue()); @@ -321,8 +317,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { counter.reset(); container.addItemAt(container.size(), cn1); counter.assertOnce(); - Assert.assertEquals( - "com.example.Test", + Assert.assertEquals("com.example.Test", container.getContainerProperty(container.lastItemId(), FULLY_QUALIFIED_NAME).getValue()); @@ -408,8 +403,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { counter.reset(); container.addItemAfter(null, cn1); counter.assertOnce(); - Assert.assertEquals( - "com.example.Test", + Assert.assertEquals("com.example.Test", container.getContainerProperty(container.firstItemId(), FULLY_QUALIFIED_NAME).getValue()); @@ -417,8 +411,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { counter.reset(); container.addItemAfter(container.firstItemId(), cn1); counter.assertOnce(); - Assert.assertEquals( - "com.example.Test", + Assert.assertEquals("com.example.Test", container.getContainerProperty(container.getIdByIndex(1), FULLY_QUALIFIED_NAME).getValue()); @@ -426,8 +419,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { counter.reset(); container.addItemAfter(container.lastItemId(), cn1); counter.assertOnce(); - Assert.assertEquals( - "com.example.Test", + Assert.assertEquals("com.example.Test", container.getContainerProperty(container.lastItemId(), FULLY_QUALIFIED_NAME).getValue()); @@ -435,8 +427,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { counter.reset(); container.addItemAt(0, cn1); counter.assertOnce(); - Assert.assertEquals( - "com.example.Test", + Assert.assertEquals("com.example.Test", container.getContainerProperty(container.firstItemId(), FULLY_QUALIFIED_NAME).getValue()); @@ -444,8 +435,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { counter.reset(); container.addItemAt(1, cn1); counter.assertOnce(); - Assert.assertEquals( - "com.example.Test", + Assert.assertEquals("com.example.Test", container.getContainerProperty(container.getIdByIndex(1), FULLY_QUALIFIED_NAME).getValue()); @@ -453,8 +443,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { counter.reset(); container.addItemAt(container.size(), cn1); counter.assertOnce(); - Assert.assertEquals( - "com.example.Test", + Assert.assertEquals("com.example.Test", container.getContainerProperty(container.lastItemId(), FULLY_QUALIFIED_NAME).getValue()); @@ -704,8 +693,8 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { Person john = new Person("John"); container.addBean(john); - Assert.assertEquals("John", container - .getContainerProperty(john, "name").getValue()); + Assert.assertEquals("John", + container.getContainerProperty(john, "name").getValue()); Assert.assertTrue(container.removeContainerProperty("name")); Assert.assertNull(container.getContainerProperty(john, "name")); @@ -749,14 +738,13 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { NestedMethodPropertyTest.Person.class); NestedMethodPropertyTest.Person john = new NestedMethodPropertyTest.Person( - "John", new NestedMethodPropertyTest.Address("Ruukinkatu 2-4", - 20540)); + "John", + new NestedMethodPropertyTest.Address("Ruukinkatu 2-4", 20540)); container.addBean(john); assertTrue(container.addNestedContainerProperty("address.street")); - assertEquals("Ruukinkatu 2-4", - container.getContainerProperty(john, "address.street") - .getValue()); + assertEquals("Ruukinkatu 2-4", container + .getContainerProperty(john, "address.street").getValue()); } @Test @@ -839,8 +827,8 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { ItemSetChangeListener addListener = createListenerMockFor(container); Capture<ItemAddEvent> capturedEvent = captureAddEvent(addListener); EasyMock.replay(addListener); - List<Person> beans = Arrays.asList(new Person("Jack"), new Person( - "John")); + List<Person> beans = Arrays.asList(new Person("Jack"), + new Person("John")); container.addAll(beans); @@ -854,8 +842,8 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { ItemSetChangeListener addListener = createListenerMockFor(container); Capture<ItemAddEvent> capturedEvent = captureAddEvent(addListener); EasyMock.replay(addListener); - List<Person> beans = Arrays.asList(new Person("Jack"), new Person( - "John")); + List<Person> beans = Arrays.asList(new Person("Jack"), + new Person("John")); container.addFilter(new Compare.Equal("name", "John")); container.addAll(beans); @@ -886,8 +874,8 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { Person bean = new Person("John"); container.addItem(bean); ItemSetChangeListener removeListener = createListenerMockFor(container); - removeListener.containerItemSetChange(EasyMock - .isA(ItemRemoveEvent.class)); + removeListener + .containerItemSetChange(EasyMock.isA(ItemRemoveEvent.class)); EasyMock.replay(removeListener); container.removeItem(bean); @@ -902,7 +890,8 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { Person bean = new Person("John"); container.addItem(bean); ItemSetChangeListener removeListener = createListenerMockFor(container); - Capture<ItemRemoveEvent> capturedEvent = captureRemoveEvent(removeListener); + Capture<ItemRemoveEvent> capturedEvent = captureRemoveEvent( + removeListener); EasyMock.replay(removeListener); container.removeItem(bean); @@ -918,7 +907,8 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { Person secondBean = new Person("John"); container.addItem(secondBean); ItemSetChangeListener removeListener = createListenerMockFor(container); - Capture<ItemRemoveEvent> capturedEvent = captureRemoveEvent(removeListener); + Capture<ItemRemoveEvent> capturedEvent = captureRemoveEvent( + removeListener); EasyMock.replay(removeListener); container.removeItem(secondBean); @@ -933,7 +923,8 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { container.addItem(new Person("Jack")); container.addItem(new Person("John")); ItemSetChangeListener removeListener = createListenerMockFor(container); - Capture<ItemRemoveEvent> capturedEvent = captureRemoveEvent(removeListener); + Capture<ItemRemoveEvent> capturedEvent = captureRemoveEvent( + removeListener); EasyMock.replay(removeListener); container.removeAllItems(); @@ -970,8 +961,8 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { container.addNestedContainerBean("address"); - assertTrue(container.getContainerPropertyIds().contains( - "address.street")); + assertTrue( + container.getContainerPropertyIds().contains("address.street")); NestedMethodPropertyTest.Person john = new NestedMethodPropertyTest.Person( "John", new Address("streetname", 12345)); @@ -979,9 +970,8 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { assertTrue(container.getItem(john).getItemPropertyIds() .contains("address.street")); - assertEquals("streetname", - container.getItem(john).getItemProperty("address.street") - .getValue()); + assertEquals("streetname", container.getItem(john) + .getItemProperty("address.street").getValue()); } @@ -996,13 +986,12 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase { container.addNestedContainerBean("address"); - assertTrue(container.getContainerPropertyIds().contains( - "address.street")); + assertTrue( + container.getContainerPropertyIds().contains("address.street")); assertTrue(container.getItem(john).getItemPropertyIds() .contains("address.street")); - assertEquals("streetname", - container.getItem(john).getItemProperty("address.street") - .getValue()); + assertEquals("streetname", container.getItem(john) + .getItemProperty("address.street").getValue()); } } diff --git a/server/src/test/java/com/vaadin/data/util/BeanItemTest.java b/server/src/test/java/com/vaadin/data/util/BeanItemTest.java index e78d518a25..7681b7566d 100644 --- a/server/src/test/java/com/vaadin/data/util/BeanItemTest.java +++ b/server/src/test/java/com/vaadin/data/util/BeanItemTest.java @@ -148,8 +148,8 @@ public class BeanItemTest { } } - protected static interface MySubInterface extends MySuperInterface, - MySuperInterface2 { + protected static interface MySubInterface + extends MySuperInterface, MySuperInterface2 { public int getSub(); public void setSub(int i); @@ -203,8 +203,8 @@ public class BeanItemTest { public void testGetInterfaceProperties() throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException { - Method method = BeanItem.class.getDeclaredMethod( - "getPropertyDescriptors", Class.class); + Method method = BeanItem.class + .getDeclaredMethod("getPropertyDescriptors", Class.class); method.setAccessible(true); LinkedHashMap<String, VaadinPropertyDescriptor<Class>> propertyDescriptors = (LinkedHashMap<String, VaadinPropertyDescriptor<Class>>) method .invoke(null, MySuperInterface.class); @@ -222,8 +222,8 @@ public class BeanItemTest { public void testGetSuperInterfaceProperties() throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException { - Method method = BeanItem.class.getDeclaredMethod( - "getPropertyDescriptors", Class.class); + Method method = BeanItem.class + .getDeclaredMethod("getPropertyDescriptors", Class.class); method.setAccessible(true); LinkedHashMap<String, VaadinPropertyDescriptor<Class>> propertyDescriptors = (LinkedHashMap<String, VaadinPropertyDescriptor<Class>>) method .invoke(null, MySubInterface.class); @@ -314,14 +314,14 @@ public class BeanItemTest { public void testPropertyTypes() { BeanItem<MyClass> item = new BeanItem<MyClass>(new MyClass("bean1")); - Assert.assertTrue(Integer.class.equals(item.getItemProperty( - "superPrivate").getType())); - Assert.assertTrue(Double.class.equals(item.getItemProperty( - "superProtected").getType())); - Assert.assertTrue(Boolean.class.equals(item.getItemProperty( - "superPublic").getType())); - Assert.assertTrue(String.class.equals(item.getItemProperty("name") - .getType())); + Assert.assertTrue(Integer.class + .equals(item.getItemProperty("superPrivate").getType())); + Assert.assertTrue(Double.class + .equals(item.getItemProperty("superProtected").getType())); + Assert.assertTrue(Boolean.class + .equals(item.getItemProperty("superPublic").getType())); + Assert.assertTrue( + String.class.equals(item.getItemProperty("name").getType())); } @Test @@ -335,12 +335,12 @@ public class BeanItemTest { @Test public void testCustomProperties() throws Exception { LinkedHashMap<String, VaadinPropertyDescriptor<MyClass>> propertyDescriptors = new LinkedHashMap<String, VaadinPropertyDescriptor<MyClass>>(); - propertyDescriptors.put( - "myname", + propertyDescriptors.put("myname", new MethodPropertyDescriptor<BeanItemTest.MyClass>("myname", - MyClass.class, MyClass.class - .getDeclaredMethod("getName"), MyClass.class - .getDeclaredMethod("setName", String.class))); + MyClass.class, + MyClass.class.getDeclaredMethod("getName"), + MyClass.class.getDeclaredMethod("setName", + String.class))); MyClass instance = new MyClass("bean1"); Constructor<BeanItem> constructor = BeanItem.class .getDeclaredConstructor(Object.class, Map.class); diff --git a/server/src/test/java/com/vaadin/data/util/ContainerHierarchicalWrapperTest.java b/server/src/test/java/com/vaadin/data/util/ContainerHierarchicalWrapperTest.java index a6fec6670b..e41f751bfd 100644 --- a/server/src/test/java/com/vaadin/data/util/ContainerHierarchicalWrapperTest.java +++ b/server/src/test/java/com/vaadin/data/util/ContainerHierarchicalWrapperTest.java @@ -2,25 +2,25 @@ package com.vaadin.data.util; import org.junit.Test; -public class ContainerHierarchicalWrapperTest extends - AbstractHierarchicalContainerTestBase { +public class ContainerHierarchicalWrapperTest + extends AbstractHierarchicalContainerTestBase { @Test public void testBasicOperations() { - testBasicContainerOperations(new ContainerHierarchicalWrapper( - new IndexedContainer())); + testBasicContainerOperations( + new ContainerHierarchicalWrapper(new IndexedContainer())); } @Test public void testHierarchicalContainer() { - testHierarchicalContainer(new ContainerHierarchicalWrapper( - new IndexedContainer())); + testHierarchicalContainer( + new ContainerHierarchicalWrapper(new IndexedContainer())); } @Test public void testRemoveSubtree() { - testRemoveHierarchicalWrapperSubtree(new ContainerHierarchicalWrapper( - new IndexedContainer())); + testRemoveHierarchicalWrapperSubtree( + new ContainerHierarchicalWrapper(new IndexedContainer())); } } diff --git a/server/src/test/java/com/vaadin/data/util/ContainerOrderedWrapperTest.java b/server/src/test/java/com/vaadin/data/util/ContainerOrderedWrapperTest.java index 7e720071be..c3a8b2c4f9 100644 --- a/server/src/test/java/com/vaadin/data/util/ContainerOrderedWrapperTest.java +++ b/server/src/test/java/com/vaadin/data/util/ContainerOrderedWrapperTest.java @@ -56,7 +56,8 @@ public class ContainerOrderedWrapperTest extends AbstractContainerTestBase { } @Override - public Item addItem(Object itemId) throws UnsupportedOperationException { + public Item addItem(Object itemId) + throws UnsupportedOperationException { return container.addItem(itemId); } @@ -93,14 +94,14 @@ public class ContainerOrderedWrapperTest extends AbstractContainerTestBase { @Test public void testBasicOperations() { - testBasicContainerOperations(new ContainerOrderedWrapper( - new NotOrderedContainer())); + testBasicContainerOperations( + new ContainerOrderedWrapper(new NotOrderedContainer())); } @Test public void testOrdered() { - testContainerOrdered(new ContainerOrderedWrapper( - new NotOrderedContainer())); + testContainerOrdered( + new ContainerOrderedWrapper(new NotOrderedContainer())); } } diff --git a/server/src/test/java/com/vaadin/data/util/ContainerSortingTest.java b/server/src/test/java/com/vaadin/data/util/ContainerSortingTest.java index dced4b4e72..1c4dc1de5e 100644 --- a/server/src/test/java/com/vaadin/data/util/ContainerSortingTest.java +++ b/server/src/test/java/com/vaadin/data/util/ContainerSortingTest.java @@ -66,15 +66,15 @@ public class ContainerSortingTest { ITEM_STRING_1, ITEM_STRING_2, ITEM_STRING_NULL2 }); ic.sort(new Object[] { PROPERTY_INTEGER_NOT_NULL, - PROPERTY_INTEGER_NULL2, PROPERTY_STRING_ID }, new boolean[] { - true, false, true }); + PROPERTY_INTEGER_NULL2, PROPERTY_STRING_ID }, + new boolean[] { true, false, true }); verifyOrder(ic, new String[] { ITEM_DATA_MINUS2, ITEM_DATA_MINUS2_NULL, ITEM_DATA_MINUS1, ITEM_DATA_MINUS1_NULL, ITEM_ANOTHER_NULL, ITEM_STRING_NULL2, ITEM_STRING_1, ITEM_STRING_2 }); ic.sort(new Object[] { PROPERTY_INTEGER_NOT_NULL, - PROPERTY_INTEGER_NULL2, PROPERTY_STRING_ID }, new boolean[] { - true, true, true }); + PROPERTY_INTEGER_NULL2, PROPERTY_STRING_ID }, + new boolean[] { true, true, true }); verifyOrder(ic, new String[] { ITEM_DATA_MINUS2_NULL, ITEM_DATA_MINUS2, ITEM_DATA_MINUS1_NULL, ITEM_DATA_MINUS1, ITEM_ANOTHER_NULL, ITEM_STRING_NULL2, ITEM_STRING_1, ITEM_STRING_2 }); @@ -86,18 +86,17 @@ public class ContainerSortingTest { HierarchicalContainer hc = new HierarchicalContainer(); populateContainer(hc); hc.sort(new Object[] { "name" }, new boolean[] { true }); - verifyOrder(hc, new String[] { "Audi", "C++", "Call of Duty", "Cars", - "English", "Fallout", "Finnish", "Ford", "Games", "Java", - "Might and Magic", "Natural languages", "PHP", - "Programming languages", "Python", "Red Alert", "Swedish", - "Toyota", "Volvo" }); - TestUtil.assertArrays( - hc.rootItemIds().toArray(), + verifyOrder(hc, + new String[] { "Audi", "C++", "Call of Duty", "Cars", "English", + "Fallout", "Finnish", "Ford", "Games", "Java", + "Might and Magic", "Natural languages", "PHP", + "Programming languages", "Python", "Red Alert", + "Swedish", "Toyota", "Volvo" }); + TestUtil.assertArrays(hc.rootItemIds().toArray(), new Integer[] { nameToId.get("Cars"), nameToId.get("Games"), nameToId.get("Natural languages"), nameToId.get("Programming languages") }); - TestUtil.assertArrays( - hc.getChildren(nameToId.get("Games")).toArray(), + TestUtil.assertArrays(hc.getChildren(nameToId.get("Games")).toArray(), new Integer[] { nameToId.get("Call of Duty"), nameToId.get("Fallout"), nameToId.get("Might and Magic"), diff --git a/server/src/test/java/com/vaadin/data/util/FileSystemContainerTest.java b/server/src/test/java/com/vaadin/data/util/FileSystemContainerTest.java index f4bb794e5c..992b265702 100644 --- a/server/src/test/java/com/vaadin/data/util/FileSystemContainerTest.java +++ b/server/src/test/java/com/vaadin/data/util/FileSystemContainerTest.java @@ -9,8 +9,8 @@ public class FileSystemContainerTest { @Test public void nonExistingDirectory() { - FilesystemContainer fsc = new FilesystemContainer(new File( - "/non/existing")); + FilesystemContainer fsc = new FilesystemContainer( + new File("/non/existing")); Assert.assertTrue(fsc.getItemIds().isEmpty()); } } diff --git a/server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerBasicTest.java b/server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerBasicTest.java index 5f7f965c69..11335314f0 100644 --- a/server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerBasicTest.java +++ b/server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerBasicTest.java @@ -20,8 +20,8 @@ import com.vaadin.data.Container.ItemSetChangeNotifier; import com.vaadin.data.Item; import com.vaadin.data.util.filter.SimpleStringFilter; -public class GeneratedPropertyContainerBasicTest extends - AbstractInMemoryContainerTestBase { +public class GeneratedPropertyContainerBasicTest + extends AbstractInMemoryContainerTestBase { @Test public void testBasicOperations() { @@ -147,8 +147,8 @@ public class GeneratedPropertyContainerBasicTest extends counter.assertOnce(); container.removeContainerFilter(filter); counter.assertOnce(); - container.addContainerFilter(new SimpleStringFilter(SIMPLE_NAME, "a", - true, false)); + container.addContainerFilter( + new SimpleStringFilter(SIMPLE_NAME, "a", true, false)); counter.assertOnce(); container.removeAllContainerFilters(); counter.assertOnce(); @@ -164,8 +164,8 @@ public class GeneratedPropertyContainerBasicTest extends counter.reset(); ((Container.Filterable) container) - .addContainerFilter(new SimpleStringFilter( - FULLY_QUALIFIED_NAME, "Test", true, false)); + .addContainerFilter(new SimpleStringFilter(FULLY_QUALIFIED_NAME, + "Test", true, false)); // no real change, so no notification required counter.assertNone(); @@ -380,8 +380,8 @@ public class GeneratedPropertyContainerBasicTest extends GeneratedPropertyContainer container = createContainer(); Object itemId = container.addItem(); ItemSetChangeListener removeListener = createListenerMockFor(container); - removeListener.containerItemSetChange(EasyMock - .isA(ItemRemoveEvent.class)); + removeListener + .containerItemSetChange(EasyMock.isA(ItemRemoveEvent.class)); EasyMock.replay(removeListener); container.removeItem(itemId); @@ -394,7 +394,8 @@ public class GeneratedPropertyContainerBasicTest extends GeneratedPropertyContainer container = createContainer(); Object itemId = container.addItem(); ItemSetChangeListener removeListener = createListenerMockFor(container); - Capture<ItemRemoveEvent> capturedEvent = captureRemoveEvent(removeListener); + Capture<ItemRemoveEvent> capturedEvent = captureRemoveEvent( + removeListener); EasyMock.replay(removeListener); container.removeItem(itemId); @@ -408,7 +409,8 @@ public class GeneratedPropertyContainerBasicTest extends container.addItem(); Object secondItemId = container.addItem(); ItemSetChangeListener removeListener = createListenerMockFor(container); - Capture<ItemRemoveEvent> capturedEvent = captureRemoveEvent(removeListener); + Capture<ItemRemoveEvent> capturedEvent = captureRemoveEvent( + removeListener); EasyMock.replay(removeListener); container.removeItem(secondItemId); @@ -422,7 +424,8 @@ public class GeneratedPropertyContainerBasicTest extends container.addItem(); container.addItem(); ItemSetChangeListener removeListener = createListenerMockFor(container); - Capture<ItemRemoveEvent> capturedEvent = captureRemoveEvent(removeListener); + Capture<ItemRemoveEvent> capturedEvent = captureRemoveEvent( + removeListener); EasyMock.replay(removeListener); container.removeAllItems(); diff --git a/server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerTest.java b/server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerTest.java index b08437a953..d92ee9627b 100644 --- a/server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerTest.java +++ b/server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerTest.java @@ -41,8 +41,8 @@ public class GeneratedPropertyContainerTest { Indexed wrappedContainer; private static double MILES_CONVERSION = 0.6214d; - private class GeneratedPropertyListener implements - PropertySetChangeListener { + private class GeneratedPropertyListener + implements PropertySetChangeListener { private int callCount = 0; @@ -99,8 +99,9 @@ public class GeneratedPropertyContainerTest { }); Object itemId = container.addItem(); - assertEquals("Expected value not in item.", container.getItem(itemId) - .getItemProperty("hello").getValue(), "Hello World!"); + assertEquals("Expected value not in item.", + container.getItem(itemId).getItemProperty("hello").getValue(), + "Hello World!"); } @Test @@ -123,8 +124,8 @@ public class GeneratedPropertyContainerTest { @Override public SortOrder[] getSortProperties(SortOrder order) { SortOrder[] sortOrder = new SortOrder[1]; - sortOrder[0] = new SortOrder("bar", order - .getDirection()); + sortOrder[0] = new SortOrder("bar", + order.getDirection()); return sortOrder; } }); @@ -159,7 +160,8 @@ public class GeneratedPropertyContainerTest { } }); - assertFalse(container.getSortableContainerPropertyIds().contains("bar")); + assertFalse( + container.getSortableContainerPropertyIds().contains("bar")); } @Test @@ -273,8 +275,8 @@ public class GeneratedPropertyContainerTest { @Test public void testRemoveProperty() { container.removeContainerProperty("foo"); - assertFalse("Container contained removed property", container - .getContainerPropertyIds().contains("foo")); + assertFalse("Container contained removed property", + container.getContainerPropertyIds().contains("foo")); assertTrue("Wrapped container did not contain removed property", wrappedContainer.getContainerPropertyIds().contains("foo")); @@ -282,8 +284,8 @@ public class GeneratedPropertyContainerTest { .getItemPropertyIds().contains("foo")); container.addContainerProperty("foo", null, null); - assertTrue("Container did not contain returned property", container - .getContainerPropertyIds().contains("foo")); + assertTrue("Container did not contain returned property", + container.getContainerPropertyIds().contains("foo")); } @Test diff --git a/server/src/test/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapperTest.java b/server/src/test/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapperTest.java index 8c7970e554..54984f07ad 100644 --- a/server/src/test/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapperTest.java +++ b/server/src/test/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapperTest.java @@ -2,8 +2,8 @@ package com.vaadin.data.util; import org.junit.Test; -public class HierarchicalContainerOrderedWrapperTest extends - AbstractHierarchicalContainerTestBase { +public class HierarchicalContainerOrderedWrapperTest + extends AbstractHierarchicalContainerTestBase { private HierarchicalContainerOrderedWrapper createContainer() { return new HierarchicalContainerOrderedWrapper( diff --git a/server/src/test/java/com/vaadin/data/util/HierarchicalContainerTest.java b/server/src/test/java/com/vaadin/data/util/HierarchicalContainerTest.java index 280c46efcc..7ab20ca3dd 100644 --- a/server/src/test/java/com/vaadin/data/util/HierarchicalContainerTest.java +++ b/server/src/test/java/com/vaadin/data/util/HierarchicalContainerTest.java @@ -9,8 +9,8 @@ import org.junit.Test; import com.vaadin.data.Container.Filter; import com.vaadin.data.Item; -public class HierarchicalContainerTest extends - AbstractHierarchicalContainerTestBase { +public class HierarchicalContainerTest + extends AbstractHierarchicalContainerTestBase { @Test public void testBasicOperations() { @@ -142,8 +142,8 @@ public class HierarchicalContainerTest extends validateHierarchicalContainer(container, "com", "com.vaadin.terminal.gwt.client.WidgetSet", - "com.vaadin.terminal.gwt.client.ui.VSplitPanelVertical", - "blah", true, expectedSize, expectedRoots, true); + "com.vaadin.terminal.gwt.client.ui.VSplitPanelVertical", "blah", + true, expectedSize, expectedRoots, true); // Additionally remove all without 'm' in the simple name. container.addContainerFilter(SIMPLE_NAME, "m", false, false); @@ -151,9 +151,7 @@ public class HierarchicalContainerTest extends expectedSize = 7 + 18; expectedRoots = 1; - validateHierarchicalContainer( - container, - "com", + validateHierarchicalContainer(container, "com", "com.vaadin.terminal.gwt.client.ui.VUriFragmentUtility", "com.vaadin.terminal.gwt.client.ui.layout.ChildComponentContainer", "blah", true, expectedSize, expectedRoots, true); @@ -249,10 +247,9 @@ public class HierarchicalContainerTest extends int expectedRoots = 20; validateHierarchicalContainer(container, - "com.vaadin.data.BufferedValidatable", - "com.vaadin.ui.TabSheet", - "com.vaadin.terminal.gwt.client.ui.VTabsheetBase", "blah", - true, expectedSize, expectedRoots, false); + "com.vaadin.data.BufferedValidatable", "com.vaadin.ui.TabSheet", + "com.vaadin.terminal.gwt.client.ui.VTabsheetBase", "blah", true, + expectedSize, expectedRoots, false); // only include .gwt.client classes container.removeAllContainerFilters(); diff --git a/server/src/test/java/com/vaadin/data/util/IndexedContainerTest.java b/server/src/test/java/com/vaadin/data/util/IndexedContainerTest.java index 27632846de..b19a425518 100644 --- a/server/src/test/java/com/vaadin/data/util/IndexedContainerTest.java +++ b/server/src/test/java/com/vaadin/data/util/IndexedContainerTest.java @@ -366,8 +366,8 @@ public class IndexedContainerTest extends AbstractInMemoryContainerTestBase { IndexedContainer container = new IndexedContainer(); Object itemId = container.addItem(); ItemSetChangeListener removeListener = createListenerMockFor(container); - removeListener.containerItemSetChange(EasyMock - .isA(ItemRemoveEvent.class)); + removeListener + .containerItemSetChange(EasyMock.isA(ItemRemoveEvent.class)); EasyMock.replay(removeListener); container.removeItem(itemId); @@ -380,7 +380,8 @@ public class IndexedContainerTest extends AbstractInMemoryContainerTestBase { IndexedContainer container = new IndexedContainer(); Object itemId = container.addItem(); ItemSetChangeListener removeListener = createListenerMockFor(container); - Capture<ItemRemoveEvent> capturedEvent = captureRemoveEvent(removeListener); + Capture<ItemRemoveEvent> capturedEvent = captureRemoveEvent( + removeListener); EasyMock.replay(removeListener); container.removeItem(itemId); @@ -394,7 +395,8 @@ public class IndexedContainerTest extends AbstractInMemoryContainerTestBase { container.addItem(); Object secondItemId = container.addItem(); ItemSetChangeListener removeListener = createListenerMockFor(container); - Capture<ItemRemoveEvent> capturedEvent = captureRemoveEvent(removeListener); + Capture<ItemRemoveEvent> capturedEvent = captureRemoveEvent( + removeListener); EasyMock.replay(removeListener); container.removeItem(secondItemId); @@ -408,7 +410,8 @@ public class IndexedContainerTest extends AbstractInMemoryContainerTestBase { container.addItem(); container.addItem(); ItemSetChangeListener removeListener = createListenerMockFor(container); - Capture<ItemRemoveEvent> capturedEvent = captureRemoveEvent(removeListener); + Capture<ItemRemoveEvent> capturedEvent = captureRemoveEvent( + removeListener); EasyMock.replay(removeListener); container.removeAllItems(); diff --git a/server/src/test/java/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java b/server/src/test/java/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java index b4621b823a..d07564efe9 100644 --- a/server/src/test/java/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java +++ b/server/src/test/java/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java @@ -35,8 +35,9 @@ import org.junit.Test; public class MethodPropertyMemoryConsumptionTest { @Test - public void testSetArguments() throws NoSuchFieldException, - SecurityException, IllegalArgumentException, IllegalAccessException { + public void testSetArguments() + throws NoSuchFieldException, SecurityException, + IllegalArgumentException, IllegalAccessException { TestBean bean = new TestBean(); TestMethodProperty<String> property = new TestMethodProperty<String>( bean, "name"); @@ -51,12 +52,14 @@ public class MethodPropertyMemoryConsumptionTest { .getDeclaredField("setArgs"); setArgsField.setAccessible(true); - Assert.assertSame("setArguments method sets non-default instance" - + " of empty Object array for getArgs", + Assert.assertSame( + "setArguments method sets non-default instance" + + " of empty Object array for getArgs", getArgsField.get(property), getArgs); - Assert.assertSame("setArguments method sets non-default instance" - + " of empty Object array for setArgs", + Assert.assertSame( + "setArguments method sets non-default instance" + + " of empty Object array for setArgs", setArgsField.get(property), setArgs); } @@ -72,17 +75,19 @@ public class MethodPropertyMemoryConsumptionTest { TestBean otherBean = new TestBean(); TestMethodProperty<String> otherProperty = new TestMethodProperty<String>( otherBean, "name"); - Assert.assertSame("setArguments method uses different instance" - + " of empty Object array for getArgs", getArgs, - otherProperty.getGetArgs()); - Assert.assertSame("setArguments method uses different instance" - + " of empty Object array for setArgs", setArgs, - otherProperty.getSetArgs()); + Assert.assertSame( + "setArguments method uses different instance" + + " of empty Object array for getArgs", + getArgs, otherProperty.getGetArgs()); + Assert.assertSame( + "setArguments method uses different instance" + + " of empty Object array for setArgs", + setArgs, otherProperty.getSetArgs()); } @Test - public void testDefaultArgsSerialization() throws IOException, - ClassNotFoundException { + public void testDefaultArgsSerialization() + throws IOException, ClassNotFoundException { TestBean bean = new TestBean(); TestMethodProperty<String> property = new TestMethodProperty<String>( bean, "name"); diff --git a/server/src/test/java/com/vaadin/data/util/NestedMethodPropertyTest.java b/server/src/test/java/com/vaadin/data/util/NestedMethodPropertyTest.java index 79ce425bae..4a1e2a1784 100644 --- a/server/src/test/java/com/vaadin/data/util/NestedMethodPropertyTest.java +++ b/server/src/test/java/com/vaadin/data/util/NestedMethodPropertyTest.java @@ -323,8 +323,8 @@ public class NestedMethodPropertyTest { } @Test - public void testSerializationWithIntermediateNull() throws IOException, - ClassNotFoundException { + public void testSerializationWithIntermediateNull() + throws IOException, ClassNotFoundException { vaadin.setManager(null); NestedMethodProperty<String> streetProperty = new NestedMethodProperty<String>( vaadin, "manager.address.street"); diff --git a/server/src/test/java/com/vaadin/data/util/PerformanceTestIndexedContainerTest.java b/server/src/test/java/com/vaadin/data/util/PerformanceTestIndexedContainerTest.java index fdfc2199b6..5f64c0e8d8 100644 --- a/server/src/test/java/com/vaadin/data/util/PerformanceTestIndexedContainerTest.java +++ b/server/src/test/java/com/vaadin/data/util/PerformanceTestIndexedContainerTest.java @@ -104,8 +104,8 @@ public class PerformanceTestIndexedContainerTest { private void checkMedian(int items, Collection<Long> times, String methodName, long threshold) { long median = median(times); - System.out.println(methodName + " timings (ms) for " + items - + " items: " + times); + System.out.println( + methodName + " timings (ms) for " + items + " items: " + times); Assert.assertTrue(methodName + " too slow, median time " + median + "ms for " + items + " items", median <= threshold); } diff --git a/server/src/test/java/com/vaadin/data/util/PropertyDescriptorTest.java b/server/src/test/java/com/vaadin/data/util/PropertyDescriptorTest.java index 86f3968116..af9db229c5 100644 --- a/server/src/test/java/com/vaadin/data/util/PropertyDescriptorTest.java +++ b/server/src/test/java/com/vaadin/data/util/PropertyDescriptorTest.java @@ -36,8 +36,8 @@ public class PropertyDescriptorTest { VaadinPropertyDescriptor<Person> descriptor2 = (VaadinPropertyDescriptor<Person>) new ObjectInputStream( new ByteArrayInputStream(baos.toByteArray())).readObject(); - Property<?> property = descriptor2.createProperty(new Person("John", - null)); + Property<?> property = descriptor2 + .createProperty(new Person("John", null)); Assert.assertEquals("John", property.getValue()); } diff --git a/server/src/test/java/com/vaadin/data/util/PropertySetItemTest.java b/server/src/test/java/com/vaadin/data/util/PropertySetItemTest.java index b957cb7f20..fc91a20dd0 100644 --- a/server/src/test/java/com/vaadin/data/util/PropertySetItemTest.java +++ b/server/src/test/java/com/vaadin/data/util/PropertySetItemTest.java @@ -181,8 +181,8 @@ public class PropertySetItemTest { PropertysetItem item = createPropertySetItem(); // Expectations and start test - propertySetListenerMock.itemPropertySetChange(EasyMock - .isA(PropertySetChangeEvent.class)); + propertySetListenerMock.itemPropertySetChange( + EasyMock.isA(PropertySetChangeEvent.class)); EasyMock.replay(propertySetListenerMock); // Add listener and add a property -> should end up in listener once @@ -209,8 +209,8 @@ public class PropertySetItemTest { item.addItemProperty(ID2, prop2); // Expectations and start test - propertySetListenerMock.itemPropertySetChange(EasyMock - .isA(PropertySetChangeEvent.class)); + propertySetListenerMock.itemPropertySetChange( + EasyMock.isA(PropertySetChangeEvent.class)); EasyMock.replay(propertySetListenerMock); // Add listener and add a property -> should end up in listener once @@ -425,9 +425,8 @@ public class PropertySetItemTest { item.addItemProperty(ID2, prop2); - Assert.assertEquals( - String.valueOf(prop1.getValue()) + " " - + String.valueOf(prop2.getValue()), item.toString()); + Assert.assertEquals(String.valueOf(prop1.getValue()) + " " + + String.valueOf(prop2.getValue()), item.toString()); } } diff --git a/server/src/test/java/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java b/server/src/test/java/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java index e1d42addba..96cd0b190b 100644 --- a/server/src/test/java/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java +++ b/server/src/test/java/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java @@ -21,8 +21,8 @@ public class ReflectToolsGetSuperFieldTest { } PropertysetItem item = new PropertysetItem(); - item.addItemProperty("testProperty", new ObjectProperty<String>( - "Value of testProperty")); + item.addItemProperty("testProperty", + new ObjectProperty<String>("Value of testProperty")); MySubClass form = new MySubClass(); diff --git a/server/src/test/java/com/vaadin/data/util/TransactionalPropertyWrapperTest.java b/server/src/test/java/com/vaadin/data/util/TransactionalPropertyWrapperTest.java index 3c5fab08f5..ee463ceb0c 100644 --- a/server/src/test/java/com/vaadin/data/util/TransactionalPropertyWrapperTest.java +++ b/server/src/test/java/com/vaadin/data/util/TransactionalPropertyWrapperTest.java @@ -35,8 +35,8 @@ import com.vaadin.legacy.ui.LegacyTextField; public class TransactionalPropertyWrapperTest { @SuppressWarnings("serial") - public class TestingProperty<T extends Object> extends - ObjectProperty<Object> { + public class TestingProperty<T extends Object> + extends ObjectProperty<Object> { private List<ValueChangeListener> listeners = new ArrayList<ValueChangeListener>(); @@ -65,15 +65,16 @@ public class TransactionalPropertyWrapperTest { private final LegacyTextField nameField = new LegacyTextField("Name"); private final LegacyTextField ageField = new LegacyTextField("Age"); - private final LegacyTextField unboundField = new LegacyTextField("No FieldGroup"); + private final LegacyTextField unboundField = new LegacyTextField( + "No FieldGroup"); private final TestingProperty<String> unboundProp = new TestingProperty<String>( "Hello World"); private final PropertysetItem item = new PropertysetItem(); @Test public void fieldGroupBindAndUnbind() { - item.addItemProperty("name", new TestingProperty<String>( - "Just some text")); + item.addItemProperty("name", + new TestingProperty<String>("Just some text")); item.addItemProperty("age", new TestingProperty<String>("42")); final FieldGroup binder = new FieldGroup(item); diff --git a/server/src/test/java/com/vaadin/data/util/filter/AbstractFilterTestBase.java b/server/src/test/java/com/vaadin/data/util/filter/AbstractFilterTestBase.java index ebd843fb53..979f472e20 100644 --- a/server/src/test/java/com/vaadin/data/util/filter/AbstractFilterTestBase.java +++ b/server/src/test/java/com/vaadin/data/util/filter/AbstractFilterTestBase.java @@ -8,8 +8,8 @@ import com.vaadin.data.Property; import com.vaadin.data.util.ObjectProperty; import com.vaadin.data.util.PropertysetItem; -public abstract class AbstractFilterTestBase<FILTERTYPE extends Filter> extends - TestCase { +public abstract class AbstractFilterTestBase<FILTERTYPE extends Filter> + extends TestCase { protected static final String PROPERTY1 = "property1"; protected static final String PROPERTY2 = "property2"; diff --git a/server/src/test/java/com/vaadin/data/util/filter/AndOrFilterTest.java b/server/src/test/java/com/vaadin/data/util/filter/AndOrFilterTest.java index 21ce685445..f825ef64c6 100644 --- a/server/src/test/java/com/vaadin/data/util/filter/AndOrFilterTest.java +++ b/server/src/test/java/com/vaadin/data/util/filter/AndOrFilterTest.java @@ -7,8 +7,8 @@ import com.vaadin.data.Container.Filter; import com.vaadin.data.Item; import com.vaadin.data.util.BeanItem; -public class AndOrFilterTest extends - AbstractFilterTestBase<AbstractJunctionFilter> { +public class AndOrFilterTest + extends AbstractFilterTestBase<AbstractJunctionFilter> { protected Item item1 = new BeanItem<Integer>(1); protected Item item2 = new BeanItem<Integer>(2); @@ -30,10 +30,10 @@ public class AndOrFilterTest extends @Test public void testTwoFilterAnd() { - Filter filter1 = new And(new SameItemFilter(item1), new SameItemFilter( - item1)); - Filter filter2 = new And(new SameItemFilter(item1), new SameItemFilter( - item2)); + Filter filter1 = new And(new SameItemFilter(item1), + new SameItemFilter(item1)); + Filter filter2 = new And(new SameItemFilter(item1), + new SameItemFilter(item2)); Assert.assertTrue(filter1.passesFilter(null, item1)); Assert.assertFalse(filter1.passesFilter(null, item2)); @@ -44,10 +44,10 @@ public class AndOrFilterTest extends @Test public void testThreeFilterAnd() { - Filter filter1 = new And(new SameItemFilter(item1), new SameItemFilter( - item1), new SameItemFilter(item1)); - Filter filter2 = new And(new SameItemFilter(item1), new SameItemFilter( - item1), new SameItemFilter(item2)); + Filter filter1 = new And(new SameItemFilter(item1), + new SameItemFilter(item1), new SameItemFilter(item1)); + Filter filter2 = new And(new SameItemFilter(item1), + new SameItemFilter(item1), new SameItemFilter(item2)); Assert.assertTrue(filter1.passesFilter(null, item1)); Assert.assertFalse(filter1.passesFilter(null, item2)); @@ -73,10 +73,10 @@ public class AndOrFilterTest extends @Test public void testTwoFilterOr() { - Filter filter1 = new Or(new SameItemFilter(item1), new SameItemFilter( - item1)); - Filter filter2 = new Or(new SameItemFilter(item1), new SameItemFilter( - item2)); + Filter filter1 = new Or(new SameItemFilter(item1), + new SameItemFilter(item1)); + Filter filter2 = new Or(new SameItemFilter(item1), + new SameItemFilter(item2)); Assert.assertTrue(filter1.passesFilter(null, item1)); Assert.assertFalse(filter1.passesFilter(null, item2)); @@ -87,10 +87,10 @@ public class AndOrFilterTest extends @Test public void testThreeFilterOr() { - Filter filter1 = new Or(new SameItemFilter(item1), new SameItemFilter( - item1), new SameItemFilter(item1)); - Filter filter2 = new Or(new SameItemFilter(item1), new SameItemFilter( - item1), new SameItemFilter(item2)); + Filter filter1 = new Or(new SameItemFilter(item1), + new SameItemFilter(item1), new SameItemFilter(item1)); + Filter filter2 = new Or(new SameItemFilter(item1), + new SameItemFilter(item1), new SameItemFilter(item2)); Assert.assertTrue(filter1.passesFilter(null, item1)); Assert.assertFalse(filter1.passesFilter(null, item2)); @@ -146,10 +146,10 @@ public class AndOrFilterTest extends Filter filter1a = new Or(new SameItemFilter(item1)); Filter filter1a2 = new Or(new SameItemFilter(item1)); Filter filter1b = new Or(new SameItemFilter(item2)); - Filter filter2a = new Or(new SameItemFilter(item1), new SameItemFilter( - item1)); - Filter filter2b = new Or(new SameItemFilter(item1), new SameItemFilter( - item2)); + Filter filter2a = new Or(new SameItemFilter(item1), + new SameItemFilter(item1)); + Filter filter2b = new Or(new SameItemFilter(item1), + new SameItemFilter(item2)); Filter filter2b2 = new Or(new SameItemFilter(item1), new SameItemFilter(item2)); Filter other0 = new And(); diff --git a/server/src/test/java/com/vaadin/data/util/filter/CompareFilterDateTest.java b/server/src/test/java/com/vaadin/data/util/filter/CompareFilterDateTest.java index 5908c7d8d4..7c3dba9db3 100644 --- a/server/src/test/java/com/vaadin/data/util/filter/CompareFilterDateTest.java +++ b/server/src/test/java/com/vaadin/data/util/filter/CompareFilterDateTest.java @@ -16,7 +16,6 @@ import com.vaadin.data.util.filter.Compare.GreaterOrEqual; import com.vaadin.data.util.filter.Compare.Less; import com.vaadin.data.util.filter.Compare.LessOrEqual; - public class CompareFilterDateTest extends AbstractFilterTestBase<Compare> { protected Item itemNullUtilDate; @@ -51,20 +50,20 @@ public class CompareFilterDateTest extends AbstractFilterTestBase<Compare> { lessEqualCompUtilDate = new LessOrEqual(PROPERTY1, formatter.parse("26072016")); - equalCompSqlDate = new Equal(PROPERTY1, new java.sql.Date(formatter - .parse("26072016").getTime())); - greaterCompSqlDate = new Greater(PROPERTY1, new java.sql.Date(formatter - .parse("26072016").getTime())); - lessCompSqlDate = new Less(PROPERTY1, new java.sql.Date(formatter - .parse("26072016").getTime())); + equalCompSqlDate = new Equal(PROPERTY1, + new java.sql.Date(formatter.parse("26072016").getTime())); + greaterCompSqlDate = new Greater(PROPERTY1, + new java.sql.Date(formatter.parse("26072016").getTime())); + lessCompSqlDate = new Less(PROPERTY1, + new java.sql.Date(formatter.parse("26072016").getTime())); greaterEqualCompSqlDate = new GreaterOrEqual(PROPERTY1, new java.sql.Date(formatter.parse("26072016").getTime())); - lessEqualCompSqlDate = new LessOrEqual(PROPERTY1, new java.sql.Date( - formatter.parse("26072016").getTime())); + lessEqualCompSqlDate = new LessOrEqual(PROPERTY1, + new java.sql.Date(formatter.parse("26072016").getTime())); itemNullUtilDate = new PropertysetItem(); - itemNullUtilDate.addItemProperty(PROPERTY1, new ObjectProperty<Date>( - null, Date.class)); + itemNullUtilDate.addItemProperty(PROPERTY1, + new ObjectProperty<Date>(null, Date.class)); itemNullSqlDate = new PropertysetItem(); itemNullSqlDate.addItemProperty(PROPERTY1, new ObjectProperty<java.sql.Date>(null, java.sql.Date.class)); @@ -73,8 +72,10 @@ public class CompareFilterDateTest extends AbstractFilterTestBase<Compare> { formatter.parse("25072016"), Date.class)); itemSqlDate = new PropertysetItem(); itemSqlDate.addItemProperty(PROPERTY1, - new ObjectProperty<java.sql.Date>(new java.sql.Date(formatter - .parse("25072016").getTime()), java.sql.Date.class)); + new ObjectProperty<java.sql.Date>( + new java.sql.Date( + formatter.parse("25072016").getTime()), + java.sql.Date.class)); } @Override @@ -88,50 +89,54 @@ public class CompareFilterDateTest extends AbstractFilterTestBase<Compare> { @Test public void testCompareUtilDatesAndUtilDates() { - Assert.assertFalse(equalCompUtilDate.passesFilter(null, - itemNullUtilDate)); + Assert.assertFalse( + equalCompUtilDate.passesFilter(null, itemNullUtilDate)); Assert.assertFalse(equalCompUtilDate.passesFilter(null, itemUtilDate)); - Assert.assertFalse(greaterCompUtilDate.passesFilter(null, itemUtilDate)); + Assert.assertFalse( + greaterCompUtilDate.passesFilter(null, itemUtilDate)); Assert.assertTrue(lessCompUtilDate.passesFilter(null, itemUtilDate)); - Assert.assertFalse(greaterEqualCompUtilDate.passesFilter(null, - itemUtilDate)); - Assert.assertTrue(lessEqualCompUtilDate - .passesFilter(null, itemUtilDate)); + Assert.assertFalse( + greaterEqualCompUtilDate.passesFilter(null, itemUtilDate)); + Assert.assertTrue( + lessEqualCompUtilDate.passesFilter(null, itemUtilDate)); } @Test public void testCompareUtilDatesAndSqlDates() { - Assert.assertFalse(equalCompUtilDate - .passesFilter(null, itemNullSqlDate)); + Assert.assertFalse( + equalCompUtilDate.passesFilter(null, itemNullSqlDate)); Assert.assertFalse(equalCompUtilDate.passesFilter(null, itemSqlDate)); Assert.assertFalse(greaterCompUtilDate.passesFilter(null, itemSqlDate)); Assert.assertTrue(lessCompUtilDate.passesFilter(null, itemSqlDate)); - Assert.assertFalse(greaterEqualCompUtilDate.passesFilter(null, - itemSqlDate)); - Assert.assertTrue(lessEqualCompUtilDate.passesFilter(null, itemSqlDate)); + Assert.assertFalse( + greaterEqualCompUtilDate.passesFilter(null, itemSqlDate)); + Assert.assertTrue( + lessEqualCompUtilDate.passesFilter(null, itemSqlDate)); } @Test public void testCompareSqlDatesAndSqlDates() { - Assert.assertFalse(equalCompSqlDate.passesFilter(null, itemNullSqlDate)); + Assert.assertFalse( + equalCompSqlDate.passesFilter(null, itemNullSqlDate)); Assert.assertFalse(equalCompSqlDate.passesFilter(null, itemSqlDate)); Assert.assertFalse(greaterCompSqlDate.passesFilter(null, itemSqlDate)); Assert.assertTrue(lessCompSqlDate.passesFilter(null, itemSqlDate)); - Assert.assertFalse(greaterEqualCompSqlDate.passesFilter(null, - itemSqlDate)); + Assert.assertFalse( + greaterEqualCompSqlDate.passesFilter(null, itemSqlDate)); Assert.assertTrue(lessEqualCompSqlDate.passesFilter(null, itemSqlDate)); } @Test public void testCompareSqlDatesAndUtilDates() { - Assert.assertFalse(equalCompSqlDate - .passesFilter(null, itemNullUtilDate)); + Assert.assertFalse( + equalCompSqlDate.passesFilter(null, itemNullUtilDate)); Assert.assertFalse(equalCompSqlDate.passesFilter(null, itemUtilDate)); Assert.assertFalse(greaterCompSqlDate.passesFilter(null, itemUtilDate)); Assert.assertTrue(lessCompSqlDate.passesFilter(null, itemUtilDate)); - Assert.assertFalse(greaterEqualCompSqlDate.passesFilter(null, - itemUtilDate)); - Assert.assertTrue(lessEqualCompSqlDate.passesFilter(null, itemUtilDate)); + Assert.assertFalse( + greaterEqualCompSqlDate.passesFilter(null, itemUtilDate)); + Assert.assertTrue( + lessEqualCompSqlDate.passesFilter(null, itemUtilDate)); } } diff --git a/server/src/test/java/com/vaadin/data/util/filter/CompareFilterTest.java b/server/src/test/java/com/vaadin/data/util/filter/CompareFilterTest.java index 116d70e188..4bdad3c54d 100644 --- a/server/src/test/java/com/vaadin/data/util/filter/CompareFilterTest.java +++ b/server/src/test/java/com/vaadin/data/util/filter/CompareFilterTest.java @@ -41,20 +41,20 @@ public class CompareFilterTest extends AbstractFilterTestBase<Compare> { protected void setUp() throws Exception { super.setUp(); itemNull = new PropertysetItem(); - itemNull.addItemProperty(PROPERTY1, new ObjectProperty<String>(null, - String.class)); + itemNull.addItemProperty(PROPERTY1, + new ObjectProperty<String>(null, String.class)); itemEmpty = new PropertysetItem(); - itemEmpty.addItemProperty(PROPERTY1, new ObjectProperty<String>("", - String.class)); + itemEmpty.addItemProperty(PROPERTY1, + new ObjectProperty<String>("", String.class)); itemA = new PropertysetItem(); - itemA.addItemProperty(PROPERTY1, new ObjectProperty<String>("a", - String.class)); + itemA.addItemProperty(PROPERTY1, + new ObjectProperty<String>("a", String.class)); itemB = new PropertysetItem(); - itemB.addItemProperty(PROPERTY1, new ObjectProperty<String>("b", - String.class)); + itemB.addItemProperty(PROPERTY1, + new ObjectProperty<String>("b", String.class)); itemC = new PropertysetItem(); - itemC.addItemProperty(PROPERTY1, new ObjectProperty<String>("c", - String.class)); + itemC.addItemProperty(PROPERTY1, + new ObjectProperty<String>("c", String.class)); } @Override @@ -123,14 +123,14 @@ public class CompareFilterTest extends AbstractFilterTestBase<Compare> { int positive = 1; Item itemNegative = new PropertysetItem(); - itemNegative.addItemProperty(PROPERTY1, new ObjectProperty<Integer>( - negative, Integer.class)); + itemNegative.addItemProperty(PROPERTY1, + new ObjectProperty<Integer>(negative, Integer.class)); Item itemZero = new PropertysetItem(); - itemZero.addItemProperty(PROPERTY1, new ObjectProperty<Integer>(zero, - Integer.class)); + itemZero.addItemProperty(PROPERTY1, + new ObjectProperty<Integer>(zero, Integer.class)); Item itemPositive = new PropertysetItem(); - itemPositive.addItemProperty(PROPERTY1, new ObjectProperty<Integer>( - positive, Integer.class)); + itemPositive.addItemProperty(PROPERTY1, + new ObjectProperty<Integer>(positive, Integer.class)); Filter equalZero = new Equal(PROPERTY1, zero); Assert.assertFalse(equalZero.passesFilter(null, itemNegative)); @@ -167,14 +167,14 @@ public class CompareFilterTest extends AbstractFilterTestBase<Compare> { BigDecimal positiveScaleTwo = new BigDecimal(1).setScale(2); Item itemNegative = new PropertysetItem(); - itemNegative.addItemProperty(PROPERTY1, new ObjectProperty<BigDecimal>( - negative, BigDecimal.class)); + itemNegative.addItemProperty(PROPERTY1, + new ObjectProperty<BigDecimal>(negative, BigDecimal.class)); Item itemZero = new PropertysetItem(); - itemZero.addItemProperty(PROPERTY1, new ObjectProperty<BigDecimal>( - zero, BigDecimal.class)); + itemZero.addItemProperty(PROPERTY1, + new ObjectProperty<BigDecimal>(zero, BigDecimal.class)); Item itemPositive = new PropertysetItem(); - itemPositive.addItemProperty(PROPERTY1, new ObjectProperty<BigDecimal>( - positive, BigDecimal.class)); + itemPositive.addItemProperty(PROPERTY1, + new ObjectProperty<BigDecimal>(positive, BigDecimal.class)); Item itemPositiveScaleTwo = new PropertysetItem(); itemPositiveScaleTwo.addItemProperty(PROPERTY1, new ObjectProperty<BigDecimal>(positiveScaleTwo, @@ -206,8 +206,8 @@ public class CompareFilterTest extends AbstractFilterTestBase<Compare> { Assert.assertFalse(isNonPositive.passesFilter(null, itemPositive)); Filter isPositiveScaleTwo = new Equal(PROPERTY1, positiveScaleTwo); - Assert.assertTrue(isPositiveScaleTwo.passesFilter(null, - itemPositiveScaleTwo)); + Assert.assertTrue( + isPositiveScaleTwo.passesFilter(null, itemPositiveScaleTwo)); Assert.assertTrue(isPositiveScaleTwo.passesFilter(null, itemPositive)); } @@ -221,14 +221,14 @@ public class CompareFilterTest extends AbstractFilterTestBase<Compare> { Date later = new Date(now.getTime() + 1); Item itemEarlier = new PropertysetItem(); - itemEarlier.addItemProperty(PROPERTY1, new ObjectProperty<Date>( - earlier, Date.class)); + itemEarlier.addItemProperty(PROPERTY1, + new ObjectProperty<Date>(earlier, Date.class)); Item itemNow = new PropertysetItem(); - itemNow.addItemProperty(PROPERTY1, new ObjectProperty<Date>(now, - Date.class)); + itemNow.addItemProperty(PROPERTY1, + new ObjectProperty<Date>(now, Date.class)); Item itemLater = new PropertysetItem(); - itemLater.addItemProperty(PROPERTY1, new ObjectProperty<Date>(later, - Date.class)); + itemLater.addItemProperty(PROPERTY1, + new ObjectProperty<Date>(later, Date.class)); Filter equalNow = new Equal(PROPERTY1, now); Assert.assertFalse(equalNow.passesFilter(null, itemEarlier)); diff --git a/server/src/test/java/com/vaadin/data/util/filter/IsNullFilterTest.java b/server/src/test/java/com/vaadin/data/util/filter/IsNullFilterTest.java index 7a2ab3af7e..18013cd41c 100644 --- a/server/src/test/java/com/vaadin/data/util/filter/IsNullFilterTest.java +++ b/server/src/test/java/com/vaadin/data/util/filter/IsNullFilterTest.java @@ -13,15 +13,15 @@ public class IsNullFilterTest extends AbstractFilterTestBase<IsNull> { @Test public void testIsNull() { Item item1 = new PropertysetItem(); - item1.addItemProperty("a", new ObjectProperty<String>(null, - String.class)); + item1.addItemProperty("a", + new ObjectProperty<String>(null, String.class)); item1.addItemProperty("b", new ObjectProperty<String>("b", String.class)); Item item2 = new PropertysetItem(); item2.addItemProperty("a", new ObjectProperty<String>("a", String.class)); - item2.addItemProperty("b", new ObjectProperty<String>(null, - String.class)); + item2.addItemProperty("b", + new ObjectProperty<String>(null, String.class)); Filter filter1 = new IsNull("a"); Filter filter2 = new IsNull("b"); diff --git a/server/src/test/java/com/vaadin/data/util/filter/LikeFilterTest.java b/server/src/test/java/com/vaadin/data/util/filter/LikeFilterTest.java index d43650101d..dc6eef04c2 100644 --- a/server/src/test/java/com/vaadin/data/util/filter/LikeFilterTest.java +++ b/server/src/test/java/com/vaadin/data/util/filter/LikeFilterTest.java @@ -36,8 +36,8 @@ public class LikeFilterTest extends AbstractFilterTestBase<Like> { item1.addItemProperty("value", new ObjectProperty<String>("a")); item2.addItemProperty("value", new ObjectProperty<String>("b")); - item3.addItemProperty("value", new ObjectProperty<String>(null, - String.class)); + item3.addItemProperty("value", + new ObjectProperty<String>(null, String.class)); Assert.assertTrue(filter.passesFilter(null, item1)); Assert.assertFalse(filter.passesFilter(null, item2)); diff --git a/server/src/test/java/com/vaadin/data/util/filter/SimpleStringFilterTest.java b/server/src/test/java/com/vaadin/data/util/filter/SimpleStringFilterTest.java index e085c934c9..dd8267107a 100644 --- a/server/src/test/java/com/vaadin/data/util/filter/SimpleStringFilterTest.java +++ b/server/src/test/java/com/vaadin/data/util/filter/SimpleStringFilterTest.java @@ -3,8 +3,8 @@ package com.vaadin.data.util.filter; import org.junit.Assert; import org.junit.Test; -public class SimpleStringFilterTest extends - AbstractFilterTestBase<SimpleStringFilter> { +public class SimpleStringFilterTest + extends AbstractFilterTestBase<SimpleStringFilter> { protected static TestItem<String, String> createTestItem() { return new TestItem<String, String>("abcde", "TeSt"); @@ -132,8 +132,8 @@ public class SimpleStringFilterTest extends TestItem<String, String> item = createTestItem(); item.addItemProperty("other1", new NullProperty()); - Assert.assertFalse(f("other1", "ab", false, true).passesFilter(null, - item)); + Assert.assertFalse( + f("other1", "ab", false, true).passesFilter(null, item)); } } diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java index 7cad310d37..edc56035e1 100644 --- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java +++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java @@ -19,8 +19,8 @@ public class ColumnPropertyTest { @Test public void constructor_legalParameters_shouldSucceed() { - ColumnProperty cp = new ColumnProperty("NAME", false, true, true, - false, "Ville", String.class); + ColumnProperty cp = new ColumnProperty("NAME", false, true, true, false, + "Ville", String.class); Assert.assertNotNull(cp); } @@ -37,15 +37,15 @@ public class ColumnPropertyTest { @Test public void getValue_defaultValue_returnsVille() { - ColumnProperty cp = new ColumnProperty("NAME", false, true, true, - false, "Ville", String.class); + ColumnProperty cp = new ColumnProperty("NAME", false, true, true, false, + "Ville", String.class); Assert.assertEquals("Ville", cp.getValue()); } @Test public void setValue_readWriteNullable_returnsKalle() { - ColumnProperty cp = new ColumnProperty("NAME", false, true, true, - false, "Ville", String.class); + ColumnProperty cp = new ColumnProperty("NAME", false, true, true, false, + "Ville", String.class); SQLContainer container = EasyMock.createMock(SQLContainer.class); RowItem owner = new RowItem(container, new RowId(new Object[] { 1 }), Arrays.asList(cp)); @@ -61,7 +61,8 @@ public class ColumnPropertyTest { ColumnProperty cp = new ColumnProperty("NAME", true, true, true, false, "Ville", String.class); SQLContainer container = EasyMock.createMock(SQLContainer.class); - new RowItem(container, new RowId(new Object[] { 1 }), Arrays.asList(cp)); + new RowItem(container, new RowId(new Object[] { 1 }), + Arrays.asList(cp)); EasyMock.replay(container); cp.setValue("Kalle"); EasyMock.verify(container); @@ -69,8 +70,8 @@ public class ColumnPropertyTest { @Test public void setValue_readWriteNullable_nullShouldWork() { - ColumnProperty cp = new ColumnProperty("NAME", false, true, true, - false, "Ville", String.class); + ColumnProperty cp = new ColumnProperty("NAME", false, true, true, false, + "Ville", String.class); SQLContainer container = EasyMock.createMock(SQLContainer.class); RowItem owner = new RowItem(container, new RowId(new Object[] { 1 }), Arrays.asList(cp)); @@ -97,15 +98,15 @@ public class ColumnPropertyTest { @Test public void getType_normal_returnsStringClass() { - ColumnProperty cp = new ColumnProperty("NAME", false, true, true, - false, "Ville", String.class); + ColumnProperty cp = new ColumnProperty("NAME", false, true, true, false, + "Ville", String.class); Assert.assertSame(String.class, cp.getType()); } @Test public void isReadOnly_readWriteNullable_returnsTrue() { - ColumnProperty cp = new ColumnProperty("NAME", false, true, true, - false, "Ville", String.class); + ColumnProperty cp = new ColumnProperty("NAME", false, true, true, false, + "Ville", String.class); Assert.assertFalse(cp.isReadOnly()); } @@ -118,8 +119,8 @@ public class ColumnPropertyTest { @Test public void setReadOnly_readOnlyChangeAllowed_shouldSucceed() { - ColumnProperty cp = new ColumnProperty("NAME", false, true, true, - false, "Ville", String.class); + ColumnProperty cp = new ColumnProperty("NAME", false, true, true, false, + "Ville", String.class); cp.setReadOnly(true); Assert.assertTrue(cp.isReadOnly()); } @@ -141,8 +142,8 @@ public class ColumnPropertyTest { @Test public void isModified_valueModified_returnsTrue() { - ColumnProperty cp = new ColumnProperty("NAME", false, true, true, - false, "Ville", String.class); + ColumnProperty cp = new ColumnProperty("NAME", false, true, true, false, + "Ville", String.class); SQLContainer container = EasyMock.createMock(SQLContainer.class); RowItem owner = new RowItem(container, new RowId(new Object[] { 1 }), Arrays.asList(cp)); @@ -163,20 +164,22 @@ public class ColumnPropertyTest { @Test public void setValue_nullOnNullable_shouldWork() { - ColumnProperty cp = new ColumnProperty("NAME", false, true, true, - false, "asdf", String.class); + ColumnProperty cp = new ColumnProperty("NAME", false, true, true, false, + "asdf", String.class); SQLContainer container = EasyMock.createMock(SQLContainer.class); - new RowItem(container, new RowId(new Object[] { 1 }), Arrays.asList(cp)); + new RowItem(container, new RowId(new Object[] { 1 }), + Arrays.asList(cp)); cp.setValue(null); Assert.assertNull(cp.getValue()); } @Test public void setValue_resetTonullOnNullable_shouldWork() { - ColumnProperty cp = new ColumnProperty("NAME", false, true, true, - false, null, String.class); + ColumnProperty cp = new ColumnProperty("NAME", false, true, true, false, + null, String.class); SQLContainer container = EasyMock.createMock(SQLContainer.class); - new RowItem(container, new RowId(new Object[] { 1 }), Arrays.asList(cp)); + new RowItem(container, new RowId(new Object[] { 1 }), + Arrays.asList(cp)); cp.setValue("asdf"); Assert.assertEquals("asdf", cp.getValue()); cp.setValue(null); diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java index f6619a33b6..8ce298c065 100644 --- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java +++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java @@ -39,14 +39,14 @@ public class DataGenerator { statement.executeUpdate("insert into people values('Pelle', '18')"); statement.executeUpdate("insert into people values('Börje', '64')"); } else { - statement - .executeUpdate("insert into people values(default, 'Ville', '23')"); - statement - .executeUpdate("insert into people values(default, 'Kalle', '7')"); - statement - .executeUpdate("insert into people values(default, 'Pelle', '18')"); - statement - .executeUpdate("insert into people values(default, 'Börje', '64')"); + statement.executeUpdate( + "insert into people values(default, 'Ville', '23')"); + statement.executeUpdate( + "insert into people values(default, 'Kalle', '7')"); + statement.executeUpdate( + "insert into people values(default, 'Pelle', '18')"); + statement.executeUpdate( + "insert into people values(default, 'Börje', '64')"); } statement.close(); statement = conn.createStatement(); @@ -63,12 +63,12 @@ public class DataGenerator { Statement statement = conn.createStatement(); for (int i = 4; i < 5000; i++) { if (SQLTestsConstants.db == DB.MSSQL) { - statement.executeUpdate("insert into people values('Person " - + i + "', '" + i % 99 + "')"); + statement.executeUpdate("insert into people values('Person " + i + + "', '" + i % 99 + "')"); } else { - statement - .executeUpdate("insert into people values(default, 'Person " - + i + "', '" + i % 99 + "')"); + statement.executeUpdate( + "insert into people values(default, 'Person " + i + + "', '" + i % 99 + "')"); } } statement.close(); @@ -94,11 +94,11 @@ public class DataGenerator { statement.execute(stmtString); } if (SQLTestsConstants.db == DB.MSSQL) { - statement - .executeUpdate("insert into VERSIONED values('Junk', default)"); + statement.executeUpdate( + "insert into VERSIONED values('Junk', default)"); } else { - statement - .executeUpdate("insert into VERSIONED values(default, 'Junk', default)"); + statement.executeUpdate( + "insert into VERSIONED values(default, 'Junk', default)"); } statement.close(); statement = conn.createStatement(); diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java index 288cb65fae..8688c9ae64 100644 --- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java +++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java @@ -25,7 +25,8 @@ public class FreeformQueryUtil { query.append(") AS rownum, * FROM \"PEOPLE\""); if (!filters.isEmpty()) { - query.append(QueryBuilder.getWhereStringForFilters(filters, sh)); + query.append( + QueryBuilder.getWhereStringForFilters(filters, sh)); } query.append(") AS a WHERE a.rownum BETWEEN ").append(offset) .append(" AND ").append(Integer.toString(offset + limit)); @@ -40,7 +41,8 @@ public class FreeformQueryUtil { query.append("SELECT * FROM (SELECT x.*, ROWNUM AS " + "\"rownum\" FROM (SELECT * FROM \"PEOPLE\""); if (!filters.isEmpty()) { - query.append(QueryBuilder.getWhereStringForFilters(filters, sh)); + query.append( + QueryBuilder.getWhereStringForFilters(filters, sh)); } query.append(") x) WHERE \"rownum\" BETWEEN ? AND ?"); sh.addParameterValue(offset); @@ -50,7 +52,8 @@ public class FreeformQueryUtil { } else { StringBuilder query = new StringBuilder("SELECT * FROM people"); if (!filters.isEmpty()) { - query.append(QueryBuilder.getWhereStringForFilters(filters, sh)); + query.append( + QueryBuilder.getWhereStringForFilters(filters, sh)); } if (limit != 0 || offset != 0) { query.append(" LIMIT ? OFFSET ?"); diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/RowIdTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/RowIdTest.java index 73f7be9fb2..e93048157b 100644 --- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/RowIdTest.java +++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/RowIdTest.java @@ -54,7 +54,7 @@ public class RowIdTest { @Test public void toString_defaultCtor_noException() { RowId rowId = new RowId(); - Assert.assertTrue("Unexpected to string for empty Row Id", rowId - .toString().isEmpty()); + Assert.assertTrue("Unexpected to string for empty Row Id", + rowId.toString().isEmpty()); } } diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java index a332d9d9ee..d499ceed92 100644 --- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java +++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java @@ -73,8 +73,8 @@ public class SQLContainerTest { @Test(expected = SQLException.class) public void constructor_withIllegalFreeformQuery_shouldFail() throws SQLException { - SQLContainer c = new SQLContainer(new FreeformQuery( - "SELECT * FROM asdf", connectionPool, "ID")); + SQLContainer c = new SQLContainer( + new FreeformQuery("SELECT * FROM asdf", connectionPool, "ID")); c.getItem(c.firstItemId()); } @@ -91,8 +91,8 @@ public class SQLContainerTest { throws SQLException { SQLContainer container = new SQLContainer(new FreeformQuery( "SELECT * FROM people", connectionPool, "ID")); - Assert.assertFalse(container - .containsId(new RowId(new Object[] { 1337 }))); + Assert.assertFalse( + container.containsId(new RowId(new Object[] { 1337 }))); } @Test @@ -101,15 +101,12 @@ public class SQLContainerTest { SQLContainer container = new SQLContainer(new FreeformQuery( "SELECT * FROM people", connectionPool, "ID")); if (SQLTestsConstants.db == DB.ORACLE) { - Assert.assertEquals( - "Ville", - container - .getContainerProperty( - new RowId(new Object[] { new BigDecimal( - 0 + offset) }), "NAME").getValue()); + Assert.assertEquals("Ville", + container.getContainerProperty(new RowId( + new Object[] { new BigDecimal(0 + offset) }), + "NAME").getValue()); } else { - Assert.assertEquals( - "Ville", + Assert.assertEquals("Ville", container.getContainerProperty( new RowId(new Object[] { 0 + offset }), "NAME") .getValue()); @@ -121,8 +118,8 @@ public class SQLContainerTest { throws SQLException { SQLContainer container = new SQLContainer(new FreeformQuery( "SELECT * FROM people", connectionPool, "ID")); - Assert.assertNull(container.getContainerProperty(new RowId( - new Object[] { 1 + offset }), "asdf")); + Assert.assertNull(container.getContainerProperty( + new RowId(new Object[] { 1 + offset }), "asdf")); } @Test @@ -130,8 +127,8 @@ public class SQLContainerTest { throws SQLException { SQLContainer container = new SQLContainer(new FreeformQuery( "SELECT * FROM people", connectionPool, "ID")); - Assert.assertNull(container.getContainerProperty(new RowId( - new Object[] { 1337 + offset }), "NAME")); + Assert.assertNull(container.getContainerProperty( + new RowId(new Object[] { 1337 + offset }), "NAME")); } @Test @@ -152,8 +149,8 @@ public class SQLContainerTest { "SELECT * FROM people", connectionPool, "ID")); Item item; if (SQLTestsConstants.db == DB.ORACLE) { - item = container.getItem(new RowId(new Object[] { new BigDecimal( - 0 + offset) })); + item = container.getItem( + new RowId(new Object[] { new BigDecimal(0 + offset) })); } else { item = container.getItem(new RowId(new Object[] { 0 + offset })); } @@ -187,19 +184,19 @@ public class SQLContainerTest { "SELECT * FROM people", connectionPool, "ID")); Item item; if (SQLTestsConstants.db == DB.ORACLE) { - item = container.getItem(new RowId(new Object[] { new BigDecimal( - 1337 + offset) })); + item = container.getItem( + new RowId(new Object[] { new BigDecimal(1337 + offset) })); Assert.assertNotNull(item); - Assert.assertEquals(new BigDecimal(1337 + offset), item - .getItemProperty("ID").getValue()); + Assert.assertEquals(new BigDecimal(1337 + offset), + item.getItemProperty("ID").getValue()); } else { item = container.getItem(new RowId(new Object[] { 1337 + offset })); Assert.assertNotNull(item); - Assert.assertEquals(1337 + offset, item.getItemProperty("ID") - .getValue()); + Assert.assertEquals(1337 + offset, + item.getItemProperty("ID").getValue()); } - Assert.assertEquals("Person 1337", item.getItemProperty("NAME") - .getValue()); + Assert.assertEquals("Person 1337", + item.getItemProperty("NAME").getValue()); } @Test @@ -268,8 +265,8 @@ public class SQLContainerTest { if (SQLTestsConstants.db == DB.MSSQL) { statement.executeUpdate("insert into people values('Bengt', '42')"); } else { - statement - .executeUpdate("insert into people values(default, 'Bengt', '42')"); + statement.executeUpdate( + "insert into people values(default, 'Bengt', '42')"); } statement.close(); conn.commit(); @@ -286,11 +283,11 @@ public class SQLContainerTest { SQLContainer container = new SQLContainer(new FreeformQuery( "SELECT * FROM people", connectionPool, "ID")); if (SQLTestsConstants.db == DB.ORACLE) { - Assert.assertEquals(3, container.indexOfId(new RowId( - new Object[] { new BigDecimal(3 + offset) }))); + Assert.assertEquals(3, container.indexOfId( + new RowId(new Object[] { new BigDecimal(3 + offset) }))); } else { - Assert.assertEquals(3, - container.indexOfId(new RowId(new Object[] { 3 + offset }))); + Assert.assertEquals(3, container + .indexOfId(new RowId(new Object[] { 3 + offset }))); } } @@ -298,18 +295,18 @@ public class SQLContainerTest { public void indexOfId_freeform5000RowsWithParameter1337_returns1337() throws SQLException { DataGenerator.addFiveThousandPeople(connectionPool); - SQLContainer container = new SQLContainer(new FreeformQuery( - "SELECT * FROM people ORDER BY \"ID\" ASC", connectionPool, - "ID")); + SQLContainer container = new SQLContainer( + new FreeformQuery("SELECT * FROM people ORDER BY \"ID\" ASC", + connectionPool, "ID")); if (SQLTestsConstants.db == DB.ORACLE) { - container.getItem(new RowId(new Object[] { new BigDecimal( - 1337 + offset) })); - Assert.assertEquals(1337, container.indexOfId(new RowId( - new Object[] { new BigDecimal(1337 + offset) }))); + container.getItem( + new RowId(new Object[] { new BigDecimal(1337 + offset) })); + Assert.assertEquals(1337, container.indexOfId( + new RowId(new Object[] { new BigDecimal(1337 + offset) }))); } else { container.getItem(new RowId(new Object[] { 1337 + offset })); - Assert.assertEquals(1337, container.indexOfId(new RowId( - new Object[] { 1337 + offset }))); + Assert.assertEquals(1337, container + .indexOfId(new RowId(new Object[] { 1337 + offset }))); } } @@ -317,13 +314,14 @@ public class SQLContainerTest { public void getIdByIndex_freeform5000rowsIndex1337_returnsRowId1337() throws SQLException { DataGenerator.addFiveThousandPeople(connectionPool); - SQLContainer container = new SQLContainer(new FreeformQuery( - "SELECT * FROM people ORDER BY \"ID\" ASC", connectionPool, - "ID")); + SQLContainer container = new SQLContainer( + new FreeformQuery("SELECT * FROM people ORDER BY \"ID\" ASC", + connectionPool, "ID")); Object itemId = container.getIdByIndex(1337); if (SQLTestsConstants.db == DB.ORACLE) { - Assert.assertEquals(new RowId(new Object[] { new BigDecimal( - 1337 + offset) }), itemId); + Assert.assertEquals( + new RowId(new Object[] { new BigDecimal(1337 + offset) }), + itemId); } else { Assert.assertEquals(new RowId(new Object[] { 1337 + offset }), itemId); @@ -352,8 +350,7 @@ public class SQLContainerTest { int end = offset + limit + 1; String q = "SELECT * FROM (SELECT row_number() OVER" + " ( ORDER BY \"ID\" ASC) AS rownum, * FROM people)" - + " AS a WHERE a.rownum BETWEEN " - + start + + " AS a WHERE a.rownum BETWEEN " + start + " AND " + end; return q; } else if (SQLTestsConstants.db == DB.ORACLE) { @@ -361,9 +358,7 @@ public class SQLContainerTest { int end = offset + limit + 1; String q = "SELECT * FROM (SELECT x.*, ROWNUM AS r FROM" + " (SELECT * FROM people ORDER BY \"ID\" ASC) x) " - + " WHERE r BETWEEN " - + start - + " AND " + + " WHERE r BETWEEN " + start + " AND " + end; return q; } else { @@ -400,9 +395,9 @@ public class SQLContainerTest { public void nextItemId_freeformCurrentItem1337_returnsItem1338() throws SQLException { DataGenerator.addFiveThousandPeople(connectionPool); - SQLContainer container = new SQLContainer(new FreeformQuery( - "SELECT * FROM people ORDER BY \"ID\" ASC", connectionPool, - "ID")); + SQLContainer container = new SQLContainer( + new FreeformQuery("SELECT * FROM people ORDER BY \"ID\" ASC", + connectionPool, "ID")); Object itemId = container.getIdByIndex(1337); if (SQLTestsConstants.db == DB.ORACLE) { Assert.assertEquals( @@ -418,9 +413,9 @@ public class SQLContainerTest { public void prevItemId_freeformCurrentItem1337_returns1336() throws SQLException { DataGenerator.addFiveThousandPeople(connectionPool); - SQLContainer container = new SQLContainer(new FreeformQuery( - "SELECT * FROM people ORDER BY \"ID\" ASC", connectionPool, - "ID")); + SQLContainer container = new SQLContainer( + new FreeformQuery("SELECT * FROM people ORDER BY \"ID\" ASC", + connectionPool, "ID")); Object itemId = container.getIdByIndex(1337); if (SQLTestsConstants.db == DB.ORACLE) { Assert.assertEquals( @@ -451,9 +446,9 @@ public class SQLContainerTest { throws SQLException { DataGenerator.addFiveThousandPeople(connectionPool); - SQLContainer container = new SQLContainer(new FreeformQuery( - "SELECT * FROM people ORDER BY \"ID\" ASC", connectionPool, - "ID")); + SQLContainer container = new SQLContainer( + new FreeformQuery("SELECT * FROM people ORDER BY \"ID\" ASC", + connectionPool, "ID")); if (SQLTestsConstants.db == DB.ORACLE) { Assert.assertEquals( new RowId(new Object[] { 4999 + offset }).toString(), @@ -470,11 +465,11 @@ public class SQLContainerTest { SQLContainer container = new SQLContainer(new FreeformQuery( "SELECT * FROM people", connectionPool, "ID")); if (SQLTestsConstants.db == DB.ORACLE) { - Assert.assertTrue(container.isFirstId(new RowId( - new Object[] { new BigDecimal(0 + offset) }))); + Assert.assertTrue(container.isFirstId( + new RowId(new Object[] { new BigDecimal(0 + offset) }))); } else { - Assert.assertTrue(container.isFirstId(new RowId( - new Object[] { 0 + offset }))); + Assert.assertTrue(container + .isFirstId(new RowId(new Object[] { 0 + offset }))); } } @@ -483,11 +478,11 @@ public class SQLContainerTest { SQLContainer container = new SQLContainer(new FreeformQuery( "SELECT * FROM people", connectionPool, "ID")); if (SQLTestsConstants.db == DB.ORACLE) { - Assert.assertFalse(container.isFirstId(new RowId( - new Object[] { new BigDecimal(1 + offset) }))); + Assert.assertFalse(container.isFirstId( + new RowId(new Object[] { new BigDecimal(1 + offset) }))); } else { - Assert.assertFalse(container.isFirstId(new RowId( - new Object[] { 1 + offset }))); + Assert.assertFalse(container + .isFirstId(new RowId(new Object[] { 1 + offset }))); } } @@ -496,11 +491,11 @@ public class SQLContainerTest { SQLContainer container = new SQLContainer(new FreeformQuery( "SELECT * FROM people", connectionPool, "ID")); if (SQLTestsConstants.db == DB.ORACLE) { - Assert.assertFalse(container.isLastId(new RowId( - new Object[] { new BigDecimal(1 + offset) }))); + Assert.assertFalse(container.isLastId( + new RowId(new Object[] { new BigDecimal(1 + offset) }))); } else { - Assert.assertFalse(container.isLastId(new RowId( - new Object[] { 1 + offset }))); + Assert.assertFalse( + container.isLastId(new RowId(new Object[] { 1 + offset }))); } } @@ -509,11 +504,11 @@ public class SQLContainerTest { SQLContainer container = new SQLContainer(new FreeformQuery( "SELECT * FROM people", connectionPool, "ID")); if (SQLTestsConstants.db == DB.ORACLE) { - Assert.assertTrue(container.isLastId(new RowId( - new Object[] { new BigDecimal(3 + offset) }))); + Assert.assertTrue(container.isLastId( + new RowId(new Object[] { new BigDecimal(3 + offset) }))); } else { - Assert.assertTrue(container.isLastId(new RowId( - new Object[] { 3 + offset }))); + Assert.assertTrue( + container.isLastId(new RowId(new Object[] { 3 + offset }))); } } @@ -521,15 +516,15 @@ public class SQLContainerTest { public void isLastId_freeform5000RowsLastId_returnsTrue() throws SQLException { DataGenerator.addFiveThousandPeople(connectionPool); - SQLContainer container = new SQLContainer(new FreeformQuery( - "SELECT * FROM people ORDER BY \"ID\" ASC", connectionPool, - "ID")); + SQLContainer container = new SQLContainer( + new FreeformQuery("SELECT * FROM people ORDER BY \"ID\" ASC", + connectionPool, "ID")); if (SQLTestsConstants.db == DB.ORACLE) { - Assert.assertTrue(container.isLastId(new RowId( - new Object[] { new BigDecimal(4999 + offset) }))); + Assert.assertTrue(container.isLastId( + new RowId(new Object[] { new BigDecimal(4999 + offset) }))); } else { - Assert.assertTrue(container.isLastId(new RowId( - new Object[] { 4999 + offset }))); + Assert.assertTrue(container + .isLastId(new RowId(new Object[] { 4999 + offset }))); } } @@ -585,7 +580,8 @@ public class SQLContainerTest { } @Test(expected = UnsupportedOperationException.class) - public void addContainerProperty_normal_isUnsupported() throws SQLException { + public void addContainerProperty_normal_isUnsupported() + throws SQLException { SQLContainer container = new SQLContainer(new FreeformQuery( "SELECT * FROM people", connectionPool, "ID")); container.addContainerProperty("asdf", String.class, ""); @@ -743,8 +739,8 @@ public class SQLContainerTest { Object id = container.addItem(); Item item = container.getItem(id); item.getItemProperty("NAME").setValue("asdf"); - Assert.assertEquals("asdf", container.getContainerProperty(id, "NAME") - .getValue()); + Assert.assertEquals("asdf", + container.getContainerProperty(id, "NAME").getValue()); } @Test @@ -1148,15 +1144,14 @@ public class SQLContainerTest { throws SQLException { FreeformQueryDelegate delegate = EasyMock .createMock(FreeformQueryDelegate.class); - EasyMock.expect( - delegate.storeRow(EasyMock.isA(Connection.class), - EasyMock.isA(RowItem.class))) - .andAnswer(new IAnswer<Integer>() { + EasyMock.expect(delegate.storeRow(EasyMock.isA(Connection.class), + EasyMock.isA(RowItem.class))).andAnswer(new IAnswer<Integer>() { @Override public Integer answer() throws Throwable { Connection conn = (Connection) EasyMock .getCurrentArguments()[0]; - RowItem item = (RowItem) EasyMock.getCurrentArguments()[1]; + RowItem item = (RowItem) EasyMock + .getCurrentArguments()[1]; Statement statement = conn.createStatement(); if (SQLTestsConstants.db == DB.MSSQL) { statement @@ -1165,15 +1160,17 @@ public class SQLContainerTest { .getValue() + "', '" + item.getItemProperty("AGE") - .getValue() + "')"); + .getValue() + + "')"); } else { - statement - .executeUpdate("insert into people values(default, '" + statement.executeUpdate( + "insert into people values(default, '" + item.getItemProperty("NAME") .getValue() + "', '" + item.getItemProperty("AGE") - .getValue() + "')"); + .getValue() + + "')"); } statement.close(); conn.commit(); @@ -1194,8 +1191,7 @@ public class SQLContainerTest { int end = offset + limit + 1; String q = "SELECT * FROM (SELECT row_number() OVER" + " ( ORDER BY \"ID\" ASC) AS rownum, * FROM people)" - + " AS a WHERE a.rownum BETWEEN " - + start + + " AS a WHERE a.rownum BETWEEN " + start + " AND " + end; return q; } else if (SQLTestsConstants.db == DB.ORACLE) { @@ -1203,9 +1199,7 @@ public class SQLContainerTest { int end = offset + limit + 1; String q = "SELECT * FROM (SELECT x.*, ROWNUM AS r FROM" + " (SELECT * FROM people ORDER BY \"ID\" ASC) x) " - + " WHERE r BETWEEN " - + start - + " AND " + + " WHERE r BETWEEN " + start + " AND " + end; return q; } else { @@ -1249,15 +1243,14 @@ public class SQLContainerTest { throws SQLException { FreeformQueryDelegate delegate = EasyMock .createMock(FreeformQueryDelegate.class); - EasyMock.expect( - delegate.storeRow(EasyMock.isA(Connection.class), - EasyMock.isA(RowItem.class))) - .andAnswer(new IAnswer<Integer>() { + EasyMock.expect(delegate.storeRow(EasyMock.isA(Connection.class), + EasyMock.isA(RowItem.class))).andAnswer(new IAnswer<Integer>() { @Override public Integer answer() throws Throwable { Connection conn = (Connection) EasyMock .getCurrentArguments()[0]; - RowItem item = (RowItem) EasyMock.getCurrentArguments()[1]; + RowItem item = (RowItem) EasyMock + .getCurrentArguments()[1]; Statement statement = conn.createStatement(); if (SQLTestsConstants.db == DB.MSSQL) { statement @@ -1266,15 +1259,17 @@ public class SQLContainerTest { .getValue() + "', '" + item.getItemProperty("AGE") - .getValue() + "')"); + .getValue() + + "')"); } else { - statement - .executeUpdate("insert into people values(default, '" + statement.executeUpdate( + "insert into people values(default, '" + item.getItemProperty("NAME") .getValue() + "', '" + item.getItemProperty("AGE") - .getValue() + "')"); + .getValue() + + "')"); } statement.close(); conn.commit(); @@ -1295,8 +1290,7 @@ public class SQLContainerTest { int end = offset + limit + 1; String q = "SELECT * FROM (SELECT row_number() OVER" + " ( ORDER BY \"ID\" ASC) AS rownum, * FROM people)" - + " AS a WHERE a.rownum BETWEEN " - + start + + " AS a WHERE a.rownum BETWEEN " + start + " AND " + end; return q; } else if (SQLTestsConstants.db == DB.ORACLE) { @@ -1304,9 +1298,7 @@ public class SQLContainerTest { int end = offset + limit + 1; String q = "SELECT * FROM (SELECT x.*, ROWNUM AS r FROM" + " (SELECT * FROM people ORDER BY \"ID\" ASC) x) " - + " WHERE r BETWEEN " - + start - + " AND " + + " WHERE r BETWEEN " + start + " AND " + end; return q; } else { @@ -1357,19 +1349,18 @@ public class SQLContainerTest { throws SQLException { FreeformQueryDelegate delegate = EasyMock .createMock(FreeformQueryDelegate.class); - EasyMock.expect( - delegate.removeRow(EasyMock.isA(Connection.class), - EasyMock.isA(RowItem.class))) - .andAnswer(new IAnswer<Boolean>() { + EasyMock.expect(delegate.removeRow(EasyMock.isA(Connection.class), + EasyMock.isA(RowItem.class))).andAnswer(new IAnswer<Boolean>() { @Override public Boolean answer() throws Throwable { Connection conn = (Connection) EasyMock .getCurrentArguments()[0]; - RowItem item = (RowItem) EasyMock.getCurrentArguments()[1]; + RowItem item = (RowItem) EasyMock + .getCurrentArguments()[1]; Statement statement = conn.createStatement(); - statement - .executeUpdate("DELETE FROM people WHERE \"ID\"=" - + item.getItemProperty("ID").getValue()); + statement.executeUpdate( + "DELETE FROM people WHERE \"ID\"=" + item + .getItemProperty("ID").getValue()); statement.close(); return true; } @@ -1387,8 +1378,7 @@ public class SQLContainerTest { int end = offset + limit + 1; String q = "SELECT * FROM (SELECT row_number() OVER" + " ( ORDER BY \"ID\" ASC) AS rownum, * FROM people)" - + " AS a WHERE a.rownum BETWEEN " - + start + + " AS a WHERE a.rownum BETWEEN " + start + " AND " + end; return q; } else if (SQLTestsConstants.db == DB.ORACLE) { @@ -1396,9 +1386,7 @@ public class SQLContainerTest { int end = offset + limit + 1; String q = "SELECT * FROM (SELECT x.*, ROWNUM AS r FROM" + " (SELECT * FROM people ORDER BY \"ID\" ASC) x) " - + " WHERE r BETWEEN " - + start - + " AND " + + " WHERE r BETWEEN " + start + " AND " + end; return q; } else { @@ -1436,15 +1424,14 @@ public class SQLContainerTest { throws SQLException { FreeformQueryDelegate delegate = EasyMock .createMock(FreeformQueryDelegate.class); - EasyMock.expect( - delegate.storeRow(EasyMock.isA(Connection.class), - EasyMock.isA(RowItem.class))) - .andAnswer(new IAnswer<Integer>() { + EasyMock.expect(delegate.storeRow(EasyMock.isA(Connection.class), + EasyMock.isA(RowItem.class))).andAnswer(new IAnswer<Integer>() { @Override public Integer answer() throws Throwable { Connection conn = (Connection) EasyMock .getCurrentArguments()[0]; - RowItem item = (RowItem) EasyMock.getCurrentArguments()[1]; + RowItem item = (RowItem) EasyMock + .getCurrentArguments()[1]; Statement statement = conn.createStatement(); statement.executeUpdate("UPDATE people SET \"NAME\"='" + item.getItemProperty("NAME").getValue() @@ -1469,8 +1456,7 @@ public class SQLContainerTest { int end = offset + limit + 1; String q = "SELECT * FROM (SELECT row_number() OVER" + " ( ORDER BY \"ID\" ASC) AS rownum, * FROM people)" - + " AS a WHERE a.rownum BETWEEN " - + start + + " AS a WHERE a.rownum BETWEEN " + start + " AND " + end; return q; } else if (SQLTestsConstants.db == DB.ORACLE) { @@ -1478,9 +1464,7 @@ public class SQLContainerTest { int end = offset + limit + 1; String q = "SELECT * FROM (SELECT x.*, ROWNUM AS r FROM" + " (SELECT * FROM people ORDER BY \"ID\" ASC) x) " - + " WHERE r BETWEEN " - + start - + " AND " + + " WHERE r BETWEEN " + start + " AND " + end; return q; } else { @@ -1525,8 +1509,9 @@ public class SQLContainerTest { Assert.assertEquals(size + 1, container.size()); container.rollback(); Assert.assertEquals(size, container.size()); - Assert.assertFalse("foo".equals(container.getContainerProperty( - container.lastItemId(), "NAME").getValue())); + Assert.assertFalse("foo".equals( + container.getContainerProperty(container.lastItemId(), "NAME") + .getValue())); } @Test @@ -1551,8 +1536,9 @@ public class SQLContainerTest { Object last = container.lastItemId(); container.getContainerProperty(last, "NAME").setValue("foo"); container.rollback(); - Assert.assertFalse("foo".equals(container.getContainerProperty( - container.lastItemId(), "NAME").getValue())); + Assert.assertFalse("foo".equals( + container.getContainerProperty(container.lastItemId(), "NAME") + .getValue())); } @Test @@ -1694,12 +1680,14 @@ public class SQLContainerTest { if (orderBys == null || orderBys.isEmpty()) { List<OrderBy> ob = new ArrayList<OrderBy>(); ob.add(new OrderBy("ID", true)); - return gen.generateSelectQuery("people", null, - ob, offset, limit, null) + return gen + .generateSelectQuery("people", null, ob, + offset, limit, null) .getQueryString(); } else { - return gen.generateSelectQuery("people", null, - orderBys, offset, limit, null) + return gen + .generateSelectQuery("people", null, + orderBys, offset, limit, null) .getQueryString(); } } else if (SQLTestsConstants.db == DB.ORACLE) { @@ -1707,12 +1695,14 @@ public class SQLContainerTest { if (orderBys == null || orderBys.isEmpty()) { List<OrderBy> ob = new ArrayList<OrderBy>(); ob.add(new OrderBy("ID", true)); - return gen.generateSelectQuery("people", null, - ob, offset, limit, null) + return gen + .generateSelectQuery("people", null, ob, + offset, limit, null) .getQueryString(); } else { - return gen.generateSelectQuery("people", null, - orderBys, offset, limit, null) + return gen + .generateSelectQuery("people", null, + orderBys, offset, limit, null) .getQueryString(); } } else { @@ -1721,8 +1711,8 @@ public class SQLContainerTest { if (!orderBys.isEmpty()) { query.append(" ORDER BY "); for (OrderBy orderBy : orderBys) { - query.append("\"" + orderBy.getColumn() - + "\""); + query.append( + "\"" + orderBy.getColumn() + "\""); if (orderBy.isAscending()) { query.append(" ASC"); } else { @@ -1808,12 +1798,14 @@ public class SQLContainerTest { if (orderBys == null || orderBys.isEmpty()) { List<OrderBy> ob = new ArrayList<OrderBy>(); ob.add(new OrderBy("ID", true)); - return gen.generateSelectQuery("people", null, - ob, offset, limit, null) + return gen + .generateSelectQuery("people", null, ob, + offset, limit, null) .getQueryString(); } else { - return gen.generateSelectQuery("people", null, - orderBys, offset, limit, null) + return gen + .generateSelectQuery("people", null, + orderBys, offset, limit, null) .getQueryString(); } } else if (SQLTestsConstants.db == DB.ORACLE) { @@ -1821,12 +1813,14 @@ public class SQLContainerTest { if (orderBys == null || orderBys.isEmpty()) { List<OrderBy> ob = new ArrayList<OrderBy>(); ob.add(new OrderBy("ID", true)); - return gen.generateSelectQuery("people", null, - ob, offset, limit, null) + return gen + .generateSelectQuery("people", null, ob, + offset, limit, null) .getQueryString(); } else { - return gen.generateSelectQuery("people", null, - orderBys, offset, limit, null) + return gen + .generateSelectQuery("people", null, + orderBys, offset, limit, null) .getQueryString(); } } else { @@ -1835,8 +1829,8 @@ public class SQLContainerTest { if (!orderBys.isEmpty()) { query.append(" ORDER BY "); for (OrderBy orderBy : orderBys) { - query.append("\"" + orderBy.getColumn() - + "\""); + query.append( + "\"" + orderBy.getColumn() + "\""); if (orderBy.isAscending()) { query.append(" ASC"); } else { @@ -1902,9 +1896,8 @@ public class SQLContainerTest { return null; } }).anyTimes(); - EasyMock.expect( - delegate.getQueryStatement(EasyMock.anyInt(), EasyMock.anyInt())) - .andAnswer(new IAnswer<StatementHelper>() { + EasyMock.expect(delegate.getQueryStatement(EasyMock.anyInt(), + EasyMock.anyInt())).andAnswer(new IAnswer<StatementHelper>() { @Override public StatementHelper answer() throws Throwable { Object[] args = EasyMock.getCurrentArguments(); @@ -1922,8 +1915,8 @@ public class SQLContainerTest { StringBuffer query = new StringBuffer( "SELECT COUNT(*) FROM people"); if (!filters.isEmpty()) { - query.append(QueryBuilder.getWhereStringForFilters( - filters, sh)); + query.append(QueryBuilder + .getWhereStringForFilters(filters, sh)); } sh.setQueryString(query.toString()); return sh; @@ -1974,9 +1967,8 @@ public class SQLContainerTest { return null; } }).anyTimes(); - EasyMock.expect( - delegate.getQueryStatement(EasyMock.anyInt(), EasyMock.anyInt())) - .andAnswer(new IAnswer<StatementHelper>() { + EasyMock.expect(delegate.getQueryStatement(EasyMock.anyInt(), + EasyMock.anyInt())).andAnswer(new IAnswer<StatementHelper>() { @Override public StatementHelper answer() throws Throwable { Object[] args = EasyMock.getCurrentArguments(); @@ -1994,8 +1986,8 @@ public class SQLContainerTest { StringBuffer query = new StringBuffer( "SELECT COUNT(*) FROM people"); if (!filters.isEmpty()) { - query.append(QueryBuilder.getWhereStringForFilters( - filters, sh)); + query.append(QueryBuilder + .getWhereStringForFilters(filters, sh)); } sh.setQueryString(query.toString()); return sh; @@ -2045,9 +2037,8 @@ public class SQLContainerTest { return null; } }).anyTimes(); - EasyMock.expect( - delegate.getQueryStatement(EasyMock.anyInt(), EasyMock.anyInt())) - .andAnswer(new IAnswer<StatementHelper>() { + EasyMock.expect(delegate.getQueryStatement(EasyMock.anyInt(), + EasyMock.anyInt())).andAnswer(new IAnswer<StatementHelper>() { @Override public StatementHelper answer() throws Throwable { Object[] args = EasyMock.getCurrentArguments(); @@ -2065,8 +2056,8 @@ public class SQLContainerTest { StringBuffer query = new StringBuffer( "SELECT COUNT(*) FROM people"); if (!filters.isEmpty()) { - query.append(QueryBuilder.getWhereStringForFilters( - filters, sh)); + query.append(QueryBuilder + .getWhereStringForFilters(filters, sh)); } sh.setQueryString(query.toString()); return sh; @@ -2117,9 +2108,8 @@ public class SQLContainerTest { return null; } }).anyTimes(); - EasyMock.expect( - delegate.getQueryStatement(EasyMock.anyInt(), EasyMock.anyInt())) - .andAnswer(new IAnswer<StatementHelper>() { + EasyMock.expect(delegate.getQueryStatement(EasyMock.anyInt(), + EasyMock.anyInt())).andAnswer(new IAnswer<StatementHelper>() { @Override public StatementHelper answer() throws Throwable { Object[] args = EasyMock.getCurrentArguments(); @@ -2137,8 +2127,8 @@ public class SQLContainerTest { StringBuffer query = new StringBuffer( "SELECT COUNT(*) FROM people"); if (!filters.isEmpty()) { - query.append(QueryBuilder.getWhereStringForFilters( - filters, sh)); + query.append(QueryBuilder + .getWhereStringForFilters(filters, sh)); } sh.setQueryString(query.toString()); return sh; @@ -2195,9 +2185,8 @@ public class SQLContainerTest { return null; } }).anyTimes(); - EasyMock.expect( - delegate.getQueryStatement(EasyMock.anyInt(), EasyMock.anyInt())) - .andAnswer(new IAnswer<StatementHelper>() { + EasyMock.expect(delegate.getQueryStatement(EasyMock.anyInt(), + EasyMock.anyInt())).andAnswer(new IAnswer<StatementHelper>() { @Override public StatementHelper answer() throws Throwable { Object[] args = EasyMock.getCurrentArguments(); @@ -2215,8 +2204,8 @@ public class SQLContainerTest { StringBuffer query = new StringBuffer( "SELECT COUNT(*) FROM people"); if (!filters.isEmpty()) { - query.append(QueryBuilder.getWhereStringForFilters( - filters, sh)); + query.append(QueryBuilder + .getWhereStringForFilters(filters, sh)); } sh.setQueryString(query.toString()); return sh; @@ -2273,9 +2262,8 @@ public class SQLContainerTest { return null; } }).anyTimes(); - EasyMock.expect( - delegate.getQueryStatement(EasyMock.anyInt(), EasyMock.anyInt())) - .andAnswer(new IAnswer<StatementHelper>() { + EasyMock.expect(delegate.getQueryStatement(EasyMock.anyInt(), + EasyMock.anyInt())).andAnswer(new IAnswer<StatementHelper>() { @Override public StatementHelper answer() throws Throwable { Object[] args = EasyMock.getCurrentArguments(); @@ -2293,8 +2281,8 @@ public class SQLContainerTest { StringBuffer query = new StringBuffer( "SELECT COUNT(*) FROM people"); if (!filters.isEmpty()) { - query.append(QueryBuilder.getWhereStringForFilters( - filters, sh)); + query.append(QueryBuilder + .getWhereStringForFilters(filters, sh)); } sh.setQueryString(query.toString()); return sh; @@ -2319,26 +2307,27 @@ public class SQLContainerTest { // Ville, Kalle, Pelle, Palle Assert.assertEquals(4, container.size()); - Assert.assertEquals( - "Ville", - container.getContainerProperty(container.getIdByIndex(0), - "NAME").getValue()); - Assert.assertEquals( - "Kalle", - container.getContainerProperty(container.getIdByIndex(1), - "NAME").getValue()); - Assert.assertEquals( - "Pelle", - container.getContainerProperty(container.getIdByIndex(2), - "NAME").getValue()); - Assert.assertEquals( - "Palle", - container.getContainerProperty(container.getIdByIndex(3), - "NAME").getValue()); + Assert.assertEquals("Ville", + container + .getContainerProperty(container.getIdByIndex(0), "NAME") + .getValue()); + Assert.assertEquals("Kalle", + container + .getContainerProperty(container.getIdByIndex(1), "NAME") + .getValue()); + Assert.assertEquals("Pelle", + container + .getContainerProperty(container.getIdByIndex(2), "NAME") + .getValue()); + Assert.assertEquals("Palle", + container + .getContainerProperty(container.getIdByIndex(3), "NAME") + .getValue()); try { container.getIdByIndex(4); - Assert.fail("SQLContainer.getIdByIndex() returned a value for an index beyond the end of the container"); + Assert.fail( + "SQLContainer.getIdByIndex() returned a value for an index beyond the end of the container"); } catch (IndexOutOfBoundsException e) { // should throw exception - item is filtered out } @@ -2395,12 +2384,14 @@ public class SQLContainerTest { if (orderBys == null || orderBys.isEmpty()) { List<OrderBy> ob = new ArrayList<OrderBy>(); ob.add(new OrderBy("ID", true)); - return gen.generateSelectQuery("people", null, - ob, offset, limit, null) + return gen + .generateSelectQuery("people", null, ob, + offset, limit, null) .getQueryString(); } else { - return gen.generateSelectQuery("people", null, - orderBys, offset, limit, null) + return gen + .generateSelectQuery("people", null, + orderBys, offset, limit, null) .getQueryString(); } } else if (SQLTestsConstants.db == DB.ORACLE) { @@ -2408,12 +2399,14 @@ public class SQLContainerTest { if (orderBys == null || orderBys.isEmpty()) { List<OrderBy> ob = new ArrayList<OrderBy>(); ob.add(new OrderBy("ID", true)); - return gen.generateSelectQuery("people", null, - ob, offset, limit, null) + return gen + .generateSelectQuery("people", null, ob, + offset, limit, null) .getQueryString(); } else { - return gen.generateSelectQuery("people", null, - orderBys, offset, limit, null) + return gen + .generateSelectQuery("people", null, + orderBys, offset, limit, null) .getQueryString(); } } else { @@ -2422,8 +2415,8 @@ public class SQLContainerTest { if (!orderBys.isEmpty()) { query.append(" ORDER BY "); for (OrderBy orderBy : orderBys) { - query.append("\"" + orderBy.getColumn() - + "\""); + query.append( + "\"" + orderBy.getColumn() + "\""); if (orderBy.isAscending()) { query.append(" ASC"); } else { @@ -2462,8 +2455,7 @@ public class SQLContainerTest { Assert.assertEquals("Börje", container.getContainerProperty(container.firstItemId(), "NAME") .getValue()); - Assert.assertEquals( - "Wilbert", + Assert.assertEquals("Wilbert", container.getContainerProperty( container.getIdByIndex(container.size() - 2), "NAME") .getValue()); diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java index e03e970048..ce0c8f1286 100755 --- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java +++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java @@ -101,8 +101,7 @@ public class SQLTestsConstants { versionStatements = new String[] { "create table VERSIONED (\"ID\" serial primary key, \"TEXT\" VARCHAR(255), \"VERSION\" INTEGER DEFAULT 0)", "CREATE OR REPLACE FUNCTION zz_row_version() RETURNS TRIGGER AS $$" - + "BEGIN" - + " IF TG_OP = 'UPDATE'" + + "BEGIN" + " IF TG_OP = 'UPDATE'" + " AND NEW.\"VERSION\" = old.\"VERSION\"" + " AND ROW(NEW.*) IS DISTINCT FROM ROW (old.*)" + " THEN" @@ -125,7 +124,8 @@ public class SQLTestsConstants { dbPwd = "sa"; peopleFirst = "create table PEOPLE (\"ID\" int identity(1,1) primary key, \"NAME\" VARCHAR(32), \"AGE\" INTEGER)"; peopleSecond = null; - versionStatements = new String[] { "create table VERSIONED (\"ID\" int identity(1,1) primary key, \"TEXT\" VARCHAR(255), \"VERSION\" rowversion not null)" }; + versionStatements = new String[] { + "create table VERSIONED (\"ID\" int identity(1,1) primary key, \"TEXT\" VARCHAR(255), \"VERSION\" rowversion not null)" }; sqlGen = new MSSQLGenerator(); break; case ORACLE: diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/TicketTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/TicketTest.java index 2030096e82..1a19eda542 100644 --- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/TicketTest.java +++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/TicketTest.java @@ -74,9 +74,8 @@ public class TicketTest { return null; } }).anyTimes(); - EasyMock.expect( - delegate.getQueryStatement(EasyMock.anyInt(), EasyMock.anyInt())) - .andAnswer(new IAnswer<StatementHelper>() { + EasyMock.expect(delegate.getQueryStatement(EasyMock.anyInt(), + EasyMock.anyInt())).andAnswer(new IAnswer<StatementHelper>() { @Override public StatementHelper answer() throws Throwable { Object[] args = EasyMock.getCurrentArguments(); @@ -94,8 +93,8 @@ public class TicketTest { StringBuffer query = new StringBuffer( "SELECT COUNT(*) FROM people"); if (!filters.isEmpty()) { - query.append(QueryBuilder.getWhereStringForFilters( - filters, sh)); + query.append(QueryBuilder + .getWhereStringForFilters(filters, sh)); } sh.setQueryString(query.toString()); return sh; @@ -122,10 +121,9 @@ public class TicketTest { .getContainerProperty(container.firstItemId(), "AGE") .getValue()); } else { - Assert.assertEquals( - 18, - container.getContainerProperty(container.firstItemId(), - "AGE").getValue()); + Assert.assertEquals(18, container + .getContainerProperty(container.firstItemId(), "AGE") + .getValue()); } EasyMock.verify(delegate); @@ -151,10 +149,9 @@ public class TicketTest { .getContainerProperty(container.firstItemId(), "AGE") .getValue()); } else { - Assert.assertEquals( - 18, - container.getContainerProperty(container.firstItemId(), - "AGE").getValue()); + Assert.assertEquals(18, container + .getContainerProperty(container.firstItemId(), "AGE") + .getValue()); } } @@ -170,8 +167,8 @@ public class TicketTest { // set a different name item.getItemProperty("NAME").setValue("otherName"); - Assert.assertEquals("otherName", item.getItemProperty("NAME") - .getValue()); + Assert.assertEquals("otherName", + item.getItemProperty("NAME").getValue()); // access the item and reset the name to its old value Item item2 = container.getItem(id); diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java index b786f5b2de..5a6ae78aeb 100644 --- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java +++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java @@ -44,12 +44,13 @@ public class SimpleJDBCConnectionPoolTest { connectionPool.reserveConnection(); } catch (SQLException e) { e.printStackTrace(); - Assert.fail("Exception before all connections used! " - + e.getMessage()); + Assert.fail( + "Exception before all connections used! " + e.getMessage()); } connectionPool.reserveConnection(); - Assert.fail("Reserving connection didn't fail even though no connections are available!"); + Assert.fail( + "Reserving connection didn't fail even though no connections are available!"); } @Test @@ -59,8 +60,8 @@ public class SimpleJDBCConnectionPoolTest { connectionPool.reserveConnection(); } catch (SQLException e) { e.printStackTrace(); - Assert.fail("Exception before all connections used! " - + e.getMessage()); + Assert.fail( + "Exception before all connections used! " + e.getMessage()); } Connection conn = connectionPool.reserveConnection(); @@ -76,8 +77,8 @@ public class SimpleJDBCConnectionPoolTest { conn2 = connectionPool.reserveConnection(); } catch (SQLException e) { e.printStackTrace(); - Assert.fail("Exception before all connections used! " - + e.getMessage()); + Assert.fail( + "Exception before all connections used! " + e.getMessage()); } connectionPool.releaseConnection(conn2); @@ -101,7 +102,8 @@ public class SimpleJDBCConnectionPoolTest { public void construct_onlyDriverNameAndUrlGiven_shouldFail() throws SQLException { SimpleJDBCConnectionPool cp = new SimpleJDBCConnectionPool( - SQLTestsConstants.dbDriver, SQLTestsConstants.dbURL, null, null); + SQLTestsConstants.dbDriver, SQLTestsConstants.dbURL, null, + null); } @Test(expected = IllegalArgumentException.class) diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java index 6daf730e25..41db88b881 100644 --- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java +++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java @@ -144,32 +144,32 @@ public class BetweenTest { public void passesFilter_nullValue_filterIsPassed() { String id = "id"; Between between = new Between(id, null, null); - Assert.assertTrue(between.passesFilter(id, - itemWithPropertyValue(id, null))); + Assert.assertTrue( + between.passesFilter(id, itemWithPropertyValue(id, null))); } @Test public void passesFilter_nullStartValue_filterIsPassed() { String id = "id"; Between between = new Between(id, null, 2); - Assert.assertTrue(between - .passesFilter(id, itemWithPropertyValue(id, 1))); + Assert.assertTrue( + between.passesFilter(id, itemWithPropertyValue(id, 1))); } @Test public void passesFilter_nullEndValue_filterIsPassed() { String id = "id"; Between between = new Between(id, 0, null); - Assert.assertTrue(between - .passesFilter(id, itemWithPropertyValue(id, 1))); + Assert.assertTrue( + between.passesFilter(id, itemWithPropertyValue(id, 1))); } @Test public void passesFilter_nullStartValueAndEndValue_filterIsPassed() { String id = "id"; Between between = new Between(id, null, null); - Assert.assertTrue(between - .passesFilter(id, itemWithPropertyValue(id, 1))); + Assert.assertTrue( + between.passesFilter(id, itemWithPropertyValue(id, 1))); } @Test diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java index c2dbf0f12a..dd1db30b72 100644 --- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java +++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java @@ -112,12 +112,9 @@ public class SQLGeneratorsTest { SQLTestsConstants.sqlGen); SQLContainer container = new SQLContainer(query); - StatementHelper sh = sg.generateDeleteQuery( - "people", - query.getPrimaryKeyColumns(), - null, - (RowItem) container.getItem(container.getItemIds().iterator() - .next())); + StatementHelper sh = sg.generateDeleteQuery("people", + query.getPrimaryKeyColumns(), null, (RowItem) container + .getItem(container.getItemIds().iterator().next())); Assert.assertEquals("DELETE FROM people WHERE \"ID\" = ?", sh.getQueryString()); } @@ -137,15 +134,16 @@ public class SQLGeneratorsTest { TableQuery query = new TableQuery("people", connectionPool); SQLContainer container = new SQLContainer(query); - RowItem ri = (RowItem) container.getItem(container.getItemIds() - .iterator().next()); + RowItem ri = (RowItem) container + .getItem(container.getItemIds().iterator().next()); ri.getItemProperty("NAME").setValue("Viljami"); StatementHelper sh = sg.generateUpdateQuery("people", ri); - Assert.assertTrue("UPDATE people SET \"NAME\" = ?, \"AGE\" = ? WHERE \"ID\" = ?" - .equals(sh.getQueryString()) - || "UPDATE people SET \"AGE\" = ?, \"NAME\" = ? WHERE \"ID\" = ?" - .equals(sh.getQueryString())); + Assert.assertTrue( + "UPDATE people SET \"NAME\" = ?, \"AGE\" = ? WHERE \"ID\" = ?" + .equals(sh.getQueryString()) + || "UPDATE people SET \"AGE\" = ?, \"NAME\" = ? WHERE \"ID\" = ?" + .equals(sh.getQueryString())); } @Test @@ -215,8 +213,7 @@ public class SQLGeneratorsTest { List<OrderBy> ob = Arrays.asList(new OrderBy("name", true)); StatementHelper sh = sg.generateSelectQuery("TABLE", f, ob, 4, 8, "NAME, ID"); - Assert.assertEquals( - sh.getQueryString(), + Assert.assertEquals(sh.getQueryString(), "SELECT * FROM (SELECT x.*, ROWNUM AS \"rownum\" FROM" + " (SELECT NAME, ID FROM TABLE WHERE (\"name\" LIKE ?" + " OR \"name\" LIKE ?) " diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/StatementHelperTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/StatementHelperTest.java index b89b7e747d..1c70fe0976 100644 --- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/StatementHelperTest.java +++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/StatementHelperTest.java @@ -44,8 +44,8 @@ public class StatementHelperTest { // Exception should contain info about which parameter and the type // which was unsupported Assert.assertTrue(e.getMessage().contains("parameter 0")); - Assert.assertTrue(e.getMessage().contains( - StatementHelper.class.getName())); + Assert.assertTrue( + e.getMessage().contains(StatementHelper.class.getName())); } } diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java index bbf083c158..1b9e14b0d8 100644 --- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java +++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java @@ -56,8 +56,8 @@ public class FreeformQueryTest { public void construction_legalParameters_shouldSucceed() { FreeformQuery ffQuery = new FreeformQuery("SELECT * FROM foo", Arrays.asList("ID"), connectionPool); - Assert.assertArrayEquals(new Object[] { "ID" }, ffQuery - .getPrimaryKeyColumns().toArray()); + Assert.assertArrayEquals(new Object[] { "ID" }, + ffQuery.getPrimaryKeyColumns().toArray()); Assert.assertEquals("SELECT * FROM foo", ffQuery.getQueryString()); } @@ -118,10 +118,10 @@ public class FreeformQueryTest { statement.executeUpdate("insert into people values('Bengt', 30)"); statement.executeUpdate("insert into people values('Ingvar', 50)"); } else { - statement - .executeUpdate("insert into people values(default, 'Bengt', 30)"); - statement - .executeUpdate("insert into people values(default, 'Ingvar', 50)"); + statement.executeUpdate( + "insert into people values(default, 'Bengt', 30)"); + statement.executeUpdate( + "insert into people values(default, 'Ingvar', 50)"); } statement.close(); conn.commit(); @@ -177,8 +177,8 @@ public class FreeformQueryTest { Arrays.asList("ID"), connectionPool); FreeformQueryDelegate delegate = EasyMock .createMock(FreeformQueryDelegate.class); - EasyMock.expect(delegate.getCountQuery()).andReturn( - "SELECT COUNT(*) FROM GARBAGE"); + EasyMock.expect(delegate.getCountQuery()) + .andReturn("SELECT COUNT(*) FROM GARBAGE"); EasyMock.replay(delegate); query.setDelegate(delegate); Assert.assertEquals(0, query.getCount()); @@ -186,7 +186,8 @@ public class FreeformQueryTest { } @Test - public void getResults_simpleQuery_returnsFourRecords() throws SQLException { + public void getResults_simpleQuery_returnsFourRecords() + throws SQLException { FreeformQuery query = new FreeformQuery( "SELECT \"ID\",\"NAME\" FROM people", Arrays.asList("ID"), connectionPool); @@ -275,8 +276,8 @@ public class FreeformQueryTest { throws SQLException { FreeformQuery query = new FreeformQuery("SELECT * FROM people", Arrays.asList("ID"), connectionPool); - query.storeRow(new RowItem(new SQLContainer(query), new RowId( - new Object[] { 1 }), null)); + query.storeRow(new RowItem(new SQLContainer(query), + new RowId(new Object[] { 1 }), null)); } @Test @@ -287,8 +288,8 @@ public class FreeformQueryTest { EasyMock.replay(container); query.beginTransaction(); try { - query.storeRow(new RowItem(container, - new RowId(new Object[] { 1 }), null)); + query.storeRow(new RowItem(container, new RowId(new Object[] { 1 }), + null)); Assert.fail("storeRow should fail when there is no delegate"); } catch (UnsupportedOperationException e) { // Cleanup to make test connection pool happy @@ -416,25 +417,24 @@ public class FreeformQueryTest { } @Test - public void getResults_hasDelegate_shouldCallDelegate() throws SQLException { + public void getResults_hasDelegate_shouldCallDelegate() + throws SQLException { FreeformQuery query = new FreeformQuery("SELECT * FROM people", Arrays.asList("ID"), connectionPool); FreeformQueryDelegate delegate = EasyMock .createMock(FreeformQueryDelegate.class); if (SQLTestsConstants.db == DB.MSSQL) { EasyMock.expect(delegate.getQueryString(0, 2)) - .andReturn( - "SELECT * FROM (SELECT row_number()" - + "OVER (ORDER BY id ASC) AS rownum, * FROM people)" - + " AS a WHERE a.rownum BETWEEN 0 AND 2"); + .andReturn("SELECT * FROM (SELECT row_number()" + + "OVER (ORDER BY id ASC) AS rownum, * FROM people)" + + " AS a WHERE a.rownum BETWEEN 0 AND 2"); } else if (SQLTestsConstants.db == DB.ORACLE) { EasyMock.expect(delegate.getQueryString(0, 2)) - .andReturn( - "SELECT * FROM (SELECT x.*, ROWNUM AS r FROM" - + " (SELECT * FROM people) x) WHERE r BETWEEN 1 AND 2"); + .andReturn("SELECT * FROM (SELECT x.*, ROWNUM AS r FROM" + + " (SELECT * FROM people) x) WHERE r BETWEEN 1 AND 2"); } else { - EasyMock.expect(delegate.getQueryString(0, 2)).andReturn( - "SELECT * FROM people LIMIT 2 OFFSET 0"); + EasyMock.expect(delegate.getQueryString(0, 2)) + .andReturn("SELECT * FROM people LIMIT 2 OFFSET 0"); } EasyMock.replay(delegate); @@ -454,18 +454,16 @@ public class FreeformQueryTest { .createMock(FreeformQueryDelegate.class); if (SQLTestsConstants.db == DB.MSSQL) { EasyMock.expect(delegate.getQueryString(0, 2)) - .andReturn( - "SELECT * FROM (SELECT row_number()" - + "OVER (ORDER BY id ASC) AS rownum, * FROM people)" - + " AS a WHERE a.rownum BETWEEN 0 AND 2"); + .andReturn("SELECT * FROM (SELECT row_number()" + + "OVER (ORDER BY id ASC) AS rownum, * FROM people)" + + " AS a WHERE a.rownum BETWEEN 0 AND 2"); } else if (SQLTestsConstants.db == DB.ORACLE) { EasyMock.expect(delegate.getQueryString(0, 2)) - .andReturn( - "SELECT * FROM (SELECT x.*, ROWNUM AS r FROM" - + " (SELECT * FROM people) x) WHERE r BETWEEN 1 AND 2"); + .andReturn("SELECT * FROM (SELECT x.*, ROWNUM AS r FROM" + + " (SELECT * FROM people) x) WHERE r BETWEEN 1 AND 2"); } else { - EasyMock.expect(delegate.getQueryString(0, 2)).andReturn( - "SELECT * FROM people LIMIT 2 OFFSET 0"); + EasyMock.expect(delegate.getQueryString(0, 2)) + .andReturn("SELECT * FROM people LIMIT 2 OFFSET 0"); } EasyMock.replay(delegate); query.setDelegate(delegate); @@ -500,18 +498,16 @@ public class FreeformQueryTest { .createMock(FreeformQueryDelegate.class); if (SQLTestsConstants.db == DB.MSSQL) { EasyMock.expect(delegate.getQueryString(200, 100)) - .andReturn( - "SELECT * FROM (SELECT row_number()" - + "OVER (ORDER BY id ASC) AS rownum, * FROM people)" - + " AS a WHERE a.rownum BETWEEN 201 AND 300"); + .andReturn("SELECT * FROM (SELECT row_number()" + + "OVER (ORDER BY id ASC) AS rownum, * FROM people)" + + " AS a WHERE a.rownum BETWEEN 201 AND 300"); } else if (SQLTestsConstants.db == DB.ORACLE) { EasyMock.expect(delegate.getQueryString(200, 100)) - .andReturn( - "SELECT * FROM (SELECT x.*, ROWNUM AS r FROM" - + " (SELECT * FROM people ORDER BY ID ASC) x) WHERE r BETWEEN 201 AND 300"); + .andReturn("SELECT * FROM (SELECT x.*, ROWNUM AS r FROM" + + " (SELECT * FROM people ORDER BY ID ASC) x) WHERE r BETWEEN 201 AND 300"); } else { - EasyMock.expect(delegate.getQueryString(200, 100)).andReturn( - "SELECT * FROM people LIMIT 100 OFFSET 200"); + EasyMock.expect(delegate.getQueryString(200, 100)) + .andReturn("SELECT * FROM people LIMIT 100 OFFSET 200"); } EasyMock.replay(delegate); query.setDelegate(delegate); @@ -616,9 +612,8 @@ public class FreeformQueryTest { Arrays.asList("ID"), connectionPool); FreeformQueryDelegate delegate = EasyMock .createMock(FreeformQueryDelegate.class); - EasyMock.expect( - delegate.storeRow(EasyMock.isA(Connection.class), - EasyMock.isA(RowItem.class))).andReturn(1); + EasyMock.expect(delegate.storeRow(EasyMock.isA(Connection.class), + EasyMock.isA(RowItem.class))).andReturn(1); SQLContainer container = EasyMock.createNiceMock(SQLContainer.class); EasyMock.replay(delegate, container); query.setDelegate(delegate); @@ -639,10 +634,9 @@ public class FreeformQueryTest { Arrays.asList("ID"), connectionPool); FreeformQueryDelegate delegate = EasyMock .createMock(FreeformQueryDelegate.class); - EasyMock.expect( - delegate.storeRow(EasyMock.isA(Connection.class), - EasyMock.isA(RowItem.class))).andThrow( - new UnsupportedOperationException()); + EasyMock.expect(delegate.storeRow(EasyMock.isA(Connection.class), + EasyMock.isA(RowItem.class))) + .andThrow(new UnsupportedOperationException()); SQLContainer container = EasyMock.createNiceMock(SQLContainer.class); EasyMock.replay(delegate, container); query.setDelegate(delegate); @@ -652,7 +646,8 @@ public class FreeformQueryTest { null); try { query.storeRow(row); - Assert.fail("storeRow should fail when delgate does not implement storeRow"); + Assert.fail( + "storeRow should fail when delgate does not implement storeRow"); } catch (UnsupportedOperationException e) { // Cleanup to make test connection pool happy query.rollback(); @@ -666,9 +661,8 @@ public class FreeformQueryTest { Arrays.asList("ID"), connectionPool); FreeformQueryDelegate delegate = EasyMock .createMock(FreeformQueryDelegate.class); - EasyMock.expect( - delegate.removeRow(EasyMock.isA(Connection.class), - EasyMock.isA(RowItem.class))).andReturn(true); + EasyMock.expect(delegate.removeRow(EasyMock.isA(Connection.class), + EasyMock.isA(RowItem.class))).andReturn(true); SQLContainer container = EasyMock.createNiceMock(SQLContainer.class); EasyMock.replay(delegate, container); query.setDelegate(delegate); @@ -689,10 +683,9 @@ public class FreeformQueryTest { Arrays.asList("ID"), connectionPool); FreeformQueryDelegate delegate = EasyMock .createMock(FreeformQueryDelegate.class); - EasyMock.expect( - delegate.removeRow(EasyMock.isA(Connection.class), - EasyMock.isA(RowItem.class))).andThrow( - new UnsupportedOperationException()); + EasyMock.expect(delegate.removeRow(EasyMock.isA(Connection.class), + EasyMock.isA(RowItem.class))) + .andThrow(new UnsupportedOperationException()); SQLContainer container = EasyMock.createNiceMock(SQLContainer.class); EasyMock.replay(delegate, container); query.setDelegate(delegate); @@ -702,7 +695,8 @@ public class FreeformQueryTest { null); try { query.removeRow(row); - Assert.fail("removeRow should fail when delegate does not implement removeRow"); + Assert.fail( + "removeRow should fail when delegate does not implement removeRow"); } catch (UnsupportedOperationException e) { // Cleanup to make test connection pool happy query.rollback(); @@ -733,7 +727,8 @@ public class FreeformQueryTest { query.beginTransaction(); try { query.beginTransaction(); - Assert.fail("Should throw exception when starting a transaction while already in a transaction"); + Assert.fail( + "Should throw exception when starting a transaction while already in a transaction"); } catch (IllegalStateException e) { // Cleanup to make test connection pool happy query.rollback(); @@ -881,9 +876,8 @@ public class FreeformQueryTest { .createMock(FreeformQueryDelegate.class); // In order to test that this is the query that is actually used, we use // a non-existing id in place of the existing one. - EasyMock.expect(delegate.getContainsRowQueryString(1)) - .andReturn( - "SELECT * FROM people WHERE \"NAME\" LIKE '%lle' AND \"ID\" = 1337"); + EasyMock.expect(delegate.getContainsRowQueryString(1)).andReturn( + "SELECT * FROM people WHERE \"NAME\" LIKE '%lle' AND \"ID\" = 1337"); EasyMock.replay(delegate); query.setDelegate(delegate); @@ -893,8 +887,8 @@ public class FreeformQueryTest { EasyMock.verify(delegate); } - public static class NonMatchingDelegateWithGroupBy implements - FreeformQueryDelegate { + public static class NonMatchingDelegateWithGroupBy + implements FreeformQueryDelegate { private String fromWhere = "FROM people p1 LEFT JOIN people p2 ON p2.id = p1.id WHERE p1.\"NAME\" LIKE 'notfound' GROUP BY p1.ID"; @@ -943,8 +937,9 @@ public class FreeformQueryTest { } } - public static class NonMatchingStatementDelegateWithGroupBy extends - NonMatchingDelegateWithGroupBy implements FreeformStatementDelegate { + public static class NonMatchingStatementDelegateWithGroupBy + extends NonMatchingDelegateWithGroupBy + implements FreeformStatementDelegate { @Override public StatementHelper getQueryStatement(int offset, int limit) @@ -978,8 +973,8 @@ public class FreeformQueryTest { Arrays.asList("ID"), connectionPool); FreeformQueryDelegate delegate = EasyMock .createMock(FreeformQueryDelegate.class); - EasyMock.expect(delegate.getContainsRowQueryString(1)).andThrow( - new UnsupportedOperationException()); + EasyMock.expect(delegate.getContainsRowQueryString(1)) + .andThrow(new UnsupportedOperationException()); EasyMock.replay(delegate); query.setDelegate(delegate); diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java index 596f28cf5e..7974582147 100644 --- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java +++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java @@ -85,7 +85,8 @@ public class QueryBuilderTest { @Test public void getWhereStringForFilter_simpleStringFilter() { StatementHelper sh = mockedStatementHelper("Vi%"); - SimpleStringFilter f = new SimpleStringFilter("NAME", "Vi", false, true); + SimpleStringFilter f = new SimpleStringFilter("NAME", "Vi", false, + true); Assert.assertEquals("\"NAME\" LIKE ?", QueryBuilder.getWhereStringForFilter(f, sh)); EasyMock.verify(sh); @@ -104,7 +105,8 @@ public class QueryBuilderTest { @Test public void getWhereStringForFilter_simpleStringFilterMatchAnywhereIgnoreCase() { StatementHelper sh = mockedStatementHelper("%VI%"); - SimpleStringFilter f = new SimpleStringFilter("NAME", "Vi", true, false); + SimpleStringFilter f = new SimpleStringFilter("NAME", "Vi", true, + false); Assert.assertEquals("UPPER(\"NAME\") LIKE ?", QueryBuilder.getWhereStringForFilter(f, sh)); EasyMock.verify(sh); @@ -230,8 +232,9 @@ public class QueryBuilderTest { public void getWhereStringForFilters_complexCompoundFilters() { StatementHelper sh = mockedStatementHelper("%lle", 18, 65, "Pelle"); ArrayList<Filter> filters = new ArrayList<Filter>(); - filters.add(new Or(new And(new Like("NAME", "%lle"), new Or(new Less( - "AGE", 18), new Greater("AGE", 65))), + filters.add(new Or( + new And(new Like("NAME", "%lle"), + new Or(new Less("AGE", 18), new Greater("AGE", 65))), new Equal("NAME", "Pelle"))); Assert.assertEquals( " WHERE ((\"NAME\" LIKE ? AND (\"AGE\" < ? OR \"AGE\" > ?)) OR \"NAME\" = ?)", @@ -244,8 +247,9 @@ public class QueryBuilderTest { StatementHelper sh = mockedStatementHelper("%lle", 18, 65, "Pelle", "Virtanen"); ArrayList<Filter> filters = new ArrayList<Filter>(); - filters.add(new Or(new And(new Like("NAME", "%lle"), new Or(new Less( - "AGE", 18), new Greater("AGE", 65))), + filters.add(new Or( + new And(new Like("NAME", "%lle"), + new Or(new Less("AGE", 18), new Greater("AGE", 65))), new Equal("NAME", "Pelle"))); filters.add(new Equal("LASTNAME", "Virtanen")); Assert.assertEquals( @@ -275,7 +279,8 @@ public class QueryBuilderTest { public void getWhereStringForFilters_complexNegatedFilter() { StatementHelper sh = mockedStatementHelper(65, 18); ArrayList<Filter> filters = new ArrayList<Filter>(); - filters.add(new Not(new Or(new Equal("AGE", 65), new Equal("AGE", 18)))); + filters.add( + new Not(new Or(new Equal("AGE", 65), new Equal("AGE", 18)))); Assert.assertEquals(" WHERE NOT (\"AGE\" = ? OR \"AGE\" = ?)", QueryBuilder.getWhereStringForFilters(filters, sh)); EasyMock.verify(sh); diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java index 1cb3d722c6..d2067a85b4 100644 --- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java +++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java @@ -57,10 +57,10 @@ public class TableQueryTest { public void construction_legalParameters_shouldSucceed() { TableQuery tQuery = new TableQuery("people", connectionPool, new DefaultSQLGenerator()); - Assert.assertArrayEquals(new Object[] { "ID" }, tQuery - .getPrimaryKeyColumns().toArray()); - boolean correctTableName = "people".equalsIgnoreCase(tQuery - .getTableName()); + Assert.assertArrayEquals(new Object[] { "ID" }, + tQuery.getPrimaryKeyColumns().toArray()); + boolean correctTableName = "people" + .equalsIgnoreCase(tQuery.getTableName()); Assert.assertTrue(correctTableName); } @@ -68,10 +68,10 @@ public class TableQueryTest { public void construction_legalParameters_defaultGenerator_shouldSucceed() { TableQuery tQuery = new TableQuery("people", connectionPool, SQLTestsConstants.sqlGen); - Assert.assertArrayEquals(new Object[] { "ID" }, tQuery - .getPrimaryKeyColumns().toArray()); - boolean correctTableName = "people".equalsIgnoreCase(tQuery - .getTableName()); + Assert.assertArrayEquals(new Object[] { "ID" }, + tQuery.getPrimaryKeyColumns().toArray()); + boolean correctTableName = "people" + .equalsIgnoreCase(tQuery.getTableName()); Assert.assertTrue(correctTableName); } @@ -115,10 +115,10 @@ public class TableQueryTest { statement.executeUpdate("insert into people values('Bengt', 30)"); statement.executeUpdate("insert into people values('Ingvar', 50)"); } else { - statement - .executeUpdate("insert into people values(default, 'Bengt', 30)"); - statement - .executeUpdate("insert into people values(default, 'Ingvar', 50)"); + statement.executeUpdate( + "insert into people values(default, 'Bengt', 30)"); + statement.executeUpdate( + "insert into people values(default, 'Ingvar', 50)"); } statement.close(); conn.commit(); @@ -145,7 +145,8 @@ public class TableQueryTest { * TableQuery get results tests **********************************************************************/ @Test - public void getResults_simpleQuery_returnsFourRecords() throws SQLException { + public void getResults_simpleQuery_returnsFourRecords() + throws SQLException { TableQuery tQuery = new TableQuery("people", connectionPool, SQLTestsConstants.sqlGen); tQuery.beginTransaction(); @@ -200,7 +201,8 @@ public class TableQueryTest { tQuery.beginTransaction(); try { tQuery.beginTransaction(); - Assert.fail("Should throw exception when starting a transaction while already in a transaction"); + Assert.fail( + "Should throw exception when starting a transaction while already in a transaction"); } catch (IllegalStateException e) { // Cleanup to make test connection pool happy tQuery.rollback(); @@ -278,8 +280,8 @@ public class TableQueryTest { SQLTestsConstants.sqlGen); try { tQuery.containsRowWithKey(new Object[] { null }); - org.junit.Assert - .fail("null should throw an IllegalArgumentException from StatementHelper"); + org.junit.Assert.fail( + "null should throw an IllegalArgumentException from StatementHelper"); } catch (IllegalArgumentException e) { // We should now be able to reserve two connections Connection c1 = connectionPool.reserveConnection(); @@ -395,8 +397,8 @@ public class TableQueryTest { SQLTestsConstants.sqlGen); SQLContainer container = new SQLContainer(tQuery); container.setAutoCommit(false); - Assert.assertTrue(container.removeItem(container.getItemIds() - .iterator().next())); + Assert.assertTrue( + container.removeItem(container.getItemIds().iterator().next())); Assert.assertEquals(4, tQuery.getCount()); Assert.assertEquals(3, container.size()); @@ -459,8 +461,8 @@ public class TableQueryTest { tQuery.setFilters(null); /* Fetch first item, modify and commit */ - Object item = container.getItem(container.getItemIds().iterator() - .next()); + Object item = container + .getItem(container.getItemIds().iterator().next()); Assert.assertNotNull(item); RowItem ri = (RowItem) item; @@ -549,8 +551,8 @@ public class TableQueryTest { // Update the version using another connection. Connection conn = connectionPool.reserveConnection(); - PreparedStatement stmt = conn - .prepareStatement("UPDATE VERSIONED SET \"TEXT\" = ? WHERE \"ID\" = ?"); + PreparedStatement stmt = conn.prepareStatement( + "UPDATE VERSIONED SET \"TEXT\" = ? WHERE \"ID\" = ?"); stmt.setString(1, "foo"); stmt.setObject(2, row.getItemProperty("ID").getValue()); stmt.executeUpdate(); @@ -607,8 +609,8 @@ public class TableQueryTest { // Update the version using another connection. Connection conn = connectionPool.reserveConnection(); - PreparedStatement stmt = conn - .prepareStatement("UPDATE VERSIONED SET \"TEXT\" = ? WHERE \"ID\" = ?"); + PreparedStatement stmt = conn.prepareStatement( + "UPDATE VERSIONED SET \"TEXT\" = ? WHERE \"ID\" = ?"); stmt.setString(1, "asdf"); stmt.setObject(2, row.getItemProperty("ID").getValue()); stmt.executeUpdate(); @@ -639,8 +641,8 @@ public class TableQueryTest { // Update the version using another connection. Connection conn = connectionPool.reserveConnection(); - PreparedStatement stmt = conn - .prepareStatement("UPDATE VERSIONED SET \"TEXT\" = ? WHERE \"ID\" = ?"); + PreparedStatement stmt = conn.prepareStatement( + "UPDATE VERSIONED SET \"TEXT\" = ? WHERE \"ID\" = ?"); stmt.setString(1, "asdf"); stmt.setObject(2, row.getItemProperty("ID").getValue()); stmt.executeUpdate(); @@ -665,7 +667,8 @@ public class TableQueryTest { } @Test - public void construction_explicitSchema_shouldSucceed() throws SQLException { + public void construction_explicitSchema_shouldSucceed() + throws SQLException { if (SQLTestsConstants.createSchema == null || SQLTestsConstants.createProductTable == null || SQLTestsConstants.dropSchema == null) { diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java index f40455f1d7..d43ad94b90 100644 --- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java +++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java @@ -60,9 +60,8 @@ public class ValidatingSimpleJDBCConnectionPool implements JDBCConnectionPool { public void releaseConnection(Connection conn) { if (conn != null && !reserved.remove(conn)) { if (alreadyReleased.contains(conn)) { - getLogger().severe( - "Tried to release connection (" + conn - + ") which has already been released"); + getLogger().severe("Tried to release connection (" + conn + + ") which has already been released"); } else { throw new RuntimeException("Tried to release connection (" + conn + ") not reserved using reserveConnection"); @@ -77,13 +76,13 @@ public class ValidatingSimpleJDBCConnectionPool implements JDBCConnectionPool { public void destroy() { realPool.destroy(); if (!reserved.isEmpty()) { - throw new RuntimeException(reserved.size() - + " connections never released"); + throw new RuntimeException( + reserved.size() + " connections never released"); } } private static Logger getLogger() { - return Logger.getLogger(ValidatingSimpleJDBCConnectionPool.class - .getName()); + return Logger + .getLogger(ValidatingSimpleJDBCConnectionPool.class.getName()); } }
\ No newline at end of file diff --git a/server/src/test/java/com/vaadin/server/AbstractClientConnectorProxyHandlingTest.java b/server/src/test/java/com/vaadin/server/AbstractClientConnectorProxyHandlingTest.java index c15676c18e..bcb0268598 100644 --- a/server/src/test/java/com/vaadin/server/AbstractClientConnectorProxyHandlingTest.java +++ b/server/src/test/java/com/vaadin/server/AbstractClientConnectorProxyHandlingTest.java @@ -33,12 +33,13 @@ public class AbstractClientConnectorProxyHandlingTest { @Test public void abstractClientConnectorTest() { try { - Method method = AbstractClientConnector.class.getDeclaredMethod( - "isThis", Object.class); + Method method = AbstractClientConnector.class + .getDeclaredMethod("isThis", Object.class); int modifiers = method.getModifiers(); if (Modifier.isFinal(modifiers) || !Modifier.isProtected(modifiers) || Modifier.isStatic(modifiers)) { - Assert.fail("isThis has invalid modifiers, CDI proxies will not work."); + Assert.fail( + "isThis has invalid modifiers, CDI proxies will not work."); } } catch (SecurityException e) { // Ignore, no can do diff --git a/server/src/test/java/com/vaadin/server/AbstractClientConnectorTest.java b/server/src/test/java/com/vaadin/server/AbstractClientConnectorTest.java index 96ca82a0b3..d546ce0f14 100644 --- a/server/src/test/java/com/vaadin/server/AbstractClientConnectorTest.java +++ b/server/src/test/java/com/vaadin/server/AbstractClientConnectorTest.java @@ -45,8 +45,7 @@ public class AbstractClientConnectorTest { mock.registerRpc(implementation); Assert.fail("expected exception"); } catch (Exception expected) { - Assert.assertEquals( - expected.getMessage(), + Assert.assertEquals(expected.getMessage(), "Use registerRpc(T implementation, Class<T> rpcInterfaceType) if the Rpc implementation implements more than one interface"); } } @@ -69,8 +68,8 @@ public class AbstractClientConnectorTest { verify(mock, times(1)).registerRpc(implementation, ClickRpc.class); } - private class ServerRpcLastMock implements Comparable<ServerRpcLastMock>, - ClickRpc { + private class ServerRpcLastMock + implements Comparable<ServerRpcLastMock>, ClickRpc { private static final long serialVersionUID = -2822356895755286180L; @Override diff --git a/server/src/test/java/com/vaadin/server/BrowserWindowOpenerTest.java b/server/src/test/java/com/vaadin/server/BrowserWindowOpenerTest.java index 7c76f7d421..e69f53769e 100644 --- a/server/src/test/java/com/vaadin/server/BrowserWindowOpenerTest.java +++ b/server/src/test/java/com/vaadin/server/BrowserWindowOpenerTest.java @@ -44,8 +44,7 @@ public class BrowserWindowOpenerTest { URLReference ref = opener.getState(false).resources .get(BrowserWindowOpenerState.locationResource); - Assert.assertTrue( - "Url reference in the state is not ResourceReference", + Assert.assertTrue("Url reference in the state is not ResourceReference", ref instanceof ResourceReference); Assert.assertEquals("Unexpected resource saved in state", resource, ((ResourceReference) ref).getResource()); @@ -66,8 +65,7 @@ public class BrowserWindowOpenerTest { URLReference ref = opener.getState(false).resources .get(BrowserWindowOpenerState.locationResource); - Assert.assertTrue( - "Url reference in the state is not ResourceReference", + Assert.assertTrue("Url reference in the state is not ResourceReference", ref instanceof ResourceReference); Resource resource = ((ResourceReference) ref).getResource(); Assert.assertTrue("Resource reference is not ExternalResource", diff --git a/server/src/test/java/com/vaadin/server/ConnectorResourceHandlerTest.java b/server/src/test/java/com/vaadin/server/ConnectorResourceHandlerTest.java index a5746065d6..f9b0577683 100644 --- a/server/src/test/java/com/vaadin/server/ConnectorResourceHandlerTest.java +++ b/server/src/test/java/com/vaadin/server/ConnectorResourceHandlerTest.java @@ -57,8 +57,8 @@ public class ConnectorResourceHandlerTest { session.lock(); try { - session.setCommunicationManager(new LegacyCommunicationManager( - session)); + session.setCommunicationManager( + new LegacyCommunicationManager(session)); ui.setSession(session); session.addUI(ui); } finally { diff --git a/server/src/test/java/com/vaadin/server/DefaultDeploymentConfigurationTest.java b/server/src/test/java/com/vaadin/server/DefaultDeploymentConfigurationTest.java index 7cbb73af17..cdda588756 100644 --- a/server/src/test/java/com/vaadin/server/DefaultDeploymentConfigurationTest.java +++ b/server/src/test/java/com/vaadin/server/DefaultDeploymentConfigurationTest.java @@ -44,8 +44,10 @@ public class DefaultDeploymentConfigurationTest { public void testGetSystemProperty() throws ClassNotFoundException { String value = "value"; String prop = "prop"; - System.setProperty(DefaultDeploymentConfigurationTest.class - .getPackage().getName() + '.' + prop, value); + System.setProperty( + DefaultDeploymentConfigurationTest.class.getPackage().getName() + + '.' + prop, + value); DefaultDeploymentConfiguration config = new DefaultDeploymentConfiguration( DefaultDeploymentConfigurationTest.class, new Properties()); Assert.assertEquals(value, config.getSystemProperty(prop)); diff --git a/server/src/test/java/com/vaadin/server/DownloadStreamTest.java b/server/src/test/java/com/vaadin/server/DownloadStreamTest.java index 180b2e348b..f302163ef7 100644 --- a/server/src/test/java/com/vaadin/server/DownloadStreamTest.java +++ b/server/src/test/java/com/vaadin/server/DownloadStreamTest.java @@ -30,10 +30,8 @@ public class DownloadStreamTest { String encodedFileName = URLEncoder.encode(filename, "utf-8"); verify(response).setHeader(eq(DownloadStream.CONTENT_DISPOSITION), contains(String.format("filename=\"%s\";", encodedFileName))); - verify(response) - .setHeader( - eq(DownloadStream.CONTENT_DISPOSITION), - contains(String.format("filename*=utf-8''%s", - encodedFileName))); + verify(response).setHeader(eq(DownloadStream.CONTENT_DISPOSITION), + contains( + String.format("filename*=utf-8''%s", encodedFileName))); } } diff --git a/server/src/test/java/com/vaadin/server/DragAndDropServiceTest.java b/server/src/test/java/com/vaadin/server/DragAndDropServiceTest.java index d0cb0ca5a6..7344e1b18b 100644 --- a/server/src/test/java/com/vaadin/server/DragAndDropServiceTest.java +++ b/server/src/test/java/com/vaadin/server/DragAndDropServiceTest.java @@ -42,8 +42,8 @@ public class DragAndDropServiceTest { @Test public void changeVariables_isSourceConnectorEnabledCalled() { final List<Level> levels = new ArrayList<Level>(); - Logger.getLogger(DragAndDropService.class.getName()).addHandler( - new StreamHandler() { + Logger.getLogger(DragAndDropService.class.getName()) + .addHandler(new StreamHandler() { @Override public synchronized void publish(LogRecord record) { levels.add(record.getLevel()); @@ -74,8 +74,8 @@ public class DragAndDropServiceTest { @Test public void changeVariables_isTargetConnectorEnabledCalled() { final List<Level> levels = new ArrayList<Level>(); - Logger.getLogger(DragAndDropService.class.getName()).addHandler( - new StreamHandler() { + Logger.getLogger(DragAndDropService.class.getName()) + .addHandler(new StreamHandler() { @Override public void publish(LogRecord record) { levels.add(record.getLevel()); @@ -96,8 +96,8 @@ public class DragAndDropServiceTest { } - private static class TestDropTarget extends AbstractComponent implements - com.vaadin.event.dd.DropTarget { + private static class TestDropTarget extends AbstractComponent + implements com.vaadin.event.dd.DropTarget { @Override public boolean isConnectorEnabled() { isConnectorEnabledCalled = true; diff --git a/server/src/test/java/com/vaadin/server/JSONSerializerTest.java b/server/src/test/java/com/vaadin/server/JSONSerializerTest.java index bb0be09870..c1d72e0c03 100644 --- a/server/src/test/java/com/vaadin/server/JSONSerializerTest.java +++ b/server/src/test/java/com/vaadin/server/JSONSerializerTest.java @@ -58,8 +58,9 @@ public class JSONSerializerTest { stringToStateMap.put("string - state 1", s); stringToStateMap.put("String - state 2", s2); - JsonValue encodedMap = JsonCodec.encode(stringToStateMap, null, - mapType, null).getEncodedValue(); + JsonValue encodedMap = JsonCodec + .encode(stringToStateMap, null, mapType, null) + .getEncodedValue(); ensureDecodedCorrectly(stringToStateMap, encodedMap, mapType); } @@ -76,8 +77,9 @@ public class JSONSerializerTest { stateToStringMap.put(s, "string - state 1"); stateToStringMap.put(s2, "String - state 2"); - JsonValue encodedMap = JsonCodec.encode(stateToStringMap, null, - mapType, null).getEncodedValue(); + JsonValue encodedMap = JsonCodec + .encode(stateToStringMap, null, mapType, null) + .getEncodedValue(); ensureDecodedCorrectly(stateToStringMap, encodedMap, mapType); } @@ -87,8 +89,8 @@ public class JSONSerializerTest { JsonArray inputArray = Json.createArray(); inputArray.set(0, "n"); inputArray.set(1, Json.createNull()); - UidlValue decodedObject = (UidlValue) JsonCodec.decodeInternalType( - UidlValue.class, true, inputArray, null); + UidlValue decodedObject = (UidlValue) JsonCodec + .decodeInternalType(UidlValue.class, true, inputArray, null); Assert.assertNull(decodedObject.getValue()); } @@ -97,15 +99,16 @@ public class JSONSerializerTest { JsonArray inputArray = Json.createArray(); inputArray.set(0, "n"); inputArray.set(1, "a"); - UidlValue decodedObject = (UidlValue) JsonCodec.decodeInternalType( - UidlValue.class, true, inputArray, null); + UidlValue decodedObject = (UidlValue) JsonCodec + .decodeInternalType(UidlValue.class, true, inputArray, null); } private void ensureDecodedCorrectly(Object original, JsonValue encoded, Type type) throws Exception { Object serverSideDecoded = JsonCodec.decodeInternalOrCustomType(type, encoded, null); - Assert.assertTrue("Server decoded", equals(original, serverSideDecoded)); + Assert.assertTrue("Server decoded", + equals(original, serverSideDecoded)); } diff --git a/server/src/test/java/com/vaadin/server/MockServletContext.java b/server/src/test/java/com/vaadin/server/MockServletContext.java index 8818ba1c36..3002925992 100644 --- a/server/src/test/java/com/vaadin/server/MockServletContext.java +++ b/server/src/test/java/com/vaadin/server/MockServletContext.java @@ -399,8 +399,8 @@ public class MockServletContext implements ServletContext { * java.lang.String) */ @Override - public javax.servlet.FilterRegistration.Dynamic addFilter( - String filterName, String className) { + public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, + String className) { return null; } @@ -411,8 +411,8 @@ public class MockServletContext implements ServletContext { * javax.servlet.Filter) */ @Override - public javax.servlet.FilterRegistration.Dynamic addFilter( - String filterName, Filter filter) { + public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, + Filter filter) { return null; } @@ -423,8 +423,8 @@ public class MockServletContext implements ServletContext { * java.lang.Class) */ @Override - public javax.servlet.FilterRegistration.Dynamic addFilter( - String filterName, Class<? extends Filter> filterClass) { + public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, + Class<? extends Filter> filterClass) { return null; } diff --git a/server/src/test/java/com/vaadin/server/PageTest.java b/server/src/test/java/com/vaadin/server/PageTest.java index b782b1f67d..6e33c6c6f0 100644 --- a/server/src/test/java/com/vaadin/server/PageTest.java +++ b/server/src/test/java/com/vaadin/server/PageTest.java @@ -74,8 +74,8 @@ public class PageTest { } - private static class TestBrowserWindowResizeListener implements - BrowserWindowResizeListener { + private static class TestBrowserWindowResizeListener + implements BrowserWindowResizeListener { @Override public void browserWindowResized(BrowserWindowResizeEvent event) { diff --git a/server/src/test/java/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java b/server/src/test/java/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java index aba29bf9a5..bea51a57af 100644 --- a/server/src/test/java/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java +++ b/server/src/test/java/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java @@ -49,8 +49,8 @@ public class TestAbstractApplicationServletStaticFilesLocation { // http://dummy.host/contextpath/servlet/extra/stuff // should return ./../.. (relative url resolving to /contextpath) - location = testLocation("http://dummy.host", "/contextpath", - "/servlet", "/extra/stuff"); + location = testLocation("http://dummy.host", "/contextpath", "/servlet", + "/extra/stuff"); Assert.assertEquals("./../..", location); // http://dummy.host/context/path/servlet/extra/stuff @@ -76,8 +76,8 @@ public class TestAbstractApplicationServletStaticFilesLocation { // Set request into replay mode replay(request); - String location = servlet.getService().getStaticFileLocation( - servlet.createVaadinRequest(request)); + String location = servlet.getService() + .getStaticFileLocation(servlet.createVaadinRequest(request)); return location; } @@ -89,8 +89,8 @@ public class TestAbstractApplicationServletStaticFilesLocation { // Set request into replay mode replay(request); - String location = servlet.getService().getStaticFileLocation( - servlet.createVaadinRequest(request)); + String location = servlet.getService() + .getStaticFileLocation(servlet.createVaadinRequest(request)); return location; } @@ -139,8 +139,9 @@ public class TestAbstractApplicationServletStaticFilesLocation { String servletPath, String pathInfo) throws MalformedURLException { URL url = new URL(base + contextPath + pathInfo); HttpServletRequest request = createMock(HttpServletRequest.class); - expect(request.isSecure()).andReturn( - url.getProtocol().equalsIgnoreCase("https")).anyTimes(); + expect(request.isSecure()) + .andReturn(url.getProtocol().equalsIgnoreCase("https")) + .anyTimes(); expect(request.getServerName()).andReturn(url.getHost()).anyTimes(); expect(request.getServerPort()).andReturn(url.getPort()).anyTimes(); expect(request.getRequestURI()).andReturn(url.getPath()).anyTimes(); diff --git a/server/src/test/java/com/vaadin/server/UIProviderTest.java b/server/src/test/java/com/vaadin/server/UIProviderTest.java index 579a3f1858..1b7bdd02e7 100644 --- a/server/src/test/java/com/vaadin/server/UIProviderTest.java +++ b/server/src/test/java/com/vaadin/server/UIProviderTest.java @@ -48,8 +48,8 @@ public class UIProviderTest { @Test public void getAnnotationFor_themeAnnotationForSubclass_annotationOverridden() { Assert.assertEquals( - "Theme annotation is not overridden correctly in subclass", - "c", UIProvider.getAnnotationFor(TestClass.class, Theme.class) + "Theme annotation is not overridden correctly in subclass", "c", + UIProvider.getAnnotationFor(TestClass.class, Theme.class) .value()); } @@ -71,10 +71,9 @@ public class UIProviderTest { @Test public void getAnnotationFor_annotationInheritedFromInterface_annotationFound() { - Assert.assertNotNull( - "Theme annotation is not inherited from interface", UIProvider - .getAnnotationFor(ClassImplementingInterface.class, - Theme.class)); + Assert.assertNotNull("Theme annotation is not inherited from interface", + UIProvider.getAnnotationFor(ClassImplementingInterface.class, + Theme.class)); } @Retention(RetentionPolicy.RUNTIME) @@ -106,8 +105,8 @@ public class UIProviderTest { public interface InterfaceWithAnnotation { } - public static class ClassImplementingInterface implements - InterfaceWithAnnotation { + public static class ClassImplementingInterface + implements InterfaceWithAnnotation { } } diff --git a/server/src/test/java/com/vaadin/server/VaadinGateInRequestTest.java b/server/src/test/java/com/vaadin/server/VaadinGateInRequestTest.java index eda2b3a006..ec72ce7a71 100644 --- a/server/src/test/java/com/vaadin/server/VaadinGateInRequestTest.java +++ b/server/src/test/java/com/vaadin/server/VaadinGateInRequestTest.java @@ -20,8 +20,8 @@ import static org.mockito.Mockito.spy; import com.vaadin.server.VaadinPortlet.VaadinGateInRequest; -public class VaadinGateInRequestTest extends - VaadinHttpAndPortletRequestTestBase<VaadinGateInRequest> { +public class VaadinGateInRequestTest + extends VaadinHttpAndPortletRequestTestBase<VaadinGateInRequest> { @Override protected VaadinGateInRequest createSut() { diff --git a/server/src/test/java/com/vaadin/server/VaadinLiferayRequestTest.java b/server/src/test/java/com/vaadin/server/VaadinLiferayRequestTest.java index 3024cd652f..d7f601be92 100644 --- a/server/src/test/java/com/vaadin/server/VaadinLiferayRequestTest.java +++ b/server/src/test/java/com/vaadin/server/VaadinLiferayRequestTest.java @@ -20,8 +20,8 @@ import static org.mockito.Mockito.spy; import com.vaadin.server.VaadinPortlet.VaadinLiferayRequest; -public class VaadinLiferayRequestTest extends - VaadinHttpAndPortletRequestTestBase<VaadinLiferayRequest> { +public class VaadinLiferayRequestTest + extends VaadinHttpAndPortletRequestTestBase<VaadinLiferayRequest> { @Override protected VaadinLiferayRequest createSut() { diff --git a/server/src/test/java/com/vaadin/server/VaadinPortletServiceTest.java b/server/src/test/java/com/vaadin/server/VaadinPortletServiceTest.java index d8c66e312f..5ecd5f44d9 100644 --- a/server/src/test/java/com/vaadin/server/VaadinPortletServiceTest.java +++ b/server/src/test/java/com/vaadin/server/VaadinPortletServiceTest.java @@ -56,16 +56,15 @@ public class VaadinPortletServiceTest { } private void mockFileLocationPreference(String location) { - when( - request.getPortletPreference(Constants.PORTAL_PARAMETER_VAADIN_RESOURCE_PATH)) - .thenReturn(location); + when(request.getPortletPreference( + Constants.PORTAL_PARAMETER_VAADIN_RESOURCE_PATH)) + .thenReturn(location); } private void mockLocationDeploymentConfiguration(String location) { - when( - conf.getApplicationOrSystemProperty( - Constants.PORTAL_PARAMETER_VAADIN_RESOURCE_PATH, null)) - .thenReturn(location); + when(conf.getApplicationOrSystemProperty( + Constants.PORTAL_PARAMETER_VAADIN_RESOURCE_PATH, null)) + .thenReturn(location); } private String getStaticFileLocation() { @@ -184,7 +183,8 @@ public class VaadinPortletServiceTest { @Test public void oldDefaultWidgetSetIsNotMappedToDefaultWidgetset() { - mockWidgetsetConfiguration("com.vaadin.portal.gwt.PortalDefaultWidgetSet"); + mockWidgetsetConfiguration( + "com.vaadin.portal.gwt.PortalDefaultWidgetSet"); mockWidgetsetProperty(null); String widgetset = getWidgetset(); @@ -201,14 +201,14 @@ public class VaadinPortletServiceTest { WrappedSession emptyWrappedSession = Mockito .mock(WrappedPortletSession.class); - when(emptyWrappedSession.getAttribute("null.lock")).thenReturn( - mockLock); + when(emptyWrappedSession.getAttribute("null.lock")) + .thenReturn(mockLock); VaadinRequest requestWithUIIDSet = Mockito .mock(VaadinRequest.class); when(requestWithUIIDSet.getParameter(UIConstants.UI_ID_PARAMETER)) .thenReturn("1"); - when(requestWithUIIDSet.getWrappedSession()).thenReturn( - emptyWrappedSession); + when(requestWithUIIDSet.getWrappedSession()) + .thenReturn(emptyWrappedSession); UI ui = sut.findUI(requestWithUIIDSet); Assert.assertNull("Unset session did not return null", ui); diff --git a/server/src/test/java/com/vaadin/server/VaadinServiceTest.java b/server/src/test/java/com/vaadin/server/VaadinServiceTest.java index bd3da6277a..c25453617c 100644 --- a/server/src/test/java/com/vaadin/server/VaadinServiceTest.java +++ b/server/src/test/java/com/vaadin/server/VaadinServiceTest.java @@ -65,12 +65,13 @@ public class VaadinServiceTest { "'fireSessionDestroy' method doesn't call 'close' for the session", 1, vaadinSession.getCloseCount()); - vaadinSession.valueUnbound(EasyMock - .createMock(HttpSessionBindingEvent.class)); + vaadinSession.valueUnbound( + EasyMock.createMock(HttpSessionBindingEvent.class)); - Assert.assertEquals("'fireSessionDestroy' method may not call 'close' " - + "method for closing session", 1, - vaadinSession.getCloseCount()); + Assert.assertEquals( + "'fireSessionDestroy' method may not call 'close' " + + "method for closing session", + 1, vaadinSession.getCloseCount()); Assert.assertEquals("SessionDestroyListeners not called exactly once", 1, listener.callCount); diff --git a/server/src/test/java/com/vaadin/server/VaadinSessionTest.java b/server/src/test/java/com/vaadin/server/VaadinSessionTest.java index 85c37d156c..385e9b3747 100644 --- a/server/src/test/java/com/vaadin/server/VaadinSessionTest.java +++ b/server/src/test/java/com/vaadin/server/VaadinSessionTest.java @@ -111,7 +111,8 @@ public class VaadinSessionTest implements Serializable { || "ignoreRestart".equals(name) || "closeApplication".equals(name)) { return null; - } else if (UIInitHandler.BROWSER_DETAILS_PARAMETER.equals(name)) { + } else if (UIInitHandler.BROWSER_DETAILS_PARAMETER + .equals(name)) { return "1"; } return super.getParameter(name); @@ -123,7 +124,8 @@ public class VaadinSessionTest implements Serializable { } @Override - public WrappedSession getWrappedSession(boolean allowSessionCreation) { + public WrappedSession getWrappedSession( + boolean allowSessionCreation) { return mockWrappedSession; } @@ -187,7 +189,8 @@ public class VaadinSessionTest implements Serializable { } }); - session.valueUnbound(EasyMock.createMock(HttpSessionBindingEvent.class)); + session.valueUnbound( + EasyMock.createMock(HttpSessionBindingEvent.class)); mockService.runPendingAccessTasks(session); // as soon as we changed // session.accessSynchronously // to session.access in @@ -227,19 +230,19 @@ public class VaadinSessionTest implements Serializable { public void testValueUnbound() { MockVaadinSession vaadinSession = new MockVaadinSession(mockService); - vaadinSession.valueUnbound(EasyMock - .createMock(HttpSessionBindingEvent.class)); + vaadinSession.valueUnbound( + EasyMock.createMock(HttpSessionBindingEvent.class)); org.junit.Assert.assertEquals( - "'valueUnbound' method doesn't call 'close' for the session", - 1, vaadinSession.getCloseCount()); + "'valueUnbound' method doesn't call 'close' for the session", 1, + vaadinSession.getCloseCount()); - vaadinSession.valueUnbound(EasyMock - .createMock(HttpSessionBindingEvent.class)); + vaadinSession.valueUnbound( + EasyMock.createMock(HttpSessionBindingEvent.class)); org.junit.Assert.assertEquals( "'valueUnbound' method may not call 'close' " - + "method for closing session", 1, - vaadinSession.getCloseCount()); + + "method for closing session", + 1, vaadinSession.getCloseCount()); } // Can't define as an anonymous class since it would have a reference to @@ -264,8 +267,8 @@ public class VaadinSessionTest implements Serializable { private static class SerializationTestLabel extends Label { private transient VaadinSession session = VaadinSession.getCurrent(); - private void readObject(ObjectInputStream in) throws IOException, - ClassNotFoundException { + private void readObject(ObjectInputStream in) + throws IOException, ClassNotFoundException { in.defaultReadObject(); session = VaadinSession.getCurrent(); } @@ -291,13 +294,12 @@ public class VaadinSessionTest implements Serializable { CurrentInstance.clearAll(); - ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream( - bos.toByteArray())); + ObjectInputStream in = new ObjectInputStream( + new ByteArrayInputStream(bos.toByteArray())); VaadinSession deserializedSession = (VaadinSession) in.readObject(); - Assert.assertNull( - "Current session shouldn't leak from deserialisation", + Assert.assertNull("Current session shouldn't leak from deserialisation", VaadinSession.getCurrent()); Assert.assertNotSame("Should get a new session", session, @@ -323,7 +325,8 @@ public class VaadinSessionTest implements Serializable { final AtomicBoolean lockChecked = new AtomicBoolean(false); ui.setContent(new Label() { - private void writeObject(ObjectOutputStream out) throws IOException { + private void writeObject(ObjectOutputStream out) + throws IOException { Assert.assertTrue(session.hasLock()); lockChecked.set(true); out.defaultWriteObject(); diff --git a/server/src/test/java/com/vaadin/server/communication/FileUploadHandlerTest.java b/server/src/test/java/com/vaadin/server/communication/FileUploadHandlerTest.java index 286163541e..f821839877 100644 --- a/server/src/test/java/com/vaadin/server/communication/FileUploadHandlerTest.java +++ b/server/src/test/java/com/vaadin/server/communication/FileUploadHandlerTest.java @@ -41,14 +41,22 @@ import com.vaadin.ui.UI; public class FileUploadHandlerTest { private FileUploadHandler handler; - @Mock private VaadinResponse response; - @Mock private StreamVariable streamVariable; - @Mock private ClientConnector clientConnector; - @Mock private VaadinRequest request; - @Mock private UI ui; - @Mock private ConnectorTracker connectorTracker; - @Mock private VaadinSession session; - @Mock private OutputStream responseOutput; + @Mock + private VaadinResponse response; + @Mock + private StreamVariable streamVariable; + @Mock + private ClientConnector clientConnector; + @Mock + private VaadinRequest request; + @Mock + private UI ui; + @Mock + private ConnectorTracker connectorTracker; + @Mock + private VaadinSession session; + @Mock + private OutputStream responseOutput; private int uiId = 123; private final String connectorId = "connectorId"; @@ -66,18 +74,24 @@ public class FileUploadHandlerTest { mockUi(); when(clientConnector.isConnectorEnabled()).thenReturn(true); - when(streamVariable.getOutputStream()).thenReturn(mock(OutputStream.class)); + when(streamVariable.getOutputStream()) + .thenReturn(mock(OutputStream.class)); when(response.getOutputStream()).thenReturn(responseOutput); } private void mockConnectorTracker() { - when(connectorTracker.getSeckey(streamVariable)).thenReturn(expectedSecurityKey); - when(connectorTracker.getStreamVariable(connectorId, variableName)).thenReturn(streamVariable); - when(connectorTracker.getConnector(connectorId)).thenReturn(clientConnector); + when(connectorTracker.getSeckey(streamVariable)) + .thenReturn(expectedSecurityKey); + when(connectorTracker.getStreamVariable(connectorId, variableName)) + .thenReturn(streamVariable); + when(connectorTracker.getConnector(connectorId)) + .thenReturn(clientConnector); } private void mockRequest() throws IOException { - when(request.getPathInfo()).thenReturn("/" + ServletPortletHelper.UPLOAD_URL_PREFIX + uiId + "/"+ connectorId + "/" + variableName + "/" + expectedSecurityKey); + when(request.getPathInfo()).thenReturn("/" + + ServletPortletHelper.UPLOAD_URL_PREFIX + uiId + "/" + + connectorId + "/" + variableName + "/" + expectedSecurityKey); when(request.getInputStream()).thenReturn(createInputStream("foobar")); when(request.getHeader("Content-Length")).thenReturn("6"); when(request.getContentType()).thenReturn("foobar"); @@ -90,11 +104,12 @@ public class FileUploadHandlerTest { @Override public int read() throws IOException { - if(counter > msg.length + 1) { - throw new AssertionError("-1 was ignored by FileUploadHandler."); + if (counter > msg.length + 1) { + throw new AssertionError( + "-1 was ignored by FileUploadHandler."); } - if(counter >= msg.length) { + if (counter >= msg.length) { counter++; return -1; } @@ -110,7 +125,8 @@ public class FileUploadHandlerTest { } /** - * Tests whether we get infinite loop if InputStream is already read (#10096) + * Tests whether we get infinite loop if InputStream is already read + * (#10096) */ @Test(expected = IOException.class) public void exceptionIsThrownOnUnexpectedEnd() throws IOException { @@ -123,7 +139,8 @@ public class FileUploadHandlerTest { @Test public void responseIsSentOnCorrectSecurityKey() throws IOException { - when(connectorTracker.getSeckey(streamVariable)).thenReturn(expectedSecurityKey); + when(connectorTracker.getSeckey(streamVariable)) + .thenReturn(expectedSecurityKey); handler.handleRequest(session, request, response); @@ -132,7 +149,8 @@ public class FileUploadHandlerTest { @Test public void responseIsNotSentOnIncorrectSecurityKey() throws IOException { - when(connectorTracker.getSeckey(streamVariable)).thenReturn("another key expected"); + when(connectorTracker.getSeckey(streamVariable)) + .thenReturn("another key expected"); handler.handleRequest(session, request, response); diff --git a/server/src/test/java/com/vaadin/server/communication/MetadataWriterTest.java b/server/src/test/java/com/vaadin/server/communication/MetadataWriterTest.java index afae14007e..078682fd24 100644 --- a/server/src/test/java/com/vaadin/server/communication/MetadataWriterTest.java +++ b/server/src/test/java/com/vaadin/server/communication/MetadataWriterTest.java @@ -62,15 +62,15 @@ public class MetadataWriterTest { @Test public void writeRepaintTag() throws Exception { new MetadataWriter().write(ui, writer, true, false, messages); - Assert.assertEquals("{\"repaintAll\":true}", writer.getBuffer() - .toString()); + Assert.assertEquals("{\"repaintAll\":true}", + writer.getBuffer().toString()); } @Test public void writeRepaintAndAsyncTag() throws Exception { new MetadataWriter().write(ui, writer, true, true, messages); - Assert.assertEquals("{\"repaintAll\":true, \"async\":true}", writer - .getBuffer().toString()); + Assert.assertEquals("{\"repaintAll\":true, \"async\":true}", + writer.getBuffer().toString()); } @Test @@ -90,8 +90,8 @@ public class MetadataWriterTest { new MetadataWriter().write(ui, writer, false, false, messages); Assert.assertEquals( - "{\"timedRedirect\":{\"interval\":15,\"url\":\"\"}}", writer - .getBuffer().toString()); + "{\"timedRedirect\":{\"interval\":15,\"url\":\"\"}}", + writer.getBuffer().toString()); } @Test diff --git a/server/src/test/java/com/vaadin/server/data/datasource/ListDataSourceTest.java b/server/src/test/java/com/vaadin/server/data/datasource/ListDataSourceTest.java index e1d57ad959..67f078bd34 100644 --- a/server/src/test/java/com/vaadin/server/data/datasource/ListDataSourceTest.java +++ b/server/src/test/java/com/vaadin/server/data/datasource/ListDataSourceTest.java @@ -13,7 +13,6 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; - public class ListDataSourceTest { private ListDataSource<StrBean> dataSource; @@ -27,8 +26,8 @@ public class ListDataSourceTest { @Test public void testListContainsAllData() { - dataSource.apply(new Query()).forEach( - str -> assertTrue( + dataSource.apply(new Query()) + .forEach(str -> assertTrue( "Data source contained values not in original data", data.remove(str))); assertTrue("Not all values from original data were in data source", @@ -77,7 +76,8 @@ public class ListDataSourceTest { if (prev.getRandomNumber() == cur.getRandomNumber()) { // Test default sort - Assert.assertTrue(prev.getValue().compareTo(cur.getValue()) <= 0); + Assert.assertTrue( + prev.getValue().compareTo(cur.getValue()) <= 0); if (prev.getValue().equals(cur.getValue())) { Assert.assertTrue(prev.getId() > cur.getId()); } diff --git a/server/src/test/java/com/vaadin/server/data/datasource/StrBean.java b/server/src/test/java/com/vaadin/server/data/datasource/StrBean.java index fb0ea8eb1e..6bb1e1bd1a 100644 --- a/server/src/test/java/com/vaadin/server/data/datasource/StrBean.java +++ b/server/src/test/java/com/vaadin/server/data/datasource/StrBean.java @@ -36,8 +36,8 @@ class StrBean implements Serializable { Random r = new Random(13337); data.add(new StrBean("Xyz", 10, max)); for (int i = 0; i < max - 1; ++i) { - data.add(new StrBean(values[r.nextInt(values.length)], i, r - .nextInt(10))); + data.add(new StrBean(values[r.nextInt(values.length)], i, + r.nextInt(10))); } return data; } diff --git a/server/src/test/java/com/vaadin/server/data/datasource/bov/DataSourceBoVTest.java b/server/src/test/java/com/vaadin/server/data/datasource/bov/DataSourceBoVTest.java index 3b0c12deb1..f835ea488d 100644 --- a/server/src/test/java/com/vaadin/server/data/datasource/bov/DataSourceBoVTest.java +++ b/server/src/test/java/com/vaadin/server/data/datasource/bov/DataSourceBoVTest.java @@ -47,16 +47,14 @@ public class DataSourceBoVTest { @Override public List<Person> fetchPersons(int offset, int limit) { - return Arrays.stream(persons) - .skip(offset) - .limit(limit) + return Arrays.stream(persons).skip(offset).limit(limit) .collect(Collectors.toList()); } @Override - public List<Person> fetchPersons(int offset, int limit, Collection<PersonSort> personSorts) { - Stream<Person> personStream = Arrays.stream(persons) - .skip(offset) + public List<Person> fetchPersons(int offset, int limit, + Collection<PersonSort> personSorts) { + Stream<Person> personStream = Arrays.stream(persons).skip(offset) .limit(limit); if (personSorts != null) for (PersonSort personSort : personSorts) { @@ -74,24 +72,30 @@ public class DataSourceBoVTest { public PersonSort createSort(String propertyName, boolean descending) { PersonSort result; switch (propertyName) { - case "name": - result = (person1, person2) -> String.CASE_INSENSITIVE_ORDER.compare(person1.getName(), person2.getName()); - break; - case "born": - result = (person1, person2) -> person2.getBorn() - person1.getBorn(); - break; - default: - throw new IllegalArgumentException("wrong field name " + propertyName); + case "name": + result = (person1, person2) -> String.CASE_INSENSITIVE_ORDER + .compare(person1.getName(), person2.getName()); + break; + case "born": + result = (person1, person2) -> person2.getBorn() + - person1.getBorn(); + break; + default: + throw new IllegalArgumentException( + "wrong field name " + propertyName); } - if (descending) return (person1, person2) -> result.compare(person2, person1); - else return result; + if (descending) + return (person1, person2) -> result.compare(person2, person1); + else + return result; } } @Test public void testPersons() { DataSource<Person> dataSource = createUnsortedDatasource(); - //TODO test if the datasource contains all defined Persons in correct(unchanged) order + // TODO test if the datasource contains all defined Persons in + // correct(unchanged) order } private DataSource<Person> createUnsortedDatasource() { @@ -104,13 +108,13 @@ public class DataSourceBoVTest { // The number of items to load int limit = query.getLimit(); - List<Person> persons = getPersonService().fetchPersons(offset, limit); + List<Person> persons = getPersonService() + .fetchPersons(offset, limit); return persons.stream(); }, // Second callback fetches the number of items for a query - query -> getPersonService().getPersonCount() - ); + query -> getPersonService().getPersonCount()); return dataSource; } @@ -118,8 +122,8 @@ public class DataSourceBoVTest { public void testSortedPersons() { DataSource<Person> dataSource = createSortedDataSource(); - //TODO test if datasource contains all defined Persons in correct order - //TODO test Query.sortOrders correctness + // TODO test if datasource contains all defined Persons in correct order + // TODO test Query.sortOrders correctness } private DataSource<Person> createSortedDataSource() { @@ -128,23 +132,20 @@ public class DataSourceBoVTest { query -> { List<PersonService.PersonSort> sortOrders = new ArrayList<>(); for (SortOrder<String> queryOrder : query.getSortOrders()) { - PersonService.PersonSort sort = personService.createSort( - // The name of the sorted property - queryOrder.getSorted(), - // The sort direction for this property - queryOrder.getDirection() == SortDirection.DESCENDING); + PersonService.PersonSort sort = personService + .createSort( + // The name of the sorted property + queryOrder.getSorted(), + // The sort direction for this property + queryOrder + .getDirection() == SortDirection.DESCENDING); sortOrders.add(sort); } - return getPersonService().fetchPersons( - query.getOffset(), - query.getLimit(), - sortOrders - ).stream(); - } - , + return getPersonService().fetchPersons(query.getOffset(), + query.getLimit(), sortOrders).stream(); + }, // Second callback fetches the number of items for a query - query -> getPersonService().getPersonCount() - ); + query -> getPersonService().getPersonCount()); return dataSource; } diff --git a/server/src/test/java/com/vaadin/server/data/datasource/bov/Person.java b/server/src/test/java/com/vaadin/server/data/datasource/bov/Person.java index e8672999b4..1e59d2c3f6 100644 --- a/server/src/test/java/com/vaadin/server/data/datasource/bov/Person.java +++ b/server/src/test/java/com/vaadin/server/data/datasource/bov/Person.java @@ -22,7 +22,7 @@ import java.io.Serializable; * * @author Vaadin Ltd */ -public class Person implements Serializable{ +public class Person implements Serializable { private final String name; private final int born; diff --git a/server/src/test/java/com/vaadin/server/data/datasource/bov/PersonService.java b/server/src/test/java/com/vaadin/server/data/datasource/bov/PersonService.java index 75419e4f00..a4a93a9600 100644 --- a/server/src/test/java/com/vaadin/server/data/datasource/bov/PersonService.java +++ b/server/src/test/java/com/vaadin/server/data/datasource/bov/PersonService.java @@ -29,14 +29,13 @@ import java.util.List; public interface PersonService extends Serializable { List<Person> fetchPersons(int offset, int limit); - List<Person> fetchPersons(int offset, int limit, Collection<PersonSort> personSorts); + List<Person> fetchPersons(int offset, int limit, + Collection<PersonSort> personSorts); int getPersonCount(); public interface PersonSort extends Comparator<Person>, Serializable { } - PersonSort createSort( - String propertyName, - boolean descending); + PersonSort createSort(String propertyName, boolean descending); } diff --git a/server/src/test/java/com/vaadin/tests/VaadinClasses.java b/server/src/test/java/com/vaadin/tests/VaadinClasses.java index a8bb79af7a..063fdf537d 100644 --- a/server/src/test/java/com/vaadin/tests/VaadinClasses.java +++ b/server/src/test/java/com/vaadin/tests/VaadinClasses.java @@ -83,8 +83,8 @@ public class VaadinClasses { public static List<Class<? extends Object>> getAllServerSideClasses() { try { - return findClassesNoTests(Object.class, "com.vaadin", new String[] { - "com.vaadin.tests", "com.vaadin.client" }); + return findClassesNoTests(Object.class, "com.vaadin", + new String[] { "com.vaadin.tests", "com.vaadin.client" }); } catch (IOException e) { e.printStackTrace(); return null; @@ -126,7 +126,8 @@ public class VaadinClasses { try { // Given as name to avoid dependencies on testbench source folder return (List) findClasses( - Class.forName("com.vaadin.tests.components.AbstractComponentTest"), + Class.forName( + "com.vaadin.tests.components.AbstractComponentTest"), "com.vaadin.tests.components"); } catch (Exception e) { e.printStackTrace(); @@ -149,8 +150,8 @@ public class VaadinClasses { try { File f = new File(location.toURI()); if (!f.exists()) { - throw new IOException("Directory " + f.toString() - + " does not exist"); + throw new IOException( + "Directory " + f.toString() + " does not exist"); } findPackages(f, basePackage, baseClass, classes, ignoredPackages); diff --git a/server/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperDeclarativeTest.java index a590b3ec1f..7e0140d588 100644 --- a/server/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperDeclarativeTest.java @@ -23,8 +23,8 @@ import com.vaadin.ui.DragAndDropWrapper; import com.vaadin.ui.DragAndDropWrapper.DragStartMode; import com.vaadin.ui.declarative.DesignContext; -public class DragAndDropWrapperDeclarativeTest extends - DeclarativeTestBase<DragAndDropWrapper> { +public class DragAndDropWrapperDeclarativeTest + extends DeclarativeTestBase<DragAndDropWrapper> { @Test public void testDefaultDnDWrapper() { @@ -55,8 +55,8 @@ public class DragAndDropWrapperDeclarativeTest extends Button okButton = new Button("OK"); String input = "<vaadin-drag-and-drop-wrapper drag-start-mode='component_other'>" + new DesignContext().createElement(okButton) - + new DesignContext().createElement(dragImage).attr( - ":drag-image", true) + + new DesignContext().createElement(dragImage) + .attr(":drag-image", true) + "</vaadin-drag-and-drop-wrapper>"; DragAndDropWrapper wrapper = new DragAndDropWrapper(okButton); wrapper.setDragStartMode(DragStartMode.COMPONENT_OTHER); diff --git a/server/src/test/java/com/vaadin/tests/components/menubar/MenuBarDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/components/menubar/MenuBarDeclarativeTest.java index 321d41152b..5d946c5a86 100644 --- a/server/src/test/java/com/vaadin/tests/components/menubar/MenuBarDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/components/menubar/MenuBarDeclarativeTest.java @@ -54,8 +54,8 @@ public class MenuBarDeclarativeTest extends DeclarativeTestBase<MenuBar> { bar.addItem("Save", null).setCheckable(true); bar.addItem("Open", null).setDescription("Open a file"); bar.addItem("Close", null).setEnabled(false); - bar.addItem("Help", null).setIcon( - new ExternalResource("http://foo.bar/ico.png")); + bar.addItem("Help", null) + .setIcon(new ExternalResource("http://foo.bar/ico.png")); bar.addItem("About", null).setVisible(false); bar.addItem("Sub", null).addItem("Item", null); @@ -70,13 +70,10 @@ public class MenuBarDeclarativeTest extends DeclarativeTestBase<MenuBar> { // #16328 public void testTicketSpec1() throws IOException { String design = "<vaadin-menu-bar auto-open plain-text tabindex=5> " - + "<menu>File" - + "<menu>Save</menu>" + + "<menu>File" + "<menu>Save</menu>" + "<menu icon=\"theme://../runo/icons/16/folder.png\">Open</menu>" - + "<menu separator />" - + "<menu disabled>Exit</menu>" - + "<menu visible='false'>Not for everybody</menu>" - + "</menu>" + + "<menu separator />" + "<menu disabled>Exit</menu>" + + "<menu visible='false'>Not for everybody</menu>" + "</menu>" + "<menu description=\"This contains many items in sub menus\">Other" + "<menu style-name=\"fancy\">Sub" + "<menu checkable checked>Option 1 - no <b>html</b></menu>" @@ -95,8 +92,8 @@ public class MenuBarDeclarativeTest extends DeclarativeTestBase<MenuBar> { // File menu MenuItem fileMenu = menuBar.addItem("File", null); fileMenu.addItem("Save", null); - fileMenu.addItem("Open", new ThemeResource( - "../runo/icons/16/folder.png"), null); + fileMenu.addItem("Open", + new ThemeResource("../runo/icons/16/folder.png"), null); fileMenu.addSeparator(); fileMenu.addItem("Exit", null).setEnabled(false); fileMenu.addItem("Not for everybody", null).setVisible(false); @@ -120,8 +117,7 @@ public class MenuBarDeclarativeTest extends DeclarativeTestBase<MenuBar> { @Test // #16328 public void testTicketSpec2() throws IOException { - String design = "<vaadin-menu-bar>" - + "<menu><b>File</b>" + String design = "<vaadin-menu-bar>" + "<menu><b>File</b>" + "<menu><font style=\"color: red\">Save</font></menu>" + "<menu icon=\"theme://../runo/icons/16/folder.png\">Open</menu>" + "<menu separator />" + "<menu disabled>Exit</menu>" // @@ -130,8 +126,8 @@ public class MenuBarDeclarativeTest extends DeclarativeTestBase<MenuBar> { menuBar.setHtmlContentAllowed(true); MenuItem fileMenu = menuBar.addItem("<b>File</b>", null); fileMenu.addItem("<font style=\"color: red\">Save</font>", null); - fileMenu.addItem("Open", new ThemeResource( - "../runo/icons/16/folder.png"), null); + fileMenu.addItem("Open", + new ThemeResource("../runo/icons/16/folder.png"), null); fileMenu.addSeparator(); fileMenu.addItem("Exit", null).setEnabled(false); testRead(design, menuBar); diff --git a/server/src/test/java/com/vaadin/tests/data/bean/Country.java b/server/src/test/java/com/vaadin/tests/data/bean/Country.java index afdf8dcfa1..159333212f 100644 --- a/server/src/test/java/com/vaadin/tests/data/bean/Country.java +++ b/server/src/test/java/com/vaadin/tests/data/bean/Country.java @@ -2,8 +2,8 @@ package com.vaadin.tests.data.bean; public enum Country { - FINLAND("Finland"), SWEDEN("Sweden"), USA("USA"), RUSSIA("Russia"), NETHERLANDS( - "Netherlands"), SOUTH_AFRICA("South Africa"); + FINLAND("Finland"), SWEDEN("Sweden"), USA("USA"), RUSSIA( + "Russia"), NETHERLANDS("Netherlands"), SOUTH_AFRICA("South Africa"); private String name; diff --git a/server/src/test/java/com/vaadin/tests/data/bean/Person.java b/server/src/test/java/com/vaadin/tests/data/bean/Person.java index f7bad31d0e..00d28a1cd8 100644 --- a/server/src/test/java/com/vaadin/tests/data/bean/Person.java +++ b/server/src/test/java/com/vaadin/tests/data/bean/Person.java @@ -136,8 +136,8 @@ public class Person { } public static Person createTestPerson2() { - return new Person("Maya", "Dinkelstein", "maya@foo.bar", 18, - Sex.FEMALE, new Address("Red street", 12, "Amsterdam", + return new Person("Maya", "Dinkelstein", "maya@foo.bar", 18, Sex.FEMALE, + new Address("Red street", 12, "Amsterdam", Country.NETHERLANDS)); } } diff --git a/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java index 0fc9ce875a..611db57109 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java @@ -21,7 +21,8 @@ public class DateToLongConverterTest { public void testValueConversion() { Date d = new Date(100, 0, 1); Assert.assertEquals( - Long.valueOf(946677600000l + (d.getTimezoneOffset() + 120) * 60 * 1000L), + Long.valueOf(946677600000l + + (d.getTimezoneOffset() + 120) * 60 * 1000L), converter.convertToModel(d, Long.class, null)); } } diff --git a/server/src/test/java/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java b/server/src/test/java/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java index 2ef5fae140..0243b8cb2c 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java @@ -62,8 +62,8 @@ public class DefaultConverterFactoryTest { @SuppressWarnings("deprecation") @Test public void stringToDate() { - assertConverter("Oct 12, 2014 12:00:00 AM", new Date(2014 - 1900, - 10 - 1, 12)); + assertConverter("Oct 12, 2014 12:00:00 AM", + new Date(2014 - 1900, 10 - 1, 12)); } @Test @@ -105,25 +105,19 @@ public class DefaultConverterFactoryTest { U tConvertedToU = factory.createConverter(tClass, uClass) .convertToModel(t, uClass, Locale.ENGLISH); - Assert.assertEquals( - "Incorrect type of value converted from " - + tClass.getSimpleName() + " to " - + uClass.getSimpleName(), uClass, - tConvertedToU.getClass()); - Assert.assertEquals( - "Incorrect conversion of " + t + " to " - + uClass.getSimpleName(), u, tConvertedToU); + Assert.assertEquals("Incorrect type of value converted from " + + tClass.getSimpleName() + " to " + uClass.getSimpleName(), + uClass, tConvertedToU.getClass()); + Assert.assertEquals("Incorrect conversion of " + t + " to " + + uClass.getSimpleName(), u, tConvertedToU); T uConvertedToT = factory.createConverter(uClass, tClass) .convertToModel(u, tClass, Locale.ENGLISH); - Assert.assertEquals( - "Incorrect type of value converted from " - + uClass.getSimpleName() + " to " - + tClass.getSimpleName(), tClass, - uConvertedToT.getClass()); - Assert.assertEquals( - "Incorrect conversion of " + u + " to " - + tClass.getSimpleName(), t, uConvertedToT); + Assert.assertEquals("Incorrect type of value converted from " + + uClass.getSimpleName() + " to " + tClass.getSimpleName(), + tClass, uConvertedToT.getClass()); + Assert.assertEquals("Incorrect conversion of " + u + " to " + + tClass.getSimpleName(), t, uConvertedToT); } diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java index 28ad109d23..db88717d7e 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java @@ -18,17 +18,19 @@ public class StringToBooleanConverterTest { @Override public String getFalseString(Locale locale) { Date d = new Date(3000000000000L); - return SimpleDateFormat.getDateInstance(SimpleDateFormat.LONG, - locale).format( - d.getTime() + (d.getTimezoneOffset() + 120) * 60 * 1000L); + return SimpleDateFormat + .getDateInstance(SimpleDateFormat.LONG, locale) + .format(d.getTime() + + (d.getTimezoneOffset() + 120) * 60 * 1000L); } @Override public String getTrueString(Locale locale) { Date d = new Date(2000000000000L); - return SimpleDateFormat.getDateInstance(SimpleDateFormat.LONG, - locale).format( - d.getTime() + (d.getTimezoneOffset() + 120) * 60 * 1000L); + return SimpleDateFormat + .getDateInstance(SimpleDateFormat.LONG, locale) + .format(d.getTime() + + (d.getTimezoneOffset() + 120) * 60 * 1000L); } }; @@ -46,22 +48,23 @@ public class StringToBooleanConverterTest { @Test public void testValueConversion() { - Assert.assertTrue(converter.convertToModel("true", Boolean.class, null)); - Assert.assertFalse(converter.convertToModel("false", Boolean.class, - null)); + Assert.assertTrue( + converter.convertToModel("true", Boolean.class, null)); + Assert.assertFalse( + converter.convertToModel("false", Boolean.class, null)); } @Test public void testYesNoValueConversion() { - Assert.assertTrue(yesNoConverter.convertToModel("yes", Boolean.class, - null)); - Assert.assertFalse(yesNoConverter.convertToModel("no", Boolean.class, - null)); + Assert.assertTrue( + yesNoConverter.convertToModel("yes", Boolean.class, null)); + Assert.assertFalse( + yesNoConverter.convertToModel("no", Boolean.class, null)); Assert.assertEquals("yes", yesNoConverter.convertToPresentation(true, String.class, null)); - Assert.assertEquals("no", - yesNoConverter.convertToPresentation(false, String.class, null)); + Assert.assertEquals("no", yesNoConverter.convertToPresentation(false, + String.class, null)); } @Test diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToByteConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToByteConverterTest.java index 03e2334ccb..afbab3301d 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToByteConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToByteConverterTest.java @@ -23,7 +23,8 @@ public class StringToByteConverterTest { @Test public void testReverseNullConversion() { Assert.assertEquals("Null value reversely was converted incorrectly", - null, reverseConverter.convertToModel(null, String.class, null)); + null, + reverseConverter.convertToModel(null, String.class, null)); } @Test diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java index 4bcc21a30b..18d77e2e8c 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java @@ -83,8 +83,8 @@ public class StringToCollectionConverterTest { public void convertToModel_setAsCollection() { LegacyStringToCollectionConverter converter = new LegacyStringToCollectionConverter( " ", new LegacyStringToEnumConverter(), TestEnum.class); - Collection<?> model = converter - .convertToModel("Z X Y", Set.class, null); + Collection<?> model = converter.convertToModel("Z X Y", Set.class, + null); Assert.assertTrue("Unexpected model class", model instanceof HashSet); EnumSet<TestEnum> set = EnumSet.allOf(TestEnum.class); set.removeAll(model); diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToEnumConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToEnumConverterTest.java index 8e64846f84..a0188cf0d6 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToEnumConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToEnumConverterTest.java @@ -82,26 +82,26 @@ public class StringToEnumConverterTest { converter.convertToModel("Foo bar baz", FooEnum.class, null)); Assert.assertEquals(FooEnum.Bar, converter.convertToModel("Bar", FooEnum.class, null)); - Assert.assertEquals(FooEnum.nonStandardCase, converter.convertToModel( - "Nonstandardcase", FooEnum.class, null)); + Assert.assertEquals(FooEnum.nonStandardCase, converter + .convertToModel("Nonstandardcase", FooEnum.class, null)); Assert.assertEquals(FooEnum._HUGH, converter.convertToModel("_hugh", FooEnum.class, null)); } @Test public void testReverseValueConversion() { - Assert.assertEquals("Value1", reverseConverter.convertToModel( - FooEnum.VALUE1, String.class, null)); - Assert.assertEquals("Some value", reverseConverter.convertToModel( - FooEnum.SOME_VALUE, String.class, null)); - Assert.assertEquals("Foo bar baz", reverseConverter.convertToModel( - FooEnum.FOO_BAR_BAZ, String.class, null)); + Assert.assertEquals("Value1", reverseConverter + .convertToModel(FooEnum.VALUE1, String.class, null)); + Assert.assertEquals("Some value", reverseConverter + .convertToModel(FooEnum.SOME_VALUE, String.class, null)); + Assert.assertEquals("Foo bar baz", reverseConverter + .convertToModel(FooEnum.FOO_BAR_BAZ, String.class, null)); Assert.assertEquals("Bar", reverseConverter.convertToModel(FooEnum.Bar, String.class, null)); - Assert.assertEquals("Nonstandardcase", reverseConverter.convertToModel( - FooEnum.nonStandardCase, String.class, null)); - Assert.assertEquals("_hugh", reverseConverter.convertToModel( - FooEnum._HUGH, String.class, null)); + Assert.assertEquals("Nonstandardcase", reverseConverter + .convertToModel(FooEnum.nonStandardCase, String.class, null)); + Assert.assertEquals("_hugh", reverseConverter + .convertToModel(FooEnum._HUGH, String.class, null)); } diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToShortConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToShortConverterTest.java index 8c6ec0c1d8..850561c55b 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToShortConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToShortConverterTest.java @@ -23,7 +23,8 @@ public class StringToShortConverterTest { @Test public void testReverseNullConversion() { Assert.assertEquals("Null value reversely was converted incorrectly", - null, reverseConverter.convertToModel(null, String.class, null)); + null, + reverseConverter.convertToModel(null, String.class, null)); } @Test @@ -41,8 +42,7 @@ public class StringToShortConverterTest { @Test public void testReverseValueConversion() { - Assert.assertEquals( - "Short value reversely was converted incorrectly", + Assert.assertEquals("Short value reversely was converted incorrectly", reverseConverter.convertToModel((short) 10, String.class, null), "10"); } diff --git a/server/src/test/java/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java index 2d5b5eafe4..70b1e7391b 100644 --- a/server/src/test/java/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java @@ -30,7 +30,8 @@ public class ByteRangeValidatorTest { public void testMinValue() { assertTrue("Validator without ranges didn't accept value", cleanValidator.isValid((byte) -15)); - assertTrue("Didn't accept valid value", minValidator.isValid((byte) 15)); + assertTrue("Didn't accept valid value", + minValidator.isValid((byte) 15)); assertFalse("Accepted too small value", minValidator.isValid((byte) 9)); } @@ -38,7 +39,8 @@ public class ByteRangeValidatorTest { public void testMaxValue() { assertTrue("Validator without ranges didn't accept value", cleanValidator.isValid((byte) 112)); - assertTrue("Didn't accept valid value", maxValidator.isValid((byte) 15)); + assertTrue("Didn't accept valid value", + maxValidator.isValid((byte) 15)); assertFalse("Accepted too large value", maxValidator.isValid((byte) 120)); } diff --git a/server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java index 6a02fd2714..573bb98aad 100644 --- a/server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java @@ -16,10 +16,10 @@ import com.vaadin.legacy.data.validator.LegacyCompositeValidator.CombinationMode public class CompositeValidatorTest { - LegacyCompositeValidator and = new LegacyCompositeValidator(CombinationMode.AND, - "One validator not valid"); - LegacyCompositeValidator or = new LegacyCompositeValidator(CombinationMode.OR, - "No validators are valid"); + LegacyCompositeValidator and = new LegacyCompositeValidator( + CombinationMode.AND, "One validator not valid"); + LegacyCompositeValidator or = new LegacyCompositeValidator( + CombinationMode.OR, "No validators are valid"); LegacyEmailValidator email = new LegacyEmailValidator("Faulty email"); LegacyRegexpValidator regex = new LegacyRegexpValidator("@mail.com", false, "Partial match validator error"); diff --git a/server/src/test/java/com/vaadin/tests/data/validator/DateRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/DateRangeValidatorTest.java index 0a21a0311b..70d16b3816 100644 --- a/server/src/test/java/com/vaadin/tests/data/validator/DateRangeValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/data/validator/DateRangeValidatorTest.java @@ -30,14 +30,16 @@ public class DateRangeValidatorTest { startDate.set(2000, Calendar.JANUARY, 1, 12, 0, 0); endDate.set(2000, Calendar.FEBRUARY, 20, 12, 0, 0); - cleanValidator = new LegacyDateRangeValidator("Given date outside range", - null, null, Resolution.DAY); - minValidator = new LegacyDateRangeValidator("Given date before startDate", - startDate.getTime(), null, Resolution.DAY); - maxValidator = new LegacyDateRangeValidator("Given date after endDate", null, + cleanValidator = new LegacyDateRangeValidator( + "Given date outside range", null, null, Resolution.DAY); + minValidator = new LegacyDateRangeValidator( + "Given date before startDate", startDate.getTime(), null, + Resolution.DAY); + maxValidator = new LegacyDateRangeValidator("Given date after endDate", + null, endDate.getTime(), Resolution.DAY); + minMaxValidator = new LegacyDateRangeValidator( + "Given date outside range", startDate.getTime(), endDate.getTime(), Resolution.DAY); - minMaxValidator = new LegacyDateRangeValidator("Given date outside range", - startDate.getTime(), endDate.getTime(), Resolution.DAY); } @Test diff --git a/server/src/test/java/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java index 07d19434cf..ad95519c98 100644 --- a/server/src/test/java/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java @@ -45,8 +45,10 @@ public class FloatRangeValidatorTest { @Test public void testMinMaxValue() { assertTrue("Didn't accept valid value", minMaxValidator.isValid(10.5f)); - assertTrue("Didn't accept valid value", minMaxValidator.isValid(100.5f)); + assertTrue("Didn't accept valid value", + minMaxValidator.isValid(100.5f)); assertFalse("Accepted too small value", minMaxValidator.isValid(10.4f)); - assertFalse("Accepted too large value", minMaxValidator.isValid(100.6f)); + assertFalse("Accepted too large value", + minMaxValidator.isValid(100.6f)); } } diff --git a/server/src/test/java/com/vaadin/tests/data/validator/NullValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/NullValidatorTest.java index b73d5059b3..ba67bf0300 100644 --- a/server/src/test/java/com/vaadin/tests/data/validator/NullValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/data/validator/NullValidatorTest.java @@ -10,8 +10,10 @@ import com.vaadin.legacy.data.validator.LegacyNullValidator; public class NullValidatorTest { - LegacyNullValidator notNull = new LegacyNullValidator("Null not accepted", false); - LegacyNullValidator onlyNull = new LegacyNullValidator("Only null accepted", true); + LegacyNullValidator notNull = new LegacyNullValidator("Null not accepted", + false); + LegacyNullValidator onlyNull = new LegacyNullValidator("Only null accepted", + true); @Test public void testNullValue() { diff --git a/server/src/test/java/com/vaadin/tests/data/validator/RegexpValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/RegexpValidatorTest.java index aa23c8e3dc..aeb50448c7 100644 --- a/server/src/test/java/com/vaadin/tests/data/validator/RegexpValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/data/validator/RegexpValidatorTest.java @@ -9,10 +9,10 @@ import com.vaadin.legacy.data.validator.LegacyRegexpValidator; public class RegexpValidatorTest { - private LegacyRegexpValidator completeValidator = new LegacyRegexpValidator("pattern", - true, "Complete match validator error"); - private LegacyRegexpValidator partialValidator = new LegacyRegexpValidator("pattern", - false, "Partial match validator error"); + private LegacyRegexpValidator completeValidator = new LegacyRegexpValidator( + "pattern", true, "Complete match validator error"); + private LegacyRegexpValidator partialValidator = new LegacyRegexpValidator( + "pattern", false, "Partial match validator error"); @Test public void testRegexpValidatorWithNull() { diff --git a/server/src/test/java/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java index c502236dfd..a4cb5f7d3a 100644 --- a/server/src/test/java/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java @@ -32,7 +32,8 @@ public class ShortRangeValidatorTest { cleanValidator.isValid((short) -15)); assertTrue("Didn't accept valid value", minValidator.isValid((short) 15)); - assertFalse("Accepted too small value", minValidator.isValid((short) 9)); + assertFalse("Accepted too small value", + minValidator.isValid((short) 9)); } @Test diff --git a/server/src/test/java/com/vaadin/tests/data/validator/StringLengthValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/StringLengthValidatorTest.java index cb6730776c..8e5897bf3b 100644 --- a/server/src/test/java/com/vaadin/tests/data/validator/StringLengthValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/data/validator/StringLengthValidatorTest.java @@ -9,7 +9,8 @@ import com.vaadin.legacy.data.validator.LegacyStringLengthValidator; public class StringLengthValidatorTest { - private LegacyStringLengthValidator validator = new LegacyStringLengthValidator("Error"); + private LegacyStringLengthValidator validator = new LegacyStringLengthValidator( + "Error"); private LegacyStringLengthValidator validatorNoNull = new LegacyStringLengthValidator( "Error", 1, 5, false); private LegacyStringLengthValidator validatorMinValue = new LegacyStringLengthValidator( @@ -48,16 +49,16 @@ public class StringLengthValidatorTest { @Test public void testNoUpperBound() { - assertTrue( - "String not accepted even though no upper bound", - validatorMinValue - .isValid("This is a really long string to test that no upper bound exists")); + assertTrue("String not accepted even though no upper bound", + validatorMinValue.isValid( + "This is a really long string to test that no upper bound exists")); } @Test public void testNoLowerBound() { assertTrue("Didn't accept short string", validatorMaxValue.isValid("")); - assertTrue("Didn't accept short string", validatorMaxValue.isValid("1")); + assertTrue("Didn't accept short string", + validatorMaxValue.isValid("1")); } @Test diff --git a/server/src/test/java/com/vaadin/tests/design/AbstractComponentSetResponsiveTest.java b/server/src/test/java/com/vaadin/tests/design/AbstractComponentSetResponsiveTest.java index 175a03cd78..6eb0c74c4b 100644 --- a/server/src/test/java/com/vaadin/tests/design/AbstractComponentSetResponsiveTest.java +++ b/server/src/test/java/com/vaadin/tests/design/AbstractComponentSetResponsiveTest.java @@ -20,8 +20,8 @@ import org.junit.Test; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; -public class AbstractComponentSetResponsiveTest extends - DeclarativeTestBase<Label> { +public class AbstractComponentSetResponsiveTest + extends DeclarativeTestBase<Label> { @Test public void testResponsiveFlag() { diff --git a/server/src/test/java/com/vaadin/tests/design/ComponentFactoryTest.java b/server/src/test/java/com/vaadin/tests/design/ComponentFactoryTest.java index 7dc9a9e89d..f679e2802d 100644 --- a/server/src/test/java/com/vaadin/tests/design/ComponentFactoryTest.java +++ b/server/src/test/java/com/vaadin/tests/design/ComponentFactoryTest.java @@ -51,8 +51,8 @@ public class ComponentFactoryTest { if (componentFactory == null) { componentFactory = defaultFactory; } - return componentFactory.createComponent( - fullyQualifiedClassName, context); + return componentFactory.createComponent(fullyQualifiedClassName, + context); } }); } @@ -79,8 +79,7 @@ public class ComponentFactoryTest { Assert.assertEquals("There should be one message logged", 1, messages.size()); - Assert.assertEquals( - "Requested class " + Label.class.getCanonicalName(), + Assert.assertEquals("Requested class " + Label.class.getCanonicalName(), messages.get(0)); } @@ -104,8 +103,8 @@ public class ComponentFactoryTest { public Component createComponent(String fullyQualifiedClassName, DesignContext context) { // Will throw because class is not found - return defaultFactory.createComponent("foobar." - + fullyQualifiedClassName, context); + return defaultFactory.createComponent( + "foobar." + fullyQualifiedClassName, context); } }); diff --git a/server/src/test/java/com/vaadin/tests/design/ComponentMapperTest.java b/server/src/test/java/com/vaadin/tests/design/ComponentMapperTest.java index c6e8c15109..fb7c278fb2 100644 --- a/server/src/test/java/com/vaadin/tests/design/ComponentMapperTest.java +++ b/server/src/test/java/com/vaadin/tests/design/ComponentMapperTest.java @@ -60,8 +60,8 @@ public class ComponentMapperTest { }); } - private final class CustomComponentMapper extends - Design.DefaultComponentMapper { + private final class CustomComponentMapper + extends Design.DefaultComponentMapper { @Override public Component tagToComponent(String tag, ComponentFactory componentFactory, DesignContext context) { @@ -78,7 +78,8 @@ public class ComponentMapperTest { } @Override - public String componentToTag(Component component, DesignContext context) { + public String componentToTag(Component component, + DesignContext context) { if (component instanceof ComponentWithCustomTagName) { ComponentWithCustomTagName withCustomTagName = (ComponentWithCustomTagName) component; return withCustomTagName.tagName; @@ -96,11 +97,12 @@ public class ComponentMapperTest { public void testCustomComponentMapperRead() { currentMapper.set(new CustomComponentMapper()); - Component component = Design.read(new ByteArrayInputStream( - "<custom-foobar />".getBytes())); + Component component = Design + .read(new ByteArrayInputStream("<custom-foobar />".getBytes())); - Assert.assertTrue("<custom-foobar> should resolve " - + ComponentWithCustomTagName.class.getSimpleName(), + Assert.assertTrue( + "<custom-foobar> should resolve " + + ComponentWithCustomTagName.class.getSimpleName(), component instanceof ComponentWithCustomTagName); Assert.assertEquals("custom-foobar", ((ComponentWithCustomTagName) component).tagName); diff --git a/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBase.java b/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBase.java index 7e8b5c7767..a67845e9e0 100644 --- a/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBase.java +++ b/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBase.java @@ -28,8 +28,8 @@ import com.vaadin.shared.Connector; import com.vaadin.ui.Component; import com.vaadin.ui.Flash; -public abstract class DeclarativeTestBase<T extends Component> extends - DeclarativeTestBaseBase<T> { +public abstract class DeclarativeTestBase<T extends Component> + extends DeclarativeTestBaseBase<T> { private static boolean debug = false; @@ -96,19 +96,20 @@ public abstract class DeclarativeTestBase<T extends Component> extends } { - comparators.put(Flash.class, new IntrospectorEqualsAsserter<Flash>( - Flash.class) { - @Override - public void assertObjectEquals(Flash o1, Flash o2) { - super.assertObjectEquals(o1, o2); - assertEquals("parameterNames", o1.getParameterNames(), - o2.getParameterNames()); - for (String name : o1.getParameterNames()) { - assertEquals("Parameter " + name, o1.getParameter(name), - o2.getParameter(name)); - } - } - }); + comparators.put(Flash.class, + new IntrospectorEqualsAsserter<Flash>(Flash.class) { + @Override + public void assertObjectEquals(Flash o1, Flash o2) { + super.assertObjectEquals(o1, o2); + assertEquals("parameterNames", o1.getParameterNames(), + o2.getParameterNames()); + for (String name : o1.getParameterNames()) { + assertEquals("Parameter " + name, + o1.getParameter(name), + o2.getParameter(name)); + } + } + }); } @Override diff --git a/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBaseBase.java b/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBaseBase.java index 6153c95592..1c4817281f 100644 --- a/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBaseBase.java +++ b/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBaseBase.java @@ -42,8 +42,8 @@ import com.vaadin.ui.declarative.DesignContext; import com.vaadin.ui.declarative.ShouldWriteDataDelegate; public abstract class DeclarativeTestBaseBase<T extends Component> { - private static final class AlwaysWriteDelegate implements - ShouldWriteDataDelegate { + private static final class AlwaysWriteDelegate + implements ShouldWriteDataDelegate { private static final long serialVersionUID = -6345914431997793599L; @Override @@ -60,8 +60,8 @@ public abstract class DeclarativeTestBaseBase<T extends Component> { protected T read(String design) { try { - return (T) Design.read(new ByteArrayInputStream(design - .getBytes("UTF-8"))); + return (T) Design + .read(new ByteArrayInputStream(design.getBytes("UTF-8"))); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } @@ -141,11 +141,13 @@ public abstract class DeclarativeTestBaseBase<T extends Component> { return result; } - private void getComparators(Class<?> c, List<EqualsAsserter<Object>> result) { + private void getComparators(Class<?> c, + List<EqualsAsserter<Object>> result) { if (c == null || !isVaadin(c)) { return; } - EqualsAsserter<Object> comparator = (EqualsAsserter<Object>) getComparator(c); + EqualsAsserter<Object> comparator = (EqualsAsserter<Object>) getComparator( + c); if (c.getSuperclass() != Object.class) { getComparators(c.getSuperclass(), result); } diff --git a/server/src/test/java/com/vaadin/tests/design/DesignFormatterTest.java b/server/src/test/java/com/vaadin/tests/design/DesignFormatterTest.java index dea106af3d..8b72382c0d 100644 --- a/server/src/test/java/com/vaadin/tests/design/DesignFormatterTest.java +++ b/server/src/test/java/com/vaadin/tests/design/DesignFormatterTest.java @@ -209,20 +209,20 @@ public class DesignFormatterTest { // note the space here - it separates key combination from caption assertEquals("ctrl-alt-d d", formatted); - ShortcutAction result = formatter - .parse(formatted, ShortcutAction.class); + ShortcutAction result = formatter.parse(formatted, + ShortcutAction.class); assertTrue(equals(action, result)); } @Test public void testShortcutActionNoCaption() { - ShortcutAction action = new ShortcutAction(null, KeyCode.D, new int[] { - ModifierKey.ALT, ModifierKey.CTRL }); + ShortcutAction action = new ShortcutAction(null, KeyCode.D, + new int[] { ModifierKey.ALT, ModifierKey.CTRL }); String formatted = formatter.format(action); assertEquals("ctrl-alt-d", formatted); - ShortcutAction result = formatter - .parse(formatted, ShortcutAction.class); + ShortcutAction result = formatter.parse(formatted, + ShortcutAction.class); assertTrue(equals(action, result)); } @@ -267,8 +267,8 @@ public class DesignFormatterTest { assertEquals("parsed ExternalResource", scheme + url, ((ExternalResource) resource).getURL()); - String formatted = formatter.format(new ExternalResource(scheme - + url)); + String formatted = formatter + .format(new ExternalResource(scheme + url)); assertEquals("formatted ExternalResource", scheme + url, formatted); } @@ -284,7 +284,8 @@ public class DesignFormatterTest { String fileSystemPath = "c:/app/resources/icon.png"; assertEquals(httpUrl, formatter.format(new ExternalResource(httpUrl))); - assertEquals(httpsUrl, formatter.format(new ExternalResource(httpsUrl))); + assertEquals(httpsUrl, + formatter.format(new ExternalResource(httpsUrl))); assertEquals(ApplicationConstants.THEME_PROTOCOL_PREFIX + themePath, formatter.format(new ThemeResource(themePath))); @@ -306,12 +307,12 @@ public class DesignFormatterTest { @Test(expected = ConversionException.class) public void testResourceFormatException() { formatter.format(new Resource() { // must use unknown resource type - @Override - public String getMIMEType() { - // TODO Auto-generated method stub - return null; - } - }); + @Override + public String getMIMEType() { + // TODO Auto-generated method stub + return null; + } + }); } @Test @@ -328,10 +329,10 @@ public class DesignFormatterTest { formatter.parse(httpUrl, ExternalResource.class).getURL()); assertEquals(new ExternalResource(httpsUrl).getURL(), formatter.parse(httpsUrl, ExternalResource.class).getURL()); - assertEquals( - new ThemeResource(themePath), - formatter.parse(ApplicationConstants.THEME_PROTOCOL_PREFIX - + themePath, ThemeResource.class)); + assertEquals(new ThemeResource(themePath), + formatter.parse( + ApplicationConstants.THEME_PROTOCOL_PREFIX + themePath, + ThemeResource.class)); assertEquals(FontAwesome.AMBULANCE, formatter.parse(fontAwesomeUrlOld, FontAwesome.class)); assertEquals(FontAwesome.AMBULANCE, @@ -339,8 +340,7 @@ public class DesignFormatterTest { assertEquals(new GenericFontIcon("SomeOther", 0xF0F9), formatter.parse(someOtherFont, FontIcon.class)); - assertEquals( - new FileResource(new File(fileSystemPath)).getSourceFile(), + assertEquals(new FileResource(new File(fileSystemPath)).getSourceFile(), formatter.parse(fileSystemPath, FileResource.class) .getSourceFile()); @@ -356,7 +356,8 @@ public class DesignFormatterTest { * @return <b>true</b> when both actions are the same (caption, icon, and * key combination). */ - public static final boolean equals(ShortcutAction act, ShortcutAction other) { + public static final boolean equals(ShortcutAction act, + ShortcutAction other) { if (SharedUtil.equals(other.getCaption(), act.getCaption()) && SharedUtil.equals(other.getIcon(), act.getIcon()) && act.getKeyCode() == other.getKeyCode() diff --git a/server/src/test/java/com/vaadin/tests/design/DesignReadInConstructorTest.java b/server/src/test/java/com/vaadin/tests/design/DesignReadInConstructorTest.java index 539595762d..e1615ab694 100644 --- a/server/src/test/java/com/vaadin/tests/design/DesignReadInConstructorTest.java +++ b/server/src/test/java/com/vaadin/tests/design/DesignReadInConstructorTest.java @@ -68,8 +68,8 @@ public class DesignReadInConstructorTest { actual.attr(attributeKey)); } - Assert.assertEquals(expected.children().size(), actual.children() - .size()); + Assert.assertEquals(expected.children().size(), + actual.children().size()); for (int i = 0; i < expected.children().size(); i++) { assertJsoupTreeEquals(expected.child(i), actual.child(i)); } diff --git a/server/src/test/java/com/vaadin/tests/design/EmbeddedsTest.java b/server/src/test/java/com/vaadin/tests/design/EmbeddedsTest.java index 4c9e323948..17b6861d0a 100644 --- a/server/src/test/java/com/vaadin/tests/design/EmbeddedsTest.java +++ b/server/src/test/java/com/vaadin/tests/design/EmbeddedsTest.java @@ -85,8 +85,8 @@ public class EmbeddedsTest { ae.setStandby("foobar"); ByteArrayOutputStream bos = new ByteArrayOutputStream(); Design.write(ae, bos); - Flash result = (Flash) Design.read(new ByteArrayInputStream(bos - .toByteArray())); + Flash result = (Flash) Design + .read(new ByteArrayInputStream(bos.toByteArray())); assertTrue(equals((ExternalResource) ae.getSource(), (ExternalResource) result.getSource())); assertEquals(ae.getAlternateText(), result.getAlternateText()); diff --git a/server/src/test/java/com/vaadin/tests/design/InvalidTagNamesTest.java b/server/src/test/java/com/vaadin/tests/design/InvalidTagNamesTest.java index 1b5bfcca4e..d216c892c9 100644 --- a/server/src/test/java/com/vaadin/tests/design/InvalidTagNamesTest.java +++ b/server/src/test/java/com/vaadin/tests/design/InvalidTagNamesTest.java @@ -94,8 +94,8 @@ public class InvalidTagNamesTest { private Component readDesign(String string) { try { - return Design.read(new ByteArrayInputStream(string - .getBytes("UTF-8"))); + return Design + .read(new ByteArrayInputStream(string.getBytes("UTF-8"))); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } diff --git a/server/src/test/java/com/vaadin/tests/design/LocaleTest.java b/server/src/test/java/com/vaadin/tests/design/LocaleTest.java index 6cb288db23..fc9ae52559 100644 --- a/server/src/test/java/com/vaadin/tests/design/LocaleTest.java +++ b/server/src/test/java/com/vaadin/tests/design/LocaleTest.java @@ -92,7 +92,8 @@ public class LocaleTest { Element eb1 = ehLayout.child(0); assertTrue( "The element should not have a locale specification, found locale " - + eb1.attr("locale"), "".equals(eb1.attr("locale"))); + + eb1.attr("locale"), + "".equals(eb1.attr("locale"))); Element eb2 = ehLayout.child(1); assertEquals("Wrong locale information.", "en_US", eb2.attr("locale")); Element ehLayout2 = evLayout.child(1); @@ -103,7 +104,8 @@ public class LocaleTest { Element el1 = ehLayout2.child(0); assertTrue( "The element should not have a locale specification, found locale " - + el1.attr("locale"), "".equals(el1.attr("locale"))); + + el1.attr("locale"), + "".equals(el1.attr("locale"))); Element el2 = ehLayout2.child(1); assertEquals("Wrong locale information.", "en_CA", el2.attr("locale")); } @@ -174,8 +176,7 @@ public class LocaleTest { Button b2 = (Button) hLayout.getComponent(1); assertEquals("Wrong locale.", new Locale("en", "GB"), b2.getLocale()); Button b3 = (Button) hLayout.getComponent(2); - assertEquals( - "The component should have the same locale as its parent.", + assertEquals("The component should have the same locale as its parent.", hLayout.getLocale(), b3.getLocale()); } }
\ No newline at end of file diff --git a/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java b/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java index 3ed7aea0cb..f277793f17 100644 --- a/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java +++ b/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java @@ -20,8 +20,8 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.ui.Notification; -public class ExtendedDesignWithEmptyAnnotation extends - DesignWithEmptyAnnotation { +public class ExtendedDesignWithEmptyAnnotation + extends DesignWithEmptyAnnotation { private LegacyTextField customField = new LegacyTextField(); diff --git a/server/src/test/java/com/vaadin/tests/design/nested/WriteNestedTemplatesTest.java b/server/src/test/java/com/vaadin/tests/design/nested/WriteNestedTemplatesTest.java index 5c78802472..a50f4880d9 100644 --- a/server/src/test/java/com/vaadin/tests/design/nested/WriteNestedTemplatesTest.java +++ b/server/src/test/java/com/vaadin/tests/design/nested/WriteNestedTemplatesTest.java @@ -59,8 +59,8 @@ public class WriteNestedTemplatesTest { @Test public void testChildRendered() { - assertEquals("Root layout must have one child", 1, design.children() - .size()); + assertEquals("Root layout must have one child", 1, + design.children().size()); assertEquals("com_vaadin_tests_design_nested-my-extended-child-design", design.child(0).tagName()); } diff --git a/server/src/test/java/com/vaadin/tests/event/EventRouterTest.java b/server/src/test/java/com/vaadin/tests/event/EventRouterTest.java index aeb460c49e..4bd80386bf 100644 --- a/server/src/test/java/com/vaadin/tests/event/EventRouterTest.java +++ b/server/src/test/java/com/vaadin/tests/event/EventRouterTest.java @@ -65,8 +65,8 @@ public class EventRouterTest { @Test public void fireEvent_exceptionFromListenerAndNoHandler_exceptionPropagated() { listener.componentEvent(EasyMock.<Component.Event> anyObject()); - EasyMock.expectLastCall().andThrow( - new RuntimeException("listener failed")); + EasyMock.expectLastCall() + .andThrow(new RuntimeException("listener failed")); EasyMock.replay(component, listener); try { @@ -82,8 +82,8 @@ public class EventRouterTest { @Test public void fireEvent_exceptionFromListener_errorHandlerCalled() { listener.componentEvent(EasyMock.<Component.Event> anyObject()); - EasyMock.expectLastCall().andThrow( - new RuntimeException("listener failed")); + EasyMock.expectLastCall() + .andThrow(new RuntimeException("listener failed")); errorHandler.error(EasyMock.<ErrorEvent> anyObject()); EasyMock.replay(component, listener, errorHandler); @@ -98,8 +98,8 @@ public class EventRouterTest { COMPONENT_EVENT_METHOD); listener.componentEvent(EasyMock.<Component.Event> anyObject()); - EasyMock.expectLastCall().andThrow( - new RuntimeException("listener failed")); + EasyMock.expectLastCall() + .andThrow(new RuntimeException("listener failed")); errorHandler.error(EasyMock.<ErrorEvent> anyObject()); // second listener should be called despite an error in the first listener2.componentEvent(EasyMock.<Component.Event> anyObject()); diff --git a/server/src/test/java/com/vaadin/tests/event/ShortcutActionTest.java b/server/src/test/java/com/vaadin/tests/event/ShortcutActionTest.java index 9af23b86b1..6cd9328efc 100644 --- a/server/src/test/java/com/vaadin/tests/event/ShortcutActionTest.java +++ b/server/src/test/java/com/vaadin/tests/event/ShortcutActionTest.java @@ -92,7 +92,8 @@ public class ShortcutActionTest { * @return <b>true</b> when both actions are the same (caption, icon, and * key combination). */ - public static final boolean equals(ShortcutAction act, ShortcutAction other) { + public static final boolean equals(ShortcutAction act, + ShortcutAction other) { if (SharedUtil.equals(other.getCaption(), act.getCaption()) && SharedUtil.equals(other.getIcon(), act.getIcon()) && act.getKeyCode() == other.getKeyCode() diff --git a/server/src/test/java/com/vaadin/tests/server/AbstractBeanContainerListenersTest.java b/server/src/test/java/com/vaadin/tests/server/AbstractBeanContainerListenersTest.java index b9b4f8025d..98a2513515 100644 --- a/server/src/test/java/com/vaadin/tests/server/AbstractBeanContainerListenersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/AbstractBeanContainerListenersTest.java @@ -5,8 +5,8 @@ import com.vaadin.data.Container.PropertySetChangeListener; import com.vaadin.data.util.BeanItemContainer; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; -public class AbstractBeanContainerListenersTest extends - AbstractListenerMethodsTestBase { +public class AbstractBeanContainerListenersTest + extends AbstractListenerMethodsTestBase { public void testPropertySetChangeListenerAddGetRemove() throws Exception { testListenerAddGetRemove(BeanItemContainer.class, PropertySetChangeEvent.class, PropertySetChangeListener.class, diff --git a/server/src/test/java/com/vaadin/tests/server/AbstractContainerListenersTest.java b/server/src/test/java/com/vaadin/tests/server/AbstractContainerListenersTest.java index cb7b91226e..5e0d464fe8 100644 --- a/server/src/test/java/com/vaadin/tests/server/AbstractContainerListenersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/AbstractContainerListenersTest.java @@ -9,8 +9,8 @@ import com.vaadin.data.Container.PropertySetChangeListener; import com.vaadin.data.util.IndexedContainer; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; -public class AbstractContainerListenersTest extends - AbstractListenerMethodsTestBase { +public class AbstractContainerListenersTest + extends AbstractListenerMethodsTestBase { @Test public void testItemSetChangeListenerAddGetRemove() throws Exception { diff --git a/server/src/test/java/com/vaadin/tests/server/AbstractInMemoryContainerListenersTest.java b/server/src/test/java/com/vaadin/tests/server/AbstractInMemoryContainerListenersTest.java index 072998b8e1..d5a7131182 100644 --- a/server/src/test/java/com/vaadin/tests/server/AbstractInMemoryContainerListenersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/AbstractInMemoryContainerListenersTest.java @@ -5,8 +5,8 @@ import com.vaadin.data.Container.ItemSetChangeListener; import com.vaadin.data.util.IndexedContainer; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; -public class AbstractInMemoryContainerListenersTest extends - AbstractListenerMethodsTestBase { +public class AbstractInMemoryContainerListenersTest + extends AbstractListenerMethodsTestBase { public void testItemSetChangeListenerAddGetRemove() throws Exception { testListenerAddGetRemove(IndexedContainer.class, ItemSetChangeEvent.class, ItemSetChangeListener.class); diff --git a/server/src/test/java/com/vaadin/tests/server/AbstractPropertyListenersTest.java b/server/src/test/java/com/vaadin/tests/server/AbstractPropertyListenersTest.java index 71a84eea6e..232d26d1d6 100644 --- a/server/src/test/java/com/vaadin/tests/server/AbstractPropertyListenersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/AbstractPropertyListenersTest.java @@ -10,21 +10,21 @@ import com.vaadin.data.util.AbstractProperty; import com.vaadin.data.util.ObjectProperty; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; -public class AbstractPropertyListenersTest extends - AbstractListenerMethodsTestBase { +public class AbstractPropertyListenersTest + extends AbstractListenerMethodsTestBase { @Test public void testValueChangeListenerAddGetRemove() throws Exception { - testListenerAddGetRemove(AbstractProperty.class, - ValueChangeEvent.class, ValueChangeListener.class, - new ObjectProperty<String>("")); + testListenerAddGetRemove(AbstractProperty.class, ValueChangeEvent.class, + ValueChangeListener.class, new ObjectProperty<String>("")); } @Test - public void testReadOnlyStatusChangeListenerAddGetRemove() throws Exception { + public void testReadOnlyStatusChangeListenerAddGetRemove() + throws Exception { testListenerAddGetRemove(AbstractProperty.class, ReadOnlyStatusChangeEvent.class, - ReadOnlyStatusChangeListener.class, new ObjectProperty<String>( - "")); + ReadOnlyStatusChangeListener.class, + new ObjectProperty<String>("")); } } diff --git a/server/src/test/java/com/vaadin/tests/server/ClientMethodSerializationTest.java b/server/src/test/java/com/vaadin/tests/server/ClientMethodSerializationTest.java index 33f6e1f90a..43a78ecc29 100644 --- a/server/src/test/java/com/vaadin/tests/server/ClientMethodSerializationTest.java +++ b/server/src/test/java/com/vaadin/tests/server/ClientMethodSerializationTest.java @@ -49,9 +49,8 @@ public class ClientMethodSerializationTest { .findMethod(ClientMethodSerializationTest.class, "basicParamsMethodForTesting", String.class, Integer.class); - private static final Method NO_PARAMS_CALL_METHOD = ReflectTools - .findMethod(ClientMethodSerializationTest.class, - "noParamsMethodForTesting"); + private static final Method NO_PARAMS_CALL_METHOD = ReflectTools.findMethod( + ClientMethodSerializationTest.class, "noParamsMethodForTesting"); public void basicParamsMethodForTesting(String stringParam, Integer integerParam) { @@ -73,10 +72,11 @@ public class ClientMethodSerializationTest { originalArray.set(1, "callBackParameter2"); originalArray.set(2, "12345"); ClientMethodInvocation original = new ClientMethodInvocation(null, - "interfaceName", JAVASCRIPT_CALLBACK_METHOD, new Object[] { - "callBackMethodName", originalArray }); + "interfaceName", JAVASCRIPT_CALLBACK_METHOD, + new Object[] { "callBackMethodName", originalArray }); - ClientMethodInvocation copy = (ClientMethodInvocation) serializeAndDeserialize(original); + ClientMethodInvocation copy = (ClientMethodInvocation) serializeAndDeserialize( + original); JsonArray copyArray = (JsonArray) copy.getParameters()[1]; assertEquals(JsonUtil.stringify(originalArray), JsonUtil.stringify(copyArray)); @@ -88,9 +88,10 @@ public class ClientMethodSerializationTest { String stringParam = "a string 123"; Integer integerParam = 1234567890; ClientMethodInvocation original = new ClientMethodInvocation(null, - "interfaceName", BASIC_PARAMS_CALL_METHOD, new Serializable[] { - stringParam, integerParam }); - ClientMethodInvocation copy = (ClientMethodInvocation) serializeAndDeserialize(original); + "interfaceName", BASIC_PARAMS_CALL_METHOD, + new Serializable[] { stringParam, integerParam }); + ClientMethodInvocation copy = (ClientMethodInvocation) serializeAndDeserialize( + original); String copyString = (String) copy.getParameters()[0]; Integer copyInteger = (Integer) copy.getParameters()[1]; assertEquals(copyString, stringParam); @@ -101,7 +102,8 @@ public class ClientMethodSerializationTest { public void testClientMethodSerialization_NoParams_NoExceptions() { ClientMethodInvocation original = new ClientMethodInvocation(null, "interfaceName", NO_PARAMS_CALL_METHOD, null); - ClientMethodInvocation copy = (ClientMethodInvocation) serializeAndDeserialize(original); + ClientMethodInvocation copy = (ClientMethodInvocation) serializeAndDeserialize( + original); } private static Serializable serializeAndDeserialize(Serializable input) { @@ -125,15 +127,17 @@ public class ClientMethodSerializationTest { public void testSerializeTwice() { String name = "javascriptFunctionName"; String[] arguments = { "1", "2", "3" }; - JsonArray args = (JsonArray) JsonCodec.encode(arguments, null, - Object[].class, null).getEncodedValue(); + JsonArray args = (JsonArray) JsonCodec + .encode(arguments, null, Object[].class, null) + .getEncodedValue(); ClientConnector connector = null; ClientMethodInvocation original = new ClientMethodInvocation(connector, - "interfaceName", JAVASCRIPT_CALLBACK_METHOD, new Object[] { - name, args }); + "interfaceName", JAVASCRIPT_CALLBACK_METHOD, + new Object[] { name, args }); - ClientMethodInvocation copy = (ClientMethodInvocation) serializeAndDeserialize(original); + ClientMethodInvocation copy = (ClientMethodInvocation) serializeAndDeserialize( + original); assertEquals(copy.getMethodName(), original.getMethodName()); assertEquals(copy.getParameters().length, original.getParameters().length); diff --git a/server/src/test/java/com/vaadin/tests/server/CsrfTokenMissingTest.java b/server/src/test/java/com/vaadin/tests/server/CsrfTokenMissingTest.java index cd9beafa10..91ac429a4c 100644 --- a/server/src/test/java/com/vaadin/tests/server/CsrfTokenMissingTest.java +++ b/server/src/test/java/com/vaadin/tests/server/CsrfTokenMissingTest.java @@ -158,8 +158,8 @@ public class CsrfTokenMissingTest { * Gets whether the token from the request is the default one. */ private boolean isDefaultToken(RpcRequest rpcRequest) { - return ApplicationConstants.CSRF_TOKEN_DEFAULT_VALUE.equals(rpcRequest - .getCsrfToken()); + return ApplicationConstants.CSRF_TOKEN_DEFAULT_VALUE + .equals(rpcRequest.getCsrfToken()); } /* @@ -184,8 +184,8 @@ public class CsrfTokenMissingTest { rpcRequest.getCsrfToken()); } - private static Logger LOGGER = Logger.getLogger(CsrfTokenMissingTest.class - .getName()); + private static Logger LOGGER = Logger + .getLogger(CsrfTokenMissingTest.class.getName()); static { LOGGER.setLevel(Level.ALL); } diff --git a/server/src/test/java/com/vaadin/tests/server/FileTypeResolverTest.java b/server/src/test/java/com/vaadin/tests/server/FileTypeResolverTest.java index a8af915cdc..ce9b4cd2ea 100644 --- a/server/src/test/java/com/vaadin/tests/server/FileTypeResolverTest.java +++ b/server/src/test/java/com/vaadin/tests/server/FileTypeResolverTest.java @@ -21,35 +21,37 @@ public class FileTypeResolverTest { File plainHtml = new File("c:\\MyFlash.html"); // Flash - assertEquals( - FileTypeResolver.getMIMEType(plainFlash.getAbsolutePath()), + assertEquals(FileTypeResolver.getMIMEType(plainFlash.getAbsolutePath()), FLASH_MIME_TYPE); assertEquals( - FileTypeResolver.getMIMEType(plainFlash.getAbsolutePath() - + "?param1=value1"), FLASH_MIME_TYPE); - assertEquals( - FileTypeResolver.getMIMEType(plainFlash.getAbsolutePath() - + "?param1=value1¶m2=value2"), FLASH_MIME_TYPE); + FileTypeResolver.getMIMEType( + plainFlash.getAbsolutePath() + "?param1=value1"), + FLASH_MIME_TYPE); + assertEquals(FileTypeResolver.getMIMEType( + plainFlash.getAbsolutePath() + "?param1=value1¶m2=value2"), + FLASH_MIME_TYPE); // Plain text assertEquals(FileTypeResolver.getMIMEType(plainText.getAbsolutePath()), TEXT_MIME_TYPE); assertEquals( - FileTypeResolver.getMIMEType(plainText.getAbsolutePath() - + "?param1=value1"), TEXT_MIME_TYPE); - assertEquals( - FileTypeResolver.getMIMEType(plainText.getAbsolutePath() - + "?param1=value1¶m2=value2"), TEXT_MIME_TYPE); + FileTypeResolver.getMIMEType( + plainText.getAbsolutePath() + "?param1=value1"), + TEXT_MIME_TYPE); + assertEquals(FileTypeResolver.getMIMEType( + plainText.getAbsolutePath() + "?param1=value1¶m2=value2"), + TEXT_MIME_TYPE); // Plain text assertEquals(FileTypeResolver.getMIMEType(plainHtml.getAbsolutePath()), HTML_MIME_TYPE); assertEquals( - FileTypeResolver.getMIMEType(plainHtml.getAbsolutePath() - + "?param1=value1"), HTML_MIME_TYPE); - assertEquals( - FileTypeResolver.getMIMEType(plainHtml.getAbsolutePath() - + "?param1=value1¶m2=value2"), HTML_MIME_TYPE); + FileTypeResolver.getMIMEType( + plainHtml.getAbsolutePath() + "?param1=value1"), + HTML_MIME_TYPE); + assertEquals(FileTypeResolver.getMIMEType( + plainHtml.getAbsolutePath() + "?param1=value1¶m2=value2"), + HTML_MIME_TYPE); // Filename missing assertEquals(FileTypeResolver.DEFAULT_MIME_TYPE, diff --git a/server/src/test/java/com/vaadin/tests/server/IndexedContainerListenersTest.java b/server/src/test/java/com/vaadin/tests/server/IndexedContainerListenersTest.java index bc2c5e3558..d8a1290b68 100644 --- a/server/src/test/java/com/vaadin/tests/server/IndexedContainerListenersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/IndexedContainerListenersTest.java @@ -9,13 +9,13 @@ import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.data.util.IndexedContainer; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; -public class IndexedContainerListenersTest extends - AbstractListenerMethodsTestBase { +public class IndexedContainerListenersTest + extends AbstractListenerMethodsTestBase { @Test public void testValueChangeListenerAddGetRemove() throws Exception { - testListenerAddGetRemove(IndexedContainer.class, - ValueChangeEvent.class, ValueChangeListener.class); + testListenerAddGetRemove(IndexedContainer.class, ValueChangeEvent.class, + ValueChangeListener.class); } @Test diff --git a/server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java b/server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java index 14da1171c6..0288e99505 100644 --- a/server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java +++ b/server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java @@ -16,8 +16,8 @@ public class PropertyFormatterTest { @Override public String format(Object value) { - boolean isCorrectType = getExpectedClass().isAssignableFrom( - value.getClass()); + boolean isCorrectType = getExpectedClass() + .isAssignableFrom(value.getClass()); assertTrue(isCorrectType); return "FOO"; } @@ -44,8 +44,8 @@ public class PropertyFormatterTest { */ @Test @SuppressWarnings({ "rawtypes" }) - public void testCorrectTypeForFormat() throws InstantiationException, - IllegalAccessException { + public void testCorrectTypeForFormat() + throws InstantiationException, IllegalAccessException { Class[] testedTypes = new Class[] { Integer.class, Boolean.class, Double.class, String.class, Date.class }; Object[] testValues = new Object[] { new Integer(3), Boolean.FALSE, @@ -61,13 +61,13 @@ public class PropertyFormatterTest { Object value = formatter.getValue(); // test with property which value is null - formatter.setPropertyDataSource(new ObjectProperty(null, - expectedClass)); + formatter.setPropertyDataSource( + new ObjectProperty(null, expectedClass)); formatter.getValue(); // calls format // test with a value - formatter.setPropertyDataSource(new ObjectProperty(testValues[i++], - expectedClass)); + formatter.setPropertyDataSource( + new ObjectProperty(testValues[i++], expectedClass)); formatter.getValue(); // calls format } diff --git a/server/src/test/java/com/vaadin/tests/server/PropertysetItemListenersTest.java b/server/src/test/java/com/vaadin/tests/server/PropertysetItemListenersTest.java index 8a91ea1868..ee5f36323e 100644 --- a/server/src/test/java/com/vaadin/tests/server/PropertysetItemListenersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/PropertysetItemListenersTest.java @@ -5,8 +5,8 @@ import com.vaadin.data.Item.PropertySetChangeListener; import com.vaadin.data.util.PropertysetItem; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; -public class PropertysetItemListenersTest extends - AbstractListenerMethodsTestBase { +public class PropertysetItemListenersTest + extends AbstractListenerMethodsTestBase { public void testPropertySetChangeListenerAddGetRemove() throws Exception { testListenerAddGetRemove(PropertysetItem.class, PropertySetChangeEvent.class, PropertySetChangeListener.class); diff --git a/server/src/test/java/com/vaadin/tests/server/SimpleMultiPartInputStreamTest.java b/server/src/test/java/com/vaadin/tests/server/SimpleMultiPartInputStreamTest.java index 70a18d1fa6..020464ed06 100644 --- a/server/src/test/java/com/vaadin/tests/server/SimpleMultiPartInputStreamTest.java +++ b/server/src/test/java/com/vaadin/tests/server/SimpleMultiPartInputStreamTest.java @@ -31,9 +31,9 @@ public class SimpleMultiPartInputStreamTest { resultStream.write(outbyte); } } catch (IOException e) { - throw new IOException(e.getMessage() + "; expected " - + new String(expected) + " but got " - + resultStream.toString()); + throw new IOException( + e.getMessage() + "; expected " + new String(expected) + + " but got " + resultStream.toString()); } if (!Arrays.equals(expected, resultStream.toByteArray())) { throw new Exception("Mismatch: expected " + new String(expected) @@ -53,7 +53,8 @@ public class SimpleMultiPartInputStreamTest { @Test public void testSingleByteBoundaryInMiddle() throws Exception { - checkBoundaryDetection("xyz" + getFullBoundary("a") + "123", "a", "xyz"); + checkBoundaryDetection("xyz" + getFullBoundary("a") + "123", "a", + "xyz"); } @Test @@ -78,7 +79,8 @@ public class SimpleMultiPartInputStreamTest { checkBoundaryDetection(getFullBoundary("aa") + "xyz123", "aa", ""); checkBoundaryDetection("axyz" + getFullBoundary("aa") + "123", "aa", "axyz"); - checkBoundaryDetection("xyz123" + getFullBoundary("aa"), "aa", "xyz123"); + checkBoundaryDetection("xyz123" + getFullBoundary("aa"), "aa", + "xyz123"); } /** diff --git a/server/src/test/java/com/vaadin/tests/server/StreamVariableMappingTest.java b/server/src/test/java/com/vaadin/tests/server/StreamVariableMappingTest.java index f93d6095c1..c469b16a95 100644 --- a/server/src/test/java/com/vaadin/tests/server/StreamVariableMappingTest.java +++ b/server/src/test/java/com/vaadin/tests/server/StreamVariableMappingTest.java @@ -58,12 +58,12 @@ public class StreamVariableMappingTest { owner.getUI().getConnectorTracker().registerConnector(owner); String targetUrl = cm.getStreamVariableTargetUrl(owner, variableName, streamVariable); - assertTrue(targetUrl.startsWith("app://APP/UPLOAD/-1/" - + owner.getConnectorId() + "/myName/")); + assertTrue(targetUrl.startsWith( + "app://APP/UPLOAD/-1/" + owner.getConnectorId() + "/myName/")); ConnectorTracker tracker = owner.getUI().getConnectorTracker(); - StreamVariable streamVariable2 = tracker.getStreamVariable( - owner.getConnectorId(), variableName); + StreamVariable streamVariable2 = tracker + .getStreamVariable(owner.getConnectorId(), variableName); assertSame(streamVariable, streamVariable2); } diff --git a/server/src/test/java/com/vaadin/tests/server/clientconnector/AttachDetachListenersTest.java b/server/src/test/java/com/vaadin/tests/server/clientconnector/AttachDetachListenersTest.java index 28c5be29cb..e437708992 100644 --- a/server/src/test/java/com/vaadin/tests/server/clientconnector/AttachDetachListenersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/clientconnector/AttachDetachListenersTest.java @@ -148,8 +148,8 @@ public class AttachDetachListenersTest { control.verify(); } - public static class EventEquals<E extends ConnectorEvent> implements - IArgumentMatcher { + public static class EventEquals<E extends ConnectorEvent> + implements IArgumentMatcher { private E expected; diff --git a/server/src/test/java/com/vaadin/tests/server/component/DeclarativeMarginTestBase.java b/server/src/test/java/com/vaadin/tests/server/component/DeclarativeMarginTestBase.java index faaf8ebfc2..9668212a78 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/DeclarativeMarginTestBase.java +++ b/server/src/test/java/com/vaadin/tests/server/component/DeclarativeMarginTestBase.java @@ -35,7 +35,8 @@ public abstract class DeclarativeMarginTestBase<L extends Layout & MarginHandler MarginInfo m = new MarginInfo(top, right, bottom, left); - String design = getMarginTag(componentTag, top, right, bottom, left); + String design = getMarginTag(componentTag, top, right, bottom, + left); // The assertEquals machinery in DeclarativeTestBase uses bean // introspection and MarginInfo is not a proper bean. It ends up @@ -47,8 +48,8 @@ public abstract class DeclarativeMarginTestBase<L extends Layout & MarginHandler } } - private String getMarginTag(String componentTag, boolean top, - boolean right, boolean bottom, boolean left) { + private String getMarginTag(String componentTag, boolean top, boolean right, + boolean bottom, boolean left) { String s = "<" + componentTag + " "; if (left && right && top && bottom) { diff --git a/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.java b/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.java index 89d73e98c5..9699726d5a 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.java @@ -36,8 +36,10 @@ public class FieldDefaultValuesTest { Object clearedValue = field.getValue(); - Assert.assertEquals("Expected to get default value after clearing " - + field.getClass().getName(), originalValue, clearedValue); + Assert.assertEquals( + "Expected to get default value after clearing " + + field.getClass().getName(), + originalValue, clearedValue); } } @@ -52,19 +54,21 @@ public class FieldDefaultValuesTest { field.isEmpty()); } else { - Assert.assertTrue(field.getClass().getName() - + " should be empty after being cleared", + Assert.assertTrue( + field.getClass().getName() + + " should be empty after being cleared", field.isEmpty()); } } } @SuppressWarnings("rawtypes") - private static List<LegacyField<?>> createFields() throws InstantiationException, - IllegalAccessException { + private static List<LegacyField<?>> createFields() + throws InstantiationException, IllegalAccessException { List<LegacyField<?>> fieldInstances = new ArrayList<LegacyField<?>>(); - for (Class<? extends LegacyField> fieldType : VaadinClasses.getFields()) { + for (Class<? extends LegacyField> fieldType : VaadinClasses + .getFields()) { fieldInstances.add(fieldType.newInstance()); } return fieldInstances; diff --git a/server/src/test/java/com/vaadin/tests/server/component/ReadEmptyDesignTest.java b/server/src/test/java/com/vaadin/tests/server/component/ReadEmptyDesignTest.java index 146c633789..6a93f0482c 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/ReadEmptyDesignTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/ReadEmptyDesignTest.java @@ -57,7 +57,8 @@ public class ReadEmptyDesignTest { public void testReadContext() { DesignContext ctx = Design.read(is, null); assertNotNull("The design context should not be null.", ctx); - assertNull("The root component should be null.", ctx.getRootComponent()); + assertNull("The root component should be null.", + ctx.getRootComponent()); } @Test diff --git a/server/src/test/java/com/vaadin/tests/server/component/StateGetDoesNotMarkDirtyTest.java b/server/src/test/java/com/vaadin/tests/server/component/StateGetDoesNotMarkDirtyTest.java index 2ae845716d..07a7afbfe5 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/StateGetDoesNotMarkDirtyTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/StateGetDoesNotMarkDirtyTest.java @@ -48,8 +48,8 @@ public class StateGetDoesNotMarkDirtyTest { // we still wouldnt know what to put into continue; } - if (excludedMethods.contains(c.getName() - + method.getName())) { + if (excludedMethods + .contains(c.getName() + method.getName())) { // blacklisted method for specific classes continue; } diff --git a/server/src/test/java/com/vaadin/tests/server/component/WriteEmptyDesignTest.java b/server/src/test/java/com/vaadin/tests/server/component/WriteEmptyDesignTest.java index 85d25aec79..27b99326e1 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/WriteEmptyDesignTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/WriteEmptyDesignTest.java @@ -54,7 +54,7 @@ public class WriteEmptyDesignTest { private void checkHtml(String html) { Document doc = Jsoup.parse(html); Element body = doc.body(); - Assert.assertEquals("There should be no elements in the html body.", - "", body.html()); + Assert.assertEquals("There should be no elements in the html body.", "", + body.html()); } }
\ No newline at end of file diff --git a/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutDeclarativeTest.java index f00eb91c50..24f1f94ac6 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutDeclarativeTest.java @@ -27,8 +27,8 @@ import com.vaadin.ui.Button; * @since 7.4 * @author Vaadin Ltd */ -public class AbsoluteLayoutDeclarativeTest extends - DeclarativeTestBase<AbsoluteLayout> { +public class AbsoluteLayoutDeclarativeTest + extends DeclarativeTestBase<AbsoluteLayout> { @Test public void testAbsoluteLayoutFeatures() { diff --git a/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListenersTest.java index ece4b5f380..4e83ac157e 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListenersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListenersTest.java @@ -5,8 +5,8 @@ import com.vaadin.event.LayoutEvents.LayoutClickListener; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; import com.vaadin.ui.AbsoluteLayout; -public class AbsoluteLayoutListenersTest extends - AbstractListenerMethodsTestBase { +public class AbsoluteLayoutListenersTest + extends AbstractListenerMethodsTestBase { public void testLayoutClickListenerAddGetRemove() throws Exception { testListenerAddGetRemove(AbsoluteLayout.class, LayoutClickEvent.class, LayoutClickListener.class); diff --git a/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/ComponentPositionTest.java b/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/ComponentPositionTest.java index 20a85edea5..8683926c9c 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/ComponentPositionTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/ComponentPositionTest.java @@ -58,11 +58,11 @@ public class ComponentPositionTest { assertEquals(CSS_VALUE, layout.getPosition(b).getRightValue()); assertEquals(Sizeable.Unit.PIXELS, layout.getPosition(b).getTopUnits()); - assertEquals(Sizeable.Unit.PICAS, layout.getPosition(b) - .getBottomUnits()); + assertEquals(Sizeable.Unit.PICAS, + layout.getPosition(b).getBottomUnits()); assertEquals(Sizeable.Unit.EM, layout.getPosition(b).getLeftUnits()); - assertEquals(Sizeable.Unit.PERCENTAGE, layout.getPosition(b) - .getRightUnits()); + assertEquals(Sizeable.Unit.PERCENTAGE, + layout.getPosition(b).getRightUnits()); assertEquals(7, layout.getPosition(b).getZIndex()); @@ -152,7 +152,8 @@ public class ComponentPositionTest { assertEquals(Sizeable.Unit.CM, layout.getPosition(b).getTopUnits()); assertEquals(Sizeable.Unit.EX, layout.getPosition(b).getRightUnits()); - assertEquals(Sizeable.Unit.INCH, layout.getPosition(b).getBottomUnits()); + assertEquals(Sizeable.Unit.INCH, + layout.getPosition(b).getBottomUnits()); assertEquals(Sizeable.Unit.MM, layout.getPosition(b).getLeftUnits()); } @@ -180,7 +181,8 @@ public class ComponentPositionTest { assertEquals(Sizeable.Unit.CM, layout.getPosition(b).getTopUnits()); assertEquals(Sizeable.Unit.EX, layout.getPosition(b).getRightUnits()); - assertEquals(Sizeable.Unit.INCH, layout.getPosition(b).getBottomUnits()); + assertEquals(Sizeable.Unit.INCH, + layout.getPosition(b).getBottomUnits()); assertEquals(Sizeable.Unit.MM, layout.getPosition(b).getLeftUnits()); } diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentDeclarativeTest.java index 42eccd5052..e4a14c0a56 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentDeclarativeTest.java @@ -50,8 +50,8 @@ import com.vaadin.ui.declarative.DesignContext; * @since * @author Vaadin Ltd */ -public class AbstractComponentDeclarativeTest extends - DeclarativeTestBase<AbstractComponent> { +public class AbstractComponentDeclarativeTest + extends DeclarativeTestBase<AbstractComponent> { private AbstractComponent component; @@ -100,8 +100,8 @@ public class AbstractComponentDeclarativeTest extends boolean[] immediate = { true, false, true, true }; for (int i = 0; i < design.length; i++) { component = (AbstractComponent) Design - .read(new ByteArrayInputStream(design[i].getBytes(Charset - .forName("UTF-8")))); + .read(new ByteArrayInputStream( + design[i].getBytes(Charset.forName("UTF-8")))); assertEquals(immediate[i], component.isImmediate()); assertEquals(explicitImmediate[i], getExplicitImmediate(component)); } @@ -110,8 +110,8 @@ public class AbstractComponentDeclarativeTest extends @Test public void testExternalIcon() { String design = "<vaadin-label icon=\"http://example.com/example.gif\"/>"; - component - .setIcon(new ExternalResource("http://example.com/example.gif")); + component.setIcon( + new ExternalResource("http://example.com/example.gif")); testRead(design, component); testWrite(design, component); } @@ -220,8 +220,8 @@ public class AbstractComponentDeclarativeTest extends Responsive.makeResponsive(component); Element design = createDesign(true); component.readDesign(design, new DesignContext()); - assertEquals("Component should have only one extension", 1, component - .getExtensions().size()); + assertEquals("Component should have only one extension", 1, + component.getExtensions().size()); } @Test diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractcomponentcontainer/AbstractComponentContainerListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractcomponentcontainer/AbstractComponentContainerListenersTest.java index 76fe3c1681..d78ae26580 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractcomponentcontainer/AbstractComponentContainerListenersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractcomponentcontainer/AbstractComponentContainerListenersTest.java @@ -10,8 +10,8 @@ import com.vaadin.ui.HasComponents.ComponentDetachListener; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.VerticalLayout; -public class AbstractComponentContainerListenersTest extends - AbstractListenerMethodsTestBase { +public class AbstractComponentContainerListenersTest + extends AbstractListenerMethodsTestBase { @Test public void testComponentDetachListenerAddGetRemove() throws Exception { diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldReadOnlyTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldReadOnlyTest.java index c6023440a0..7385caaf30 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldReadOnlyTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldReadOnlyTest.java @@ -18,14 +18,14 @@ import com.vaadin.ui.Label; public class AbstractFieldReadOnlyTest { Person paulaBean = new Person("Paula", "Brilliant", "paula@brilliant.com", - 34, Sex.FEMALE, new Address("Paula street 1", 12345, "P-town", - Country.FINLAND)); + 34, Sex.FEMALE, + new Address("Paula street 1", 12345, "P-town", Country.FINLAND)); @Test public void testReadOnlyProperty() { LegacyTextField tf = new LegacyTextField(); - tf.setPropertyDataSource(new MethodProperty<String>(paulaBean, - "firstName")); + tf.setPropertyDataSource( + new MethodProperty<String>(paulaBean, "firstName")); assertFalse(tf.isReadOnly()); tf.getPropertyDataSource().setReadOnly(true); assertTrue(tf.isReadOnly()); @@ -41,8 +41,8 @@ public class AbstractFieldReadOnlyTest { valueStore.setValue("event received!"); } }); - tf.setPropertyDataSource(new MethodProperty<String>(paulaBean, - "firstName")); + tf.setPropertyDataSource( + new MethodProperty<String>(paulaBean, "firstName")); assertTrue(valueStore.getValue().isEmpty()); tf.getPropertyDataSource().setReadOnly(true); assertFalse(valueStore.getValue().isEmpty()); diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactoryTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactoryTest.java index 784f03ab0a..aa9364c4b3 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactoryTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactoryTest.java @@ -73,8 +73,8 @@ public class DefaultConverterFactoryTest { } Person paulaBean = new Person("Paula", "Brilliant", "paula@brilliant.com", - 34, Sex.FEMALE, new Address("Paula street 1", 12345, "P-town", - Country.FINLAND)); + 34, Sex.FEMALE, + new Address("Paula street 1", 12345, "P-town", Country.FINLAND)); { paulaBean.setSalary(49000); BigDecimal rent = new BigDecimal(57223); @@ -89,8 +89,8 @@ public class DefaultConverterFactoryTest { LegacyTextField tf = new LegacyTextField(); tf.setLocale(new Locale("en", "US")); - tf.setPropertyDataSource(new MethodProperty<Integer>(new FloatBean(12f, - 23f), "f2")); + tf.setPropertyDataSource( + new MethodProperty<Integer>(new FloatBean(12f, 23f), "f2")); assertEquals("23", tf.getValue()); tf.setValue("24"); assertEquals("24", tf.getValue()); @@ -105,8 +105,8 @@ public class DefaultConverterFactoryTest { LegacyTextField tf = new LegacyTextField(); tf.setLocale(new Locale("en", "US")); - tf.setPropertyDataSource(new MethodProperty<Integer>(new LongBean(12, - 1982739187238L), "l2")); + tf.setPropertyDataSource(new MethodProperty<Integer>( + new LongBean(12, 1982739187238L), "l2")); assertEquals("1,982,739,187,238", tf.getValue()); tf.setValue("1982739187239"); assertEquals("1,982,739,187,239", tf.getValue()); @@ -120,15 +120,15 @@ public class DefaultConverterFactoryTest { VaadinSession.setCurrent(app); LegacyTextField tf = new LegacyTextField(); tf.setLocale(new Locale("en", "US")); - tf.setPropertyDataSource(new MethodProperty<Integer>(paulaBean, - "salary")); + tf.setPropertyDataSource( + new MethodProperty<Integer>(paulaBean, "salary")); assertEquals("49,000", tf.getValue()); tf.setLocale(new Locale("fi", "FI")); // FIXME: The following line should not be necessary and should be // removed - tf.setPropertyDataSource(new MethodProperty<Integer>(paulaBean, - "salary")); + tf.setPropertyDataSource( + new MethodProperty<Integer>(paulaBean, "salary")); String value = tf.getValue(); // Java uses a non-breaking space (ascii 160) instead of space when // formatting diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/LegacyAbstractFieldListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/LegacyAbstractFieldListenersTest.java index e341a4cf02..5843bd901f 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/LegacyAbstractFieldListenersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/LegacyAbstractFieldListenersTest.java @@ -9,12 +9,13 @@ import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; import com.vaadin.ui.Table; -public class LegacyAbstractFieldListenersTest extends AbstractListenerMethodsTestBase { +public class LegacyAbstractFieldListenersTest + extends AbstractListenerMethodsTestBase { @Test - public void testReadOnlyStatusChangeListenerAddGetRemove() throws Exception { - testListenerAddGetRemove(Table.class, - ReadOnlyStatusChangeEvent.class, + public void testReadOnlyStatusChangeListenerAddGetRemove() + throws Exception { + testListenerAddGetRemove(Table.class, ReadOnlyStatusChangeEvent.class, ReadOnlyStatusChangeListener.class); } diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java index 225f0daf69..fe6c4a9b9a 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java @@ -71,8 +71,8 @@ public class RemoveListenersOnDetachTest { } @Override - public void setValue(String newValue) throws ReadOnlyException, - ConversionException { + public void setValue(String newValue) + throws ReadOnlyException, ConversionException { fireValueChange(); } diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java index 87f810d562..d60d086bbe 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java @@ -34,11 +34,11 @@ import com.vaadin.ui.VerticalLayout; * @since * @author Vaadin Ltd */ -public class AbstractOrderedLayoutDeclarativeTest extends - DeclarativeMarginTestBase<AbstractOrderedLayout> { +public class AbstractOrderedLayoutDeclarativeTest + extends DeclarativeMarginTestBase<AbstractOrderedLayout> { - private List<String> defaultAlignments = Arrays.asList(new String[] { - ":top", ":left" }); + private List<String> defaultAlignments = Arrays + .asList(new String[] { ":top", ":left" }); @Test public void testMargins() { @@ -76,8 +76,8 @@ public class AbstractOrderedLayoutDeclarativeTest extends private String getDesign(float expandRatio, String... alignments) { String result = "<vaadin-vertical-layout caption=test-layout>"; result += "<vaadin-label caption=test-label "; - String ratioString = expandRatio == 1.0f ? null : String - .valueOf(expandRatio); + String ratioString = expandRatio == 1.0f ? null + : String.valueOf(expandRatio); if (expandRatio != 0) { if (ratioString == null) { result += ":expand"; diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutListenersTest.java index e7393e5f7d..afd79a00e5 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutListenersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutListenersTest.java @@ -5,8 +5,8 @@ import com.vaadin.event.LayoutEvents.LayoutClickListener; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; import com.vaadin.ui.VerticalLayout; -public class AbstractOrderedLayoutListenersTest extends - AbstractListenerMethodsTestBase { +public class AbstractOrderedLayoutListenersTest + extends AbstractListenerMethodsTestBase { public void testLayoutClickListenerAddGetRemove() throws Exception { testListenerAddGetRemove(VerticalLayout.class, LayoutClickEvent.class, LayoutClickListener.class); diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/LayoutSettingsOnReplaceTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/LayoutSettingsOnReplaceTest.java index 9d1972c232..9bb35605ed 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/LayoutSettingsOnReplaceTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/LayoutSettingsOnReplaceTest.java @@ -52,9 +52,10 @@ public class LayoutSettingsOnReplaceTest { }; layout.replaceComponent(first, replace); - Assert.assertEquals("Expand ratio for replaced component is not " - + "the same as for previous one", ratio, - layout.getExpandRatio(replace), 0.0001); + Assert.assertEquals( + "Expand ratio for replaced component is not " + + "the same as for previous one", + ratio, layout.getExpandRatio(replace), 0.0001); } @Test @@ -78,8 +79,9 @@ public class LayoutSettingsOnReplaceTest { }; layout.replaceComponent(first, replace); - Assert.assertEquals("Alignment for replaced component is not " - + "the same as for previous one", alignment, - layout.getComponentAlignment(replace)); + Assert.assertEquals( + "Alignment for replaced component is not " + + "the same as for previous one", + alignment, layout.getComponentAlignment(replace)); } } diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java index 6800320753..a69baf83db 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java @@ -39,8 +39,8 @@ import com.vaadin.ui.declarative.DesignException; * * @author Vaadin Ltd */ -public class AbstractSelectDeclarativeTest extends - DeclarativeTestBase<AbstractSelect> { +public class AbstractSelectDeclarativeTest + extends DeclarativeTestBase<AbstractSelect> { public String getDesignSingleSelectNewItemsAllowed() { return "<vaadin-combo-box new-items-allowed item-caption-mode='icon_only'" @@ -100,7 +100,8 @@ public class AbstractSelectDeclarativeTest extends @Test(expected = DesignException.class) public void testReadMultipleValuesForSingleSelect() { testRead("<vaadin-list-select>" + "<option selected>1</option>" - + "<option selected>2</option>" + "</vaadin-list-select>", null); + + "<option selected>2</option>" + "</vaadin-list-select>", + null); } @Test @@ -148,8 +149,8 @@ public class AbstractSelectDeclarativeTest extends @Test public void testWriteInlineData() { - testWrite(getDesignForInlineData(), - getExpectedComponentForInlineData(), true); + testWrite(getDesignForInlineData(), getExpectedComponentForInlineData(), + true); } private String getDesignForInlineData() { @@ -162,8 +163,8 @@ public class AbstractSelectDeclarativeTest extends private AbstractSelect getExpectedComponentForInlineData() { AbstractSelect as = new ListSelect(); as.addItem("Value 1"); - as.setItemIcon("Value 1", new ExternalResource( - "http://some.url/icon.png")); + as.setItemIcon("Value 1", + new ExternalResource("http://some.url/icon.png")); as.addItem("Value 2"); as.setValue("Value 2"); return as; @@ -198,7 +199,8 @@ public class AbstractSelectDeclarativeTest extends Element design = createDesignWithAttributesMultiSelect(); ListSelect ls = new ListSelect(); ls.readDesign(design, new DesignContext()); - Assert.assertTrue("Multi select should be allowed.", ls.isMultiSelect()); + Assert.assertTrue("Multi select should be allowed.", + ls.isMultiSelect()); assertEquals("Wrong caption mode.", AbstractSelect.ItemCaptionMode.EXPLICIT, ls.getItemCaptionMode()); @@ -239,8 +241,7 @@ public class AbstractSelectDeclarativeTest extends e.attr("item-caption-mode")); assertEquals("Wrong item icon property id.", "icon", e.attr("item-icon-property-id")); - Assert.assertTrue( - "Null selection should be allowed.", + Assert.assertTrue("Null selection should be allowed.", "".equals(e.attr("null-selection-allowed")) || "true".equals(e.attr("null-selection-allowed"))); assertEquals("Wrong null selection item id.", "No item selected", @@ -254,8 +255,7 @@ public class AbstractSelectDeclarativeTest extends ls.writeDesign(e, new DesignContext()); assertEquals("Null selection should not be allowed.", "false", e.attr("null-selection-allowed")); - Assert.assertTrue( - "Multi select should be allowed.", + Assert.assertTrue("Multi select should be allowed.", "".equals(e.attr("multi-select")) || "true".equals(e.attr("multi-select"))); } @@ -274,11 +274,12 @@ public class AbstractSelectDeclarativeTest extends Element root = new Element(Tag.valueOf("vaadin-combo-box"), ""); DesignContext dc = new DesignContext(); - dc.setShouldWriteDataDelegate(DeclarativeTestBaseBase.ALWAYS_WRITE_DATA); + dc.setShouldWriteDataDelegate( + DeclarativeTestBaseBase.ALWAYS_WRITE_DATA); underTest.writeDesign(root, dc); - Assert.assertEquals("> One", root.getElementsByTag("option").first() - .html()); + Assert.assertEquals("> One", + root.getElementsByTag("option").first().html()); } public ComboBox createSingleSelectWithOnlyAttributes() { diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectListenersTest.java index cedc582b57..7fc584e3d5 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectListenersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectListenersTest.java @@ -9,8 +9,8 @@ import com.vaadin.data.Container.PropertySetChangeListener; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; import com.vaadin.ui.ComboBox; -public class AbstractSelectListenersTest extends - AbstractListenerMethodsTestBase { +public class AbstractSelectListenersTest + extends AbstractListenerMethodsTestBase { @Test public void testItemSetChangeListenerAddGetRemove() throws Exception { diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectStateTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectStateTest.java index 52b215f4c8..afdcebb5f2 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectStateTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectStateTest.java @@ -31,8 +31,8 @@ public class AbstractSelectStateTest { public void getState_selectHasCustomState() { TestSelect select = new TestSelect(); AbstractSelectState state = select.getState(); - Assert.assertEquals("Unexpected state class", - AbstractSelectState.class, state.getClass()); + Assert.assertEquals("Unexpected state class", AbstractSelectState.class, + state.getClass()); } @Test diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java index 1b8b2f3bef..e4735d3595 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java @@ -22,8 +22,8 @@ import com.vaadin.server.ThemeResource; import com.vaadin.tests.design.DeclarativeTestBase; import com.vaadin.ui.OptionGroup; -public class OptionGroupDeclarativeTest extends - DeclarativeTestBase<OptionGroup> { +public class OptionGroupDeclarativeTest + extends DeclarativeTestBase<OptionGroup> { private OptionGroup og; diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/RemoveFromParentLockingTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/RemoveFromParentLockingTest.java index c8db6ac292..3b5869ace3 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/RemoveFromParentLockingTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/RemoveFromParentLockingTest.java @@ -32,8 +32,7 @@ public class RemoveFromParentLockingTest { @Before @After - public void cleanCurrentSession() - { + public void cleanCurrentSession() { VaadinSession.setCurrent(null); } diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java index 02094cb611..ef99e3f7af 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java @@ -32,8 +32,8 @@ import com.vaadin.ui.VerticalSplitPanel; * @since * @author Vaadin Ltd */ -public class AbstractSplitPanelDeclarativeTest extends - DeclarativeTestBase<AbstractSplitPanel> { +public class AbstractSplitPanelDeclarativeTest + extends DeclarativeTestBase<AbstractSplitPanel> { @Test public void testWithBothChildren() { diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelListenersTest.java index 5dd2f406bc..d6c12ca2d8 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelListenersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelListenersTest.java @@ -5,8 +5,8 @@ import com.vaadin.ui.AbstractSplitPanel.SplitterClickEvent; import com.vaadin.ui.AbstractSplitPanel.SplitterClickListener; import com.vaadin.ui.HorizontalSplitPanel; -public class AbstractSplitPanelListenersTest extends - AbstractListenerMethodsTestBase { +public class AbstractSplitPanelListenersTest + extends AbstractListenerMethodsTestBase { public void testSplitterClickListenerAddGetRemove() throws Exception { testListenerAddGetRemove(HorizontalSplitPanel.class, SplitterClickEvent.class, SplitterClickListener.class); diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java index a43323a93a..c8f353b97e 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java @@ -11,8 +11,8 @@ import com.vaadin.event.FieldEvents.TextChangeListener; import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; -public class AbstractTextFieldListenersTest extends - AbstractListenerMethodsTestBase { +public class AbstractTextFieldListenersTest + extends AbstractListenerMethodsTestBase { @Test public void testTextChangeListenerAddGetRemove() throws Exception { diff --git a/server/src/test/java/com/vaadin/tests/server/component/audio/AudioDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/audio/AudioDeclarativeTest.java index f9bfd2d316..83848a5197 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/audio/AudioDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/audio/AudioDeclarativeTest.java @@ -55,8 +55,8 @@ public class AudioDeclarativeTest extends DeclarativeTestBase<Audio> { audio.setMuted(true); audio.setShowControls(false); audio.setSources(new ExternalResource("http://foo.pl"), - new ExternalResource("https://bar.pl"), new FileResource( - new File("ohai"))); + new ExternalResource("https://bar.pl"), + new FileResource(new File("ohai"))); testRead(design, audio); testWrite(design, audio); } diff --git a/server/src/test/java/com/vaadin/tests/server/component/audio/VideoDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/audio/VideoDeclarativeTest.java index dafff32be2..43fc26d074 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/audio/VideoDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/audio/VideoDeclarativeTest.java @@ -49,8 +49,8 @@ public class VideoDeclarativeTest extends DeclarativeTestBase<Video> { video.setMuted(true); video.setShowControls(false); video.setSources(new ExternalResource("http://foo.pl"), - new ExternalResource("https://bar.pl"), new FileResource( - new File("ohai"))); + new ExternalResource("https://bar.pl"), + new FileResource(new File("ohai"))); video.setPoster(new ExternalResource("http://foo.pl/poster")); testRead(design, video); testWrite(design, video); diff --git a/server/src/test/java/com/vaadin/tests/server/component/browserframe/BrowserFrameDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/browserframe/BrowserFrameDeclarativeTest.java index b62499a28e..2094167785 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/browserframe/BrowserFrameDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/browserframe/BrowserFrameDeclarativeTest.java @@ -27,8 +27,8 @@ import com.vaadin.ui.BrowserFrame; * @since 7.4 * @author Vaadin Ltd */ -public class BrowserFrameDeclarativeTest extends - DeclarativeTestBase<BrowserFrame> { +public class BrowserFrameDeclarativeTest + extends DeclarativeTestBase<BrowserFrame> { protected String getDesign() { return "<vaadin-browser-frame source='http://foo.bar/some.html' />"; diff --git a/server/src/test/java/com/vaadin/tests/server/component/button/ButtonDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/button/ButtonDeclarativeTest.java index 439a0d5be0..a5827e009a 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/button/ButtonDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/button/ButtonDeclarativeTest.java @@ -86,15 +86,16 @@ public class ButtonDeclarativeTest extends DeclarativeTestBase<Button> { designPlainText = designPlainText.replace("vaadin-button", "vaadin-native-button"); Button nativeButton = read(designPlainText); - Assert.assertEquals(expectedCaptionPlainText, nativeButton.getCaption()); + Assert.assertEquals(expectedCaptionPlainText, + nativeButton.getCaption()); String designHtml = "<vaadin-button>> One</vaadin-button>"; String expectedCaptionHtml = "> One"; read = read(designHtml); Assert.assertEquals(expectedCaptionHtml, read.getCaption()); - designHtml = designHtml - .replace("vaadin-button", "vaadin-native-button"); + designHtml = designHtml.replace("vaadin-button", + "vaadin-native-button"); nativeButton = read(designHtml); Assert.assertEquals(expectedCaptionHtml, nativeButton.getCaption()); diff --git a/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.java b/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.java index 1592fb6c38..dd9dc8f847 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.java @@ -131,8 +131,8 @@ public class CalendarBasicsTest { // Setting the locale should set the internal calendars locale assertEquals(Locale.CANADA_FRENCH, calendar.getLocale()); java.util.Calendar c = new GregorianCalendar(Locale.CANADA_FRENCH); - assertEquals(c.getTimeZone().getRawOffset(), calendar - .getInternalCalendar().getTimeZone().getRawOffset()); + assertEquals(c.getTimeZone().getRawOffset(), + calendar.getInternalCalendar().getTimeZone().getRawOffset()); } @Test @@ -223,8 +223,8 @@ public class CalendarBasicsTest { calendar.setLocale(Locale.GERMAN); // simulating consequences of markAsDirty calendar.beforeClientResponse(true); - assertEquals(java.util.Calendar.MONDAY, calendar.getInternalCalendar() - .getFirstDayOfWeek()); + assertEquals(java.util.Calendar.MONDAY, + calendar.getInternalCalendar().getFirstDayOfWeek()); } @Test @@ -235,8 +235,8 @@ public class CalendarBasicsTest { // simulating consequences of markAsDirty calendar.beforeClientResponse(true); - assertEquals(java.util.Calendar.SUNDAY, calendar.getInternalCalendar() - .getFirstDayOfWeek()); + assertEquals(java.util.Calendar.SUNDAY, + calendar.getInternalCalendar().getFirstDayOfWeek()); } @Test @@ -247,8 +247,8 @@ public class CalendarBasicsTest { calendar.setLocale(Locale.GERMAN); // simulating consequences of markAsDirty calendar.beforeClientResponse(true); - assertEquals(java.util.Calendar.SUNDAY, calendar.getInternalCalendar() - .getFirstDayOfWeek()); + assertEquals(java.util.Calendar.SUNDAY, + calendar.getInternalCalendar().getFirstDayOfWeek()); } @Test @@ -259,8 +259,8 @@ public class CalendarBasicsTest { calendar.setFirstDayOfWeek(null); // simulating consequences of markAsDirty calendar.beforeClientResponse(true); - assertEquals(java.util.Calendar.MONDAY, calendar.getInternalCalendar() - .getFirstDayOfWeek()); + assertEquals(java.util.Calendar.MONDAY, + calendar.getInternalCalendar().getFirstDayOfWeek()); } @Test(expected = IllegalArgumentException.class) diff --git a/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarDeclarativeTest.java index f0ee8f7298..f8ac24cce6 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarDeclarativeTest.java @@ -30,7 +30,8 @@ public class CalendarDeclarativeTest extends DeclarativeTestBase<Calendar> { @Test public void testEmpty() { - verifyDeclarativeDesign("<vaadin-calendar></vaadin-calendar>", new Calendar()); + verifyDeclarativeDesign("<vaadin-calendar></vaadin-calendar>", + new Calendar()); } @Test diff --git a/server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.java b/server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.java index 4bcd5c7192..e4550b317b 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.java @@ -64,8 +64,8 @@ public class ContainerDataSourceTest { Date end = cal.getTime(); // Test the all events are returned - List<CalendarEvent> events = calendar.getEventProvider().getEvents( - start, end); + List<CalendarEvent> events = calendar.getEventProvider() + .getEvents(start, end); assertEquals(container.size(), events.size()); // Test that a certain range is returned @@ -102,8 +102,8 @@ public class ContainerDataSourceTest { Date end = cal.getTime(); // Test the all events are returned - List<CalendarEvent> events = calendar.getEventProvider().getEvents( - start, end); + List<CalendarEvent> events = calendar.getEventProvider() + .getEvents(start, end); assertEquals(container.size(), events.size()); // Test that a certain range is returned @@ -137,8 +137,8 @@ public class ContainerDataSourceTest { Date end = cal.getTime(); // Test the all events are returned - List<CalendarEvent> events = calendar.getEventProvider().getEvents( - start, end); + List<CalendarEvent> events = calendar.getEventProvider() + .getEvents(start, end); assertEquals(container.size(), events.size()); // Check that event values are present @@ -171,8 +171,8 @@ public class ContainerDataSourceTest { calendar.setContainerDataSource(container); // Test null start time - List<CalendarEvent> events = calendar.getEventProvider().getEvents( - null, end); + List<CalendarEvent> events = calendar.getEventProvider().getEvents(null, + end); assertEquals(container.size(), events.size()); // Test null end time @@ -202,8 +202,8 @@ public class ContainerDataSourceTest { "testDescription", "testStartDate", "testEndDate", null); // Test null start time - List<CalendarEvent> events = calendar.getEventProvider().getEvents( - null, end); + List<CalendarEvent> events = calendar.getEventProvider().getEvents(null, + end); assertEquals(container.size(), events.size()); // Test null end time @@ -366,8 +366,8 @@ public class ContainerDataSourceTest { CalendarEvent.class); java.util.Calendar cal = java.util.Calendar.getInstance(); for (int i = 1; i <= 10; i++) { - eventContainer.addBean(new BasicEvent("Test " + i, "Description " - + i, cal.getTime())); + eventContainer.addBean(new BasicEvent("Test " + i, + "Description " + i, cal.getTime())); cal.add(java.util.Calendar.DAY_OF_MONTH, 2); } return eventContainer; diff --git a/server/src/test/java/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java index 717ba1f45a..6582d2ac19 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java @@ -24,8 +24,8 @@ import com.vaadin.ui.AbstractColorPicker.PopupStyle; import com.vaadin.ui.ColorPicker; import com.vaadin.ui.ColorPickerArea; -public class AbstractColorPickerDeclarativeTest extends - DeclarativeTestBase<AbstractColorPicker> { +public class AbstractColorPickerDeclarativeTest + extends DeclarativeTestBase<AbstractColorPicker> { @Test public void testAllAbstractColorPickerFeatures() { diff --git a/server/src/test/java/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java b/server/src/test/java/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java index 441f743214..4da1b1380a 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java @@ -108,7 +108,8 @@ public class AddComponentsTest { assertSame(extra, layout.getComponent(4)); layout.removeAllComponents(); - layout.addComponents(children[3], children[2], children[1], children[0]); + layout.addComponents(children[3], children[2], children[1], + children[0]); assertOrder(layout, new int[] { 3, 2, 1, 0 }); } diff --git a/server/src/test/java/com/vaadin/tests/server/component/customlayout/CustomLayoutDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/customlayout/CustomLayoutDeclarativeTest.java index 6ee3490c05..0cee19ee85 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/customlayout/CustomLayoutDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/customlayout/CustomLayoutDeclarativeTest.java @@ -28,8 +28,8 @@ import com.vaadin.ui.Label; * @since * @author Vaadin Ltd */ -public class CustomLayoutDeclarativeTest extends - DeclarativeTestBase<CustomLayout> { +public class CustomLayoutDeclarativeTest + extends DeclarativeTestBase<CustomLayout> { @Test public void testEmpty() { diff --git a/server/src/test/java/com/vaadin/tests/server/component/customlayout/CustomLayoutTest.java b/server/src/test/java/com/vaadin/tests/server/component/customlayout/CustomLayoutTest.java index 4d327e70a6..050e2037a2 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/customlayout/CustomLayoutTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/customlayout/CustomLayoutTest.java @@ -40,9 +40,8 @@ import com.vaadin.ui.CustomLayout; public class CustomLayoutTest { @Test - public void ctor_inputStreamProvided_inputStreamIsRead() - throws IOException, IllegalArgumentException, - IllegalAccessException { + public void ctor_inputStreamProvided_inputStreamIsRead() throws IOException, + IllegalArgumentException, IllegalAccessException { Integer buffer = getBufferSize(); StringBuilder builder = new StringBuilder(); for (int i = 0; i < buffer; i++) { diff --git a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java index 0335e0499a..8d58fecdef 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java @@ -87,7 +87,8 @@ public class BeanFieldGroupTest { BeanFieldGroup<MyBean> bindFields = BeanFieldGroup .bindFieldsUnbuffered(myBean, viewStub); - LegacyField<String> field = (LegacyField<String>) bindFields.getField("basicField"); + LegacyField<String> field = (LegacyField<String>) bindFields + .getField("basicField"); Assert.assertEquals(DEFAULT_FOR_BASIC_FIELD, myBean.basicField); field.setValue("Foo"); Assert.assertEquals("Foo", myBean.basicField); @@ -103,8 +104,8 @@ public class BeanFieldGroupTest { MyBean myBean = new MyBean(); ViewStub viewStub = new ViewStub(); - BeanFieldGroup<MyBean> bindFields = BeanFieldGroup.bindFieldsBuffered( - myBean, viewStub); + BeanFieldGroup<MyBean> bindFields = BeanFieldGroup + .bindFieldsBuffered(myBean, viewStub); LegacyField<String> basicField = (LegacyField<String>) bindFields .getField("basicField"); @@ -131,8 +132,8 @@ public class BeanFieldGroupTest { BeanFieldGroup<MyBean> bfg = new BeanFieldGroup<MyBean>(MyBean.class); bfg.setItemDataSource(bean); - com.vaadin.legacy.ui.LegacyField<?> helloField = bfg.buildAndBind("Hello string", - "nestedBean.hello"); + com.vaadin.legacy.ui.LegacyField<?> helloField = bfg + .buildAndBind("Hello string", "nestedBean.hello"); assertEquals(bean.nestedBean.hello, helloField.getValue().toString()); } diff --git a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java index d565e097f0..45c41fac1e 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java @@ -60,8 +60,8 @@ public class CaseInsensitiveBindingTest { @Test public void perfectMatchPriority() { PropertysetItem item = new PropertysetItem(); - item.addItemProperty("first_name", new ObjectProperty<String>( - "Not this")); + item.addItemProperty("first_name", + new ObjectProperty<String>("Not this")); item.addItemProperty("firstName", new ObjectProperty<String>("This")); class MyForm extends FormLayout { diff --git a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java index b7f0747e2b..86ae6589e6 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java @@ -81,8 +81,7 @@ public class FieldGroupTest { field2.setRequired(true); fieldGroup.bind(field2, "prop2"); - Set<LegacyTextField> set = new HashSet<>(Arrays.asList(field1, - field2)); + Set<LegacyTextField> set = new HashSet<>(Arrays.asList(field1, field2)); try { fieldGroup.commit(); diff --git a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java index da09d2adc1..3d6d308ed5 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java @@ -18,8 +18,8 @@ public class FieldNamedDescriptionTest { // Create an item PropertysetItem item = new PropertysetItem(); item.addItemProperty("name", new ObjectProperty<String>("Zaphod")); - item.addItemProperty("description", new ObjectProperty<String>( - "This is a description")); + item.addItemProperty("description", + new ObjectProperty<String>("This is a description")); // Define a form as a class that extends some layout class MyForm extends FormLayout { diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridAddRowBuiltinContainerTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridAddRowBuiltinContainerTest.java index 70c73eb516..2206ff6ade 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridAddRowBuiltinContainerTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridAddRowBuiltinContainerTest.java @@ -47,9 +47,8 @@ public class GridAddRowBuiltinContainerTest { Assert.assertEquals("There should be one item in the container", 1, container.size()); - Assert.assertEquals("Hello", - container.getItem(itemId).getItemProperty("myColumn") - .getValue()); + Assert.assertEquals("Hello", container.getItem(itemId) + .getItemProperty("myColumn").getValue()); } @Test(expected = IllegalArgumentException.class) @@ -63,9 +62,8 @@ public class GridAddRowBuiltinContainerTest { // cast to Object to distinguish from a null varargs array Object itemId = grid.addRow((Object) null); - Assert.assertEquals(null, - container.getItem(itemId).getItemProperty("myColumn") - .getValue()); + Assert.assertEquals(null, container.getItem(itemId) + .getItemProperty("myColumn").getValue()); } @Test(expected = IllegalArgumentException.class) @@ -80,10 +78,10 @@ public class GridAddRowBuiltinContainerTest { Object itemId = grid.addRow("Hello", Integer.valueOf(3)); Item item = container.getItem(itemId); - Assert.assertEquals("Hello", item.getItemProperty("myColumn") - .getValue()); - Assert.assertEquals(Integer.valueOf(3), item.getItemProperty("myOther") - .getValue()); + Assert.assertEquals("Hello", + item.getItemProperty("myColumn").getValue()); + Assert.assertEquals(Integer.valueOf(3), + item.getItemProperty("myOther").getValue()); } @Test(expected = IllegalArgumentException.class) @@ -101,8 +99,8 @@ public class GridAddRowBuiltinContainerTest { Item item = container.getItem(Integer.valueOf(1)); Assert.assertEquals("Default value should be used for removed column", "", item.getItemProperty("myColumn").getValue()); - Assert.assertEquals(Integer.valueOf(3), item.getItemProperty("myOther") - .getValue()); + Assert.assertEquals(Integer.valueOf(3), + item.getItemProperty("myOther").getValue()); } @Test @@ -114,10 +112,10 @@ public class GridAddRowBuiltinContainerTest { grid.addRow(Integer.valueOf(3), "Hello"); Item item = container.getItem(Integer.valueOf(1)); - Assert.assertEquals("Hello", item.getItemProperty("myColumn") - .getValue()); - Assert.assertEquals(Integer.valueOf(3), item.getItemProperty("myOther") - .getValue()); + Assert.assertEquals("Hello", + item.getItemProperty("myColumn").getValue()); + Assert.assertEquals(Integer.valueOf(3), + item.getItemProperty("myOther").getValue()); } @Test @@ -143,7 +141,8 @@ public class GridAddRowBuiltinContainerTest { // Can't use @Test(expect = Foo.class) since we also want to verify // state after exception was thrown - Assert.fail("Adding to BeanItemContainer container should throw UnsupportedOperationException"); + Assert.fail( + "Adding to BeanItemContainer container should throw UnsupportedOperationException"); } catch (UnsupportedOperationException e) { Assert.assertEquals("No row should have been added", 0, container.size()); @@ -200,15 +199,16 @@ public class GridAddRowBuiltinContainerTest { // state after exception was thrown Assert.fail("Adding row should throw MethodException"); } catch (MethodException e) { - Assert.assertEquals("Got the wrong exception", "name", e.getCause() - .getMessage()); + Assert.assertEquals("Got the wrong exception", "name", + e.getCause().getMessage()); Assert.assertEquals("There should be no rows in the container", 0, container.size()); } } - private void setContainerRemoveColumns(BeanItemContainer<Person> container) { + private void setContainerRemoveColumns( + BeanItemContainer<Person> container) { // Remove predefined column so we can change container grid.removeAllColumns(); grid.setContainerDataSource(container); diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java index 65a4cfe564..431bbd9436 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java @@ -34,8 +34,8 @@ public class GridChildrenTest { grid.addColumn("foo"); grid.addColumn("bar"); grid.addColumn("baz"); - HeaderCell merged = grid.getDefaultHeaderRow() - .join("foo", "bar", "baz"); + HeaderCell merged = grid.getDefaultHeaderRow().join("foo", "bar", + "baz"); Label label = new Label(); merged.setComponent(label); Iterator<Component> i = grid.iterator(); diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java index 97f0355b4b..65967651e3 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java @@ -42,8 +42,8 @@ public class GridColumnAddingAndRemovingTest { public void testAddColumn() { grid.addColumn("foo"); - Property<?> property = container.getContainerProperty( - container.firstItemId(), "foo"); + Property<?> property = container + .getContainerProperty(container.firstItemId(), "foo"); assertEquals(property.getType(), String.class); } @@ -59,8 +59,8 @@ public class GridColumnAddingAndRemovingTest { grid.removeColumn("foo"); // Removing a column, doesn't remove the property - Property<?> property = container.getContainerProperty( - container.firstItemId(), "foo"); + Property<?> property = container + .getContainerProperty(container.firstItemId(), "foo"); assertEquals(property.getType(), String.class); grid.addColumn("foo"); } @@ -70,8 +70,8 @@ public class GridColumnAddingAndRemovingTest { grid.addColumn("bar", Integer.class); grid.addColumn("baz", Double.class); - Property<?> property = container.getContainerProperty( - container.firstItemId(), "bar"); + Property<?> property = container + .getContainerProperty(container.firstItemId(), "bar"); assertEquals(property.getType(), Integer.class); assertEquals(null, property.getValue()); property = container.getContainerProperty(container.firstItemId(), @@ -126,8 +126,8 @@ public class GridColumnAddingAndRemovingTest { @Test public void testAddBooleanColumnProperty() { grid.addColumn("foo", Boolean.class); - Property<?> property = container.getContainerProperty( - container.firstItemId(), "foo"); + Property<?> property = container + .getContainerProperty(container.firstItemId(), "foo"); assertEquals(property.getType(), Boolean.class); assertEquals(property.getValue(), null); } diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java index 8b19370075..eebb40cc3a 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java @@ -109,8 +109,8 @@ public class GridColumnsTest { column.setHeaderCaption("CustomHeader"); assertEquals("CustomHeader", column.getHeaderCaption()); - assertEquals(column.getHeaderCaption(), grid.getDefaultHeaderRow() - .getCell("column1").getText()); + assertEquals(column.getHeaderCaption(), + grid.getDefaultHeaderRow().getCell("column1").getText()); column.setWidth(100); assertEquals(100, column.getWidth(), 0.49d); @@ -226,15 +226,14 @@ public class GridColumnsTest { .getContainerPropertyIds().iterator().next(); grid.getContainerDataSource().removeContainerProperty(propertyId); - assertEquals( - "Frozen column count should update when removing last row", + assertEquals("Frozen column count should update when removing last row", containerSize - 1, grid.getFrozenColumnCount()); } @Test public void testReorderColumns() { - Set<?> containerProperties = new LinkedHashSet<Object>(grid - .getContainerDataSource().getContainerPropertyIds()); + Set<?> containerProperties = new LinkedHashSet<Object>( + grid.getContainerDataSource().getContainerPropertyIds()); Object[] properties = new Object[] { "column3", "column2", "column6" }; grid.setColumnOrder(properties); @@ -284,8 +283,8 @@ public class GridColumnsTest { public void testPropertyAndColumnEditorFieldsMatch() { Column column1 = grid.getColumn("column1"); column1.setEditorField(new LegacyTextField()); - assertSame(column1.getEditorField(), grid.getColumn("column1") - .getEditorField()); + assertSame(column1.getEditorField(), + grid.getColumn("column1").getEditorField()); Column column2 = grid.getColumn("column2"); column2.setEditorField(new LegacyTextField()); @@ -372,8 +371,8 @@ public class GridColumnsTest { ColumnResizeListener mock = EasyMock .createMock(ColumnResizeListener.class); Capture<ColumnResizeEvent> capturedEvent = new Capture<ColumnResizeEvent>(); - mock.columnResize(and(capture(capturedEvent), - isA(ColumnResizeEvent.class))); + mock.columnResize( + and(capture(capturedEvent), isA(ColumnResizeEvent.class))); EasyMock.expectLastCall().once(); // Tell it to wait for the call @@ -394,7 +393,7 @@ public class GridColumnsTest { event.isUserOriginated()); } - @Test + @Test public void textHeaderCaptionIsReturned() { Column firstColumn = grid.getColumns().get(0); diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java index c5747e4073..77694d906a 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java @@ -107,11 +107,12 @@ public class GridContainerTest { grid.setContainerDataSource(new IndexedContainer()); try { grid.addColumn("notInContainer"); - Assert.fail("Adding a property id not in the container should throw an exception"); + Assert.fail( + "Adding a property id not in the container should throw an exception"); } catch (IllegalStateException e) { Assert.assertTrue(e.getMessage().contains("notInContainer")); - Assert.assertTrue(e.getMessage().contains( - "does not exist in the container")); + Assert.assertTrue( + e.getMessage().contains("does not exist in the container")); } } @@ -121,13 +122,14 @@ public class GridContainerTest { grid.setContainerDataSource(new IndexedContainer()); try { grid.setColumns("notInContainer", "notThereEither"); - Assert.fail("Setting columns for property ids not in the container should throw an exception"); + Assert.fail( + "Setting columns for property ids not in the container should throw an exception"); } catch (IllegalStateException e) { // addColumn is run in random order.. Assert.assertTrue(e.getMessage().contains("notInContainer") || e.getMessage().contains("notThereEither")); - Assert.assertTrue(e.getMessage().contains( - "does not exist in the container")); + Assert.assertTrue( + e.getMessage().contains("does not exist in the container")); } } @@ -139,7 +141,8 @@ public class GridContainerTest { } @Test - public void testSerializeRpcDataProviderWithRowChanges() throws IOException { + public void testSerializeRpcDataProviderWithRowChanges() + throws IOException { Grid grid = new Grid(); IndexedContainer container = new IndexedContainer(); grid.setContainerDataSource(container); diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java index 31419f59f2..352635e0d7 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java @@ -136,13 +136,13 @@ public class GridEditorTest { public void testEditItem() throws Exception { startEdit(); assertEquals(ITEM_ID, grid.getEditedItemId()); - assertEquals(getEditedItem(), grid.getEditorFieldGroup() - .getItemDataSource()); + assertEquals(getEditedItem(), + grid.getEditorFieldGroup().getItemDataSource()); - assertEquals(DEFAULT_NAME, grid.getColumn(PROPERTY_NAME) - .getEditorField().getValue()); - assertEquals(String.valueOf(DEFAULT_AGE), grid.getColumn(PROPERTY_AGE) - .getEditorField().getValue()); + assertEquals(DEFAULT_NAME, + grid.getColumn(PROPERTY_NAME).getEditorField().getValue()); + assertEquals(String.valueOf(DEFAULT_AGE), + grid.getColumn(PROPERTY_AGE).getEditorField().getValue()); } @Test @@ -171,7 +171,8 @@ public class GridEditorTest { // Manual fail instead of @Test(expected=...) to check it is // saveEditor that fails and not setValue grid.saveEditor(); - Assert.fail("CommitException expected when saving an invalid field value"); + Assert.fail( + "CommitException expected when saving an invalid field value"); } catch (CommitException e) { // expected } diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java index d9db217aa3..5b9a383d2d 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java @@ -35,7 +35,7 @@ public class GridExtensionTest { public void testCreateExtension() { Grid grid = new Grid(); DummyGridExtension dummy = new DummyGridExtension(grid); - assertTrue("DummyGridExtension never made it to Grid", grid - .getExtensions().contains(dummy)); + assertTrue("DummyGridExtension never made it to Grid", + grid.getExtensions().contains(dummy)); } } diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java index 85f51c35fb..e9a5b1126c 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java @@ -33,8 +33,8 @@ import com.vaadin.ui.Grid.SelectionModel; public class GridSelectionTest { - private static class MockSelectionChangeListener implements - SelectionListener { + private static class MockSelectionChangeListener + implements SelectionListener { private SelectionEvent event; @Override @@ -129,17 +129,20 @@ public class GridSelectionTest { @Test public void selectionModeMapsToMulti() { - assertTrue(grid.setSelectionMode(SelectionMode.MULTI) instanceof SelectionModel.Multi); + assertTrue(grid.setSelectionMode( + SelectionMode.MULTI) instanceof SelectionModel.Multi); } @Test public void selectionModeMapsToSingle() { - assertTrue(grid.setSelectionMode(SelectionMode.SINGLE) instanceof SelectionModel.Single); + assertTrue(grid.setSelectionMode( + SelectionMode.SINGLE) instanceof SelectionModel.Single); } @Test public void selectionModeMapsToNone() { - assertTrue(grid.setSelectionMode(SelectionMode.NONE) instanceof SelectionModel.None); + assertTrue(grid.setSelectionMode( + SelectionMode.NONE) instanceof SelectionModel.None); } @Test(expected = IllegalArgumentException.class) @@ -181,8 +184,8 @@ public class GridSelectionTest { private void selectionCallsListener() { grid.select(itemId1Present); assertEquals("added size", 1, mockListener.getAdded().size()); - assertEquals("added item", itemId1Present, mockListener.getAdded() - .iterator().next()); + assertEquals("added item", itemId1Present, + mockListener.getAdded().iterator().next()); assertEquals("removed size", 0, mockListener.getRemoved().size()); } @@ -204,8 +207,8 @@ public class GridSelectionTest { grid.deselect(itemId1Present); assertEquals("removed size", 1, mockListener.getRemoved().size()); - assertEquals("removed item", itemId1Present, mockListener.getRemoved() - .iterator().next()); + assertEquals("removed item", itemId1Present, + mockListener.getRemoved().iterator().next()); assertEquals("removed size", 0, mockListener.getAdded().size()); } @@ -364,10 +367,10 @@ public class GridSelectionTest { grid.select(itemId2Present); assertEquals("added size", 1, mockListener.getAdded().size()); assertEquals("removed size", 1, mockListener.getRemoved().size()); - assertEquals("added item", itemId2Present, mockListener.getAdded() - .iterator().next()); - assertEquals("removed item", itemId1Present, mockListener.getRemoved() - .iterator().next()); + assertEquals("added item", itemId2Present, + mockListener.getAdded().iterator().next()); + assertEquals("removed item", itemId1Present, + mockListener.getRemoved().iterator().next()); assertEquals("selectedRows is correct", itemId2Present, grid.getSelectedRow()); } diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java index 4031886e7a..01eb682a7c 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java @@ -110,8 +110,8 @@ public class GridStaticSectionTest extends Grid { @Test public void testJoinAllFooterCells() { FooterRow mergeRow = prependFooterRow(); - mergeRow.join(dataSource.getContainerPropertyIds().toArray()).setText( - "All the stuff."); + mergeRow.join(dataSource.getContainerPropertyIds().toArray()) + .setText("All the stuff."); } private void sanityCheck() throws Throwable { diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java index 9b327a2f22..6733c46c1f 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java @@ -108,14 +108,14 @@ public class MultiSelectionModelTest { public void testSettingSelection() throws Throwable { try { expectSelectEvent(itemId2Present, itemId1Present); - model.setSelected(Arrays.asList(new Object[] { itemId1Present, - itemId2Present })); + model.setSelected(Arrays + .asList(new Object[] { itemId1Present, itemId2Present })); verifyCurrentSelection(itemId1Present, itemId2Present); expectDeselectEvent(itemId1Present); expectSelectEvent(itemId3Present); - model.setSelected(Arrays.asList(new Object[] { itemId3Present, - itemId2Present })); + model.setSelected(Arrays + .asList(new Object[] { itemId3Present, itemId2Present })); verifyCurrentSelection(itemId3Present, itemId2Present); } catch (Exception e) { throw e.getCause(); diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/SingleSelectionModelTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/SingleSelectionModelTest.java index c217efb935..a546facea4 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/SingleSelectionModelTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/SingleSelectionModelTest.java @@ -129,21 +129,20 @@ public class SingleSelectionModelTest { @Override public void select(SelectionEvent event) { if (selected != null) { - Assert.assertTrue( - "Selection did not contain expected item", event - .getAdded().contains(selected)); + Assert.assertTrue("Selection did not contain expected item", + event.getAdded().contains(selected)); } else { - Assert.assertTrue("Unexpected selection", event.getAdded() - .isEmpty()); + Assert.assertTrue("Unexpected selection", + event.getAdded().isEmpty()); } if (deselected != null) { Assert.assertTrue( - "DeSelection did not contain expected item", event - .getRemoved().contains(deselected)); + "DeSelection did not contain expected item", + event.getRemoved().contains(deselected)); } else { - Assert.assertTrue("Unexpected selection", event - .getRemoved().isEmpty()); + Assert.assertTrue("Unexpected selection", + event.getRemoved().isEmpty()); } grid.removeSelectionListener(this); diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java index 21892634a0..92d95b09f8 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java @@ -76,8 +76,7 @@ public class GridColumnDeclarativeTest extends GridDeclarativeTestBase { @Test public void testReadEmptyExpand() { String design = "<vaadin-grid><table>"// - + "<colgroup>" - + " <col sortable=true expand />" + + "<colgroup>" + " <col sortable=true expand />" + "</colgroup>" // + "</table></vaadin-grid>"; diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java index 41f967ac16..dd0d0fd705 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java @@ -70,15 +70,15 @@ public class GridDeclarativeAttributeTest extends DeclarativeTestBase<Grid> { @Test public void testSelectionMode() { String design = "<vaadin-grid selection-mode='none'>"; - assertSame(NoSelectionModel.class, read(design).getSelectionModel() - .getClass()); + assertSame(NoSelectionModel.class, + read(design).getSelectionModel().getClass()); design = "<vaadin-grid selection-mode='single'>"; - assertSame(SingleSelectionModel.class, read(design).getSelectionModel() - .getClass()); + assertSame(SingleSelectionModel.class, + read(design).getSelectionModel().getClass()); design = "<vaadin-grid selection-mode='multi'>"; - assertSame(MultiSelectionModel.class, read(design).getSelectionModel() - .getClass()); + assertSame(MultiSelectionModel.class, + read(design).getSelectionModel().getClass()); } } diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java index 9424d89ecf..aaba54fe84 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java @@ -149,7 +149,8 @@ public class GridDeclarativeTestBase extends DeclarativeTestBase<Grid> { col2.isEditable()); assertEquals(baseError + "Hidable", col1.isHidable(), col2.isHidable()); - assertEquals(baseError + "Hidden", col1.isHidden(), col2.isHidden()); + assertEquals(baseError + "Hidden", col1.isHidden(), + col2.isHidden()); assertEquals(baseError + "HidingToggleCaption", col1.getHidingToggleCaption(), col2.getHidingToggleCaption()); diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java index d64a877d81..a0ca16c4f9 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java @@ -332,10 +332,10 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase { Element root = new Element(Tag.valueOf("vaadin-grid"), ""); grid.writeDesign(root, new DesignContext()); - Assert.assertEquals("&amp; Test", root.getElementsByTag("th") - .get(0).html()); - Assert.assertEquals("&amp; Test", root.getElementsByTag("td") - .get(0).html()); + Assert.assertEquals("&amp; Test", + root.getElementsByTag("th").get(0).html()); + Assert.assertEquals("&amp; Test", + root.getElementsByTag("td").get(0).html()); header = grid.addHeaderRowAt(0); footer = grid.addFooterRowAt(0); @@ -347,10 +347,10 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase { root = new Element(Tag.valueOf("vaadin-grid"), ""); grid.writeDesign(root, new DesignContext()); - Assert.assertEquals("& Test", root.getElementsByTag("th").get(0) - .html()); - Assert.assertEquals("& Test", root.getElementsByTag("td").get(0) - .html()); + Assert.assertEquals("& Test", + root.getElementsByTag("th").get(0).html()); + Assert.assertEquals("& Test", + root.getElementsByTag("td").get(0).html()); } } diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java index df8e864309..9362cbce95 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java @@ -26,8 +26,7 @@ public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase { @Test public void testSimpleInlineData() { String design = "<vaadin-grid><table>"// - + "<colgroup>" - + " <col sortable property-id='Col1' />" + + "<colgroup>" + " <col sortable property-id='Col1' />" + "</colgroup>" // + "<thead />" // No headers read or written + "<tbody>" // @@ -53,8 +52,7 @@ public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase { @Test public void testMultipleColumnsInlineData() { String design = "<vaadin-grid><table>"// - + "<colgroup>" - + " <col sortable property-id='Col1' />" + + "<colgroup>" + " <col sortable property-id='Col1' />" + " <col sortable property-id='Col2' />" + " <col sortable property-id='Col3' />" // + "</colgroup>" // @@ -82,8 +80,7 @@ public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase { @Test public void testMultipleColumnsInlineDataReordered() { String design = "<vaadin-grid><table>"// - + "<colgroup>" - + " <col sortable property-id='Col2' />" + + "<colgroup>" + " <col sortable property-id='Col2' />" + " <col sortable property-id='Col3' />" + " <col sortable property-id='Col1' />" // + "</colgroup>" // @@ -112,13 +109,10 @@ public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase { @Test public void testHtmlEntities() { String design = "<vaadin-grid><table>"// - + "<colgroup>" - + " <col property-id='test' />" - + "</colgroup>" // + + "<colgroup>" + " <col property-id='test' />" + "</colgroup>" // + "<thead />" // No headers read or written + "<tbody>" // - + " <tr><td>&Test</tr></td>" - + "</tbody>" + + " <tr><td>&Test</tr></td>" + "</tbody>" + "</table></vaadin-grid>"; Grid read = read(design); diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/sort/SortTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/sort/SortTest.java index 2a682df2e5..d738793426 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/sort/SortTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/sort/SortTest.java @@ -56,7 +56,8 @@ public class SortTest { sorted = true; } - public void expectedSort(Object[] properties, SortDirection[] directions) { + public void expectedSort(Object[] properties, + SortDirection[] directions) { assert directions.length == properties.length : "Array dimensions differ"; expectedProperties = properties; expectedAscending = new boolean[directions.length]; @@ -138,7 +139,8 @@ public class SortTest { new SortDirection[] { SortDirection.ASCENDING }); grid.sort("foo"); - listener.assertEventFired(new SortOrder("foo", SortDirection.ASCENDING)); + listener.assertEventFired( + new SortOrder("foo", SortDirection.ASCENDING)); } @Test @@ -147,7 +149,8 @@ public class SortTest { new SortDirection[] { SortDirection.DESCENDING }); grid.sort("foo", SortDirection.DESCENDING); - listener.assertEventFired(new SortOrder("foo", SortDirection.DESCENDING)); + listener.assertEventFired( + new SortOrder("foo", SortDirection.DESCENDING)); } @Test @@ -155,13 +158,12 @@ public class SortTest { container.expectedSort(new Object[] { "foo", "bar", "baz" }, new SortDirection[] { SortDirection.ASCENDING, SortDirection.ASCENDING, SortDirection.DESCENDING }); - grid.sort(Sort.by("foo").then("bar") - .then("baz", SortDirection.DESCENDING)); + grid.sort(Sort.by("foo").then("bar").then("baz", + SortDirection.DESCENDING)); - listener.assertEventFired( - new SortOrder("foo", SortDirection.ASCENDING), new SortOrder( - "bar", SortDirection.ASCENDING), new SortOrder("baz", - SortDirection.DESCENDING)); + listener.assertEventFired(new SortOrder("foo", SortDirection.ASCENDING), + new SortOrder("bar", SortDirection.ASCENDING), + new SortOrder("baz", SortDirection.DESCENDING)); } @@ -173,13 +175,12 @@ public class SortTest { container.expectedSort(new Object[] { "foo", "bar", "baz" }, new SortDirection[] { SortDirection.ASCENDING, SortDirection.ASCENDING, SortDirection.DESCENDING }); - grid.sort(Sort.by("foo").then("bar") - .then("baz", SortDirection.DESCENDING)); + grid.sort(Sort.by("foo").then("bar").then("baz", + SortDirection.DESCENDING)); - listener.assertEventFired( - new SortOrder("foo", SortDirection.ASCENDING), new SortOrder( - "bar", SortDirection.ASCENDING), new SortOrder("baz", - SortDirection.DESCENDING)); + listener.assertEventFired(new SortOrder("foo", SortDirection.ASCENDING), + new SortOrder("bar", SortDirection.ASCENDING), + new SortOrder("baz", SortDirection.DESCENDING)); container = new DummySortingIndexedContainer(); container.addContainerProperty("foo", Person.class, null); @@ -189,7 +190,8 @@ public class SortTest { new SortDirection[] { SortDirection.DESCENDING }); grid.setContainerDataSource(container); - listener.assertEventFired(new SortOrder("baz", SortDirection.DESCENDING)); + listener.assertEventFired( + new SortOrder("baz", SortDirection.DESCENDING)); } diff --git a/server/src/test/java/com/vaadin/tests/server/component/gridlayout/GridLayoutDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/gridlayout/GridLayoutDeclarativeTest.java index e3975e41a8..6f81552a1c 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/gridlayout/GridLayoutDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/gridlayout/GridLayoutDeclarativeTest.java @@ -32,8 +32,8 @@ import com.vaadin.ui.Label; import com.vaadin.ui.declarative.Design; import com.vaadin.ui.declarative.DesignContext; -public class GridLayoutDeclarativeTest extends - DeclarativeMarginTestBase<GridLayout> { +public class GridLayoutDeclarativeTest + extends DeclarativeMarginTestBase<GridLayout> { @Test public void testMargins() { @@ -272,7 +272,8 @@ public class GridLayoutDeclarativeTest extends context.setRootComponent(layout); Design.write(context, out); - ByteArrayInputStream input = new ByteArrayInputStream(out.toByteArray()); + ByteArrayInputStream input = new ByteArrayInputStream( + out.toByteArray()); Component component = Design.read(input); GridLayout readLayout = (GridLayout) component; diff --git a/server/src/test/java/com/vaadin/tests/server/component/label/LabelListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/label/LabelListenersTest.java index 51cf7bf1ff..9fe345ea85 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/label/LabelListenersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/label/LabelListenersTest.java @@ -28,10 +28,11 @@ public class LabelListenersTest extends AbstractListenerMethodsTestBase { Label underTest = new Label(); // setup the mock listener - ValueChangeListener mockListener = createStrictMock(ValueChangeListener.class); + ValueChangeListener mockListener = createStrictMock( + ValueChangeListener.class); // record - mockListener - .valueChange(anyObject(com.vaadin.data.Property.ValueChangeEvent.class)); + mockListener.valueChange( + anyObject(com.vaadin.data.Property.ValueChangeEvent.class)); // test underTest.addValueChangeListener(mockListener); @@ -50,10 +51,11 @@ public class LabelListenersTest extends AbstractListenerMethodsTestBase { Property mockProperty = EasyMock.createMock(Property.class); - ValueChangeListener mockListener = createStrictMock(ValueChangeListener.class); + ValueChangeListener mockListener = createStrictMock( + ValueChangeListener.class); // record - mockListener - .valueChange(anyObject(com.vaadin.data.Property.ValueChangeEvent.class)); + mockListener.valueChange( + anyObject(com.vaadin.data.Property.ValueChangeEvent.class)); expect(mockProperty.getType()).andReturn(String.class).atLeastOnce(); expect(mockProperty.getValue()).andReturn("Any").atLeastOnce(); @@ -72,7 +74,8 @@ public class LabelListenersTest extends AbstractListenerMethodsTestBase { public void testValueChangeNotFiredWhenNotSettingValue() { Label underTest = new Label(); // setup the mock listener - ValueChangeListener mockListener = createStrictMock(ValueChangeListener.class); + ValueChangeListener mockListener = createStrictMock( + ValueChangeListener.class); // record: nothing to record // test @@ -85,7 +88,8 @@ public class LabelListenersTest extends AbstractListenerMethodsTestBase { public void testNoValueChangeFiredWhenSettingPropertyDataSourceToNull() { Label underTest = new Label(); // setup the mock Listener - ValueChangeListener mockListener = createStrictMock(ValueChangeListener.class); + ValueChangeListener mockListener = createStrictMock( + ValueChangeListener.class); // record: nothing to record // test diff --git a/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectDeclarativeTest.java index d0fa400d31..4869c377e9 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectDeclarativeTest.java @@ -31,9 +31,10 @@ public class ListSelectDeclarativeTest extends DeclarativeTestBase<ListSelect> { } private String getWithOptionsDesign() { - return "<vaadin-list-select rows=10>\n" + " <option>Male</option>\n" - + " <option>Female</option>\n" + "</vaadin-list-select>\n" - + ""; + return "<vaadin-list-select rows=10>\n" + + " <option>Male</option>\n" + + " <option>Female</option>\n" + + "</vaadin-list-select>\n" + ""; } @Test diff --git a/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectStateTest.java b/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectStateTest.java index 01dc71d96a..82882a9e61 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectStateTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectStateTest.java @@ -31,8 +31,8 @@ public class ListSelectStateTest { public void getState_listSelectHasCustomState() { TestListSelect select = new TestListSelect(); AbstractSelectState state = select.getState(); - Assert.assertEquals("Unexpected state class", - AbstractSelectState.class, state.getClass()); + Assert.assertEquals("Unexpected state class", AbstractSelectState.class, + state.getClass()); } private static class TestListSelect extends ListSelect { diff --git a/server/src/test/java/com/vaadin/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java index 511f411a93..5a854d2733 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java @@ -25,8 +25,8 @@ import com.vaadin.ui.NativeSelect; * * @author Vaadin Ltd */ -public class NativeSelectDeclarativeTest extends - DeclarativeTestBase<NativeSelect> { +public class NativeSelectDeclarativeTest + extends DeclarativeTestBase<NativeSelect> { public String getBasicDesign() { return "<vaadin-native-select><option>foo</option><option>bar</option></vaadin-native-select>"; diff --git a/server/src/test/java/com/vaadin/tests/server/component/passwordfield/PasswordFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/passwordfield/PasswordFieldDeclarativeTest.java index fcb2453057..196a6261ac 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/passwordfield/PasswordFieldDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/passwordfield/PasswordFieldDeclarativeTest.java @@ -25,8 +25,8 @@ import com.vaadin.ui.PasswordField; * @since * @author Vaadin Ltd */ -public class PasswordFieldDeclarativeTest extends - DeclarativeTestBase<PasswordField> { +public class PasswordFieldDeclarativeTest + extends DeclarativeTestBase<PasswordField> { @Test public void testReadOnlyValue() { diff --git a/server/src/test/java/com/vaadin/tests/server/component/popupview/PopupViewDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/popupview/PopupViewDeclarativeTest.java index 300a993064..ebb8323699 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/popupview/PopupViewDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/popupview/PopupViewDeclarativeTest.java @@ -49,8 +49,7 @@ public class PopupViewDeclarativeTest extends DeclarativeTestBase<PopupView> { component.setPopupVisible(true); // hide-on-mouse-out is true by default. not seen in design String design = "<vaadin-popup-view popup-visible>" // - + "Click <u>here</u> to open" - + "<popup-content>" + + "Click <u>here</u> to open" + "<popup-content>" + new DesignContext().createElement(verticalLayout) + "</popup-content>" // + "</vaadin-popup-view>"; @@ -64,8 +63,7 @@ public class PopupViewDeclarativeTest extends DeclarativeTestBase<PopupView> { PopupView component = new PopupView("Click Me!", label); component.setHideOnMouseOut(false); String design = "<vaadin-popup-view hide-on-mouse-out='false'>" // - + "Click Me!" - + "<popup-content>" + + "Click Me!" + "<popup-content>" + new DesignContext().createElement(label) + "</popup-content>" // + "</vaadin-popup-view>"; testWrite(design, component); diff --git a/server/src/test/java/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.java index 36ede0a321..b4e9f7a30d 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.java @@ -25,8 +25,8 @@ import com.vaadin.ui.ProgressBar; * * @author Vaadin Ltd */ -public class ProgressBarDeclarativeTest extends - DeclarativeTestBase<ProgressBar> { +public class ProgressBarDeclarativeTest + extends DeclarativeTestBase<ProgressBar> { public String getBasicDesign() { return "<vaadin-progress-bar value=0.5 indeterminate>"; diff --git a/server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java index 37d27af197..685618fedc 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java @@ -20,8 +20,8 @@ import org.junit.Test; import com.vaadin.tests.design.DeclarativeTestBase; import com.vaadin.ui.RichTextArea; -public class RichTextAreaDeclarativeTest extends - DeclarativeTestBase<RichTextArea> { +public class RichTextAreaDeclarativeTest + extends DeclarativeTestBase<RichTextArea> { private String getBasicDesign() { return "<vaadin-rich-text-area null-representation='' null-setting-allowed>\n" diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java index 03f50c6b5f..40f97d248a 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java @@ -26,8 +26,8 @@ public class CacheUpdateExceptionCausesTest { @Test public void testSingleCauseException() { Table table = new Table(); - Throwable[] causes = new Throwable[] { new RuntimeException( - "Broken in one way.") }; + Throwable[] causes = new Throwable[] { + new RuntimeException("Broken in one way.") }; CacheUpdateException exception = new CacheUpdateException(table, "Error during Table cache update.", causes); diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/MultipleSelectionTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/MultipleSelectionTest.java index a7973b45f0..6301f21acf 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/table/MultipleSelectionTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/table/MultipleSelectionTest.java @@ -55,8 +55,8 @@ public class MultipleSelectionTest { * @return A new container with test items */ private Container createTestContainer() { - IndexedContainer container = new IndexedContainer(Arrays.asList("1", - new String[] { "2", "3", "4" })); + IndexedContainer container = new IndexedContainer( + Arrays.asList("1", new String[] { "2", "3", "4" })); return container; } } diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/TableColumnAlignmentsTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/TableColumnAlignmentsTest.java index 69aaf2e3a9..ff4c8336fb 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/table/TableColumnAlignmentsTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/table/TableColumnAlignmentsTest.java @@ -12,8 +12,8 @@ public class TableColumnAlignmentsTest { @Test public void defaultColumnAlignments() { for (int properties = 0; properties < 10; properties++) { - Table t = TableGeneratorTest.createTableWithDefaultContainer( - properties, 10); + Table t = TableGeneratorTest + .createTableWithDefaultContainer(properties, 10); Object[] expected = new Object[properties]; for (int i = 0; i < properties; i++) { expected[i] = Align.LEFT; @@ -26,8 +26,8 @@ public class TableColumnAlignmentsTest { @Test public void explicitColumnAlignments() { int properties = 5; - Table t = TableGeneratorTest.createTableWithDefaultContainer( - properties, 10); + Table t = TableGeneratorTest.createTableWithDefaultContainer(properties, + 10); Align[] explicitAlignments = new Align[] { Align.CENTER, Align.LEFT, Align.RIGHT, Align.RIGHT, Align.LEFT }; @@ -122,8 +122,8 @@ public class TableColumnAlignmentsTest { @Test public void explicitColumnAlignmentOneByOne() { int properties = 5; - Table t = TableGeneratorTest.createTableWithDefaultContainer( - properties, 10); + Table t = TableGeneratorTest.createTableWithDefaultContainer(properties, + 10); Align[] explicitAlignments = new Align[] { Align.CENTER, Align.LEFT, Align.RIGHT, Align.RIGHT, Align.LEFT }; @@ -134,9 +134,9 @@ public class TableColumnAlignmentsTest { t.setColumnAlignment("Property " + i, explicitAlignments[i]); currentAlignments[i] = explicitAlignments[i]; - assertArrayEquals("Explicit visible columns, " + i - + " alignments set", currentAlignments, - t.getColumnAlignments()); + assertArrayEquals( + "Explicit visible columns, " + i + " alignments set", + currentAlignments, t.getColumnAlignments()); } } diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java index 7de6eaf2ef..05392ec0a0 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java @@ -38,8 +38,7 @@ public class TableDeclarativeTest extends TableDeclarativeTestBase { @Test public void testBasicAttributes() { - String design = "<" - + getTag() + String design = "<" + getTag() + " page-length=30 cache-rate=3 selectable editable " + "sortable=false sort-ascending=false sort-container-property-id=foo " + "drag-mode=row multi-select-mode=simple column-header-mode=id row-header-mode=id " @@ -69,12 +68,9 @@ public class TableDeclarativeTest extends TableDeclarativeTestBase { @Test public void testColumns() { - String design = "<" - + getTag() - + " column-collapsing-allowed>" // + String design = "<" + getTag() + " column-collapsing-allowed>" // + " <table>" // - + " <colgroup>" - + " <col property-id='foo' width=300>" + + " <colgroup>" + " <col property-id='foo' width=300>" + " <col property-id='bar' center expand=1 collapsible=false>" + " <col property-id='baz' right expand=2 collapsed>" + " </colgroup>" // @@ -103,8 +99,7 @@ public class TableDeclarativeTest extends TableDeclarativeTestBase { @Test public void testHeadersFooters() { - String design = "<" + getTag() - + ">" // + String design = "<" + getTag() + ">" // + " <table>" // + " <colgroup><col property-id=foo><col property-id=bar></colgroup>" // + " <thead>" // @@ -120,8 +115,8 @@ public class TableDeclarativeTest extends TableDeclarativeTestBase { table.addContainerProperty("foo", String.class, null); table.setColumnHeader("foo", "FOO"); - table.setColumnIcon("foo", new ExternalResource( - "http://example.com/icon.png")); + table.setColumnIcon("foo", + new ExternalResource("http://example.com/icon.png")); table.setColumnFooter("foo", "foo"); table.addContainerProperty("bar", String.class, null); @@ -134,12 +129,9 @@ public class TableDeclarativeTest extends TableDeclarativeTestBase { @Test public void testInlineData() { - String design = "<" - + getTag() - + ">" // + String design = "<" + getTag() + ">" // + " <table>" // - + " <colgroup>" - + " <col property-id='foo' />" + + " <colgroup>" + " <col property-id='foo' />" + " <col property-id='bar' />" + " <col property-id='baz' />" // + " </colgroup>" + " <thead>" @@ -168,27 +160,18 @@ public class TableDeclarativeTest extends TableDeclarativeTestBase { testRead(design, table); testWrite(design, table, true); } - + @Test public void testHtmlEntities() { - String design = "<v-table>" - + "<table>" - + " <colgroup>" - + " <col property-id=\"test\"" - + " </colgroup>" - + " <thead>" - + " <tr><th>& Test</th></tr>" - + " </thead>" - + " <tbody>" - + " <tr item-id=\"test\"><td>& Test</tr>" - + " </tbody>" - + " <tfoot>" - + " <tr><td>& Test</td></tr>" - + " </tfoot>" - + "</table>" - + "</v-table>"; + String design = "<v-table>" + "<table>" + " <colgroup>" + + " <col property-id=\"test\"" + " </colgroup>" + + " <thead>" + " <tr><th>& Test</th></tr>" + + " </thead>" + " <tbody>" + + " <tr item-id=\"test\"><td>& Test</tr>" + " </tbody>" + + " <tfoot>" + " <tr><td>& Test</td></tr>" + + " </tfoot>" + "</table>" + "</v-table>"; Table read = read(design); - + Assert.assertEquals("& Test", read.getContainerProperty("test", "test").getValue()); Assert.assertEquals("& Test", read.getColumnHeader("test")); diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTestBase.java b/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTestBase.java index 1f0b3d924c..96e5e32216 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTestBase.java +++ b/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTestBase.java @@ -20,8 +20,8 @@ import static org.junit.Assert.assertTrue; import com.vaadin.tests.design.DeclarativeTestBase; import com.vaadin.ui.Table; -public abstract class TableDeclarativeTestBase extends - DeclarativeTestBase<Table> { +public abstract class TableDeclarativeTestBase + extends DeclarativeTestBase<Table> { @Override public Table testRead(String design, Table expected) { @@ -40,8 +40,8 @@ public abstract class TableDeclarativeTestBase extends } protected void compareBody(Table read, Table expected) { - assertEquals("number of items", expected.getItemIds().size(), read - .getItemIds().size()); + assertEquals("number of items", expected.getItemIds().size(), + read.getItemIds().size()); for (Object rowId : expected.getItemIds()) { assertTrue(read.containsId(rowId)); for (Object propertyId : read.getVisibleColumns()) { diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/TableGeneratorTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/TableGeneratorTest.java index f3c2589f4a..6fbe5557f8 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/table/TableGeneratorTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/table/TableGeneratorTest.java @@ -17,8 +17,8 @@ public class TableGeneratorTest { for (int j = 0; j < items; j++) { Item item = t.addItem("Item " + j); for (int i = 0; i < properties; i++) { - item.getItemProperty("Property " + i).setValue( - "Item " + j + "/Property " + i); + item.getItemProperty("Property " + i) + .setValue("Item " + j + "/Property " + i); } } diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java index 25c82a137b..91205a4fb8 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java @@ -68,8 +68,8 @@ public class TablePropertyValueConverterTest { @Test public void testSetContainer() { - table.setContainerDataSource(createContainer(new String[] { "col1", - "col3", "col4", "col5" })); + table.setContainerDataSource(createContainer( + new String[] { "col1", "col3", "col4", "col5" })); Collection<Object> converters = table.getCurrentConverters(); assertTrue("There should only have been one converter left.", converters.size() == 1); @@ -112,63 +112,68 @@ public class TablePropertyValueConverterTest { } }); - customTable.setConverter("col2", new LegacyConverter<String, BaseClass>() { - private static final long serialVersionUID = 1L; - - @Override - public BaseClass convertToModel(String value, - Class<? extends BaseClass> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { - return new BaseClass("model"); - } - - @Override - public Class<BaseClass> getModelType() { - return BaseClass.class; - } - - @Override - public Class<String> getPresentationType() { - return String.class; - } - - @Override - public String convertToPresentation(BaseClass value, - Class<? extends String> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { - return null; - } - }); - customTable.setConverter("col3", new LegacyConverter<String, DerivedClass>() { - private static final long serialVersionUID = 1L; - - @Override - public DerivedClass convertToModel(String value, - Class<? extends DerivedClass> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { - return new DerivedClass("derived" + 1001); - } - - @Override - public Class<DerivedClass> getModelType() { - return DerivedClass.class; - } - - @Override - public Class<String> getPresentationType() { - return String.class; - } - - @Override - public String convertToPresentation(DerivedClass value, - Class<? extends String> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { - return null; - } - }); - customTable.setContainerDataSource(createContainer(new String[] { - "col1", "col2", "col3" }, new Class[] { DerivedClass.class, - DerivedClass.class, BaseClass.class })); + customTable.setConverter("col2", + new LegacyConverter<String, BaseClass>() { + private static final long serialVersionUID = 1L; + + @Override + public BaseClass convertToModel(String value, + Class<? extends BaseClass> targetType, + Locale locale) + throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + return new BaseClass("model"); + } + + @Override + public Class<BaseClass> getModelType() { + return BaseClass.class; + } + + @Override + public Class<String> getPresentationType() { + return String.class; + } + + @Override + public String convertToPresentation(BaseClass value, + Class<? extends String> targetType, Locale locale) + throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + return null; + } + }); + customTable.setConverter("col3", + new LegacyConverter<String, DerivedClass>() { + private static final long serialVersionUID = 1L; + + @Override + public DerivedClass convertToModel(String value, + Class<? extends DerivedClass> targetType, + Locale locale) + throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + return new DerivedClass("derived" + 1001); + } + + @Override + public Class<DerivedClass> getModelType() { + return DerivedClass.class; + } + + @Override + public Class<String> getPresentationType() { + return String.class; + } + + @Override + public String convertToPresentation(DerivedClass value, + Class<? extends String> targetType, Locale locale) + throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + return null; + } + }); + customTable.setContainerDataSource( + createContainer(new String[] { "col1", "col2", "col3" }, + new Class[] { DerivedClass.class, DerivedClass.class, + BaseClass.class })); Set<Object> converters = customTable.getCurrentConverters(); // TODO Test temporarily disabled as this feature // is not yet implemented in Table @@ -186,33 +191,34 @@ public class TablePropertyValueConverterTest { createContainer(new String[] { "col1", "col2", "col3" }, new Class[] { int.class, BaseClass.class, DerivedClass.class })); - customTable.setConverter("col1", new LegacyConverter<String, Integer>() { - private static final long serialVersionUID = 1L; - - @Override - public Integer convertToModel(String value, - Class<? extends Integer> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { - return 11; - } - - @Override - public String convertToPresentation(Integer value, - Class<? extends String> targetType, Locale locale) - throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { - return "presentation"; - } - - @Override - public Class<Integer> getModelType() { - return Integer.class; - } - - @Override - public Class<String> getPresentationType() { - return String.class; - } - }); + customTable.setConverter("col1", + new LegacyConverter<String, Integer>() { + private static final long serialVersionUID = 1L; + + @Override + public Integer convertToModel(String value, + Class<? extends Integer> targetType, Locale locale) + throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + return 11; + } + + @Override + public String convertToPresentation(Integer value, + Class<? extends String> targetType, Locale locale) + throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException { + return "presentation"; + } + + @Override + public Class<Integer> getModelType() { + return Integer.class; + } + + @Override + public Class<String> getPresentationType() { + return String.class; + } + }); Set<Object> converters = customTable.getCurrentConverters(); assertTrue("Converter was not set.", converters.size() > 0); } @@ -227,8 +233,8 @@ public class TablePropertyValueConverterTest { @Before public void setUp() { - table = new TestableTable("Test table", createContainer(new String[] { - "col1", "col2", "col3" })); + table = new TestableTable("Test table", + createContainer(new String[] { "col1", "col2", "col3" })); table.setConverter("col1", new LegacyConverter<String, String>() { private static final long serialVersionUID = 1L; diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/TableSelectableTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/TableSelectableTest.java index 2ec8ccec81..17748a8767 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/table/TableSelectableTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/table/TableSelectableTest.java @@ -40,8 +40,8 @@ public class TableSelectableTest { @Test public void addValueChangeListener_explicitSelectable_tableIsSelectable() { TestTable table = new TestTable(); - table.addValueChangeListener(EasyMock - .createMock(ValueChangeListener.class)); + table.addValueChangeListener( + EasyMock.createMock(ValueChangeListener.class)); Assert.assertTrue(table.isSelectable()); Assert.assertTrue(table.markAsDirtyCalled); @@ -58,8 +58,8 @@ public class TableSelectableTest { public void setSelectable_explicitNotSelectable_tableIsNotSelectable() { Table table = new Table(); table.setSelectable(false); - table.addValueChangeListener(EasyMock - .createMock(ValueChangeListener.class)); + table.addValueChangeListener( + EasyMock.createMock(ValueChangeListener.class)); Assert.assertFalse(table.isSelectable()); } diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/TableVisibleColumnsTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/TableVisibleColumnsTest.java index e4f229590f..f9f6e7f979 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/table/TableVisibleColumnsTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/table/TableVisibleColumnsTest.java @@ -14,8 +14,8 @@ public class TableVisibleColumnsTest { @Test public void defaultVisibleColumns() { for (int properties = 0; properties < 10; properties++) { - Table t = TableGeneratorTest.createTableWithDefaultContainer( - properties, 10); + Table t = TableGeneratorTest + .createTableWithDefaultContainer(properties, 10); Object[] expected = new Object[properties]; for (int i = 0; i < properties; i++) { expected[i] = "Property " + i; @@ -28,7 +28,8 @@ public class TableVisibleColumnsTest { @Test public void explicitVisibleColumns() { Table t = TableGeneratorTest.createTableWithDefaultContainer(5, 10); - Object[] newVisibleColumns = new Object[] { "Property 1", "Property 2" }; + Object[] newVisibleColumns = new Object[] { "Property 1", + "Property 2" }; t.setVisibleColumns(newVisibleColumns); assertArrayEquals("Explicit visible columns, 5 properties", newVisibleColumns, t.getVisibleColumns()); @@ -40,7 +41,8 @@ public class TableVisibleColumnsTest { Table t = TableGeneratorTest.createTableWithDefaultContainer(3, 10); try { - t.setVisibleColumns(new Object[] { "a", "Property 2", "Property 3" }); + t.setVisibleColumns( + new Object[] { "a", "Property 2", "Property 3" }); junit.framework.Assert.fail("IllegalArgumentException expected"); } catch (IllegalArgumentException e) { // OK, expected diff --git a/server/src/test/java/com/vaadin/tests/server/component/tabsheet/TabSheetTest.java b/server/src/test/java/com/vaadin/tests/server/component/tabsheet/TabSheetTest.java index a45b2c5587..0b526541c2 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/tabsheet/TabSheetTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/tabsheet/TabSheetTest.java @@ -281,6 +281,6 @@ public class TabSheetTest { // then listener.assertActualComponentIs(lbl3); - assertEquals(lbl3, tabSheet.getSelectedTab()); + assertEquals(lbl3, tabSheet.getSelectedTab()); } } diff --git a/server/src/test/java/com/vaadin/tests/server/component/tree/ListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/tree/ListenersTest.java index 359aa8d480..323966392d 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/tree/ListenersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/tree/ListenersTest.java @@ -44,7 +44,8 @@ public class ListenersTest implements ExpandListener, CollapseListener { expandCalled = 0; tree.expandItemsRecursively(rootIds.get(1)); assertEquals(2, expandCalled); - List<Object> c = new ArrayList<Object>(tree.getChildren(rootIds.get(1))); + List<Object> c = new ArrayList<Object>( + tree.getChildren(rootIds.get(1))); assertEquals(c.get(4), lastExpanded); @@ -116,7 +117,8 @@ public class ListenersTest implements ExpandListener, CollapseListener { collapseCalled = 0; tree.collapseItemsRecursively(rootIds.get(1)); assertEquals(2, collapseCalled); - List<Object> c = new ArrayList<Object>(tree.getChildren(rootIds.get(1))); + List<Object> c = new ArrayList<Object>( + tree.getChildren(rootIds.get(1))); assertEquals(c.get(4), lastCollapsed); // Collapsing an already expanded item should send no expand event diff --git a/server/src/test/java/com/vaadin/tests/server/component/tree/TreeDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/tree/TreeDeclarativeTest.java index 8577ed1af8..fdd2dc6931 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/tree/TreeDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/tree/TreeDeclarativeTest.java @@ -72,8 +72,8 @@ public class TreeDeclarativeTest extends DeclarativeTestBase<Tree> { tree.setParent("Grandchild", "Child"); tree.addItem("With icon"); - tree.setItemIcon("With icon", new ExternalResource( - "http://example.com/icon.png")); + tree.setItemIcon("With icon", + new ExternalResource("http://example.com/icon.png")); testRead(design, tree); testWrite(design, tree, true); diff --git a/server/src/test/java/com/vaadin/tests/server/component/tree/TreeTest.java b/server/src/test/java/com/vaadin/tests/server/component/tree/TreeTest.java index 3e5425a875..ed455415ea 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/tree/TreeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/tree/TreeTest.java @@ -73,16 +73,16 @@ public class TreeTest { @Test public void testContainerTypeIsHierarchical() { - assertTrue(HierarchicalContainer.class.isAssignableFrom(tree - .getContainerDataSource().getClass())); - assertTrue(HierarchicalContainer.class.isAssignableFrom(tree2 - .getContainerDataSource().getClass())); - assertTrue(HierarchicalContainer.class.isAssignableFrom(tree3 - .getContainerDataSource().getClass())); - assertFalse(HierarchicalContainer.class.isAssignableFrom(tree4 - .getContainerDataSource().getClass())); - assertTrue(Container.Hierarchical.class.isAssignableFrom(tree4 - .getContainerDataSource().getClass())); + assertTrue(HierarchicalContainer.class + .isAssignableFrom(tree.getContainerDataSource().getClass())); + assertTrue(HierarchicalContainer.class + .isAssignableFrom(tree2.getContainerDataSource().getClass())); + assertTrue(HierarchicalContainer.class + .isAssignableFrom(tree3.getContainerDataSource().getClass())); + assertFalse(HierarchicalContainer.class + .isAssignableFrom(tree4.getContainerDataSource().getClass())); + assertTrue(Container.Hierarchical.class + .isAssignableFrom(tree4.getContainerDataSource().getClass())); } @Test @@ -91,8 +91,8 @@ public class TreeTest { tree.expandItem("child"); Field expandedField = tree.getClass().getDeclaredField("expanded"); - Field expandedItemIdField = tree.getClass().getDeclaredField( - "expandedItemId"); + Field expandedItemIdField = tree.getClass() + .getDeclaredField("expandedItemId"); expandedField.setAccessible(true); expandedItemIdField.setAccessible(true); @@ -131,8 +131,8 @@ public class TreeTest { tree.setContainerDataSource(new HierarchicalContainer()); Field expandedField = tree.getClass().getDeclaredField("expanded"); - Field expandedItemIdField = tree.getClass().getDeclaredField( - "expandedItemId"); + Field expandedItemIdField = tree.getClass() + .getDeclaredField("expandedItemId"); expandedField.setAccessible(true); expandedItemIdField.setAccessible(true); diff --git a/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableTest.java b/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableTest.java index 33f41d84ea..99cda2e3a3 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableTest.java @@ -58,8 +58,9 @@ public class TreeTableTest { for (RowHeaderMode mode : modes) { tree.setRowHeaderMode(mode); - Assert.assertTrue("Row headers are disabled for " + mode - + " header mode", tree.rowHeadersAreEnabled()); + Assert.assertTrue( + "Row headers are disabled for " + mode + " header mode", + tree.rowHeadersAreEnabled()); } } diff --git a/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java index 146d1f1ad1..1306c14e07 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java @@ -27,8 +27,8 @@ import com.vaadin.ui.TwinColSelect; * * @author Vaadin Ltd */ -public class TwinColSelectDeclarativeTest extends - DeclarativeTestBase<TwinColSelect> { +public class TwinColSelectDeclarativeTest + extends DeclarativeTestBase<TwinColSelect> { public String getBasicDesign() { return "<vaadin-twin-col-select rows=5 right-column-caption='Selected values' left-column-caption='Unselected values'>\n" diff --git a/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectStateTest.java b/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectStateTest.java index b2e2c0a65b..182a1a5f21 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectStateTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectStateTest.java @@ -46,8 +46,8 @@ public class TwinColSelectStateTest { @Test public void selectStateHasCustomPrimaryStyleName() { TwinColSelectState state = new TwinColSelectState(); - Assert.assertEquals("Unexpected primary style name", - "v-select-twincol", state.primaryStyleName); + Assert.assertEquals("Unexpected primary style name", "v-select-twincol", + state.primaryStyleName); } private static class TestTwinColSelect extends TwinColSelect { diff --git a/server/src/test/java/com/vaadin/tests/server/component/ui/CustomUIClassLoaderTest.java b/server/src/test/java/com/vaadin/tests/server/component/ui/CustomUIClassLoaderTest.java index 6ff6c1a71c..e31b3ff8f2 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/ui/CustomUIClassLoaderTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/ui/CustomUIClassLoaderTest.java @@ -70,8 +70,8 @@ public class CustomUIClassLoaderTest { private static DeploymentConfiguration createConfigurationMock() { Properties properties = new Properties(); properties.put(VaadinSession.UI_PARAMETER, MyUI.class.getName()); - return new DefaultDeploymentConfiguration( - CustomUIClassLoaderTest.class, properties); + return new DefaultDeploymentConfiguration(CustomUIClassLoaderTest.class, + properties); } private static VaadinRequest createRequestMock(ClassLoader classloader) { @@ -80,8 +80,8 @@ public class CustomUIClassLoaderTest { .createMock(VaadinService.class); EasyMock.expect(configurationMock.getDeploymentConfiguration()) .andReturn(createConfigurationMock()); - EasyMock.expect(configurationMock.getClassLoader()).andReturn( - classloader); + EasyMock.expect(configurationMock.getClassLoader()) + .andReturn(classloader); // Mock a VaadinRequest to give the mocked vaadin service VaadinRequest requestMock = EasyMock.createMock(VaadinRequest.class); diff --git a/server/src/test/java/com/vaadin/tests/server/component/upload/UploadTest.java b/server/src/test/java/com/vaadin/tests/server/component/upload/UploadTest.java index 358e4db9cd..a07377b83f 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/upload/UploadTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/upload/UploadTest.java @@ -64,7 +64,8 @@ public class UploadTest { state.primaryStyleName); } - private static class TestStreamingErrorEvent implements StreamingErrorEvent { + private static class TestStreamingErrorEvent + implements StreamingErrorEvent { @Override public String getFileName() { diff --git a/server/src/test/java/com/vaadin/tests/server/component/window/AttachDetachWindowTest.java b/server/src/test/java/com/vaadin/tests/server/component/window/AttachDetachWindowTest.java index 9f7a54df9c..b394b97a23 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/window/AttachDetachWindowTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/window/AttachDetachWindowTest.java @@ -227,7 +227,8 @@ public class AttachDetachWindowTest { ui.addComponentAttachListener(new ComponentAttachListener() { @Override - public void componentAttachedToContainer(ComponentAttachEvent event) { + public void componentAttachedToContainer( + ComponentAttachEvent event) { eventFired[0] = event.getAttachedComponent().equals(window); } }); @@ -271,10 +272,10 @@ public class AttachDetachWindowTest { testContent.childAttachCalled); assertSame("window not attached", win.getSession(), testApp); - assertSame("window content not attached", testContent.getUI() - .getSession(), testApp); - assertSame("window children not attached", testContent.child.getUI() - .getSession(), testApp); + assertSame("window content not attached", + testContent.getUI().getSession(), testApp); + assertSame("window children not attached", + testContent.child.getUI().getSession(), testApp); } /** diff --git a/server/src/test/java/com/vaadin/tests/server/component/window/WindowDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/window/WindowDeclarativeTest.java index e1c14e9757..a99ae2bb8a 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/window/WindowDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/window/WindowDeclarativeTest.java @@ -169,10 +169,8 @@ public class WindowDeclarativeTest extends DeclarativeTestBase<Window> { Label assistive2 = new Label("More assistive text"); String design = "<vaadin-window>" - + createElement(assistive1) - .attr(":assistive-description", true) - + createElement(new Button("OK")) - + createElement(assistive2) + + createElement(assistive1).attr(":assistive-description", true) + + createElement(new Button("OK")) + createElement(assistive2) .attr(":assistive-description", true); Window expected = new Window(); @@ -181,12 +179,10 @@ public class WindowDeclarativeTest extends DeclarativeTestBase<Window> { testRead(design, expected); - String written = "<vaadin-window>" - + createElement(new Button("OK")) - + createElement(assistive1) - .attr(":assistive-description", true) - + createElement(assistive2) - .attr(":assistive-description", true); + String written = "<vaadin-window>" + createElement(new Button("OK")) + + createElement(assistive1).attr(":assistive-description", true) + + createElement(assistive2).attr(":assistive-description", + true); testWrite(written, expected); } diff --git a/server/src/test/java/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java b/server/src/test/java/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java index c5bc4f39e5..f1a83adadc 100644 --- a/server/src/test/java/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java +++ b/server/src/test/java/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java @@ -37,7 +37,8 @@ public class AddRemoveComponentTest { hl.addComponent(label); componentContainer.removeComponent(label); - Assert.assertEquals("Parent no longer correct for " - + componentContainer.getClass(), hl, label.getParent()); + Assert.assertEquals( + "Parent no longer correct for " + componentContainer.getClass(), + hl, label.getParent()); } } diff --git a/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java b/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java index 9e71150946..8b20055d82 100644 --- a/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java +++ b/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java @@ -17,9 +17,9 @@ import com.vaadin.legacy.ui.LegacyAbstractField; * {@link ValueChangeNotifier}). * * Subclasses should implement {@link #setValue()} and call - * <code>super.setValue(LegacyAbstractField)</code>. Also, subclasses should typically - * override {@link #setValue(LegacyAbstractField)} to set the field value via - * <code>changeVariables()</code>. + * <code>super.setValue(LegacyAbstractField)</code>. Also, subclasses should + * typically override {@link #setValue(LegacyAbstractField)} to set the field + * value via <code>changeVariables()</code>. */ public abstract class AbstractFieldValueChangeTestBase<T> { @@ -72,8 +72,8 @@ public abstract class AbstractFieldValueChangeTestBase<T> { * be seen in some cases also when there is no notification of value change * from the property. * - * LegacyField value change notifications closely mirror value changes of the data - * source behind the field. + * LegacyField value change notifications closely mirror value changes of + * the data source behind the field. */ @Test public void testNonBuffered() { @@ -87,8 +87,8 @@ public abstract class AbstractFieldValueChangeTestBase<T> { * Fully buffered use where the data source is neither read nor modified * during editing, and is updated at commit(). * - * LegacyField value change notifications reflect the buffered value in the field, - * not the original data source value changes. + * LegacyField value change notifications reflect the buffered value in the + * field, not the original data source value changes. */ public void testBuffered() { getField().setPropertyDataSource(new ObjectProperty<String>("")); diff --git a/server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java b/server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java index 887cc5fe48..3a43fc4005 100644 --- a/server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java @@ -14,8 +14,8 @@ import com.vaadin.ui.ComboBox; * * See <a href="http://dev.vaadin.com/ticket/4394">Ticket 4394</a>. */ -public class ComboBoxValueChangeTest extends - AbstractFieldValueChangeTestBase<Object> { +public class ComboBoxValueChangeTest + extends AbstractFieldValueChangeTestBase<Object> { @Before public void setUp() { diff --git a/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java b/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java index 0d6865bffa..66f86a37d0 100644 --- a/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java @@ -19,8 +19,8 @@ import com.vaadin.legacy.ui.LegacyTextField; * * See <a href="http://dev.vaadin.com/ticket/4394">Ticket 4394</a>. */ -public class TextFieldValueChangeTest extends - AbstractFieldValueChangeTestBase<String> { +public class TextFieldValueChangeTest + extends AbstractFieldValueChangeTestBase<String> { @Before public void setUp() { diff --git a/server/src/test/java/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java b/server/src/test/java/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java index ecd45251b5..f168bfd0d5 100644 --- a/server/src/test/java/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java +++ b/server/src/test/java/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java @@ -99,8 +99,7 @@ public class ClassBasedViewProviderTest { ClassBasedViewProvider provider2 = new ClassBasedViewProvider("test", TestView.class); - assertNull( - "Found view name for empty view string when none registered", + assertNull("Found view name for empty view string when none registered", provider2.getViewName("")); } diff --git a/server/src/test/java/com/vaadin/tests/server/navigator/NavigatorTest.java b/server/src/test/java/com/vaadin/tests/server/navigator/NavigatorTest.java index 3b7ad0ae00..fcf69496db 100644 --- a/server/src/test/java/com/vaadin/tests/server/navigator/NavigatorTest.java +++ b/server/src/test/java/com/vaadin/tests/server/navigator/NavigatorTest.java @@ -151,7 +151,8 @@ public class NavigatorTest { if (!stringEquals(reference.getViewName(), event.getViewName())) { return false; } - if (!stringEquals(reference.getParameters(), event.getParameters())) { + if (!stringEquals(reference.getParameters(), + event.getParameters())) { return false; } return true; @@ -258,9 +259,8 @@ public class NavigatorTest { @Override public boolean matches(Object actual) { - return actual instanceof ViewChangeEvent - && expected.equals(((ViewChangeEvent) actual) - .getParameters()); + return actual instanceof ViewChangeEvent && expected + .equals(((ViewChangeEvent) actual).getParameters()); } }); return null; @@ -299,10 +299,11 @@ public class NavigatorTest { UriFragmentManager manager = (UriFragmentManager) navigator .getStateManager(); - manager.uriFragmentChanged(EasyMock - .createMock(UriFragmentChangedEvent.class)); - Assert.fail("Expected null pointer exception after call uriFragmentChanged " - + "for destroyed navigator"); + manager.uriFragmentChanged( + EasyMock.createMock(UriFragmentChangedEvent.class)); + Assert.fail( + "Expected null pointer exception after call uriFragmentChanged " + + "for destroyed navigator"); } @Test @@ -336,8 +337,8 @@ public class NavigatorTest { manager.setState("test2"); EasyMock.expect(manager.getState()).andReturn("test2"); - EasyMock.expect(provider.getViewName("test1/params")) - .andReturn("test1").times(2); + EasyMock.expect(provider.getViewName("test1/params")).andReturn("test1") + .times(2); EasyMock.expect(provider.getView("test1")).andReturn(view1); EasyMock.expect(manager.getState()).andReturn("test2"); view1.enter(eventParametersEqual("params")); @@ -389,8 +390,8 @@ public class NavigatorTest { display.showView(view1); manager.setState("test1"); - EasyMock.expect(provider.getViewName("test1/params")) - .andReturn("test1").times(2); + EasyMock.expect(provider.getViewName("test1/params")).andReturn("test1") + .times(2); EasyMock.expect(provider.getView("test1")).andReturn(view1); EasyMock.expect(manager.getState()).andReturn("test2"); view1.enter(eventParametersEqual("params")); @@ -582,8 +583,8 @@ public class NavigatorTest { navigator.addView("test", view); - assertEquals("Registered view instance not returned by navigator", - view, navigator.getView("test")); + assertEquals("Registered view instance not returned by navigator", view, + navigator.getView("test")); } @Test @@ -738,8 +739,8 @@ public class NavigatorTest { TestView2.class, navigator.getView("test/subview/").getClass()); assertEquals( "Incorrect view name found for subview string with parameters", - TestView2.class, navigator.getView("test/subview/parameters") - .getClass()); + TestView2.class, + navigator.getView("test/subview/parameters").getClass()); assertEquals("Incorrect view name found for top level view string", TestView.class, navigator.getView("test").getClass()); assertEquals( @@ -747,8 +748,8 @@ public class NavigatorTest { TestView.class, navigator.getView("test/").getClass()); assertEquals( "Incorrect view name found for top level view string with parameters starting like subview name", - TestView.class, navigator.getView("test/subviewnothere") - .getClass()); + TestView.class, + navigator.getView("test/subviewnothere").getClass()); } @Test @@ -758,8 +759,8 @@ public class NavigatorTest { navigator.addView("test/subview", TestView2.class); navigator.addView("test", TestView.class); - assertEquals("Incorrect view name found", TestView.class, navigator - .getView("test").getClass()); + assertEquals("Incorrect view name found", TestView.class, + navigator.getView("test").getClass()); // other order @@ -768,8 +769,8 @@ public class NavigatorTest { navigator2.addView("test", TestView.class); navigator2.addView("test/subview", TestView2.class); - assertEquals("Incorrect view name found", TestView.class, navigator2 - .getView("test").getClass()); + assertEquals("Incorrect view name found", TestView.class, + navigator2.getView("test").getClass()); } @Test @@ -801,10 +802,10 @@ public class NavigatorTest { EasyMock.replay(errorView2); ViewProvider errorProvider = EasyMock.createMock(ViewProvider.class); - EasyMock.expect(errorProvider.getView("doesnotexist2")).andReturn( - errorView2); - EasyMock.expect(errorProvider.getViewName("doesnotexist2")).andReturn( - "doesnotexist2"); + EasyMock.expect(errorProvider.getView("doesnotexist2")) + .andReturn(errorView2); + EasyMock.expect(errorProvider.getViewName("doesnotexist2")) + .andReturn("doesnotexist2"); EasyMock.replay(errorProvider); navigator.setErrorProvider(errorProvider); diff --git a/server/src/test/java/com/vaadin/tests/server/renderer/ImageRendererTest.java b/server/src/test/java/com/vaadin/tests/server/renderer/ImageRendererTest.java index 782434bcd5..9548d73a27 100644 --- a/server/src/test/java/com/vaadin/tests/server/renderer/ImageRendererTest.java +++ b/server/src/test/java/com/vaadin/tests/server/renderer/ImageRendererTest.java @@ -59,8 +59,8 @@ public class ImageRendererTest { @Test public void testExternalResource() { - JsonValue v = renderer.encode(new ExternalResource( - "http://example.com/foo.png")); + JsonValue v = renderer + .encode(new ExternalResource("http://example.com/foo.png")); assertEquals("http://example.com/foo.png", getUrl(v)); } diff --git a/server/src/test/java/com/vaadin/tests/server/renderer/RendererTest.java b/server/src/test/java/com/vaadin/tests/server/renderer/RendererTest.java index 4eca6333d5..e237faa0c5 100644 --- a/server/src/test/java/com/vaadin/tests/server/renderer/RendererTest.java +++ b/server/src/test/java/com/vaadin/tests/server/renderer/RendererTest.java @@ -65,7 +65,8 @@ public class RendererTest { } } - private static class TestConverter implements LegacyConverter<String, TestBean> { + private static class TestConverter + implements LegacyConverter<String, TestBean> { @Override public TestBean convertToModel(String value, @@ -150,8 +151,8 @@ public class RendererTest { @Test public void testDefaultRendererAndConverter() throws Exception { assertSame(TextRenderer.class, intColumn.getRenderer().getClass()); - assertSame(LegacyStringToIntegerConverter.class, intColumn.getConverter() - .getClass()); + assertSame(LegacyStringToIntegerConverter.class, + intColumn.getConverter().getClass()); assertSame(TextRenderer.class, textColumn.getRenderer().getClass()); // String->String; converter not needed @@ -165,8 +166,8 @@ public class RendererTest { @Test public void testFindCompatibleConverter() throws Exception { intColumn.setRenderer(renderer()); - assertSame(LegacyStringToIntegerConverter.class, intColumn.getConverter() - .getClass()); + assertSame(LegacyStringToIntegerConverter.class, + intColumn.getConverter().getClass()); textColumn.setRenderer(renderer()); assertNull(textColumn.getConverter()); @@ -196,8 +197,8 @@ public class RendererTest { @Test public void testEncodingWithoutConverter() throws Exception { - assertEquals("TestBean [42]", render(beanColumn, new TestBean()) - .asString()); + assertEquals("TestBean [42]", + render(beanColumn, new TestBean()).asString()); } @Test @@ -235,21 +236,21 @@ public class RendererTest { textColumn.setRenderer(new TextRenderer("default value")); htmlColumn.setRenderer(new HtmlRenderer("default value")); - numberColumn.setRenderer(new NumberRenderer("%s", Locale.getDefault(), - "default value")); + numberColumn.setRenderer( + new NumberRenderer("%s", Locale.getDefault(), "default value")); dateColumn.setRenderer(new DateRenderer("%s", "default value")); buttonColumn.setRenderer(new ButtonRenderer("default value")); - assertEquals("default value", textColumn.getRenderer().encode(null) - .asString()); - assertEquals("default value", htmlColumn.getRenderer().encode(null) - .asString()); - assertEquals("default value", numberColumn.getRenderer().encode(null) - .asString()); - assertEquals("default value", dateColumn.getRenderer().encode(null) - .asString()); - assertEquals("default value", buttonColumn.getRenderer().encode(null) - .asString()); + assertEquals("default value", + textColumn.getRenderer().encode(null).asString()); + assertEquals("default value", + htmlColumn.getRenderer().encode(null).asString()); + assertEquals("default value", + numberColumn.getRenderer().encode(null).asString()); + assertEquals("default value", + dateColumn.getRenderer().encode(null).asString()); + assertEquals("default value", + buttonColumn.getRenderer().encode(null).asString()); } private TestConverter converter() { diff --git a/server/src/test/java/com/vaadin/tests/server/validation/RangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/server/validation/RangeValidatorTest.java index dfd157c8bb..667abb4529 100644 --- a/server/src/test/java/com/vaadin/tests/server/validation/RangeValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/server/validation/RangeValidatorTest.java @@ -14,7 +14,8 @@ public class RangeValidatorTest { // RangeValidator @Test public void testMinValueNonInclusive() { - LegacyIntegerRangeValidator iv = new LegacyIntegerRangeValidator("Failed", 0, 10); + LegacyIntegerRangeValidator iv = new LegacyIntegerRangeValidator( + "Failed", 0, 10); iv.setMinValueIncluded(false); assertFalse(iv.isValid(0)); assertTrue(iv.isValid(10)); @@ -24,7 +25,8 @@ public class RangeValidatorTest { @Test public void testMinMaxValuesInclusive() { - LegacyIntegerRangeValidator iv = new LegacyIntegerRangeValidator("Failed", 0, 10); + LegacyIntegerRangeValidator iv = new LegacyIntegerRangeValidator( + "Failed", 0, 10); assertTrue(iv.isValid(0)); assertTrue(iv.isValid(1)); assertTrue(iv.isValid(10)); @@ -34,7 +36,8 @@ public class RangeValidatorTest { @Test public void testMaxValueNonInclusive() { - LegacyIntegerRangeValidator iv = new LegacyIntegerRangeValidator("Failed", 0, 10); + LegacyIntegerRangeValidator iv = new LegacyIntegerRangeValidator( + "Failed", 0, 10); iv.setMaxValueIncluded(false); assertTrue(iv.isValid(0)); assertTrue(iv.isValid(9)); @@ -45,7 +48,8 @@ public class RangeValidatorTest { @Test public void testMinMaxValuesNonInclusive() { - LegacyIntegerRangeValidator iv = new LegacyIntegerRangeValidator("Failed", 0, 10); + LegacyIntegerRangeValidator iv = new LegacyIntegerRangeValidator( + "Failed", 0, 10); iv.setMinValueIncluded(false); iv.setMaxValueIncluded(false); diff --git a/server/src/test/java/com/vaadin/tests/util/GraphVizClassHierarchyCreator.java b/server/src/test/java/com/vaadin/tests/util/GraphVizClassHierarchyCreator.java index 9e791500b0..d621c0d2b4 100644 --- a/server/src/test/java/com/vaadin/tests/util/GraphVizClassHierarchyCreator.java +++ b/server/src/test/java/com/vaadin/tests/util/GraphVizClassHierarchyCreator.java @@ -89,7 +89,8 @@ public class GraphVizClassHierarchyCreator { } private static void addClassAndParentInterfaces( - Set<Class> classesAndParents, Class<?> cls, String packageToInclude) { + Set<Class> classesAndParents, Class<?> cls, + String packageToInclude) { if (cls == null) { return; @@ -123,7 +124,8 @@ public class GraphVizClassHierarchyCreator { if (!superClass.getPackage().getName().startsWith(packageToInclude)) { return; } - if (!includeInterfaces && (c.isInterface() || superClass.isInterface())) { + if (!includeInterfaces + && (c.isInterface() || superClass.isInterface())) { return; } diff --git a/server/src/test/java/com/vaadin/tests/util/TestUtil.java b/server/src/test/java/com/vaadin/tests/util/TestUtil.java index 88ed017f91..c4a185647b 100644 --- a/server/src/test/java/com/vaadin/tests/util/TestUtil.java +++ b/server/src/test/java/com/vaadin/tests/util/TestUtil.java @@ -29,15 +29,18 @@ public class TestUtil { while (i1.hasNext()) { Object o1 = i1.next(); if (!i2.hasNext()) { - Assert.fail("The second iterable contains fewer items than the first. The object " - + o1 + " has no match in the second iterable."); + Assert.fail( + "The second iterable contains fewer items than the first. The object " + + o1 + " has no match in the second iterable."); } Object o2 = i2.next(); Assert.assertEquals(o1, o2); } if (i2.hasNext()) { - Assert.fail("The second iterable contains more items than the first. The object " - + i2.next() + " has no match in the first iterable."); + Assert.fail( + "The second iterable contains more items than the first. The object " + + i2.next() + + " has no match in the first iterable."); } } } diff --git a/server/src/test/java/com/vaadin/ui/AbsSelectTest.java b/server/src/test/java/com/vaadin/ui/AbsSelectTest.java index 0b807c5f21..8c71a42fc5 100644 --- a/server/src/test/java/com/vaadin/ui/AbsSelectTest.java +++ b/server/src/test/java/com/vaadin/ui/AbsSelectTest.java @@ -30,8 +30,8 @@ public class AbsSelectTest { NativeSelect ns = new NativeSelect(); ns.addItems("Foo", "bar", "baz"); Assert.assertEquals(3, ns.size()); - Assert.assertArrayEquals(new Object[] { "Foo", "bar", "baz" }, ns - .getItemIds().toArray()); + Assert.assertArrayEquals(new Object[] { "Foo", "bar", "baz" }, + ns.getItemIds().toArray()); } @Test @@ -43,8 +43,8 @@ public class AbsSelectTest { NativeSelect ns = new NativeSelect(); ns.addItems(o1, o2, o3); Assert.assertEquals(3, ns.size()); - Assert.assertArrayEquals(new Object[] { o1, o2, o3 }, ns.getItemIds() - .toArray()); + Assert.assertArrayEquals(new Object[] { o1, o2, o3 }, + ns.getItemIds().toArray()); } @Test @@ -56,8 +56,8 @@ public class AbsSelectTest { NativeSelect ns = new NativeSelect(); ns.addItems(itemIds); Assert.assertEquals(3, ns.size()); - Assert.assertArrayEquals(new Object[] { "foo", "bar", "baz" }, ns - .getItemIds().toArray()); + Assert.assertArrayEquals(new Object[] { "foo", "bar", "baz" }, + ns.getItemIds().toArray()); } @Test @@ -72,8 +72,8 @@ public class AbsSelectTest { NativeSelect ns = new NativeSelect(); ns.addItems(itemIds); Assert.assertEquals(3, ns.size()); - Assert.assertArrayEquals(new Object[] { o1, o2, o3 }, ns.getItemIds() - .toArray()); + Assert.assertArrayEquals(new Object[] { o1, o2, o3 }, + ns.getItemIds().toArray()); } diff --git a/server/src/test/java/com/vaadin/ui/NativeSelectTest.java b/server/src/test/java/com/vaadin/ui/NativeSelectTest.java index 78e4715f9b..f9c13b3988 100644 --- a/server/src/test/java/com/vaadin/ui/NativeSelectTest.java +++ b/server/src/test/java/com/vaadin/ui/NativeSelectTest.java @@ -37,21 +37,22 @@ public class NativeSelectTest { @Test public void rpcRegisteredConstructorStringCollection() { - assertFocusRpcRegistered(new NativeSelect("foo", - Collections.singleton("Hello"))); + assertFocusRpcRegistered( + new NativeSelect("foo", Collections.singleton("Hello"))); } @Test public void rpcRegisteredConstructorStringContainer() { - assertFocusRpcRegistered(new NativeSelect("foo", new IndexedContainer())); + assertFocusRpcRegistered( + new NativeSelect("foo", new IndexedContainer())); } @Test public void getState_listSelectHasCustomState() { TestNativeSelect select = new TestNativeSelect(); AbstractSelectState state = select.getState(); - Assert.assertEquals("Unexpected state class", - AbstractSelectState.class, state.getClass()); + Assert.assertEquals("Unexpected state class", AbstractSelectState.class, + state.getClass()); } private static class TestNativeSelect extends NativeSelect { @@ -62,9 +63,8 @@ public class NativeSelectTest { } private void assertFocusRpcRegistered(NativeSelect s) { - Assert.assertNotNull( - "RPC is not correctly registered", - s.getRpcManager("com.vaadin.shared.communication.FieldRpc$FocusAndBlurServerRpc")); + Assert.assertNotNull("RPC is not correctly registered", s.getRpcManager( + "com.vaadin.shared.communication.FieldRpc$FocusAndBlurServerRpc")); } } diff --git a/server/src/test/java/com/vaadin/ui/PushConfigurationTransportTest.java b/server/src/test/java/com/vaadin/ui/PushConfigurationTransportTest.java index 80e7dd9261..44c6fb00da 100644 --- a/server/src/test/java/com/vaadin/ui/PushConfigurationTransportTest.java +++ b/server/src/test/java/com/vaadin/ui/PushConfigurationTransportTest.java @@ -42,9 +42,11 @@ public class PushConfigurationTransportTest { transport); if (transport == Transport.WEBSOCKET_XHR) { - Assert.assertTrue(ui.getState().pushConfiguration.alwaysUseXhrForServerRequests); + Assert.assertTrue(ui + .getState().pushConfiguration.alwaysUseXhrForServerRequests); } else { - Assert.assertFalse(ui.getState().pushConfiguration.alwaysUseXhrForServerRequests); + Assert.assertFalse(ui + .getState().pushConfiguration.alwaysUseXhrForServerRequests); } } diff --git a/server/src/test/java/com/vaadin/ui/SplitPositionChangeListenerTest.java b/server/src/test/java/com/vaadin/ui/SplitPositionChangeListenerTest.java index 02dc412cd9..5b7b277914 100644 --- a/server/src/test/java/com/vaadin/ui/SplitPositionChangeListenerTest.java +++ b/server/src/test/java/com/vaadin/ui/SplitPositionChangeListenerTest.java @@ -35,10 +35,11 @@ public class SplitPositionChangeListenerTest { @Test public void testSplitPositionListenerIsTriggered() throws Exception { final HorizontalSplitPanel splitPanel = new HorizontalSplitPanel(); - SplitPositionChangeListener splitPositionChangeListener = mock(SplitPositionChangeListener.class); + SplitPositionChangeListener splitPositionChangeListener = mock( + SplitPositionChangeListener.class); splitPanel.addSplitPositionChangeListener(splitPositionChangeListener); splitPanel.setSplitPosition(50, Unit.PERCENTAGE); - verify(splitPositionChangeListener).onSplitPositionChanged( - any(SplitPositionChangeEvent.class)); + verify(splitPositionChangeListener) + .onSplitPositionChanged(any(SplitPositionChangeEvent.class)); } } diff --git a/server/src/test/java/com/vaadin/ui/TableTest.java b/server/src/test/java/com/vaadin/ui/TableTest.java index 86237abbe0..decb03be1a 100644 --- a/server/src/test/java/com/vaadin/ui/TableTest.java +++ b/server/src/test/java/com/vaadin/ui/TableTest.java @@ -39,8 +39,8 @@ public class TableTest { @Test public void emptyAfterClearSingleSelect() { - table.setContainerDataSource(BeanItemContainerGenerator - .createContainer(100)); + table.setContainerDataSource( + BeanItemContainerGenerator.createContainer(100)); Assert.assertTrue(table.isEmpty()); Object first = table.getContainerDataSource().getItemIds().iterator() .next(); @@ -55,8 +55,8 @@ public class TableTest { @Test public void emptyAfterClearMultiSelect() { table.setMultiSelect(true); - table.setContainerDataSource(BeanItemContainerGenerator - .createContainer(100)); + table.setContainerDataSource( + BeanItemContainerGenerator.createContainer(100)); Assert.assertTrue(table.isEmpty()); Assert.assertArrayEquals(new Object[] {}, diff --git a/server/src/test/java/com/vaadin/ui/TextFieldTest.java b/server/src/test/java/com/vaadin/ui/TextFieldTest.java index b64e937bf4..c9259bc770 100644 --- a/server/src/test/java/com/vaadin/ui/TextFieldTest.java +++ b/server/src/test/java/com/vaadin/ui/TextFieldTest.java @@ -31,7 +31,8 @@ public class TextFieldTest { @Test public void emptyAfterClearUsingPDS() { - LegacyTextField tf = new LegacyTextField(new ObjectProperty<String>("foo")); + LegacyTextField tf = new LegacyTextField( + new ObjectProperty<String>("foo")); Assert.assertFalse(tf.isEmpty()); tf.clear(); Assert.assertTrue(tf.isEmpty()); diff --git a/server/src/test/java/com/vaadin/ui/UIInitRefreshTest.java b/server/src/test/java/com/vaadin/ui/UIInitRefreshTest.java index 9e1fabc58f..d048fb2462 100644 --- a/server/src/test/java/com/vaadin/ui/UIInitRefreshTest.java +++ b/server/src/test/java/com/vaadin/ui/UIInitRefreshTest.java @@ -34,8 +34,8 @@ public class UIInitRefreshTest { private boolean fragmentChangeCalled; private boolean browserWindowResizeCalled; - private class TestUI extends UI implements UriFragmentChangedListener, - BrowserWindowResizeListener { + private class TestUI extends UI + implements UriFragmentChangedListener, BrowserWindowResizeListener { @Override protected void init(VaadinRequest request) { getPage().addBrowserWindowResizeListener(this); @@ -87,14 +87,14 @@ public class UIInitRefreshTest { IMocksControl control = EasyMock.createNiceControl(); VaadinRequest initRequest = control.createMock(VaadinRequest.class); - EasyMock.expect(initRequest.getParameter("v-loc")).andReturn( - "http://example.com/#foo"); + EasyMock.expect(initRequest.getParameter("v-loc")) + .andReturn("http://example.com/#foo"); EasyMock.expect(initRequest.getParameter("v-cw")).andReturn("100"); EasyMock.expect(initRequest.getParameter("v-ch")).andReturn("100"); VaadinRequest reinitRequest = control.createMock(VaadinRequest.class); - EasyMock.expect(reinitRequest.getParameter("v-loc")).andReturn( - "http://example.com/#bar"); + EasyMock.expect(reinitRequest.getParameter("v-loc")) + .andReturn("http://example.com/#bar"); EasyMock.expect(reinitRequest.getParameter("v-cw")).andReturn("200"); EasyMock.expect(reinitRequest.getParameter("v-ch")).andReturn("200"); diff --git a/server/src/test/java/com/vaadin/ui/declarative/DesignTest.java b/server/src/test/java/com/vaadin/ui/declarative/DesignTest.java index 778e3ed53a..0b378ef54c 100644 --- a/server/src/test/java/com/vaadin/ui/declarative/DesignTest.java +++ b/server/src/test/java/com/vaadin/ui/declarative/DesignTest.java @@ -47,8 +47,9 @@ public class DesignTest { private static Charset DEFAULT_CHARSET = Charset.defaultCharset(); @AfterClass - public static void restoreCharset() throws NoSuchFieldException, - SecurityException, IllegalArgumentException, IllegalAccessException { + public static void restoreCharset() + throws NoSuchFieldException, SecurityException, + IllegalArgumentException, IllegalAccessException { setCharset(DEFAULT_CHARSET); } @@ -60,9 +61,10 @@ public class DesignTest { String cp1251Html = getHtml(); setUtf8Charset(); String utf8Html = getHtml(); - Assert.assertEquals("Html written with UTF-8 as default encoding " - + "differs from html written with cp1251 encoding", cp1251Html, - utf8Html); + Assert.assertEquals( + "Html written with UTF-8 as default encoding " + + "differs from html written with cp1251 encoding", + cp1251Html, utf8Html); } @Test @@ -71,9 +73,10 @@ public class DesignTest { IllegalArgumentException, IllegalAccessException { setCp1251Charset(); String cp1251Html = getHtml(); - Assert.assertEquals("Non ascii string parsed from serialized HTML " - + "differs from expected", NON_ASCII_STRING, - getHtmlLabelValue(cp1251Html)); + Assert.assertEquals( + "Non ascii string parsed from serialized HTML " + + "differs from expected", + NON_ASCII_STRING, getHtmlLabelValue(cp1251Html)); } @Test @@ -82,9 +85,10 @@ public class DesignTest { IllegalArgumentException, IllegalAccessException { setUtf8Charset(); String utf8 = getHtml(); - Assert.assertEquals("Non ascii string parsed from serialized HTML " - + "differs from expected", NON_ASCII_STRING, - getHtmlLabelValue(utf8)); + Assert.assertEquals( + "Non ascii string parsed from serialized HTML " + + "differs from expected", + NON_ASCII_STRING, getHtmlLabelValue(utf8)); } private String getHtmlLabelValue(String html) { @@ -107,13 +111,15 @@ public class DesignTest { return out.toString(UTF8_CHARSET.name()); } - private void setCp1251Charset() throws NoSuchFieldException, - SecurityException, IllegalArgumentException, IllegalAccessException { + private void setCp1251Charset() + throws NoSuchFieldException, SecurityException, + IllegalArgumentException, IllegalAccessException { setCharset(CP1251_CHARSET); } - private void setUtf8Charset() throws NoSuchFieldException, - SecurityException, IllegalArgumentException, IllegalAccessException { + private void setUtf8Charset() + throws NoSuchFieldException, SecurityException, + IllegalArgumentException, IllegalAccessException { setCharset(UTF8_CHARSET); } diff --git a/server/src/test/java/com/vaadin/util/CurrentInstanceTest.java b/server/src/test/java/com/vaadin/util/CurrentInstanceTest.java index 458e8a2f6c..60015c51c0 100644 --- a/server/src/test/java/com/vaadin/util/CurrentInstanceTest.java +++ b/server/src/test/java/com/vaadin/util/CurrentInstanceTest.java @@ -142,8 +142,8 @@ public class CurrentInstanceTest { assertCleared(); } - private void assertCleared() throws SecurityException, - NoSuchFieldException, IllegalAccessException { + private void assertCleared() throws SecurityException, NoSuchFieldException, + IllegalAccessException { Assert.assertNull(getInternalCurrentInstanceVariable().get()); } @@ -193,8 +193,8 @@ public class CurrentInstanceTest { // Then store a new session in there Map<Class<?>, CurrentInstance> old = CurrentInstance - .setCurrent(new SessionStoredInCurrentInstance(EasyMock - .createNiceMock(VaadinService.class))); + .setCurrent(new SessionStoredInCurrentInstance( + EasyMock.createNiceMock(VaadinService.class))); // Restore the old values and assert that the session is null again CurrentInstance.restoreInstances(old); diff --git a/server/src/test/java/com/vaadin/util/ReflectToolsGetFieldValueByTypeTest.java b/server/src/test/java/com/vaadin/util/ReflectToolsGetFieldValueByTypeTest.java index c3b09428d4..7d15bcfc68 100644 --- a/server/src/test/java/com/vaadin/util/ReflectToolsGetFieldValueByTypeTest.java +++ b/server/src/test/java/com/vaadin/util/ReflectToolsGetFieldValueByTypeTest.java @@ -28,10 +28,11 @@ public class ReflectToolsGetFieldValueByTypeTest { try { memberField = myInstance.getClass().getField("field"); // Should get a String value. Without the third parameter (calling - // ReflectTools.getJavaFieldValue(Object object, LegacyField field)) would + // ReflectTools.getJavaFieldValue(Object object, LegacyField field)) + // would // get an Integer value - fieldValue = ReflectTools.getJavaFieldValue(myInstance, - memberField, String.class); + fieldValue = ReflectTools.getJavaFieldValue(myInstance, memberField, + String.class); } catch (Exception e) { } assertTrue(fieldValue instanceof String); diff --git a/server/src/test/java/com/vaadin/util/ReflectToolsGetPrimitiveFieldValueTest.java b/server/src/test/java/com/vaadin/util/ReflectToolsGetPrimitiveFieldValueTest.java index 40e8f05e1e..d6362395da 100644 --- a/server/src/test/java/com/vaadin/util/ReflectToolsGetPrimitiveFieldValueTest.java +++ b/server/src/test/java/com/vaadin/util/ReflectToolsGetPrimitiveFieldValueTest.java @@ -17,8 +17,8 @@ public class ReflectToolsGetPrimitiveFieldValueTest { Object fieldValue = new Boolean(false); try { memberField = myInstance.getClass().getField("field"); - fieldValue = ReflectTools - .getJavaFieldValue(myInstance, memberField); + fieldValue = ReflectTools.getJavaFieldValue(myInstance, + memberField); } catch (Exception e) { } assertFalse(fieldValue instanceof Boolean); diff --git a/shared/src/main/java/com/vaadin/shared/JavaScriptExtensionState.java b/shared/src/main/java/com/vaadin/shared/JavaScriptExtensionState.java index 5050ffec10..bb323939db 100644 --- a/shared/src/main/java/com/vaadin/shared/JavaScriptExtensionState.java +++ b/shared/src/main/java/com/vaadin/shared/JavaScriptExtensionState.java @@ -23,8 +23,8 @@ import java.util.Set; import com.vaadin.shared.communication.SharedState; -public class JavaScriptExtensionState extends SharedState implements - JavaScriptConnectorState { +public class JavaScriptExtensionState extends SharedState + implements JavaScriptConnectorState { private Set<String> callbackNames = new HashSet<String>(); private Map<String, Set<String>> rpcInterfaces = new HashMap<String, Set<String>>(); diff --git a/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java b/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java index 32299a22d1..3545398382 100644 --- a/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java +++ b/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java @@ -123,8 +123,8 @@ public class VBrowserDetails implements Serializable { } else if (isIE) { int tridentPos = userAgent.indexOf("trident/"); if (tridentPos >= 0) { - String tmp = userAgent.substring(tridentPos - + "Trident/".length()); + String tmp = userAgent + .substring(tridentPos + "Trident/".length()); tmp = tmp.replaceFirst("([0-9]+\\.[0-9]+).*", "$1"); browserEngineVersion = Float.parseFloat(tmp); } @@ -133,8 +133,8 @@ public class VBrowserDetails implements Serializable { } } catch (Exception e) { // Browser engine version parsing failed - System.err.println("Browser engine version parsing failed for: " - + userAgent); + System.err.println( + "Browser engine version parsing failed for: " + userAgent); } // Browser version @@ -149,8 +149,8 @@ public class VBrowserDetails implements Serializable { parseVersionString(tmp); } } else { - String ieVersionString = userAgent.substring(userAgent - .indexOf("msie ") + 5); + String ieVersionString = userAgent + .substring(userAgent.indexOf("msie ") + 5); ieVersionString = safeSubstring(ieVersionString, 0, ieVersionString.indexOf(";")); parseVersionString(ieVersionString); @@ -183,8 +183,8 @@ public class VBrowserDetails implements Serializable { } } catch (Exception e) { // Browser version parsing failed - System.err.println("Browser version parsing failed for: " - + userAgent); + System.err.println( + "Browser version parsing failed for: " + userAgent); } // Operating system @@ -255,8 +255,8 @@ public class VBrowserDetails implements Serializable { // Some Androids report version numbers as "2.1-update1" if (osMinorVersion == -1 && parts[1].contains("-")) { try { - osMinorVersion = Integer.parseInt(parts[1].substring(0, - parts[1].indexOf('-'))); + osMinorVersion = Integer.parseInt( + parts[1].substring(0, parts[1].indexOf('-'))); } catch (Exception ee) { } } @@ -269,16 +269,17 @@ public class VBrowserDetails implements Serializable { if (idx < 0) { idx = versionString.length(); } - browserMajorVersion = Integer.parseInt(safeSubstring(versionString, 0, - idx)); + browserMajorVersion = Integer + .parseInt(safeSubstring(versionString, 0, idx)); int idx2 = versionString.indexOf('.', idx + 1); if (idx2 < 0) { idx2 = versionString.length(); } try { - browserMinorVersion = Integer.parseInt(safeSubstring(versionString, - idx + 1, idx2).replaceAll("[^0-9].*", "")); + browserMinorVersion = Integer + .parseInt(safeSubstring(versionString, idx + 1, idx2) + .replaceAll("[^0-9].*", "")); } catch (NumberFormatException e) { // leave the minor version unmodified (-1 = unknown) } diff --git a/shared/src/main/java/com/vaadin/shared/VaadinUriResolver.java b/shared/src/main/java/com/vaadin/shared/VaadinUriResolver.java index ee8d13f10f..4fc156838b 100644 --- a/shared/src/main/java/com/vaadin/shared/VaadinUriResolver.java +++ b/shared/src/main/java/com/vaadin/shared/VaadinUriResolver.java @@ -70,15 +70,14 @@ public abstract class VaadinUriResolver implements Serializable { // without published://) vaadinUri = ApplicationConstants.APP_PROTOCOL_PREFIX + ApplicationConstants.PUBLISHED_FILE_PATH - + vaadinUri - .substring(ApplicationConstants.PUBLISHED_PROTOCOL_PREFIX + + vaadinUri.substring( + ApplicationConstants.PUBLISHED_PROTOCOL_PREFIX .length()); // Let translation of app:// urls take care of the rest } if (vaadinUri.startsWith(ApplicationConstants.APP_PROTOCOL_PREFIX)) { - String relativeUrl = vaadinUri - .substring(ApplicationConstants.APP_PROTOCOL_PREFIX - .length()); + String relativeUrl = vaadinUri.substring( + ApplicationConstants.APP_PROTOCOL_PREFIX.length()); String serviceUrl = getServiceUrl(); String serviceUrlParameterName = getServiceUrlParameterName(); if (serviceUrlParameterName != null) { @@ -107,9 +106,8 @@ public abstract class VaadinUriResolver implements Serializable { } if (vaadinUri.startsWith(ApplicationConstants.VAADIN_PROTOCOL_PREFIX)) { final String vaadinDirUri = getVaadinDirUrl(); - String relativeUrl = vaadinUri - .substring(ApplicationConstants.VAADIN_PROTOCOL_PREFIX - .length()); + String relativeUrl = vaadinUri.substring( + ApplicationConstants.VAADIN_PROTOCOL_PREFIX.length()); vaadinUri = vaadinDirUri + relativeUrl; } diff --git a/shared/src/main/java/com/vaadin/shared/annotations/Delayed.java b/shared/src/main/java/com/vaadin/shared/annotations/Delayed.java index f7e24de006..c6f42700aa 100644 --- a/shared/src/main/java/com/vaadin/shared/annotations/Delayed.java +++ b/shared/src/main/java/com/vaadin/shared/annotations/Delayed.java @@ -26,8 +26,8 @@ import com.vaadin.shared.communication.ServerRpc; * Invoking a method in a {@link ServerRpc} interface marked with this * annotation will only add the invocation to a queue of outgoing RPC * invocations, but it will not cause the queue to be purged and sent to the - * server. The queue will instead be sent when any RPC method not marked as @Delayed - * has been invoked. + * server. The queue will instead be sent when any RPC method not marked + * as @Delayed has been invoked. * * @author Vaadin Ltd * @version @VERSION@ diff --git a/shared/src/main/java/com/vaadin/shared/communication/FieldRpc.java b/shared/src/main/java/com/vaadin/shared/communication/FieldRpc.java index 28ae8d39b6..296a387c25 100644 --- a/shared/src/main/java/com/vaadin/shared/communication/FieldRpc.java +++ b/shared/src/main/java/com/vaadin/shared/communication/FieldRpc.java @@ -26,8 +26,8 @@ public class FieldRpc implements Serializable { public void blur(); } - public interface FocusAndBlurServerRpc extends FocusServerRpc, - BlurServerRpc { + public interface FocusAndBlurServerRpc + extends FocusServerRpc, BlurServerRpc { } } diff --git a/shared/src/main/java/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java b/shared/src/main/java/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java index 4d21b5af7a..c3cbecd922 100644 --- a/shared/src/main/java/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java +++ b/shared/src/main/java/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java @@ -26,15 +26,14 @@ public class LegacyChangeVariablesInvocation extends MethodInvocation { public LegacyChangeVariablesInvocation(String connectorId, String variableName, Object value) { super(connectorId, ApplicationConstants.UPDATE_VARIABLE_INTERFACE, - ApplicationConstants.UPDATE_VARIABLE_METHOD, new Object[] { - variableName, new UidlValue(value) }); + ApplicationConstants.UPDATE_VARIABLE_METHOD, + new Object[] { variableName, new UidlValue(value) }); setVariableChange(variableName, value); } public static boolean isLegacyVariableChange(String interfaceName, String methodName) { - return ApplicationConstants.UPDATE_VARIABLE_METHOD - .equals(interfaceName) + return ApplicationConstants.UPDATE_VARIABLE_METHOD.equals(interfaceName) && ApplicationConstants.UPDATE_VARIABLE_METHOD .equals(methodName); } diff --git a/shared/src/main/java/com/vaadin/shared/communication/PushConstants.java b/shared/src/main/java/com/vaadin/shared/communication/PushConstants.java index 5b23cd7f6e..4310425928 100644 --- a/shared/src/main/java/com/vaadin/shared/communication/PushConstants.java +++ b/shared/src/main/java/com/vaadin/shared/communication/PushConstants.java @@ -39,7 +39,8 @@ public class PushConstants implements Serializable { * exceed {@link PushConstants#WEBSOCKET_BUFFER_SIZE} given a UTF-8 encoded * message. */ - public static final int WEBSOCKET_FRAGMENT_SIZE = WEBSOCKET_BUFFER_SIZE / 4 - 1; + public static final int WEBSOCKET_FRAGMENT_SIZE = WEBSOCKET_BUFFER_SIZE / 4 + - 1; /** * The character used to mark message boundaries when messages may be split diff --git a/shared/src/main/java/com/vaadin/shared/ui/AlignmentInfo.java b/shared/src/main/java/com/vaadin/shared/ui/AlignmentInfo.java index 120552a43d..2a494591cd 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/AlignmentInfo.java +++ b/shared/src/main/java/com/vaadin/shared/ui/AlignmentInfo.java @@ -75,11 +75,13 @@ public final class AlignmentInfo implements Serializable { } public boolean isVerticalCenter() { - return (bitMask & Bits.ALIGNMENT_VERTICAL_CENTER) == Bits.ALIGNMENT_VERTICAL_CENTER; + return (bitMask + & Bits.ALIGNMENT_VERTICAL_CENTER) == Bits.ALIGNMENT_VERTICAL_CENTER; } public boolean isHorizontalCenter() { - return (bitMask & Bits.ALIGNMENT_HORIZONTAL_CENTER) == Bits.ALIGNMENT_HORIZONTAL_CENTER; + return (bitMask + & Bits.ALIGNMENT_HORIZONTAL_CENTER) == Bits.ALIGNMENT_HORIZONTAL_CENTER; } public String getVerticalAlignment() { diff --git a/shared/src/main/java/com/vaadin/shared/ui/ComponentStateUtil.java b/shared/src/main/java/com/vaadin/shared/ui/ComponentStateUtil.java index 894a1bbcbb..f06db945e6 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/ComponentStateUtil.java +++ b/shared/src/main/java/com/vaadin/shared/ui/ComponentStateUtil.java @@ -31,7 +31,8 @@ public final class ComponentStateUtil implements Serializable { return state.width == null || "".equals(state.width); } - public static final boolean isUndefinedHeight(AbstractComponentState state) { + public static final boolean isUndefinedHeight( + AbstractComponentState state) { return state.height == null || "".equals(state.height); } diff --git a/shared/src/main/java/com/vaadin/shared/ui/JavaScriptComponentState.java b/shared/src/main/java/com/vaadin/shared/ui/JavaScriptComponentState.java index 3208934146..fe4e948af5 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/JavaScriptComponentState.java +++ b/shared/src/main/java/com/vaadin/shared/ui/JavaScriptComponentState.java @@ -24,8 +24,8 @@ import java.util.Set; import com.vaadin.shared.AbstractComponentState; import com.vaadin.shared.JavaScriptConnectorState; -public class JavaScriptComponentState extends AbstractComponentState implements - JavaScriptConnectorState { +public class JavaScriptComponentState extends AbstractComponentState + implements JavaScriptConnectorState { private Set<String> callbackNames = new HashSet<String>(); private Map<String, Set<String>> rpcInterfaces = new HashMap<String, Set<String>>(); diff --git a/shared/src/main/java/com/vaadin/shared/ui/MarginInfo.java b/shared/src/main/java/com/vaadin/shared/ui/MarginInfo.java index 0af3b7351f..4f9e604ecd 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/MarginInfo.java +++ b/shared/src/main/java/com/vaadin/shared/ui/MarginInfo.java @@ -69,12 +69,14 @@ public class MarginInfo implements Serializable { * @param left * enable or disable left margin */ - public MarginInfo(boolean top, boolean right, boolean bottom, boolean left) { + public MarginInfo(boolean top, boolean right, boolean bottom, + boolean left) { doSetMargins(top, right, bottom, left); } /** - * Creates a MarginInfo object by having horizontal and vertical margins specified (analogous to CSS). + * Creates a MarginInfo object by having horizontal and vertical margins + * specified (analogous to CSS). * * @since 7.6.5 * @@ -210,8 +212,8 @@ public class MarginInfo implements Serializable { @Override public String toString() { - return "MarginInfo(" + hasTop() + ", " + hasRight() + ", " - + hasBottom() + ", " + hasLeft() + ")"; + return "MarginInfo(" + hasTop() + ", " + hasRight() + ", " + hasBottom() + + ", " + hasLeft() + ")"; } diff --git a/shared/src/main/java/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java index f4124100e0..513ffb8b84 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java +++ b/shared/src/main/java/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java @@ -21,5 +21,6 @@ import com.vaadin.shared.communication.ServerRpc; public interface CheckBoxServerRpc extends ServerRpc { @Delayed - public void setChecked(boolean checked, MouseEventDetails mouseEventDetails); + public void setChecked(boolean checked, + MouseEventDetails mouseEventDetails); } diff --git a/shared/src/main/java/com/vaadin/shared/ui/colorpicker/Color.java b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/Color.java index 8624327993..e7141757d1 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/colorpicker/Color.java +++ b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/Color.java @@ -125,11 +125,7 @@ public class Color implements Serializable { || !withinRange(alpha)) { String errorMessage = "All values must fall within range [0-255]. (red: " - + red - + ", green: " - + green - + ", blue: " - + blue + + red + ", green: " + green + ", blue: " + blue + ", alpha: " + alpha + ")"; throw new IllegalArgumentException(errorMessage); } @@ -421,9 +417,10 @@ public class Color implements Serializable { if (saturationRatio == 0) { red = green = blue = (int) (lightnessRatio * 255.0f + 0.5f); } else { - float p = lightnessRatio < 0.5f ? lightnessRatio - * (1f + saturationRatio) : lightnessRatio + saturationRatio - - lightnessRatio * saturationRatio; + float p = lightnessRatio < 0.5f + ? lightnessRatio * (1f + saturationRatio) + : lightnessRatio + saturationRatio + - lightnessRatio * saturationRatio; float q = 2 * lightnessRatio - p; red = hslComponentToRgbComponent(p, q, hueRatio + (1f / 3f)); @@ -433,7 +430,8 @@ public class Color implements Serializable { return 0xff000000 | (red << 16) | (green << 8) | (blue << 0); } - private static int hslComponentToRgbComponent(float p, float q, float ratio) { + private static int hslComponentToRgbComponent(float p, float q, + float ratio) { if (ratio < 0) { ratio += 1; } else if (ratio > 1) { @@ -445,7 +443,8 @@ public class Color implements Serializable { } else if (2f * ratio < 1f) { return (int) (p * 255f + 0.5f); } else if (3f * ratio < 2f) { - return (int) ((q + (p - q) * ((2f / 3f) - ratio) * 6f) * 255f + 0.5f); + return (int) ((q + (p - q) * ((2f / 3f) - ratio) * 6f) * 255f + + 0.5f); } return (int) (q * 255f + 0.5f); diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/DetailsConnectorChange.java b/shared/src/main/java/com/vaadin/shared/ui/grid/DetailsConnectorChange.java index 8b64d22423..d668a8fe6d 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/grid/DetailsConnectorChange.java +++ b/shared/src/main/java/com/vaadin/shared/ui/grid/DetailsConnectorChange.java @@ -84,12 +84,11 @@ public class DetailsConnectorChange implements Serializable { boolean connectorAndNewIndexIsNullThenOldIndexIsSet = connector == null && newIndex == null && oldIndex != null; - assert (connectorAndNewIndexIsNotNull || connectorAndNewIndexIsNullThenOldIndexIsSet) : "connector: " - + nullityString(connector) - + ", oldIndex: " - + nullityString(oldIndex) - + ", newIndex: " - + nullityString(newIndex); + assert (connectorAndNewIndexIsNotNull + || connectorAndNewIndexIsNullThenOldIndexIsSet) : "connector: " + + nullityString(connector) + ", oldIndex: " + + nullityString(oldIndex) + ", newIndex: " + + nullityString(newIndex); return true; } diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java index 54ccc78daa..b526767cb1 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java +++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java @@ -127,7 +127,7 @@ public class GridState extends TabIndexState { * @see com.vaadin.ui.Grid#setDetailsVisible(Object, boolean) * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, * elemental.json.JsonArray) - * */ + */ public static final String JSONKEY_DETAILS_VISIBLE = "dv"; /** diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/Range.java b/shared/src/main/java/com/vaadin/shared/ui/grid/Range.java index 21e70d3dbf..60a845fe58 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/grid/Range.java +++ b/shared/src/main/java/com/vaadin/shared/ui/grid/Range.java @@ -374,8 +374,8 @@ public final class Range implements Serializable { */ public Range combineWith(Range other) throws IllegalArgumentException { if (getStart() > other.getEnd() || other.getStart() > getEnd()) { - throw new IllegalArgumentException("There is a gap between " + this - + " and " + other); + throw new IllegalArgumentException( + "There is a gap between " + this + " and " + other); } return Range.between(Math.min(getStart(), other.getStart()), diff --git a/shared/src/main/java/com/vaadin/shared/ui/loginform/LoginFormConstants.java b/shared/src/main/java/com/vaadin/shared/ui/loginform/LoginFormConstants.java index 9f0c256881..23c92475fe 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/loginform/LoginFormConstants.java +++ b/shared/src/main/java/com/vaadin/shared/ui/loginform/LoginFormConstants.java @@ -28,4 +28,3 @@ public class LoginFormConstants implements Serializable { public static final String LOGIN_RESOURCE_NAME = "loginForm"; } - diff --git a/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java index 76e5267bb8..1fee2aede9 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java +++ b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java @@ -18,7 +18,7 @@ package com.vaadin.shared.ui.orderedlayout; import com.vaadin.shared.communication.ServerRpc; import com.vaadin.shared.ui.LayoutClickRpc; -public interface AbstractOrderedLayoutServerRpc extends LayoutClickRpc, - ServerRpc { +public interface AbstractOrderedLayoutServerRpc + extends LayoutClickRpc, ServerRpc { } diff --git a/shared/src/main/java/com/vaadin/shared/ui/ui/UIState.java b/shared/src/main/java/com/vaadin/shared/ui/ui/UIState.java index 48ff9cdaaf..94c9ae2171 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/ui/UIState.java +++ b/shared/src/main/java/com/vaadin/shared/ui/ui/UIState.java @@ -79,8 +79,8 @@ public class UIState extends TabIndexState { tabIndex = 1; } - public static class LoadingIndicatorConfigurationState implements - Serializable { + public static class LoadingIndicatorConfigurationState + implements Serializable { public int firstDelay = 300; public int secondDelay = 1500; public int thirdDelay = 5000; @@ -119,15 +119,15 @@ public class UIState extends TabIndexState { public String pushUrl = null; public Map<String, String> parameters = new HashMap<String, String>(); { - parameters - .put(TRANSPORT_PARAM, Transport.WEBSOCKET.getIdentifier()); + parameters.put(TRANSPORT_PARAM, + Transport.WEBSOCKET.getIdentifier()); parameters.put(FALLBACK_TRANSPORT_PARAM, Transport.LONG_POLLING.getIdentifier()); } } - public static class ReconnectDialogConfigurationState implements - Serializable { + public static class ReconnectDialogConfigurationState + implements Serializable { public String dialogText = "Server connection lost, trying to reconnect..."; public String dialogTextGaveUp = "Server connection lost."; public int reconnectAttempts = 10000; diff --git a/shared/src/main/java/com/vaadin/shared/util/SharedUtil.java b/shared/src/main/java/com/vaadin/shared/util/SharedUtil.java index 28c1ea3734..a20cd83fd4 100644 --- a/shared/src/main/java/com/vaadin/shared/util/SharedUtil.java +++ b/shared/src/main/java/com/vaadin/shared/util/SharedUtil.java @@ -74,7 +74,8 @@ public class SharedUtil implements Serializable { StringBuilder sb = new StringBuilder(); for (int i = 0; i < camelCaseString.length(); i++) { char c = camelCaseString.charAt(i); - if (Character.isUpperCase(c) && isWordComplete(camelCaseString, i)) { + if (Character.isUpperCase(c) + && isWordComplete(camelCaseString, i)) { sb.append(' '); } sb.append(c); diff --git a/shared/src/test/java/com/vaadin/shared/ui/grid/RangeTest.java b/shared/src/test/java/com/vaadin/shared/ui/grid/RangeTest.java index e3cae858ee..bed5732b0d 100644 --- a/shared/src/test/java/com/vaadin/shared/ui/grid/RangeTest.java +++ b/shared/src/test/java/com/vaadin/shared/ui/grid/RangeTest.java @@ -35,7 +35,8 @@ public class RangeTest { @Test public void constructorEquivalenceTest() { - assertEquals("10 == [10,11[", Range.withOnly(10), Range.between(10, 11)); + assertEquals("10 == [10,11[", Range.withOnly(10), + Range.between(10, 11)); assertEquals("[10,20[ == 10, length 10", Range.between(10, 20), Range.withLength(10, 10)); assertEquals("10 == 10, length 1", Range.withOnly(10), @@ -87,17 +88,18 @@ public class RangeTest { assertTrue("end-1 should be contained", range.contains(end - 1)); assertTrue("[0..10[ contains 5", Range.between(0, 10).contains(5)); - assertTrue("empty range does not contain 5", !Range.between(5, 5) - .contains(5)); + assertTrue("empty range does not contain 5", + !Range.between(5, 5).contains(5)); } @Test public void emptyTest() { assertTrue("[0..0[ should be empty", Range.between(0, 0).isEmpty()); - assertTrue("Range of length 0 should be empty", Range.withLength(0, 0) - .isEmpty()); + assertTrue("Range of length 0 should be empty", + Range.withLength(0, 0).isEmpty()); - assertTrue("[0..1[ should not be empty", !Range.between(0, 1).isEmpty()); + assertTrue("[0..1[ should not be empty", + !Range.between(0, 1).isEmpty()); assertTrue("Range of length 1 should not be empty", !Range.withLength(0, 1).isEmpty()); } @@ -151,18 +153,18 @@ public class RangeTest { @Test public void intersectsTest() { - assertTrue("[0..10[ intersects [5..15[", Range.between(0, 10) - .intersects(Range.between(5, 15))); - assertTrue("[0..10[ does not intersect [10..20[", !Range.between(0, 10) - .intersects(Range.between(10, 20))); + assertTrue("[0..10[ intersects [5..15[", + Range.between(0, 10).intersects(Range.between(5, 15))); + assertTrue("[0..10[ does not intersect [10..20[", + !Range.between(0, 10).intersects(Range.between(10, 20))); } @Test public void intersects_emptyInside() { - assertTrue("[5..5[ does intersect with [0..10[", Range.between(5, 5) - .intersects(Range.between(0, 10))); - assertTrue("[0..10[ does intersect with [5..5[", Range.between(0, 10) - .intersects(Range.between(5, 5))); + assertTrue("[5..5[ does intersect with [0..10[", + Range.between(5, 5).intersects(Range.between(0, 10))); + assertTrue("[0..10[ does intersect with [5..5[", + Range.between(0, 10).intersects(Range.between(5, 5))); } @Test @@ -175,14 +177,14 @@ public class RangeTest { @Test public void subsetTest() { - assertTrue("[5..10[ is subset of [0..20[", Range.between(5, 10) - .isSubsetOf(Range.between(0, 20))); + assertTrue("[5..10[ is subset of [0..20[", + Range.between(5, 10).isSubsetOf(Range.between(0, 20))); final Range range = Range.between(0, 10); assertTrue("range is subset of self", range.isSubsetOf(range)); - assertTrue("[0..10[ is not subset of [5..15[", !Range.between(0, 10) - .isSubsetOf(Range.between(5, 15))); + assertTrue("[0..10[ is not subset of [5..15[", + !Range.between(0, 10).isSubsetOf(Range.between(5, 15))); } @Test @@ -220,7 +222,8 @@ public class RangeTest { public void rangeEndsBeforeTest() { final Range former = Range.between(0, 5); final Range latter = Range.between(5, 10); - assertTrue("latter should end before former", former.endsBefore(latter)); + assertTrue("latter should end before former", + former.endsBefore(latter)); assertTrue("former shouldn't end before latter", !latter.endsBefore(former)); diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/AbstractTB3Test.java index 9c617ab128..c2a0bc8793 100644 --- a/uitest-common/src/main/java/com/vaadin/tests/tb3/AbstractTB3Test.java +++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/AbstractTB3Test.java @@ -87,7 +87,8 @@ import elemental.json.impl.JsonUtil; * <li>Hub connection setup and teardown</li> * <li>Automatic generation of URL for a given test on the development server * using {@link #getUIClass()} or by automatically finding an enclosing UI class - * and based on requested features, e.g. {@link #isDebug()}, {@link #isPush()}</li> + * and based on requested features, e.g. {@link #isDebug()}, + * {@link #isPush()}</li> * <li>Generic helpers for creating TB3+ tests</li> * </ul> * @@ -118,11 +119,11 @@ public abstract class AbstractTB3Test extends ParallelTest { private static final int BROWSER_TIMEOUT_IN_MS = 30 * 1000; protected static DesiredCapabilities PHANTOMJS2() { - DesiredCapabilities phantomjs2 = new VaadinBrowserFactory().create( - Browser.PHANTOMJS, "2"); + DesiredCapabilities phantomjs2 = new VaadinBrowserFactory() + .create(Browser.PHANTOMJS, "2"); // Hack for the test cluster - phantomjs2 - .setCapability("phantomjs.binary.path", "/usr/bin/phantomjs2"); + phantomjs2.setCapability("phantomjs.binary.path", + "/usr/bin/phantomjs2"); return phantomjs2; } @@ -174,8 +175,8 @@ public abstract class AbstractTB3Test extends ParallelTest { } protected WebElement getTooltipErrorElement() { - WebElement tooltip = getDriver().findElement( - com.vaadin.testbench.By.className("v-tooltip")); + WebElement tooltip = getDriver() + .findElement(com.vaadin.testbench.By.className("v-tooltip")); return tooltip.findElement(By.className("v-errormessage")); } @@ -202,7 +203,8 @@ public abstract class AbstractTB3Test extends ParallelTest { waitForDebugMessage(expectedMessage, 30); } - protected void waitForDebugMessage(final String expectedMessage, int timeout) { + protected void waitForDebugMessage(final String expectedMessage, + int timeout) { waitUntil(new ExpectedCondition<Boolean>() { @Override @@ -213,12 +215,13 @@ public abstract class AbstractTB3Test extends ParallelTest { } protected void clearDebugMessages() { - driver.findElement( - By.xpath("//button[@class='v-debugwindow-button' and @title='Clear log']")) + driver.findElement(By + .xpath("//button[@class='v-debugwindow-button' and @title='Clear log']")) .click(); } - protected void waitUntilRowIsVisible(final TableElement table, final int row) { + protected void waitUntilRowIsVisible(final TableElement table, + final int row) { waitUntil(new ExpectedCondition<Object>() { @Override public Object apply(WebDriver input) { @@ -331,8 +334,8 @@ public abstract class AbstractTB3Test extends ParallelTest { */ @BrowserConfiguration public List<DesiredCapabilities> getBrowsersToTest() { - return Collections.singletonList(Browser.FIREFOX - .getDesiredCapabilities()); + return Collections + .singletonList(Browser.FIREFOX.getDesiredCapabilities()); } /** @@ -427,8 +430,8 @@ public abstract class AbstractTB3Test extends ParallelTest { /** * Waits the given number of seconds for the given condition to become true. - * Use e.g. as {@link - * #waitUntil(ExpectedConditions.textToBePresentInElement(by, text))} + * Use e.g. as + * {@link #waitUntil(ExpectedConditions.textToBePresentInElement(by, text))} * * @param condition * the condition to wait for to become true @@ -452,8 +455,9 @@ public abstract class AbstractTB3Test extends ParallelTest { /** * Waits the given number of seconds for the given condition to become - * false. Use e.g. as {@link - * #waitUntilNot(ExpectedConditions.textToBePresentInElement(by, text))} + * false. Use e.g. as + * {@link #waitUntilNot(ExpectedConditions.textToBePresentInElement(by, + * text))} * * @param condition * the condition to wait for to become false @@ -506,8 +510,8 @@ public abstract class AbstractTB3Test extends ParallelTest { } /** - * For tests extending AbstractTestUIWithLog, returns the element - * for the Nth log row + * For tests extending AbstractTestUIWithLog, returns the element for the + * Nth log row * * @param rowNr * The log row to retrieve @@ -518,8 +522,8 @@ public abstract class AbstractTB3Test extends ParallelTest { } /** - * For tests extending AbstractTestUIWithLog, returns the text in - * the Nth log row + * For tests extending AbstractTestUIWithLog, returns the text in the Nth + * log row * * @param rowNr * The log row to retrieve text for @@ -595,8 +599,8 @@ public abstract class AbstractTB3Test extends ParallelTest { * @throws AssertionError * If comparison fails */ - public static final <T> void assertLessThan(String message, - Comparable<T> a, T b) throws AssertionError { + public static final <T> void assertLessThan(String message, Comparable<T> a, + T b) throws AssertionError { if (a.compareTo(b) < 0) { return; } @@ -771,8 +775,8 @@ public abstract class AbstractTB3Test extends ParallelTest { */ private String getApplicationId(String pathWithQueryParameters) { // Remove any possible URL parameters - String pathWithoutQueryParameters = pathWithQueryParameters.replaceAll( - "\\?.*", ""); + String pathWithoutQueryParameters = pathWithQueryParameters + .replaceAll("\\?.*", ""); if ("".equals(pathWithoutQueryParameters)) { return "ROOT"; } @@ -859,10 +863,9 @@ public abstract class AbstractTB3Test extends ParallelTest { protected void assertNoDebugMessage(Level level) { // class="v-debugwindow-row Level.getName()" - List<WebElement> logElements = driver - .findElements(By.xpath(String - .format("//div[@class='v-debugwindow-row %s']/span[@class='v-debugwindow-message']", - level.getName()))); + List<WebElement> logElements = driver.findElements(By.xpath(String + .format("//div[@class='v-debugwindow-row %s']/span[@class='v-debugwindow-message']", + level.getName()))); if (!logElements.isEmpty()) { String logRows = ""; for (WebElement e : logElements) { @@ -1008,8 +1011,8 @@ public abstract class AbstractTB3Test extends ParallelTest { } protected boolean isLoadingIndicatorVisible() { - WebElement loadingIndicator = findElement(By - .className("v-loading-indicator")); + WebElement loadingIndicator = findElement( + By.className("v-loading-indicator")); return loadingIndicator.isDisplayed(); } @@ -1019,8 +1022,8 @@ public abstract class AbstractTB3Test extends ParallelTest { @Override public Boolean apply(WebDriver input) { - WebElement loadingIndicator = input.findElement(By - .className("v-loading-indicator")); + WebElement loadingIndicator = input + .findElement(By.className("v-loading-indicator")); return !loadingIndicator.isDisplayed(); } @@ -1049,8 +1052,9 @@ public abstract class AbstractTB3Test extends ParallelTest { protected void selectMenu(String menuCaption, boolean click) { WebElement menuElement = getMenuElement(menuCaption); Dimension size = menuElement.getSize(); - new Actions(getDriver()).moveToElement(menuElement, size.width - 10, - size.height / 2).perform(); + new Actions(getDriver()) + .moveToElement(menuElement, size.width - 10, size.height / 2) + .perform(); if (click) { new Actions(getDriver()).click().perform(); } @@ -1082,8 +1086,9 @@ public abstract class AbstractTB3Test extends ParallelTest { selectMenu(menuCaptions[0], true); // Move to the menu item opened below the menu bar. - new Actions(getDriver()).moveByOffset(0, - getMenuElement(menuCaptions[0]).getSize().getHeight()) + new Actions(getDriver()) + .moveByOffset(0, + getMenuElement(menuCaptions[0]).getSize().getHeight()) .perform(); for (int i = 1; i < menuCaptions.length - 1; i++) { @@ -1166,7 +1171,8 @@ public abstract class AbstractTB3Test extends ParallelTest { Assert.assertFalse( "The element should not have a horizontal scrollbar (scrollWidth: " + scrollWidth + ", clientWidth: " + clientWidth + "): " - + errorMessage, hasScrollbar); + + errorMessage, + hasScrollbar); } protected void assertNoVerticalScrollbar(WebElement element, @@ -1181,7 +1187,8 @@ public abstract class AbstractTB3Test extends ParallelTest { Assert.assertFalse( "The element should not have a vertical scrollbar (scrollHeight: " + scrollHeight + ", clientHeight: " + clientHeight - + "): " + errorMessage, hasScrollbar); + + "): " + errorMessage, + hasScrollbar); } protected int getScrollHeight(WebElement element) { @@ -1246,8 +1253,8 @@ public abstract class AbstractTB3Test extends ParallelTest { protected void waitForThemeToChange(final String theme) { - final WebElement rootDiv = findElement(By - .xpath("//div[contains(@class,'v-app')]")); + final WebElement rootDiv = findElement( + By.xpath("//div[contains(@class,'v-app')]")); waitUntil(new ExpectedCondition<Boolean>() { @Override diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java index 00d7788f8b..5c9830c769 100644 --- a/uitest-common/src/main/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java +++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java @@ -76,23 +76,22 @@ public class CustomTestBenchCommandExecutor { */ public boolean compareScreen(WebElement element, BufferedImage reference, String referenceName, boolean isIE8) throws IOException { - for (int times = 0; times < Parameters.getMaxScreenshotRetries(); times++) { + for (int times = 0; times < Parameters + .getMaxScreenshotRetries(); times++) { BufferedImage screenshotImage = cropToElement(element, ImageIO.read(new ByteArrayInputStream( ((TakesScreenshot) actualDriver) - .getScreenshotAs(OutputType.BYTES))), isIE8); + .getScreenshotAs(OutputType.BYTES))), + isIE8); if (reference == null) { // Store the screenshot in the errors directory and fail the // test ImageFileUtil.createScreenshotDirectoriesIfNeeded(); ImageIO.write(screenshotImage, "png", ImageFileUtil.getErrorScreenshotFile(referenceName)); - getLogger().severe( - "No reference found for " - + referenceName - + " in " - + ImageFileUtil - .getScreenshotReferenceDirectory()); + getLogger().severe("No reference found for " + referenceName + + " in " + + ImageFileUtil.getScreenshotReferenceDirectory()); return false; } if (imageComparison.imageEqualToReference(screenshotImage, @@ -136,8 +135,8 @@ public class CustomTestBenchCommandExecutor { // Get the part of the element which is on screen w = Math.min(fullScreen.getWidth() - x, w); } else { - throw new IOException("Element x is outside the screenshot (x: " - + x + ", y: " + y + ")"); + throw new IOException("Element x is outside the screenshot (x: " + x + + ", y: " + y + ")"); } if (y >= 0 && y < fullScreen.getHeight()) { @@ -145,8 +144,8 @@ public class CustomTestBenchCommandExecutor { // Get the part of the element which is on screen h = Math.min(fullScreen.getHeight() - y, h); } else { - throw new IOException("Element y is outside the screenshot (x: " - + x + ", y: " + y + ")"); + throw new IOException("Element y is outside the screenshot (x: " + x + + ", y: " + y + ")"); } return fullScreen.getSubimage(x, y, w, h); diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/ParameterizedTB3Runner.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/ParameterizedTB3Runner.java index 06e1ea9df9..695f2a404a 100644 --- a/uitest-common/src/main/java/com/vaadin/tests/tb3/ParameterizedTB3Runner.java +++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/ParameterizedTB3Runner.java @@ -59,17 +59,13 @@ public class ParameterizedTB3Runner extends TB3Runner { } if (!m.getName().startsWith("get") || !m.getName().endsWith("s")) { - throw new IllegalStateException( - "Method " - + m.getName() - + " is annotated with @Parameter but is not named getSomeThings() as it should"); + throw new IllegalStateException("Method " + m.getName() + + " is annotated with @Parameter but is not named getSomeThings() as it should"); } if (m.getParameterTypes().length != 0) { - throw new IllegalStateException( - "Method " - + m.getName() - + " annotated with @Parameter should not have any arguments"); + throw new IllegalStateException("Method " + m.getName() + + " annotated with @Parameter should not have any arguments"); } if (!Modifier.isStatic(m.getModifiers())) { @@ -88,9 +84,10 @@ public class ParameterizedTB3Runner extends TB3Runner { setterMethod = getTestClass().getJavaClass().getMethod(setter, String.class); } catch (Exception e) { - throw new IllegalStateException("No setter " + setter - + " found in " - + getTestClass().getJavaClass().getName(), e); + throw new IllegalStateException( + "No setter " + setter + " found in " + + getTestClass().getJavaClass().getName(), + e); } Collection<String> values; @@ -103,8 +100,9 @@ public class ParameterizedTB3Runner extends TB3Runner { parameters.put(setterMethod, values); } } catch (Exception e) { - throw new IllegalStateException("The setter " + m.getName() - + " could not be invoked", e); + throw new IllegalStateException( + "The setter " + m.getName() + " could not be invoked", + e); } } @@ -114,8 +112,8 @@ public class ParameterizedTB3Runner extends TB3Runner { for (FrameworkMethod m : methods) { if (!(m instanceof TBMethod)) { - System.err.println("Unknown method type: " - + m.getClass().getName()); + System.err.println( + "Unknown method type: " + m.getClass().getName()); newMethods.add(m); continue; } diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java index 85104c784b..b44f3582ec 100644 --- a/uitest-common/src/main/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java +++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java @@ -69,8 +69,7 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test { if (properties.containsKey(RUN_LOCALLY_PROPERTY)) { System.setProperty("useLocalWebDriver", "true"); DesiredCapabilities localBrowser = getRunLocallyCapabilities(); - System.setProperty( - "browsers.include", + System.setProperty("browsers.include", localBrowser.getBrowserName() + localBrowser.getVersion()); } @@ -93,15 +92,17 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test { String allowRunLocally = getProperty(ALLOW_RUN_LOCALLY_PROPERTY); if ((allowRunLocally == null || !allowRunLocally.equals("" + true)) && getClass().getAnnotation(RunLocally.class) != null) { - Assert.fail("@RunLocally annotation is not allowed by default in framework tests. " - + "See file uitest/eclipse-run-selected-test.properties for more information."); + Assert.fail( + "@RunLocally annotation is not allowed by default in framework tests. " + + "See file uitest/eclipse-run-selected-test.properties for more information."); } super.setup(); } @Override - public void setDesiredCapabilities(DesiredCapabilities desiredCapabilities) { + public void setDesiredCapabilities( + DesiredCapabilities desiredCapabilities) { super.setDesiredCapabilities(desiredCapabilities); if (BrowserUtil.isIE(desiredCapabilities)) { @@ -123,17 +124,15 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test { desiredCapabilities.setCapability("project", "Vaadin Framework"); desiredCapabilities.setCapability("build", String.format("%s / %s", getDeploymentHostname(), Calendar.getInstance().getTime())); - desiredCapabilities.setCapability( - "name", - String.format("%s.%s", getClass().getCanonicalName(), - testName.getMethodName())); + desiredCapabilities.setCapability("name", String.format("%s.%s", + getClass().getCanonicalName(), testName.getMethodName())); } protected static DesiredCapabilities getRunLocallyCapabilities() { VaadinBrowserFactory factory = new VaadinBrowserFactory(); try { - return factory.create(Browser.valueOf(properties.getProperty( - RUN_LOCALLY_PROPERTY).toUpperCase())); + return factory.create(Browser.valueOf(properties + .getProperty(RUN_LOCALLY_PROPERTY).toUpperCase())); } catch (Exception e) { System.err.println(e.getMessage()); System.err.println("Falling back to FireFox"); @@ -154,9 +153,8 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test { protected String getScreenshotDirectory() { String screenshotDirectory = getProperty(SCREENSHOT_DIRECTORY); if (screenshotDirectory == null) { - throw new RuntimeException( - "No screenshot directory defined. Use -D" - + SCREENSHOT_DIRECTORY + "=<path>"); + throw new RuntimeException("No screenshot directory defined. Use -D" + + SCREENSHOT_DIRECTORY + "=<path>"); } return screenshotDirectory; } diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/RetryOnFail.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/RetryOnFail.java index 7a1656a0d2..78ae12043c 100644 --- a/uitest-common/src/main/java/com/vaadin/tests/tb3/RetryOnFail.java +++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/RetryOnFail.java @@ -39,10 +39,10 @@ public class RetryOnFail implements TestRule { return; } catch (Throwable t) { caughtThrowable = t; - System.err.println(String.format( - "%s: run %s/%s failed.", - description.getDisplayName(), i + 1, - retryCount + 1)); + System.err + .println(String.format("%s: run %s/%s failed.", + description.getDisplayName(), i + 1, + retryCount + 1)); System.err.println(t.getMessage()); } } diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java index d94e05efdb..1ced470637 100644 --- a/uitest-common/src/main/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java +++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java @@ -102,8 +102,8 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test { screenshotFailures = new ArrayList<String>(); Parameters.setScreenshotErrorDirectory(getScreenshotErrorDirectory()); - Parameters - .setScreenshotReferenceDirectory(getScreenshotReferenceDirectory()); + Parameters.setScreenshotReferenceDirectory( + getScreenshotReferenceDirectory()); } /** @@ -127,7 +127,8 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test { protected void compareScreen(WebElement element, String identifier) throws IOException { if (identifier == null || identifier.isEmpty()) { - throw new IllegalArgumentException("Empty identifier not supported"); + throw new IllegalArgumentException( + "Empty identifier not supported"); } File mainReference = getScreenshotReferenceFile(identifier); @@ -207,8 +208,8 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test { return customTestBench; } - private void enableAutoswitch(File htmlFile) throws FileNotFoundException, - IOException { + private void enableAutoswitch(File htmlFile) + throws FileNotFoundException, IOException { if (htmlFile == null || !htmlFile.exists()) { return; } @@ -238,8 +239,8 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test { * @return */ private static File htmlFromPng(File png) { - return new File(png.getParentFile(), png.getName().replaceAll( - "\\.png$", ".png.html")); + return new File(png.getParentFile(), + png.getName().replaceAll("\\.png$", ".png.html")); } /** @@ -444,9 +445,9 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test { if (versionOverride != null) { // Windows_Firefox_17_bufferingdemo_valo - parameters = parameters.replaceFirst("_" - + getDesiredCapabilities().getVersion(), "_" - + versionOverride); + parameters = parameters.replaceFirst( + "_" + getDesiredCapabilities().getVersion(), + "_" + versionOverride); } return parameters; } @@ -459,9 +460,10 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test { * running this test. */ private String getScreenshotErrorBaseName() { - return getScreenshotReferenceName("dummy", null).replace( - getScreenshotReferenceDirectory(), - getScreenshotErrorDirectory()).replace("_dummy.png", ""); + return getScreenshotReferenceName("dummy", null) + .replace(getScreenshotReferenceDirectory(), + getScreenshotErrorDirectory()) + .replace("_dummy.png", ""); } /** diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/SingleBrowserTest.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/SingleBrowserTest.java index b5389d3eec..e8e8089edf 100644 --- a/uitest-common/src/main/java/com/vaadin/tests/tb3/SingleBrowserTest.java +++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/SingleBrowserTest.java @@ -28,7 +28,7 @@ public abstract class SingleBrowserTest extends PrivateTB3Configuration { if (isRunLocally()) { return Collections.singletonList(getRunLocallyCapabilities()); } - return Collections.singletonList(Browser.PHANTOMJS - .getDesiredCapabilities()); + return Collections + .singletonList(Browser.PHANTOMJS.getDesiredCapabilities()); } } diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java index 7447a3c056..b785865790 100644 --- a/uitest-common/src/main/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java +++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java @@ -20,8 +20,8 @@ import java.util.List; import org.openqa.selenium.remote.DesiredCapabilities; -public abstract class SingleBrowserTestPhantomJS2 extends - PrivateTB3Configuration { +public abstract class SingleBrowserTestPhantomJS2 + extends PrivateTB3Configuration { @Override public List<DesiredCapabilities> getBrowsersToTest() { return Collections.singletonList(PHANTOMJS2()); diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3Runner.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3Runner.java index 4917e398cf..9437bab3df 100644 --- a/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3Runner.java +++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3Runner.java @@ -57,7 +57,8 @@ public class TB3Runner extends ParallelRunner { public HttpClient getGridHttpClient(int connection_timeout, int socket_timeout) { - if (socket_timeout == 0 || socket_timeout > SOCKET_TIMEOUT) { + if (socket_timeout == 0 + || socket_timeout > SOCKET_TIMEOUT) { return super.getGridHttpClient(connection_timeout, SOCKET_TIMEOUT); } diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestLocator.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestLocator.java index eb0861757e..f48ea59e4d 100644 --- a/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestLocator.java +++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestLocator.java @@ -74,8 +74,8 @@ public class TB3TestLocator { try { File f = new File(location.toURI()); if (!f.exists()) { - throw new IOException("Directory " + f.toString() - + " does not exist"); + throw new IOException( + "Directory " + f.toString() + " does not exist"); } findPackages(f, basePackage, baseClass, classes, ignoredPackages); @@ -193,7 +193,8 @@ public class TB3TestLocator { return; } - if (!Modifier.isAbstract(c.getModifiers()) && !c.isAnonymousClass()) { + if (!Modifier.isAbstract(c.getModifiers()) + && !c.isAnonymousClass()) { result.add((Class<? extends T>) c); } } catch (Exception e) { @@ -217,8 +218,8 @@ public class TB3TestLocator { .getAnnotation(IncludeIfProperty.class); if (includeIfProperty != null) { String includeValue = includeIfProperty.value(); - String systemPropertyValue = System.getProperty(includeIfProperty - .property()); + String systemPropertyValue = System + .getProperty(includeIfProperty.property()); if (!includeValue.equals(systemPropertyValue)) { return false; } diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestSuite.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestSuite.java index c68d59a4eb..385e5bc4f8 100644 --- a/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestSuite.java +++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestSuite.java @@ -41,8 +41,7 @@ public class TB3TestSuite extends ParallelTestSuite { Class<? extends AbstractTB3Test> baseClass, String basePackage, String[] ignorePackages, TB3TestLocator locator) throws InitializationError, IOException { - super(klass, locator - .findClasses(baseClass, basePackage, ignorePackages).toArray( - new Class<?>[] {})); + super(klass, locator.findClasses(baseClass, basePackage, ignorePackages) + .toArray(new Class<?>[] {})); } } diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java index 2389811ff0..fa35526f4d 100644 --- a/uitest-common/src/main/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java +++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java @@ -42,9 +42,8 @@ public class VaadinBrowserFactory extends DefaultBrowserFactory { .getClassLoader().loadClass(browserFactoryClass) .newInstance(); } catch (Exception e) { - getLogger().warning( - "Failed to instantiate browser factory " - + browserFactoryClass); + getLogger().warning("Failed to instantiate browser factory " + + browserFactoryClass); throw new RuntimeException(e); } } diff --git a/uitest/src/main/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java b/uitest/src/main/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java index e03e970048..ce0c8f1286 100755 --- a/uitest/src/main/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java +++ b/uitest/src/main/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java @@ -101,8 +101,7 @@ public class SQLTestsConstants { versionStatements = new String[] { "create table VERSIONED (\"ID\" serial primary key, \"TEXT\" VARCHAR(255), \"VERSION\" INTEGER DEFAULT 0)", "CREATE OR REPLACE FUNCTION zz_row_version() RETURNS TRIGGER AS $$" - + "BEGIN" - + " IF TG_OP = 'UPDATE'" + + "BEGIN" + " IF TG_OP = 'UPDATE'" + " AND NEW.\"VERSION\" = old.\"VERSION\"" + " AND ROW(NEW.*) IS DISTINCT FROM ROW (old.*)" + " THEN" @@ -125,7 +124,8 @@ public class SQLTestsConstants { dbPwd = "sa"; peopleFirst = "create table PEOPLE (\"ID\" int identity(1,1) primary key, \"NAME\" VARCHAR(32), \"AGE\" INTEGER)"; peopleSecond = null; - versionStatements = new String[] { "create table VERSIONED (\"ID\" int identity(1,1) primary key, \"TEXT\" VARCHAR(255), \"VERSION\" rowversion not null)" }; + versionStatements = new String[] { + "create table VERSIONED (\"ID\" int identity(1,1) primary key, \"TEXT\" VARCHAR(255), \"VERSION\" rowversion not null)" }; sqlGen = new MSSQLGenerator(); break; case ORACLE: diff --git a/uitest/src/main/java/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/main/java/com/vaadin/launcher/ApplicationRunnerServlet.java index 34c82ae4ed..716a44a54c 100644 --- a/uitest/src/main/java/com/vaadin/launcher/ApplicationRunnerServlet.java +++ b/uitest/src/main/java/com/vaadin/launcher/ApplicationRunnerServlet.java @@ -66,8 +66,8 @@ import com.vaadin.util.CurrentInstance; @SuppressWarnings("serial") public class ApplicationRunnerServlet extends LegacyVaadinServlet { - private static class ApplicationRunnerRedirectException extends - RuntimeException { + private static class ApplicationRunnerRedirectException + extends RuntimeException { private final String target; public ApplicationRunnerRedirectException(String target) { @@ -205,8 +205,8 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { try { final Class<?> classToRun = getClassToRun(); if (UI.class.isAssignableFrom(classToRun)) { - session.addUIProvider(new ApplicationRunnerUIProvider( - classToRun)); + session.addUIProvider( + new ApplicationRunnerUIProvider(classToRun)); } else if (LegacyApplication.class.isAssignableFrom(classToRun)) { // Avoid using own UIProvider for legacy Application } else if (UIProvider.class.isAssignableFrom(classToRun)) { @@ -220,10 +220,10 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { } catch (final InstantiationException e) { throw new ServiceException(e); } catch (final ClassNotFoundException e) { - throw new ServiceException( - new InstantiationException( - "Failed to load application class: " - + getApplicationRunnerApplicationClassName((VaadinServletRequest) request))); + throw new ServiceException(new InstantiationException( + "Failed to load application class: " + + getApplicationRunnerApplicationClassName( + (VaadinServletRequest) request))); } } @@ -232,8 +232,8 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { return getApplicationRunnerURIs(request).applicationClassname; } - private final static class ProxyDeploymentConfiguration implements - InvocationHandler, Serializable { + private final static class ProxyDeploymentConfiguration + implements InvocationHandler, Serializable { private final DeploymentConfiguration originalConfiguration; private ProxyDeploymentConfiguration( @@ -246,7 +246,8 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { throws Throwable { if (method.getDeclaringClass() == DeploymentConfiguration.class) { // Find the configuration instance to delegate to - DeploymentConfiguration configuration = findDeploymentConfiguration(originalConfiguration); + DeploymentConfiguration configuration = findDeploymentConfiguration( + originalConfiguration); return method.invoke(configuration, args); } else { @@ -351,8 +352,8 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { String className = file.getPath() .substring(uitestDir.getPath().length() + 1) .replace(File.separatorChar, '.'); - className = className.substring(0, className.length() - - ".java".length()); + className = className.substring(0, + className.length() - ".java".length()); if (isSupportedClass(className)) { lastModifiedTimestamp = file.lastModified(); lastModifiedClassName = className; @@ -394,8 +395,8 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { Class<?> appClass = null; - String baseName = getApplicationRunnerApplicationClassName(request - .get()); + String baseName = getApplicationRunnerApplicationClassName( + request.get()); try { appClass = getClass().getClassLoader().loadClass(baseName); return appClass; @@ -403,16 +404,16 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { // for (String pkg : defaultPackages) { try { - appClass = getClass().getClassLoader().loadClass( - pkg + "." + baseName); + appClass = getClass().getClassLoader() + .loadClass(pkg + "." + baseName); } catch (ClassNotFoundException ee) { // Ignore as this is expected for many packages } catch (Exception e2) { // TODO: handle exception - getLogger().log( - Level.FINE, + getLogger().log(Level.FINE, "Failed to find application class " + pkg + "." - + baseName, e2); + + baseName, + e2); } if (appClass != null) { return appClass; @@ -432,8 +433,8 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { protected DeploymentConfiguration createDeploymentConfiguration( Properties initParameters) { // Get the original configuration from the super class - final DeploymentConfiguration originalConfiguration = super - .createDeploymentConfiguration(initParameters); + final DeploymentConfiguration originalConfiguration = super.createDeploymentConfiguration( + initParameters); // And then create a proxy instance that delegates to the original // configuration or a customized version @@ -447,8 +448,8 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { protected VaadinServletService createServletService( DeploymentConfiguration deploymentConfiguration) throws ServiceException { - VaadinServletService service = super - .createServletService(deploymentConfiguration); + VaadinServletService service = super.createServletService( + deploymentConfiguration); final SystemMessagesProvider provider = service .getSystemMessagesProvider(); service.setSystemMessagesProvider(new SystemMessagesProvider() { @@ -459,8 +460,8 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { if (systemMessagesInfo.getRequest() == null) { return provider.getSystemMessages(systemMessagesInfo); } - Object messages = systemMessagesInfo.getRequest().getAttribute( - CUSTOM_SYSTEM_MESSAGES_PROPERTY); + Object messages = systemMessagesInfo.getRequest() + .getAttribute(CUSTOM_SYSTEM_MESSAGES_PROPERTY); if (messages instanceof SystemMessages) { return (SystemMessages) messages; } @@ -500,9 +501,9 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { try { VaadinServletService service = (VaadinServletService) VaadinService .getCurrent(); - session = service - .findVaadinSession(new VaadinServletRequest( - currentRequest, service)); + session = service.findVaadinSession( + new VaadinServletRequest(currentRequest, + service)); } finally { /* * Clear some state set by findVaadinSession to @@ -510,8 +511,8 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { * e.g. static request handling. */ CurrentInstance.restoreInstances(oldCurrent); - currentRequest.removeAttribute(VaadinSession.class - .getName()); + currentRequest.removeAttribute( + VaadinSession.class.getName()); } } } @@ -542,7 +543,8 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { } CustomDeploymentConfiguration customDeploymentConfiguration = classToRun - .getAnnotation(CustomDeploymentConfiguration.class); + .getAnnotation( + CustomDeploymentConfiguration.class); if (customDeploymentConfiguration != null) { Properties initParameters = new Properties( originalConfiguration.getInitParameters()); diff --git a/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java b/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java index 5861ede412..6e6b3964ab 100644 --- a/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java +++ b/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java @@ -154,14 +154,10 @@ public class DevelopmentServerLauncher { } // Add help for System.out - System.out - .println("-------------------------------------------------\n" - + "Starting Vaadin in " - + mode - + ".\n" - + "Running in http://localhost:" - + port - + "\n-------------------------------------------------\n"); + System.out.println("-------------------------------------------------\n" + + "Starting Vaadin in " + mode + ".\n" + + "Running in http://localhost:" + port + + "\n-------------------------------------------------\n"); final Server server = new Server(); @@ -240,8 +236,8 @@ public class DevelopmentServerLauncher { } } if (!classFolders.isEmpty()) { - System.out - .println("Enabling context auto-reload.\n Scan interval: " + System.out.println( + "Enabling context auto-reload.\n Scan interval: " + interval + " secs.\n Scanned folders: "); for (File f : classFolders) { System.out.println(" " + f.getAbsolutePath()); @@ -284,16 +280,16 @@ public class DevelopmentServerLauncher { server.start(); if (serverArgs.containsKey("shutdownPort")) { - int shutdownPort = Integer.parseInt(serverArgs - .get("shutdownPort")); - final ServerSocket serverSocket = new ServerSocket( - shutdownPort, 1, InetAddress.getByName("127.0.0.1")); + int shutdownPort = Integer + .parseInt(serverArgs.get("shutdownPort")); + final ServerSocket serverSocket = new ServerSocket(shutdownPort, + 1, InetAddress.getByName("127.0.0.1")); new Thread() { @Override public void run() { try { - System.out - .println("Waiting for shutdown signal on port " + System.out.println( + "Waiting for shutdown signal on port " + serverSocket.getLocalPort()); // Start waiting for a close signal Socket accept = serverSocket.accept(); @@ -308,8 +304,8 @@ public class DevelopmentServerLauncher { try { Thread.sleep(5000); if (!server.isStopped()) { - System.out - .println("Jetty still running. Closing JVM."); + System.out.println( + "Jetty still running. Closing JVM."); dumpThreadStacks(); System.exit(-1); } @@ -442,8 +438,8 @@ public class DevelopmentServerLauncher { FilterChain chain) throws IOException, ServletException { String path = ((HttpServletRequest) request).getPathInfo(); - System.out.println("Caching " + path + " for " + CACHE_MINUTES - + " minutes"); + System.out.println( + "Caching " + path + " for " + CACHE_MINUTES + " minutes"); Calendar calendar = Calendar.getInstance(); calendar.add(Calendar.MINUTE, CACHE_MINUTES); diff --git a/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java b/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java index a3fc282131..42866558c8 100644 --- a/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java +++ b/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java @@ -121,7 +121,8 @@ public class ScreenshotBrowser extends UI { return new File(screenshotDir, "reference"); } - private static File getAlternative(File baseFile, int alternativeNumber) { + private static File getAlternative(File baseFile, + int alternativeNumber) { assert alternativeNumber >= 1; String alternativeName = baseFile.getName().replaceFirst("\\.png", "_" + alternativeNumber + ".png"); @@ -198,18 +199,18 @@ public class ScreenshotBrowser extends UI { left.setSpacing(true); left.setSizeFull(); - left.addComponent(createActionButton("Accept changes", 'j', - Action.ACCEPT)); - left.addComponent(createActionButton("Ignore changes", 'k', - Action.IGNORE)); + left.addComponent( + createActionButton("Accept changes", 'j', Action.ACCEPT)); + left.addComponent( + createActionButton("Ignore changes", 'k', Action.IGNORE)); left.addComponent(createActionButton("Use as alternative", 'l', Action.ALTERNATIVE)); - left.addComponent(new Button("Clear action", - createSetActionListener(null))); + left.addComponent( + new Button("Clear action", createSetActionListener(null))); left.addComponent(createSpacer()); - left.addComponent(new Button("Commit actions", - new Button.ClickListener() { + left.addComponent( + new Button("Commit actions", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { commitActions(); @@ -241,8 +242,9 @@ public class ScreenshotBrowser extends UI { private Button createActionButton(String caption, char shortcut, Action action) { - Button button = new Button(caption + " <strong>" + shortcut - + "</strong>", createSetActionListener(action)); + Button button = new Button( + caption + " <strong>" + shortcut + "</strong>", + createSetActionListener(action)); button.setCaptionAsHtml(true); return button; } @@ -300,12 +302,12 @@ public class ScreenshotBrowser extends UI { } }); - table.addShortcutListener(createShortcutListener(KeyCode.J, - Action.ACCEPT)); - table.addShortcutListener(createShortcutListener(KeyCode.K, - Action.IGNORE)); - table.addShortcutListener(createShortcutListener(KeyCode.L, - Action.ALTERNATIVE)); + table.addShortcutListener( + createShortcutListener(KeyCode.J, Action.ACCEPT)); + table.addShortcutListener( + createShortcutListener(KeyCode.K, Action.IGNORE)); + table.addShortcutListener( + createShortcutListener(KeyCode.L, Action.ALTERNATIVE)); refreshTableContainer(); @@ -320,7 +322,8 @@ public class ScreenshotBrowser extends UI { } private void commitActions() { - for (ComparisonFailure comparisonFailure : getContainer().getItemIds()) { + for (ComparisonFailure comparisonFailure : getContainer() + .getItemIds()) { Action action = comparisonFailure.getAction(); if (action != null) { action.commit(comparisonFailure.getFile()); @@ -400,8 +403,8 @@ public class ScreenshotBrowser extends UI { File propertiesFile = new File( "../work/eclipse-run-selected-test.properties"); if (!propertiesFile.exists()) { - throw new RuntimeException("File " - + propertiesFile.getAbsolutePath() + " not found."); + throw new RuntimeException( + "File " + propertiesFile.getAbsolutePath() + " not found."); } FileInputStream in = null; @@ -412,7 +415,8 @@ public class ScreenshotBrowser extends UI { properties.load(in); String screenShotDirName = properties .getProperty("com.vaadin.testbench.screenshot.directory"); - if (screenShotDirName == null || screenShotDirName.startsWith("<")) { + if (screenShotDirName == null + || screenShotDirName.startsWith("<")) { throw new RuntimeException( "com.vaadin.testbench.screenshot.directory has not been configred in " + propertiesFile.getAbsolutePath()); diff --git a/uitest/src/main/java/com/vaadin/tests/Components.java b/uitest/src/main/java/com/vaadin/tests/Components.java index 7f024e774a..10c204135f 100644 --- a/uitest/src/main/java/com/vaadin/tests/Components.java +++ b/uitest/src/main/java/com/vaadin/tests/Components.java @@ -93,10 +93,9 @@ public class Components extends LegacyApplication { sp = new HorizontalSplitPanel(); sp.setSizeFull(); VerticalLayout naviLayout = new VerticalLayout(); - naviLayout - .addComponent(new Label( - "Click to open a test case.<br/>Right click to open test in a new window<br/><br/>", - ContentMode.HTML)); + naviLayout.addComponent(new Label( + "Click to open a test case.<br/>Right click to open test in a new window<br/><br/>", + ContentMode.HTML)); naviLayout.addComponent(createMenu()); naviLayout.addComponent(createMissingTestsList()); @@ -104,10 +103,9 @@ public class Components extends LegacyApplication { sp.setSplitPosition(250, Sizeable.UNITS_PIXELS); VerticalLayout embeddingLayout = new VerticalLayout(); embeddingLayout.setSizeFull(); - embeddingLayout - .addComponent(new Label( - "<b>Do not use the embedded version for creating automated tests. Open the test in a new window before recording.</b><br/>", - ContentMode.HTML)); + embeddingLayout.addComponent(new Label( + "<b>Do not use the embedded version for creating automated tests. Open the test in a new window before recording.</b><br/>", + ContentMode.HTML)); applicationEmbedder.setSizeFull(); embeddingLayout.addComponent(applicationEmbedder); embeddingLayout.setExpandRatio(applicationEmbedder, 1); @@ -129,8 +127,9 @@ public class Components extends LegacyApplication { missingTests += "<font class=\"" + cls + "\">" + component.getSimpleName() + "</font><br/>"; } - return new Label("<b>Components without a test:</B><br/>" - + missingTests, ContentMode.HTML); + return new Label( + "<b>Components without a test:</B><br/>" + missingTests, + ContentMode.HTML); } private Component createMenu() { diff --git a/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java b/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java index 85c1229169..b1df9f2976 100644 --- a/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java +++ b/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java @@ -113,8 +113,8 @@ public class CustomLayoutDemo extends com.vaadin.server.LegacyApplication setBody("Welcome"); // Add heading label and custom layout panel to main window - mainWindow.addComponent(new Label("<h3>Custom layout demo</h3>", - ContentMode.HTML)); + mainWindow.addComponent( + new Label("<h3>Custom layout demo</h3>", ContentMode.HTML)); mainWindow.addComponent(customLayoutPanel); } @@ -129,8 +129,9 @@ public class CustomLayoutDemo extends com.vaadin.server.LegacyApplication if (username.getValue().toString().length() < 1) { username.setValue("Anonymous"); } - mainLayout.replaceComponent(loginButton, new Label("Welcome user <em>" - + username.getValue() + "</em>", ContentMode.HTML)); + mainLayout.replaceComponent(loginButton, + new Label("Welcome user <em>" + username.getValue() + "</em>", + ContentMode.HTML)); } /** diff --git a/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java b/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java index c62a9ea51b..a7759e9e08 100644 --- a/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java +++ b/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java @@ -87,7 +87,8 @@ public class LayoutDemo extends com.vaadin.server.LegacyApplication { // Create TabSheet // final TabSheet tabsheet = new TabSheet(); - tabsheet.setCaption("Tabsheet, above layouts are added to this component"); + tabsheet.setCaption( + "Tabsheet, above layouts are added to this component"); tabsheet.addTab(layoutA, "Horizontal ordered layout", null); tabsheet.addTab(layoutB, "Vertical ordered layout", null); tabsheet.addTab(layoutG, "First grid layout", null); @@ -108,13 +109,15 @@ public class LayoutDemo extends com.vaadin.server.LegacyApplication { "<br /><h3>Grid Layout (4 x 4)</h3>Added 16 components.", ContentMode.HTML)); mainWindow.addComponent(layoutG); - mainWindow.addComponent(new Label("<br /><h3>Grid Layout (4 x 4)</h3>" - + "Added four panels and four embedded components " - + "diagonally with absolute coordinates.", ContentMode.HTML)); - mainWindow.addComponent(layoutG2); mainWindow.addComponent(new Label( - "<br /><h3>TabSheet</h3>Added above layouts as tabs.", + "<br /><h3>Grid Layout (4 x 4)</h3>" + + "Added four panels and four embedded components " + + "diagonally with absolute coordinates.", ContentMode.HTML)); + mainWindow.addComponent(layoutG2); + mainWindow.addComponent( + new Label("<br /><h3>TabSheet</h3>Added above layouts as tabs.", + ContentMode.HTML)); mainWindow.addComponent(tabsheet); } diff --git a/uitest/src/main/java/com/vaadin/tests/ListenerOrder.java b/uitest/src/main/java/com/vaadin/tests/ListenerOrder.java index 8375b75f4b..b24ba1e99c 100644 --- a/uitest/src/main/java/com/vaadin/tests/ListenerOrder.java +++ b/uitest/src/main/java/com/vaadin/tests/ListenerOrder.java @@ -89,7 +89,8 @@ public class ListenerOrder extends com.vaadin.server.LegacyApplication s1.addListener((ValueChangeListener) this); Item i = s1.getItem("second"); - for (Iterator<?> it = i.getItemPropertyIds().iterator(); it.hasNext();) { + for (Iterator<?> it = i.getItemPropertyIds().iterator(); it + .hasNext();) { Object o = it.next(); System.out.println("[" + o + "]"); } diff --git a/uitest/src/main/java/com/vaadin/tests/ModalWindow.java b/uitest/src/main/java/com/vaadin/tests/ModalWindow.java index 045000a090..2f81d7c641 100644 --- a/uitest/src/main/java/com/vaadin/tests/ModalWindow.java +++ b/uitest/src/main/java/com/vaadin/tests/ModalWindow.java @@ -35,8 +35,8 @@ import com.vaadin.ui.Window; * @see com.vaadin.ui.Window * @see com.vaadin.ui.Label */ -public class ModalWindow extends com.vaadin.server.LegacyApplication implements - ClickListener { +public class ModalWindow extends com.vaadin.server.LegacyApplication + implements ClickListener { private Window test; private Button reopen; diff --git a/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java b/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java index b646655c35..cad6051072 100644 --- a/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java +++ b/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java @@ -37,14 +37,14 @@ public class NativeWindowing extends LegacyApplication { setMainWindow(main); - main.addComponent(new Button("Add new subwindow", - new Button.ClickListener() { + main.addComponent( + new Button("Add new subwindow", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { VerticalLayout layout = new VerticalLayout(); layout.setMargin(true); - final Window w = new Window("sw " - + System.currentTimeMillis(), layout); + final Window w = new Window( + "sw " + System.currentTimeMillis(), layout); main.addWindow(w); w.setPositionX(100); w.setPositionY(100); @@ -54,14 +54,15 @@ public class NativeWindowing extends LegacyApplication { w.setWidth("100px"); w.setHeight("400px"); - final Button closebutton = new Button("Close " - + w.getCaption(), new Button.ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - main.removeWindow(w); - } + final Button closebutton = new Button( + "Close " + w.getCaption(), + new Button.ClickListener() { + @Override + public void buttonClick(ClickEvent event) { + main.removeWindow(w); + } - }); + }); layout.addComponent(closebutton); layout.addComponent(new Label( @@ -98,13 +99,12 @@ public class NativeWindowing extends LegacyApplication { @Override public void buttonClick(ClickEvent event) { try { - main.open( - new com.vaadin.server.ExternalResource( - new URL( - getURL(), - "mainwin-" - + System.currentTimeMillis() - + "/")), null); + main.open(new com.vaadin.server.ExternalResource( + new URL(getURL(), + "mainwin-" + + System.currentTimeMillis() + + "/")), + null); } catch (final MalformedURLException e) { } } @@ -134,8 +134,8 @@ public class NativeWindowing extends LegacyApplication { @Override public void buttonClick(ClickEvent event) { - ww.addComponent(new Label("Button clicked " + (++state) - + " times")); + ww.addComponent(new Label( + "Button clicked " + (++state) + " times")); } })); addWindow(ww); diff --git a/uitest/src/main/java/com/vaadin/tests/Parameters.java b/uitest/src/main/java/com/vaadin/tests/Parameters.java index 7e71c4dc76..92ad0051f9 100644 --- a/uitest/src/main/java/com/vaadin/tests/Parameters.java +++ b/uitest/src/main/java/com/vaadin/tests/Parameters.java @@ -40,8 +40,8 @@ import com.vaadin.ui.VerticalLayout; * * @since 3.1.1 */ -public class Parameters extends com.vaadin.server.LegacyApplication implements - RequestHandler { +public class Parameters extends com.vaadin.server.LegacyApplication + implements RequestHandler { private final Label context = new Label(); @@ -65,14 +65,14 @@ public class Parameters extends com.vaadin.server.LegacyApplication implements try { final URL u1 = new URL(getURL(), "test/uri?test=1&test=2"); final URL u2 = new URL(getURL(), "foo/bar?mary=john&count=3"); - layout.addComponent(new Link(u1.toString(), - new ExternalResource(u1))); + layout.addComponent( + new Link(u1.toString(), new ExternalResource(u1))); layout.addComponent(new Label("Or this: ")); - layout.addComponent(new Link(u2.toString(), - new ExternalResource(u2))); + layout.addComponent( + new Link(u2.toString(), new ExternalResource(u2))); } catch (final Exception e) { - System.out.println("Couldn't get hostname for this machine: " - + e.toString()); + System.out.println( + "Couldn't get hostname for this machine: " + e.toString()); e.printStackTrace(); } diff --git a/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java b/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java index 08f8bc4d7a..879f6fe14a 100644 --- a/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java +++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java @@ -48,8 +48,8 @@ public class PerformanceTestLabelsAndOrderedLayouts extends CustomComponent { result = new Label(); main.addComponent(result); - main.addComponent(new Button("click when rendered", - new ClickListener() { + main.addComponent( + new Button("click when rendered", new ClickListener() { @Override public void buttonClick(ClickEvent event) { @@ -57,14 +57,14 @@ public class PerformanceTestLabelsAndOrderedLayouts extends CustomComponent { } })); - main.addComponent(new Button( - "Click for layout repaint (cached components)", - new ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - testContainer.markAsDirty(); - } - })); + main.addComponent( + new Button("Click for layout repaint (cached components)", + new ClickListener() { + @Override + public void buttonClick(ClickEvent event) { + testContainer.markAsDirty(); + } + })); testContainer = new VerticalLayout(); diff --git a/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java b/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java index a6f112cff0..910408dbba 100644 --- a/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java +++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java @@ -56,7 +56,8 @@ public class PerformanceTestSubTreeCaching extends CustomComponent { startTest(); } }); - b.setDescription("Push this button to start test. A test label will be rendered above existing components."); + b.setDescription( + "Push this button to start test. A test label will be rendered above existing components."); main.addComponent(b); b = new Button("end test", new Button.ClickListener() { @Override @@ -64,7 +65,8 @@ public class PerformanceTestSubTreeCaching extends CustomComponent { endTest(); } }); - b.setDescription("Push this button as soon as test componenet is rendered."); + b.setDescription( + "Push this button as soon as test componenet is rendered."); main.addComponent(b); result = new Label(); diff --git a/uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java b/uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java index 84c9d70299..287da60c9c 100644 --- a/uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java +++ b/uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java @@ -76,10 +76,10 @@ public class StressComponentsInTable extends CustomComponent { "Charles", "Aaron", "Lucas", "Luis", "Owen", "Landon", "Diego", "Brian", "Adam", "Adrian", "Kyle", "Eric", "Ian", "Nathaniel", "Carlos", "Alex", "Bryan", "Jesus", "Julian", "Sean", "Carter", - "Hayden", "Jeremiah", "Cole", "Brayden", "Wyatt", "Chase", - "Steven", "Timothy", "Dominic", "Sebastian", "Xavier", "Jaden", - "Jesse", "Devin", "Seth", "Antonio", "Richard", "Miguel", "Colin", - "Cody", "Alejandro", "Caden", "Blake", "Carson" }; + "Hayden", "Jeremiah", "Cole", "Brayden", "Wyatt", "Chase", "Steven", + "Timothy", "Dominic", "Sebastian", "Xavier", "Jaden", "Jesse", + "Devin", "Seth", "Antonio", "Richard", "Miguel", "Colin", "Cody", + "Alejandro", "Caden", "Blake", "Carson" }; public static String rndString() { return testString[(int) (Math.random() * testString.length)]; diff --git a/uitest/src/main/java/com/vaadin/tests/TableChangingDatasource.java b/uitest/src/main/java/com/vaadin/tests/TableChangingDatasource.java index 162c850fb5..ce3240c9fa 100644 --- a/uitest/src/main/java/com/vaadin/tests/TableChangingDatasource.java +++ b/uitest/src/main/java/com/vaadin/tests/TableChangingDatasource.java @@ -24,8 +24,8 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; -public class TableChangingDatasource extends CustomComponent implements - ClickListener { +public class TableChangingDatasource extends CustomComponent + implements ClickListener { Table t; Table[] ta = new Table[4]; private int mode = 0; @@ -33,22 +33,22 @@ public class TableChangingDatasource extends CustomComponent implements public TableChangingDatasource() { final VerticalLayout main = new VerticalLayout(); - main.addComponent(new Label( - "Table should look sane after data source changes")); + main.addComponent( + new Label("Table should look sane after data source changes")); t = new Table(); t.setWidth("500px"); t.setHeight("300px"); - ta[0] = TestForTablesInitialColumnWidthLogicRendering - .getTestTable(3, 0); - ta[1] = TestForTablesInitialColumnWidthLogicRendering - .getTestTable(3, 7); - ta[2] = TestForTablesInitialColumnWidthLogicRendering - .getTestTable(3, 5); - ta[3] = TestForTablesInitialColumnWidthLogicRendering - .getTestTable(3, 1); + ta[0] = TestForTablesInitialColumnWidthLogicRendering.getTestTable(3, + 0); + ta[1] = TestForTablesInitialColumnWidthLogicRendering.getTestTable(3, + 7); + ta[2] = TestForTablesInitialColumnWidthLogicRendering.getTestTable(3, + 5); + ta[3] = TestForTablesInitialColumnWidthLogicRendering.getTestTable(3, + 1); main.addComponent(t); main.addComponent(new Button("switch DS", this)); diff --git a/uitest/src/main/java/com/vaadin/tests/TableSelectTest.java b/uitest/src/main/java/com/vaadin/tests/TableSelectTest.java index 61c93d0eae..c54a733da8 100644 --- a/uitest/src/main/java/com/vaadin/tests/TableSelectTest.java +++ b/uitest/src/main/java/com/vaadin/tests/TableSelectTest.java @@ -22,8 +22,8 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; -public class TableSelectTest extends CustomComponent implements - Table.ValueChangeListener { +public class TableSelectTest extends CustomComponent + implements Table.ValueChangeListener { public TableSelectTest() { final VerticalLayout main = new VerticalLayout(); diff --git a/uitest/src/main/java/com/vaadin/tests/TestBench.java b/uitest/src/main/java/com/vaadin/tests/TestBench.java index bd01fa2087..f1d4be0d8c 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestBench.java +++ b/uitest/src/main/java/com/vaadin/tests/TestBench.java @@ -51,8 +51,8 @@ import com.vaadin.ui.VerticalLayout; * @author Vaadin Ltd. * */ -public class TestBench extends com.vaadin.server.LegacyApplication implements - Property.ValueChangeListener { +public class TestBench extends com.vaadin.server.LegacyApplication + implements Property.ValueChangeListener { // Add here packages which are used for finding testable classes String[] testablePackages = { "com.vaadin.tests", @@ -79,9 +79,10 @@ public class TestBench extends com.vaadin.server.LegacyApplication implements for (int p = 0; p < testablePackages.length; p++) { testables.addItem(testablePackages[p]); try { - final List<Class<?>> testableClasses = getTestableClassesForPackage(testablePackages[p]); - for (final Iterator<Class<?>> it = testableClasses.iterator(); it - .hasNext();) { + final List<Class<?>> testableClasses = getTestableClassesForPackage( + testablePackages[p]); + for (final Iterator<Class<?>> it = testableClasses + .iterator(); it.hasNext();) { final Class<?> t = it.next(); // ignore TestBench itself if (t.equals(TestBench.class)) { @@ -116,12 +117,13 @@ public class TestBench extends com.vaadin.server.LegacyApplication implements .hasNext();) { final Class<?> testable = i.next(); // simplify captions - final String name = testable.getName().substring( - testable.getName().lastIndexOf('.') + 1); + final String name = testable.getName() + .substring(testable.getName().lastIndexOf('.') + 1); menu.setItemCaption(testable, name); } // expand all root items - for (final Iterator<?> i = menu.rootItemIds().iterator(); i.hasNext();) { + for (final Iterator<?> i = menu.rootItemIds().iterator(); i + .hasNext();) { menu.expandItemsRecursively(i.next()); } @@ -189,8 +191,8 @@ public class TestBench extends com.vaadin.server.LegacyApplication implements if (next instanceof Class) { Class<?> c = (Class<?>) next; String string = c.getSimpleName(); - if (string.toLowerCase().contains( - fragment.toLowerCase())) { + if (string.toLowerCase() + .contains(fragment.toLowerCase())) { menu.setValue(c); mainLayout.setSplitPosition(0); return; @@ -274,8 +276,8 @@ public class TestBench extends com.vaadin.server.LegacyApplication implements * @return * @throws ClassNotFoundException */ - public static List<Class<?>> getTestableClassesForPackage(String packageName) - throws Exception { + public static List<Class<?>> getTestableClassesForPackage( + String packageName) throws Exception { final ArrayList<File> directories = new ArrayList<File>(); try { final ClassLoader cld = Thread.currentThread() @@ -291,8 +293,8 @@ public class TestBench extends com.vaadin.server.LegacyApplication implements directories.add(new File(url.getFile())); } } catch (final Exception x) { - throw new Exception(packageName - + " does not appear to be a valid package."); + throw new Exception( + packageName + " does not appear to be a valid package."); } final ArrayList<Class<?>> classes = new ArrayList<Class<?>>(); @@ -310,11 +312,11 @@ public class TestBench extends com.vaadin.server.LegacyApplication implements + files[j].substring(0, files[j].length() - 6); final Class<?> c = Class.forName(p); if (c.getSuperclass() != null) { - if ((c.getSuperclass() - .equals(com.vaadin.server.VaadinSession.class))) { + if ((c.getSuperclass().equals( + com.vaadin.server.VaadinSession.class))) { classes.add(c); - } else if ((c.getSuperclass() - .equals(com.vaadin.ui.CustomComponent.class))) { + } else if ((c.getSuperclass().equals( + com.vaadin.ui.CustomComponent.class))) { classes.add(c); } } @@ -329,9 +331,9 @@ public class TestBench extends com.vaadin.server.LegacyApplication implements } } } else { - throw new ClassNotFoundException(packageName + " (" - + directory.getPath() - + ") does not appear to be a valid package"); + throw new ClassNotFoundException( + packageName + " (" + directory.getPath() + + ") does not appear to be a valid package"); } } diff --git a/uitest/src/main/java/com/vaadin/tests/TestComponentAddAndRecursion.java b/uitest/src/main/java/com/vaadin/tests/TestComponentAddAndRecursion.java index d431562c8e..6b7701454f 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestComponentAddAndRecursion.java +++ b/uitest/src/main/java/com/vaadin/tests/TestComponentAddAndRecursion.java @@ -108,12 +108,12 @@ public class TestComponentAddAndRecursion extends CustomComponent { try { p3l.addComponent(p2); new Notification("ERROR", "This should have failed", - Notification.TYPE_ERROR_MESSAGE).show(Page - .getCurrent()); + Notification.TYPE_ERROR_MESSAGE) + .show(Page.getCurrent()); } catch (Exception e) { new Notification("OK", "threw, as expected", - Notification.TYPE_ERROR_MESSAGE).show(Page - .getCurrent()); + Notification.TYPE_ERROR_MESSAGE) + .show(Page.getCurrent()); } } @@ -129,12 +129,12 @@ public class TestComponentAddAndRecursion extends CustomComponent { try { p3l.addComponent(p); new Notification("ERROR", "This should have failed", - Notification.TYPE_ERROR_MESSAGE).show(Page - .getCurrent()); + Notification.TYPE_ERROR_MESSAGE) + .show(Page.getCurrent()); } catch (Exception e) { new Notification("OK", "threw, as expected", - Notification.TYPE_ERROR_MESSAGE).show(Page - .getCurrent()); + Notification.TYPE_ERROR_MESSAGE) + .show(Page.getCurrent()); } } diff --git a/uitest/src/main/java/com/vaadin/tests/TestContainerChanges.java b/uitest/src/main/java/com/vaadin/tests/TestContainerChanges.java index 0e03606cd8..12d6828395 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestContainerChanges.java +++ b/uitest/src/main/java/com/vaadin/tests/TestContainerChanges.java @@ -72,8 +72,8 @@ public class TestContainerChanges extends CustomComponent { tbl2.addListener(new Table.ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - System.err.println("Value now " - + event.getProperty().getValue()); + System.err + .println("Value now " + event.getProperty().getValue()); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java b/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java index d6c72ee8e9..c2bbc5a54f 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java @@ -24,8 +24,8 @@ import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; -public class TestForApplicationLayoutThatUsesWholeBrosersSpace extends - LegacyApplication { +public class TestForApplicationLayoutThatUsesWholeBrosersSpace + extends LegacyApplication { LegacyWindow main = new LegacyWindow("Windowing test"); diff --git a/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java b/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java index 6e44d13843..623d7d8cef 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java @@ -59,10 +59,10 @@ public class TestForContainerFilterable extends CustomComponent { filterLayout.addComponent(fooFilter); filterLayout.addComponent(barFilter); filterLayout.addComponent(filterButton); - fooFilter - .setDescription("Filters foo column in case-sensitive contains manner."); - barFilter - .setDescription("Filters bar column in case-insensitive prefix manner."); + fooFilter.setDescription( + "Filters foo column in case-sensitive contains manner."); + barFilter.setDescription( + "Filters bar column in case-insensitive prefix manner."); filterLayout.addComponent(count); // Table diff --git a/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java b/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java index a4f2dcd106..fbaf6208dc 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java @@ -35,8 +35,8 @@ import com.vaadin.ui.VerticalLayout; * * @author Vaadin Ltd. */ -public class TestForMultipleStyleNames extends CustomComponent implements - ValueChangeListener { +public class TestForMultipleStyleNames extends CustomComponent + implements ValueChangeListener { private final VerticalLayout main = new VerticalLayout(); @@ -53,8 +53,8 @@ public class TestForMultipleStyleNames extends CustomComponent implements public void createNewView() { main.removeAllComponents(); - main.addComponent(new Label( - "TK5 supports multiple stylenames for components.")); + main.addComponent( + new Label("TK5 supports multiple stylenames for components.")); main.addComponent(new Label("Note you need to add Theme under" + " WebContent/VAADIN/Themes/mytheme" + " in order to see actual visible results" @@ -91,7 +91,8 @@ public class TestForMultipleStyleNames extends CustomComponent implements final Collection<?> styles = (Collection<?>) s.getValue(); - for (final Iterator<?> iterator = styles.iterator(); iterator.hasNext();) { + for (final Iterator<?> iterator = styles.iterator(); iterator + .hasNext();) { final String styleName = (String) iterator.next(); if (curStyles.contains(styleName)) { // already added diff --git a/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java b/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java index a9faeb8f38..2d2811989b 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java @@ -37,14 +37,14 @@ public class TestForNativeWindowing extends LegacyApplication { setMainWindow(main); - main.addComponent(new Button("Add new subwindow", - new Button.ClickListener() { + main.addComponent( + new Button("Add new subwindow", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { VerticalLayout layout = new VerticalLayout(); layout.setMargin(true); - final Window w = new Window("sw " - + System.currentTimeMillis(), layout); + final Window w = new Window( + "sw " + System.currentTimeMillis(), layout); main.addWindow(w); w.setPositionX(100); w.setPositionY(100); @@ -54,14 +54,15 @@ public class TestForNativeWindowing extends LegacyApplication { w.setWidth("100px"); w.setHeight("400px"); - final Button closebutton = new Button("Close " - + w.getCaption(), new Button.ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - main.removeWindow(w); - } + final Button closebutton = new Button( + "Close " + w.getCaption(), + new Button.ClickListener() { + @Override + public void buttonClick(ClickEvent event) { + main.removeWindow(w); + } - }); + }); layout.addComponent(closebutton); layout.addComponent(new Label( @@ -98,13 +99,12 @@ public class TestForNativeWindowing extends LegacyApplication { @Override public void buttonClick(ClickEvent event) { try { - main.open( - new com.vaadin.server.ExternalResource( - new URL( - getURL(), - "mainwin-" - + System.currentTimeMillis() - + "/")), null); + main.open(new com.vaadin.server.ExternalResource( + new URL(getURL(), + "mainwin-" + + System.currentTimeMillis() + + "/")), + null); } catch (final MalformedURLException e) { } } @@ -134,8 +134,8 @@ public class TestForNativeWindowing extends LegacyApplication { @Override public void buttonClick(ClickEvent event) { - ww.addComponent(new Label("Button clicked " + (++state) - + " times")); + ww.addComponent(new Label( + "Button clicked " + (++state) + " times")); } })); addWindow(ww); diff --git a/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java b/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java index e054b69916..87d032df17 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java @@ -89,7 +89,8 @@ public class TestForPreconfiguredComponents extends CustomComponent { fillSelect(s, 20); s.setMultiSelect(true); test = createTestBench(s); - test.setCaption("OptionGroup + multiselect manually (configured from select)"); + test.setCaption( + "OptionGroup + multiselect manually (configured from select)"); main.addComponent(test); final Button b = new Button("refresh view", new Button.ClickListener() { @@ -104,8 +105,8 @@ public class TestForPreconfiguredComponents extends CustomComponent { public static void fillSelect(AbstractSelect s, int items) { for (int i = 0; i < items; i++) { - final String name = firstnames[(int) (Math.random() * (firstnames.length - 1))] - + " " + final String name = firstnames[(int) (Math.random() + * (firstnames.length - 1))] + " " + lastnames[(int) (Math.random() * (lastnames.length - 1))]; s.addItem(name); } @@ -115,8 +116,8 @@ public class TestForPreconfiguredComponents extends CustomComponent { Tree t = new Tree("Tree"); final String[] names = new String[100]; for (int i = 0; i < names.length; i++) { - names[i] = firstnames[(int) (Math.random() * (firstnames.length - 1))] - + " " + names[i] = firstnames[(int) (Math.random() + * (firstnames.length - 1))] + " " + lastnames[(int) (Math.random() * (lastnames.length - 1))]; } @@ -124,7 +125,8 @@ public class TestForPreconfiguredComponents extends CustomComponent { t = new Tree("Organization Structure"); for (int i = 0; i < 100; i++) { t.addItem(names[i]); - final String parent = names[(int) (Math.random() * (names.length - 1))]; + final String parent = names[(int) (Math.random() + * (names.length - 1))]; if (t.containsId(parent)) { t.setParent(names[i], parent); } @@ -171,8 +173,8 @@ public class TestForPreconfiguredComponents extends CustomComponent { statusLayout .addComponent(new Label(event.getClass().getName())); // TODO should not use LegacyField.toString() - statusLayout.addComponent(new Label("selected: " - + event.getSource().toString())); + statusLayout.addComponent( + new Label("selected: " + event.getSource().toString())); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java b/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java index af2cceedec..23e0d472f7 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java @@ -30,8 +30,8 @@ import com.vaadin.ui.VerticalLayout; * * @author Vaadin Ltd. */ -public class TestForRichTextEditor extends CustomComponent implements - ValueChangeListener { +public class TestForRichTextEditor extends CustomComponent + implements ValueChangeListener { private final VerticalLayout main = new VerticalLayout(); diff --git a/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java b/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java index de79dba2f6..75a2df2666 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java @@ -48,8 +48,8 @@ import com.vaadin.ui.Upload.SucceededEvent; import com.vaadin.ui.Upload.SucceededListener; import com.vaadin.ui.VerticalLayout; -public class TestForStyledUpload extends LegacyApplication implements - Upload.FinishedListener, FailedListener, SucceededListener, +public class TestForStyledUpload extends LegacyApplication + implements Upload.FinishedListener, FailedListener, SucceededListener, StartedListener { Layout main = new VerticalLayout(); @@ -89,8 +89,8 @@ public class TestForStyledUpload extends LegacyApplication implements refreshMemUsage(); - transferred.setValue("Transferred " + readBytes + " of " - + contentLenght); + transferred.setValue( + "Transferred " + readBytes + " of " + contentLenght); } }); @@ -165,8 +165,8 @@ public class TestForStyledUpload extends LegacyApplication implements sb.append("/"); sb.append(up.getUploadSize()); sb.append(" "); - sb.append(Math.round(100 * up.getBytesRead() - / (double) up.getUploadSize())); + sb.append(Math.round( + 100 * up.getBytesRead() / (double) up.getUploadSize())); sb.append("%"); } else { sb.append("Idle"); @@ -180,26 +180,28 @@ public class TestForStyledUpload extends LegacyApplication implements statusLayout.removeAllComponents(); final InputStream stream = buffer.getStream(); if (stream == null) { - statusLayout.addComponent(new Label( - "Upload finished, but output buffer is null!!")); + statusLayout.addComponent( + new Label("Upload finished, but output buffer is null!!")); } else { - statusLayout.addComponent(new Label("<b>Name:</b> " - + event.getFilename(), ContentMode.HTML)); - statusLayout.addComponent(new Label("<b>Mimetype:</b> " - + event.getMIMEType(), ContentMode.HTML)); - statusLayout.addComponent(new Label("<b>Size:</b> " - + event.getLength() + " bytes.", ContentMode.HTML)); - - statusLayout.addComponent(new Link("Download " - + buffer.getFileName(), new StreamResource(buffer, buffer - .getFileName()))); + statusLayout.addComponent(new Label( + "<b>Name:</b> " + event.getFilename(), ContentMode.HTML)); + statusLayout.addComponent( + new Label("<b>Mimetype:</b> " + event.getMIMEType(), + ContentMode.HTML)); + statusLayout.addComponent( + new Label("<b>Size:</b> " + event.getLength() + " bytes.", + ContentMode.HTML)); + + statusLayout + .addComponent(new Link("Download " + buffer.getFileName(), + new StreamResource(buffer, buffer.getFileName()))); status.setVisible(true); } } - public interface Buffer extends StreamResource.StreamSource, - Upload.Receiver { + public interface Buffer + extends StreamResource.StreamSource, Upload.Receiver { String getFileName(); } diff --git a/uitest/src/main/java/com/vaadin/tests/TestForTabSheet.java b/uitest/src/main/java/com/vaadin/tests/TestForTabSheet.java index 8d5fe71ed3..4dfa1b96a6 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForTabSheet.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForTabSheet.java @@ -7,8 +7,8 @@ import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.SelectedTabChangeEvent; -public class TestForTabSheet extends CustomComponent implements - Button.ClickListener, TabSheet.SelectedTabChangeListener { +public class TestForTabSheet extends CustomComponent + implements Button.ClickListener, TabSheet.SelectedTabChangeListener { TabSheet tabsheet = new TabSheet(); Button tab1_root = new Button("Push this button"); Label tab2_root = new Label("Contents of Second Tab"); diff --git a/uitest/src/main/java/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java b/uitest/src/main/java/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java index cfd7f58866..ca9764e919 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java @@ -35,8 +35,8 @@ import com.vaadin.ui.VerticalLayout; * * @author Vaadin Ltd. */ -public class TestForTablesInitialColumnWidthLogicRendering extends - CustomComponent { +public class TestForTablesInitialColumnWidthLogicRendering + extends CustomComponent { private final VerticalLayout main = new VerticalLayout(); @@ -75,7 +75,8 @@ public class TestForTablesInitialColumnWidthLogicRendering extends main.addComponent(t); t = getTestTable(5, 5); - t.setCaption("Table with some cols and rows rows, some col widths fixed"); + t.setCaption( + "Table with some cols and rows rows, some col widths fixed"); Iterator<?> it = t.getContainerPropertyIds().iterator(); it.next(); @@ -90,7 +91,8 @@ public class TestForTablesInitialColumnWidthLogicRendering extends main.addComponent(t); t = getTestTable(3, 40); - t.setCaption("Table with some columns and wide explicit width. (Ought to widen columns to use all space)"); + t.setCaption( + "Table with some columns and wide explicit width. (Ought to widen columns to use all space)"); t.setWidth("1000px"); main.addComponent(t); @@ -100,7 +102,8 @@ public class TestForTablesInitialColumnWidthLogicRendering extends main.addComponent(t); t = getTestTable(12, 100); - t.setCaption("Table with lot of rows and lot of columns, width == 50%"); + t.setCaption( + "Table with lot of rows and lot of columns, width == 50%"); t.setWidth(50, Table.UNITS_PERCENTAGE); main.addComponent(t); @@ -164,10 +167,10 @@ public class TestForTablesInitialColumnWidthLogicRendering extends "Charles", "Aaron", "Lucas", "Luis", "Owen", "Landon", "Diego", "Brian", "Adam", "Adrian", "Kyle", "Eric", "Ian", "Nathaniel", "Carlos", "Alex", "Bryan", "Jesus", "Julian", "Sean", "Carter", - "Hayden", "Jeremiah", "Cole", "Brayden", "Wyatt", "Chase", - "Steven", "Timothy", "Dominic", "Sebastian", "Xavier", "Jaden", - "Jesse", "Devin", "Seth", "Antonio", "Richard", "Miguel", "Colin", - "Cody", "Alejandro", "Caden", "Blake", "Carson" }; + "Hayden", "Jeremiah", "Cole", "Brayden", "Wyatt", "Chase", "Steven", + "Timothy", "Dominic", "Sebastian", "Xavier", "Jaden", "Jesse", + "Devin", "Seth", "Antonio", "Richard", "Miguel", "Colin", "Cody", + "Alejandro", "Caden", "Blake", "Carson" }; public static String rndString() { return testString[(int) (Math.random() * testString.length)]; diff --git a/uitest/src/main/java/com/vaadin/tests/TestForTrees.java b/uitest/src/main/java/com/vaadin/tests/TestForTrees.java index 00fc2d54c2..f77245a47e 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForTrees.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForTrees.java @@ -92,7 +92,8 @@ public class TestForTrees extends CustomComponent implements Handler { t.setCaption("with actions"); t.setImmediate(true); t.addActionHandler(this); - final AbstractOrderedLayout ol = (AbstractOrderedLayout) createTestBench(t); + final AbstractOrderedLayout ol = (AbstractOrderedLayout) createTestBench( + t); al = new VerticalLayout(); al.setMargin(true); ol.addComponent(new Panel("action log", al)); @@ -113,8 +114,8 @@ public class TestForTrees extends CustomComponent implements Handler { Tree t = new Tree("Tree"); final String[] names = new String[100]; for (int i = 0; i < names.length; i++) { - names[i] = firstnames[(int) (Math.random() * (firstnames.length - 1))] - + " " + names[i] = firstnames[(int) (Math.random() + * (firstnames.length - 1))] + " " + lastnames[(int) (Math.random() * (lastnames.length - 1))]; } @@ -122,7 +123,8 @@ public class TestForTrees extends CustomComponent implements Handler { t = new Tree("Organization Structure"); for (int i = 0; i < 100; i++) { t.addItem(names[i]); - final String parent = names[(int) (Math.random() * (names.length - 1))]; + final String parent = names[(int) (Math.random() + * (names.length - 1))]; if (t.containsId(parent)) { t.setParent(names[i], parent); } @@ -166,8 +168,8 @@ public class TestForTrees extends CustomComponent implements Handler { statusLayout .addComponent(new Label(event.getClass().getName())); // TODO should not use LegacyField.toString() - statusLayout.addComponent(new Label("selected: " - + event.getSource().toString())); + statusLayout.addComponent( + new Label("selected: " + event.getSource().toString())); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java index cfea229f68..f98ac5ea26 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java @@ -50,8 +50,8 @@ import com.vaadin.ui.Upload.StartedEvent; import com.vaadin.ui.Upload.StartedListener; import com.vaadin.ui.VerticalLayout; -public class TestForUpload extends CustomComponent implements - Upload.ProgressListener { +public class TestForUpload extends CustomComponent + implements Upload.ProgressListener { private static final long serialVersionUID = -3400119871764256575L; @@ -86,8 +86,8 @@ public class TestForUpload extends CustomComponent implements public TestForUpload() { setCompositionRoot(main); - main.addComponent(new Label( - "This is a simple test for upload application. " + main.addComponent( + new Label("This is a simple test for upload application. " + "Upload should work with big files and concurrent " + "requests should not be blocked. Button 'b' reads " + "current state into label below it. Memory receiver " @@ -139,8 +139,8 @@ public class TestForUpload extends CustomComponent implements pi2.setVisible(false); if (event instanceof Upload.FailedEvent) { Exception reason = ((Upload.FailedEvent) event).getReason(); - l.setValue("Finished with failure ( " + reason - + " ), idle"); + l.setValue( + "Finished with failure ( " + reason + " ), idle"); } else if (event instanceof Upload.SucceededEvent) { l.setValue("Finished with succes, idle"); } else { @@ -153,16 +153,19 @@ public class TestForUpload extends CustomComponent implements statusLayout.addComponent(new Label( "Upload finished, but output buffer is null")); } else { - statusLayout.addComponent(new Label("<b>Name:</b> " - + event.getFilename(), ContentMode.HTML)); - statusLayout.addComponent(new Label("<b>Mimetype:</b> " - + event.getMIMEType(), ContentMode.HTML)); - statusLayout.addComponent(new Label("<b>Size:</b> " - + event.getLength() + " bytes.", ContentMode.HTML)); + statusLayout.addComponent( + new Label("<b>Name:</b> " + event.getFilename(), + ContentMode.HTML)); + statusLayout.addComponent( + new Label("<b>Mimetype:</b> " + event.getMIMEType(), + ContentMode.HTML)); + statusLayout.addComponent(new Label( + "<b>Size:</b> " + event.getLength() + " bytes.", + ContentMode.HTML)); - statusLayout.addComponent(new Link("Download " - + buffer.getFileName(), new StreamResource(buffer, - buffer.getFileName()))); + statusLayout.addComponent(new Link( + "Download " + buffer.getFileName(), + new StreamResource(buffer, buffer.getFileName()))); statusLayout.setVisible(true); } @@ -278,8 +281,8 @@ public class TestForUpload extends CustomComponent implements sb.append("/"); sb.append(up.getUploadSize()); sb.append(" "); - sb.append(Math.round(100 * up.getBytesRead() - / (double) up.getUploadSize())); + sb.append(Math.round( + 100 * up.getBytesRead() / (double) up.getUploadSize())); sb.append("%"); } else { sb.append("Idle"); @@ -288,8 +291,8 @@ public class TestForUpload extends CustomComponent implements refreshMemUsage(); } - public interface Buffer extends StreamResource.StreamSource, - Upload.Receiver { + public interface Buffer + extends StreamResource.StreamSource, Upload.Receiver { String getFileName(); } diff --git a/uitest/src/main/java/com/vaadin/tests/TestForWindowOpen.java b/uitest/src/main/java/com/vaadin/tests/TestForWindowOpen.java index 5de80fd833..5a97924417 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForWindowOpen.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForWindowOpen.java @@ -29,8 +29,8 @@ public class TestForWindowOpen extends CustomComponent { final VerticalLayout main = new VerticalLayout(); setCompositionRoot(main); - main.addComponent(new Button("Open in this window", - new Button.ClickListener() { + main.addComponent( + new Button("Open in this window", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { @@ -46,8 +46,8 @@ public class TestForWindowOpen extends CustomComponent { @Override public void buttonClick(ClickEvent event) { - UI.getCurrent().getPage() - .open("http://www.google.com", "mytarget"); + UI.getCurrent().getPage().open("http://www.google.com", + "mytarget"); } @@ -58,8 +58,8 @@ public class TestForWindowOpen extends CustomComponent { @Override public void buttonClick(ClickEvent event) { - UI.getCurrent().getPage() - .open("http://www.google.com", "secondtarget"); + UI.getCurrent().getPage().open("http://www.google.com", + "secondtarget"); } diff --git a/uitest/src/main/java/com/vaadin/tests/TestForWindowing.java b/uitest/src/main/java/com/vaadin/tests/TestForWindowing.java index 02d1e21d5a..eb4c2bf21c 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForWindowing.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForWindowing.java @@ -40,8 +40,8 @@ public class TestForWindowing extends CustomComponent { final VerticalLayout main = new VerticalLayout(); - main.addComponent(new Label( - "Click the button to create a new inline window.")); + main.addComponent( + new Label("Click the button to create a new inline window.")); final CheckBox asModal = new CheckBox("As modal"); main.addComponent(asModal); diff --git a/uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java b/uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java index b8ade0d8b6..d0439a6e3a 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java +++ b/uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java @@ -25,8 +25,8 @@ import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; -public class TestSetVisibleAndCaching extends - com.vaadin.server.LegacyApplication { +public class TestSetVisibleAndCaching + extends com.vaadin.server.LegacyApplication { Panel panelA = new Panel("Panel A"); Panel panelB = new Panel("Panel B"); @@ -42,20 +42,19 @@ public class TestSetVisibleAndCaching extends "TestSetVisibleAndCaching"); setMainWindow(mainWindow); - panelA.setContent(wrapInPanelLayout(new Label( - "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"))); - panelB.setContent(wrapInPanelLayout(new Label( - "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"))); - panelC.setContent(wrapInPanelLayout(new Label( - "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"))); + panelA.setContent(wrapInPanelLayout( + new Label("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"))); + panelB.setContent(wrapInPanelLayout( + new Label("BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"))); + panelC.setContent(wrapInPanelLayout( + new Label("CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"))); - mainWindow - .addComponent(new Label( - "Inspect transfered data from server to " - + "client using firebug (http request / response cycles)." - + " See how widgets are re-used," - + " after each panel is once shown in GUI then" - + " their contents are not resend.")); + mainWindow.addComponent( + new Label("Inspect transfered data from server to " + + "client using firebug (http request / response cycles)." + + " See how widgets are re-used," + + " after each panel is once shown in GUI then" + + " their contents are not resend.")); mainWindow.addComponent(buttonNextPanel); mainWindow.addComponent(panelA); mainWindow.addComponent(panelB); diff --git a/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java b/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java index 90b9088f76..cb1b77d6cf 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java +++ b/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java @@ -267,8 +267,8 @@ public class TestSizeableIncomponents extends LegacyApplication { * @throws InstantiationException * @throws IllegalAccessException */ - public Component getComponent() throws InstantiationException, - IllegalAccessException { + public Component getComponent() + throws InstantiationException, IllegalAccessException { Component c = (Component) classToTest.newInstance(); if (c instanceof Button) { @@ -277,21 +277,24 @@ public class TestSizeableIncomponents extends LegacyApplication { if (AbstractSelect.class.isAssignableFrom(c.getClass())) { if (c instanceof Table) { Table new_name = (Table) c; - new_name.setContainerDataSource(TestForTablesInitialColumnWidthLogicRendering - .getTestTable(5, 100).getContainerDataSource()); + new_name.setContainerDataSource( + TestForTablesInitialColumnWidthLogicRendering + .getTestTable(5, 100) + .getContainerDataSource()); } else { AbstractSelect new_name = (AbstractSelect) c; Container cont = TestForTablesInitialColumnWidthLogicRendering .getTestTable(2, 8).getContainerDataSource(); new_name.setContainerDataSource(cont); - new_name.setItemCaptionPropertyId(cont - .getContainerPropertyIds().iterator().next()); + new_name.setItemCaptionPropertyId( + cont.getContainerPropertyIds().iterator().next()); } } else if (c instanceof ComponentContainer) { ComponentContainer new_name = (ComponentContainer) c; - new_name.addComponent(new Label("component 1 in test container")); + new_name.addComponent( + new Label("component 1 in test container")); new_name.addComponent(new Button("component 2")); } else if (c instanceof Embedded) { Embedded em = (Embedded) c; diff --git a/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java b/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java index 238e7bf317..1a6f15c068 100644 --- a/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java +++ b/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java @@ -66,8 +66,8 @@ public class TreeFilesystem extends com.vaadin.server.LegacyApplication tree.addListener(this); // Get sample directory - final File sampleDir = SampleDirectory.getDirectory( - VaadinSession.getCurrent(), main); + final File sampleDir = SampleDirectory + .getDirectory(VaadinSession.getCurrent(), main); // populate tree's root node with example directory if (sampleDir != null) { populateNode(sampleDir.getAbsolutePath(), null); diff --git a/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java b/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java index 7f79bce024..a61055a4b5 100644 --- a/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java +++ b/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java @@ -41,8 +41,8 @@ import com.vaadin.ui.VerticalLayout; * @since 4.0.0 * */ -public class TreeFilesystemContainer extends - com.vaadin.server.LegacyApplication implements Listener { +public class TreeFilesystemContainer extends com.vaadin.server.LegacyApplication + implements Listener { // Filesystem explorer panel and it's components private final Panel explorerPanel = new Panel("Filesystem explorer"); @@ -56,7 +56,8 @@ public class TreeFilesystemContainer extends @Override public void init() { - final LegacyWindow w = new LegacyWindow("Tree FilesystemContainer demo"); + final LegacyWindow w = new LegacyWindow( + "Tree FilesystemContainer demo"); setMainWindow(w); final VerticalLayout main = new VerticalLayout(); w.setContent(main); @@ -84,10 +85,11 @@ public class TreeFilesystemContainer extends propertyPanel.setEnabled(false); // Get sample directory - final File sampleDir = SampleDirectory.getDirectory( - VaadinSession.getCurrent(), w); + final File sampleDir = SampleDirectory + .getDirectory(VaadinSession.getCurrent(), w); // Populate tree with FilesystemContainer - final FilesystemContainer fsc = new FilesystemContainer(sampleDir, true); + final FilesystemContainer fsc = new FilesystemContainer(sampleDir, + true); filesystem.setContainerDataSource(fsc); // "this" handles all filesystem events // e.g. node clicked, expanded etc. diff --git a/uitest/src/main/java/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java b/uitest/src/main/java/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java index 833087029d..d60acea61e 100644 --- a/uitest/src/main/java/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java +++ b/uitest/src/main/java/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java @@ -59,9 +59,8 @@ public class UsingCustomNewItemHandlerInSelect extends CustomComponent { for (int j = 0; j < 4; j++) { Integer id = new Integer(sequence++); Item item = select.addItem(id); - item.getItemProperty("CAPTION").setValue( - id.toString() + ": " - + names[random.nextInt() % names.length]); + item.getItemProperty("CAPTION").setValue(id.toString() + ": " + + names[random.nextInt() % names.length]); } } @@ -71,8 +70,8 @@ public class UsingCustomNewItemHandlerInSelect extends CustomComponent { // here could be db insert or other backend operation Integer id = new Integer(sequence++); Item item = select.addItem(id); - item.getItemProperty("CAPTION").setValue( - id.toString() + ": " + newItemCaption); + item.getItemProperty("CAPTION") + .setValue(id.toString() + ": " + newItemCaption); select.setValue(id); } diff --git a/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java b/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java index 85da6d671f..907f1a2846 100644 --- a/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java +++ b/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java @@ -66,12 +66,13 @@ public class UsingObjectsInSelect extends com.vaadin.server.LegacyApplication public void createExampleTasks() { final String[] assignedTo = new String[] { "John", "Mary", "Joe", "Sarah", "Jeff", "Jane", "Peter", "Marc", "Josie", "Linus" }; - final String[] type = new String[] { "Enhancement", "Bugfix", - "Testing", "Task" }; + final String[] type = new String[] { "Enhancement", "Bugfix", "Testing", + "Task" }; for (int j = 0; j < 100; j++) { final Task task = new Task( type[(int) (random.nextDouble() * (type.length - 1))], - assignedTo[(int) (random.nextDouble() * (assignedTo.length - 1))], + assignedTo[(int) (random.nextDouble() + * (assignedTo.length - 1))], random.nextInt(100)); select.addItem(task); } diff --git a/uitest/src/main/java/com/vaadin/tests/VaadinClasses.java b/uitest/src/main/java/com/vaadin/tests/VaadinClasses.java index 99416cfff1..dc09e7cc0c 100644 --- a/uitest/src/main/java/com/vaadin/tests/VaadinClasses.java +++ b/uitest/src/main/java/com/vaadin/tests/VaadinClasses.java @@ -37,7 +37,7 @@ public class VaadinClasses { return null; } } - + public static List<Class<? extends ComponentContainer>> getComponentContainers() { try { return findClasses(ComponentContainer.class, "com.vaadin.ui"); @@ -73,7 +73,8 @@ public class VaadinClasses { try { // Given as name to avoid dependencies on testbench source folder return (List) findClasses( - Class.forName("com.vaadin.tests.components.AbstractComponentTest"), + Class.forName( + "com.vaadin.tests.components.AbstractComponentTest"), "com.vaadin.tests.components"); } catch (Exception e) { e.printStackTrace(); @@ -96,8 +97,8 @@ public class VaadinClasses { try { File f = new File(location.toURI()); if (!f.exists()) { - throw new IOException("Directory " + f.toString() - + " does not exist"); + throw new IOException( + "Directory " + f.toString() + " does not exist"); } findPackages(f, basePackage, baseClass, classes, ignoredPackages); diff --git a/uitest/src/main/java/com/vaadin/tests/VerifyBrowserVersion.java b/uitest/src/main/java/com/vaadin/tests/VerifyBrowserVersion.java index 1b21f08aa7..febe483e0e 100644 --- a/uitest/src/main/java/com/vaadin/tests/VerifyBrowserVersion.java +++ b/uitest/src/main/java/com/vaadin/tests/VerifyBrowserVersion.java @@ -12,8 +12,8 @@ public class VerifyBrowserVersion extends TestBase { Label userAgent = new Label(browser.getBrowserApplication()); userAgent.setId("userAgent"); addComponent(userAgent); - Label touchDevice = new Label("Touch device? " - + (browser.isTouchDevice() ? "YES" : "No")); + Label touchDevice = new Label( + "Touch device? " + (browser.isTouchDevice() ? "YES" : "No")); touchDevice.setId("touchDevice"); addComponent(touchDevice); } diff --git a/uitest/src/main/java/com/vaadin/tests/actions/ActionsWithoutKeyCode.java b/uitest/src/main/java/com/vaadin/tests/actions/ActionsWithoutKeyCode.java index ec8e48ef64..8fc887b36e 100644 --- a/uitest/src/main/java/com/vaadin/tests/actions/ActionsWithoutKeyCode.java +++ b/uitest/src/main/java/com/vaadin/tests/actions/ActionsWithoutKeyCode.java @@ -12,7 +12,8 @@ public class ActionsWithoutKeyCode extends AbstractTestUIWithLog { protected void setup(VaadinRequest request) { LegacyTextField tf = new LegacyTextField(); tf.setWidth("100%"); - tf.setInputPrompt("Enter text with å,ä or ä or press windows key while textfield is focused"); + tf.setInputPrompt( + "Enter text with å,ä or ä or press windows key while textfield is focused"); addComponent(tf); addActionHandler(new Action.Handler() { @@ -28,7 +29,8 @@ public class ActionsWithoutKeyCode extends AbstractTestUIWithLog { } @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { log("action " + action.getCaption() + " triggered by " + sender.getClass().getSimpleName() + " on " + target.getClass().getSimpleName()); diff --git a/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java b/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java index 936eca147b..ec9b07ac4d 100644 --- a/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java +++ b/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java @@ -34,8 +34,8 @@ public class GAESyncTest extends LegacyApplication { // Was this caused by a GAE timeout? while (t != null) { if (t instanceof DeadlineExceededException) { - getMainWindow().showNotification("Bugger!", - "Deadline Exceeded", Notification.TYPE_ERROR_MESSAGE); + getMainWindow().showNotification("Bugger!", "Deadline Exceeded", + Notification.TYPE_ERROR_MESSAGE); return; } t = t.getCause(); @@ -61,8 +61,8 @@ public class GAESyncTest extends LegacyApplication { tf.addListener(new Property.ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - IntrWindow.this.showNotification((String) event - .getProperty().getValue()); + IntrWindow.this.showNotification( + (String) event.getProperty().getValue()); } @@ -94,8 +94,8 @@ public class GAESyncTest extends LegacyApplication { @Override public void buttonClick(ClickEvent event) { if (getUI() == getMainWindow()) { - getUI().getPage().showNotification( - new Notification("main")); + getUI().getPage() + .showNotification(new Notification("main")); try { Thread.sleep((5000)); } catch (InterruptedException e) { diff --git a/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java b/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java index f1548ea6c2..c3ba0adb0b 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java +++ b/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java @@ -16,8 +16,8 @@ public class ApplicationCloseTest extends TestBase { Label applications = new Label("Applications in session: <br/>", ContentMode.HTML); if (getContext() != null) { - applications.setValue(applications.getValue() + "App: " - + getContext() + "<br/>"); + applications.setValue( + applications.getValue() + "App: " + getContext() + "<br/>"); } applications.setValue(applications.getValue() + "<br/><br/>"); @@ -46,12 +46,10 @@ public class ApplicationCloseTest extends TestBase { long totalUsage = Runtime.getRuntime().totalMemory(); String totalUsageString = totalUsage / 1000 / 1000 + "MiB"; Label memoryUsage = new Label( - "Using about " - + memoryConsumer.length() - / 1000 - / 1000 + "Using about " + memoryConsumer.length() / 1000 / 1000 + "MiB memory for this application.<br/>Total memory usage reported as " - + totalUsageString + "<br/>", ContentMode.HTML); + + totalUsageString + "<br/>", + ContentMode.HTML); addComponent(thisApp); addComponent(memoryUsage); diff --git a/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorServlet.java b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorServlet.java index 116ef1c1f2..e93c681131 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorServlet.java +++ b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorServlet.java @@ -106,9 +106,9 @@ public class CommErrorEmulatorServlet extends VaadinServlet { public void setUIDLResponseCode(final UI ui, int responseCode, final int delay) { uidlResponseCode.put(ui, responseCode); - System.out.println("Responding with " + responseCode - + " to UIDL requests for " + ui + " for the next " + delay - + "s"); + System.out.println( + "Responding with " + responseCode + " to UIDL requests for " + + ui + " for the next " + delay + "s"); new Thread(new Runnable() { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java index 379e80ef0e..0f95a7ffcf 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java +++ b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java @@ -98,7 +98,8 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog { vl.setSpacing(true); vl.setMargin(true); p.setContent(vl); - vl.addComponent(createTemporaryResponseCodeSetters("UIDL", uidlResponse)); + vl.addComponent( + createTemporaryResponseCodeSetters("UIDL", uidlResponse)); vl.addComponent(createTemporaryResponseCodeSetters("Heartbeat", heartbeatResponse)); vl.addComponent(new Button("Activate", new ClickListener() { @@ -132,8 +133,8 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog { final LegacyTextField reconnectDialogMessage = new LegacyTextField( "Reconnect message"); reconnectDialogMessage.setWidth("50em"); - reconnectDialogMessage.setValue(getReconnectDialogConfiguration() - .getDialogText()); + reconnectDialogMessage + .setValue(getReconnectDialogConfiguration().getDialogText()); reconnectDialogMessage .addValueChangeListener(new ValueChangeListener() { @Override @@ -147,8 +148,8 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog { "Reconnect gave up message"); reconnectDialogGaveUpMessage.setWidth("50em"); - reconnectDialogGaveUpMessage.setValue(getReconnectDialogConfiguration() - .getDialogTextGaveUp()); + reconnectDialogGaveUpMessage.setValue( + getReconnectDialogConfiguration().getDialogTextGaveUp()); reconnectDialogGaveUpMessage .addValueChangeListener(new ValueChangeListener() { @Override @@ -160,9 +161,8 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog { final LegacyTextField reconnectDialogReconnectAttempts = new LegacyTextField( "Reconnect attempts"); reconnectDialogReconnectAttempts.setConverter(Integer.class); - reconnectDialogReconnectAttempts - .setConvertedValue(getReconnectDialogConfiguration() - .getReconnectAttempts()); + reconnectDialogReconnectAttempts.setConvertedValue( + getReconnectDialogConfiguration().getReconnectAttempts()); reconnectDialogReconnectAttempts .addValueChangeListener(new ValueChangeListener() { @Override @@ -175,9 +175,8 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog { final LegacyTextField reconnectDialogReconnectInterval = new LegacyTextField( "Reconnect interval (ms)"); reconnectDialogReconnectInterval.setConverter(Integer.class); - reconnectDialogReconnectInterval - .setConvertedValue(getReconnectDialogConfiguration() - .getReconnectInterval()); + reconnectDialogReconnectInterval.setConvertedValue( + getReconnectDialogConfiguration().getReconnectInterval()); reconnectDialogReconnectInterval .addValueChangeListener(new ValueChangeListener() { @Override @@ -191,9 +190,8 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog { final LegacyTextField reconnectDialogGracePeriod = new LegacyTextField( "Reconnect dialog grace period (ms)"); reconnectDialogGracePeriod.setConverter(Integer.class); - reconnectDialogGracePeriod - .setConvertedValue(getReconnectDialogConfiguration() - .getDialogGracePeriod()); + reconnectDialogGracePeriod.setConvertedValue( + getReconnectDialogConfiguration().getDialogGracePeriod()); reconnectDialogGracePeriod .addValueChangeListener(new ValueChangeListener() { @Override @@ -206,8 +204,8 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog { final CheckBox reconnectDialogModal = new CheckBox( "Reconnect dialog modality"); - reconnectDialogModal.setValue(getReconnectDialogConfiguration() - .isDialogModal()); + reconnectDialogModal + .setValue(getReconnectDialogConfiguration().isDialogModal()); reconnectDialogModal.addValueChangeListener( event -> getReconnectDialogConfiguration() .setDialogModal(reconnectDialogModal.getValue())); @@ -230,11 +228,13 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog { hl.setSpacing(true); hl.setDefaultComponentAlignment(Alignment.MIDDLE_LEFT); Label l1 = new Label("Respond to " + type + " requests with code"); - final LegacyTextField responseCode = new LegacyTextField(null, "" + response.code); + final LegacyTextField responseCode = new LegacyTextField(null, + "" + response.code); responseCode.setConverter(Integer.class); responseCode.setWidth("5em"); Label l2 = new Label("for the following"); - final LegacyTextField timeField = new LegacyTextField(null, "" + response.time); + final LegacyTextField timeField = new LegacyTextField(null, + "" + response.time); timeField.setConverter(Integer.class); timeField.setWidth("5em"); Label l3 = new Label("seconds"); diff --git a/uitest/src/main/java/com/vaadin/tests/application/ConfirmBrowserTabClose.java b/uitest/src/main/java/com/vaadin/tests/application/ConfirmBrowserTabClose.java index 3d3d84f9bd..2be7bb93cf 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/ConfirmBrowserTabClose.java +++ b/uitest/src/main/java/com/vaadin/tests/application/ConfirmBrowserTabClose.java @@ -38,8 +38,8 @@ public class ConfirmBrowserTabClose extends AbstractTestUIWithLog { } }); addComponent(b); - getPage().getJavaScript().eval( - "window.addEventListener('beforeunload', function (e) {" + getPage().getJavaScript() + .eval("window.addEventListener('beforeunload', function (e) {" + "var confirmationMessage = 'Please stay!';" + "e.returnValue = confirmationMessage;" + "return confirmationMessage;" + "});"); diff --git a/uitest/src/main/java/com/vaadin/tests/application/CriticalNotifications.java b/uitest/src/main/java/com/vaadin/tests/application/CriticalNotifications.java index 14b4cb62e9..ba1c192172 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/CriticalNotifications.java +++ b/uitest/src/main/java/com/vaadin/tests/application/CriticalNotifications.java @@ -35,8 +35,8 @@ public class CriticalNotifications extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - systemMessages = VaadinService.getCurrent().getSystemMessages( - getLocale(), request); + systemMessages = VaadinService.getCurrent() + .getSystemMessages(getLocale(), request); includeDetails = new CheckBox("Include details"); addComponent(includeDetails); @@ -137,9 +137,9 @@ public class CriticalNotifications extends AbstractTestUI { try { service.writeStringResponse(response, - JsonConstants.JSON_CONTENT_TYPE, VaadinService - .createCriticalNotificationJSON(caption, message, - details, url)); + JsonConstants.JSON_CONTENT_TYPE, + VaadinService.createCriticalNotificationJSON(caption, + message, details, url)); } catch (IOException e) { e.printStackTrace(); } diff --git a/uitest/src/main/java/com/vaadin/tests/application/DeploymentConfiguration.java b/uitest/src/main/java/com/vaadin/tests/application/DeploymentConfiguration.java index 9c95479bec..91fadbf9a4 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/DeploymentConfiguration.java +++ b/uitest/src/main/java/com/vaadin/tests/application/DeploymentConfiguration.java @@ -15,8 +15,8 @@ public class DeploymentConfiguration extends AbstractTestUI { getLayout().setMargin(new MarginInfo(true, false, false, false)); for (Object key : params.keySet()) { - addComponent(new Label(key + ": " - + params.getProperty((String) key))); + addComponent( + new Label(key + ": " + params.getProperty((String) key))); } } diff --git a/uitest/src/main/java/com/vaadin/tests/application/DetachOldUIOnReload.java b/uitest/src/main/java/com/vaadin/tests/application/DetachOldUIOnReload.java index a7c9239fae..b917ccd18d 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/DetachOldUIOnReload.java +++ b/uitest/src/main/java/com/vaadin/tests/application/DetachOldUIOnReload.java @@ -51,8 +51,8 @@ public class DetachOldUIOnReload extends AbstractTestUIWithLog { private List<String> getSessionMessages(boolean storeIfNeeded) { @SuppressWarnings("unchecked") - List<String> messages = (List<String>) getSession().getAttribute( - PERSISTENT_MESSAGES_ATTRIBUTE); + List<String> messages = (List<String>) getSession() + .getAttribute(PERSISTENT_MESSAGES_ATTRIBUTE); if (messages == null) { messages = new ArrayList<String>(); if (storeIfNeeded) { diff --git a/uitest/src/main/java/com/vaadin/tests/application/MissingHierarchyDetection.java b/uitest/src/main/java/com/vaadin/tests/application/MissingHierarchyDetection.java index 508ac818f6..4d538da9f9 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/MissingHierarchyDetection.java +++ b/uitest/src/main/java/com/vaadin/tests/application/MissingHierarchyDetection.java @@ -29,10 +29,11 @@ public class MissingHierarchyDetection extends AbstractTestUI { private boolean isChildRendered = true; private BrokenCssLayout brokenLayout = new BrokenCssLayout(); - private CssLayout normalLayout = new CssLayout(new Label( - "Normal layout child")); + private CssLayout normalLayout = new CssLayout( + new Label("Normal layout child")); - public class BrokenCssLayout extends CssLayout implements SelectiveRenderer { + public class BrokenCssLayout extends CssLayout + implements SelectiveRenderer { public BrokenCssLayout() { setCaption("Broken layout"); Label label = new Label("Child component"); @@ -56,8 +57,8 @@ public class MissingHierarchyDetection extends AbstractTestUI { toggle(true); } })); - addComponent(new Button("Toggle improperly", - new Button.ClickListener() { + addComponent( + new Button("Toggle improperly", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { toggle(false); diff --git a/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java b/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java index d32ecb583d..1f255652d5 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java +++ b/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java @@ -85,10 +85,10 @@ public class NavigateWithOngoingXHR extends AbstractTestUI { }); // Hacky URLs that are might not work in all deployment scenarios - addComponent(new Link("Navigate away", new ExternalResource( - "slowRequestHandler"))); - addComponent(new Link("Start download", new ExternalResource( - "slowRequestHandler?download"))); + addComponent(new Link("Navigate away", + new ExternalResource("slowRequestHandler"))); + addComponent(new Link("Start download", + new ExternalResource("slowRequestHandler?download"))); } @Override diff --git a/uitest/src/main/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeat.java b/uitest/src/main/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeat.java index de45d2bccb..83a8ac3438 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeat.java +++ b/uitest/src/main/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeat.java @@ -23,7 +23,8 @@ import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Label; @PreserveOnRefresh -@CustomDeploymentConfiguration({ @Conf(name = "heartbeatInterval", value = "5") }) +@CustomDeploymentConfiguration({ + @Conf(name = "heartbeatInterval", value = "5") }) public class PreserveWithExpiredHeartbeat extends AbstractTestUI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/application/ReconnectDialogUI.java b/uitest/src/main/java/com/vaadin/tests/application/ReconnectDialogUI.java index 62de2d49c5..4627756e16 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/ReconnectDialogUI.java +++ b/uitest/src/main/java/com/vaadin/tests/application/ReconnectDialogUI.java @@ -26,10 +26,8 @@ public class ReconnectDialogUI extends AbstractTestUIWithLog { @Override protected void setup(VaadinRequest request) { if (request.getParameter("reconnectAttempts") != null) { - getReconnectDialogConfiguration() - .setReconnectAttempts( - Integer.parseInt(request - .getParameter("reconnectAttempts"))); + getReconnectDialogConfiguration().setReconnectAttempts(Integer + .parseInt(request.getParameter("reconnectAttempts"))); } Button b = new Button("Say hello"); b.addClickListener(new ClickListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/application/RefreshStatePreserve.java b/uitest/src/main/java/com/vaadin/tests/application/RefreshStatePreserve.java index e7f81167d9..a6773c201e 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/RefreshStatePreserve.java +++ b/uitest/src/main/java/com/vaadin/tests/application/RefreshStatePreserve.java @@ -20,7 +20,8 @@ public class RefreshStatePreserve extends AbstractTestUIWithLog { getPage().addUriFragmentChangedListener( new UriFragmentChangedListener() { @Override - public void uriFragmentChanged(UriFragmentChangedEvent event) { + public void uriFragmentChanged( + UriFragmentChangedEvent event) { log("Fragment changed to " + event.getUriFragment()); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/application/ResynchronizeAfterAsyncRemoval.java b/uitest/src/main/java/com/vaadin/tests/application/ResynchronizeAfterAsyncRemoval.java index bc6ef22c9a..2e76ed460e 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/ResynchronizeAfterAsyncRemoval.java +++ b/uitest/src/main/java/com/vaadin/tests/application/ResynchronizeAfterAsyncRemoval.java @@ -40,8 +40,8 @@ public class ResynchronizeAfterAsyncRemoval extends AbstractTestUIWithLog { public void buttonClick(ClickEvent event) { log("Window removed: " + (window.getParent() == null)); - boolean dirty = getUI().getConnectorTracker().isDirty( - event.getButton()); + boolean dirty = getUI().getConnectorTracker() + .isDirty(event.getButton()); log("Dirty: " + dirty); } })); @@ -69,8 +69,8 @@ public class ResynchronizeAfterAsyncRemoval extends AbstractTestUIWithLog { private Map<Integer, Set<String>> getUnregisterIdMap() { try { ConnectorTracker tracker = getConnectorTracker(); - Field field = tracker.getClass().getDeclaredField( - "syncIdToUnregisteredConnectorIds"); + Field field = tracker.getClass() + .getDeclaredField("syncIdToUnregisteredConnectorIds"); field.setAccessible(true); return (Map<Integer, Set<String>>) field.get(tracker); } catch (Exception e) { diff --git a/uitest/src/main/java/com/vaadin/tests/application/VaadinSessionAttribute.java b/uitest/src/main/java/com/vaadin/tests/application/VaadinSessionAttribute.java index c8fc96f596..832637e641 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/VaadinSessionAttribute.java +++ b/uitest/src/main/java/com/vaadin/tests/application/VaadinSessionAttribute.java @@ -31,15 +31,14 @@ public class VaadinSessionAttribute extends AbstractTestUI { getSession().setAttribute(ATTR_NAME, Integer.valueOf(42)); getSession().setAttribute(Integer.class, Integer.valueOf(42 * 2)); - addComponent(new Button("Show attribute values", - new Button.ClickListener() { + addComponent( + new Button("Show attribute values", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { Notification notification = new Notification( - getSession().getAttribute(ATTR_NAME) - + " & " - + getSession().getAttribute( - Integer.class)); + getSession().getAttribute(ATTR_NAME) + " & " + + getSession() + .getAttribute(Integer.class)); notification.setDelayMsec(Notification.DELAY_FOREVER); notification.show(getPage()); } diff --git a/uitest/src/main/java/com/vaadin/tests/application/WebBrowserTimeZone.java b/uitest/src/main/java/com/vaadin/tests/application/WebBrowserTimeZone.java index 52d61c89c9..b591635a73 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/WebBrowserTimeZone.java +++ b/uitest/src/main/java/com/vaadin/tests/application/WebBrowserTimeZone.java @@ -17,10 +17,12 @@ public class WebBrowserTimeZone extends AbstractTestUI { final Label offsetLabel = addLabel("Browser offset"); final Label rawOffsetLabel = addLabel("Browser raw offset"); - final Label dstDiffLabel = addLabel("Difference between raw offset and DST"); + final Label dstDiffLabel = addLabel( + "Difference between raw offset and DST"); final Label dstInEffectLabel = addLabel("Is DST currently active?"); final Label curDateLabel = addLabel("Current date in the browser"); - final Label diffLabel = addLabel("Browser to Europe/Helsinki offset difference"); + final Label diffLabel = addLabel( + "Browser to Europe/Helsinki offset difference"); final Label containsLabel = addLabel("Browser could be in Helsinki"); addButton("Get TimeZone from browser", new Button.ClickListener() { @@ -40,10 +42,10 @@ public class WebBrowserTimeZone extends AbstractTestUI { rawOffsetLabel.setValue(String.valueOf(browserRawOffset)); diffLabel.setValue(String.valueOf(browserOffset - hkiOffset)); containsLabel.setValue(contains ? "Yes" : "No"); - dstDiffLabel.setValue(String.valueOf(getBrowser() - .getDSTSavings())); - dstInEffectLabel.setValue(getBrowser().isDSTInEffect() ? "Yes" - : "No"); + dstDiffLabel + .setValue(String.valueOf(getBrowser().getDSTSavings())); + dstInEffectLabel + .setValue(getBrowser().isDSTInEffect() ? "Yes" : "No"); curDateLabel.setValue(getBrowser().getCurrentDate().toString()); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/applicationcontext/ChangeSessionId.java b/uitest/src/main/java/com/vaadin/tests/applicationcontext/ChangeSessionId.java index 93e9464054..fc1d249e26 100644 --- a/uitest/src/main/java/com/vaadin/tests/applicationcontext/ChangeSessionId.java +++ b/uitest/src/main/java/com/vaadin/tests/applicationcontext/ChangeSessionId.java @@ -19,8 +19,8 @@ public class ChangeSessionId extends AbstractTestCase { LegacyWindow mainWindow = new LegacyWindow("Sestest Application"); mainWindow.addComponent(log); mainWindow.addComponent(loginButton); - mainWindow.addComponent(new Button("Show session id", - new Button.ClickListener() { + mainWindow.addComponent( + new Button("Show session id", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { @@ -33,8 +33,8 @@ public class ChangeSessionId extends AbstractTestCase { @Override public void buttonClick(ClickEvent event) { String oldSessionId = getSessionId(); - VaadinService.reinitializeSession(VaadinService - .getCurrentRequest()); + VaadinService + .reinitializeSession(VaadinService.getCurrentRequest()); String newSessionId = getSessionId(); if (oldSessionId.equals(newSessionId)) { log.log("FAILED! Both old and new session id is " diff --git a/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseSession.java b/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseSession.java index cca76cc9e3..252f5a8318 100644 --- a/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseSession.java +++ b/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseSession.java @@ -56,7 +56,8 @@ public class CloseSession extends AbstractTestUI { String oldSessionId = request.getParameter(OLD_SESSION_ID_PARAM); if (oldSessionId != null) { log.log("Old WrappedSession id: " + oldSessionId); - log.log("Same WrappedSession id? " + oldSessionId.equals(sessionId)); + log.log("Same WrappedSession id? " + + oldSessionId.equals(sessionId)); } // Add parameters to help see what has changed @@ -65,16 +66,18 @@ public class CloseSession extends AbstractTestUI { + OLD_SESSION_ID_PARAM + "=" + sessionId; addComponent(log); - addComponent(new Button( - "Close VaadinServiceSession and redirect elsewhere", - new Button.ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - // Assuming Vaadin is deployed to the root context - getPage().setLocation("/statictestfiles/static.html"); - getSession().close(); - } - })); + addComponent( + new Button("Close VaadinServiceSession and redirect elsewhere", + new Button.ClickListener() { + @Override + public void buttonClick(ClickEvent event) { + // Assuming Vaadin is deployed to the root + // context + getPage().setLocation( + "/statictestfiles/static.html"); + getSession().close(); + } + })); addComponent(new Button("Close VaadinServiceSession and reopen page", new Button.ClickListener() { @Override @@ -106,8 +109,7 @@ public class CloseSession extends AbstractTestUI { getPage().setLocation(reopenUrl); } })); - addComponent(new Button( - "Invalidate HttpSession and redirect elsewhere", + addComponent(new Button("Invalidate HttpSession and redirect elsewhere", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { @@ -116,14 +118,13 @@ public class CloseSession extends AbstractTestUI { getPage().setLocation("/statictestfiles/static.html"); } })); - addComponent(new Button( - "Invalidate HttpSession in a background thread", + addComponent(new Button("Invalidate HttpSession in a background thread", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { final HttpSession session = ((WrappedHttpSession) VaadinService .getCurrentRequest().getWrappedSession()) - .getHttpSession(); + .getHttpSession(); Thread t = new Thread(new Runnable() { @Override @@ -133,12 +134,12 @@ public class CloseSession extends AbstractTestUI { } catch (InterruptedException e) { e.printStackTrace(); } - System.out - .println("Invalidating session from thread " + System.out.println( + "Invalidating session from thread " + session.getId()); session.invalidate(); - System.out - .println("Invalidated session from thread " + System.out.println( + "Invalidated session from thread " + session.getId()); } @@ -164,9 +165,10 @@ public class CloseSession extends AbstractTestUI { log.log("Detach of " + this + " (" + getUIId() + ")"); boolean correctUI = (UI.getCurrent() == this); boolean correctPage = (Page.getCurrent() == getPage()); - boolean correctVaadinSession = (VaadinSession.getCurrent() == getSession()); - boolean correctVaadinService = (VaadinService.getCurrent() == getSession() - .getService()); + boolean correctVaadinSession = (VaadinSession + .getCurrent() == getSession()); + boolean correctVaadinService = (VaadinService + .getCurrent() == getSession().getService()); log.log("UI.current correct in detach: " + correctUI); log.log("Page.current correct in detach: " + correctPage); log.log("VaadinSession.current correct in detach: " diff --git a/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseUI.java b/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseUI.java index 8f2cddd529..69c6b673c5 100644 --- a/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseUI.java +++ b/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseUI.java @@ -120,9 +120,10 @@ public class CloseUI extends AbstractTestUIWithLog { log("Detach of " + this + " (" + getUIId() + ")"); boolean correctUI = (UI.getCurrent() == this); boolean correctPage = (Page.getCurrent() == getPage()); - boolean correctVaadinSession = (VaadinSession.getCurrent() == getSession()); - boolean correctVaadinService = (VaadinService.getCurrent() == getSession() - .getService()); + boolean correctVaadinSession = (VaadinSession + .getCurrent() == getSession()); + boolean correctVaadinService = (VaadinService + .getCurrent() == getSession().getService()); log("UI.current correct in detach: " + correctUI); log("Page.current correct in detach: " + correctPage); log("VaadinSession.current correct in detach: " + correctVaadinSession); diff --git a/uitest/src/main/java/com/vaadin/tests/applicationservlet/CustomDeploymentConf.java b/uitest/src/main/java/com/vaadin/tests/applicationservlet/CustomDeploymentConf.java index 8ae7715a77..783635ec82 100644 --- a/uitest/src/main/java/com/vaadin/tests/applicationservlet/CustomDeploymentConf.java +++ b/uitest/src/main/java/com/vaadin/tests/applicationservlet/CustomDeploymentConf.java @@ -34,9 +34,8 @@ public class CustomDeploymentConf extends AbstractTestUI { .getService().getDeploymentConfiguration(); addComponent(new Label("Resource cache time: " + deploymentConfiguration.getResourceCacheTime())); - addComponent(new Label("Custom config param: " - + deploymentConfiguration.getApplicationOrSystemProperty( - "customParam", null))); + addComponent(new Label("Custom config param: " + deploymentConfiguration + .getApplicationOrSystemProperty("customParam", null))); } @Override diff --git a/uitest/src/main/java/com/vaadin/tests/applicationservlet/DisableSendUrlAsParameters.java b/uitest/src/main/java/com/vaadin/tests/applicationservlet/DisableSendUrlAsParameters.java index d398ead622..1f74c995ed 100644 --- a/uitest/src/main/java/com/vaadin/tests/applicationservlet/DisableSendUrlAsParameters.java +++ b/uitest/src/main/java/com/vaadin/tests/applicationservlet/DisableSendUrlAsParameters.java @@ -21,7 +21,8 @@ import com.vaadin.server.Constants; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUIWithLog; -@CustomDeploymentConfiguration({ @Conf(name = Constants.SERVLET_PARAMETER_SENDURLSASPARAMETERS, value = "false") }) +@CustomDeploymentConfiguration({ + @Conf(name = Constants.SERVLET_PARAMETER_SENDURLSASPARAMETERS, value = "false") }) public class DisableSendUrlAsParameters extends AbstractTestUIWithLog { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTest.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTest.java index d033443a2c..60c4ce969b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTest.java @@ -26,9 +26,8 @@ import com.vaadin.ui.MenuBar; import com.vaadin.ui.MenuBar.MenuItem; import com.vaadin.ui.themes.BaseTheme; -public abstract class AbstractComponentTest<T extends AbstractComponent> - extends AbstractComponentTestCase<T> implements FocusListener, - BlurListener { +public abstract class AbstractComponentTest<T extends AbstractComponent> extends + AbstractComponentTestCase<T> implements FocusListener, BlurListener { protected static final String TEXT_SHORT = "Short"; protected static final String TEXT_MEDIUM = "This is a semi-long text that might wrap."; @@ -217,8 +216,8 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> try { return getTestClass().newInstance(); } catch (Exception e) { - throw new RuntimeException("Failed to instantiate " - + getTestClass(), e); + throw new RuntimeException( + "Failed to instantiate " + getTestClass(), e); } } @@ -227,7 +226,8 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> * when overriding. */ protected void createActions() { - createBooleanAction("Immediate", CATEGORY_STATE, true, immediateCommand); + createBooleanAction("Immediate", CATEGORY_STATE, true, + immediateCommand); createBooleanAction("Enabled", CATEGORY_STATE, true, enabledCommand); createBooleanAction("Readonly", CATEGORY_STATE, false, readonlyCommand); createBooleanAction("Visible", CATEGORY_STATE, true, visibleCommand); @@ -299,7 +299,8 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> createSelectAction("Tab index", "State", tabIndexes, "0", new Command<T, Integer>() { @Override - public void execute(T c, Integer tabIndex, Object data) { + public void execute(T c, Integer tabIndex, + Object data) { ((Focusable) c).setTabIndex(tabIndex); } }); @@ -356,8 +357,8 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> } private void createCaptionSelect(String category) { - createSelectAction("Caption", category, createCaptionOptions(), - "Short", captionCommand); + createSelectAction("Caption", category, createCaptionOptions(), "Short", + captionCommand); } @@ -429,14 +430,13 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> doCommand(caption, command, initialState, data); } - protected <DATATYPE> void createClickAction(String caption, - String category, final Command<T, DATATYPE> command, DATATYPE value) { + protected <DATATYPE> void createClickAction(String caption, String category, + final Command<T, DATATYPE> command, DATATYPE value) { createClickAction(caption, category, command, value, null); } - protected <DATATYPE> void createClickAction(String caption, - String category, final Command<T, DATATYPE> command, - DATATYPE value, Object data) { + protected <DATATYPE> void createClickAction(String caption, String category, + final Command<T, DATATYPE> command, DATATYPE value, Object data) { MenuItem categoryItem = getCategoryMenuItem(category); categoryItem.addItem(caption, menuClickCommand(command, value, data)); } @@ -484,8 +484,8 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> protected void removeCategory(String categoryId) { if (!hasCategory(categoryId)) { - throw new IllegalArgumentException("Category '" + categoryId - + "' does not exist"); + throw new IllegalArgumentException( + "Category '" + categoryId + "' does not exist"); } MenuItem item = getCategoryMenuItem(categoryId); @@ -511,7 +511,8 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> @Override public void menuSelected(MenuItem selectedItem) { boolean selected = !isSelected(selectedItem); - doCommand(getText(selectedItem), booleanCommand, selected, data); + doCommand(getText(selectedItem), booleanCommand, selected, + data); setSelected(selectedItem, selected); } @@ -551,8 +552,8 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> public void menuSelected(MenuItem selectedItem) { doCommand(getText(selectedItem), cmd, object, data); - if (parentOfSelectableMenuItem.contains(selectedItem - .getParent())) { + if (parentOfSelectableMenuItem + .contains(selectedItem.getParent())) { unselectChildren(selectedItem.getParent()); setSelected(selectedItem, true); } @@ -593,22 +594,16 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> return item.getParent() == mainMenu; } - protected <TYPE> void createSelectAction( - String caption, - String category, - LinkedHashMap<String, TYPE> options, - String initialValue, + protected <TYPE> void createSelectAction(String caption, String category, + LinkedHashMap<String, TYPE> options, String initialValue, com.vaadin.tests.components.ComponentTestCase.Command<T, TYPE> command) { createSelectAction(caption, category, options, initialValue, command, null); } - protected <TYPE extends Enum<TYPE>> void createSelectAction( - String caption, - String category, - Class<TYPE> enumType, - TYPE initialValue, + protected <TYPE extends Enum<TYPE>> void createSelectAction(String caption, + String category, Class<TYPE> enumType, TYPE initialValue, com.vaadin.tests.components.ComponentTestCase.Command<T, TYPE> command) { LinkedHashMap<String, TYPE> options = new LinkedHashMap<String, TYPE>(); for (TYPE value : EnumSet.allOf(enumType)) { @@ -618,10 +613,8 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> command); } - protected <TYPE> void createMultiClickAction( - String caption, - String category, - LinkedHashMap<String, TYPE> options, + protected <TYPE> void createMultiClickAction(String caption, + String category, LinkedHashMap<String, TYPE> options, com.vaadin.tests.components.ComponentTestCase.Command<T, TYPE> command, Object data) { @@ -629,16 +622,14 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> MenuItem mainItem = categoryItem.addItem(caption, null); for (String option : options.keySet()) { - MenuBar.Command cmd = menuClickCommand(command, - options.get(option), data); + MenuBar.Command cmd = menuClickCommand(command, options.get(option), + data); mainItem.addItem(option, cmd); } } - protected <TYPE> void createMultiToggleAction( - String caption, - String category, - LinkedHashMap<String, TYPE> options, + protected <TYPE> void createMultiToggleAction(String caption, + String category, LinkedHashMap<String, TYPE> options, com.vaadin.tests.components.ComponentTestCase.Command<T, Boolean> command, boolean defaultValue) { @@ -652,10 +643,8 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> defaultValues); } - protected <TYPE> void createMultiToggleAction( - String caption, - String category, - LinkedHashMap<String, TYPE> options, + protected <TYPE> void createMultiToggleAction(String caption, + String category, LinkedHashMap<String, TYPE> options, com.vaadin.tests.components.ComponentTestCase.Command<T, Boolean> command, LinkedHashMap<String, Boolean> defaultValues) { @@ -668,11 +657,8 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> } } - protected <TYPE> void createSelectAction( - String caption, - String category, - LinkedHashMap<String, TYPE> options, - String initialValue, + protected <TYPE> void createSelectAction(String caption, String category, + LinkedHashMap<String, TYPE> options, String initialValue, com.vaadin.tests.components.ComponentTestCase.Command<T, TYPE> command, Object data) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractLayoutTest.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractLayoutTest.java index 56c04180b8..525e28b41d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/AbstractLayoutTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractLayoutTest.java @@ -10,8 +10,8 @@ import com.vaadin.ui.Layout.AlignmentHandler; import com.vaadin.ui.Layout.MarginHandler; import com.vaadin.ui.Layout.SpacingHandler; -public abstract class AbstractLayoutTest<T extends AbstractLayout> extends - AbstractComponentContainerTest<T> { +public abstract class AbstractLayoutTest<T extends AbstractLayout> + extends AbstractComponentContainerTest<T> { protected static final String CATEGORY_LAYOUT_FEATURES = "Layout features"; private Command<T, MarginInfo> marginCommand = new Command<T, MarginInfo>() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutTest.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutTest.java index 1d18cba952..b345414459 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutTest.java @@ -15,7 +15,8 @@ public abstract class AbstractOrderedLayoutTest<T extends AbstractOrderedLayout> @Override public void execute(T c, Boolean value, Object data) { if (value) { - c.addListener((LayoutClickListener) AbstractOrderedLayoutTest.this); + c.addListener( + (LayoutClickListener) AbstractOrderedLayoutTest.this); } else { } diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUI.java index 33ff504d8d..61b3417d8c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUI.java @@ -97,13 +97,12 @@ public abstract class AbstractTestUI extends UI { long currentWidgetsetTimestamp = currentWidgetsetFolder.lastModified(); int halfHour = 30 * 60 * 1000; if (currentWidgetsetTimestamp + halfHour < newestWidgetsetTimestamp) { - Notification - .show("The currently used widgetset (" - + usedWidgetset + Notification.show( + "The currently used widgetset (" + usedWidgetset + ") was compiled long before the most recently compiled one (" + newestWidgetsetName + "). Are you sure you have compiled the right widgetset?", - Type.WARNING_MESSAGE); + Type.WARNING_MESSAGE); } } @@ -185,7 +184,8 @@ public abstract class AbstractTestUI extends UI { getLayout().removeComponent(c); } - public void replaceComponent(Component oldComponent, Component newComponent) { + public void replaceComponent(Component oldComponent, + Component newComponent) { getLayout().replaceComponent(oldComponent, newComponent); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java b/uitest/src/main/java/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java index b5a8384ff1..63184ed290 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java @@ -29,8 +29,9 @@ public class AddRemoveSetStyleNamesTest extends TestBase { @Override public void buttonClick(ClickEvent event) { String style = (String) event.getButton().getData(); - setComponentsStyle(style, !popupDateField.getStyleName() - .contains(style), event.getButton()); + setComponentsStyle(style, + !popupDateField.getStyleName().contains(style), + event.getButton()); } }; diff --git a/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java b/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java index 323705f466..26da622f76 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java @@ -17,8 +17,8 @@ import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.NativeSelect; -public abstract class ComponentTestCase<T extends AbstractComponent> extends - AbstractComponentTestCase<T> { +public abstract class ComponentTestCase<T extends AbstractComponent> + extends AbstractComponentTestCase<T> { protected static final Object CAPTION = "caption"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/DeclarativeTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/DeclarativeTestUI.java index 568c484760..c5505699f6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/DeclarativeTestUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/DeclarativeTestUI.java @@ -155,8 +155,8 @@ public class DeclarativeTestUI extends AbstractTestUI { try { return (T) component; } catch (ClassCastException ex) { - getLogger().log(Level.SEVERE, - "Component code/design type mismatch", ex); + getLogger().log(Level.SEVERE, "Component code/design type mismatch", + ex); } return null; } diff --git a/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascade.java b/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascade.java index cd284224a0..95f3138e69 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascade.java +++ b/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascade.java @@ -70,13 +70,13 @@ public class DisableEnableCascade extends TestBase { if (target.isEnabled()) { target.setEnabled(false); button.setCaption(button.getCaption().replace("Disable", "Enable")); - target.setCaption(target.getCaption() - .replace("enabled", "disabled")); + target.setCaption( + target.getCaption().replace("enabled", "disabled")); } else { target.setEnabled(true); button.setCaption(button.getCaption().replace("Enable", "Disable")); - target.setCaption(target.getCaption() - .replace("disabled", "enabled")); + target.setCaption( + target.getCaption().replace("disabled", "enabled")); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java b/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java index 6942eb31e5..4df1c3094f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java +++ b/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java @@ -36,7 +36,8 @@ public class DisableEnableCascadeStyles extends TestBase { button = new Button("Button, enabled"); nativeButton = new NativeButton("NativeButton, enabled"); - textField = new LegacyTextField("TextField with caption and value, enabled"); + textField = new LegacyTextField( + "TextField with caption and value, enabled"); textField.setValue("Text"); textArea = new TextArea("TextArea with caption and value, enabled"); textArea.setValue("Text"); @@ -101,15 +102,13 @@ public class DisableEnableCascadeStyles extends TestBase { } } if (layout.getComponent(0).isEnabled()) { - enableDisableComponentsButton - .setCaption(enableDisableComponentsButton - .getCaption().replace("Enable", - "Disable")); + enableDisableComponentsButton.setCaption( + enableDisableComponentsButton.getCaption() + .replace("Enable", "Disable")); } else { - enableDisableComponentsButton - .setCaption(enableDisableComponentsButton - .getCaption().replace("Disable", - "Enable")); + enableDisableComponentsButton.setCaption( + enableDisableComponentsButton.getCaption() + .replace("Disable", "Enable")); } } }); @@ -123,13 +122,13 @@ public class DisableEnableCascadeStyles extends TestBase { if (target.isEnabled()) { target.setEnabled(false); button.setCaption(button.getCaption().replace("Disable", "Enable")); - target.setCaption(target.getCaption() - .replace("enabled", "disabled")); + target.setCaption( + target.getCaption().replace("enabled", "disabled")); } else { target.setEnabled(true); button.setCaption(button.getCaption().replace("Enable", "Disable")); - target.setCaption(target.getCaption() - .replace("disabled", "enabled")); + target.setCaption( + target.getCaption().replace("disabled", "enabled")); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java b/uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java index 15e89e1fd5..9cddbeb28b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java @@ -20,7 +20,8 @@ public class ErrorMessages extends TestBase { bb.setComponentError(new CompositeErrorMessage(errors)); addComponent(bb); - LegacyTextField tf = new LegacyTextField("", "Textfield with UserError"); + LegacyTextField tf = new LegacyTextField("", + "Textfield with UserError"); tf.setComponentError(new UserError("This is a failure")); addComponent(tf); diff --git a/uitest/src/main/java/com/vaadin/tests/components/FileDownloaderUI.java b/uitest/src/main/java/com/vaadin/tests/components/FileDownloaderUI.java index b1379080e9..30e798e5f4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/FileDownloaderUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/FileDownloaderUI.java @@ -99,14 +99,14 @@ public class FileDownloaderUI extends AbstractTestUIWithLog { addComponents("Class resource pdf", resource, components); Button downloadUtf8File = new Button("Download UTF-8 named file"); - FileDownloader fd = new FileDownloader(new ClassResource( - new EmbeddedPdf().getClass(), "åäö-日本語.pdf")); + FileDownloader fd = new FileDownloader( + new ClassResource(new EmbeddedPdf().getClass(), "åäö-日本語.pdf")); fd.setOverrideContentType(false); fd.extend(downloadUtf8File); addComponent(downloadUtf8File); - addComponent(new Button("Remove first download button", - new ClickListener() { + addComponent( + new Button("Remove first download button", new ClickListener() { @Override public void buttonClick(ClickEvent event) { @@ -115,18 +115,18 @@ public class FileDownloaderUI extends AbstractTestUIWithLog { parent.removeComponent(firstDownloadComponent); } })); - addComponent(new Button( - "Detach FileDownloader from first download button", - new ClickListener() { - - @Override - public void buttonClick(ClickEvent event) { - FileDownloader e = (FileDownloader) firstDownloadComponent - .getExtensions().iterator().next(); - e.remove(); - log("FileDownload detached"); - } - })); + addComponent( + new Button("Detach FileDownloader from first download button", + new ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + FileDownloader e = (FileDownloader) firstDownloadComponent + .getExtensions().iterator().next(); + e.remove(); + log("FileDownload detached"); + } + })); } public void addComponents(String caption, ConnectorResource resource, @@ -142,8 +142,8 @@ public class FileDownloaderUI extends AbstractTestUIWithLog { c.setId(cls.getName() + caption.replace(" ", "")); c.setCaption(cls.getName()); - c.setDescription(resource.getMIMEType() + " / " - + resource.getClass()); + c.setDescription( + resource.getMIMEType() + " / " + resource.getClass()); c.setWidth("100px"); c.setHeight("100px"); @@ -180,8 +180,8 @@ public class FileDownloaderUI extends AbstractTestUIWithLog { } BufferedImage bi = getImage(text); response.setContentType("image/png"); - response.setHeader("Content-Disposition", "attachment; filename=\"" - + path + "\""); + response.setHeader("Content-Disposition", + "attachment; filename=\"" + path + "\""); ImageIO.write(bi, "png", response.getOutputStream()); return true; @@ -193,16 +193,16 @@ public class FileDownloaderUI extends AbstractTestUIWithLog { private BufferedImage getImage(String text) { BufferedImage bi = new BufferedImage(150, 30, BufferedImage.TYPE_3BYTE_BGR); - bi.getGraphics() - .drawChars(text.toCharArray(), 0, text.length(), 10, 20); + bi.getGraphics().drawChars(text.toCharArray(), 0, text.length(), 10, + 20); return bi; } private BufferedImage getImage2(String text) { BufferedImage bi = new BufferedImage(200, 200, BufferedImage.TYPE_INT_RGB); - bi.getGraphics() - .drawChars(text.toCharArray(), 0, text.length(), 10, 20); + bi.getGraphics().drawChars(text.toCharArray(), 0, text.length(), 10, + 20); return bi; } diff --git a/uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java b/uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java index 83d45f1545..59e79c96b5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java +++ b/uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java @@ -13,8 +13,8 @@ public class FocusFromShortcutAction extends TestBase { @Override protected void setup() { - final Select select = new Select("Select", Arrays.asList("Option 1", - "Option 2")); + final Select select = new Select("Select", + Arrays.asList("Option 1", "Option 2")); final LegacyTextField text = new LegacyTextField("Text"); addComponent(select); diff --git a/uitest/src/main/java/com/vaadin/tests/components/LayoutAttachListenerInfo.java b/uitest/src/main/java/com/vaadin/tests/components/LayoutAttachListenerInfo.java index e118558528..9d2689810b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/LayoutAttachListenerInfo.java +++ b/uitest/src/main/java/com/vaadin/tests/components/LayoutAttachListenerInfo.java @@ -22,8 +22,8 @@ public class LayoutAttachListenerInfo extends TestBase { @Override protected void setup() { - OptionGroup layouts = new OptionGroup("Layouts", Arrays.asList( - "AbsoluteLayout", "OrderedLayout", "GridLayout")); + OptionGroup layouts = new OptionGroup("Layouts", + Arrays.asList("AbsoluteLayout", "OrderedLayout", "GridLayout")); layouts.select("AbsoluteLayout"); layouts.setImmediate(true); layouts.addValueChangeListener(new ValueChangeListener() { @@ -34,7 +34,8 @@ public class LayoutAttachListenerInfo extends TestBase { } else if (event.getProperty().getValue() .equals("OrderedLayout")) { testOrderedLayout(); - } else if (event.getProperty().getValue().equals("GridLayout")) { + } else if (event.getProperty().getValue() + .equals("GridLayout")) { testGridLayout(); } } @@ -66,7 +67,8 @@ public class LayoutAttachListenerInfo extends TestBase { a.setHeight("300px"); a.addComponentAttachListener(new ComponentAttachListener() { @Override - public void componentAttachedToContainer(ComponentAttachEvent event) { + public void componentAttachedToContainer( + ComponentAttachEvent event) { AbsoluteLayout layout = (AbsoluteLayout) event.getContainer(); AbsoluteLayout.ComponentPosition position = layout .getPosition(event.getAttachedComponent()); @@ -95,12 +97,12 @@ public class LayoutAttachListenerInfo extends TestBase { v.setHeight("300px"); v.addComponentAttachListener(new ComponentAttachListener() { @Override - public void componentAttachedToContainer(ComponentAttachEvent event) { + public void componentAttachedToContainer( + ComponentAttachEvent event) { VerticalLayout layout = (VerticalLayout) event.getContainer(); getMainWindow().showNotification( - "Attached to index " - + layout.getComponentIndex(event - .getAttachedComponent()), + "Attached to index " + layout.getComponentIndex( + event.getAttachedComponent()), Notification.TYPE_ERROR_MESSAGE); } }); @@ -125,10 +127,11 @@ public class LayoutAttachListenerInfo extends TestBase { g.setHideEmptyRowsAndColumns(true); g.addComponentAttachListener(new ComponentAttachListener() { @Override - public void componentAttachedToContainer(ComponentAttachEvent event) { + public void componentAttachedToContainer( + ComponentAttachEvent event) { GridLayout layout = (GridLayout) event.getContainer(); - GridLayout.Area area = layout.getComponentArea(event - .getAttachedComponent()); + GridLayout.Area area = layout + .getComponentArea(event.getAttachedComponent()); getMainWindow().showNotification( "Attached to " + area.getColumn1() + "," + area.getRow1(), diff --git a/uitest/src/main/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayout.java b/uitest/src/main/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayout.java index 9f63970f85..39329d7341 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayout.java @@ -75,8 +75,8 @@ public class NoLayoutUpdateWhichNeedsLayout extends UI { w = new Window("test"); w.setWidth("300px"); w.setHeight("300px"); - w.setContent(new VerticalLayout(new Label( - "simple test label component"))); + w.setContent(new VerticalLayout( + new Label("simple test label component"))); w.center(); getUI().addWindow(w); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/TooltipsOnScrollingWindow.java b/uitest/src/main/java/com/vaadin/tests/components/TooltipsOnScrollingWindow.java index a38f9c274e..6a9ef2a034 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/TooltipsOnScrollingWindow.java +++ b/uitest/src/main/java/com/vaadin/tests/components/TooltipsOnScrollingWindow.java @@ -9,13 +9,11 @@ public class TooltipsOnScrollingWindow extends TestBase { @Override protected void setup() { - TestUtils - .injectCSS( - getMainWindow(), - ".v-generated-body { overflow: auto; } " - + ".v-app, .v-ui { overflow: visible !important;}" - + ".hoverable-label { position: fixed; bottom: 10px; right: 10px; }" - + ".hidden-label { position: absolute; top: 2000px; left: 2000px;}"); + TestUtils.injectCSS(getMainWindow(), + ".v-generated-body { overflow: auto; } " + + ".v-app, .v-ui { overflow: visible !important;}" + + ".hoverable-label { position: fixed; bottom: 10px; right: 10px; }" + + ".hidden-label { position: absolute; top: 2000px; left: 2000px;}"); getLayout().getParent().setHeight("4000px"); getLayout().getParent().setWidth("4000px"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/TouchScrollables.java b/uitest/src/main/java/com/vaadin/tests/components/TouchScrollables.java index 1af1cc82e9..691f93b09e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/TouchScrollables.java +++ b/uitest/src/main/java/com/vaadin/tests/components/TouchScrollables.java @@ -49,16 +49,14 @@ public class TouchScrollables extends TestBase { addTest(getAccordionTest()); addTest(getSubWindowTest()); - TestUtils - .injectCSS( - getLayout().getUI(), - "body * {-webkit-user-select: none;} .v-table-row-drag-middle .v-table-cell-content {" - + " background-color: inherit ; border-bottom: 1px solid cyan;" - + "}" - + ".v-table-row-drag-middle .v-table-cell-wrapper {" - + " margin-bottom: -1px;" + "}" + "" - - ); + TestUtils.injectCSS(getLayout().getUI(), + "body * {-webkit-user-select: none;} .v-table-row-drag-middle .v-table-cell-content {" + + " background-color: inherit ; border-bottom: 1px solid cyan;" + + "}" + + ".v-table-row-drag-middle .v-table-cell-wrapper {" + + " margin-bottom: -1px;" + "}" + "" + + ); } private Component getPanelTest() { @@ -200,7 +198,8 @@ public class TouchScrollables extends TestBase { } @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { Notification.show(action.getCaption()); } @@ -239,7 +238,8 @@ public class TouchScrollables extends TestBase { IndexedContainer containerDataSource = (IndexedContainer) table .getContainerDataSource(); int newIndex = containerDataSource.indexOfId(itemIdOver) - 1; - if (dropTargetData.getDropLocation() != VerticalDropLocation.TOP) { + if (dropTargetData + .getDropLocation() != VerticalDropLocation.TOP) { newIndex++; } if (newIndex < 0) { @@ -296,8 +296,8 @@ public class TouchScrollables extends TestBase { for (int i = 0; i < 40; i++) { Item addItem = table.addItem("Item" + i); Person p = testData.getIdByIndex(i); - addItem.getItemProperty("Name").setValue( - p.getFirstName() + " " + p.getLastName()); + addItem.getItemProperty("Name") + .setValue(p.getFirstName() + " " + p.getLastName()); addItem.getItemProperty("Weight").setValue(50 + r.nextInt(60)); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java index 1d72bdf5d5..ac5ec79dea 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java @@ -89,8 +89,8 @@ public class AbsoluteLayoutHideComponent extends AbstractTestUI { // =====> THIS CODE generates error // WITHOUT THIS CODE works fine - Embedded e = new Embedded("", new ThemeResource( - "../runo/icons/64/ok.png")); + Embedded e = new Embedded("", + new ThemeResource("../runo/icons/64/ok.png")); // e.setMimeType("image/jpg"); e.setWidth("100%"); e.setHeight("100%"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContent.java b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContent.java index 4e1c8f5ca2..8570d76f54 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContent.java @@ -36,8 +36,8 @@ public class AbsoluteLayoutRelativeSizeContent extends AbstractTestUI { protected void setup(VaadinRequest request) { HorizontalLayout level1 = new HorizontalLayout( createComparisonTableOnFixed(), createTableOnFixed(), - createHalfTableOnFixed(), - createHalfTableAndFixedTableOnFixed(), createHalfTableOnFull()); + createHalfTableOnFixed(), createHalfTableAndFixedTableOnFixed(), + createHalfTableOnFull()); level1.setSpacing(true); level1.setWidth(100, Unit.PERCENTAGE); level1.setExpandRatio( diff --git a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.java b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.java index 810a583ba5..e7ed64d263 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.java +++ b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.java @@ -15,9 +15,11 @@ public class AbsoluteLayoutResizing extends TestBase { AbsoluteLayout al = new AbsoluteLayout(); TextArea ta = new TextArea(); - ta.setValue("When resizing the layout this text area should also get resized"); + ta.setValue( + "When resizing the layout this text area should also get resized"); ta.setSizeFull(); - al.addComponent(ta, "left: 10px; right: 10px; top: 10px; bottom: 10px;"); + al.addComponent(ta, + "left: 10px; right: 10px; top: 10px; bottom: 10px;"); HorizontalSplitPanel horizPanel = new HorizontalSplitPanel(); horizPanel.setSizeFull(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/EnableState.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/EnableState.java index eb84f689a5..5424efc2cb 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/EnableState.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/EnableState.java @@ -27,15 +27,18 @@ public class EnableState extends AbstractTestCase { enable.setImmediate(true); CheckBox caption = new CheckBox("Toggle button caption", true); - caption.addValueChangeListener(event -> button.setCaption(button.getCaption() + "+")); + caption.addValueChangeListener( + event -> button.setCaption(button.getCaption() + "+")); caption.setImmediate(true); CheckBox visible = new CheckBox("Toggle panel visibility", true); - visible.addValueChangeListener(event -> panel.setVisible(event.getValue())); + visible.addValueChangeListener( + event -> panel.setVisible(event.getValue())); visible.setImmediate(true); CheckBox panelEnable = new CheckBox("Toggle panel enabled", true); - panelEnable.addValueChangeListener(event -> panel.setEnabled(event.getValue())); + panelEnable.addValueChangeListener( + event -> panel.setEnabled(event.getValue())); panelEnable.setImmediate(true); mainWindow.addComponent(enable); diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java index 27126a5117..ea41be4789 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java @@ -38,11 +38,11 @@ public abstract class AbstractComponentDataBindingTest extends TestBase cb.setNullSelectionAllowed(false); for (Locale l : Locale.getAvailableLocales()) { Item i = cb.addItem(l); - i.getItemProperty(CAPTION).setValue( - l.getDisplayName(Locale.ENGLISH)); + i.getItemProperty(CAPTION) + .setValue(l.getDisplayName(Locale.ENGLISH)); } - ((Container.Sortable) cb.getContainerDataSource()).sort( - new Object[] { CAPTION }, new boolean[] { true }); + ((Container.Sortable) cb.getContainerDataSource()) + .sort(new Object[] { CAPTION }, new boolean[] { true }); cb.setImmediate(true); cb.addListener(new ValueChangeListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java index ff6db2d88d..0533b7c02a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java @@ -10,8 +10,9 @@ public class DateFieldBackedByString extends AbstractComponentDataBindingTest { protected void createFields() { LegacyDateField df = new LegacyDateField("Date field"); addComponent(df); - df.setPropertyDataSource(new com.vaadin.data.util.ObjectProperty<String>( - s, String.class)); + df.setPropertyDataSource( + new com.vaadin.data.util.ObjectProperty<String>(s, + String.class)); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java index b195a9a2ae..2f25bf8ce2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java @@ -15,15 +15,17 @@ public class DoubleInTextField extends AbstractComponentDataBindingTest { new Address("Dovestreet 12", 12233, "Johnston", Country.SOUTH_AFRICA)); - LegacyTextField salary = new LegacyTextField("Vaadin 7 - TextField with Double"); + LegacyTextField salary = new LegacyTextField( + "Vaadin 7 - TextField with Double"); addComponent(salary); - salary.setPropertyDataSource(new MethodProperty<Double>(person, - "salaryDouble")); + salary.setPropertyDataSource( + new MethodProperty<Double>(person, "salaryDouble")); - LegacyTextField salary6 = new LegacyTextField("Vaadin 6 - TextField with Double"); + LegacyTextField salary6 = new LegacyTextField( + "Vaadin 6 - TextField with Double"); addComponent(salary6); - salary6.setPropertyDataSource(new MethodProperty<Double>(person, - "salaryDouble")); + salary6.setPropertyDataSource( + new MethodProperty<Double>(person, "salaryDouble")); salary6.setConverter(new Vaadin6ImplicitDoubleConverter()); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java index 75248c93ae..c30edc1bf6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java @@ -15,8 +15,8 @@ public class FieldFocusOnClick extends AbstractTestUI { protected void setup(VaadinRequest request) { addComponent(new LegacyTextField(null, "TextField")); addComponent(new CheckBox("CheckBox")); - addComponent(new OptionGroup(null, - Arrays.asList("Option 1", "Option 2"))); + addComponent( + new OptionGroup(null, Arrays.asList("Option 1", "Option 2"))); addComponent(new NativeButton("NativeButton")); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java index 67daa98b67..4af04293cf 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java @@ -4,8 +4,8 @@ import java.util.Locale; import com.vaadin.legacy.data.util.converter.LegacyConverter; -public class Vaadin6ImplicitDoubleConverter implements - LegacyConverter<String, Double> { +public class Vaadin6ImplicitDoubleConverter + implements LegacyConverter<String, Double> { @Override public Double convertToModel(String value, diff --git a/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.java b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.java index bd7f047fc7..32124372fd 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.java +++ b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.java @@ -16,8 +16,8 @@ public class AccordionPrimaryStylenames extends TestBase { acc.setPrimaryStyleName("my-accordion"); addComponent(acc); - addComponent(new Button("Set primary stylename", - new Button.ClickListener() { + addComponent( + new Button("Set primary stylename", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { acc.setPrimaryStyleName("my-second-accordion"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java b/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java index 605ab676b6..877f521332 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java +++ b/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java @@ -23,8 +23,8 @@ public class BeanItemContainerNullValues extends TestBase { protected void setup() { table = new Table(); table.setSortDisabled(false); - table.setContainerDataSource(BeanItemContainerGenerator - .createContainer(100, 1)); + table.setContainerDataSource( + BeanItemContainerGenerator.createContainer(100, 1)); table.setColumnCollapsingAllowed(true); Button b = new Button("Disable sorting", new Button.ClickListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/browserframe/BrowserFrameIsVisible.java b/uitest/src/main/java/com/vaadin/tests/components/browserframe/BrowserFrameIsVisible.java index 4e9c133bea..e0ebc9bf37 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/browserframe/BrowserFrameIsVisible.java +++ b/uitest/src/main/java/com/vaadin/tests/components/browserframe/BrowserFrameIsVisible.java @@ -101,8 +101,8 @@ public class BrowserFrameIsVisible extends TestBase { ByteArrayInputStream istream; try { - istream = new ByteArrayInputStream(sb.toString().getBytes( - "UTF-8")); + istream = new ByteArrayInputStream( + sb.toString().getBytes("UTF-8")); } catch (UnsupportedEncodingException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java index 0d4981a441..cbb0be14d5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java +++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java @@ -18,7 +18,8 @@ public class ButtonEnterWithWindowShortcut extends TestBase { private static final long serialVersionUID = -4976129418325394913L; @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { log.log(action.getCaption() + " pressed in window"); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonHtml.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonHtml.java index 5cdc34e8e8..1c3070f38b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonHtml.java +++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonHtml.java @@ -21,8 +21,8 @@ public class ButtonHtml extends TestBase { @Override public void buttonClick(ClickEvent event) { - swapButton.setHtmlContentAllowed(!swapButton - .isHtmlContentAllowed()); + swapButton.setHtmlContentAllowed( + !swapButton.isHtmlContentAllowed()); } }); addComponent(swapButton); diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java index 807e88c7e4..67fd4ee8f1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java +++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java @@ -26,7 +26,8 @@ public class ButtonTabIndex extends TestBase { protected void setup() { LegacyTextField tf1 = new LegacyTextField("Tab index 0"); tf1.setTabIndex(0); - LegacyTextField tf2 = new LegacyTextField("Tab index -1, focused initially"); + LegacyTextField tf2 = new LegacyTextField( + "Tab index -1, focused initially"); tf2.setTabIndex(-1); tf2.focus(); addComponent(tf1); diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonToggleIcons.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonToggleIcons.java index 9e37fef7d9..1e0f85446e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonToggleIcons.java +++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonToggleIcons.java @@ -33,6 +33,7 @@ public class ButtonToggleIcons extends UI { }; layout.addComponent(new Button("Toggle icon", iconToggleListener)); - layout.addComponent(new NativeButton("Toggle icon", iconToggleListener)); + layout.addComponent( + new NativeButton("Toggle icon", iconToggleListener)); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/Buttons.java b/uitest/src/main/java/com/vaadin/tests/components/button/Buttons.java index 573c95c2b8..a6c4e326fe 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/button/Buttons.java +++ b/uitest/src/main/java/com/vaadin/tests/components/button/Buttons.java @@ -42,7 +42,8 @@ public class Buttons extends ComponentTestCase<Button> { l = createButton( "This is a 100% wide button with fixed 65px height. " - + LoremIpsum.get(5000), nat); + + LoremIpsum.get(5000), + nat); l.setWidth("100%"); l.setHeight("65px"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/Buttons3.java b/uitest/src/main/java/com/vaadin/tests/components/button/Buttons3.java index b20effad97..12e4ef9a4b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/button/Buttons3.java +++ b/uitest/src/main/java/com/vaadin/tests/components/button/Buttons3.java @@ -4,8 +4,8 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -public class Buttons3<T extends Button> extends Buttons2<T> implements - ClickListener { +public class Buttons3<T extends Button> extends Buttons2<T> + implements ClickListener { @Override public void buttonClick(ClickEvent event) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ShortCutListenerModification.java b/uitest/src/main/java/com/vaadin/tests/components/button/ShortCutListenerModification.java index 9cdd803fe0..025dfbb9c3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/button/ShortCutListenerModification.java +++ b/uitest/src/main/java/com/vaadin/tests/components/button/ShortCutListenerModification.java @@ -12,8 +12,8 @@ import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; @SuppressWarnings("serial") -public class ShortCutListenerModification extends TestBase implements - ClickListener { +public class ShortCutListenerModification extends TestBase + implements ClickListener { @Override protected String getDescription() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionEventSource.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionEventSource.java index ec40ef4649..dff7d2b71e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionEventSource.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionEventSource.java @@ -49,8 +49,9 @@ public class CalendarActionEventSource extends AbstractTestUI { CalendarEvent event = null; try { - event = new BasicEvent("NAME", null, new SimpleDateFormat( - "yyyy-MM-dd hh:mm").parse("2013-01-01 07:00"), + event = new BasicEvent("NAME", null, + new SimpleDateFormat("yyyy-MM-dd hh:mm") + .parse("2013-01-01 07:00"), new SimpleDateFormat("yyyy-MM-dd hh:mm") .parse("2013-01-01 11:00")); } catch (ParseException e) { @@ -63,10 +64,10 @@ public class CalendarActionEventSource extends AbstractTestUI { }); try { - calendar.setStartDate(new SimpleDateFormat("yyyy-MM-dd") - .parse("2013-01-01")); - calendar.setEndDate(new SimpleDateFormat("yyyy-MM-dd") - .parse("2013-01-31")); + calendar.setStartDate( + new SimpleDateFormat("yyyy-MM-dd").parse("2013-01-01")); + calendar.setEndDate( + new SimpleDateFormat("yyyy-MM-dd").parse("2013-01-31")); } catch (ParseException e) { // Nothing to do } @@ -79,7 +80,8 @@ public class CalendarActionEventSource extends AbstractTestUI { setEnabled(true); calendar.addActionHandler(new Handler() { @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { Label label1 = new Label(calendar.toString()); label1.setId("calendarlabel"); addComponent(label1); diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.java index 5b05d188bd..6f2dc818cf 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.java @@ -79,10 +79,10 @@ public class CalendarActionsMenuTest extends AbstractTestUI { }); try { - calendar.setStartDate(new SimpleDateFormat("yyyy-MM-dd") - .parse("2013-01-01")); - calendar.setEndDate(new SimpleDateFormat("yyyy-MM-dd") - .parse("2013-01-31")); + calendar.setStartDate( + new SimpleDateFormat("yyyy-MM-dd").parse("2013-01-01")); + calendar.setEndDate( + new SimpleDateFormat("yyyy-MM-dd").parse("2013-01-31")); } catch (ParseException e) { // Nothing to do } @@ -95,7 +95,8 @@ public class CalendarActionsMenuTest extends AbstractTestUI { setEnabled(true); calendar.addActionHandler(new Handler() { @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { Notification.show("ACTION CLICKED"); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsUI.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsUI.java index ee898e0790..c7188e45fe 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsUI.java @@ -58,7 +58,8 @@ public class CalendarActionsUI extends UI { * .Action, java.lang.Object, java.lang.Object) */ @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { Date date = (Date) target; if (action == NEW_EVENT) { BasicEvent event = new BasicEvent("New event", @@ -96,8 +97,8 @@ public class CalendarActionsUI extends UI { content.addComponent(calendar); - content.addComponent(new Button("Set week view", - new Button.ClickListener() { + content.addComponent( + new Button("Set week view", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { calendar.setEndDate(new Date(100, 1, 7)); diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarBackwardForward.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarBackwardForward.java index 5a21353d7d..de896bb699 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarBackwardForward.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarBackwardForward.java @@ -50,32 +50,35 @@ public class CalendarBackwardForward extends AbstractTestUI { try { - BasicEvent event = new BasicEvent("EVENT NAME 1", - "EVENT TOOLTIP 1", + BasicEvent event = new BasicEvent("EVENT NAME 1", "EVENT TOOLTIP 1", new SimpleDateFormat("yyyy-MM-dd HH:mm") - .parse("2013-09-05 15:30"), new SimpleDateFormat( - "yyyy-MM-dd HH:mm").parse("2013-09-07 22:20")); + .parse("2013-09-05 15:30"), + new SimpleDateFormat("yyyy-MM-dd HH:mm") + .parse("2013-09-07 22:20")); event.setStyleName("color1"); calendar.addEvent(event); event = new BasicEvent("EVENT NAME 2", "EVENT TOOLTIP 2", new SimpleDateFormat("yyyy-MM-dd HH:mm") - .parse("2013-09-05 12:10"), new SimpleDateFormat( - "yyyy-MM-dd HH:mm").parse("2013-09-05 13:20")); + .parse("2013-09-05 12:10"), + new SimpleDateFormat("yyyy-MM-dd HH:mm") + .parse("2013-09-05 13:20")); event.setStyleName("color2"); calendar.addEvent(event); event = new BasicEvent("EVENT NAME 3", "EVENT TOOLTIP 3", new SimpleDateFormat("yyyy-MM-dd HH:mm") - .parse("2013-09-01 11:30"), new SimpleDateFormat( - "yyyy-MM-dd HH:mm").parse("2013-09-29 15:20")); + .parse("2013-09-01 11:30"), + new SimpleDateFormat("yyyy-MM-dd HH:mm") + .parse("2013-09-29 15:20")); event.setStyleName("color3"); calendar.addEvent(event); event = new BasicEvent("EVENT NAME 4", "EVENT TOOLTIP 4", new SimpleDateFormat("yyyy-MM-dd HH:mm") - .parse("2013-09-01 11:30"), new SimpleDateFormat( - "yyyy-MM-dd HH:mm").parse("2013-09-01 15:20")); + .parse("2013-09-01 11:30"), + new SimpleDateFormat("yyyy-MM-dd HH:mm") + .parse("2013-09-01 15:20")); event.setStyleName("color4"); event.setAllDay(true); calendar.addEvent(event); @@ -84,10 +87,10 @@ public class CalendarBackwardForward extends AbstractTestUI { } try { - calendar.setStartDate(new SimpleDateFormat("yyyy-MM-dd") - .parse("2013-09-01")); - calendar.setEndDate(new SimpleDateFormat("yyyy-MM-dd") - .parse("2013-09-30")); + calendar.setStartDate( + new SimpleDateFormat("yyyy-MM-dd").parse("2013-09-01")); + calendar.setEndDate( + new SimpleDateFormat("yyyy-MM-dd").parse("2013-09-30")); } catch (ParseException e) { // Nothing to do } diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarDragAndDrop.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarDragAndDrop.java index 56c4eacba1..0eddfb5926 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarDragAndDrop.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarDragAndDrop.java @@ -52,9 +52,9 @@ public class CalendarDragAndDrop extends AbstractTestUI { TableTransferable transferable = (TableTransferable) event .getTransferable(); - calendar.addEvent(new BasicEvent(transferable.getItemId() - .toString(), "This event was dragged here", details - .getDropTime())); + calendar.addEvent(new BasicEvent( + transferable.getItemId().toString(), + "This event was dragged here", details.getDropTime())); table.removeItem(transferable.getItemId()); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarHtmlInEvents.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarHtmlInEvents.java index 8d0950cc61..8537af3d99 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarHtmlInEvents.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarHtmlInEvents.java @@ -58,11 +58,10 @@ public class CalendarHtmlInEvents extends AbstractTestUIWithLog { ns.setValue("Month"); final CheckBox allowHtml = new CheckBox("Allow HTML in event caption"); allowHtml.setValue(calendar.isEventCaptionAsHtml()); - allowHtml.addValueChangeListener( - event -> { - calendar.setEventCaptionAsHtml(event.getValue()); - log("HTML in event caption: " + event.getValue()); - }); + allowHtml.addValueChangeListener(event -> { + calendar.setEventCaptionAsHtml(event.getValue()); + log("HTML in event caption: " + event.getValue()); + }); HorizontalLayout hl = new HorizontalLayout(); hl.setDefaultComponentAlignment(Alignment.BOTTOM_LEFT); hl.addComponents(ns, allowHtml); diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java index b36b4d200e..2d0059f878 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java @@ -74,8 +74,8 @@ public class CalendarMonthViewDndEvent extends AbstractTestUI { @Override public void eventSetChange(EventSetChangeEvent event) { - List<CalendarEvent> events = event.getProvider().getEvents( - new Date(0), new Date(Long.MAX_VALUE)); + List<CalendarEvent> events = event.getProvider() + .getEvents(new Date(0), new Date(Long.MAX_VALUE)); CalendarEvent calEvent = events.get(0); Date startEvent = calEvent.getStart(); Date endEvent = calEvent.getEnd(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarNotifications.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarNotifications.java index 9b9a64624a..ad61135e84 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarNotifications.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarNotifications.java @@ -68,8 +68,8 @@ public class CalendarNotifications extends AbstractTestUIWithLog { new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - Notification - .show("This will disappear when you move your mouse!"); + Notification.show( + "This will disappear when you move your mouse!"); } }); content.addComponent(btn); diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarReadOnly.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarReadOnly.java index 8e82555e87..b8e1dd4ba5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarReadOnly.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarReadOnly.java @@ -35,16 +35,16 @@ public class CalendarReadOnly extends AbstractTestUI { calendar.setSizeFull(); try { - calendar.setStartDate(new SimpleDateFormat("yyyy-MM-dd") - .parse("2013-09-01")); - calendar.setEndDate(new SimpleDateFormat("yyyy-MM-dd") - .parse("2013-09-30")); + calendar.setStartDate( + new SimpleDateFormat("yyyy-MM-dd").parse("2013-09-01")); + calendar.setEndDate( + new SimpleDateFormat("yyyy-MM-dd").parse("2013-09-30")); - BasicEvent event = new BasicEvent("EVENT NAME 1", - "EVENT TOOLTIP 1", + BasicEvent event = new BasicEvent("EVENT NAME 1", "EVENT TOOLTIP 1", new SimpleDateFormat("yyyy-MM-dd HH:mm") - .parse("2013-09-05 15:30"), new SimpleDateFormat( - "yyyy-MM-dd HH:mm").parse("2013-09-05 22:20")); + .parse("2013-09-05 15:30"), + new SimpleDateFormat("yyyy-MM-dd HH:mm") + .parse("2013-09-05 22:20")); event.setStyleName("color1"); calendar.addEvent(event); diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarRescheduleEvent.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarRescheduleEvent.java index 824ad0941f..f36955f38d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarRescheduleEvent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarRescheduleEvent.java @@ -68,8 +68,8 @@ public class CalendarRescheduleEvent extends AbstractTestUI { @Override public void eventSetChange(EventSetChangeEvent event) { - List<CalendarEvent> events = event.getProvider().getEvents( - new Date(0), new Date(Long.MAX_VALUE)); + List<CalendarEvent> events = event.getProvider() + .getEvents(new Date(0), new Date(Long.MAX_VALUE)); CalendarEvent calEvent = events.get(0); Date startEvent = calEvent.getStart(); Date endEvent = calEvent.getEnd(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java index 98c5c08095..50825ef22a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java @@ -35,8 +35,8 @@ import com.vaadin.ui.components.calendar.event.BasicEvent; * out of view (#7261) */ @Theme("tests-calendar") -public class CalendarShownNotCorrectlyWhenPartiallyOutOfView extends - AbstractTestUI { +public class CalendarShownNotCorrectlyWhenPartiallyOutOfView + extends AbstractTestUI { private static final long serialVersionUID = 1L; private Calendar calendar; @@ -52,11 +52,11 @@ public class CalendarShownNotCorrectlyWhenPartiallyOutOfView extends calendar = new Calendar(); try { - BasicEvent event = new BasicEvent("EVENT NAME 1", - "EVENT TOOLTIP 1", + BasicEvent event = new BasicEvent("EVENT NAME 1", "EVENT TOOLTIP 1", new SimpleDateFormat("yyyy-MM-dd HH:mm") - .parse("2013-09-05 09:30"), new SimpleDateFormat( - "yyyy-MM-dd HH:mm").parse("2013-09-05 14:00")); + .parse("2013-09-05 09:30"), + new SimpleDateFormat("yyyy-MM-dd HH:mm") + .parse("2013-09-05 14:00")); event.setStyleName("color1"); calendar.addEvent(event); } catch (ParseException e1) { // Nothing to do @@ -64,10 +64,10 @@ public class CalendarShownNotCorrectlyWhenPartiallyOutOfView extends } try { - calendar.setStartDate(new SimpleDateFormat("yyyy-MM-dd") - .parse("2013-09-01")); - calendar.setEndDate(new SimpleDateFormat("yyyy-MM-dd") - .parse("2013-09-30")); + calendar.setStartDate( + new SimpleDateFormat("yyyy-MM-dd").parse("2013-09-01")); + calendar.setEndDate( + new SimpleDateFormat("yyyy-MM-dd").parse("2013-09-30")); } catch (ParseException e) { // Nothing to do } diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarVisibleHours.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarVisibleHours.java index 65e5502686..ed30c56c5e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarVisibleHours.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarVisibleHours.java @@ -52,32 +52,35 @@ public class CalendarVisibleHours extends AbstractTestUI { try { - BasicEvent event = new BasicEvent("EVENT NAME 1", - "EVENT TOOLTIP 1", + BasicEvent event = new BasicEvent("EVENT NAME 1", "EVENT TOOLTIP 1", new SimpleDateFormat("yyyy-MM-dd HH:mm") - .parse("2013-09-05 15:30"), new SimpleDateFormat( - "yyyy-MM-dd HH:mm").parse("2013-09-07 22:20")); + .parse("2013-09-05 15:30"), + new SimpleDateFormat("yyyy-MM-dd HH:mm") + .parse("2013-09-07 22:20")); event.setStyleName("color1"); calendar.addEvent(event); event = new BasicEvent("EVENT NAME 2", "EVENT TOOLTIP 2", new SimpleDateFormat("yyyy-MM-dd HH:mm") - .parse("2013-09-05 12:10"), new SimpleDateFormat( - "yyyy-MM-dd HH:mm").parse("2013-09-05 13:20")); + .parse("2013-09-05 12:10"), + new SimpleDateFormat("yyyy-MM-dd HH:mm") + .parse("2013-09-05 13:20")); event.setStyleName("color2"); calendar.addEvent(event); event = new BasicEvent("EVENT NAME 3", "EVENT TOOLTIP 3", new SimpleDateFormat("yyyy-MM-dd HH:mm") - .parse("2013-09-01 11:30"), new SimpleDateFormat( - "yyyy-MM-dd HH:mm").parse("2013-09-29 15:20")); + .parse("2013-09-01 11:30"), + new SimpleDateFormat("yyyy-MM-dd HH:mm") + .parse("2013-09-29 15:20")); event.setStyleName("color3"); calendar.addEvent(event); event = new BasicEvent("EVENT NAME 4", "EVENT TOOLTIP 4", new SimpleDateFormat("yyyy-MM-dd HH:mm") - .parse("2013-09-01 11:30"), new SimpleDateFormat( - "yyyy-MM-dd HH:mm").parse("2013-09-01 15:20")); + .parse("2013-09-01 11:30"), + new SimpleDateFormat("yyyy-MM-dd HH:mm") + .parse("2013-09-01 15:20")); event.setStyleName("color4"); event.setAllDay(true); calendar.addEvent(event); @@ -86,10 +89,10 @@ public class CalendarVisibleHours extends AbstractTestUI { } try { - calendar.setStartDate(new SimpleDateFormat("yyyy-MM-dd") - .parse("2013-09-01")); - calendar.setEndDate(new SimpleDateFormat("yyyy-MM-dd") - .parse("2013-09-30")); + calendar.setStartDate( + new SimpleDateFormat("yyyy-MM-dd").parse("2013-09-01")); + calendar.setEndDate( + new SimpleDateFormat("yyyy-MM-dd").parse("2013-09-30")); } catch (ParseException e) { // Nothing to do } diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarWeekSelection.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarWeekSelection.java index c74f2a53e3..732899e85e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarWeekSelection.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarWeekSelection.java @@ -15,10 +15,10 @@ public class CalendarWeekSelection extends AbstractTestUI { calendar.setLocale(Locale.US); try { - calendar.setStartDate(new SimpleDateFormat("yyyy-MM-dd") - .parse("2013-12-15")); - calendar.setEndDate(new SimpleDateFormat("yyyy-MM-dd") - .parse("2014-01-15")); + calendar.setStartDate( + new SimpleDateFormat("yyyy-MM-dd").parse("2013-12-15")); + calendar.setEndDate( + new SimpleDateFormat("yyyy-MM-dd").parse("2014-01-15")); } catch (ParseException e) { e.printStackTrace(); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/NotificationTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/NotificationTestUI.java index 2313ad891a..38599277b4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/NotificationTestUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/NotificationTestUI.java @@ -67,8 +67,8 @@ public class NotificationTestUI extends UI { new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - Notification - .show("This will disappear when you move your mouse!"); + Notification.show( + "This will disappear when you move your mouse!"); } }); content.addComponent(btn); @@ -81,8 +81,8 @@ public class NotificationTestUI extends UI { @Override public void dateClick(DateClickEvent event) { provider.addEvent(event.getDate()); - Notification - .show("This should disappear, but if wont unless clicked."); + Notification.show( + "This should disappear, but if wont unless clicked."); // this requestRepaint call interferes with the notification cal.markAsDirty(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/NullEventMoveHandler.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/NullEventMoveHandler.java index 40dd43abb2..896078d1c9 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/NullEventMoveHandler.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/NullEventMoveHandler.java @@ -35,10 +35,10 @@ public class NullEventMoveHandler extends AbstractTestUIWithLog { calendar.setLocale(Locale.US); try { - calendar.setStartDate(new SimpleDateFormat("yyyy-MM-dd") - .parse("2014-06-01")); - calendar.setEndDate(new SimpleDateFormat("yyyy-MM-dd") - .parse("2014-06-30")); + calendar.setStartDate( + new SimpleDateFormat("yyyy-MM-dd").parse("2014-06-01")); + calendar.setEndDate( + new SimpleDateFormat("yyyy-MM-dd").parse("2014-06-30")); BasicEvent event = new BasicEvent("foo", "bar", new SimpleDateFormat("yyyy-MM-dd").parse("2014-06-01")); diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDay.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDay.java index 4a792bc670..e7c9828c6b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDay.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDay.java @@ -36,11 +36,11 @@ public class SetFirstVisibleHourOfDay extends AbstractTestUI { calendar = new Calendar(); try { - BasicEvent event = new BasicEvent("EVENT NAME 1", - "EVENT TOOLTIP 1", + BasicEvent event = new BasicEvent("EVENT NAME 1", "EVENT TOOLTIP 1", new SimpleDateFormat("yyyy-MM-dd HH:mm") - .parse("2013-09-05 00:00"), new SimpleDateFormat( - "yyyy-MM-dd HH:mm").parse("2013-09-05 13:00")); + .parse("2013-09-05 00:00"), + new SimpleDateFormat("yyyy-MM-dd HH:mm") + .parse("2013-09-05 13:00")); event.setStyleName("color1"); calendar.addEvent(event); } catch (ParseException e) { @@ -48,10 +48,10 @@ public class SetFirstVisibleHourOfDay extends AbstractTestUI { } try { - calendar.setStartDate(new SimpleDateFormat("yyyy-MM-dd") - .parse("2013-09-01")); - calendar.setEndDate(new SimpleDateFormat("yyyy-MM-dd") - .parse("2013-09-30")); + calendar.setStartDate( + new SimpleDateFormat("yyyy-MM-dd").parse("2013-09-01")); + calendar.setEndDate( + new SimpleDateFormat("yyyy-MM-dd").parse("2013-09-30")); } catch (ParseException e) { e.printStackTrace(); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java b/uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java index daf472914b..80e010da08 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java +++ b/uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java @@ -109,8 +109,8 @@ public class IconsInCaption extends TestBase { ContentMode.HTML); container.addComponent(title); for (String icon : icons) { - ThemeResource res = new ThemeResource("../runo/icons/" + size - + "/" + icon); + ThemeResource res = new ThemeResource( + "../runo/icons/" + size + "/" + icon); if (TYPE_CAPTION.equals(iconType)) { Label name = new Label(); name.setCaption(icon); diff --git a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxes2.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxes2.java index 14bea90206..14a9a995d2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxes2.java +++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxes2.java @@ -5,8 +5,8 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.CheckBox; -public class CheckBoxes2 extends AbstractFieldTest<CheckBox, Boolean> implements - ClickListener { +public class CheckBoxes2 extends AbstractFieldTest<CheckBox, Boolean> + implements ClickListener { @Override protected Class<CheckBox> getTestClass() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java index 463d53a4a8..ecaea55eef 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java +++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java @@ -28,8 +28,8 @@ public class CheckboxCaptionWrapping extends TestBase { mainLayout.setStyleName("borders"); mainLayout.setWidth("300px"); mainLayout.addComponent(cb); - mainLayout.addComponent(new Label( - "Lorem ipsum dolor sit amet, consectetur adipisicing" + mainLayout.addComponent( + new Label("Lorem ipsum dolor sit amet, consectetur adipisicing" + " elit, sed do eiusmod tempor.")); addComponent(mainLayout); diff --git a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckboxContextClick.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckboxContextClick.java index 9b37db10b1..dbe24a2856 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckboxContextClick.java +++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckboxContextClick.java @@ -25,12 +25,13 @@ public class CheckboxContextClick extends AbstractTestUIWithLog { @Override protected void setup(VaadinRequest request) { final CheckBox cb = new CheckBox("Right-click me", true); - cb.addContextClickListener(new ContextClickEvent.ContextClickListener() { - @Override - public void contextClick(ContextClickEvent event) { - log("checkbox context clicked"); - } - }); + cb.addContextClickListener( + new ContextClickEvent.ContextClickListener() { + @Override + public void contextClick(ContextClickEvent event) { + log("checkbox context clicked"); + } + }); addComponent(cb); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java index daae6bc2e5..6319a7e511 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java @@ -45,8 +45,8 @@ import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.components.colorpicker.ColorChangeEvent; import com.vaadin.ui.components.colorpicker.ColorChangeListener; -public class ColorPickerTestUI extends AbstractTestUI implements - ColorChangeListener { +public class ColorPickerTestUI extends AbstractTestUI + implements ColorChangeListener { @Override public String getTestDescription() { @@ -129,14 +129,12 @@ public class ColorPickerTestUI extends AbstractTestUI implements drawable.setColor(java.awt.Color.blue); drawable.drawRect(0, 0, 269, 269); drawable.setColor(java.awt.Color.black); - drawable.drawString( - "r=" + String.valueOf(fgColor.getRed()) + ",g=" - + String.valueOf(fgColor.getGreen()) + ",b=" - + String.valueOf(fgColor.getBlue()), 50, 100); - drawable.drawString( - "r=" + String.valueOf(bgColor.getRed()) + ",g=" - + String.valueOf(bgColor.getGreen()) + ",b=" - + String.valueOf(bgColor.getBlue()), 5, 15); + drawable.drawString("r=" + String.valueOf(fgColor.getRed()) + ",g=" + + String.valueOf(fgColor.getGreen()) + ",b=" + + String.valueOf(fgColor.getBlue()), 50, 100); + drawable.drawString("r=" + String.valueOf(bgColor.getRed()) + ",g=" + + String.valueOf(bgColor.getGreen()) + ",b=" + + String.valueOf(bgColor.getBlue()), 5, 15); try { /* Write the image to a buffer. */ @@ -333,7 +331,8 @@ public class ColorPickerTestUI extends AbstractTestUI implements layout3.addComponent(colorpicker6); layout3.setComponentAlignment(colorpicker6, Alignment.MIDDLE_CENTER); - Panel panel3 = new Panel("Color area colorpicker with caption", layout3); + Panel panel3 = new Panel("Color area colorpicker with caption", + layout3); panel3.setWidth("100%"); panel3.setHeight(null); layoutLeft.addComponent(panel3); diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxBorder.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxBorder.java index 731e23188e..a084d1019d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxBorder.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxBorder.java @@ -14,8 +14,8 @@ public class ComboBoxBorder extends TestBase { protected void setup() { setTheme("tests-tickets"); - final ComboBox cb = new ComboBox("All errors", Arrays.asList("Error", - "Error 2")); + final ComboBox cb = new ComboBox("All errors", + Arrays.asList("Error", "Error 2")); cb.setStyleName("ComboBoxBorder"); cb.setImmediate(true); cb.setWidth("200px"); // must have with to reproduce diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java index dea1deb9b5..204093bbf4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java @@ -86,8 +86,8 @@ public class ComboBoxDataSourceChange extends TestBase { cb2.addListener(new Property.ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - currentValue.setValue(String.valueOf(event.getProperty() - .getValue())); + currentValue.setValue( + String.valueOf(event.getProperty().getValue())); } }); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java index 07cd1f046c..e119571e20 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java @@ -34,9 +34,9 @@ public class ComboBoxLargeIcons extends TestBase { "document-ppt", "document-txt", "document-web", "document" }; for (String icon : icons) { Item item = cb.addItem(icon); - item.getItemProperty("icon").setValue( - new ThemeResource("../runo/icons/32/" + icon + ".png?" - + new Date().getTime())); + item.getItemProperty("icon") + .setValue(new ThemeResource("../runo/icons/32/" + icon + + ".png?" + new Date().getTime())); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreen.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreen.java index 044214cecf..d367aeb1aa 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreen.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreen.java @@ -64,9 +64,8 @@ public class ComboBoxOnSmallScreen extends AbstractTestUI { Item item = cb.getItem(itemId); item.getItemProperty(PID).setValue(v); int flagIndex = i % 3; - cb.setItemIcon(itemId, new ClassResource( - flagIndex == 0 ? "fi_small.png" : flagIndex == 1 ? "fi.gif" - : "se.gif")); + cb.setItemIcon(itemId, new ClassResource(flagIndex == 0 + ? "fi_small.png" : flagIndex == 1 ? "fi.gif" : "se.gif")); } cb.select(selectId); diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPageLength.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPageLength.java index 6807b21424..6e4546920b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPageLength.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPageLength.java @@ -15,8 +15,9 @@ public class ComboBoxPageLength extends ComboBoxes2<ComboBox> { public void valueChange(ValueChangeEvent event) { if (event.getProperty() != null) { if (event.getProperty().getValue() != null) { - Integer value = Integer.parseInt(((String) event - .getProperty().getValue()).split(" ")[1]); + Integer value = Integer.parseInt( + ((String) event.getProperty().getValue()) + .split(" ")[1]); getComponent().setPageLength(value); } else { getComponent().setPageLength(0); diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxParentDisable.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxParentDisable.java index d1adeaaf88..22f0379343 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxParentDisable.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxParentDisable.java @@ -62,7 +62,8 @@ public class ComboBoxParentDisable extends AbstractTestUIWithLog { } - private class MyValueChangeListener implements Property.ValueChangeListener { + private class MyValueChangeListener + implements Property.ValueChangeListener { @Override public void valueChange(Property.ValueChangeEvent event) { log.log("you made a selection change"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrolls.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrolls.java index ed8212b231..87ea0847be 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrolls.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrolls.java @@ -24,11 +24,10 @@ public class ComboBoxPopupWhenBodyScrolls extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { + getPage().getStyles() + .add("body.v-generated-body { overflow: auto;height:auto;}"); getPage().getStyles().add( - "body.v-generated-body { overflow: auto;height:auto;}"); - getPage() - .getStyles() - .add("body.v-generated-body .v-ui.v-scrollable{ overflow: visible;height:auto !important;}"); + "body.v-generated-body .v-ui.v-scrollable{ overflow: visible;height:auto !important;}"); ComboBox cb = new ComboBox(); for (int i = 0; i < 10; i++) { cb.addItem("Item " + i); @@ -43,9 +42,7 @@ public class ComboBoxPopupWhenBodyScrolls extends AbstractTestUI { addComponent(spacer); // Chrome requires document.scrollTop (<body>) // Firefox + IE wants document.documentElement.scrollTop (<html>) - getPage() - .getJavaScript() - .execute( - "document.body.scrollTop=1800;document.documentElement.scrollTop=1800;"); + getPage().getJavaScript().execute( + "document.body.scrollTop=1800;document.documentElement.scrollTop=1800;"); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java index 2187c24e91..82cb6b440d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java @@ -12,8 +12,8 @@ import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; @SuppressWarnings("serial") -public class ComboBoxReapperingOldValue extends LegacyApplication implements - ValueChangeListener { +public class ComboBoxReapperingOldValue extends LegacyApplication + implements ValueChangeListener { ComboBox cbox1 = new ComboBox(); ComboBox cbox2 = new ComboBox(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.java index 9f07d81cc9..a5022e3d51 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.java @@ -55,8 +55,8 @@ public class ComboBoxSQLContainerFilteredValueChange extends TestBase { myCombo.addListener(new Property.ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - selectedLabel.setValue("Selected: " - + event.getProperty().getValue()); + selectedLabel.setValue( + "Selected: " + event.getProperty().getValue()); } }); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabled.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabled.java index a8a66b64ec..1b0675c914 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabled.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabled.java @@ -8,8 +8,8 @@ import com.vaadin.tests.components.ComponentTestCase; import com.vaadin.ui.ComboBox; import com.vaadin.ui.Notification; -public class ComboBoxScrollingToPageDisabled extends - ComponentTestCase<ComboBox> { +public class ComboBoxScrollingToPageDisabled + extends ComponentTestCase<ComboBox> { private static final Object CAPTION = "caption"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java index d941c153c3..60b6817ba3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java @@ -26,8 +26,8 @@ public class ComboBoxSelectingWithNewItemsAllowed extends ComboBoxSelecting { super.setup(request); comboBox.setNewItemsAllowed(true); - final Label label = new Label(String.valueOf(comboBox.getItemIds() - .size())); + final Label label = new Label( + String.valueOf(comboBox.getItemIds().size())); label.setCaption("Item count:"); label.setId("count"); comboBox.addValueChangeListener(new Property.ValueChangeListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java index d98997d28f..2efa1c3991 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java @@ -30,8 +30,8 @@ public class ComboBoxSlowInFF extends TestBase { for (int i = 0; i < 200; i++) { Item item = t.addItem(i); for (int j = 0; j < 5; j++) { - item.getItemProperty("test" + j).setValue( - createComponent(i, j)); + item.getItemProperty("test" + j) + .setValue(createComponent(i, j)); } } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java index 8ee08532cc..800e31c0de 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java @@ -20,8 +20,8 @@ public class ComboBoxSuggestionOnDetach extends TestBase { layout.setSizeUndefined(); popup.setContent(layout); - ComboBox comboBox = new ComboBox("Combo box", Arrays.asList("Option 1", - "Option 2", "Option 3")); + ComboBox comboBox = new ComboBox("Combo box", + Arrays.asList("Option 1", "Option 2", "Option 3")); comboBox.addFocusListener(new FieldEvents.FocusListener() { @Override public void focus(FocusEvent event) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidth.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidth.java index 86e5b54cb6..b21a082dcc 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidth.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidth.java @@ -9,24 +9,15 @@ import com.vaadin.ui.ComboBox; public class ComboBoxSuggestionPopupWidth extends AbstractTestUI { - private static List<String> items = Arrays - .asList("abc", - "cde", - "efg", - "ghi", - "ijk", - "more items 1", - "more items 2", - "more items 3", - "Ridicilously long item caption so we can see how the ComboBox displays ridicilously long captions in the suggestion pop-up", - "more items 4", "more items 5", "more items 6", - "more items 7"); + private static List<String> items = Arrays.asList("abc", "cde", "efg", + "ghi", "ijk", "more items 1", "more items 2", "more items 3", + "Ridicilously long item caption so we can see how the ComboBox displays ridicilously long captions in the suggestion pop-up", + "more items 4", "more items 5", "more items 6", "more items 7"); @Override protected void setup(VaadinRequest request) { ComboBox cb = new ComboBox( - "200px wide ComboBox with 100% wide suggestion popup", - items); + "200px wide ComboBox with 100% wide suggestion popup", items); cb.setPopupWidth("100%"); cb.setWidth("200px"); cb.addStyleName("width-as-percentage"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacy.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacy.java index 091b5f9aab..2ce4450590 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacy.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacy.java @@ -9,18 +9,10 @@ import com.vaadin.ui.ComboBox; public class ComboBoxSuggestionPopupWidthLegacy extends AbstractTestUI { - private static List<String> items = Arrays - .asList("abc", - "cde", - "efg", - "ghi", - "ijk", - "more items 1", - "more items 2", - "more items 3", - "Ridicilously long item caption so we can see how the ComboBox displays ridicilously long captions in the suggestion pop-up", - "more items 4", "more items 5", "more items 6", - "more items 7"); + private static List<String> items = Arrays.asList("abc", "cde", "efg", + "ghi", "ijk", "more items 1", "more items 2", "more items 3", + "Ridicilously long item caption so we can see how the ComboBox displays ridicilously long captions in the suggestion pop-up", + "more items 4", "more items 5", "more items 6", "more items 7"); @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentage.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentage.java index 1ddc666a44..5cf736b088 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentage.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentage.java @@ -9,18 +9,10 @@ import com.vaadin.ui.ComboBox; public class ComboBoxSuggestionPopupWidthPercentage extends AbstractTestUI { - private static List<String> items = Arrays - .asList("abc", - "cde", - "efg", - "ghi", - "ijk", - "more items 1", - "more items 2", - "more items 3", - "Ridicilously long item caption so we can see how the ComboBox displays ridicilously long captions in the suggestion pop-up", - "more items 4", "more items 5", "more items 6", - "more items 7"); + private static List<String> items = Arrays.asList("abc", "cde", "efg", + "ghi", "ijk", "more items 1", "more items 2", "more items 3", + "Ridicilously long item caption so we can see how the ComboBox displays ridicilously long captions in the suggestion pop-up", + "more items 4", "more items 5", "more items 6", "more items 7"); @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixels.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixels.java index 623f4c904f..7ebf149a5c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixels.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixels.java @@ -9,18 +9,10 @@ import com.vaadin.ui.ComboBox; public class ComboBoxSuggestionPopupWidthPixels extends AbstractTestUI { - private static List<String> items = Arrays - .asList("abc", - "cde", - "efg", - "ghi", - "ijk", - "more items 1", - "more items 2", - "more items 3", - "Ridicilously long item caption so we can see how the ComboBox displays ridicilously long captions in the suggestion pop-up", - "more items 4", "more items 5", "more items 6", - "more items 7"); + private static List<String> items = Arrays.asList("abc", "cde", "efg", + "ghi", "ijk", "more items 1", "more items 2", "more items 3", + "Ridicilously long item caption so we can see how the ComboBox displays ridicilously long captions in the suggestion pop-up", + "more items 4", "more items 5", "more items 6", "more items 7"); @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java index 258126c93d..bd15b377b9 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java @@ -14,8 +14,8 @@ public class ComboBoxTextFieldEventOrder extends TestBase { protected void setup() { LegacyTextField textField = new LegacyTextField("text field"); textField.setImmediate(true); - final Select select = new Select("select", Arrays.asList("1", "2", "3", - "4")); + final Select select = new Select("select", + Arrays.asList("1", "2", "3", "4")); textField.addListener(new ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java index 05b52dee80..1598a77d66 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java @@ -15,8 +15,8 @@ public class ComboBoxUndefinedWidthAndIcon extends TestBase { for (int i = 1; i < 200 + 1; i++) { Item item = cb.addItem(i); item.getItemProperty("caption").setValue("Item " + i); - item.getItemProperty("icon").setValue( - new ThemeResource("../runo/icons/16/users.png")); + item.getItemProperty("icon") + .setValue(new ThemeResource("../runo/icons/16/users.png")); } cb.setItemIconPropertyId("icon"); cb.setItemCaptionPropertyId("caption"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java index a35bc46390..64ed79a54f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java @@ -44,7 +44,8 @@ public class ComboBoxValueInput extends AbstractTestUI { return 3268; } - private ComboBox getComboBox(String caption, boolean addNullItem, String id) { + private ComboBox getComboBox(String caption, boolean addNullItem, + String id) { ComboBox cb = new ComboBox(caption); cb.setImmediate(true); if (addNullItem) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java index 4f7b36386e..36cb6e017e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java @@ -93,7 +93,8 @@ public class ComboPushTiming extends TestBase { class MyExecutor extends ThreadPoolExecutor { public MyExecutor() { - super(5, 20, 20, TimeUnit.SECONDS, new SynchronousQueue<Runnable>()); + super(5, 20, 20, TimeUnit.SECONDS, + new SynchronousQueue<Runnable>()); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPage.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPage.java index acfb7b165f..66ed6d6da5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPage.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPage.java @@ -8,8 +8,8 @@ import com.vaadin.ui.ComboBox; import com.vaadin.ui.Label; @SuppressWarnings("serial") -public class ComboSelectedValueBeyondTheFirstDropdownPage extends - AbstractTestUI { +public class ComboSelectedValueBeyondTheFirstDropdownPage + extends AbstractTestUI { protected static final int ITEM_COUNT = 21; protected static final String ITEM_NAME_TEMPLATE = "Item %d"; @@ -32,7 +32,8 @@ public class ComboSelectedValueBeyondTheFirstDropdownPage extends private ComboBox getComboBox(final Label value) { final ComboBox combobox = new ComboBox("MyCaption"); - combobox.setDescription("ComboBox with more than 10 elements in it's dropdown list."); + combobox.setDescription( + "ComboBox with more than 10 elements in it's dropdown list."); combobox.setImmediate(true); diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.java index 3aaae7e6dc..45d6c0a03d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.java @@ -29,8 +29,8 @@ public class ComboboxInPopupViewWithItems extends TestBase { class PopupContent implements PopupView.Content { - private final ComboBox cb = new ComboBox(null, Arrays.asList("Item 1", - "Item 2", "Item 3")); + private final ComboBox cb = new ComboBox(null, + Arrays.asList("Item 1", "Item 2", "Item 3")); @Override public String getMinimizedValueAsHTML() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleNames.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleNames.java index 375b417407..67f5669d8e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleNames.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleNames.java @@ -21,8 +21,8 @@ public class ComboboxPrimaryStyleNames extends TestBase { addItem(box, "Value 4"); addComponent(box); - addComponent(new Button("Set primary style", - new Button.ClickListener() { + addComponent( + new Button("Set primary style", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { box.setPrimaryStyleName("my-second-combobox"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidth.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidth.java index 593f567c12..afa8933a7a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidth.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidth.java @@ -33,7 +33,8 @@ public class ComboboxStyleChangeWidth extends AbstractTestUIWithLog { final ComboBox cbFoo = new ComboBox(); cbFoo.setImmediate(true); cbFoo.setSizeUndefined(); - cbFoo.addItem("A really long string that causes an inline width to be set"); + cbFoo.addItem( + "A really long string that causes an inline width to be set"); Button btn = new Button("Click to break CB", new Button.ClickListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/Comboboxes.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/Comboboxes.java index cf754d3fee..3cdbcda3f3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/Comboboxes.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/Comboboxes.java @@ -141,8 +141,8 @@ public class Comboboxes extends ComponentTestCase<ComboBox> { if (value == null) { c.setItemIcon(id, null); } else { - c.setItemIcon(id, new ThemeResource(value + "?" - + new Date().getTime())); + c.setItemIcon(id, new ThemeResource( + value + "?" + new Date().getTime())); } } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/FilteringTurkishLocale.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/FilteringTurkishLocale.java index ff7faf1965..000404e149 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/FilteringTurkishLocale.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/FilteringTurkishLocale.java @@ -30,12 +30,12 @@ public class FilteringTurkishLocale extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - final ComboBox comboBox = new ComboBox("Box", Arrays.asList( - "I without dot", "İ with dot")); + final ComboBox comboBox = new ComboBox("Box", + Arrays.asList("I without dot", "İ with dot")); comboBox.setNullSelectionAllowed(false); - NativeSelect localeSelect = new NativeSelect("Locale", Arrays.asList( - Locale.ENGLISH, new Locale("tr"))); + NativeSelect localeSelect = new NativeSelect("Locale", + Arrays.asList(Locale.ENGLISH, new Locale("tr"))); localeSelect.addValueChangeListener(new ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/PopUpWidth.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/PopUpWidth.java index c73bb28c43..d77af57eab 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/PopUpWidth.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/PopUpWidth.java @@ -12,7 +12,8 @@ public class PopUpWidth extends TestBase { protected void setup() { addComponent(createComboBox("Do not touch this")); - addComponent(createComboBox("Browse this (check that width does not change)")); + addComponent(createComboBox( + "Browse this (check that width does not change)")); } private ComboBox createComboBox(String caption) { @@ -22,8 +23,8 @@ public class PopUpWidth extends TestBase { for (int i = 1; i < 200 + 1; i++) { Item item = cb.addItem(i); item.getItemProperty("caption").setValue("Item " + i); - item.getItemProperty("icon").setValue( - new ThemeResource("../runo/icons/16/users.png")); + item.getItemProperty("icon") + .setValue(new ThemeResource("../runo/icons/16/users.png")); } cb.setItemIconPropertyId("icon"); cb.setItemCaptionPropertyId("caption"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibility.java b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibility.java index 48484165ff..d227b52f9f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibility.java +++ b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibility.java @@ -28,8 +28,8 @@ public class CustomComponentChildVisibility extends AbstractTestUI { protected void setup(VaadinRequest request) { Label label = new Label("In panel"); label.setId("label"); - final CustomComponent cc = new CustomComponent(new Panel( - "In CustomComponent", label)); + final CustomComponent cc = new CustomComponent( + new Panel("In CustomComponent", label)); Button hideButton = new Button("Hide CustomComponent"); hideButton.addClickListener(new Button.ClickListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java index 8170f152c2..955c4ff885 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java @@ -21,8 +21,8 @@ public class EmbeddedInCustomComponent extends TestBase { } private CustomComponent wrap(String caption, String themeImage) { - Embedded image = new Embedded(caption, new ThemeResource( - "../runo/icons/64/" + themeImage)); + Embedded image = new Embedded(caption, + new ThemeResource("../runo/icons/64/" + themeImage)); CustomComponent cc = new CustomComponent(image); return cc; } diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java index a81efec5d8..318db6b18b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java +++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java @@ -11,8 +11,8 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.CustomLayout; import com.vaadin.ui.Label; -public class CustomLayoutUsingTemplate extends TestBase implements - ClickListener { +public class CustomLayoutUsingTemplate extends TestBase + implements ClickListener { CustomLayout layout; Button button1 = new Button("Add Button to first location", this); @@ -20,13 +20,13 @@ public class CustomLayoutUsingTemplate extends TestBase implements @Override protected void setup() { - String thisPackage = CustomLayoutUsingTemplate.class.getName().replace( - '.', '/'); + String thisPackage = CustomLayoutUsingTemplate.class.getName() + .replace('.', '/'); thisPackage = thisPackage.replaceAll( CustomLayoutUsingTemplate.class.getSimpleName() + "$", ""); String template = thisPackage + "template.htm"; - InputStream is = getClass().getClassLoader().getResourceAsStream( - template); + InputStream is = getClass().getClassLoader() + .getResourceAsStream(template); addComponent(button1); @@ -61,7 +61,8 @@ public class CustomLayoutUsingTemplate extends TestBase implements if (event.getButton() == button1) { layout.addComponent(button2, "location1"); } else { - layout.addComponent(new LegacyTextField("A text field!"), "location2"); + layout.addComponent(new LegacyTextField("A text field!"), + "location2"); } } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java index 8d9baeba73..18bf589452 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java +++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java @@ -38,8 +38,9 @@ public class CustomLayoutUsingTheme extends TestBase implements ClickListener { @Override public void buttonClick(ClickEvent event) { - layout.addComponent(new NativeButton( - "This is it, the body!"), "body"); + layout.addComponent( + new NativeButton("This is it, the body!"), + "body"); } })); layout.addComponent(menu, "menu"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java index 4127836666..7ed74f8f45 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java +++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java @@ -32,11 +32,11 @@ public class CustomLayoutWithMissingSlot extends AbstractTestUIWithLog { protected void setup(VaadinRequest request) { CustomLayout cl; try { - cl = new CustomLayout( - new ByteArrayInputStream( - "<div>First: <div location='first'></div><p>Second: <div location='second'></div><p>" - .getBytes("UTF-8"))); - cl.addComponent(new LegacyTextField("This should be visible"), "first"); + cl = new CustomLayout(new ByteArrayInputStream( + "<div>First: <div location='first'></div><p>Second: <div location='second'></div><p>" + .getBytes("UTF-8"))); + cl.addComponent(new LegacyTextField("This should be visible"), + "first"); Button button = new Button( "This button is visible, together with one label"); button.addClickListener(new ClickListener() { @@ -47,8 +47,9 @@ public class CustomLayoutWithMissingSlot extends AbstractTestUIWithLog { } }); cl.addComponent(button, "second"); - cl.addComponent(new LegacyTextField( - "This won't be as the slot is missing"), "third"); + cl.addComponent( + new LegacyTextField("This won't be as the slot is missing"), + "third"); addComponent(cl); } catch (IOException e) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldTest.java index ad8d70ccc5..e89d911806 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldTest.java @@ -11,7 +11,8 @@ import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest; -public class LegacyDateFieldTest<T extends LegacyDateField> extends LegacyAbstractFieldTest<T> { +public class LegacyDateFieldTest<T extends LegacyDateField> + extends LegacyAbstractFieldTest<T> { @SuppressWarnings("unchecked") @Override @@ -31,7 +32,8 @@ public class LegacyDateFieldTest<T extends LegacyDateField> extends LegacyAbstra protected void createActions() { super.createActions(); createResolutionSelectAction(CATEGORY_FEATURES); - createBooleanAction("Lenient", CATEGORY_FEATURES, false, lenientCommand); + createBooleanAction("Lenient", CATEGORY_FEATURES, false, + lenientCommand); createBooleanAction("Show week numbers", CATEGORY_FEATURES, false, weekNumberCommand); createDateFormatSelectAction(CATEGORY_FEATURES); diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java index 8539f70b17..0f74e57f3f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java +++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java @@ -14,9 +14,8 @@ public class DragStartModes extends TestBase { @Override protected void setup() { - TestUtils - .injectCSS(getMainWindow(), - ".v-ddwrapper { background: #ACF; } .extra{ background: #FFA500; }"); + TestUtils.injectCSS(getMainWindow(), + ".v-ddwrapper { background: #ACF; } .extra{ background: #FFA500; }"); addComponent(makeWrapper(DragStartMode.NONE)); addComponent(makeWrapper(DragStartMode.COMPONENT)); diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java index 7c7e17a5a6..06cacfec4e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java +++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java @@ -41,12 +41,12 @@ public class SingleUseDragAndDropUpload extends AbstractTestUIWithLog { @Override protected void setup(VaadinRequest request) { - Label upload = new Label(FontAwesome.UPLOAD.getHtml(), ContentMode.HTML); + Label upload = new Label(FontAwesome.UPLOAD.getHtml(), + ContentMode.HTML); upload.setSizeUndefined(); upload.setStyleName("upload"); - getPage() - .getStyles() - .add(".upload{ font-size: 36px; border: 1px solid black; padding:15px;}"); + getPage().getStyles().add( + ".upload{ font-size: 36px; border: 1px solid black; padding:15px;}"); final DragAndDropWrapper dnd = new DragAndDropWrapper(upload); dnd.setSizeUndefined(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedAltText.java b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedAltText.java index aedfafe627..803cc95a41 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedAltText.java +++ b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedAltText.java @@ -20,8 +20,8 @@ public class EmbeddedAltText extends TestBase { @Override protected void setup() { - final Embedded e = new Embedded("Caption", new ThemeResource( - "../runo/icons/64/ok.png")); + final Embedded e = new Embedded("Caption", + new ThemeResource("../runo/icons/64/ok.png")); e.setAlternateText("Alt text of the image"); addComponent(e); final Embedded player = new Embedded(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java index 28ffebcf56..3225b0af9a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java +++ b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java @@ -11,8 +11,8 @@ public class EmbeddedClickListenerRelativeCoordinates extends TestBase { @Override protected void setup() { - Embedded e = new Embedded("Embedded caption", new ThemeResource( - "../runo/icons/64/ok.png")); + Embedded e = new Embedded("Embedded caption", + new ThemeResource("../runo/icons/64/ok.png")); final Label xLabel = new Label(); xLabel.setId("x"); final Label yLabel = new Label(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java index 52454e115e..7632577227 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java +++ b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java @@ -55,8 +55,8 @@ public class EmbeddedImageRefresh extends TestBase { button.addListener(new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - ((StreamResource) embedded.getSource()).setFilename(new Date() - .getTime() + ".png"); + ((StreamResource) embedded.getSource()) + .setFilename(new Date().getTime() + ".png"); embedded.markAsDirty(); } }); @@ -130,8 +130,8 @@ public class EmbeddedImageRefresh extends TestBase { } else { drawable.setColor(Color.black); } - drawable.fillRect(gridx + 1, gridy + 1, gridxnext - gridx - - 1, gridynext - gridy - 1); + drawable.fillRect(gridx + 1, gridy + 1, + gridxnext - gridx - 1, gridynext - gridy - 1); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedTooltip.java b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedTooltip.java index aa24337013..28bca2001c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedTooltip.java +++ b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedTooltip.java @@ -18,9 +18,10 @@ public class EmbeddedTooltip extends TestBase { @Override protected void setup() { - Embedded e = new Embedded("Embedded caption", new ThemeResource( - "../runo/icons/64/ok.png")); - e.setDescription("Embedded tooltip, only shown on caption, not on the image"); + Embedded e = new Embedded("Embedded caption", + new ThemeResource("../runo/icons/64/ok.png")); + e.setDescription( + "Embedded tooltip, only shown on caption, not on the image"); addComponent(e); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutClickListener.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutClickListener.java index 5d2dc02ccb..07a96381a9 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutClickListener.java +++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutClickListener.java @@ -45,12 +45,10 @@ public class FormLayoutClickListener extends AbstractTestUIWithLog { @Override public void layoutClick(LayoutClickEvent event) { - log("Child component: " - + (event.getChildComponent() == null ? null : event - .getChildComponent().getId())); - log("Clicked component: " - + (event.getClickedComponent() == null ? null : event - .getClickedComponent().getId())); + log("Child component: " + (event.getChildComponent() == null + ? null : event.getChildComponent().getId())); + log("Clicked component: " + (event.getClickedComponent() == null + ? null : event.getClickedComponent().getId())); log("Source component: " + event.getComponent().getId()); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java index 32476dee1e..674ad4100e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java @@ -25,10 +25,12 @@ import com.vaadin.ui.FormLayout; public class HtmlCaptionInFormLayout extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - final LegacyTextField asHtml = new LegacyTextField("Contains <b>HTML</b>"); + final LegacyTextField asHtml = new LegacyTextField( + "Contains <b>HTML</b>"); asHtml.setCaptionAsHtml(true); - final LegacyTextField asText = new LegacyTextField("Contains <b>HTML</b>"); + final LegacyTextField asText = new LegacyTextField( + "Contains <b>HTML</b>"); addComponent(new FormLayout(asHtml, asText)); diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/CustomRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/CustomRenderer.java index 171d3f2a5e..4e41c09eca 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/CustomRenderer.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/CustomRenderer.java @@ -67,8 +67,8 @@ public class CustomRenderer extends AbstractTestUI { Grid grid = new Grid(container); grid.getColumn(INT_ARRAY_PROPERTY).setRenderer(new IntArrayRenderer()); - grid.getColumn(VOID_PROPERTY).setRenderer( - new RowAwareRenderer(debugLabel)); + grid.getColumn(VOID_PROPERTY) + .setRenderer(new RowAwareRenderer(debugLabel)); grid.getColumn(BEAN_PROPERTY).setRenderer(new BeanRenderer()); grid.setSelectionMode(SelectionMode.NONE); diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSize.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSize.java index c0e3c9d683..793ccb8c18 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSize.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSize.java @@ -27,8 +27,8 @@ public class GridCellFocusOnResetSize extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - addComponent(new TestWidgetComponent( - GridCellFocusOnResetSizeWidget.class)); + addComponent( + new TestWidgetComponent(GridCellFocusOnResetSizeWidget.class)); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridClientDataChangeHandler.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridClientDataChangeHandler.java index 7bd1c838d7..49147f004d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridClientDataChangeHandler.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridClientDataChangeHandler.java @@ -27,6 +27,7 @@ public class GridClientDataChangeHandler extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - addComponent(new TestWidgetComponent(GridDataChangeHandlerWidget.class)); + addComponent( + new TestWidgetComponent(GridDataChangeHandlerWidget.class)); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColspans.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColspans.java index 23d3c3c394..8daa685b66 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColspans.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColspans.java @@ -66,8 +66,8 @@ public class GridColspans extends AbstractTestUI { .join(dataSource.getContainerPropertyIds().toArray()) .setText("All the stuff"); - addComponent(new Button("Show/Hide firstName", - new Button.ClickListener() { + addComponent( + new Button("Show/Hide firstName", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { @@ -79,8 +79,8 @@ public class GridColspans extends AbstractTestUI { } })); - addComponent(new Button("Change column order", - new Button.ClickListener() { + addComponent( + new Button("Change column order", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoWidthClient.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoWidthClient.java index 0829e09de9..2aab18d6e1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoWidthClient.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoWidthClient.java @@ -27,7 +27,7 @@ public class GridColumnAutoWidthClient extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - addComponent(new TestWidgetComponent( - GridColumnAutoWidthClientWidget.class)); + addComponent( + new TestWidgetComponent(GridColumnAutoWidthClientWidget.class)); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnExpand.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnExpand.java index f8338f991a..b2052ee3dc 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnExpand.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnExpand.java @@ -97,7 +97,8 @@ public class GridColumnExpand extends AbstractTestUI { return layout; } - private Component createWidthButton(final Column column, final double width) { + private Component createWidthButton(final Column column, + final double width) { return new Button("" + width, new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutData.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutData.java index b04745f17a..bced274f32 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutData.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutData.java @@ -50,16 +50,16 @@ public class GridColumnWidthsWithoutData extends AbstractTestUI { }); addComponent(selectionModeSelector); - addComponent(new Button("Recreate without data", - new Button.ClickListener() { + addComponent( + new Button("Recreate without data", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { replaceGrid(createGrid(false)); } })); - addComponent(new Button("Recreate with data", - new Button.ClickListener() { + addComponent( + new Button("Recreate with data", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { replaceGrid(createGrid(true)); diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java index f18c0f9bdb..926ba16b87 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java @@ -55,8 +55,8 @@ public class GridDetailsDetach extends AbstractTestUI { } }); - layout.addComponent(new Button("Reattach Grid", - new Button.ClickListener() { + layout.addComponent( + new Button("Reattach Grid", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { gridContainer.removeAllComponents(); @@ -87,8 +87,8 @@ public class GridDetailsDetach extends AbstractTestUI { public Component getDetails(RowReference rowReference) { final GridExampleBean bean = (GridExampleBean) rowReference .getItemId(); - VerticalLayout layout = new VerticalLayout(new Label( - "Extra data for " + bean.getName())); + VerticalLayout layout = new VerticalLayout( + new Label("Extra data for " + bean.getName())); layout.setMargin(true); return layout; } diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java index 27676a14af..028be3a810 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java @@ -41,8 +41,8 @@ public class GridEditorUI extends AbstractTestUI { grid.getColumn("firstName").setEditorField(new PasswordField()); - LegacyTextField lastNameField = (LegacyTextField) grid.getColumn("lastName") - .getEditorField(); + LegacyTextField lastNameField = (LegacyTextField) grid + .getColumn("lastName").getEditorField(); lastNameField.setMaxLength(50); grid.getColumn("phoneNumber").getEditorField().setReadOnly(true); diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridFastAsyncUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridFastAsyncUpdate.java index 31fe0275a5..ef8b80c965 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridFastAsyncUpdate.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridFastAsyncUpdate.java @@ -42,13 +42,14 @@ public class GridFastAsyncUpdate extends AbstractTestUI { ++counter; Item item = container.addItem(counter); - item.getItemProperty("sequenceNumber").setValue( - String.valueOf(counter)); - item.getItemProperty("millis").setValue( - String.valueOf(Calendar.getInstance() - .getTimeInMillis() - loggingStart)); - item.getItemProperty("level").setValue( - Level.INFO.toString()); + item.getItemProperty("sequenceNumber") + .setValue(String.valueOf(counter)); + item.getItemProperty("millis") + .setValue(String.valueOf(Calendar + .getInstance().getTimeInMillis() + - loggingStart)); + item.getItemProperty("level") + .setValue(Level.INFO.toString()); item.getItemProperty("message").setValue("Message"); if (grid != null && !scrollLock) { grid.scrollToEnd(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFormatChange.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFormatChange.java index fbd6a42a38..f200fcb71c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFormatChange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFormatChange.java @@ -107,8 +107,8 @@ public class GridHeaderFormatChange extends AbstractTestUI { grid = new Grid(datasource); grid.setWidth("600px"); grid.getColumn("zipCode").setRenderer(new NumberRenderer()); - grid.setColumnOrder("firstName", "lastName", "streetAddress", - "zipCode", "city"); + grid.setColumnOrder("firstName", "lastName", "streetAddress", "zipCode", + "city"); grid.setSelectionMode(SelectionMode.SINGLE); addComponent(grid); @@ -156,8 +156,8 @@ public class GridHeaderFormatChange extends AbstractTestUI { if (row == null) { row = grid.prependHeaderRow(); if (grid.getColumn("firstName") != null) { - row.join("firstName", "lastName").setText( - "Full Name"); + row.join("firstName", "lastName") + .setText("Full Name"); } row.join("streetAddress", "zipCode", "city") .setText("Address"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderStyleNames.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderStyleNames.java index 019850dabb..cefcbcfd48 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderStyleNames.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderStyleNames.java @@ -42,8 +42,8 @@ public class GridHeaderStyleNames extends AbstractTestUIWithLog { protected void setup(VaadinRequest request) { Grid grid = new Grid(); grid.setSelectionMode(SelectionMode.MULTI); - grid.setContainerDataSource(BeanItemContainerGenerator - .createContainer(100)); + grid.setContainerDataSource( + BeanItemContainerGenerator.createContainer(100)); ageHeaderCell = grid.getDefaultHeaderRow().getCell("age"); grid.getDefaultHeaderRow().setStyleName("foo"); @@ -55,18 +55,14 @@ public class GridHeaderStyleNames extends AbstractTestUIWithLog { footerRow = grid.appendFooterRow(); ageFooterCell = footerRow.getCell("age"); - getPage() - .getStyles() - .add(".age {background-image: linear-gradient(to bottom,green 2%, #efefef 98%) !important;}"); - getPage() - .getStyles() - .add(".valo .v-grid-header .v-grid-cell.city-country {background-image: linear-gradient(to bottom,yellow 2%, #efefef 98%) !important;}"); - getPage() - .getStyles() - .add(".valo .v-grid-footer .v-grid-cell.age-footer {background-image: linear-gradient(to bottom,blue 2%, #efefef 98%) !important;}"); - getPage() - .getStyles() - .add(".valo .v-grid .v-grid-row.custom-row > * {background-image: linear-gradient(to bottom,purple 2%, #efefef 98%);}"); + getPage().getStyles().add( + ".age {background-image: linear-gradient(to bottom,green 2%, #efefef 98%) !important;}"); + getPage().getStyles().add( + ".valo .v-grid-header .v-grid-cell.city-country {background-image: linear-gradient(to bottom,yellow 2%, #efefef 98%) !important;}"); + getPage().getStyles().add( + ".valo .v-grid-footer .v-grid-cell.age-footer {background-image: linear-gradient(to bottom,blue 2%, #efefef 98%) !important;}"); + getPage().getStyles().add( + ".valo .v-grid .v-grid-row.custom-row > * {background-image: linear-gradient(to bottom,purple 2%, #efefef 98%);}"); setCellStyles(true); setRowStyles(true); diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridInTabSheet.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInTabSheet.java index cddbd390f2..58efb92239 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridInTabSheet.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInTabSheet.java @@ -51,8 +51,8 @@ public class GridInTabSheet extends AbstractTestUI { grid.addRow(100 + (k++)); } })); - addComponent(new Button("Remove row from Grid", - new Button.ClickListener() { + addComponent( + new Button("Remove row from Grid", new Button.ClickListener() { private Integer k = 0; @@ -61,8 +61,8 @@ public class GridInTabSheet extends AbstractTestUI { Object firstItemId = grid.getContainerDataSource() .firstItemId(); if (firstItemId != null) { - grid.getContainerDataSource().removeItem( - firstItemId); + grid.getContainerDataSource() + .removeItem(firstItemId); } } })); @@ -73,7 +73,8 @@ public class GridInTabSheet extends AbstractTestUI { public void buttonClick(ClickEvent event) { grid.setCellStyleGenerator(new CellStyleGenerator() { @Override - public String getStyle(CellReference cellReference) { + public String getStyle( + CellReference cellReference) { int rowIndex = ((Integer) cellReference .getItemId()).intValue(); Object propertyId = cellReference diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInit.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInit.java index 4a11c19242..6174a37416 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInit.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInit.java @@ -38,8 +38,8 @@ public class GridMultiSelectionOnInit extends AbstractTestUI { @Override public void buttonClick(ClickEvent event) { - ((MultiSelectionModel) grid.getSelectionModel()) - .setSelected(grid.getContainerDataSource().getItemIds()); + ((MultiSelectionModel) grid.getSelectionModel()).setSelected( + grid.getContainerDataSource().getItemIds()); } })); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridRowHeightChange.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridRowHeightChange.java index 3cb735d92b..377d0e74e2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridRowHeightChange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridRowHeightChange.java @@ -14,8 +14,8 @@ import java.util.List; public class GridRowHeightChange extends AbstractTestUI { - private final List<String> themes = Arrays - .asList("valo", "reindeer", "runo", "chameleon", "base"); + private final List<String> themes = Arrays.asList("valo", "reindeer", + "runo", "chameleon", "base"); @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrolling.java index ce64b3e9f3..ae880819b2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrolling.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrolling.java @@ -47,8 +47,8 @@ public class GridScrolling extends AbstractTestUI { for (int row = 0; row < 65536; row++) { Item item = ds.addItem(Integer.valueOf(row)); for (int col = 0; col < 5; col++) { - item.getItemProperty("col" + col).setValue( - "(" + row + ", " + col + ")"); + item.getItemProperty("col" + col) + .setValue("(" + row + ", " + col + ")"); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSidebarPosition.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSidebarPosition.java index 852ec7cea6..d2dfa42cc4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSidebarPosition.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSidebarPosition.java @@ -41,7 +41,8 @@ public class GridSidebarPosition extends AbstractTestUI { for (int i = 0; i < 30; i++) { grid.addColumn( "This is a really really really really long column name " - + i).setHidable(true); + + i) + .setHidable(true); } hl.addComponent(grid); diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSortIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSortIndicator.java index a05365d575..2fbaefbb32 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSortIndicator.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSortIndicator.java @@ -49,16 +49,17 @@ public class GridSortIndicator extends AbstractTestUI { // is not null. List<SortOrder> newSortOrder = new ArrayList<SortOrder>(); SortDirection newSortDirection = oldSortDirection; - if (currentSortOrder.get(0).getPropertyId().equals("Name")) { - newSortDirection = SortDirection.ASCENDING - .equals(oldSortDirection) ? SortDirection.DESCENDING - : SortDirection.ASCENDING; + if (currentSortOrder.get(0).getPropertyId() + .equals("Name")) { + newSortDirection = SortDirection.ASCENDING.equals( + oldSortDirection) ? SortDirection.DESCENDING + : SortDirection.ASCENDING; } if (newSortDirection != null) { newSortOrder .add(new SortOrder("Name", newSortDirection)); - newSortOrder.add(new SortOrder("Value", - newSortDirection)); + newSortOrder + .add(new SortOrder("Value", newSortDirection)); g.setSortOrder(newSortOrder); } oldSortDirection = newSortDirection; diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSwitchRenderers.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSwitchRenderers.java index 23c075136d..9c4ce0fb45 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSwitchRenderers.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSwitchRenderers.java @@ -60,8 +60,8 @@ public class GridSwitchRenderers extends AbstractTestUIWithLog { grid.getColumn(EXPANSION_COLUMN_ID).setWidth(50); for (int col = MANUALLY_FORMATTED_COLUMNS; col < COLUMNS; col++) { grid.getColumn(getColumnProperty(col)).setWidth(300); - grid.getColumn(getColumnProperty(col)).setRenderer( - new TextRenderer()); + grid.getColumn(getColumnProperty(col)) + .setRenderer(new TextRenderer()); } grid.setSelectionMode(SelectionMode.NONE); @@ -86,8 +86,8 @@ public class GridSwitchRenderers extends AbstractTestUIWithLog { int col = MANUALLY_FORMATTED_COLUMNS; for (; col < COLUMNS; col++) { - item.getItemProperty(getColumnProperty(col)).setValue( - "<b>(" + content + ", " + col + ")</b>"); + item.getItemProperty(getColumnProperty(col)) + .setValue("<b>(" + content + ", " + col + ")</b>"); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWidthIncrease.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWidthIncrease.java index 6726400327..cce5ceecd5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWidthIncrease.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWidthIncrease.java @@ -36,8 +36,8 @@ public class GridWidthIncrease extends AbstractTestUI { grid.addRow(rowData); grid.setWidth(400 + "px"); addComponent(grid); - addComponent(new Button("Increase Grid Width", - new Button.ClickListener() { + addComponent( + new Button("Increase Grid Width", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptRenderers.java b/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptRenderers.java index 8f88883161..1caa0763b9 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptRenderers.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptRenderers.java @@ -61,8 +61,8 @@ public class JavaScriptRenderers extends AbstractTestUI { Integer itemId = Integer.valueOf(i); Item item = container.addItem(itemId); item.getItemProperty("id").setValue(itemId); - item.getItemProperty("bean").setValue( - new MyBean(i + 1, Integer.toString(i - 1))); + item.getItemProperty("bean") + .setValue(new MyBean(i + 1, Integer.toString(i - 1))); item.getItemProperty("string").setValue("string" + i); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptStringRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptStringRenderer.java index ab3be6f4f1..27a2ebb58a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptStringRenderer.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptStringRenderer.java @@ -19,8 +19,8 @@ import com.vaadin.annotations.JavaScript; import com.vaadin.ui.renderers.AbstractJavaScriptRenderer; @JavaScript("JavaScriptStringRenderer.js") -public class JavaScriptStringRenderer extends - AbstractJavaScriptRenderer<String> { +public class JavaScriptStringRenderer + extends AbstractJavaScriptRenderer<String> { protected JavaScriptStringRenderer() { super(String.class); diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/NullRenderers.java b/uitest/src/main/java/com/vaadin/tests/components/grid/NullRenderers.java index db86847690..9ed2812803 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/NullRenderers.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/NullRenderers.java @@ -44,13 +44,13 @@ public class NullRenderers extends AbstractTestUI { container.addContainerProperty(TextRenderer.class, String.class, null); container.addContainerProperty(HtmlRenderer.class, String.class, null); container.addContainerProperty(DateRenderer.class, Date.class, null); - container - .addContainerProperty(NumberRenderer.class, Number.class, null); + container.addContainerProperty(NumberRenderer.class, Number.class, + null); container.addContainerProperty(ProgressBarRenderer.class, Double.class, null); - container - .addContainerProperty(ButtonRenderer.class, String.class, null); + container.addContainerProperty(ButtonRenderer.class, String.class, + null); container.addContainerProperty(ImageRenderer.class, Resource.class, null); @@ -62,27 +62,27 @@ public class NullRenderers extends AbstractTestUI { gridDefaults.setSelectionMode(SelectionMode.NONE); gridDefaults.setWidth("100%"); - gridDefaults.getColumn(TextRenderer.class).setRenderer( - new TextRenderer("-- No Text --")); - gridDefaults.getColumn(HtmlRenderer.class).setRenderer( - new HtmlRenderer("-- No Jokes --")); + gridDefaults.getColumn(TextRenderer.class) + .setRenderer(new TextRenderer("-- No Text --")); + gridDefaults.getColumn(HtmlRenderer.class) + .setRenderer(new HtmlRenderer("-- No Jokes --")); gridDefaults.getColumn(DateRenderer.class).setRenderer( new DateRenderer("%s", Locale.getDefault(), "-- Never --")); gridDefaults.getColumn(NumberRenderer.class).setRenderer( new NumberRenderer("%s", Locale.getDefault(), "-- Nothing --")); - gridDefaults.getColumn(ProgressBarRenderer.class).setRenderer( - new ProgressBarRenderer()); + gridDefaults.getColumn(ProgressBarRenderer.class) + .setRenderer(new ProgressBarRenderer()); - gridDefaults.getColumn(ButtonRenderer.class).setRenderer( - new ButtonRenderer(new RendererClickListener() { + gridDefaults.getColumn(ButtonRenderer.class) + .setRenderer(new ButtonRenderer(new RendererClickListener() { @Override public void click(RendererClickEvent event) { } }, "-- No Control --")); - gridDefaults.getColumn(ImageRenderer.class).setRenderer( - new ImageRenderer(new RendererClickListener() { + gridDefaults.getColumn(ImageRenderer.class) + .setRenderer(new ImageRenderer(new RendererClickListener() { @Override public void click(RendererClickEvent event) { @@ -97,27 +97,27 @@ public class NullRenderers extends AbstractTestUI { gridNoDefaults.setSelectionMode(SelectionMode.NONE); gridNoDefaults.setWidth("100%"); - gridNoDefaults.getColumn(TextRenderer.class).setRenderer( - new TextRenderer()); - gridNoDefaults.getColumn(HtmlRenderer.class).setRenderer( - new HtmlRenderer()); - gridNoDefaults.getColumn(DateRenderer.class).setRenderer( - new DateRenderer()); - gridNoDefaults.getColumn(NumberRenderer.class).setRenderer( - new NumberRenderer()); + gridNoDefaults.getColumn(TextRenderer.class) + .setRenderer(new TextRenderer()); + gridNoDefaults.getColumn(HtmlRenderer.class) + .setRenderer(new HtmlRenderer()); + gridNoDefaults.getColumn(DateRenderer.class) + .setRenderer(new DateRenderer()); + gridNoDefaults.getColumn(NumberRenderer.class) + .setRenderer(new NumberRenderer()); - gridNoDefaults.getColumn(ProgressBarRenderer.class).setRenderer( - new ProgressBarRenderer()); + gridNoDefaults.getColumn(ProgressBarRenderer.class) + .setRenderer(new ProgressBarRenderer()); - gridNoDefaults.getColumn(ButtonRenderer.class).setRenderer( - new ButtonRenderer(new RendererClickListener() { + gridNoDefaults.getColumn(ButtonRenderer.class) + .setRenderer(new ButtonRenderer(new RendererClickListener() { @Override public void click(RendererClickEvent event) { } })); - gridNoDefaults.getColumn(ImageRenderer.class).setRenderer( - new ImageRenderer(new RendererClickListener() { + gridNoDefaults.getColumn(ImageRenderer.class) + .setRenderer(new ImageRenderer(new RendererClickListener() { @Override public void click(RendererClickEvent event) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/SortableHeaderStyles.java b/uitest/src/main/java/com/vaadin/tests/components/grid/SortableHeaderStyles.java index 56e6c608b3..09d9a12a2b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/SortableHeaderStyles.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/SortableHeaderStyles.java @@ -32,17 +32,16 @@ public class SortableHeaderStyles extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - getPage() - .getStyles() - .add(".valo .v-grid-header th.v-grid-cell.sortable { font-weight: bold;}"); + getPage().getStyles().add( + ".valo .v-grid-header th.v-grid-cell.sortable { font-weight: bold;}"); PersonContainer container = PersonContainer.createWithTestData(); Collection<?> sortableContainerPropertyIds = container .getSortableContainerPropertyIds(); - final OptionGroup sortableSelector = new OptionGroup( - "Sortable columns", sortableContainerPropertyIds); + final OptionGroup sortableSelector = new OptionGroup("Sortable columns", + sortableContainerPropertyIds); sortableSelector.setMultiSelect(true); sortableSelector.setValue(sortableContainerPropertyIds); @@ -54,8 +53,8 @@ public class SortableHeaderStyles extends AbstractTestUI { Collection<?> sortableCols = (Collection<?>) sortableSelector .getValue(); for (Column column : grid.getColumns()) { - column.setSortable(sortableCols.contains(column - .getPropertyId())); + column.setSortable( + sortableCols.contains(column.getPropertyId())); } } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/WidgetRenderers.java b/uitest/src/main/java/com/vaadin/tests/components/grid/WidgetRenderers.java index d1110d4caa..0d89b96df1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/WidgetRenderers.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/WidgetRenderers.java @@ -43,8 +43,8 @@ public class WidgetRenderers extends AbstractTestUI { container.addContainerProperty(ProgressBarRenderer.class, Double.class, null); - container - .addContainerProperty(ButtonRenderer.class, String.class, null); + container.addContainerProperty(ButtonRenderer.class, String.class, + null); container.addContainerProperty(ImageRenderer.class, Resource.class, null); container.addContainerProperty(PROPERTY_ID, String.class, null); @@ -53,8 +53,8 @@ public class WidgetRenderers extends AbstractTestUI { item.getItemProperty(ProgressBarRenderer.class).setValue(0.3); item.getItemProperty(ButtonRenderer.class).setValue("Click"); - item.getItemProperty(ImageRenderer.class).setValue( - new ThemeResource("window/img/close.png")); + item.getItemProperty(ImageRenderer.class) + .setValue(new ThemeResource("window/img/close.png")); item.getItemProperty(PROPERTY_ID).setValue("Click"); final Grid grid = new Grid(container); @@ -62,20 +62,20 @@ public class WidgetRenderers extends AbstractTestUI { grid.setId("test-grid"); grid.setSelectionMode(SelectionMode.NONE); - grid.getColumn(ProgressBarRenderer.class).setRenderer( - new ProgressBarRenderer()); + grid.getColumn(ProgressBarRenderer.class) + .setRenderer(new ProgressBarRenderer()); - grid.getColumn(ButtonRenderer.class).setRenderer( - new ButtonRenderer(new RendererClickListener() { + grid.getColumn(ButtonRenderer.class) + .setRenderer(new ButtonRenderer(new RendererClickListener() { @Override public void click(RendererClickEvent event) { - item.getItemProperty(ButtonRenderer.class).setValue( - "Clicked!"); + item.getItemProperty(ButtonRenderer.class) + .setValue("Clicked!"); } })); - grid.getColumn(ImageRenderer.class).setRenderer( - new ImageRenderer(new RendererClickListener() { + grid.getColumn(ImageRenderer.class) + .setRenderer(new ImageRenderer(new RendererClickListener() { @Override public void click(RendererClickEvent event) { @@ -84,12 +84,12 @@ public class WidgetRenderers extends AbstractTestUI { } })); - grid.getColumn(PROPERTY_ID).setRenderer( - new ButtonRenderer(new RendererClickListener() { + grid.getColumn(PROPERTY_ID) + .setRenderer(new ButtonRenderer(new RendererClickListener() { @Override public void click(RendererClickEvent event) { - item.getItemProperty(PROPERTY_ID).setValue( - event.getPropertyId()); + item.getItemProperty(PROPERTY_ID) + .setValue(event.getPropertyId()); } })); @@ -100,7 +100,8 @@ public class WidgetRenderers extends AbstractTestUI { @Override public void buttonClick(ClickEvent event) { grid.setColumnOrder(ImageRenderer.class, - ProgressBarRenderer.class, ButtonRenderer.class); + ProgressBarRenderer.class, + ButtonRenderer.class); } })); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeatures.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeatures.java index 429f15bb47..3b699a7031 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeatures.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeatures.java @@ -33,7 +33,8 @@ public class GridBasicClientFeatures extends UI { @Override protected void init(VaadinRequest request) { - setContent(new TestWidgetComponent(GridBasicClientFeaturesWidget.class)); + setContent( + new TestWidgetComponent(GridBasicClientFeaturesWidget.class)); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java index 175396289a..a5976fa920 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java @@ -118,7 +118,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { Object addedRow = (iter.hasNext() ? iter.next() : "none"); iter = event.getRemoved().iterator(); Object removedRow = (iter.hasNext() ? iter.next() : "none"); - log("SelectionEvent: Added " + addedRow + ", Removed " + removedRow); + log("SelectionEvent: Added " + addedRow + ", Removed " + + removedRow); } }; @@ -126,9 +127,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { @Override public void itemClick(ItemClickEvent event) { - log("Item " + (event.isDoubleClick() ? "double " : "") - + "click on " + event.getPropertyId() + ", item " - + event.getItemId()); + log("Item " + (event.isDoubleClick() ? "double " : "") + "click on " + + event.getPropertyId() + ", item " + event.getItemId()); } }; @@ -204,8 +204,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { cssLayout.addComponent(new Label(string)); } - final int rowIndex = grid.getContainerDataSource().indexOfId( - rowReference.getItemId()); + final int rowIndex = grid.getContainerDataSource() + .indexOfId(rowReference.getItemId()); ClickListener clickListener = new ClickListener() { @Override public void buttonClick(ClickEvent event) { @@ -293,26 +293,26 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { Item item = ds.addItem(Integer.valueOf(row)); int col = 0; for (; col < COLUMNS - MANUALLY_FORMATTED_COLUMNS; col++) { - item.getItemProperty(getColumnProperty(col)).setValue( - "(" + row + ", " + col + ")"); + item.getItemProperty(getColumnProperty(col)) + .setValue("(" + row + ", " + col + ")"); } item.getItemProperty(getColumnProperty(1)).setReadOnly(true); - item.getItemProperty(getColumnProperty(col++)).setValue( - Integer.valueOf(row)); - item.getItemProperty(getColumnProperty(col++)).setValue( - new Date(timestamp)); + item.getItemProperty(getColumnProperty(col++)) + .setValue(Integer.valueOf(row)); + item.getItemProperty(getColumnProperty(col++)) + .setValue(new Date(timestamp)); timestamp += 91250000; // a bit over a day, just to get // variation - item.getItemProperty(getColumnProperty(col++)).setValue( - "<b>" + row + "</b>"); + item.getItemProperty(getColumnProperty(col++)) + .setValue("<b>" + row + "</b>"); // Random numbers - item.getItemProperty(getColumnProperty(col++)).setValue( - rand.nextInt()); + item.getItemProperty(getColumnProperty(col++)) + .setValue(rand.nextInt()); // Random between 0 - 5 to test multisorting - item.getItemProperty(getColumnProperty(col++)).setValue( - rand.nextInt(5)); + item.getItemProperty(getColumnProperty(col++)) + .setValue(rand.nextInt(5)); } } @@ -321,21 +321,20 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { { int col = grid.getContainerDataSource().getContainerPropertyIds() - .size() - - MANUALLY_FORMATTED_COLUMNS; - grid.getColumn(getColumnProperty(col++)).setRenderer( - new NumberRenderer(new DecimalFormat("0,000.00", - DecimalFormatSymbols.getInstance(new Locale("fi", - "FI"))))); + .size() - MANUALLY_FORMATTED_COLUMNS; + grid.getColumn(getColumnProperty(col++)) + .setRenderer(new NumberRenderer( + new DecimalFormat("0,000.00", DecimalFormatSymbols + .getInstance(new Locale("fi", "FI"))))); grid.getColumn(getColumnProperty(col++)).setRenderer( new DateRenderer(new SimpleDateFormat("dd.MM.yy HH:mm"))); - grid.getColumn(getColumnProperty(col++)).setRenderer( - new HtmlRenderer()); - grid.getColumn(getColumnProperty(col++)).setRenderer( - new NumberRenderer()); - grid.getColumn(getColumnProperty(col++)).setRenderer( - new NumberRenderer()); + grid.getColumn(getColumnProperty(col++)) + .setRenderer(new HtmlRenderer()); + grid.getColumn(getColumnProperty(col++)) + .setRenderer(new NumberRenderer()); + grid.getColumn(getColumnProperty(col++)) + .setRenderer(new NumberRenderer()); } // Create footer @@ -480,8 +479,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { primaryStyleNames.put("v-escalator", "v-escalator"); primaryStyleNames.put("my-grid", "my-grid"); - createMultiClickAction("Primary style name", "State", - primaryStyleNames, new Command<Grid, String>() { + createMultiClickAction("Primary style name", "State", primaryStyleNames, + new Command<Grid, String>() { @Override public void execute(Grid grid, String value, Object data) { @@ -504,7 +503,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { grid.addSelectionListener(selectionListener); ((SelectionModel.Single) grid.getSelectionModel()) - .setDeselectAllowed(singleSelectAllowDeselect); + .setDeselectAllowed( + singleSelectAllowDeselect); } else { grid.removeSelectionListener(selectionListener); } @@ -520,7 +520,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { new Command<Grid, Integer>() { @Override public void execute(Grid grid, Integer limit, Object data) { - if (!(grid.getSelectionModel() instanceof MultiSelectionModel)) { + if (!(grid + .getSelectionModel() instanceof MultiSelectionModel)) { grid.setSelectionMode(SelectionMode.MULTI); } @@ -531,8 +532,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { LinkedHashMap<String, List<SortOrder>> sortableProperties = new LinkedHashMap<String, List<SortOrder>>(); for (Object propertyId : ds.getSortableContainerPropertyIds()) { - sortableProperties.put(propertyId + ", ASC", Sort.by(propertyId) - .build()); + sortableProperties.put(propertyId + ", ASC", + Sort.by(propertyId).build()); sortableProperties.put(propertyId + ", DESC", Sort.by(propertyId, SortDirection.DESCENDING).build()); } @@ -654,12 +655,12 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { } }); - createSelectAction("Cell style generator", "State", - cellStyleGenerators, CELL_STYLE_GENERATOR_NONE, + createSelectAction("Cell style generator", "State", cellStyleGenerators, + CELL_STYLE_GENERATOR_NONE, new Command<Grid, CellStyleGenerator>() { @Override - public void execute(Grid grid, - CellStyleGenerator generator, Object data) { + public void execute(Grid grid, CellStyleGenerator generator, + Object data) { grid.setCellStyleGenerator(generator); } }); @@ -669,8 +670,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { @Override public void execute(Grid c, Boolean value, Object data) { - c.setRowDescriptionGenerator(value ? rowDescriptionGenerator - : null); + c.setRowDescriptionGenerator( + value ? rowDescriptionGenerator : null); } }); @@ -678,8 +679,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { new Command<Grid, Boolean>() { @Override public void execute(Grid c, Boolean value, Object data) { - c.setCellDescriptionGenerator(value ? cellDescriptionGenerator - : null); + c.setCellDescriptionGenerator( + value ? cellDescriptionGenerator : null); } }); @@ -734,9 +735,11 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { @Override public void execute(Grid c, Boolean value, Object data) { if (!value) { - c.removeItemClickListener(editorOpeningItemClickListener); + c.removeItemClickListener( + editorOpeningItemClickListener); } else { - c.addItemClickListener(editorOpeningItemClickListener); + c.addItemClickListener( + editorOpeningItemClickListener); } } @@ -750,11 +753,11 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { .getField("Column 0"); if (targetField != null) { if (!value) { - targetField - .removeValueChangeListener(reactiveValueChanger); + targetField.removeValueChangeListener( + reactiveValueChanger); } else { - targetField - .addValueChangeListener(reactiveValueChanger); + targetField.addValueChangeListener( + reactiveValueChanger); } } } @@ -766,9 +769,11 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { @Override public void execute(Grid grid, Boolean value, Object data) { if (value) { - grid.addColumnReorderListener(columnReorderListener); + grid.addColumnReorderListener( + columnReorderListener); } else { - grid.removeColumnReorderListener(columnReorderListener); + grid.removeColumnReorderListener( + columnReorderListener); } } }); @@ -777,9 +782,11 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { @Override public void execute(Grid grid, Boolean value, Object data) { if (value) { - grid.addColumnVisibilityChangeListener(columnVisibilityListener); + grid.addColumnVisibilityChangeListener( + columnVisibilityListener); } else { - grid.removeColumnVisibilityChangeListener(columnVisibilityListener); + grid.removeColumnVisibilityChangeListener( + columnVisibilityListener); } } }); @@ -791,8 +798,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { SelectionModel model = c.getSelectionModel(); if (model instanceof SelectionModel.Single) { - ((SelectionModel.Single) model) - .setDeselectAllowed(singleSelectAllowDeselect); + ((SelectionModel.Single) model).setDeselectAllowed( + singleSelectAllowDeselect); } } }); @@ -852,8 +859,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { if (value.equals("Top")) { defaultRow = grid.getHeaderRow(0); } else if (value.equals("Bottom")) { - defaultRow = grid.getHeaderRow(grid - .getHeaderRowCount() - 1); + defaultRow = grid + .getHeaderRow(grid.getHeaderRowCount() - 1); } grid.setDefaultHeaderRow(defaultRow); } @@ -961,14 +968,17 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { String wasColumnHidingToggleCaption; @Override - public void execute(Grid grid, String value, Object data) { - String columnProperty = getColumnProperty((Integer) data); + public void execute(Grid grid, String value, + Object data) { + String columnProperty = getColumnProperty( + (Integer) data); Column column = grid.getColumn(columnProperty); if (column == null) { column = grid.addColumn(columnProperty); column.setHidable(wasHidable); column.setHidden(wasHidden); - column.setHidingToggleCaption(wasColumnHidingToggleCaption); + column.setHidingToggleCaption( + wasColumnHidingToggleCaption); } else { wasHidable = column.isHidable(); wasHidden = column.isHidden(); @@ -982,14 +992,17 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { new Command<Grid, String>() { @Override - public void execute(Grid grid, String value, Object data) { - final String columnProperty = getColumnProperty((Integer) data); + public void execute(Grid grid, String value, + Object data) { + final String columnProperty = getColumnProperty( + (Integer) data); List<Column> cols = grid.getColumns(); List<Object> reordered = new ArrayList<Object>(); boolean addAsLast = false; for (int i = 0; i < cols.size(); i++) { Column col = cols.get(i); - if (col.getPropertyId().equals(columnProperty)) { + if (col.getPropertyId() + .equals(columnProperty)) { if (i == 0) { addAsLast = true; } else { @@ -1012,7 +1025,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { @Override public void execute(Grid grid, Boolean value, Object columnIndex) { - Object propertyId = getColumnProperty((Integer) columnIndex); + Object propertyId = getColumnProperty( + (Integer) columnIndex); Column column = grid.getColumn(propertyId); column.setSortable(value); } @@ -1024,7 +1038,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { @Override public void execute(Grid grid, Boolean value, Object columnIndex) { - Object propertyId = getColumnProperty((Integer) columnIndex); + Object propertyId = getColumnProperty( + (Integer) columnIndex); Column column = grid.getColumn(propertyId); column.setResizable(value); } @@ -1052,12 +1067,13 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { int count = 0; @Override - public void execute(Grid grid, String value, Object data) { - final String columnProperty = getColumnProperty((Integer) data); + public void execute(Grid grid, String value, + Object data) { + final String columnProperty = getColumnProperty( + (Integer) data); grid.getColumn(columnProperty) - .setHidingToggleCaption( - columnProperty + " caption " - + count++); + .setHidingToggleCaption(columnProperty + + " caption " + count++); } }, null, c); @@ -1066,8 +1082,10 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { int count = 0; @Override - public void execute(Grid grid, String value, Object data) { - final String columnProperty = getColumnProperty((Integer) data); + public void execute(Grid grid, String value, + Object data) { + final String columnProperty = getColumnProperty( + (Integer) data); grid.getColumn(columnProperty).setHeaderCaption( columnProperty + " header " + count++); } @@ -1081,7 +1099,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { @Override public void execute(Grid grid, Integer value, Object columnIndex) { - Object propertyId = getColumnProperty((Integer) columnIndex); + Object propertyId = getColumnProperty( + (Integer) columnIndex); Column column = grid.getColumn(propertyId); column.setWidthUndefined(); } @@ -1104,7 +1123,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { @Override public void execute(Grid grid, Integer value, Object columnIndex) { - Object propertyId = getColumnProperty((Integer) columnIndex); + Object propertyId = getColumnProperty( + (Integer) columnIndex); Column column = grid.getColumn(propertyId); column.setWidth(value); } @@ -1120,9 +1140,10 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { defaultRows, new Command<Grid, GridStaticCellType>() { @Override - public void execute(Grid grid, - GridStaticCellType value, Object columnIndex) { - final Object propertyId = getColumnProperty((Integer) columnIndex); + public void execute(Grid grid, GridStaticCellType value, + Object columnIndex) { + final Object propertyId = getColumnProperty( + (Integer) columnIndex); final HeaderCell cell = grid.getDefaultHeaderRow() .getCell(propertyId); switch (value) { @@ -1158,9 +1179,10 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { defaultRows, new Command<Grid, GridStaticCellType>() { @Override - public void execute(Grid grid, - GridStaticCellType value, Object columnIndex) { - final Object propertyId = getColumnProperty((Integer) columnIndex); + public void execute(Grid grid, GridStaticCellType value, + Object columnIndex) { + final Object propertyId = getColumnProperty( + (Integer) columnIndex); final FooterCell cell = grid.getFooterRow(0) .getCell(propertyId); switch (value) { @@ -1252,8 +1274,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { if (enable.booleanValue()) { ds.addContainerProperty(propertyId, String.class, "property value"); - grid.getColumn(propertyId).setHeaderCaption( - "new property"); + grid.getColumn(propertyId) + .setHeaderCaption("new property"); grid.setColumnOrder(propertyId); } else { ds.removeContainerProperty(propertyId); @@ -1293,7 +1315,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { } } - private <T extends Object> Property<T> getProperty(Item item, int i) { + private <T extends Object> Property<T> getProperty(Item item, + int i) { @SuppressWarnings("unchecked") Property<T> itemProperty = item .getItemProperty(getColumnProperty(i)); @@ -1366,9 +1389,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { Property<?> property = ds.getContainerProperty( firstItemId, containerPropertyId); if (property.getType().equals(String.class)) { - ((Property<String>) property) - .setValue("modified: " - + containerPropertyId); + ((Property<String>) property).setValue( + "modified: " + containerPropertyId); } } } @@ -1377,9 +1399,10 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { createBooleanAction("Select first row", "Body rows", false, new Command<Grid, Boolean>() { @Override - public void execute(Grid grid, Boolean select, Object data) { - final Object firstItemId = grid - .getContainerDataSource().firstItemId(); + public void execute(Grid grid, Boolean select, + Object data) { + final Object firstItemId = grid.getContainerDataSource() + .firstItemId(); if (select.booleanValue()) { grid.select(firstItemId); } else { @@ -1510,8 +1533,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { createCategory("Height", "Size"); // header 20px + scrollbar 16px = 36px baseline - createClickAction("86px (no drag scroll select)", "Height", - sizeCommand, "86px"); + createClickAction("86px (no drag scroll select)", "Height", sizeCommand, + "86px"); createClickAction("96px (drag scroll select limit)", "Height", sizeCommand, "96px"); createClickAction("106px (drag scroll select enabled)", "Height", @@ -1532,7 +1555,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { private void createDetailsActions() { Command<Grid, DetailsGenerator> swapDetailsGenerator = new Command<Grid, DetailsGenerator>() { @Override - public void execute(Grid c, DetailsGenerator generator, Object data) { + public void execute(Grid c, DetailsGenerator generator, + Object data) { grid.setDetailsGenerator(generator); } }; diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRenderer.java index 5c4ccfae89..bd9ec12c75 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRenderer.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRenderer.java @@ -27,6 +27,7 @@ public class GridDefaultTextRenderer extends UI { @Override protected void init(VaadinRequest request) { - setContent(new TestWidgetComponent(GridDefaultTextRendererWidget.class)); + setContent( + new TestWidgetComponent(GridDefaultTextRendererWidget.class)); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignments.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignments.java index 06f4f17eb8..b37e47243f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignments.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignments.java @@ -57,13 +57,16 @@ public class GridLayoutAlignments extends UI { setContent(layout); } - private Component createButton(final GridLayout g, final Alignment topLeft) { - return new Button("Align " + topLeft.getVerticalAlignment() + ", " - + topLeft.getHorizontalAlignment(), new Button.ClickListener() { - @Override - public void buttonClick(Button.ClickEvent clickEvent) { - g.setComponentAlignment(g.getComponent(0, 0), topLeft); - } - }); + private Component createButton(final GridLayout g, + final Alignment topLeft) { + return new Button( + "Align " + topLeft.getVerticalAlignment() + ", " + + topLeft.getHorizontalAlignment(), + new Button.ClickListener() { + @Override + public void buttonClick(Button.ClickEvent clickEvent) { + g.setComponentAlignment(g.getComponent(0, 0), topLeft); + } + }); } }
\ No newline at end of file diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacing.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacing.java index d5644336e3..d14c46220f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacing.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacing.java @@ -25,9 +25,8 @@ public class GridLayoutExtraSpacing extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - getUI().getPage() - .getStyles() - .add(".v-gridlayout {background: red;} .v-csslayout {background: white;}"); + getUI().getPage().getStyles().add( + ".v-gridlayout {background: red;} .v-csslayout {background: white;}"); final GridLayout gl = new GridLayout(4, 4); diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignment.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignment.java index 32d01f9910..5c89a4b3e4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignment.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignment.java @@ -25,7 +25,8 @@ import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; @Widgetset(TestingWidgetSet.NAME) -public class GridLayoutFractionalSizeAndAlignment extends AbstractTestUIWithLog { +public class GridLayoutFractionalSizeAndAlignment + extends AbstractTestUIWithLog { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutHideMiddleCells.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutHideMiddleCells.java index 4712b8fb26..95c2d51559 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutHideMiddleCells.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutHideMiddleCells.java @@ -69,24 +69,24 @@ public class GridLayoutHideMiddleCells extends AbstractTestUI { horLayout.addComponent(gridLayout); horLayout.addComponent(gridLayout2); - mainLayout.addComponent(new Button( - "Hide/show both middle Column and row", - new Button.ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - for (int i = 0; i < ROWS; i++) { - for (int j = 0; j < COLS; j++) { - if (j == 2 || i == 2) { - if (labels[i][j].isVisible()) { - labels[i][j].setVisible(false); - } else { - labels[i][j].setVisible(true); + mainLayout + .addComponent(new Button("Hide/show both middle Column and row", + new Button.ClickListener() { + @Override + public void buttonClick(ClickEvent event) { + for (int i = 0; i < ROWS; i++) { + for (int j = 0; j < COLS; j++) { + if (j == 2 || i == 2) { + if (labels[i][j].isVisible()) { + labels[i][j].setVisible(false); + } else { + labels[i][j].setVisible(true); + } + } } } } - } - } - })); + })); mainLayout.addComponent(new Button("Hide/show middle Column", new Button.ClickListener() { @Override @@ -100,8 +100,8 @@ public class GridLayoutHideMiddleCells extends AbstractTestUI { } } })); - mainLayout.addComponent(new Button("Hide/show middle Row", - new Button.ClickListener() { + mainLayout.addComponent( + new Button("Hide/show middle Row", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { for (int j = 0; j < COLS; j++) { @@ -114,8 +114,8 @@ public class GridLayoutHideMiddleCells extends AbstractTestUI { } })); - mainLayout.addComponent(new Button("Hide Random button", - new Button.ClickListener() { + mainLayout.addComponent( + new Button("Hide Random button", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java index 1ec7bfc13f..5ae4a11448 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java @@ -36,8 +36,8 @@ public class GridLayoutRequiredIndicatorLocation extends AbstractTestUI { .add(".colored { background: lime; overflow: visible; }"); getPage().getCurrent().getStyles() .add(".pink { background: pink; overflow: visible; }"); - getPage().getCurrent().getStyles().add( - ".v-gridlayout-slot { border: 1px solid red; }"); + getPage().getCurrent().getStyles() + .add(".v-gridlayout-slot { border: 1px solid red; }"); GridLayout rootLayout = new GridLayout(2, 2); rootLayout.addStyleName("allow-overflow"); @@ -110,7 +110,8 @@ public class GridLayoutRequiredIndicatorLocation extends AbstractTestUI { layout.addComponent(label); // TODO also test with captions - LegacyTextField field = new LegacyTextField(useCaption ? "caption" : null); + LegacyTextField field = new LegacyTextField( + useCaption ? "caption" : null); field.setRequired(true); field.setWidth(width); layout.addComponent(field); @@ -119,7 +120,8 @@ public class GridLayoutRequiredIndicatorLocation extends AbstractTestUI { private void addLabel(VerticalLayout layout, String width, Alignment alignment, boolean useCaption) { - LegacyTextField field = new LegacyTextField(useCaption ? "caption" : null); + LegacyTextField field = new LegacyTextField( + useCaption ? "caption" : null); field.setRequired(true); field.setWidth(width); layout.addComponent(field); diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java index 968222f0f2..51f864918a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java @@ -23,7 +23,8 @@ public class UniformGridLayoutUI extends UI { layout.addComponent(createGridWithoutGridBuilder(3, hide)); } - private GridLayout createGridWithoutGridBuilder(int rows, boolean collapse) { + private GridLayout createGridWithoutGridBuilder(int rows, + boolean collapse) { GridLayout grid = new GridLayout(30, 3); grid.setWidth("100%"); // grid.setMargin(true); diff --git a/uitest/src/main/java/com/vaadin/tests/components/image/ImageAltText.java b/uitest/src/main/java/com/vaadin/tests/components/image/ImageAltText.java index efee376bfe..960acfb598 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/image/ImageAltText.java +++ b/uitest/src/main/java/com/vaadin/tests/components/image/ImageAltText.java @@ -10,8 +10,8 @@ public class ImageAltText extends TestBase { @Override protected void setup() { - final Image image = new Image("Caption", new ThemeResource( - "../runo/icons/64/ok.png")); + final Image image = new Image("Caption", + new ThemeResource("../runo/icons/64/ok.png")); image.setDebugId("image"); image.setAlternateText("Original alt text"); addComponent(image); diff --git a/uitest/src/main/java/com/vaadin/tests/components/image/ImageClicks.java b/uitest/src/main/java/com/vaadin/tests/components/image/ImageClicks.java index 397e31c39c..854210344f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/image/ImageClicks.java +++ b/uitest/src/main/java/com/vaadin/tests/components/image/ImageClicks.java @@ -38,8 +38,8 @@ public class ImageClicks extends TestBase { @Override public void click(ClickEvent event) { ++clickCounter; - imageResource.setFilename("testimage.png?" - + new Date().getTime()); + imageResource + .setFilename("testimage.png?" + new Date().getTime()); image.markAsDirty(); label.setValue(labelText()); } @@ -118,8 +118,8 @@ public class ImageClicks extends TestBase { drawable.setColor(Color.white); } - drawable.fillRect(gridx + 1, gridy + 1, gridxnext - gridx - - 1, gridynext - gridy - 1); + drawable.fillRect(gridx + 1, gridy + 1, + gridxnext - gridx - 1, gridynext - gridy - 1); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java index 1e193fc3b4..ccd22da4c3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java @@ -95,8 +95,8 @@ public class BasicJavaScriptComponent extends AbstractTestUI { HasComponents parent = getParent(); int i = 1; while (parent != null) { - if (!parentIds.getString(i).equals( - parent.getConnectorId())) { + if (!parentIds.getString(i) + .equals(parent.getConnectorId())) { log.log("parentIds[" + i + "] doesn't match"); } i++; @@ -134,10 +134,8 @@ public class BasicJavaScriptComponent extends AbstractTestUI { getRpcProxy(TestRpc.class).sendRpc("RPC message"); callFunction("messageToClient", "Callback message"); - getState() - .setMessages( - Arrays.asList("First state message", - "Second state message")); + getState().setMessages(Arrays.asList("First state message", + "Second state message")); // Dummy resource used to test URL translation Resource resource = new ConnectorResource() { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.java b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.java index 06edbb913f..d858f7c95f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.java +++ b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.java @@ -41,8 +41,8 @@ public class JavaScriptResizeListener extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - addComponent(new Button("Change holder size", - new Button.ClickListener() { + addComponent( + new Button("Change holder size", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { updateHolderSize(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/label/LabelModes.java b/uitest/src/main/java/com/vaadin/tests/components/label/LabelModes.java index e5bc539f36..d70fd5ab4c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/label/LabelModes.java +++ b/uitest/src/main/java/com/vaadin/tests/components/label/LabelModes.java @@ -15,25 +15,30 @@ public class LabelModes extends ComponentTestCase<Label> { protected void initializeComponents() { Label l; - l = createLabel("This is an undefined wide label with default content mode"); + l = createLabel( + "This is an undefined wide label with default content mode"); l.setWidth(null); addTestComponent(l); - l = createLabel("This label contains\nnewlines and spaces\nbut is in\ndefault content mode"); + l = createLabel( + "This label contains\nnewlines and spaces\nbut is in\ndefault content mode"); l.setWidth(null); addTestComponent(l); - l = createLabel("This label contains\nnewlines and spaces\nand is in\npreformatted mode"); + l = createLabel( + "This label contains\nnewlines and spaces\nand is in\npreformatted mode"); l.setContentMode(ContentMode.PREFORMATTED); l.setWidth(null); addTestComponent(l); - l = createLabel("This label contains\nnewlines and spaces\nand is in\nhtml mode"); + l = createLabel( + "This label contains\nnewlines and spaces\nand is in\nhtml mode"); l.setContentMode(ContentMode.HTML); l.setWidth(null); addTestComponent(l); - l = createLabel("This label contains\nnewlines and spaces\nand is in\nraw mode"); + l = createLabel( + "This label contains\nnewlines and spaces\nand is in\nraw mode"); l.setContentMode(ContentMode.RAW); l.setWidth(null); addTestComponent(l); diff --git a/uitest/src/main/java/com/vaadin/tests/components/label/LabelTest.java b/uitest/src/main/java/com/vaadin/tests/components/label/LabelTest.java index 8c9a76ea47..5968fccf02 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/label/LabelTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/label/LabelTest.java @@ -9,8 +9,8 @@ import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractComponentTest; import com.vaadin.ui.Label; -public class LabelTest extends AbstractComponentTest<Label> implements - ValueChangeListener { +public class LabelTest extends AbstractComponentTest<Label> + implements ValueChangeListener { private Command<Label, String> setValueCommand = new Command<Label, String>() { @@ -59,9 +59,11 @@ public class LabelTest extends AbstractComponentTest<Label> implements List<String> values = new ArrayList<String>(); values.add("Test"); values.add("A little longer value"); - values.add("A very long value with very much text. All in all it is 74 characters long"); + values.add( + "A very long value with very much text. All in all it is 74 characters long"); values.add("<b>Bold</b>"); - values.add("<div style=\"height: 70px; width: 15px; border: 1px dashed red\">With border</div>"); + values.add( + "<div style=\"height: 70px; width: 15px; border: 1px dashed red\">With border</div>"); createClickAction("(empty string)", subCategory, setValueCommand, ""); createClickAction("(null)", subCategory, setValueCommand, null); diff --git a/uitest/src/main/java/com/vaadin/tests/components/label/Labels.java b/uitest/src/main/java/com/vaadin/tests/components/label/Labels.java index cd6976543a..0d296b1b92 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/label/Labels.java +++ b/uitest/src/main/java/com/vaadin/tests/components/label/Labels.java @@ -15,8 +15,9 @@ public class Labels extends ComponentTestCase<Label> { @Override protected void initializeComponents() { Label l; - l = createLabel("This is an undefined\nwide\nlabel which do not wrap. It should be clipped at the end of the screen" - + LoremIpsum.get(1000)); + l = createLabel( + "This is an undefined\nwide\nlabel which do not wrap. It should be clipped at the end of the screen" + + LoremIpsum.get(1000)); l.setWidth(null); addTestComponent(l); @@ -29,8 +30,9 @@ public class Labels extends ComponentTestCase<Label> { l.setWidth("100%"); addTestComponent(l); - l = createLabel("This is a\n\n 100%\t\t\t \twide simple with fixed 65px height. It should wrap. " - + LoremIpsum.get(5000)); + l = createLabel( + "This is a\n\n 100%\t\t\t \twide simple with fixed 65px height. It should wrap. " + + LoremIpsum.get(5000)); l.setWidth("100%"); l.setHeight("65px"); addTestComponent(l); diff --git a/uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java b/uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java index f503e8966f..b18b92dfc8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java +++ b/uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java @@ -15,14 +15,15 @@ public class MarginsInLabels extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { AbstractLayout layout = new VerticalLayout(); - layout.addComponent(new Label("<h1>Vertical layout</h1>", - ContentMode.HTML)); + layout.addComponent( + new Label("<h1>Vertical layout</h1>", ContentMode.HTML)); layout.addComponent(new Label("Next row")); addComponent(layout); layout = new GridLayout(1, 2); layout.setWidth("100%"); - layout.addComponent(new Label("<h1>Grid layout</h1>", ContentMode.HTML)); + layout.addComponent( + new Label("<h1>Grid layout</h1>", ContentMode.HTML)); layout.addComponent(new Label("Next row")); addComponent(layout); diff --git a/uitest/src/main/java/com/vaadin/tests/components/link/LinkIcon.java b/uitest/src/main/java/com/vaadin/tests/components/link/LinkIcon.java index 970c2f71c7..8378500010 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/link/LinkIcon.java +++ b/uitest/src/main/java/com/vaadin/tests/components/link/LinkIcon.java @@ -20,8 +20,8 @@ public class LinkIcon extends TestBase { @Override protected void setup() { - Link l = new Link("www.google.com", new ExternalResource( - "http://www.vaadin.com/")); + Link l = new Link("www.google.com", + new ExternalResource("http://www.vaadin.com/")); l.setIcon(new ThemeResource("../runo/icons/32/calendar.png")); addComponent(l); diff --git a/uitest/src/main/java/com/vaadin/tests/components/link/LinkTargetSize.java b/uitest/src/main/java/com/vaadin/tests/components/link/LinkTargetSize.java index cb537c88ae..05a3b0008e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/link/LinkTargetSize.java +++ b/uitest/src/main/java/com/vaadin/tests/components/link/LinkTargetSize.java @@ -19,8 +19,8 @@ public class LinkTargetSize extends TestBase { @Override protected void setup() { - Link l = new Link("Try it!", new ExternalResource( - "http://www.google.com/m")); + Link l = new Link("Try it!", + new ExternalResource("http://www.google.com/m")); l.setTargetName("_blank"); l.setTargetWidth(300); l.setTargetHeight(300); diff --git a/uitest/src/main/java/com/vaadin/tests/components/link/LinkTest.java b/uitest/src/main/java/com/vaadin/tests/components/link/LinkTest.java index 6deea0fd96..996fc32775 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/link/LinkTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/link/LinkTest.java @@ -42,11 +42,11 @@ public class LinkTest extends AbstractComponentTest<Link> { private void createTargetSelect(String category) { LinkedHashMap<String, Resource> options = new LinkedHashMap<String, Resource>(); options.put("-", null); - options.put("https://vaadin.com", new ExternalResource( - "https://vaadin.com")); + options.put("https://vaadin.com", + new ExternalResource("https://vaadin.com")); options.put("32x32 theme icon", ICON_32_ATTENTION_PNG_CACHEABLE); - options.put("linktest-target.html", new ClassResource( - "linktest-target.html")); + options.put("linktest-target.html", + new ClassResource("linktest-target.html")); createSelectAction("Link target", category, options, "https://vaadin.com", linkTargetCommand, null); diff --git a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItems.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItems.java index 56e9d1f419..d5864b84e2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItems.java +++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItems.java @@ -97,7 +97,8 @@ public class ListSelectAddRemoveItems extends AbstractTestUIWithLog { addComponent(new Button("Remove middle", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - container.removeItem(container.getIdByIndex(container.size() / 2)); + container.removeItem( + container.getIdByIndex(container.size() / 2)); logContainer(); } })); diff --git a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAllowNewItem.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAllowNewItem.java index 8e74a7a53d..4ada4f12ff 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAllowNewItem.java +++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAllowNewItem.java @@ -9,8 +9,8 @@ public class ListSelectAllowNewItem extends TestBase { @Override protected void setup() { - ListSelect select = new ListSelect("Select", Arrays.asList("Option 1", - "Option 2")); + ListSelect select = new ListSelect("Select", + Arrays.asList("Option 1", "Option 2")); select.setImmediate(true); select.setNewItemsAllowed(true); addComponent(select); diff --git a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.java index b0137c55cf..cf7d12781c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.java +++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.java @@ -11,8 +11,8 @@ public class ListSelectPrimaryStylename extends TestBase { @Override protected void setup() { - final ListSelect list = new ListSelect("Caption", Arrays.asList( - "Option 1", "Option 2", "Option 3")); + final ListSelect list = new ListSelect("Caption", + Arrays.asList("Option 1", "Option 2", "Option 3")); list.setPrimaryStyleName("my-list"); addComponent(list); diff --git a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChanges.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChanges.java index 9518456066..944c7549d3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChanges.java +++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChanges.java @@ -41,8 +41,8 @@ public class ListSelectPushSelectionChanges extends AbstractTestUI { // Option group changes propagate to the list select listSelect.setPropertyDataSource(optionGroup); - final OptionGroup modeSelect = new OptionGroup("Mode", Arrays.asList( - "Single", "Multi")); + final OptionGroup modeSelect = new OptionGroup("Mode", + Arrays.asList("Single", "Multi")); modeSelect.setValue("Single"); modeSelect.addValueChangeListener(new ValueChangeListener() { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormTest.java b/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormTest.java index 629edc2130..4c28bc54dd 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormTest.java @@ -87,8 +87,8 @@ public class LoginFormTest extends TestBase { protected void login(LoginForm loginForm, String user, String password) { VerticalLayout infoLayout = new VerticalLayout(); - Label info = new Label("User '" + user + "', password='" + password - + "' logged in"); + Label info = new Label( + "User '" + user + "', password='" + password + "' logged in"); Button logoutButton = new Button("Log out", new ClickListener() { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.java b/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.java index 58656cb7bf..1f608cad7c 100755 --- a/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.java +++ b/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.java @@ -18,18 +18,18 @@ public class LoginFormUIInLoginHandler extends TestBase { public void onLogin(LoginEvent event) { UI r1 = UI.getCurrent(); if (r1 != null) { - addComponent(new Label("UI.getCurrent().data: " - + r1.getData())); + addComponent( + new Label("UI.getCurrent().data: " + r1.getData())); } else { addComponent(new Label("UI.getCurrent() is null")); } UI r2 = ((LoginForm) event.getSource()).getUI(); if (r2 != null) { - addComponent(new Label("event.getSource().data: " - + r2.getData())); - } else { addComponent(new Label( - "event.getSource().getRoot() is null")); + "event.getSource().data: " + r2.getData())); + } else { + addComponent( + new Label("event.getSource().getRoot() is null")); } } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarNavigation.java index b4e24c60d9..c8814320f0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarNavigation.java +++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarNavigation.java @@ -6,7 +6,8 @@ import com.vaadin.ui.MenuBar; import com.vaadin.ui.MenuBar.Command; import com.vaadin.ui.MenuBar.MenuItem; -public class MenuBarNavigation extends AbstractTestUIWithLog implements Command { +public class MenuBarNavigation extends AbstractTestUIWithLog + implements Command { private MenuItem edit; private MenuItem file; diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java index 0d9c3d8bba..a6b76eb18f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java +++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java @@ -20,7 +20,8 @@ public class MenuBarRunsOutOfBrowser extends AbstractTestCase { MenuBar menuBar = new MenuBar(); menuBar.addItem("Test", new ThemeResource("icons/16/calendar.png"), null); - menuBar.addItem("ABC", new ThemeResource("icons/16/document.png"), null); + menuBar.addItem("ABC", new ThemeResource("icons/16/document.png"), + null); menuBar.addItem("123", new ThemeResource("icons/16/help.png"), null); main.addComponent(menuBar); diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValo.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValo.java index 88d89abbf4..d284b82ba4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValo.java +++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValo.java @@ -28,14 +28,14 @@ public class MenuBarSubmenusClosingValo extends AbstractTestUI { protected void setup(VaadinRequest request) { // here we increase animation time to 1 second for to do auto testing // possible - getPage().getStyles().add( - ".valo .v-menubar-popup[class*=\"animate-in\"] {" + getPage().getStyles() + .add(".valo .v-menubar-popup[class*=\"animate-in\"] {" + "-webkit-animation: valo-overlay-animate-in 1000ms; " + "-moz-animation: valo-overlay-animate-in 1000ms; " + "animation: valo-overlay-animate-in 1000ms;};"); - getPage().getStyles().add( - ".valo .v-menubar-popup[class*=\"animate-out\"] {" + getPage().getStyles() + .add(".valo .v-menubar-popup[class*=\"animate-out\"] {" + "-webkit-animation: valo-animate-out-fade 1000ms; " + "-moz-animation: valo-animate-out-fade 1000ms; " + "animation: valo-animate-out-fade 1000ms;};"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTest.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTest.java index 982b16c6e2..ada6622c98 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTest.java @@ -134,8 +134,8 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { options.put("Every second", 2); options.put("Every third", 3); - createSelectAction("Checkable", category, options, - "No items checkable", setMenuItemCheckableDensity); + createSelectAction("Checkable", category, options, "No items checkable", + setMenuItemCheckableDensity); } /* COMMANDS */ @@ -269,8 +269,8 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { parent.addSeparator(); } - MenuItem subMenuItem = parent.addItem("Sub menu " + parent.getId() - + "/" + (i + 1), menuCommand); + MenuItem subMenuItem = parent.addItem( + "Sub menu " + parent.getId() + "/" + (i + 1), menuCommand); if (disabledDensity != null && i % disabledDensity == 0) { subMenuItem.setEnabled(false); diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java index 16a0896aa2..32c27592c8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java +++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java @@ -44,8 +44,8 @@ public class MenuBarsWithNesting extends AbstractTestUI { public final static String[] itemNames = { "Icon item", "Arrow down", "Arrow up", "Warning" }; private final static Resource[] itemIcons = { - new ThemeResource("window/img/restore.png"), - FontAwesome.ARROW_DOWN, FontAwesome.ARROW_UP, FontAwesome.WARNING }; + new ThemeResource("window/img/restore.png"), FontAwesome.ARROW_DOWN, + FontAwesome.ARROW_UP, FontAwesome.WARNING }; // The last menu item is nested with the following submenu items. public final static String[] nestedItemnames = { "No icon", "Font icon", diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuItemStyleRemoved.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuItemStyleRemoved.java index cf06836f94..8efafa3afa 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuItemStyleRemoved.java +++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuItemStyleRemoved.java @@ -34,8 +34,8 @@ public class MenuItemStyleRemoved extends AbstractTestUI { && webBrowser.getBrowserMajorVersion() == 8) { method = "querySelectorAll('." + MENUITEM_CLASS + "')"; } - JavaScript.getCurrent().execute( - "var x=document." + method + ";" + JavaScript.getCurrent() + .execute("var x=document." + method + ";" + " var i; for(i=0; i < x.length; i++)" + " {x[i].className += ' custom-menu-item'};"); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonClick.java b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonClick.java index b6c80aea0c..22feae52e4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonClick.java +++ b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonClick.java @@ -47,16 +47,16 @@ public class NativeButtonClick extends AbstractTestUI { new NativeButton.ClickListener() { @Override public void buttonClick(ClickEvent event) { - label1.setValue(event.getClientX() + "," - + event.getClientY()); + label1.setValue( + event.getClientX() + "," + event.getClientY()); } }); Button button2 = new NativeButton("Button2", new NativeButton.ClickListener() { @Override public void buttonClick(ClickEvent event) { - label2.setValue(event.getClientX() + "," - + event.getClientY()); + label2.setValue( + event.getClientX() + "," + event.getClientY()); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java index 94023db2d0..c17fa15612 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java +++ b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java @@ -22,8 +22,8 @@ public class NativeButtonHtml extends TestBase { @Override public void buttonClick(ClickEvent event) { - swapButton.setHtmlContentAllowed(!swapButton - .isHtmlContentAllowed()); + swapButton.setHtmlContentAllowed( + !swapButton.isHtmlContentAllowed()); } }); addComponent(swapButton); diff --git a/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonIconAndText.java b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonIconAndText.java index d1a889dcf4..79ee6f79be 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonIconAndText.java +++ b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonIconAndText.java @@ -23,8 +23,8 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.NativeButton; -public class NativeButtonIconAndText extends AbstractTestUI implements - ClickListener { +public class NativeButtonIconAndText extends AbstractTestUI + implements ClickListener { static final String UPDATED_ALTERNATE_TEXT = "Now has alternate text"; static final String INITIAL_ALTERNATE_TEXT = "Initial alternate text"; @@ -43,8 +43,8 @@ public class NativeButtonIconAndText extends AbstractTestUI implements buttonTextIcon.setIcon(new ThemeResource("../runo/icons/64/ok.png")); Button buttonTextIconAlt = new Button("Text icon alt"); - buttonTextIconAlt.setIcon(new ThemeResource( - "../runo/icons/64/cancel.png")); + buttonTextIconAlt + .setIcon(new ThemeResource("../runo/icons/64/cancel.png")); buttonTextIconAlt.setIconAlternateText(INITIAL_ALTERNATE_TEXT); buttonText.addClickListener(this); @@ -62,12 +62,13 @@ public class NativeButtonIconAndText extends AbstractTestUI implements NativeButton nativeButtonText = new NativeButton("Only text"); NativeButton nativeButtonTextIcon = new NativeButton("Text icon"); - nativeButtonTextIcon.setIcon(new ThemeResource( - "../runo/icons/64/ok.png")); + nativeButtonTextIcon + .setIcon(new ThemeResource("../runo/icons/64/ok.png")); - NativeButton nativeButtonTextIconAlt = new NativeButton("Text icon alt"); - nativeButtonTextIconAlt.setIcon(new ThemeResource( - "../runo/icons/64/cancel.png")); + NativeButton nativeButtonTextIconAlt = new NativeButton( + "Text icon alt"); + nativeButtonTextIconAlt + .setIcon(new ThemeResource("../runo/icons/64/cancel.png")); nativeButtonTextIconAlt.setIconAlternateText(INITIAL_ALTERNATE_TEXT); nativeButtonText.addClickListener(this); diff --git a/uitest/src/main/java/com/vaadin/tests/components/notification/Notifications.java b/uitest/src/main/java/com/vaadin/tests/components/notification/Notifications.java index 10fef434ca..91c886e9ac 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/notification/Notifications.java +++ b/uitest/src/main/java/com/vaadin/tests/components/notification/Notifications.java @@ -30,8 +30,8 @@ public class Notifications extends TestBase implements ClickListener { .getItemProperty(CAPTION).setValue("Humanized"); type.addItem(Notification.TYPE_ERROR_MESSAGE).getItemProperty(CAPTION) .setValue("Error"); - type.addItem(Notification.TYPE_WARNING_MESSAGE) - .getItemProperty(CAPTION).setValue("Warning"); + type.addItem(Notification.TYPE_WARNING_MESSAGE).getItemProperty(CAPTION) + .setValue("Warning"); type.addItem(Notification.TYPE_TRAY_NOTIFICATION) .getItemProperty(CAPTION).setValue("Tray"); type.setValue(type.getItemIds().iterator().next()); @@ -53,7 +53,8 @@ public class Notifications extends TestBase implements ClickListener { @Override public void buttonClick(ClickEvent event) { - Notification n = new Notification(tf.getValue(), (Type) type.getValue()); + Notification n = new Notification(tf.getValue(), + (Type) type.getValue()); n.setHtmlContentAllowed(true); n.show(Page.getCurrent()); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java index 4732869a9a..aa4605d9e5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java +++ b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java @@ -10,7 +10,8 @@ import com.vaadin.ui.CheckBox; import com.vaadin.ui.Notification; import com.vaadin.ui.TextArea; -public class NotificationsHtmlAllowed extends TestBase implements ClickListener { +public class NotificationsHtmlAllowed extends TestBase + implements ClickListener { private TextArea messageField; private CheckBox htmlAllowedBox; diff --git a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java index 877f9aa675..0ecf5e6f8d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java +++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java @@ -9,9 +9,9 @@ import com.vaadin.ui.OptionGroup; public class DisabledOptionGroupItems extends ComponentTestCase<OptionGroup> { - private static final List<String> cities = Arrays.asList(new String[] { - "Berlin", "Brussels", "Helsinki", "Madrid", "Oslo", "Paris", - "Stockholm" }); + private static final List<String> cities = Arrays + .asList(new String[] { "Berlin", "Brussels", "Helsinki", "Madrid", + "Oslo", "Paris", "Stockholm" }); private static final String NULL_SELECTION_ID = "Berlin"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java index 213258ed29..b5267781a2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java @@ -22,7 +22,8 @@ public class OptionGroupMultipleValueChange extends TestBase { @Override protected void setup() { final OptionGroup og = new OptionGroup(); - og.addItem("Clicking on the text might cause an extra valuechange event"); + og.addItem( + "Clicking on the text might cause an extra valuechange event"); og.addItem("Second option, same thing"); og.setImmediate(true); addComponent(og); diff --git a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroups.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroups.java index c4c588d1ea..a1c05ad715 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroups.java +++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroups.java @@ -37,8 +37,8 @@ public class OptionGroups extends AbstractSelectTestCase<OptionGroup> { options.put("32x32", ICON_32_ATTENTION_PNG_CACHEABLE); options.put("64x64", ICON_64_EMAIL_REPLY_PNG_CACHEABLE); - createSelectAction(string, CATEGORY_DECORATIONS, options, options - .keySet().iterator().next(), + createSelectAction(string, CATEGORY_DECORATIONS, options, + options.keySet().iterator().next(), new Command<OptionGroup, ThemeResource>() { @Override public void execute(OptionGroup c, ThemeResource icon, diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java index a46fd43af8..499dc83781 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java @@ -106,10 +106,10 @@ public class BoxLayoutTest extends AbstractTestUI { vertical.addValueChangeListener(event -> { view.removeAllComponents(); - view.addComponent(createControls(!vertical.getValue() - .booleanValue())); - view.addComponent(createTestLayout(!vertical.getValue() - .booleanValue())); + view.addComponent( + createControls(!vertical.getValue().booleanValue())); + view.addComponent( + createTestLayout(!vertical.getValue().booleanValue())); view.setExpandRatio(view.getComponent(1), 1); }); @@ -124,7 +124,8 @@ public class BoxLayoutTest extends AbstractTestUI { new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - if (event.getButton().getWidth() == -1) { + if (event.getButton() + .getWidth() == -1) { event.getButton().setHeight("50px"); event.getButton().setWidth("200px"); } else { @@ -147,7 +148,8 @@ public class BoxLayoutTest extends AbstractTestUI { new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - Component last = l.getComponent(l.getComponentCount() - 1); + Component last = l + .getComponent(l.getComponentCount() - 1); l.removeComponent(last); } }); @@ -223,8 +225,8 @@ public class BoxLayoutTest extends AbstractTestUI { align = new NativeSelect(null, alignments); for (Alignment a : alignments) { - align.setItemCaption(a, - a.getVerticalAlignment() + "-" + a.getHorizontalAlignment()); + align.setItemCaption(a, a.getVerticalAlignment() + "-" + + a.getHorizontalAlignment()); } align.setImmediate(true); align.setEnabled(false); @@ -295,8 +297,8 @@ public class BoxLayoutTest extends AbstractTestUI { }); component.addComponent(componentHeight); - componentCaption = new NativeSelect("Caption", Arrays.asList("Short", - "Slightly Longer Caption")); + componentCaption = new NativeSelect("Caption", + Arrays.asList("Short", "Slightly Longer Caption")); componentCaption.setImmediate(true); componentCaption.setEnabled(false); componentCaption.addListener(new ValueChangeListener() { @@ -311,16 +313,17 @@ public class BoxLayoutTest extends AbstractTestUI { }); component.addComponent(componentCaption); - componentIcon = new NativeSelect("Icon", Arrays.asList( - "../runo/icons/16/folder.png", "../runo/icons/32/document.png")); + componentIcon = new NativeSelect("Icon", + Arrays.asList("../runo/icons/16/folder.png", + "../runo/icons/32/document.png")); componentIcon.setImmediate(true); componentIcon.setEnabled(false); componentIcon.addListener(new ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { if (componentIcon.getValue() != null) { - target.setIcon(new ThemeResource(componentIcon.getValue() - .toString())); + target.setIcon(new ThemeResource( + componentIcon.getValue().toString())); } else { target.setIcon(null); } @@ -344,8 +347,8 @@ public class BoxLayoutTest extends AbstractTestUI { componentError.setEnabled(false); componentError.addValueChangeListener(event -> { if (target != null) { - target.setComponentError(componentError.getValue() ? new UserError( - "Error message") : null); + target.setComponentError(componentError.getValue() + ? new UserError("Error message") : null); } }); component.addComponent(componentError); @@ -355,8 +358,8 @@ public class BoxLayoutTest extends AbstractTestUI { componentRequired.setEnabled(false); componentRequired.addValueChangeListener(event -> { if (target != null && target instanceof LegacyAbstractField) { - ((LegacyAbstractField<?>) target).setRequired(componentRequired - .getValue()); + ((LegacyAbstractField<?>) target) + .setRequired(componentRequired.getValue()); } }); component.addComponent(componentRequired); @@ -406,16 +409,16 @@ public class BoxLayoutTest extends AbstractTestUI { expand.setEnabled(target != null); if (target != null) { if (target.getWidth() > -1) { - componentWidth.select(new Float(target.getWidth()) - .intValue() - + target.getWidthUnits().getSymbol()); + componentWidth + .select(new Float(target.getWidth()).intValue() + + target.getWidthUnits().getSymbol()); } else { componentWidth.select(null); } if (target.getHeight() > -1) { - componentHeight.select(new Float(target.getHeight()) - .intValue() - + target.getHeightUnits().getSymbol()); + componentHeight + .select(new Float(target.getHeight()).intValue() + + target.getHeightUnits().getSymbol()); } else { componentHeight.select(null); } @@ -433,8 +436,8 @@ public class BoxLayoutTest extends AbstractTestUI { componentDescription.setValue(target.getDescription()); componentError.setValue(target.getComponentError() != null); if (target instanceof LegacyAbstractField) { - componentRequired.setValue(((LegacyAbstractField<?>) target) - .isRequired()); + componentRequired.setValue( + ((LegacyAbstractField<?>) target).isRequired()); } } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java index 4360ff60d8..17042ca2f3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java @@ -33,8 +33,8 @@ public class ExpandChangeReattach extends AbstractTestUI { Table table = new Table("Table", TestUtils.getISO3166Container()); verticalLayout.addComponent(table); - verticalLayout.addComponent(new Button("Toggle expand logic", - new Button.ClickListener() { + verticalLayout.addComponent( + new Button("Toggle expand logic", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { if (verticalLayout.getHeight() == -1) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java index 420d88af55..bb6efe4699 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java @@ -10,7 +10,8 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.HorizontalLayout; -public class HorizontalLayoutFullsizeContentWithErrorMsg extends AbstractTestUI { +public class HorizontalLayoutFullsizeContentWithErrorMsg + extends AbstractTestUI { static final String FIELD_ID = "f"; static final String BUTTON_ID = "b"; @@ -44,8 +45,8 @@ public class HorizontalLayoutFullsizeContentWithErrorMsg extends AbstractTestUI toggleError.addClickListener(new ClickListener() { @Override public void buttonClick(ClickEvent event) { - tf.setComponentError(tf.getComponentError() == null ? new UserError( - "foo") : null); + tf.setComponentError(tf.getComponentError() == null + ? new UserError("foo") : null); } }); hl.addComponent(toggleError); diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java index d9ab760302..dda071df7c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java @@ -3,8 +3,8 @@ package com.vaadin.tests.components.orderedlayout; import com.vaadin.tests.components.AbstractOrderedLayoutTest; import com.vaadin.ui.HorizontalLayout; -public class HorizontalLayoutTest extends - AbstractOrderedLayoutTest<HorizontalLayout> { +public class HorizontalLayoutTest + extends AbstractOrderedLayoutTest<HorizontalLayout> { @Override protected Class<HorizontalLayout> getTestClass() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java index 8c5953104f..2b050a9c9a 100755 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java @@ -25,7 +25,8 @@ public class HorizontalRelativeSizeWithoutExpand extends UI { verticalLayout1.setSizeFull(); Tree tree = new Tree(); tree.setSizeFull(); - tree.setContainerDataSource(new BeanItemContainer<String>(String.class)); + tree.setContainerDataSource( + new BeanItemContainer<String>(String.class)); String a = "aaaaaaaaaaaaaaaaaaaaaaaa"; String b = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"; String c = "ccccccccccccccccccccccccccccccccccccccccccccccccc"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java index c6b0fa625d..61c09e4a92 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java @@ -67,8 +67,8 @@ public class LayoutClickListenerTest extends TestBase { if (clickedComponent == null) { // Not over any child component - LayoutClickListenerTest.this.addComponent(new Label( - "The click was not over any component.")); + LayoutClickListenerTest.this.addComponent( + new Label("The click was not over any component.")); } else { // Over a child component String message = "The click was over a " diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java index 6235ed9617..5fef63ce86 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java @@ -31,15 +31,13 @@ public class LayoutRenderTimeTest extends LegacyApplication { // row.setWidth("100%"); // row.setSpacing(true); - Embedded icon = new Embedded(null, new ThemeResource( - "../runo/icons/32/document.png")); + Embedded icon = new Embedded(null, + new ThemeResource("../runo/icons/32/document.png")); // row.addComponent(icon); // row.setComponentAlignment(icon, Alignment.MIDDLE_LEFT); - Label text = new Label( - "Row content #" - + i - + ". In pellentesque faucibus vestibulum. Nulla at nulla justo, eget luctus tortor. Nulla facilisi. Duis aliquet."); + Label text = new Label("Row content #" + i + + ". In pellentesque faucibus vestibulum. Nulla at nulla justo, eget luctus tortor. Nulla facilisi. Duis aliquet."); // row.addComponent(text); // row.setExpandRatio(text, 1); diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java index 99c80fe4c1..aa945ce04f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java @@ -32,17 +32,14 @@ public class LayoutResizeTest extends TestBase { left.setSpacing(true); left.setMargin(true); - left.addComponent(new Label("<h2>Layout resize test</h2>", - ContentMode.HTML)); + left.addComponent( + new Label("<h2>Layout resize test</h2>", ContentMode.HTML)); Button resize = new Button("Resize to 700x400", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - event.getButton() - .getUI() - .getPage() - .getJavaScript() + event.getButton().getUI().getPage().getJavaScript() .execute( "setTimeout(function() {window.resizeTo(700,400)}, 500)"); } @@ -52,12 +49,8 @@ public class LayoutResizeTest extends TestBase { resize = new Button("Resize to 900x600", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - event.getButton() - .getUI() - .getPage() - .getJavaScript() - .execute( - "setTimeout(function() {window.resizeTo(900,600)}, 500)"); + event.getButton().getUI().getPage().getJavaScript().execute( + "setTimeout(function() {window.resizeTo(900,600)}, 500)"); } }); left.addComponent(resize); @@ -105,15 +98,13 @@ public class LayoutResizeTest extends TestBase { row.setWidth("100%"); row.setSpacing(true); - Embedded icon = new Embedded(null, new ThemeResource( - "../runo/icons/32/document.png")); + Embedded icon = new Embedded(null, + new ThemeResource("../runo/icons/32/document.png")); row.addComponent(icon); row.setComponentAlignment(icon, Alignment.MIDDLE_LEFT); - Label text = new Label( - "Row content #" - + i - + ". In pellentesque faucibus vestibulum. Nulla at nulla justo, eget luctus tortor. Nulla facilisi. Duis aliquet."); + Label text = new Label("Row content #" + i + + ". In pellentesque faucibus vestibulum. Nulla at nulla justo, eget luctus tortor. Nulla facilisi. Duis aliquet."); row.addComponent(text); row.setExpandRatio(text, 1); diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHover.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHover.java index 59e2b0936a..55226ee500 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHover.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHover.java @@ -30,8 +30,8 @@ public class NestedLayoutCaptionHover extends AbstractTestUI { protected void setup(VaadinRequest request) { VerticalLayout test = new VerticalLayout(); test.setCaption("inner layout"); - addComponent(new VerticalLayout(new VerticalLayout(new VerticalLayout( - test)))); + addComponent(new VerticalLayout( + new VerticalLayout(new VerticalLayout(test)))); } @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java index d7dbe11769..520e2d10d8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java @@ -42,11 +42,12 @@ public class OrderedLayoutCases extends AbstractTestUI { new ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - setHeight(event.getProperty().getValue().toString()); + setHeight( + event.getProperty().getValue().toString()); } }, dimensionValues)); - addComponent(createSimpleSelector("Caption", - new ValueChangeListener() { + addComponent( + createSimpleSelector("Caption", new ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { String value = event.getProperty().getValue() @@ -54,7 +55,8 @@ public class OrderedLayoutCases extends AbstractTestUI { if (value.length() == 0) { setCaption(null); } else if (value.equals("Long")) { - setCaption("A rather long caption just to see what happens"); + setCaption( + "A rather long caption just to see what happens"); } else { setCaption(value); } @@ -133,40 +135,40 @@ public class OrderedLayoutCases extends AbstractTestUI { sizeBar = new HorizontalLayout(); sizeBar.setSpacing(true); - sizeBar.addComponent(createSimpleSelector("Layout width", - new ValueChangeListener() { + sizeBar.addComponent( + createSimpleSelector("Layout width", new ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - currentLayout.setWidth(event.getProperty().getValue() - .toString()); + currentLayout.setWidth( + event.getProperty().getValue().toString()); } }, dimensionValues)); sizeBar.addComponent(createSimpleSelector("Layout height", new ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - currentLayout.setHeight(event.getProperty().getValue() - .toString()); + currentLayout.setHeight( + event.getProperty().getValue().toString()); } }, dimensionValues)); - sizeBar.addComponent(createSimpleSelector("Spacing", - new ValueChangeListener() { + sizeBar.addComponent( + createSimpleSelector("Spacing", new ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - currentLayout.setSpacing(Boolean.parseBoolean(event - .getProperty().getValue().toString())); + currentLayout.setSpacing(Boolean.parseBoolean( + event.getProperty().getValue().toString())); } }, "false", "true")); - sizeBar.addComponent(createSimpleSelector("Margin", - new ValueChangeListener() { + sizeBar.addComponent( + createSimpleSelector("Margin", new ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - currentLayout.setMargin(Boolean.parseBoolean(event - .getProperty().getValue().toString())); + currentLayout.setMargin(Boolean.parseBoolean( + event.getProperty().getValue().toString())); } }, "false", "true")); - sizeBar.addComponent(createSimpleSelector("Direction", - new ValueChangeListener() { + sizeBar.addComponent( + createSimpleSelector("Direction", new ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { Object value = event.getProperty().getValue(); @@ -206,8 +208,8 @@ public class OrderedLayoutCases extends AbstractTestUI { }, "Horizontal", "Vertical")); HorizontalLayout caseBar = new HorizontalLayout(); - caseBar.addComponent(new Button("Undefined without relative", - new ClickListener() { + caseBar.addComponent( + new Button("Undefined without relative", new ClickListener() { @Override public void buttonClick(ClickEvent event) { resetState(); @@ -220,8 +222,8 @@ public class OrderedLayoutCases extends AbstractTestUI { setChildState(2, 2, 2); } })); - caseBar.addComponent(new Button("Undefined with relative", - new ClickListener() { + caseBar.addComponent( + new Button("Undefined with relative", new ClickListener() { @Override public void buttonClick(ClickEvent event) { resetState(); @@ -229,8 +231,8 @@ public class OrderedLayoutCases extends AbstractTestUI { setChildState(1, 0, 4); } })); - caseBar.addComponent(new Button("Fixed with overflow", - new ClickListener() { + caseBar.addComponent( + new Button("Fixed with overflow", new ClickListener() { @Override public void buttonClick(ClickEvent event) { resetState(); @@ -240,8 +242,8 @@ public class OrderedLayoutCases extends AbstractTestUI { setState(sizeBar, 3, 1); } })); - caseBar.addComponent(new Button("Fixed with extra space", - new ClickListener() { + caseBar.addComponent( + new Button("Fixed with extra space", new ClickListener() { @Override public void buttonClick(ClickEvent event) { resetState(); @@ -258,8 +260,8 @@ public class OrderedLayoutCases extends AbstractTestUI { } })); - caseBar.addComponent(new Button("Expand with alignment", - new ClickListener() { + caseBar.addComponent( + new Button("Expand with alignment", new ClickListener() { @Override public void buttonClick(ClickEvent event) { resetState(); @@ -276,8 +278,8 @@ public class OrderedLayoutCases extends AbstractTestUI { } })); - caseBar.addComponent(new Button("Multiple expands", - new ClickListener() { + caseBar.addComponent( + new Button("Multiple expands", new ClickListener() { @Override public void buttonClick(ClickEvent event) { resetState(); @@ -299,8 +301,8 @@ public class OrderedLayoutCases extends AbstractTestUI { } })); - caseBar.addComponent(new Button("Fixed + relative height", - new ClickListener() { + caseBar.addComponent( + new Button("Fixed + relative height", new ClickListener() { @Override public void buttonClick(ClickEvent event) { resetState(); @@ -317,8 +319,8 @@ public class OrderedLayoutCases extends AbstractTestUI { } })); - caseBar.addComponent(new Button("Undefined + relative height", - new ClickListener() { + caseBar.addComponent( + new Button("Undefined + relative height", new ClickListener() { @Override public void buttonClick(ClickEvent event) { resetState(); @@ -331,8 +333,8 @@ public class OrderedLayoutCases extends AbstractTestUI { } })); - caseBar.addComponent(new Button("Undefined + alignments", - new ClickListener() { + caseBar.addComponent( + new Button("Undefined + alignments", new ClickListener() { @Override public void buttonClick(ClickEvent event) { resetState(); @@ -399,12 +401,14 @@ public class OrderedLayoutCases extends AbstractTestUI { } } - private void setChildState(int childIndex, int selectIndex, int valueIndex) { + private void setChildState(int childIndex, int selectIndex, + int valueIndex) { Component child = currentLayout.getComponent(childIndex); setState(child, selectIndex, valueIndex); } - private static void setState(Component container, int selectIndex, int value) { + private static void setState(Component container, int selectIndex, + int value) { NativeSelect select = (NativeSelect) ((AbstractOrderedLayout) container) .getComponent(selectIndex); select.setValue(new ArrayList<Object>(select.getItemIds()).get(value)); diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutComponentOrdering.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutComponentOrdering.java index 5857df20b1..114445c5ba 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutComponentOrdering.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutComponentOrdering.java @@ -54,7 +54,8 @@ public class OrderedLayoutComponentOrdering extends TestBase { move.addClickListener(new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - hl.addComponentAsFirst(hl.getComponent(hl.getComponentCount() - 1)); + hl.addComponentAsFirst( + hl.getComponent(hl.getComponentCount() - 1)); } }); addComponent(move); diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPasses.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPasses.java index 9c54dbab8d..b45a96526a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPasses.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPasses.java @@ -22,7 +22,8 @@ public class OrderedLayoutInfiniteLayoutPasses extends UI { setContent(layout); Styles styles = Page.getCurrent().getStyles(); - styles.add(".my-separator {background-color: lightgray; min-height:2px;max-height:2px} "); + styles.add( + ".my-separator {background-color: lightgray; min-height:2px;max-height:2px} "); } private Button createOpenWindowButton() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/RelativeChildrenWithoutExpand.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/RelativeChildrenWithoutExpand.java index 59447919ef..65a091c7b6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/RelativeChildrenWithoutExpand.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/RelativeChildrenWithoutExpand.java @@ -24,8 +24,8 @@ public class RelativeChildrenWithoutExpand extends AbstractTestUI { setContent(vl); HorizontalLayout verticalExpand = new HorizontalLayout(); - verticalExpand.addComponent(new Button("Add relative child", - new Button.ClickListener() { + verticalExpand.addComponent( + new Button("Add relative child", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { horizontalExpand.addComponent(new Label(loremIpsum), 0); diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java index 6fd7bf362b..70f17600c3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java @@ -43,7 +43,8 @@ public class VaadinTunesLayout extends AbstractTestUI { setContent(rootLayout); // root.showNotification( - // "This is an example of how you can do layouts in Vaadin.<br/>It is not a working sound player.", + // "This is an example of how you can do layouts in Vaadin.<br/>It is + // not a working sound player.", // Notification.TYPE_HUMANIZED_MESSAGE); // Our root window contains one VerticalLayout, let's make @@ -140,7 +141,8 @@ public class VaadinTunesLayout extends AbstractTestUI { // Place all components to the status layout and align them properly status.addComponent(toggleVisualization); - status.setComponentAlignment(toggleVisualization, Alignment.MIDDLE_LEFT); + status.setComponentAlignment(toggleVisualization, + Alignment.MIDDLE_LEFT); status.addComponent(timeFromStart); status.setComponentAlignment(timeFromStart, Alignment.BOTTOM_LEFT); status.addComponent(trackDetails); @@ -243,11 +245,11 @@ public class VaadinTunesLayout extends AbstractTestUI { new NativeSelect()); // Lets populate the table with random data - String[] tracks = new String[] { "Red Flag", "Millstone", - "Not The Sun", "Breath", "Here We Are", "Deep Heaven", - "Her Voice Resides", "Natural Tan", "End It All", "Kings", - "Daylight Slaving", "Mad Man", "Resolve", "Teargas", - "African Air", "Passing Bird" }; + String[] tracks = new String[] { "Red Flag", "Millstone", "Not The Sun", + "Breath", "Here We Are", "Deep Heaven", "Her Voice Resides", + "Natural Tan", "End It All", "Kings", "Daylight Slaving", + "Mad Man", "Resolve", "Teargas", "African Air", + "Passing Bird" }; String[] times = new String[] { "4:12", "6:03", "5:43", "4:32", "3:42", "4:45", "2:56", "9:34", "2:10", "3:44", "5:49", "6:30", "5:18", "7:42", "3:13", "2:52" }; @@ -263,9 +265,8 @@ public class VaadinTunesLayout extends AbstractTestUI { "Frames", "Fortress", "Phobia", "The Poison", "Manifesto", "White Pony", "The Big Dirty" }; String[] genres = new String[] { "Rock", "Metal", "Hardcore", "Indie", - "Pop", "Alternative", "Blues", "Jazz", "Hip Hop", - "Electronica", "Punk", "Hard Rock", "Dance", "R'n'B", "Gospel", - "Country" }; + "Pop", "Alternative", "Blues", "Jazz", "Hip Hop", "Electronica", + "Punk", "Hard Rock", "Dance", "R'n'B", "Gospel", "Country" }; for (int i = 0; i < 1000; i++) { NativeSelect s = new NativeSelect(); s.addItem("1 star"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java index 6909ac06dc..4c8ef34cd2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java @@ -23,8 +23,8 @@ import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.VerticalLayout; -public class VerticalLayoutFocusWithDOMChanges extends AbstractTestUI implements - ValueChangeListener { +public class VerticalLayoutFocusWithDOMChanges extends AbstractTestUI + implements ValueChangeListener { Button dummyButton = new Button("Just a button"); LegacyTextField listenedTextField = new LegacyTextField(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java index 2298364c3f..bdc345fd26 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java @@ -3,8 +3,8 @@ package com.vaadin.tests.components.orderedlayout; import com.vaadin.tests.components.AbstractOrderedLayoutTest; import com.vaadin.ui.VerticalLayout; -public class VerticalLayoutTest extends - AbstractOrderedLayoutTest<VerticalLayout> { +public class VerticalLayoutTest + extends AbstractOrderedLayoutTest<VerticalLayout> { @Override protected Class<VerticalLayout> getTestClass() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java index e0c2aebc4c..677df3e8b9 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java @@ -121,7 +121,8 @@ public class VerticalLayoutWithEmptyLabel extends AbstractTestUI { private final Label myLabel = new Label(""); private final LegacyTextField filterPhoneField = new LegacyTextField( "Foobar Number"); - private final LegacyTextField filterFoobarField = new LegacyTextField("Foobar ID"); + private final LegacyTextField filterFoobarField = new LegacyTextField( + "Foobar ID"); private final CheckBox incomingOnlyField = new CheckBox( "Incoming foobar only"); @@ -146,7 +147,8 @@ public class VerticalLayoutWithEmptyLabel extends AbstractTestUI { this.addComponent(topLayout); // Foobar phone # - final LegacyTextField smsNumber = new LegacyTextField("Foobar Phone #"); + final LegacyTextField smsNumber = new LegacyTextField( + "Foobar Phone #"); smsNumber.setSizeUndefined(); smsNumber.setColumns(12); smsNumber.setMaxLength(16); diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java index 0ac9a008d2..3f22cb5e12 100755 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java @@ -28,7 +28,8 @@ public class VerticalRelativeSizeWithoutExpand extends UI { verticalLayout1.setSizeFull(); Tree tree = new Tree(); tree.setSizeFull(); - tree.setContainerDataSource(new BeanItemContainer<String>(String.class)); + tree.setContainerDataSource( + new BeanItemContainer<String>(String.class)); String a = "aaaaaaaaaaaaaaaaaaaaaaaa"; String b = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"; String c = "ccccccccccccccccccccccccccccccccccccccccccccccccc"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/BasicPanelTest.java b/uitest/src/main/java/com/vaadin/tests/components/panel/BasicPanelTest.java index 9111668dc7..096baad188 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/panel/BasicPanelTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/panel/BasicPanelTest.java @@ -16,7 +16,8 @@ public class BasicPanelTest extends TestBase { private final Label scrollPosition = new Label(); private final Panel panel = new Panel("Panel caption") { @Override - public void changeVariables(Object source, Map<String, Object> variables) { + public void changeVariables(Object source, + Map<String, Object> variables) { super.changeVariables(source, variables); updateLabelText(); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelChangeContents.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelChangeContents.java index 3f953bf73a..bffe4e1e66 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelChangeContents.java +++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelChangeContents.java @@ -25,8 +25,8 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; -public class PanelChangeContents extends AbstractTestUI implements - ClickListener { +public class PanelChangeContents extends AbstractTestUI + implements ClickListener { VerticalLayout stats = new VerticalLayout(); VerticalLayout companies = new VerticalLayout(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java index 1dad8d44b0..7cc1d27e43 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java +++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java @@ -17,10 +17,8 @@ public class PanelClickListenerRelativeCoordinates extends TestBase { @Override public void click(ClickEvent event) { - getMainWindow() - .showNotification( - "" + event.getRelativeX() + ", " - + event.getRelativeY()); + getMainWindow().showNotification("" + event.getRelativeX() + + ", " + event.getRelativeY()); } }); addComponent(panel); diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelConcurrentModificationException.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelConcurrentModificationException.java index e05678b7c8..9aa173f195 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelConcurrentModificationException.java +++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelConcurrentModificationException.java @@ -24,12 +24,12 @@ public class PanelConcurrentModificationException extends TestBase { panelLayout.addComponent(new Label("Label")); } })); - addComponent(new Button("Or click here first", - new Button.ClickListener() { + addComponent( + new Button("Or click here first", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - Notification - .show("It is now safe to click the other button"); + Notification.show( + "It is now safe to click the other button"); } })); addComponent(panel); diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java index a4b02935a2..bc9de8bd64 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java +++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java @@ -70,7 +70,8 @@ public class PanelShouldRemoveActionHandler extends TestBase { public void remove() { panel.setCaption(panel.getCaption() + " - Removed handler"); - panel.removeActionHandler(actionHandlers.remove(actionHandlers.size() - 1)); + panel.removeActionHandler( + actionHandlers.remove(actionHandlers.size() - 1)); } private List<Handler> actionHandlers = new ArrayList<Handler>(); @@ -87,7 +88,8 @@ public class PanelShouldRemoveActionHandler extends TestBase { } @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { getMainWindow().showNotification( "Handling action " + action.getCaption()); } @@ -108,7 +110,8 @@ public class PanelShouldRemoveActionHandler extends TestBase { } @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { getMainWindow().showNotification( "Handling action " + action.getCaption()); } @@ -121,8 +124,8 @@ public class PanelShouldRemoveActionHandler extends TestBase { private void addHandler(Handler actionHandler) { actionHandlers.add(actionHandler); panel.addActionHandler(actionHandler); - panel.setCaption("A panel with " + actionHandlers.size() - + " action handlers"); + panel.setCaption( + "A panel with " + actionHandlers.size() + " action handlers"); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java index 39a88cdc90..2f75b9ed0d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java @@ -4,7 +4,8 @@ import com.vaadin.event.FieldEvents.TextChangeListener; import com.vaadin.tests.components.abstractfield.LegacyAbstractTextFieldTest; import com.vaadin.ui.PasswordField; -public class PasswordFieldTest extends LegacyAbstractTextFieldTest<PasswordField> +public class PasswordFieldTest + extends LegacyAbstractTextFieldTest<PasswordField> implements TextChangeListener { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/DisabledPopupView.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/DisabledPopupView.java index ecce1781a5..cc732f1c82 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/popupview/DisabledPopupView.java +++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/DisabledPopupView.java @@ -9,7 +9,8 @@ public class DisabledPopupView extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - PopupView popupView = new PopupView("Disabled Popup", new Button("Hi!")); + PopupView popupView = new PopupView("Disabled Popup", + new Button("Hi!")); popupView.setEnabled(false); diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java index a5441f38b1..24b32a9c96 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java +++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java @@ -24,8 +24,8 @@ public class PopupViewClickShortcut extends TestBase { sub.center(); getMainWindow().addWindow(sub); addComponent(log); - addComponent(new PopupView("Show popup table", makeTable("Popup", - KeyCode.P))); + addComponent(new PopupView("Show popup table", + makeTable("Popup", KeyCode.P))); addComponent(makeTable("Main window", KeyCode.M)); ((ComponentContainer) sub.getContent()).addComponent(new PopupView( "Show popup table", makeTable("Subwindow popup", KeyCode.U))); @@ -45,17 +45,18 @@ public class PopupViewClickShortcut extends TestBase { l.setCaption(caption); l.setWidth(null); - Button b = new Button("Submit " + caption + " (Ctrl+Alt+" - + (char) keyCode + ")", new Button.ClickListener() { - private int i = 5; + Button b = new Button( + "Submit " + caption + " (Ctrl+Alt+" + (char) keyCode + ")", + new Button.ClickListener() { + private int i = 5; - @Override - public void buttonClick(ClickEvent event) { - log.log("Submitted from " - + event.getButton().getParent().getCaption()); - t.addItem(new String[] { "added " + i++ }, i); - } - }); + @Override + public void buttonClick(ClickEvent event) { + log.log("Submitted from " + + event.getButton().getParent().getCaption()); + t.addItem(new String[] { "added " + i++ }, i); + } + }); b.setClickShortcut(keyCode, ModifierKey.CTRL, ModifierKey.ALT); diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.java index d19f98124e..08cc060191 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.java +++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.java @@ -11,8 +11,8 @@ public class PopupViewInEmbeddedApplication extends TestBase { @Override protected void setup() { - PopupView pop = new PopupView("Click me!", new Label( - "I popped up, woohoo!")); + PopupView pop = new PopupView("Click me!", + new Label("I popped up, woohoo!")); addComponent(pop); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewLabelResized.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewLabelResized.java index 2776c63e9f..43e3aebb06 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewLabelResized.java +++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewLabelResized.java @@ -26,10 +26,10 @@ public class PopupViewLabelResized extends TestBase { gl.addComponent(expander, 1, 0); gl.setColumnExpandRatio(1, 1); - gl.addComponent( - new PopupView("Click here to popup", new Label("test")), 0, 0); - gl.addComponent( - new PopupView("Click here to popup", new Label("test")), 2, 0); + gl.addComponent(new PopupView("Click here to popup", new Label("test")), + 0, 0); + gl.addComponent(new PopupView("Click here to popup", new Label("test")), + 2, 0); addComponent(gl); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java index 8846b66125..2270da827c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java +++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java @@ -27,15 +27,14 @@ public class PopupViewNullValues extends TestBase { }); } catch (Exception e) { - getMainWindow() - .showNotification( - "Error, 'null content' should not throw an exception at this point", - Notification.TYPE_ERROR_MESSAGE); + getMainWindow().showNotification( + "Error, 'null content' should not throw an exception at this point", + Notification.TYPE_ERROR_MESSAGE); } try { - pv[1] = new PopupView(null, new LegacyTextField( - "Empty html, contains component")); + pv[1] = new PopupView(null, + new LegacyTextField("Empty html, contains component")); addComponent(pv[1]); b[1] = new Button("Open popupview 2", new ClickListener() { @@ -46,10 +45,9 @@ public class PopupViewNullValues extends TestBase { }); } catch (Exception e) { - getMainWindow() - .showNotification( - "Error, 'null html', should not throw an exception at this point", - Notification.TYPE_ERROR_MESSAGE); + getMainWindow().showNotification( + "Error, 'null html', should not throw an exception at this point", + Notification.TYPE_ERROR_MESSAGE); } try { @@ -64,14 +62,13 @@ public class PopupViewNullValues extends TestBase { }); } catch (Exception e) { - getMainWindow() - .showNotification( - "Error, 'null html, null content', should not throw an exception at this point", - Notification.TYPE_ERROR_MESSAGE); + getMainWindow().showNotification( + "Error, 'null html, null content', should not throw an exception at this point", + Notification.TYPE_ERROR_MESSAGE); } try { - pv[3] = new PopupView("Popupview 4 - has component", new LegacyTextField( - "This is the content of popupview 4")); + pv[3] = new PopupView("Popupview 4 - has component", + new LegacyTextField("This is the content of popupview 4")); addComponent(pv[3]); b[3] = new Button("Open popupview 4", new ClickListener() { @@ -82,10 +79,9 @@ public class PopupViewNullValues extends TestBase { }); } catch (Exception e) { - getMainWindow() - .showNotification( - "Error, 'null html, null content', should not throw an exception at this point", - Notification.TYPE_ERROR_MESSAGE); + getMainWindow().showNotification( + "Error, 'null html, null content', should not throw an exception at this point", + Notification.TYPE_ERROR_MESSAGE); } addComponent(b[0]); diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/ReopenPopupView.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/ReopenPopupView.java index 979bafc688..f497724a42 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/popupview/ReopenPopupView.java +++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/ReopenPopupView.java @@ -28,8 +28,8 @@ public class ReopenPopupView extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { addComponent(log); - addComponent(new PopupView("PopupView", new Button("Button", - new Button.ClickListener() { + addComponent(new PopupView("PopupView", + new Button("Button", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { log.log("Button clicked"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java index c98f580ae2..470f793a04 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java @@ -5,7 +5,8 @@ import java.util.LinkedHashMap; import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest; import com.vaadin.ui.ProgressBar; -public class ProgressBarGenericTest extends LegacyAbstractFieldTest<ProgressBar> { +public class ProgressBarGenericTest + extends LegacyAbstractFieldTest<ProgressBar> { private Command<ProgressBar, Boolean> indeterminate = new Command<ProgressBar, Boolean>() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarTest.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarTest.java index ce51184e7d..19e033088f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarTest.java @@ -65,8 +65,8 @@ public class ProgressBarTest extends AbstractTestUI { } })); - addComponent(new Button("Use ProgressIndicator", - new Button.ClickListener() { + addComponent( + new Button("Use ProgressIndicator", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { useComponent(new ProgressIndicator()); diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java index 4542d0c6c8..6bb9c73411 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java +++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java @@ -25,8 +25,8 @@ public class ProgressIndicatorInvisible extends TestBase { @Override public void buttonClick(ClickEvent event) { pi.setVisible(!pi.isVisible()); - event.getButton().setCaption( - (pi.isVisible() ? "Hide" : "Show") + event.getButton() + .setCaption((pi.isVisible() ? "Hide" : "Show") + " progress indicator"); } @@ -47,19 +47,19 @@ public class ProgressIndicatorInvisible extends TestBase { }); addComponent(disableProgressIndicator); - Button removeProgressIndicator = new Button( - "Remove progress indicator", new ClickListener() { + Button removeProgressIndicator = new Button("Remove progress indicator", + new ClickListener() { @Override public void buttonClick(ClickEvent event) { if (pi.getParent() != null) { lo.removeComponent(pi); - event.getButton().setCaption( - "Add progress indicator"); + event.getButton() + .setCaption("Add progress indicator"); } else { lo.addComponent(pi); - event.getButton().setCaption( - "Remove progress indicator"); + event.getButton() + .setCaption("Remove progress indicator"); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorTest.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorTest.java index 3590881efa..d5c5a523d7 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorTest.java @@ -20,7 +20,8 @@ import java.util.LinkedHashMap; import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest; import com.vaadin.ui.ProgressIndicator; -public class ProgressIndicatorTest extends LegacyAbstractFieldTest<ProgressIndicator> { +public class ProgressIndicatorTest + extends LegacyAbstractFieldTest<ProgressIndicator> { ProgressIndicator progress = new ProgressIndicator(); Command<ProgressIndicator, Float> setValueCommand = new Command<ProgressIndicator, Float>() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java b/uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java index c406dcd749..cd9abc369e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java +++ b/uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java @@ -15,8 +15,8 @@ import com.vaadin.server.Resource; import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest; import com.vaadin.ui.AbstractSelect; -public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends - LegacyAbstractFieldTest<T> implements ItemClickListener { +public abstract class AbstractSelectTestCase<T extends AbstractSelect> + extends LegacyAbstractFieldTest<T> implements ItemClickListener { public static final String CATEGORY_DATA_SOURCE = "Data source"; @@ -67,7 +67,8 @@ public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends } protected void createMultiSelectCheckbox(String category) { - createBooleanAction("Multi select", category, false, multiselectCommand); + createBooleanAction("Multi select", category, false, + multiselectCommand); } @@ -101,8 +102,8 @@ public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends for (int i = 1; i <= items; i++) { Item item = c.addItem("Item " + i); for (int j = 1; j <= properties; j++) { - item.getItemProperty("Property " + j).setValue( - "Item " + i + "," + j); + item.getItemProperty("Property " + j) + .setValue("Item " + i + "," + j); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/OptionGroupBaseSelects.java b/uitest/src/main/java/com/vaadin/tests/components/select/OptionGroupBaseSelects.java index 33edc470c7..64714cba70 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/select/OptionGroupBaseSelects.java +++ b/uitest/src/main/java/com/vaadin/tests/components/select/OptionGroupBaseSelects.java @@ -10,7 +10,8 @@ import com.vaadin.ui.NativeSelect; import com.vaadin.ui.OptionGroup; import com.vaadin.ui.TwinColSelect; -public class OptionGroupBaseSelects extends ComponentTestCase<HorizontalLayout> { +public class OptionGroupBaseSelects + extends ComponentTestCase<HorizontalLayout> { private HorizontalLayout layout; @@ -50,31 +51,32 @@ public class OptionGroupBaseSelects extends ComponentTestCase<HorizontalLayout> layout = new HorizontalLayout(); layout.setSpacing(true); - layout.addComponent(createSelect( - new ListSelect("List Select, enabled"), true)); - layout.addComponent(createSelect( - new ListSelect("List Select, disabled"), false)); + layout.addComponent( + createSelect(new ListSelect("List Select, enabled"), true)); + layout.addComponent( + createSelect(new ListSelect("List Select, disabled"), false)); - layout.addComponent(createSelect(new NativeSelect( - "Native Select, enabled"), true)); - layout.addComponent(createSelect(new NativeSelect( - "Native Select, disabled"), false)); + layout.addComponent( + createSelect(new NativeSelect("Native Select, enabled"), true)); + layout.addComponent(createSelect( + new NativeSelect("Native Select, disabled"), false)); - layout.addComponent(createSelect(new OptionGroup( - "Option Group, enabled"), true)); - layout.addComponent(createSelect(new OptionGroup( - "Option Group, disabled"), false)); + layout.addComponent( + createSelect(new OptionGroup("Option Group, enabled"), true)); + layout.addComponent( + createSelect(new OptionGroup("Option Group, disabled"), false)); - layout.addComponent(createSelect(new TwinColSelect( - "Twin Column Select, enabled"), true)); - layout.addComponent(createSelect(new TwinColSelect( - "Twin Column Select, disabled"), false)); + layout.addComponent(createSelect( + new TwinColSelect("Twin Column Select, enabled"), true)); + layout.addComponent(createSelect( + new TwinColSelect("Twin Column Select, disabled"), false)); addTestComponent(layout); } - private AbstractSelect createSelect(AbstractSelect select, boolean enabled) { + private AbstractSelect createSelect(AbstractSelect select, + boolean enabled) { select.addContainerProperty(CAPTION, String.class, null); for (int i = 0; i < 10; i++) { select.addItem("" + i).getItemProperty(CAPTION) diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/SelectDisplaysOldValue.java b/uitest/src/main/java/com/vaadin/tests/components/select/SelectDisplaysOldValue.java index 77c187ff60..a7752f6033 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/select/SelectDisplaysOldValue.java +++ b/uitest/src/main/java/com/vaadin/tests/components/select/SelectDisplaysOldValue.java @@ -75,7 +75,8 @@ public class SelectDisplaysOldValue extends TestBase { } private void buildSlaveDropdown(Integer masterId) { - IndexedContainer slaveOptionContainer = initSlaveOptionContainer(masterId); + IndexedContainer slaveOptionContainer = initSlaveOptionContainer( + masterId); slaveComboBox = new Select(SLAVE_COMBO_BOX_CAPTION, slaveOptionContainer); configureSlaveOptionDropdown(); @@ -91,8 +92,8 @@ public class SelectDisplaysOldValue extends TestBase { for (Integer optionId : controllerOptionMap.keySet()) { itemAdded = containerToReturn.addItem(optionId); - itemAdded.getItemProperty(NAME_PROPERTY_ID).setValue( - controllerOptionMap.get(optionId)); + itemAdded.getItemProperty(NAME_PROPERTY_ID) + .setValue(controllerOptionMap.get(optionId)); } return containerToReturn; @@ -139,12 +140,13 @@ public class SelectDisplaysOldValue extends TestBase { System.out.println("Slave value: " + slaveComboBox.getValue()); } - private class ControllerUpdatedListener implements - Property.ValueChangeListener { + private class ControllerUpdatedListener + implements Property.ValueChangeListener { @Override - public void valueChange(Property.ValueChangeEvent valueChangeEvent) { - refreshSlaveDropdown((Integer) valueChangeEvent.getProperty() - .getValue()); + public void valueChange( + Property.ValueChangeEvent valueChangeEvent) { + refreshSlaveDropdown( + (Integer) valueChangeEvent.getProperty().getValue()); } } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/SelectIconPlacement.java b/uitest/src/main/java/com/vaadin/tests/components/select/SelectIconPlacement.java index 0cba74b941..0b3301bb4e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/select/SelectIconPlacement.java +++ b/uitest/src/main/java/com/vaadin/tests/components/select/SelectIconPlacement.java @@ -19,8 +19,8 @@ public class SelectIconPlacement extends TestBase { mySelect = new Select("Width: " + (width == null ? "auto" : width)); String bar = "Only item"; mySelect.addItem(bar); - mySelect.setItemIcon(bar, new ThemeResource("common/icons/" + icon - + "?w=" + width)); + mySelect.setItemIcon(bar, + new ThemeResource("common/icons/" + icon + "?w=" + width)); mySelect.select(bar); mySelect.setWidth(width); addComponent(mySelect); diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/StylingPopupOpener.java b/uitest/src/main/java/com/vaadin/tests/components/select/StylingPopupOpener.java index b97231ae8e..baa06b86a8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/select/StylingPopupOpener.java +++ b/uitest/src/main/java/com/vaadin/tests/components/select/StylingPopupOpener.java @@ -10,10 +10,8 @@ public class StylingPopupOpener extends TestBase { @Override protected void setup() { - TestUtils - .injectCSS( - getMainWindow(), - ".v-filterselect-mystyle .v-filterselect-button { width: 50px; background-color: red; } "); + TestUtils.injectCSS(getMainWindow(), + ".v-filterselect-mystyle .v-filterselect-button { width: 50px; background-color: red; } "); final Select select = new Select(); addComponent(select); diff --git a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderPrimaryStyleName.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderPrimaryStyleName.java index 00e1713222..1c0716fdce 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderPrimaryStyleName.java +++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderPrimaryStyleName.java @@ -14,8 +14,8 @@ public class SliderPrimaryStyleName extends TestBase { slider.setPrimaryStyleName("my-slider"); addComponent(slider); - addComponent(new Button("Change primary style", - new Button.ClickListener() { + addComponent( + new Button("Change primary style", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { slider.setPrimaryStyleName("my-second-slider"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java index 7c0648876b..5fa6860c34 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java @@ -8,17 +8,19 @@ import com.vaadin.ui.AbstractSplitPanel.SplitterClickEvent; import com.vaadin.ui.AbstractSplitPanel.SplitterClickListener; public abstract class AbstractSplitPanelTest<T extends AbstractSplitPanel> - extends AbstractComponentContainerTest<T> implements - SplitterClickListener { + extends AbstractComponentContainerTest<T> + implements SplitterClickListener { private Command<T, Boolean> splitterClickListenerCommand = new Command<T, Boolean>() { @Override public void execute(T c, Boolean value, Object data) { if (value) { - c.addListener((SplitterClickListener) AbstractSplitPanelTest.this); + c.addListener( + (SplitterClickListener) AbstractSplitPanelTest.this); } else { - c.removeListener((SplitterClickListener) AbstractSplitPanelTest.this); + c.removeListener( + (SplitterClickListener) AbstractSplitPanelTest.this); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeight.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeight.java index 4da5430cb1..dd5b4e8c1d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeight.java +++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeight.java @@ -35,7 +35,8 @@ public class HorizontalSplitPanelHeight extends AbstractTestUI { getLayout().setMargin(new MarginInfo(true, false, false, false)); HorizontalSplitPanel panel = new HorizontalSplitPanel(); - panel.setCaption("Horizontal 1 - no first component, label as second component"); + panel.setCaption( + "Horizontal 1 - no first component, label as second component"); panel.setId("Horizontal 1"); Label label = new Label("Label"); label.addStyleName("target"); @@ -44,7 +45,8 @@ public class HorizontalSplitPanelHeight extends AbstractTestUI { addComponent(panel); panel = new HorizontalSplitPanel(); - panel.setCaption("Horizontal 2 - button as first component, label as second component"); + panel.setCaption( + "Horizontal 2 - button as first component, label as second component"); panel.setId("Horizontal 2"); label = new Label("Label"); label.addStyleName("target"); @@ -54,7 +56,8 @@ public class HorizontalSplitPanelHeight extends AbstractTestUI { addComponent(panel); panel = new HorizontalSplitPanel(); - panel.setCaption("Horizontal 3 - fixed height, no first component, label as second component"); + panel.setCaption( + "Horizontal 3 - fixed height, no first component, label as second component"); panel.setId("Horizontal 3"); label = new Label("Label"); label.addStyleName("target"); @@ -64,7 +67,8 @@ public class HorizontalSplitPanelHeight extends AbstractTestUI { addComponent(panel); VerticalSplitPanel vPanel = new VerticalSplitPanel(); - vPanel.setCaption("Vertical 1 - no first component, label as second component"); + vPanel.setCaption( + "Vertical 1 - no first component, label as second component"); vPanel.setId("Vertical 1"); vPanel.setHeight(100, Unit.PIXELS); Label vLabel = new Label("Label"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java index a330581f22..a9c2d6bb6f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java +++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java @@ -2,8 +2,8 @@ package com.vaadin.tests.components.splitpanel; import com.vaadin.ui.HorizontalSplitPanel; -public class HorizontalSplitPanels extends - AbstractSplitPanelTest<HorizontalSplitPanel> { +public class HorizontalSplitPanels + extends AbstractSplitPanelTest<HorizontalSplitPanel> { @Override protected Class<HorizontalSplitPanel> getTestClass() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java index 7328983f21..3025da57e7 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java +++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java @@ -10,8 +10,8 @@ import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.NativeButton; -public class SplitPanelExtraScrollbars extends AbstractTestCase implements - ClickListener { +public class SplitPanelExtraScrollbars extends AbstractTestCase + implements ClickListener { private HorizontalSplitPanel sp; private HorizontalLayout hl; diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java index eb1fee145d..f8f56f17d6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java +++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java @@ -45,8 +45,8 @@ public class SplitPanelSplitterWidth extends TestBase { p.setSizeFull(); split2.addComponent(p); - getLayout().addComponent( - new Button("Unlock", new Button.ClickListener() { + getLayout() + .addComponent(new Button("Unlock", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java index 3359ec0559..6e4fd58391 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java +++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java @@ -21,10 +21,10 @@ public class SplitPanelWithMinimumAndMaximum extends AbstractTestUI { horizontalSplitsLayout.setCaption("Horizontal splits"); HorizontalSplitPanel percentagePositionWithPercentageLimitsHorizontal = new HorizontalSplitPanel(); - percentagePositionWithPercentageLimitsHorizontal.setMinSplitPosition( - 10, Sizeable.UNITS_PERCENTAGE); - percentagePositionWithPercentageLimitsHorizontal.setMaxSplitPosition( - 80, Sizeable.UNITS_PERCENTAGE); + percentagePositionWithPercentageLimitsHorizontal.setMinSplitPosition(10, + Sizeable.UNITS_PERCENTAGE); + percentagePositionWithPercentageLimitsHorizontal.setMaxSplitPosition(80, + Sizeable.UNITS_PERCENTAGE); percentagePositionWithPercentageLimitsHorizontal .setFirstComponent(new Label("Min 10 % - 50 % position")); percentagePositionWithPercentageLimitsHorizontal @@ -53,10 +53,10 @@ public class SplitPanelWithMinimumAndMaximum extends AbstractTestUI { Sizeable.UNITS_PIXELS); pixelPositionWithPixelLimitsHorizontal.setMaxSplitPosition(550, Sizeable.UNITS_PIXELS); - pixelPositionWithPixelLimitsHorizontal.setFirstComponent(new Label( - "Min 100 px - 400 px position")); - pixelPositionWithPixelLimitsHorizontal.setSecondComponent(new Label( - "Max 550 px")); + pixelPositionWithPixelLimitsHorizontal + .setFirstComponent(new Label("Min 100 px - 400 px position")); + pixelPositionWithPixelLimitsHorizontal + .setSecondComponent(new Label("Max 550 px")); pixelPositionWithPixelLimitsHorizontal.setSplitPosition(400, Sizeable.UNITS_PIXELS); horizontalSplitsLayout @@ -82,38 +82,36 @@ public class SplitPanelWithMinimumAndMaximum extends AbstractTestUI { percentagePositionWithPercentageLimitsHorizontalResersed .setMaxSplitPosition(80, Sizeable.UNITS_PERCENTAGE); percentagePositionWithPercentageLimitsHorizontalResersed - .setFirstComponent(new Label( - "Max 80 % - Reversed 50 % position")); + .setFirstComponent( + new Label("Max 80 % - Reversed 50 % position")); percentagePositionWithPercentageLimitsHorizontalResersed .setSecondComponent(new Label("Min 10 %")); percentagePositionWithPercentageLimitsHorizontalResersed .setSplitPosition(50, Sizeable.UNITS_PERCENTAGE, true); - horizontalSplitsLayout - .addComponent(percentagePositionWithPercentageLimitsHorizontalResersed); + horizontalSplitsLayout.addComponent( + percentagePositionWithPercentageLimitsHorizontalResersed); HorizontalSplitPanel pixelPositionWithPercentageLimitsHorizontalResersed = new HorizontalSplitPanel(); pixelPositionWithPercentageLimitsHorizontalResersed .setMinSplitPosition(10, Sizeable.UNITS_PERCENTAGE); pixelPositionWithPercentageLimitsHorizontalResersed .setMaxSplitPosition(80, Sizeable.UNITS_PERCENTAGE); - pixelPositionWithPercentageLimitsHorizontalResersed - .setFirstComponent(new Label( - "Max 80 % - Reversed 400 px position")); + pixelPositionWithPercentageLimitsHorizontalResersed.setFirstComponent( + new Label("Max 80 % - Reversed 400 px position")); pixelPositionWithPercentageLimitsHorizontalResersed .setSecondComponent(new Label("Min 10 %")); - pixelPositionWithPercentageLimitsHorizontalResersed.setSplitPosition( - 400, Sizeable.UNITS_PIXELS, true); - horizontalSplitsLayout - .addComponent(pixelPositionWithPercentageLimitsHorizontalResersed); + pixelPositionWithPercentageLimitsHorizontalResersed + .setSplitPosition(400, Sizeable.UNITS_PIXELS, true); + horizontalSplitsLayout.addComponent( + pixelPositionWithPercentageLimitsHorizontalResersed); HorizontalSplitPanel pixelPositionWithPixelLimitsHorizontalResersed = new HorizontalSplitPanel(); pixelPositionWithPixelLimitsHorizontalResersed.setMinSplitPosition(100, Sizeable.UNITS_PIXELS); pixelPositionWithPixelLimitsHorizontalResersed.setMaxSplitPosition(550, Sizeable.UNITS_PIXELS); - pixelPositionWithPixelLimitsHorizontalResersed - .setFirstComponent(new Label( - "Max 550 px - Reversed 400 px position")); + pixelPositionWithPixelLimitsHorizontalResersed.setFirstComponent( + new Label("Max 550 px - Reversed 400 px position")); pixelPositionWithPixelLimitsHorizontalResersed .setSecondComponent(new Label("Min 100 px")); pixelPositionWithPixelLimitsHorizontalResersed.setSplitPosition(400, @@ -126,15 +124,14 @@ public class SplitPanelWithMinimumAndMaximum extends AbstractTestUI { .setMinSplitPosition(100, Sizeable.UNITS_PIXELS); percentagePositionWithPixelLimitsHorizontalResersed .setMaxSplitPosition(550, Sizeable.UNITS_PIXELS); - percentagePositionWithPixelLimitsHorizontalResersed - .setFirstComponent(new Label( - "Max 550 px - Reversed 30 % position")); + percentagePositionWithPixelLimitsHorizontalResersed.setFirstComponent( + new Label("Max 550 px - Reversed 30 % position")); percentagePositionWithPixelLimitsHorizontalResersed .setSecondComponent(new Label("Min 100 px")); - percentagePositionWithPixelLimitsHorizontalResersed.setSplitPosition( - 30, Sizeable.UNITS_PERCENTAGE, true); - horizontalSplitsLayout - .addComponent(percentagePositionWithPixelLimitsHorizontalResersed); + percentagePositionWithPixelLimitsHorizontalResersed.setSplitPosition(30, + Sizeable.UNITS_PERCENTAGE, true); + horizontalSplitsLayout.addComponent( + percentagePositionWithPixelLimitsHorizontalResersed); horizontalSplitsLayout.setSizeFull(); tabs.addComponent(horizontalSplitsLayout); @@ -161,10 +158,10 @@ public class SplitPanelWithMinimumAndMaximum extends AbstractTestUI { Sizeable.UNITS_PERCENTAGE); pixelPositionWithPercentageLimitsVertical.setMaxSplitPosition(80, Sizeable.UNITS_PERCENTAGE); - pixelPositionWithPercentageLimitsVertical.setFirstComponent(new Label( - "Min 10 % - 400 px position")); - pixelPositionWithPercentageLimitsVertical.setSecondComponent(new Label( - "Max 80 %")); + pixelPositionWithPercentageLimitsVertical + .setFirstComponent(new Label("Min 10 % - 400 px position")); + pixelPositionWithPercentageLimitsVertical + .setSecondComponent(new Label("Max 80 %")); pixelPositionWithPercentageLimitsVertical.setSplitPosition(400, Sizeable.UNITS_PIXELS); verticalSplitsLayout @@ -175,10 +172,10 @@ public class SplitPanelWithMinimumAndMaximum extends AbstractTestUI { Sizeable.UNITS_PIXELS); pixelPositionWithPixelLimitsVertical.setMaxSplitPosition(450, Sizeable.UNITS_PIXELS); - pixelPositionWithPixelLimitsVertical.setFirstComponent(new Label( - "Min 100 px - 400 px position")); - pixelPositionWithPixelLimitsVertical.setSecondComponent(new Label( - "Max 450 px")); + pixelPositionWithPixelLimitsVertical + .setFirstComponent(new Label("Min 100 px - 400 px position")); + pixelPositionWithPixelLimitsVertical + .setSecondComponent(new Label("Max 450 px")); pixelPositionWithPixelLimitsVertical.setSplitPosition(400, Sizeable.UNITS_PIXELS); verticalSplitsLayout.addComponent(pixelPositionWithPixelLimitsVertical); @@ -188,10 +185,10 @@ public class SplitPanelWithMinimumAndMaximum extends AbstractTestUI { Sizeable.UNITS_PIXELS); percentagePositionWithPixelLimitsVertical.setMaxSplitPosition(450, Sizeable.UNITS_PIXELS); - percentagePositionWithPixelLimitsVertical.setFirstComponent(new Label( - "Min 100 px - 30 % position")); - percentagePositionWithPixelLimitsVertical.setSecondComponent(new Label( - "Max 450 px")); + percentagePositionWithPixelLimitsVertical + .setFirstComponent(new Label("Min 100 px - 30 % position")); + percentagePositionWithPixelLimitsVertical + .setSecondComponent(new Label("Max 450 px")); percentagePositionWithPixelLimitsVertical.setSplitPosition(30, Sizeable.UNITS_PERCENTAGE); verticalSplitsLayout @@ -203,38 +200,36 @@ public class SplitPanelWithMinimumAndMaximum extends AbstractTestUI { percentagePositionWithPercentageLimitsVerticalReversed .setMaxSplitPosition(80, Sizeable.UNITS_PERCENTAGE); percentagePositionWithPercentageLimitsVerticalReversed - .setFirstComponent(new Label( - "Max 80 % - Reversed 50 % position")); + .setFirstComponent( + new Label("Max 80 % - Reversed 50 % position")); percentagePositionWithPercentageLimitsVerticalReversed .setSecondComponent(new Label("Min 10 %")); percentagePositionWithPercentageLimitsVerticalReversed .setSplitPosition(50, Sizeable.UNITS_PERCENTAGE, true); - verticalSplitsLayout - .addComponent(percentagePositionWithPercentageLimitsVerticalReversed); + verticalSplitsLayout.addComponent( + percentagePositionWithPercentageLimitsVerticalReversed); VerticalSplitPanel pixelPositionWithPercentageLimitsVerticalReversed = new VerticalSplitPanel(); - pixelPositionWithPercentageLimitsVerticalReversed.setMinSplitPosition( - 10, Sizeable.UNITS_PERCENTAGE); - pixelPositionWithPercentageLimitsVerticalReversed.setMaxSplitPosition( - 80, Sizeable.UNITS_PERCENTAGE); pixelPositionWithPercentageLimitsVerticalReversed - .setFirstComponent(new Label( - "Max 80 % - Reversed 400 px position")); + .setMinSplitPosition(10, Sizeable.UNITS_PERCENTAGE); + pixelPositionWithPercentageLimitsVerticalReversed + .setMaxSplitPosition(80, Sizeable.UNITS_PERCENTAGE); + pixelPositionWithPercentageLimitsVerticalReversed.setFirstComponent( + new Label("Max 80 % - Reversed 400 px position")); pixelPositionWithPercentageLimitsVerticalReversed .setSecondComponent(new Label("Min 10 %")); pixelPositionWithPercentageLimitsVerticalReversed.setSplitPosition(400, Sizeable.UNITS_PIXELS, true); - verticalSplitsLayout - .addComponent(pixelPositionWithPercentageLimitsVerticalReversed); + verticalSplitsLayout.addComponent( + pixelPositionWithPercentageLimitsVerticalReversed); VerticalSplitPanel pixelPositionWithPixelLimitsVerticalReversed = new VerticalSplitPanel(); pixelPositionWithPixelLimitsVerticalReversed.setMinSplitPosition(100, Sizeable.UNITS_PIXELS); pixelPositionWithPixelLimitsVerticalReversed.setMaxSplitPosition(400, Sizeable.UNITS_PIXELS); - pixelPositionWithPixelLimitsVerticalReversed - .setFirstComponent(new Label( - "Max 400 px - Reversed 300 px position")); + pixelPositionWithPixelLimitsVerticalReversed.setFirstComponent( + new Label("Max 400 px - Reversed 300 px position")); pixelPositionWithPixelLimitsVerticalReversed .setSecondComponent(new Label("Min 100 px")); pixelPositionWithPixelLimitsVerticalReversed.setSplitPosition(300, @@ -243,19 +238,18 @@ public class SplitPanelWithMinimumAndMaximum extends AbstractTestUI { .addComponent(pixelPositionWithPixelLimitsVerticalReversed); VerticalSplitPanel percentagePositionWithPixelLimitsVerticalReversed = new VerticalSplitPanel(); - percentagePositionWithPixelLimitsVerticalReversed.setMinSplitPosition( - 100, Sizeable.UNITS_PIXELS); - percentagePositionWithPixelLimitsVerticalReversed.setMaxSplitPosition( - 400, Sizeable.UNITS_PIXELS); percentagePositionWithPixelLimitsVerticalReversed - .setFirstComponent(new Label( - "Max 400 px - Reversed 30 % position")); + .setMinSplitPosition(100, Sizeable.UNITS_PIXELS); + percentagePositionWithPixelLimitsVerticalReversed + .setMaxSplitPosition(400, Sizeable.UNITS_PIXELS); + percentagePositionWithPixelLimitsVerticalReversed.setFirstComponent( + new Label("Max 400 px - Reversed 30 % position")); percentagePositionWithPixelLimitsVerticalReversed .setSecondComponent(new Label("Min 100 px")); percentagePositionWithPixelLimitsVerticalReversed.setSplitPosition(30, Sizeable.UNITS_PERCENTAGE, true); - verticalSplitsLayout - .addComponent(percentagePositionWithPixelLimitsVerticalReversed); + verticalSplitsLayout.addComponent( + percentagePositionWithPixelLimitsVerticalReversed); tabs.addComponent(verticalSplitsLayout); verticalSplitsLayout.setSizeFull(); @@ -266,8 +260,8 @@ public class SplitPanelWithMinimumAndMaximum extends AbstractTestUI { final HorizontalSplitPanel togglableSplitPanel = new HorizontalSplitPanel(); togglableSplitPanel.setMinSplitPosition(10, Sizeable.UNITS_PERCENTAGE); togglableSplitPanel.setMaxSplitPosition(80, Sizeable.UNITS_PERCENTAGE); - togglableSplitPanel.setFirstComponent(new Label( - "Min 10 % - 50 % position")); + togglableSplitPanel + .setFirstComponent(new Label("Min 10 % - 50 % position")); togglableSplitPanel.setSecondComponent(new Label("Max 80 %")); togglableSplitPanel.setSplitPosition(50, Sizeable.UNITS_PERCENTAGE); togglableSplitPanel.setHeight("250px"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPositionChange.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPositionChange.java index 81c449731c..6c6173542b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPositionChange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPositionChange.java @@ -49,8 +49,8 @@ public class SplitPositionChange extends AbstractTestUIWithLog { splitPanel.setHeight("200px"); splitPanel.addComponent(buildPanel(firstCaption)); splitPanel.addComponent(buildPanel(secondCaption)); - splitPanel - .addSplitPositionChangeListener(new AbstractSplitPanel.SplitPositionChangeListener() { + splitPanel.addSplitPositionChangeListener( + new AbstractSplitPanel.SplitPositionChangeListener() { @Override public void onSplitPositionChanged( diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java index 219a72c196..f366d59591 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java +++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java @@ -2,8 +2,8 @@ package com.vaadin.tests.components.splitpanel; import com.vaadin.ui.VerticalSplitPanel; -public class VerticalSplitPanels extends - AbstractSplitPanelTest<VerticalSplitPanel> { +public class VerticalSplitPanels + extends AbstractSplitPanelTest<VerticalSplitPanel> { @Override protected Class<VerticalSplitPanel> getTestClass() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java b/uitest/src/main/java/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java index 2d8a30cb12..17f6000282 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java @@ -64,8 +64,7 @@ public class AddSelectionToRemovedRange extends AbstractTestUI { for (Integer item : selected) { if (null == item) { - new Notification( - "ERROR", + new Notification("ERROR", "Table value has null in Set of selected items!", Type.ERROR_MESSAGE).show(getPage()); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/AsyncPushUpdates.java b/uitest/src/main/java/com/vaadin/tests/components/table/AsyncPushUpdates.java index 6f9f1df89f..8edb3d9aa9 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/AsyncPushUpdates.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/AsyncPushUpdates.java @@ -69,9 +69,8 @@ public class AsyncPushUpdates extends AbstractTestUI { for (int i = 0; i < 11; i++) { container.getContainerProperty( container.addItem(), VALUE_PROPERTY_ID) - .setValue( - clickCount + " - " + id + " - " - + i); + .setValue(clickCount + " - " + id + + " - " + i); } } catch (InterruptedException e) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/CellStyleGeneratorTest.java b/uitest/src/main/java/com/vaadin/tests/components/table/CellStyleGeneratorTest.java index fb4bc5a045..84824718b9 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/CellStyleGeneratorTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/CellStyleGeneratorTest.java @@ -10,9 +10,8 @@ public class CellStyleGeneratorTest extends TestBase { @Override protected void setup() { - TestUtils - .injectCSS(getMainWindow(), - ".v-table-cell-content-red{background:red;}.v-table-row-blue{background:blue;}"); + TestUtils.injectCSS(getMainWindow(), + ".v-table-cell-content-red{background:red;}.v-table-row-blue{background:blue;}"); CellStyleGenerator g = new CellStyleGenerator() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java index 8d1a9fc7df..769f988c15 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java @@ -37,7 +37,8 @@ public class ColumnCollapsingAndColumnExpansion extends AbstractTestUIWithLog { } @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { table.setColumnCollapsed("Col2", !table.isColumnCollapsed("Col2")); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnResizeEvent.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnResizeEvent.java index f092ba8bca..77d490ea7d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnResizeEvent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnResizeEvent.java @@ -85,20 +85,21 @@ public class ColumnResizeEvent extends TestBase { table.addListener(new ColumnResizeListener() { @Override - public void columnResize(com.vaadin.ui.Table.ColumnResizeEvent event) { + public void columnResize( + com.vaadin.ui.Table.ColumnResizeEvent event) { if (event.getPropertyId().equals("firstname")) { - column1Width.setValue(event.getCurrentWidth() - + "px (previously " + event.getPreviousWidth() - + "px)"); + column1Width.setValue( + event.getCurrentWidth() + "px (previously " + + event.getPreviousWidth() + "px)"); } else if (event.getPropertyId().equals("lastname")) { - column2Width.setValue(event.getCurrentWidth() - + "px (previously " + event.getPreviousWidth() - + "px)"); + column2Width.setValue( + event.getCurrentWidth() + "px (previously " + + event.getPreviousWidth() + "px)"); } else if (event.getPropertyId().equals("150pxfixedCol")) { - column3Width.setValue(event.getCurrentWidth() - + "px (previously " + event.getPreviousWidth() - + "px)"); + column3Width.setValue( + event.getCurrentWidth() + "px (previously " + + event.getPreviousWidth() + "px)"); } } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrder.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrder.java index 7e33de502c..27d2d82113 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrder.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrder.java @@ -10,8 +10,8 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; -public class ColumnWidthsAfterChangeTableColumnsCountOrOrder extends - AbstractTestUI { +public class ColumnWidthsAfterChangeTableColumnsCountOrOrder + extends AbstractTestUI { protected static final String BUTTON_CHANGE_ORDER_AND_WIDTH_ID = "buttonChangeOrderAndWidth"; protected static final String BUTTON_CHANGE_COLUMN_COUNT_AND_WIDTH = "buttonChangeColumnCountAndWidth"; @@ -40,8 +40,8 @@ public class ColumnWidthsAfterChangeTableColumnsCountOrOrder extends new Button.ClickListener() { @Override public void buttonClick(Button.ClickEvent clickEvent) { - table.setVisibleColumns(new Object[] { "name", "descr", - "id" }); + table.setVisibleColumns( + new Object[] { "name", "descr", "id" }); table.setColumnWidth("descr", NEW_COLUMN_WIDTH); } }); @@ -51,7 +51,8 @@ public class ColumnWidthsAfterChangeTableColumnsCountOrOrder extends "Change columns count and width", new Button.ClickListener() { @Override public void buttonClick(Button.ClickEvent clickEvent) { - table.setVisibleColumns(new Object[] { "name", "descr" }); + table.setVisibleColumns( + new Object[] { "name", "descr" }); table.setColumnWidth("descr", NEW_COLUMN_WIDTH); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java b/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java index 12f28332f4..5f96538368 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java @@ -111,8 +111,8 @@ public class ContainerSizeChangeDuringTablePaint extends AbstractTestUI { addItem(container, "A", "New", "Row"); container.sabotageNextPaint(); - event.getButton().setCaption( - "Event was fired successfully."); + event.getButton() + .setCaption("Event was fired successfully."); } }); button.setId("addRow"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java b/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java index ec7301099f..38a8f746e6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java @@ -36,7 +36,8 @@ public class ContextMenuSize extends AbstractTestUI { table.addActionHandler(new Handler() { @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { } @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/DndTableTargetDetails.java b/uitest/src/main/java/com/vaadin/tests/components/table/DndTableTargetDetails.java index 7bebfafd4e..693a489f2d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/DndTableTargetDetails.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/DndTableTargetDetails.java @@ -86,11 +86,11 @@ public class DndTableTargetDetails extends AbstractTestUI { .getTargetDetails(); MouseEventDetails mouseDetails = details.getMouseEvent(); - VerticalLayout layout = (VerticalLayout) details.getTarget() - .getUI().getContent(); + VerticalLayout layout = (VerticalLayout) details.getTarget().getUI() + .getContent(); - Label name = new Label("Button name=" - + mouseDetails.getButtonName()); + Label name = new Label( + "Button name=" + mouseDetails.getButtonName()); name.addStyleName("dnd-button-name"); layout.addComponent(name); if (mouseDetails.isCtrlKey()) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java b/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java index 390a026c6f..0241684a99 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java @@ -81,7 +81,8 @@ public class EditableModeChange extends AbstractTestUI { Object propertyId, Component uiContext) { if (selectionEvent != null) { if ((selectionEvent.getItemId().equals(itemId)) - && (selectionEvent.getPropertyId().equals(propertyId))) { + && (selectionEvent.getPropertyId() + .equals(propertyId))) { return super.createField(container, itemId, propertyId, uiContext); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/EmptyRowsWhenScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/table/EmptyRowsWhenScrolling.java index 3bc0d3dd1f..3290ea9db5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/EmptyRowsWhenScrolling.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/EmptyRowsWhenScrolling.java @@ -83,9 +83,9 @@ public class EmptyRowsWhenScrolling extends UI { SimpleBean.class); container.setBeanIdProperty("id"); for (int i = 1; i <= 50; ++i) { - container.addBean(new SimpleBean(i, "image", - "Column1 row " + i, "Column2 row " + i, "Column3 row " - + i, "Column4 row " + i)); + container.addBean(new SimpleBean(i, "image", "Column1 row " + i, + "Column2 row " + i, "Column3 row " + i, + "Column4 row " + i)); } table.setContainerDataSource(container); table.setEditable(true); @@ -99,8 +99,8 @@ public class EmptyRowsWhenScrolling extends UI { int imgNum = new Random().nextInt(5) + 1; try { // Simulate background work - System.out - .println("Generated column for image /com/example/simpletable/img/px50-" + System.out.println( + "Generated column for image /com/example/simpletable/img/px50-" + imgNum + ".jpg"); Thread.sleep(50); } catch (InterruptedException e) { @@ -112,13 +112,14 @@ public class EmptyRowsWhenScrolling extends UI { Embedded image = new Embedded("", resource); image.setWidth("50px"); image.setHeight("50px"); - image.addClickListener(new com.vaadin.event.MouseEvents.ClickListener() { - @Override - public void click( - com.vaadin.event.MouseEvents.ClickEvent event) { - Notification.show("Image clicked!"); - } - }); + image.addClickListener( + new com.vaadin.event.MouseEvents.ClickListener() { + @Override + public void click( + com.vaadin.event.MouseEvents.ClickEvent event) { + Notification.show("Image clicked!"); + } + }); return image; } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainer.java b/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainer.java index a7d387477d..532c03b91a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainer.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainer.java @@ -114,7 +114,7 @@ public class ExpandingContainer extends AbstractContainer implements @Override @SuppressWarnings("rawtypes") - public Property/* <?> */getContainerProperty(Object itemId, + public Property/* <?> */ getContainerProperty(Object itemId, Object propertyId) { BeanItem<MyBean> item = getItem(itemId); return item != null ? item.getItemProperty(propertyId) : null; @@ -222,8 +222,8 @@ public class ExpandingContainer extends AbstractContainer implements } final int size = currentSize; if (index >= size) { - throw new IndexOutOfBoundsException("index=" + index + " but size=" - + size); + throw new IndexOutOfBoundsException( + "index=" + index + " but size=" + size); } checkExpand(index); return index; @@ -237,8 +237,8 @@ public class ExpandingContainer extends AbstractContainer implements final int size = currentSize; checkExpand(startIndex); if (startIndex < 0 || startIndex > size) { - throw new IndexOutOfBoundsException("startIndex=" + startIndex - + " but size=" + size); + throw new IndexOutOfBoundsException( + "startIndex=" + startIndex + " but size=" + size); } if (startIndex + numberOfItems > size) { numberOfItems = size - startIndex; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java index a42135dc85..7c3220dced 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java @@ -35,8 +35,8 @@ public class HeaderFooterClickLeftRightMiddle extends AbstractTestUIWithLog { CheckBox headerClickListenerCheckbox = new CheckBox( "Header click listener"); headerClickListenerCheckbox.setImmediate(true); - headerClickListenerCheckbox - .addValueChangeListener(new HasValue.ValueChangeListener<Boolean>() { + headerClickListenerCheckbox.addValueChangeListener( + new HasValue.ValueChangeListener<Boolean>() { private HeaderClickListener headerClickListener = new HeaderClickListener() { @@ -57,7 +57,8 @@ public class HeaderFooterClickLeftRightMiddle extends AbstractTestUIWithLog { .isEmpty()) { table.addHeaderClickListener(headerClickListener); } else { - table.removeHeaderClickListener(headerClickListener); + table.removeHeaderClickListener( + headerClickListener); } } }); @@ -66,8 +67,8 @@ public class HeaderFooterClickLeftRightMiddle extends AbstractTestUIWithLog { CheckBox footerClickListenerCheckbox = new CheckBox( "Footer click listener"); footerClickListenerCheckbox.setImmediate(true); - footerClickListenerCheckbox - .addValueChangeListener(new HasValue.ValueChangeListener<Boolean>() { + footerClickListenerCheckbox.addValueChangeListener( + new HasValue.ValueChangeListener<Boolean>() { private FooterClickListener footerClickListener = new FooterClickListener() { @@ -87,7 +88,8 @@ public class HeaderFooterClickLeftRightMiddle extends AbstractTestUIWithLog { .isEmpty()) { table.addFooterClickListener(footerClickListener); } else { - table.removeFooterClickListener(footerClickListener); + table.removeFooterClickListener( + footerClickListener); } } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java index 10ffb1c8aa..fc2b1ae49a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java @@ -13,8 +13,8 @@ import com.vaadin.ui.Link; import com.vaadin.ui.Notification; import com.vaadin.ui.Table; -public class HeaderPositionWhenSorting extends AbstractTestUI implements - Action.Handler, ItemClickListener { +public class HeaderPositionWhenSorting extends AbstractTestUI + implements Action.Handler, ItemClickListener { private Table table; private boolean actionHandlerHasActions = false; @@ -43,7 +43,8 @@ public class HeaderPositionWhenSorting extends AbstractTestUI implements }); addComponent(cbActionHandler); - CheckBox cbActionHasActions = new CheckBox("Action handler has actions"); + CheckBox cbActionHasActions = new CheckBox( + "Action handler has actions"); cbActionHasActions.setImmediate(true); cbActionHasActions.addValueChangeListener(event -> { actionHandlerHasActions = event.getValue(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java index e9c948ddf7..7642ac2bc8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java @@ -14,8 +14,8 @@ public class HeaderRightClickAfterDrag extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { Table table = new Table(); - table.setContainerDataSource(new BeanItemContainer<TestBean>( - TestBean.class)); + table.setContainerDataSource( + new BeanItemContainer<TestBean>(TestBean.class)); for (int i = 0; i < 10; i++) { table.addItem(new TestBean(i)); } @@ -25,12 +25,11 @@ public class HeaderRightClickAfterDrag extends AbstractTestUI { table.addHeaderClickListener(new Table.HeaderClickListener() { @Override public void headerClick(Table.HeaderClickEvent event) { - if (MouseEventDetails.MouseButton.RIGHT.equals(event - .getButton())) { + if (MouseEventDetails.MouseButton.RIGHT + .equals(event.getButton())) { Window window = new Window("Right-clicked:", new Label( - "<center>" - + event.getPropertyId().toString() - .toUpperCase() + "</center>", + "<center>" + event.getPropertyId().toString() + .toUpperCase() + "</center>", ContentMode.HTML)); window.setPositionX(event.getClientX()); window.setPositionY(event.getClientY()); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java index abb770ab05..40f2f30055 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java @@ -20,7 +20,8 @@ public class HeaderUpdateWhenNoRows extends AbstractTestUI { final CheckBox showHeaders = new CheckBox("Show headers"); showHeaders.addValueChangeListener(event -> { if (showHeaders.getValue()) { - table.setColumnHeaderMode(ColumnHeaderMode.EXPLICIT_DEFAULTS_ID); + table.setColumnHeaderMode( + ColumnHeaderMode.EXPLICIT_DEFAULTS_ID); } else { table.setColumnHeaderMode(ColumnHeaderMode.HIDDEN); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java b/uitest/src/main/java/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java index 4a729d221f..e4d894057a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java @@ -37,8 +37,8 @@ public class HiddenColumnsExpandRatios extends TestBase { addComponent(new Button("All", new ClickListener() { @Override public void buttonClick(ClickEvent event) { - table.setVisibleColumns(table.getContainerPropertyIds() - .toArray()); + table.setVisibleColumns( + table.getContainerPropertyIds().toArray()); } })); addComponent(new Button("Some", new ClickListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java b/uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java index a085408436..5018ca5e4e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java @@ -57,9 +57,7 @@ public class ItemClickEvents extends AbstractTestUI { tree.setParent("2. Child 1", "Root 2"); tree.addItem("2. Child 2"); tree.setParent("2. Child 2", "Root 2"); - tree.addContainerProperty( - "icon", - ExternalResource.class, + tree.addContainerProperty("icon", ExternalResource.class, new ExternalResource( "https://vaadin.com/vaadin-theme/images/vaadin-logo.png")); @@ -144,16 +142,19 @@ public class ItemClickEvents extends AbstractTestUI { b = new CheckBox("selectable"); if (c instanceof Table) { b.setValue(((Table) c).isSelectable()); - b.addValueChangeListener(event -> ((Table) c).setSelectable(event.getValue())); + b.addValueChangeListener( + event -> ((Table) c).setSelectable(event.getValue())); } else if (c instanceof Tree) { b.setValue(((Tree) c).isSelectable()); - b.addValueChangeListener(event -> ((Tree) c).setSelectable(event.getValue())); + b.addValueChangeListener( + event -> ((Tree) c).setSelectable(event.getValue())); } b.setImmediate(true); layout.addComponent(b); b = new CheckBox("nullsel"); b.setValue(c.isNullSelectionAllowed()); - b.addValueChangeListener(event -> c.setNullSelectionAllowed(event.getValue())); + b.addValueChangeListener( + event -> c.setNullSelectionAllowed(event.getValue())); b.setImmediate(true); layout.addComponent(b); b = new CheckBox("multi"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/KeyControl.java b/uitest/src/main/java/com/vaadin/tests/components/table/KeyControl.java index 2998940db1..6611cef707 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/KeyControl.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/KeyControl.java @@ -45,7 +45,8 @@ public class KeyControl extends TestBase { public void valueChange(ValueChangeEvent event) { @SuppressWarnings("unchecked") Set<String> value = (Set<String>) table1.getValue(); - selected1.setValue(value.toString() + " TOTAL: " + value.size()); + selected1 + .setValue(value.toString() + " TOTAL: " + value.size()); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java b/uitest/src/main/java/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java index f9a0add6fc..fe678f7980 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java @@ -31,24 +31,23 @@ public class KeyboardNavigationWithChangingContent extends TestBase { t.setMultiSelect(true); getLayout().addComponent(t); - getLayout().addComponent( - new Button("Change elements and selection", - new ClickListener() { - - @Override - public void buttonClick(ClickEvent event) { - - bic.removeAllItems(); - ValueHolder<String> v4 = null; - for (int i = 4; i < 30; i++) { - v4 = new ValueHolder<String>("test" + i); - bic.addBean(v4); - - } - t.select(t.firstItemId()); - t.focus(); - } - })); + getLayout().addComponent(new Button("Change elements and selection", + new ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + + bic.removeAllItems(); + ValueHolder<String> v4 = null; + for (int i = 4; i < 30; i++) { + v4 = new ValueHolder<String>("test" + i); + bic.addBean(v4); + + } + t.select(t.firstItemId()); + t.focus(); + } + })); } @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java index b9062236de..ada685960d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java @@ -38,23 +38,21 @@ public class LabelEmbeddedClickThroughForTable extends AbstractTestUI { Item item = table.addItem("Item 1 (row 1)"); item.getItemProperty("Column 1").setValue("String A"); item.getItemProperty("Column 2").setValue(new Label("Label A")); - item.getItemProperty("Column 3").setValue( - new Label("<b>Label A</b>", ContentMode.HTML)); - item.getItemProperty("Column 4").setValue( - new Embedded("An embedded image", new ThemeResource( - "../runo/icons/32/ok.png"))); + item.getItemProperty("Column 3") + .setValue(new Label("<b>Label A</b>", ContentMode.HTML)); + item.getItemProperty("Column 4") + .setValue(new Embedded("An embedded image", + new ThemeResource("../runo/icons/32/ok.png"))); item = table.addItem("Item 2 (row 2)"); item.getItemProperty("Column 1").setValue("String B"); item.getItemProperty("Column 2").setValue(new Label("Label B")); item.getItemProperty("Column 3") - .setValue( - new Label( - "<a style=\"color: blue\" href=\"javascript:false\">Label B</a>", - ContentMode.HTML)); - item.getItemProperty("Column 4").setValue( - new Embedded("", new ThemeResource( - "../runo/icons/32/cancel.png"))); + .setValue(new Label( + "<a style=\"color: blue\" href=\"javascript:false\">Label B</a>", + ContentMode.HTML)); + item.getItemProperty("Column 4").setValue(new Embedded("", + new ThemeResource("../runo/icons/32/cancel.png"))); table.addItemClickListener(new ItemClickListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/LargeSelectionCausesNPE.java b/uitest/src/main/java/com/vaadin/tests/components/table/LargeSelectionCausesNPE.java index b6ee62ea59..715ace04eb 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/LargeSelectionCausesNPE.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/LargeSelectionCausesNPE.java @@ -86,8 +86,8 @@ public class LargeSelectionCausesNPE extends TestBase { // set column headers table.setVisibleColumns(new String[] { CODE, NAME, ID }); - table.setColumnHeaders(new String[] { "DummyCode", "DummyName", - "DummyId" }); + table.setColumnHeaders( + new String[] { "DummyCode", "DummyName", "DummyId" }); // Column alignment table.setColumnAlignment(ID, Align.CENTER); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/LastColumnNegative.java b/uitest/src/main/java/com/vaadin/tests/components/table/LastColumnNegative.java index 87ff6d9d7b..c230a1b257 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/LastColumnNegative.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/LastColumnNegative.java @@ -48,11 +48,8 @@ public class LastColumnNegative extends TestBase { private Table setupTable() { IndexedContainer container = new IndexedContainer(); - container - .addContainerProperty( - "fileName", - String.class, - "Long enough string to cause a scrollbar when the window is set to a dencently small size."); + container.addContainerProperty("fileName", String.class, + "Long enough string to cause a scrollbar when the window is set to a dencently small size."); container.addContainerProperty("size", Long.class, 23958l); container.addItem(); container.addItem(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java b/uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java index d5302cdf45..05f1d538fd 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java @@ -40,8 +40,8 @@ public class LongMultiselect extends AbstractTestUI { // Set ItemProperty.COLUMN2 for all selected values of table Collection selectedIds = (Collection) table.getValue(); for (final Object itemId : selectedIds) { - final Property p = table.getItem(itemId).getItemProperty( - ItemProperty.COLUMN2); + final Property p = table.getItem(itemId) + .getItemProperty(ItemProperty.COLUMN2); if (p.getValue() instanceof String) { p.setValue(null); } else { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ModifyContainerProperty.java b/uitest/src/main/java/com/vaadin/tests/components/table/ModifyContainerProperty.java index 00965220db..c888fd98d0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/ModifyContainerProperty.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/ModifyContainerProperty.java @@ -27,14 +27,16 @@ public class ModifyContainerProperty extends TestBase { addComponent(new Button("Remove container property", new Button.ClickListener() { @Override - public void buttonClick(com.vaadin.ui.Button.ClickEvent arg0) { + public void buttonClick( + com.vaadin.ui.Button.ClickEvent arg0) { ic.removeContainerProperty("one"); } })); addComponent(new Button("Add container property", new Button.ClickListener() { @Override - public void buttonClick(com.vaadin.ui.Button.ClickEvent arg0) { + public void buttonClick( + com.vaadin.ui.Button.ClickEvent arg0) { boolean added = ic.addContainerProperty("three", String.class, "three"); if (added) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java b/uitest/src/main/java/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java index 9c063fd42e..a7058b41e3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java @@ -35,10 +35,11 @@ public class MultiSelectWithRemovedRow extends TestBase { addComponent(log); final BeanItemContainer<Person> container = new BeanItemContainer<Person>( - Person.class, Arrays.asList(new Person("Joe"), new Person( - "William"), new Person("Jack"), new Person("Averell"), - new Person("Bob"), new Person("Grat"), new Person( - "Bill"), new Person("Emmett"))); + Person.class, + Arrays.asList(new Person("Joe"), new Person("William"), + new Person("Jack"), new Person("Averell"), + new Person("Bob"), new Person("Grat"), + new Person("Bill"), new Person("Emmett"))); final Table table = new Table("Table", container); table.setSelectable(true); table.setMultiSelect(true); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/PopupViewInTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/PopupViewInTable.java index f070d28aa8..9a118ab979 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/PopupViewInTable.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/PopupViewInTable.java @@ -41,8 +41,8 @@ public class PopupViewInTable extends AbstractTestUI { } private Component createContent() { - VerticalLayout vl = new VerticalLayout(new Label("Hello"), new Button( - "World")); + VerticalLayout vl = new VerticalLayout(new Label("Hello"), + new Button("World")); return vl; } diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java index d418dbc1f4..de160182a9 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java @@ -49,8 +49,8 @@ public class PropertyValueChange extends TestBase { Object columnId) { final Label l = new Label(); @SuppressWarnings("unchecked") - final Property<Integer> integer = source.getContainerProperty( - itemId, "integer"); + final Property<Integer> integer = source + .getContainerProperty(itemId, "integer"); l.setValue(String.valueOf(getMultipliedValue(integer))); // we must hook value change listener to ensure updates in all use @@ -107,8 +107,9 @@ public class PropertyValueChange extends TestBase { t2.setId("disabled table"); Table reader = new Table("Reader table"); - reader.setDescription("This table should be redrawn on container changes as container data is " - + "displayed directly in cells."); + reader.setDescription( + "This table should be redrawn on container changes as container data is " + + "displayed directly in cells."); reader.setContainerDataSource(container); reader.addGeneratedColumn("integer x 3", multiplier); reader.setPageLength(0); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ReloadWidgets.java b/uitest/src/main/java/com/vaadin/tests/components/table/ReloadWidgets.java index ef72f92a4e..77acb153b8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/ReloadWidgets.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/ReloadWidgets.java @@ -15,8 +15,8 @@ public class ReloadWidgets extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - final Table table = new Table(null, new BeanItemContainer<Bean>( - Bean.class)); + final Table table = new Table(null, + new BeanItemContainer<Bean>(Bean.class)); table.setId("table"); table.setSizeFull(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/RowAdditionTest.java b/uitest/src/main/java/com/vaadin/tests/components/table/RowAdditionTest.java index c6d071f34c..3645f88a69 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/RowAdditionTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/RowAdditionTest.java @@ -39,16 +39,16 @@ public class RowAdditionTest extends TestBase { item.getItemProperty("column1").setValue("0"); } })); - hl.addComponent(new Button("Add at position 50", - new Button.ClickListener() { + hl.addComponent( + new Button("Add at position 50", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { Item item = container.addItemAt(50, new Object()); item.getItemProperty("column1").setValue("50"); } })); - hl.addComponent(new Button("Add at position 100", - new Button.ClickListener() { + hl.addComponent( + new Button("Add at position 100", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { Item item = container.addItemAt(100, new Object()); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java b/uitest/src/main/java/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java index bcae4dc6d9..0f8d590909 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java @@ -54,7 +54,8 @@ public class RowUpdateShouldRetainContextMenu extends TestBase { table.addActionHandler(new Action.Handler() { @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { } @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ShowLastItem.java b/uitest/src/main/java/com/vaadin/tests/components/table/ShowLastItem.java index 6d6f744918..2c77cd2dbc 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/ShowLastItem.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/ShowLastItem.java @@ -35,7 +35,8 @@ public class ShowLastItem extends AbstractTestUI { table.addItem(itemId).getItemProperty("Col") .setValue(String.valueOf(itemId)); - table.setCurrentPageFirstItemIndex(table.getItemIds().size() - 1); + table.setCurrentPageFirstItemIndex( + table.getItemIds().size() - 1); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SortableHeaderStyles.java b/uitest/src/main/java/com/vaadin/tests/components/table/SortableHeaderStyles.java index a41f4248d9..dbe8c4aa6e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/SortableHeaderStyles.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/SortableHeaderStyles.java @@ -29,16 +29,16 @@ public class SortableHeaderStyles extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - getPage().getStyles().add( - ".v-table-header-sortable { font-weight: bold;}"); + getPage().getStyles() + .add(".v-table-header-sortable { font-weight: bold;}"); PersonContainer container = PersonContainer.createWithTestData(); Collection<?> sortableContainerPropertyIds = container .getSortableContainerPropertyIds(); - final OptionGroup sortableSelector = new OptionGroup( - "Sortable columns", sortableContainerPropertyIds); + final OptionGroup sortableSelector = new OptionGroup("Sortable columns", + sortableContainerPropertyIds); sortableSelector.setMultiSelect(true); sortableSelector.setValue(sortableContainerPropertyIds); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java index 202fa97c8b..92250090f5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java @@ -11,8 +11,8 @@ import com.vaadin.ui.Component; import com.vaadin.ui.Link; import com.vaadin.ui.Table; -public class TableAndBrowserContextMenu extends TestBase implements - Action.Handler, ItemClickListener { +public class TableAndBrowserContextMenu extends TestBase + implements Action.Handler, ItemClickListener { private Table table; private boolean actionHandlerHasActions = false; @@ -41,7 +41,8 @@ public class TableAndBrowserContextMenu extends TestBase implements }); addComponent(cbActionHandler); - CheckBox cbActionHasActions = new CheckBox("Action handler has actions"); + CheckBox cbActionHasActions = new CheckBox( + "Action handler has actions"); cbActionHasActions.setImmediate(true); cbActionHasActions.addValueChangeListener(event -> { actionHandlerHasActions = event.getValue(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableBlurFocus.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableBlurFocus.java index d95b406c1a..a3d0d4ab29 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableBlurFocus.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableBlurFocus.java @@ -134,8 +134,8 @@ public class TableBlurFocus extends AbstractTestUIWithLog { Notification.show("Clicked!"); } }); - table.addItem(new Object[] { "entryString" + x, buttonLabel, - button, " " }, "entryID" + x); + table.addItem(new Object[] { "entryString" + x, buttonLabel, button, + " " }, "entryID" + x); } return table; } diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java index ec954b1a78..3a1795c4f0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java @@ -61,8 +61,8 @@ public class TableClickAndDragOnIconAndComponents extends AbstractTestUI { Object columnId) { Item item = source.getItem(itemId); LegacyTextField textfield = new LegacyTextField(); - textfield.setValue(String.valueOf(item.getItemProperty("foo") - .getValue())); + textfield.setValue( + String.valueOf(item.getItemProperty("foo").getValue())); return textfield; } }); @@ -75,8 +75,8 @@ public class TableClickAndDragOnIconAndComponents extends AbstractTestUI { Object columnId) { Item item = source.getItem(itemId); LegacyTextField textfield = new LegacyTextField(); - textfield.setValue(String.valueOf(item.getItemProperty("foo") - .getValue())); + textfield.setValue( + String.valueOf(item.getItemProperty("foo").getValue())); textfield.setReadOnly(true); return textfield; } @@ -88,8 +88,8 @@ public class TableClickAndDragOnIconAndComponents extends AbstractTestUI { @Override public Component generateCell(Table source, Object itemId, Object columnId) { - Embedded embedded = new Embedded(null, new ThemeResource( - "../runo/icons/16/ok.png")); + Embedded embedded = new Embedded(null, + new ThemeResource("../runo/icons/16/ok.png")); return embedded; } }); @@ -134,8 +134,8 @@ public class TableClickAndDragOnIconAndComponents extends AbstractTestUI { } item.getItemProperty("foo").setValue("foo " + itemId); item.getItemProperty("red").setValue("red " + itemId); - item.getItemProperty("icon").setValue( - new ThemeResource("../runo/icons/16/ok.png")); + item.getItemProperty("icon") + .setValue(new ThemeResource("../runo/icons/16/ok.png")); } @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java index 6fa86543cb..f50a5c6a04 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java @@ -73,8 +73,8 @@ public class TableClickValueChangeInteraction extends TestBase { @Override public void valueChange(ValueChangeEvent event) { - valueChangeLabel.setValue("Value " - + event.getProperty().getValue()); + valueChangeLabel.setValue( + "Value " + event.getProperty().getValue()); } }); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnAddAndResize.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnAddAndResize.java index 40751047b1..cebc15432b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnAddAndResize.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnAddAndResize.java @@ -27,15 +27,11 @@ public class TableColumnAddAndResize extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - String people[][] = { - { "Galileo", "Liked to go around the Sun" }, + String people[][] = { { "Galileo", "Liked to go around the Sun" }, { "Monnier", "Liked star charts" }, - { "VÀisÀlÀ", "Liked optics" }, - { "Oterma", "Liked comets" }, - { - "Valtaoja", - "Likes cosmology and still " - + "lives unlike the others above" }, }; + { "VÀisÀlÀ", "Liked optics" }, { "Oterma", "Liked comets" }, + { "Valtaoja", "Likes cosmology and still " + + "lives unlike the others above" }, }; VerticalLayout content = new VerticalLayout(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenu.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenu.java index 9416ffe70c..1cfb28c793 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenu.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenu.java @@ -17,7 +17,8 @@ public class TableContextMenu extends TestBase { table.addActionHandler(new Action.Handler() { @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { Notification.show("Done that :-)"); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuOnField.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuOnField.java index 8f98cdbffb..eb496c2438 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuOnField.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuOnField.java @@ -23,7 +23,8 @@ public class TableContextMenuOnField extends TestBase { table.addActionHandler(new Action.Handler() { @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { // TODO Auto-generated method stub } diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuTouch.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuTouch.java index 9415318054..4c04cee540 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuTouch.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuTouch.java @@ -28,7 +28,8 @@ public class TableContextMenuTouch extends AbstractTestUI { table.addActionHandler(new Action.Handler() { @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { Notification.show("Done that :-)"); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableExtraScrollbars.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableExtraScrollbars.java index ccf521c500..00f3bb3463 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableExtraScrollbars.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableExtraScrollbars.java @@ -42,8 +42,8 @@ public class TableExtraScrollbars extends AbstractTestCase { for (int i = 0; i < ROWS; ++i) { Item item = container.addItem(i); for (int p = 0; p < PROPS; ++p) { - item.getItemProperty("prop" + p).setValue( - "property value 1234567890"); + item.getItemProperty("prop" + p) + .setValue("property value 1234567890"); } } return container; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java index 3b3c789232..af1acb7d89 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java @@ -34,7 +34,8 @@ public class TableHeightWhenHidingHeaders extends AbstractTestCase { if (event.getValue()) { // table body height is now 77px, which together // with header makes 100px - table.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_EXPLICIT_DEFAULTS_ID); + table.setColumnHeaderMode( + Table.COLUMN_HEADER_MODE_EXPLICIT_DEFAULTS_ID); } else { table.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_HIDDEN); // header disappears, but table body height stays at diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java index 1515589b4c..e5adaaf4c2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java @@ -41,8 +41,8 @@ public class TableMatchesMouseDownMouseUpElement extends AbstractTestUI { Item item = table.addItem("Item 1 (row 1)"); item.getItemProperty("Column 1").setValue("String A"); item.getItemProperty("Column 2").setValue(new Label("Label A")); - item.getItemProperty("Column 3").setValue( - new Label("<b>Label A</b>", ContentMode.HTML)); + item.getItemProperty("Column 3") + .setValue(new Label("<b>Label A</b>", ContentMode.HTML)); VerticalLayout l = new VerticalLayout(); l.setId("row-1"); l.setHeight(100, Unit.PIXELS); @@ -52,10 +52,9 @@ public class TableMatchesMouseDownMouseUpElement extends AbstractTestUI { item.getItemProperty("Column 1").setValue("String B"); item.getItemProperty("Column 2").setValue(new Label("Label B")); item.getItemProperty("Column 3") - .setValue( - new Label( - "<a style=\"color: blue\" href=\"javascript:false\">Label B</a>", - ContentMode.HTML)); + .setValue(new Label( + "<a style=\"color: blue\" href=\"javascript:false\">Label B</a>", + ContentMode.HTML)); l = new VerticalLayout(); l.setId("row-2"); l.setSizeFull(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java index 8f6e6c685f..1033d01c12 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java @@ -72,9 +72,8 @@ public class TableMoveFocusWithSelection extends AbstractTestUI { addComponent(t); // Select mode - Button toggleSelectMode = new Button( - t.isMultiSelect() ? "Press to use single select" - : "Press to use multi select"); + Button toggleSelectMode = new Button(t.isMultiSelect() + ? "Press to use single select" : "Press to use multi select"); toggleSelectMode.setId("toggle-mode"); toggleSelectMode.addClickListener(new ClickListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableMultiSelectSimple.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableMultiSelectSimple.java index d6a79759ac..58506e83a9 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableMultiSelectSimple.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableMultiSelectSimple.java @@ -30,8 +30,8 @@ public class TableMultiSelectSimple extends TestBase { @Override public void valueChange(ValueChangeEvent event) { - TreeSet<?> sorted = new TreeSet<Object>((Set<?>) event - .getProperty().getValue()); + TreeSet<?> sorted = new TreeSet<Object>( + (Set<?>) event.getProperty().getValue()); log.log("Selected value: " + sorted); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableParentEnabledStateChange.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableParentEnabledStateChange.java index 9aeb25002d..611ebc792e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableParentEnabledStateChange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableParentEnabledStateChange.java @@ -37,8 +37,8 @@ public class TableParentEnabledStateChange extends AbstractTestUIWithLog { final MyCustomComponent customComponent = new MyCustomComponent(); - toggle = new Button("Toggle enabled state ; " - + customComponent.isEnabled()); + toggle = new Button( + "Toggle enabled state ; " + customComponent.isEnabled()); toggle.addClickListener(new Button.ClickListener() { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableReduceContainerSize.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableReduceContainerSize.java index 30db12371d..a7012976c0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableReduceContainerSize.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableReduceContainerSize.java @@ -73,8 +73,8 @@ public class TableReduceContainerSize extends TestBase { label.setValue("Index: " + table.getCurrentPageFirstItemIndex()); } catch (Exception e) { - label.setValue("Exception: " - + e.getClass().getSimpleName()); + label.setValue( + "Exception: " + e.getClass().getSimpleName()); } } }); @@ -95,8 +95,8 @@ public class TableReduceContainerSize extends TestBase { label.setValue("Index: " + table.getCurrentPageFirstItemIndex()); } catch (Exception e) { - label.setValue("Exception: " - + e.getClass().getSimpleName()); + label.setValue( + "Exception: " + e.getClass().getSimpleName()); } } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java index 710a4f8fe3..f3edec8cd2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java @@ -129,7 +129,8 @@ public class TableRemovedQuicklySendsInvalidRpcCalls extends AbstractTestUI { } @Override - public void setDiffState(ClientConnector connector, JsonObject diffState) { + public void setDiffState(ClientConnector connector, + JsonObject diffState) { tracker.setDiffState(connector, diffState); } @@ -161,7 +162,8 @@ public class TableRemovedQuicklySendsInvalidRpcCalls extends AbstractTestUI { } @Override - public void cleanStreamVariable(String connectorId, String variableName) { + public void cleanStreamVariable(String connectorId, + String variableName) { tracker.cleanStreamVariable(connectorId, variableName); } @@ -185,7 +187,8 @@ public class TableRemovedQuicklySendsInvalidRpcCalls extends AbstractTestUI { @Override public void cleanConcurrentlyRemovedConnectorIds( int lastSyncIdSeenByClient) { - tracker.cleanConcurrentlyRemovedConnectorIds(lastSyncIdSeenByClient); + tracker.cleanConcurrentlyRemovedConnectorIds( + lastSyncIdSeenByClient); } @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRows.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRows.java index bee0839663..865d9b3576 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRows.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRows.java @@ -17,7 +17,8 @@ import com.vaadin.ui.Table; * * @author Vaadin Ltd */ -public class TableRepairsScrollPositionOnReAddingAllRows extends AbstractTestUI { +public class TableRepairsScrollPositionOnReAddingAllRows + extends AbstractTestUI { private static final long serialVersionUID = 1L; @@ -50,8 +51,8 @@ public class TableRepairsScrollPositionOnReAddingAllRows extends AbstractTestUI @Override public void buttonClick(com.vaadin.ui.Button.ClickEvent event) { - List<TableItem> originalItemIds = new ArrayList<TableItem>(cont - .getItemIds()); + List<TableItem> originalItemIds = new ArrayList<TableItem>( + cont.getItemIds()); cont.removeAllItems(); cont.addAll(originalItemIds); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java index 5c733b9e24..c612af6194 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java @@ -46,7 +46,8 @@ public class TableRowHeight2 extends AbstractTestUI { b.setStyleName(BaseTheme.BUTTON_LINK); b.addStyleName("nowraplink"); - b.setCaption("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ullamcorper, elit quis elementum iaculis, dui est rutrum risus, at cursus sem leo eget arcu. Proin vel eros ut tortor luctus pretium. Nulla facilisi. Donec in dui. Proin ac diam vitae massa tempus faucibus. Fusce eu risus. Nunc ac risus. Cras libero."); + b.setCaption( + "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ullamcorper, elit quis elementum iaculis, dui est rutrum risus, at cursus sem leo eget arcu. Proin vel eros ut tortor luctus pretium. Nulla facilisi. Donec in dui. Proin ac diam vitae massa tempus faucibus. Fusce eu risus. Nunc ac risus. Cras libero."); item.getItemProperty("title").setValue(b); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight3.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight3.java index c31b87f9da..5acc9713f3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight3.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight3.java @@ -40,7 +40,8 @@ public class TableRowHeight3 extends TestBase { b.setStyleName(BaseTheme.BUTTON_LINK); b.addStyleName("nowraplink"); if (i < 2) { - b.setCaption("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ullamcorper, elit quis elementum iaculis, dui est rutrum risus, at cursus sem leo eget arcu. Proin vel eros ut tortor luctus pretium. Nulla facilisi. Donec in dui. Proin ac diam vitae massa tempus faucibus. Fusce eu risus. Nunc ac risus. Cras libero."); + b.setCaption( + "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ullamcorper, elit quis elementum iaculis, dui est rutrum risus, at cursus sem leo eget arcu. Proin vel eros ut tortor luctus pretium. Nulla facilisi. Donec in dui. Proin ac diam vitae massa tempus faucibus. Fusce eu risus. Nunc ac risus. Cras libero."); } else if (2 <= i && i < 4) { b.setCaption("One line"); } else { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java index e1fe4d0514..0574a1de6c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java @@ -28,10 +28,12 @@ public class TableRowScrolledBottom extends AbstractTestUI { public void buttonClick(Button.ClickEvent event) { for (int j = 0; j < 100; j++) { ++i; - table.addItem(new Object[] { new Label(part1 + "<b>" + i - + "</b>" + part2, ContentMode.HTML) }, i); - table.setCurrentPageFirstItemIndex(table - .getContainerDataSource().size() - 1); + table.addItem(new Object[] { + new Label(part1 + "<b>" + i + "</b>" + part2, + ContentMode.HTML) }, + i); + table.setCurrentPageFirstItemIndex( + table.getContainerDataSource().size() - 1); } } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollAfterAddRow.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollAfterAddRow.java index d1d6edaa67..b352c68989 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollAfterAddRow.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollAfterAddRow.java @@ -114,8 +114,8 @@ public class TableScrollAfterAddRow extends AbstractTestUI { new NativeButton.ClickListener() { @Override public void buttonClick(ClickEvent event) { - label.setValue(Integer.toString(table - .getCurrentPageFirstItemIndex())); + label.setValue(Integer.toString( + table.getCurrentPageFirstItemIndex())); } }); layout.addComponent(addRowButton); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollingWithSQLContainer.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollingWithSQLContainer.java index 61f8952041..29fd306aca 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollingWithSQLContainer.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollingWithSQLContainer.java @@ -44,8 +44,8 @@ public class TableScrollingWithSQLContainer extends UI { // Will fail if table doesn't exist, which is OK. conn.rollback(); } - statement - .execute("create table people (id integer generated always as identity," + statement.execute( + "create table people (id integer generated always as identity," + " name varchar(32), AGE INTEGER)"); statement.execute("alter table people add primary key (id)"); for (int i = 0; i < 5000; i++) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableSelectPagingOff.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSelectPagingOff.java index d97e0a5cef..e9ddd2d20e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSelectPagingOff.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSelectPagingOff.java @@ -21,9 +21,10 @@ public class TableSelectPagingOff extends TestBase { } private Collection<MyBean> getBeans() { - return Arrays.asList(new MyBean("a", "description a"), new MyBean("b", - "description b"), new MyBean("c", "description c"), new MyBean( - "d", "description d")); + return Arrays.asList(new MyBean("a", "description a"), + new MyBean("b", "description b"), + new MyBean("c", "description c"), + new MyBean("d", "description d")); } public class MyBean { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableSetUndefinedSize.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSetUndefinedSize.java index e355c0d0ea..7a857995df 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSetUndefinedSize.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSetUndefinedSize.java @@ -36,22 +36,22 @@ public class TableSetUndefinedSize extends AbstractTestUI { private HorizontalLayout createWidthButtons(final Table table) { HorizontalLayout layout = new HorizontalLayout(); - layout.addComponent(new Button("width 500px", - new Button.ClickListener() { + layout.addComponent( + new Button("width 500px", new Button.ClickListener() { @Override public void buttonClick(Button.ClickEvent event) { table.setWidth("500px"); } })); - layout.addComponent(new Button("width 100%", - new Button.ClickListener() { + layout.addComponent( + new Button("width 100%", new Button.ClickListener() { @Override public void buttonClick(Button.ClickEvent event) { table.setWidth("100%"); } })); - layout.addComponent(new Button("undefined width", - new Button.ClickListener() { + layout.addComponent( + new Button("undefined width", new Button.ClickListener() { @Override public void buttonClick(Button.ClickEvent event) { table.setWidthUndefined(); @@ -64,29 +64,29 @@ public class TableSetUndefinedSize extends AbstractTestUI { private HorizontalLayout createHeigthButtons(final Table table) { HorizontalLayout layout = new HorizontalLayout(); - layout.addComponent(new Button("height 200px", - new Button.ClickListener() { + layout.addComponent( + new Button("height 200px", new Button.ClickListener() { @Override public void buttonClick(Button.ClickEvent event) { table.setHeight("200px"); } })); - layout.addComponent(new Button("height 300px", - new Button.ClickListener() { + layout.addComponent( + new Button("height 300px", new Button.ClickListener() { @Override public void buttonClick(Button.ClickEvent event) { table.setHeight("300px"); } })); - layout.addComponent(new Button("height 100%", - new Button.ClickListener() { + layout.addComponent( + new Button("height 100%", new Button.ClickListener() { @Override public void buttonClick(Button.ClickEvent event) { table.setHeight("100%"); } })); - layout.addComponent(new Button("undefined height", - new Button.ClickListener() { + layout.addComponent( + new Button("undefined height", new Button.ClickListener() { @Override public void buttonClick(Button.ClickEvent event) { table.setHeightUndefined(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java index 74de327b19..5fdb4af257 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java @@ -12,7 +12,8 @@ public class TableShouldNotEatValueChanges extends TestBase { @Override protected void setup() { - Table t = new Table("Table with multiselection and item click listener"); + Table t = new Table( + "Table with multiselection and item click listener"); t.focus(); t.setPageLength(3); t.addContainerProperty("foo", String.class, "bar"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableSorting.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSorting.java index 85819784c0..48b98987ad 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSorting.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSorting.java @@ -34,8 +34,8 @@ public class TableSorting extends TestBase { testTable.addListener(new Property.ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - System.out.println("ValueChanged: " - + testTable.getValue().toString()); + System.out.println( + "ValueChanged: " + testTable.getValue().toString()); showID.setCaption("ID: " + testTable.getValue().toString()); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableSqlContainer.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSqlContainer.java index a0738de8a4..ba78372e29 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSqlContainer.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSqlContainer.java @@ -58,8 +58,8 @@ public class TableSqlContainer extends AbstractTestUI { table.addValueChangeListener(new Property.ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - selectedLabel.setValue("Selected: " - + event.getProperty().getValue()); + selectedLabel.setValue( + "Selected: " + event.getProperty().getValue()); } }); @@ -108,14 +108,14 @@ public class TableSqlContainer extends AbstractTestUI { conn = connectionPool.reserveConnection(); Statement statement = conn.createStatement(); - statement - .executeUpdate("INSERT INTO mytable VALUES(1, '2013-05-24', 'A0')"); - statement - .executeUpdate("INSERT INTO mytable VALUES(2, '2013-04-26', 'A1')"); - statement - .executeUpdate("INSERT INTO mytable VALUES(3, '2013-05-27', 'B0')"); - statement - .executeUpdate("INSERT INTO mytable VALUES(4, '2013-04-28', 'B1')"); + statement.executeUpdate( + "INSERT INTO mytable VALUES(1, '2013-05-24', 'A0')"); + statement.executeUpdate( + "INSERT INTO mytable VALUES(2, '2013-04-26', 'A1')"); + statement.executeUpdate( + "INSERT INTO mytable VALUES(3, '2013-05-27', 'B0')"); + statement.executeUpdate( + "INSERT INTO mytable VALUES(4, '2013-04-28', 'B1')"); statement.close(); conn.commit(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidth.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidth.java index 442f00f346..6dfdd84768 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidth.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidth.java @@ -58,7 +58,8 @@ public class TableToggleColumnVisibilityWidth extends AbstractTestUI { if (detailed) { table.setVisibleColumns(new Object[] { "Name" }); } else { - table.setVisibleColumns(new Object[] { "Name", "Last Name" }); + table.setVisibleColumns( + new Object[] { "Name", "Last Name" }); } detailed = !detailed; } diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleVisibility.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleVisibility.java index f89d2d2934..856d9e04fd 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleVisibility.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleVisibility.java @@ -148,9 +148,9 @@ public class TableToggleVisibility extends AbstractTestCase { ToggleButton.this.table.setVisible(!wasVisible); setCaption((wasVisible ? "+ " : "- ") + ToggleButton.this.table.getCaption()); - setDescription((wasVisible ? "Show " : "Hide ") - + "the list with " - + ToggleButton.this.table.getCaption()); + setDescription( + (wasVisible ? "Show " : "Hide ") + "the list with " + + ToggleButton.this.table.getCaption()); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableUndefinedSize.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableUndefinedSize.java index 7705d52cb1..ec6b58fbac 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableUndefinedSize.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableUndefinedSize.java @@ -36,8 +36,8 @@ public class TableUndefinedSize extends TestBase { log = new Log(5); - controls.addComponent(new Button("Fixed size (200x200)", - new Button.ClickListener() { + controls.addComponent( + new Button("Fixed size (200x200)", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { tbl.setWidth("200px"); @@ -46,8 +46,8 @@ public class TableUndefinedSize extends TestBase { } })); - controls.addComponent(new Button("Fixed size (600x200)", - new Button.ClickListener() { + controls.addComponent( + new Button("Fixed size (600x200)", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { tbl.setWidth("600px"); @@ -56,8 +56,8 @@ public class TableUndefinedSize extends TestBase { } })); - controls.addComponent(new Button("Undefined size", - new Button.ClickListener() { + controls.addComponent( + new Button("Undefined size", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { tbl.setSizeUndefined(); @@ -65,15 +65,15 @@ public class TableUndefinedSize extends TestBase { } })); - NativeSelect pageLength = new NativeSelect("PageLength", Arrays.asList( - 0, 1, 2, 4, 8, 10)); + NativeSelect pageLength = new NativeSelect("PageLength", + Arrays.asList(0, 1, 2, 4, 8, 10)); pageLength.setImmediate(true); pageLength.setNullSelectionAllowed(false); pageLength.addListener(new Property.ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - int pageLength = Integer.valueOf(event.getProperty().getValue() - .toString()); + int pageLength = Integer + .valueOf(event.getProperty().getValue().toString()); tbl.setPageLength(pageLength); log.log("Page length: " + pageLength); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java index 2ac9f67402..ebb5f16372 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java @@ -30,7 +30,8 @@ public class TableUnregisterComponent extends TestBase { container.addContainerProperty(COL_B, String.class, ""); Item it = container.addItem("a"); - final ObjectProperty<String> valA = new ObjectProperty<String>("orgVal"); + final ObjectProperty<String> valA = new ObjectProperty<String>( + "orgVal"); final LegacyTextField fieldA = new LegacyTextField(valA) { @Override public void setPropertyDataSource(Property newDataSource) { @@ -49,12 +50,13 @@ public class TableUnregisterComponent extends TestBase { table.setColumnCollapsingAllowed(true); table.setTableFieldFactory(new DefaultFieldFactory() { @Override - public LegacyField<?> createField(Container container, Object itemId, - Object propertyId, Component uiContext) { + public LegacyField<?> createField(Container container, + Object itemId, Object propertyId, Component uiContext) { if (COL_B.equals(propertyId)) { LegacyField<String> field = new LegacyTextField() { @Override - public void setPropertyDataSource(Property newDataSource) { + public void setPropertyDataSource( + Property newDataSource) { super.setPropertyDataSource(newDataSource); if (newDataSource == null) { log.log("Edit field property data source cleared"); @@ -78,7 +80,8 @@ public class TableUnregisterComponent extends TestBase { addComponent(new Button("Switch column collapse", new ClickListener() { @Override public void buttonClick(ClickEvent event) { - table.setColumnCollapsed(COL_A, !table.isColumnCollapsed(COL_A)); + table.setColumnCollapsed(COL_A, + !table.isColumnCollapsed(COL_A)); } })); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWidthItemRemove.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWidthItemRemove.java index bd84fab309..5b3c756d4f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWidthItemRemove.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWidthItemRemove.java @@ -55,8 +55,7 @@ public class TableWidthItemRemove extends AbstractTestUI { addButton("Populate", new ClickListener() { @Override public void buttonClick(ClickEvent event) { - table.addItem( - new Object[] { "John", "Doe", new Integer(1980) }, + table.addItem(new Object[] { "John", "Doe", new Integer(1980) }, Math.random() * 1000); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.java index ad34d50208..56bdbc2704 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.java @@ -77,11 +77,12 @@ public class TableWithBrokenGeneratorAndContainer extends TestBase { } @Override - public Object generateCell(Table source, Object itemId, Object columnId) { + public Object generateCell(Table source, Object itemId, + Object columnId) { if (counter++ % brokenInterval == 0 && Boolean.TRUE.equals(brokenGenerator.getValue())) { - throw new IllegalArgumentException("Broken generator for " - + itemId + "/" + columnId); + throw new IllegalArgumentException( + "Broken generator for " + itemId + "/" + columnId); } else { return "Generated " + itemId + "/" + columnId; } @@ -136,9 +137,9 @@ public class TableWithBrokenGeneratorAndContainer extends TestBase { Table table = ((CacheUpdateException) t) .getTable(); table.removeAllItems(); - Notification - .show("Problem updating table. Please try again later", - Notification.Type.ERROR_MESSAGE); + Notification.show( + "Problem updating table. Please try again later", + Notification.Type.ERROR_MESSAGE); } } } @@ -158,8 +159,8 @@ public class TableWithBrokenGeneratorAndContainer extends TestBase { for (int i = 1; i <= rows; i++) { Item item = container.addItem("item" + i); for (int j = 1; j <= cols; j++) { - item.getItemProperty("prop" + j).setValue( - "item" + i + "/prop" + j); + item.getItemProperty("prop" + j) + .setValue("item" + i + "/prop" + j); } } return container; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithChildComponents.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithChildComponents.java index 7eb9c3239c..cfec94e6c3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithChildComponents.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithChildComponents.java @@ -11,7 +11,8 @@ import com.vaadin.ui.NativeButton; import com.vaadin.ui.Table; import com.vaadin.ui.Table.ColumnGenerator; -public class TableWithChildComponents extends TestBase implements ClickListener { +public class TableWithChildComponents extends TestBase + implements ClickListener { private static final String COL2 = "Column 2 - generated"; private static final String COL1 = "Column 1 - components"; @@ -30,16 +31,15 @@ public class TableWithChildComponents extends TestBase implements ClickListener @Override public Object generateCell(Table source, Object itemId, Object columnId) { - return new Button( - "Item id: " + itemId + " column: " + columnId, + return new Button("Item id: " + itemId + " column: " + columnId, TableWithChildComponents.this); } }); for (int i = 0; i < 100; i++) { Item item = table.addItem("Row " + i); - item.getItemProperty(COL1).setValue( - new NativeButton("Row " + i + " native", this)); + item.getItemProperty(COL1) + .setValue(new NativeButton("Row " + i + " native", this)); } addComponent(table); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java index 4ca83b22bd..3d2ead9fe9 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java @@ -18,19 +18,22 @@ public class TableWithContainerRequiringEqualsForItemId extends AbstractTestUI { private MyEntityContainer container = new MyEntityContainer(); private Log log = new Log(10); - public static class MyEntityContainer extends BeanContainer<Long, MyEntity> { + public static class MyEntityContainer + extends BeanContainer<Long, MyEntity> { public MyEntityContainer() { super(MyEntity.class); - setBeanIdResolver(new BeanIdResolver<Long, TableWithContainerRequiringEqualsForItemId.MyEntity>() { - - @Override - public Long getIdForBean(MyEntity bean) { - // Return a new instance every time to ensure Table can - // handle it - return new Long(bean.getId()); - } - }); + setBeanIdResolver( + new BeanIdResolver<Long, TableWithContainerRequiringEqualsForItemId.MyEntity>() { + + @Override + public Long getIdForBean(MyEntity bean) { + // Return a new instance every time to ensure Table + // can + // handle it + return new Long(bean.getId()); + } + }); } @@ -66,14 +69,15 @@ public class TableWithContainerRequiringEqualsForItemId extends AbstractTestUI { for (int i = 0; i < 1000; i++) { MyEntity myEntity = new MyEntity(i + "st"); - myEntity.setCreated(new Date(new Date().getTime() - 24 * 60 * 60 - * 1000L)); + myEntity.setCreated( + new Date(new Date().getTime() - 24 * 60 * 60 * 1000L)); myEntity.setId(i); container.addBean(myEntity); } t.setContainerDataSource(container); - t.setVisibleColumns(new Object[] { "id", "created", "name", "Actions" }); + t.setVisibleColumns( + new Object[] { "id", "created", "name", "Actions" }); addComponent(t); addComponent(log); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java index b7d965a91f..7ca9d1b236 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java @@ -25,8 +25,8 @@ import com.vaadin.ui.Table; public class TableWithCustomConverterFactory extends AbstractTestUI { - public static class MyIntegerConverter implements - LegacyConverter<String, Integer> { + public static class MyIntegerConverter + implements LegacyConverter<String, Integer> { @Override public Integer convertToModel(String value, @@ -55,9 +55,11 @@ public class TableWithCustomConverterFactory extends AbstractTestUI { } - public static class MyConverterFactory extends LegacyDefaultConverterFactory { + public static class MyConverterFactory + extends LegacyDefaultConverterFactory { @Override - protected LegacyConverter<String, ?> createStringConverter(Class<?> sourceType) { + protected LegacyConverter<String, ?> createStringConverter( + Class<?> sourceType) { if (Integer.class.isAssignableFrom(sourceType)) { return new MyIntegerConverter(); } else { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java index 226fde3b29..6cd5995296 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java @@ -21,9 +21,10 @@ public class TableWithNoncollapsibleColumns extends TestBase { table.addContainerProperty("Column 1 - noncollapsible", String.class, null); - table.addContainerProperty("Column 2 - collapsible", String.class, null); - table.addContainerProperty("Column 3 - toggle collapsing", - String.class, null); + table.addContainerProperty("Column 2 - collapsible", String.class, + null); + table.addContainerProperty("Column 3 - toggle collapsing", String.class, + null); table.setColumnCollapsible("Column 1 - noncollapsible", false); layout.addComponent(table); @@ -32,18 +33,18 @@ public class TableWithNoncollapsibleColumns extends TestBase { new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - table.setColumnCollapsed( - "Column 1 - noncollapsible", - !table.isColumnCollapsed("Column 1 - noncollapsible")); + table.setColumnCollapsed("Column 1 - noncollapsible", + !table.isColumnCollapsed( + "Column 1 - noncollapsible")); } }); final Button button2 = new Button("Column 2: collapse/show", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - table.setColumnCollapsed( - "Column 2 - collapsible", - !table.isColumnCollapsed("Column 2 - collapsible")); + table.setColumnCollapsed("Column 2 - collapsible", + !table.isColumnCollapsed( + "Column 2 - collapsible")); } }); @@ -51,9 +52,9 @@ public class TableWithNoncollapsibleColumns extends TestBase { new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - table.setColumnCollapsed( - "Column 3 - toggle collapsing", - !table.isColumnCollapsed("Column 3 - toggle collapsing")); + table.setColumnCollapsed("Column 3 - toggle collapsing", + !table.isColumnCollapsed( + "Column 3 - toggle collapsing")); } }); final Button button4 = new Button( @@ -63,7 +64,8 @@ public class TableWithNoncollapsibleColumns extends TestBase { public void buttonClick(ClickEvent event) { table.setColumnCollapsible( "Column 3 - toggle collapsing", - !table.isColumnCollapsible("Column 3 - toggle collapsing")); + !table.isColumnCollapsible( + "Column 3 - toggle collapsing")); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithPolling.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithPolling.java index fdd5c2901a..55e86f49d7 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithPolling.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithPolling.java @@ -40,8 +40,9 @@ public class TableWithPolling extends AbstractTestUI { table.addContainerProperty("Last Name", String.class, null); table.addContainerProperty("Year", Integer.class, null); - table.addItem(new Object[] { "Nicolaus", "Copernicus", - new Integer(1473) }, new Integer(1)); + table.addItem( + new Object[] { "Nicolaus", "Copernicus", new Integer(1473) }, + new Integer(1)); table.addItem(new Object[] { "Tycho", "Brahe", new Integer(1546) }, new Integer(2)); table.addItem(new Object[] { "Giordano", "Bruno", new Integer(1548) }, diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java b/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java index e82cb8321f..f6dfc6de4b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java @@ -59,8 +59,8 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private Command<T, Boolean> columnVisibleCommand = new Command<T, Boolean>() { @Override public void execute(Table c, Boolean visible, Object propertyId) { - List<Object> visibleColumns = new ArrayList<Object>(Arrays.asList(c - .getVisibleColumns())); + List<Object> visibleColumns = new ArrayList<Object>( + Arrays.asList(c.getVisibleColumns())); if (visible) { // Table should really check this... Completely fails without // the check (# @@ -205,7 +205,8 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private Command<T, ColumnHeaderMode> columnHeaderModeCommand = new Command<T, ColumnHeaderMode>() { @Override - public void execute(T c, ColumnHeaderMode columnHeaderMode, Object data) { + public void execute(T c, ColumnHeaderMode columnHeaderMode, + Object data) { c.setColumnHeaderMode(columnHeaderMode); } @@ -246,8 +247,8 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> @Override public void execute(T c, final GeneratedColumn col, Object data) { - while (c.getColumnGenerator(generatedColumnId - + generatedColumnNextNr) != null) { + while (c.getColumnGenerator( + generatedColumnId + generatedColumnNextNr) != null) { generatedColumnNextNr++; } @@ -314,7 +315,8 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private final Object itemId; private final Object propertyId; - public CellStyleInfo(String styleName, Object itemId, Object propertyId) { + public CellStyleInfo(String styleName, Object itemId, + Object propertyId) { this.styleName = styleName; this.itemId = itemId; this.propertyId = propertyId; @@ -322,15 +324,17 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> public boolean appliesTo(Object itemId, Object propertyId) { return (this.itemId != null && this.itemId.equals(itemId)) - && (this.propertyId == propertyId || (this.propertyId != null && this.propertyId - .equals(propertyId))); + && (this.propertyId == propertyId + || (this.propertyId != null + && this.propertyId.equals(propertyId))); } } private Command<T, CellStyleInfo> cellStyleCommand = new Command<T, CellStyleInfo>() { @Override - public void execute(T c, final CellStyleInfo cellStyleInfo, Object data) { + public void execute(T c, final CellStyleInfo cellStyleInfo, + Object data) { if (cellStyleInfo == null) { c.setCellStyleGenerator(null); } else { @@ -384,12 +388,13 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> c.setRowGenerator(new RowGenerator() { @Override - public GeneratedRow generateRow(Table table, Object itemId) { + public GeneratedRow generateRow(Table table, + Object itemId) { if (generatedRowInfo.appliesTo(itemId)) { GeneratedRow generatedRow = new GeneratedRow( generatedRowInfo.text); - generatedRow - .setHtmlContentAllowed(generatedRowInfo.isHtml); + generatedRow.setHtmlContentAllowed( + generatedRowInfo.isHtml); return generatedRow; } return null; @@ -455,34 +460,34 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> createClickAction("Add Button", category, addGeneratedColumnCommand, new GeneratedColumn(Button.class, null, false)); createClickAction("Add 200px wide Button", category, - addGeneratedColumnCommand, new GeneratedColumn(Button.class, - "200px", false)); + addGeneratedColumnCommand, + new GeneratedColumn(Button.class, "200px", false)); createClickAction("Add 100% wide Button", category, - addGeneratedColumnCommand, new GeneratedColumn(Button.class, - "100%", false)); + addGeneratedColumnCommand, + new GeneratedColumn(Button.class, "100%", false)); createClickAction("Add Label", category, addGeneratedColumnCommand, new GeneratedColumn(Label.class, null, false)); createClickAction("Add 100px Label", category, - addGeneratedColumnCommand, new GeneratedColumn(Label.class, - "100px", false)); + addGeneratedColumnCommand, + new GeneratedColumn(Label.class, "100px", false)); createClickAction("Add 100% wide Label", category, - addGeneratedColumnCommand, new GeneratedColumn(Label.class, - "100%", false)); + addGeneratedColumnCommand, + new GeneratedColumn(Label.class, "100%", false)); createClickAction("Remove generated columns", category, removeGeneratedColumnsCommand, null); createClickAction("Add string as generated column", category, - addGeneratedColumnCommand, new GeneratedColumn(String.class, - "", false)); + addGeneratedColumnCommand, + new GeneratedColumn(String.class, "", false)); createClickAction("Add HTML string as generated column", category, - addGeneratedColumnCommand, new GeneratedColumn(String.class, - "", true)); + addGeneratedColumnCommand, + new GeneratedColumn(String.class, "", true)); createClickAction("Add 100px HTML Label", category, - addGeneratedColumnCommand, new GeneratedColumn(Label.class, - "100px", true)); + addGeneratedColumnCommand, + new GeneratedColumn(Label.class, "100px", true)); createClickAction("Add Object as generated column", category, - addGeneratedColumnCommand, new GeneratedColumn(Object.class, - "", false)); + addGeneratedColumnCommand, + new GeneratedColumn(Object.class, "", false)); } private void createCellStyleAction(String categoryFeatures) { @@ -506,14 +511,13 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> for (int ix = 0; ix < props; ix++) { text[ix] = "foo" + ix; } - options.put("Every tenth row, no spanning", new GeneratedRowInfo(10, - false, text)); - options.put( - "Every eight row, spanned, html formatted", + options.put("Every tenth row, no spanning", + new GeneratedRowInfo(10, false, text)); + options.put("Every eight row, spanned, html formatted", new GeneratedRowInfo(8, true, "<b>foo</b> <i>bar</i> <span style='color:red;text-size:0.5em;'>baz</span>")); - options.put("Every row, spanned", new GeneratedRowInfo(1, false, - "spanned")); + options.put("Every row, spanned", + new GeneratedRowInfo(1, false, "spanned")); createSelectAction("Row generator", categoryFeatures, options, "None", rowGeneratorCommand, true); } @@ -549,8 +553,8 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> cm.addItem("Caption only", null); cm.addItem("Has icon", ICON_16_USER_PNG_UNCACHEABLE); options.put("With and without icon", cm); - options.put("Only one large icon", new ContextMenu("Icon", - ICON_64_EMAIL_REPLY_PNG_UNCACHEABLE)); + options.put("Only one large icon", + new ContextMenu("Icon", ICON_64_EMAIL_REPLY_PNG_UNCACHEABLE)); options.put("Empty", new ContextMenu() { @Override public Action[] getActions(Object target, Object sender) { @@ -752,10 +756,8 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> && nr % 2 == 0) { c.setColumnHeader(propertyId, null); } else if (value != null) { - c.setColumnHeader( - propertyId, - value.replace("{id}", - propertyId.toString())); + c.setColumnHeader(propertyId, value.replace( + "{id}", propertyId.toString())); } else { c.setColumnHeader(propertyId, null); } @@ -812,7 +814,8 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> "Explicit defaults id", new Command<T, ColumnHeaderMode>() { @Override - public void execute(T c, ColumnHeaderMode value, Object data) { + public void execute(T c, ColumnHeaderMode value, + Object data) { c.setColumnHeaderMode(value); } @@ -852,7 +855,8 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> "Multi - ctrl/shift", new Command<T, SelectMode>() { @Override - public void execute(Table t, SelectMode value, Object data) { + public void execute(Table t, SelectMode value, + Object data) { switch (value) { case NONE: t.setSelectable(false); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TabletContextMenu.java b/uitest/src/main/java/com/vaadin/tests/components/table/TabletContextMenu.java index 193cb499a7..72f96b4172 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TabletContextMenu.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TabletContextMenu.java @@ -104,7 +104,8 @@ public class TabletContextMenu extends AbstractTestUI { ShortcutAction.KeyCode.DELETE, null); @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { System.out.println(action.getCaption()); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java b/uitest/src/main/java/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java index 8244835df7..3891fb8212 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java @@ -10,7 +10,8 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Table; -public class TestCurrentPageFirstItem extends TestBase implements ClickListener { +public class TestCurrentPageFirstItem extends TestBase + implements ClickListener { private Button buttonIndex; private Button buttonItem; @@ -56,8 +57,9 @@ public class TestCurrentPageFirstItem extends TestBase implements ClickListener Table t = tables[i]; t.select(counter); if (event.getButton() == buttonIndex) { - t.setCurrentPageFirstItemIndex(((Container.Indexed) t - .getContainerDataSource()).indexOfId(counter)); + t.setCurrentPageFirstItemIndex( + ((Container.Indexed) t.getContainerDataSource()) + .indexOfId(counter)); } else { t.setCurrentPageFirstItemId(counter); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ValueAfterClearingContainer.java b/uitest/src/main/java/com/vaadin/tests/components/table/ValueAfterClearingContainer.java index 58abce830b..d21a09838a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/ValueAfterClearingContainer.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/ValueAfterClearingContainer.java @@ -47,8 +47,8 @@ public class ValueAfterClearingContainer extends TestBase { @Override public void buttonClick(ClickEvent event) { if (!table.getItemIds().isEmpty()) { - Notification - .show("Only possible when the table is empty"); + Notification.show( + "Only possible when the table is empty"); return; } else { for (int i = 0; i < 5; i++) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheet.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheet.java index 3e132c583b..3d32cadb0a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheet.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheet.java @@ -25,8 +25,8 @@ public class FirstTabNotVisibleInTabsheet extends AbstractTestUI { tabSheet.addTab(new Label("visible tab " + i), "visible tab " + i); } - addComponent(new VerticalLayout(tabSheet, new Button( - "Toggle first tab", new Button.ClickListener() { + addComponent(new VerticalLayout(tabSheet, + new Button("Toggle first tab", new Button.ClickListener() { @Override public void buttonClick(Button.ClickEvent event) { firstTab.setVisible(!firstTab.isVisible()); diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/PreventTabChange.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/PreventTabChange.java index fddb036728..6a3d308733 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/PreventTabChange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/PreventTabChange.java @@ -7,8 +7,8 @@ import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.SelectedTabChangeEvent; import com.vaadin.ui.TabSheet.SelectedTabChangeListener; -public class PreventTabChange extends TestBase implements - SelectedTabChangeListener { +public class PreventTabChange extends TestBase + implements SelectedTabChangeListener { private TabSheet tabSheet; diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabBarWidth.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabBarWidth.java index accd77ae0e..d7a69b50f9 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabBarWidth.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabBarWidth.java @@ -82,9 +82,8 @@ public class TabBarWidth extends AbstractTestUI { String originalWidth = (String) ((TabSheet) component) .getData(); component.setWidth(originalWidth); - component.setCaption("Width: " - + (originalWidth == null ? "undefined" - : originalWidth)); + component.setCaption("Width: " + (originalWidth == null + ? "undefined" : originalWidth)); } } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java index 0d4f1fe562..a480751b15 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java @@ -34,8 +34,8 @@ public class TabGetAndReplaceComponent extends TestBase { Tab tab = tabs.getTab(content2); // Replace content - tabs.replaceComponent(tab.getComponent(), new Label( - "Replacement 2")); + tabs.replaceComponent(tab.getComponent(), + new Label("Replacement 2")); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java index 09e34307c0..899de78252 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java @@ -38,8 +38,8 @@ public class TabSheetCaptions extends TestBase { VerticalLayout layout1 = new VerticalLayout(); layout1.setMargin(true); layout1.setSizeFull(); - panel1 = new Panel( - "Panel initial caption (should also be tab caption)", layout1); + panel1 = new Panel("Panel initial caption (should also be tab caption)", + layout1); panel1.setSizeFull(); layout1.addComponent(new Label("This is a panel")); tabSheet.addTab(panel1); @@ -48,9 +48,8 @@ public class TabSheetCaptions extends TestBase { button.addClickListener(new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - tabSheet.getTab(panel1).setCaption( - "This is a new tab caption " - + dateFormatter.format(date)); + tabSheet.getTab(panel1).setCaption("This is a new tab caption " + + dateFormatter.format(date)); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java index f0c51be9ed..50050b9a36 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java @@ -39,7 +39,8 @@ public class TabSheetIcons extends TestBase { tab[0] = new Label("This is tab 1"); tab[0].setIcon(new ThemeResource("../runo/icons/32/folder-add.png")); tab[0].setCaption("tab number 1"); - tab[1] = new LegacyTextField("This is tab 2", "Contents of tab 2 textfield"); + tab[1] = new LegacyTextField("This is tab 2", + "Contents of tab 2 textfield"); tab[2] = new Label("This is tab 3"); tab[2].setIcon(new ThemeResource("../runo/icons/16/folder-add.png")); tab[2].setCaption("tab number 3"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java index de637bbed7..8e6b17d81e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java @@ -59,9 +59,8 @@ public class TabSheetIndexOperations extends TestBase { @Override public void buttonClick(ClickEvent event) { getMainWindow().showNotification( - "Index: " - + tabs.getTabPosition(tabs.getTab(tabs - .getSelectedTab()))); + "Index: " + tabs.getTabPosition( + tabs.getTab(tabs.getSelectedTab()))); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java index c14203e765..4114abfd99 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java @@ -21,8 +21,8 @@ public class TabSheetTabStyleNames extends TestBase { tab1.setStyleName(STYLE_NAME); - addComponent(new Button("Update style names", - new Button.ClickListener() { + addComponent( + new Button("Update style names", new Button.ClickListener() { int counter = 0; @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java index 5c76effefd..bd86191451 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java @@ -11,7 +11,8 @@ public class TabSheetTabTheming extends TestBase { TabSheet tabsheet = new TabSheet(); tabsheet.setStyleName("pg"); tabsheet.addTab(new Label(), "Brown fox and the fence", null); - tabsheet.addTab(new Label(), "Something about using all the keys", null); + tabsheet.addTab(new Label(), "Something about using all the keys", + null); addComponent(tabsheet); setTheme("tests-tickets"); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTest.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTest.java index 56836037b7..c106b5bde2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTest.java @@ -165,8 +165,8 @@ public class TabSheetTest<T extends TabSheet> extends iconOptions.put("16x16 (cachable)", ICON_16_USER_PNG_CACHEABLE); iconOptions.put("16x16 (uncachable)", ICON_16_USER_PNG_UNCACHEABLE); iconOptions.put("32x32 (cachable)", ICON_32_ATTENTION_PNG_CACHEABLE); - iconOptions - .put("32x32 (uncachable)", ICON_32_ATTENTION_PNG_UNCACHEABLE); + iconOptions.put("32x32 (uncachable)", + ICON_32_ATTENTION_PNG_UNCACHEABLE); iconOptions.put("64x64 (cachable)", ICON_64_EMAIL_REPLY_PNG_CACHEABLE); iconOptions.put("64x64 (uncachable)", ICON_64_EMAIL_REPLY_PNG_UNCACHEABLE); diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.java index 2dd4993aca..b242e192b0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.java @@ -64,8 +64,8 @@ public class TabSheetWithHasComponent extends AbstractTestUI { } protected TabSheet createSmallTabSheet() { - return new TabSheet(new Button("Tab1 inside popup"), new NativeButton( - "Tab 2 inside popup")); + return new TabSheet(new Button("Tab1 inside popup"), + new NativeButton("Tab 2 inside popup")); } private Panel createPanel() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java index fe1bcd0a1a..a3301a905d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java @@ -76,7 +76,8 @@ public class TabsheetScrolling extends TestBase { new ClickListener() { @Override public void buttonClick(ClickEvent event) { - int lastFixed = fixedSizeTabSheet.getComponentCount() - 1; + int lastFixed = fixedSizeTabSheet.getComponentCount() + - 1; fixedSizeTabSheet.setSelectedTab(lastFixed); int lastAuto = autoWideTabSheet.getComponentCount() - 1; autoWideTabSheet.setSelectedTab(lastAuto); diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java index bd39910ddb..95ba3f1baf 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java @@ -37,7 +37,8 @@ public class TabsheetShouldUpdateHeight extends TestBase { addComponent(btnSwitch); } - private VerticalLayout getLayoutWithComponents(final int inAmount, String id) { + private VerticalLayout getLayoutWithComponents(final int inAmount, + String id) { final VerticalLayout v = new VerticalLayout(); v.setDebugId(id); v.setSpacing(true); diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java index 110f26d478..531c0f73d0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java @@ -25,8 +25,7 @@ public class VerticalScrollbarPosition extends TestBase { tf.setRows(2); tf.setHeight("300px"); tf.setWidth("200px"); - tabsheet.addTab( - tf, + tabsheet.addTab(tf, "A text area that is 200px wide, the tab bar for the tabsheet is wider", null); TextArea tf2 = new TextArea("Another tab", "b"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/textarea/ScrollCursor.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/ScrollCursor.java index 154a30a64b..4a2294e478 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textarea/ScrollCursor.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textarea/ScrollCursor.java @@ -18,11 +18,11 @@ public class ScrollCursor extends TestBase { @Override protected void setup() { textArea = new TextArea(); - textArea.setValue("saddddddddddd fdgdfgfdgfd\n" - + "aasddddddddddd\n" + "dsaffffffdsf\n" + "sdf\n" - + "dsfsdfsdfsdfsd\n\n" + "ffffffffffffffffffff\n" - + "sdfdsfdsfsdfsdfsd xxxxxxxxxxxxxxxx\n" + "sdgfsd\n" - + "dsf\n" + "ds\n" + "fds\n" + "fds\nfs"); + textArea.setValue("saddddddddddd fdgdfgfdgfd\n" + "aasddddddddddd\n" + + "dsaffffffdsf\n" + "sdf\n" + "dsfsdfsdfsdfsd\n\n" + + "ffffffffffffffffffff\n" + + "sdfdsfdsfsdfsdfsd xxxxxxxxxxxxxxxx\n" + "sdgfsd\n" + "dsf\n" + + "ds\n" + "fds\n" + "fds\nfs"); addComponent(textArea); Button button = new Button("Scroll"); button.addListener(new ClickListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java index 50a7155a78..db6aa01281 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java @@ -13,7 +13,8 @@ import com.vaadin.ui.TextArea; public class TextAreaCursorPosition extends TestBase { - private LegacyTextField cursorPosition = new LegacyTextField("Cursor position"); + private LegacyTextField cursorPosition = new LegacyTextField( + "Cursor position"); @Override public void setup() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java index 38f0fb5326..4561431ac6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java @@ -58,7 +58,8 @@ public class BigDecimalTextField extends AbstractTestUIWithLog { Button setValue = new Button("Set value to 15,2", new ClickListener() { @Override public void buttonClick(ClickEvent event) { - ((LegacyTextField) fieldGroup.getField("decimal")).setValue("15,2"); + ((LegacyTextField) fieldGroup.getField("decimal")) + .setValue("15,2"); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java index 646824cd8f..8cb0076038 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java @@ -37,7 +37,8 @@ public class EnterShortcutMaySendInputPromptAsValue extends TestBase { } @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { if (action == enter) { } diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java index 7e3f377155..3387ad4f15 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java @@ -67,17 +67,17 @@ public class InputPromptGetText extends AbstractTestUI { getLayout().addComponent(label); } }); - tf.addShortcutListener(new ShortcutListener("Shortcut", KeyCode.ENTER, - null) { + tf.addShortcutListener( + new ShortcutListener("Shortcut", KeyCode.ENTER, null) { - @Override - public void handleAction(Object sender, Object target) { - String input = tf.getValue(); - Label label = new Label("Your input was: " + input); - label.setId(LABEL1); - getLayout().addComponent(label); - } - }); + @Override + public void handleAction(Object sender, Object target) { + String input = tf.getValue(); + Label label = new Label("Your input was: " + input); + label.setId(LABEL1); + getLayout().addComponent(label); + } + }); getLayout().addComponent(tf); getLayout().addComponent(button); diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java index c194b1486e..0f13f5f92d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java @@ -122,8 +122,9 @@ public class TextChangeEvents2 extends TestBase { } { - final LegacyTextField[] tfs = new LegacyTextField[] { new LegacyTextField(), - new LegacyTextField(), new LegacyTextField(), new LegacyTextField() }; + final LegacyTextField[] tfs = new LegacyTextField[] { + new LegacyTextField(), new LegacyTextField(), + new LegacyTextField(), new LegacyTextField() }; HorizontalLayout hl = new HorizontalLayout(); hl.setCaption("Blää"); getLayout().addComponent(hl); @@ -162,7 +163,8 @@ public class TextChangeEvents2 extends TestBase { @Override public void valueChange(ValueChangeEvent event) { - LegacyTextField tf = (LegacyTextField) event.getProperty(); + LegacyTextField tf = (LegacyTextField) event + .getProperty(); String val = tf.getValue(); if (val != null && val.length() > 4) { tf.setValue(val.substring(0, 4)); diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java index a533456179..e8bfc639ae 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java @@ -12,8 +12,8 @@ public class TextFieldInLayoutInTable extends LegacyApplication { @Override public void init() { - final LegacyWindow mainWindow = new LegacyWindow(this.getClass() - .getName()); + final LegacyWindow mainWindow = new LegacyWindow( + this.getClass().getName()); setMainWindow(mainWindow); final Table table = new Table(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java index 777c29ad37..71303c4209 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java @@ -4,8 +4,8 @@ import com.vaadin.event.FieldEvents.TextChangeListener; import com.vaadin.legacy.ui.LegacyTextField; import com.vaadin.tests.components.abstractfield.LegacyAbstractTextFieldTest; -public class TextFieldTest extends LegacyAbstractTextFieldTest<LegacyTextField> implements - TextChangeListener { +public class TextFieldTest extends LegacyAbstractTextFieldTest<LegacyTextField> + implements TextChangeListener { @Override protected Class<LegacyTextField> getTestClass() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java index 1b8b6c3ba5..d7518eea95 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java @@ -35,7 +35,8 @@ public class TextFieldWithDataSourceAndInputPrompt extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - LegacyTextField textField = new LegacyTextField("TextField with null value"); + LegacyTextField textField = new LegacyTextField( + "TextField with null value"); textField.setInputPrompt("Me is input prompt"); textField.setNullRepresentation(null); textField.setValue(null); diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeConnectors.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeConnectors.java index 5c2d4d8e39..da9569aa9a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeConnectors.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeConnectors.java @@ -58,16 +58,16 @@ public class TreeConnectors extends TestBase { }); - tree.setItemIcon("Item 1", new ThemeResource( - "../runo/icons/32/folder.png")); - tree.setItemIcon("Item 3", new ThemeResource( - "../runo/icons/32/document.png")); - tree.setItemIcon("Item 13", new ThemeResource( - "../runo/icons/64/user.png")); - tree.setItemIcon("Item 72", new ThemeResource( - "../runo/icons/64/users.png")); - tree.setItemIcon("Item 17", new ThemeResource( - "../runo/icons/16/document-pdf.png")); + tree.setItemIcon("Item 1", + new ThemeResource("../runo/icons/32/folder.png")); + tree.setItemIcon("Item 3", + new ThemeResource("../runo/icons/32/document.png")); + tree.setItemIcon("Item 13", + new ThemeResource("../runo/icons/64/user.png")); + tree.setItemIcon("Item 72", + new ThemeResource("../runo/icons/64/users.png")); + tree.setItemIcon("Item 17", + new ThemeResource("../runo/icons/16/document-pdf.png")); return tree; } diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java index f885e1d1da..409df2b18d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java @@ -29,8 +29,8 @@ public class TreeNodeCaptionWrapping extends TestBase { String subItem = "Subitem - also long"; tree.addItem(mainItem); - tree.setItemIcon(mainItem, new ThemeResource( - "../runo/icons/16/error.png")); + tree.setItemIcon(mainItem, + new ThemeResource("../runo/icons/16/error.png")); tree.addItem(subItem); tree.setParent(subItem, mainItem); diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeToolTips.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeToolTips.java index 59e3fec1f9..6839e6837c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeToolTips.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeToolTips.java @@ -12,13 +12,14 @@ public class TreeToolTips extends TestBase { @Override protected void setup() { final Tree tree = new Tree(null, createContainer()); - tree.setItemDescriptionGenerator(new AbstractSelect.ItemDescriptionGenerator() { - @Override - public String generateDescription(Component source, Object itemId, - Object propertyId) { - return "This is a tooltip for item id '" + itemId + "'"; - } - }); + tree.setItemDescriptionGenerator( + new AbstractSelect.ItemDescriptionGenerator() { + @Override + public String generateDescription(Component source, + Object itemId, Object propertyId) { + return "This is a tooltip for item id '" + itemId + "'"; + } + }); for (Object rootItems : tree.rootItemIds()) { tree.expandItemsRecursively(rootItems); diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/Trees.java b/uitest/src/main/java/com/vaadin/tests/components/tree/Trees.java index f12d6adbb3..d41cdd94d2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tree/Trees.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tree/Trees.java @@ -19,8 +19,8 @@ import com.vaadin.ui.Tree.ExpandEvent; import com.vaadin.ui.Tree.ExpandListener; import com.vaadin.ui.Tree.ItemStyleGenerator; -public class Trees extends AbstractSelectTestCase<Tree> implements - ExpandListener, CollapseListener { +public class Trees extends AbstractSelectTestCase<Tree> + implements ExpandListener, CollapseListener { private int rootItemIds = 3; @@ -137,8 +137,8 @@ public class Trees extends AbstractSelectTestCase<Tree> implements cm.addItem("Caption only", null); cm.addItem("Has icon", ICON_16_USER_PNG_UNCACHEABLE); options.put("With and without icon", cm); - options.put("Only one large icon", new ContextMenu("Icon", - ICON_64_EMAIL_REPLY_PNG_UNCACHEABLE)); + options.put("Only one large icon", + new ContextMenu("Icon", ICON_64_EMAIL_REPLY_PNG_UNCACHEABLE)); createSelectAction("Context menu", category, options, "None", contextMenuCommand, true); @@ -149,7 +149,8 @@ public class Trees extends AbstractSelectTestCase<Tree> implements LinkedHashMap<String, com.vaadin.ui.Tree.ItemStyleGenerator> options = new LinkedHashMap<String, com.vaadin.ui.Tree.ItemStyleGenerator>(); options.put("-", null); - options.put(rootGreenSecondLevelRed.toString(), rootGreenSecondLevelRed); + options.put(rootGreenSecondLevelRed.toString(), + rootGreenSecondLevelRed); options.put(evenItemsBold.toString(), evenItemsBold); createSelectAction("Item Style generator", category, options, "-", @@ -387,8 +388,8 @@ public class Trees extends AbstractSelectTestCase<Tree> implements private Command<Tree, com.vaadin.ui.Tree.ItemStyleGenerator> itemStyleGeneratorCommand = new Command<Tree, com.vaadin.ui.Tree.ItemStyleGenerator>() { @Override - public void execute(Tree c, - com.vaadin.ui.Tree.ItemStyleGenerator value, Object data) { + public void execute(Tree c, com.vaadin.ui.Tree.ItemStyleGenerator value, + Object data) { c.setItemStyleGenerator(value); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java index 3d40bc47cf..69cb884c07 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java @@ -43,9 +43,9 @@ public class ChangeDataSourcePageLengthZero extends TestBase { .getContainerDataSource(); Object itemId = container.addItem(); container.getContainerProperty(itemId, "i").setValue(i++); - container.getContainerProperty(itemId, "link").setValue( - new Link(String.valueOf(i + 1), new ExternalResource( - "http://www.google.fi"))); + container.getContainerProperty(itemId, "link") + .setValue(new Link(String.valueOf(i + 1), + new ExternalResource("http://www.google.fi"))); container.setChildrenAllowed(itemId, false); container.setParent(itemId, null); } @@ -68,9 +68,9 @@ public class ChangeDataSourcePageLengthZero extends TestBase { for (int i = 0; i < num; i++) { Object item = container.addItem(); container.getContainerProperty(item, "i").setValue(i + 1); - container.getContainerProperty(item, "link").setValue( - new Link(String.valueOf(i + 1), new ExternalResource( - "http://www.google.fi"))); + container.getContainerProperty(item, "link") + .setValue(new Link(String.valueOf(i + 1), + new ExternalResource("http://www.google.fi"))); if (i > 0 && (i + 1) % 2 == 0) { container.setChildrenAllowed(item, false); container.setParent(item, previous); diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/DisappearingComponents.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/DisappearingComponents.java index ee64007234..c60090d974 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/DisappearingComponents.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/DisappearingComponents.java @@ -21,8 +21,7 @@ public class DisappearingComponents extends AbstractTestUI { for (int i = 0; i < items.length; i++) { items[i] = tt .addItem( - new Object[] { - i + 1, + new Object[] { i + 1, new Link(String.valueOf(i + 1), new ExternalResource( "http://www.google.fi")) }, diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/DynamicallyModified.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/DynamicallyModified.java index e089237b54..484076d804 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/DynamicallyModified.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/DynamicallyModified.java @@ -8,8 +8,8 @@ import com.vaadin.ui.Tree.CollapseEvent; import com.vaadin.ui.Tree.ExpandEvent; import com.vaadin.ui.TreeTable; -public class DynamicallyModified extends TestBase implements - Tree.ExpandListener, Tree.CollapseListener { +public class DynamicallyModified extends TestBase + implements Tree.ExpandListener, Tree.CollapseListener { protected static final String NAME_PROPERTY = "Name"; protected static final String HOURS_PROPERTY = "Hours done"; protected static final String MODIFIED_PROPERTY = "Last Modified"; @@ -36,22 +36,22 @@ public class DynamicallyModified extends TestBase implements DEFAULT_DATE); // Populate table - Object allProjects = treetable.addItem(new Object[] { "All Projects", - 18, DEFAULT_DATE }, null); - Object year2010 = treetable.addItem(new Object[] { "Year 2010", 18, - DEFAULT_DATE }, null); - Object customerProject1 = treetable.addItem(new Object[] { - "Customer Project 1", 13, DEFAULT_DATE }, null); - Object customerProject1Implementation = treetable.addItem(new Object[] { - "Implementation", 5, DEFAULT_DATE }, null); - Object customerProject1Planning = treetable.addItem(new Object[] { - "Planning", 2, DEFAULT_DATE }, null); - Object customerProject1Prototype = treetable.addItem(new Object[] { - "Prototype", 5, DEFAULT_DATE }, null); - Object customerProject2 = treetable.addItem(new Object[] { - "Customer Project 2", 5, DEFAULT_DATE }, null); - Object customerProject2Planning = treetable.addItem(new Object[] { - "Planning", 5, DEFAULT_DATE }, null); + Object allProjects = treetable.addItem( + new Object[] { "All Projects", 18, DEFAULT_DATE }, null); + Object year2010 = treetable + .addItem(new Object[] { "Year 2010", 18, DEFAULT_DATE }, null); + Object customerProject1 = treetable.addItem( + new Object[] { "Customer Project 1", 13, DEFAULT_DATE }, null); + Object customerProject1Implementation = treetable.addItem( + new Object[] { "Implementation", 5, DEFAULT_DATE }, null); + Object customerProject1Planning = treetable + .addItem(new Object[] { "Planning", 2, DEFAULT_DATE }, null); + Object customerProject1Prototype = treetable + .addItem(new Object[] { "Prototype", 5, DEFAULT_DATE }, null); + Object customerProject2 = treetable.addItem( + new Object[] { "Customer Project 2", 5, DEFAULT_DATE }, null); + Object customerProject2Planning = treetable + .addItem(new Object[] { "Planning", 5, DEFAULT_DATE }, null); // Set hierarchy treetable.setParent(year2010, allProjects); diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java index 2042edeea2..9c34efb539 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java @@ -62,13 +62,12 @@ public class ExpandAnimationsInChameleon extends TestBase { super.addComponent(c); setComponentAlignment(c, Alignment.MIDDLE_CENTER); if (c.getStyleName() != "") { - ((AbstractComponent) c).setDescription(c.getClass() - .getSimpleName() - + ".addStyleName(\"" - + c.getStyleName() + "\")"); + ((AbstractComponent) c).setDescription( + c.getClass().getSimpleName() + ".addStyleName(\"" + + c.getStyleName() + "\")"); } else { - ((AbstractComponent) c).setDescription("new " - + c.getClass().getSimpleName() + "()"); + ((AbstractComponent) c).setDescription( + "new " + c.getClass().getSimpleName() + "()"); } } }; @@ -106,8 +105,8 @@ public class ExpandAnimationsInChameleon extends TestBase { hc.setParent(j, 2); } - t.setColumnIcon("Third", new ThemeResource( - "../runo/icons/16/document.png")); + t.setColumnIcon("Third", + new ThemeResource("../runo/icons/16/document.png")); t.select(1); return t; diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java index f444b781dd..09477213a8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java @@ -12,8 +12,8 @@ import com.vaadin.ui.Tree.ExpandEvent; import com.vaadin.ui.Tree.ExpandListener; import com.vaadin.ui.TreeTable; -public class KeepAllItemsVisible extends TestBase implements ExpandListener, - CollapseListener { +public class KeepAllItemsVisible extends TestBase + implements ExpandListener, CollapseListener { private static final String CAPTION = "caption"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java index ea76a9639a..c9f74dd654 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java @@ -22,14 +22,15 @@ public class ProgrammaticCollapse extends TestBase { table.addItem(new Object[] { "A" + i, "B" + i }, parentid); for (int j = 1; j < 5; ++j) { int id = 1000 * i + j; - table.addItem(new Object[] { "A" + i + "." + j, - "B" + i + "." + j }, id); + table.addItem( + new Object[] { "A" + i + "." + j, "B" + i + "." + j }, + id); table.setParent(id, parentid); } } layout.addComponent(table); - layout.addComponent(new Button("Expand / Collapse", - new ClickListener() { + layout.addComponent( + new Button("Expand / Collapse", new ClickListener() { @Override public void buttonClick(ClickEvent event) { boolean collapsed = !table.isCollapsed(1); @@ -37,8 +38,8 @@ public class ProgrammaticCollapse extends TestBase { table.setCollapsed(1, collapsed); } })); - layout.addComponent(new Button("Expand / Collapse last", - new ClickListener() { + layout.addComponent( + new Button("Expand / Collapse last", new ClickListener() { @Override public void buttonClick(ClickEvent event) { boolean collapsed = !table.isCollapsed(100); @@ -46,8 +47,8 @@ public class ProgrammaticCollapse extends TestBase { table.setCollapsed(100, collapsed); } })); - layout.addComponent(new Button("Expand / Collapse multiple", - new ClickListener() { + layout.addComponent( + new Button("Expand / Collapse multiple", new ClickListener() { private boolean collapsed = true; @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticSelect.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticSelect.java index 7088497b4e..23776a14b7 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticSelect.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticSelect.java @@ -109,8 +109,8 @@ public class ProgrammaticSelect extends TestBase { for (int i = 1; i <= items; i++) { Item item = c.addItem("Item " + i); for (int j = 1; j <= properties; j++) { - item.getItemProperty("Property " + j).setValue( - "Item " + i + "," + j); + item.getItemProperty("Property " + j) + .setValue("Item " + i + "," + j); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java index 4372341161..b7b7371b89 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java @@ -80,14 +80,14 @@ public class RemoveAllItemsRefresh extends TestBase { containerItem = treeContainer.addItem("first"); containerItem.getItemProperty(NAME_PROPERTY) .setValue("1 NAME_PROPERTY"); - containerItem.getItemProperty(TITLE_PROPERTY).setValue( - "1 TITLE_PROPERTY"); + containerItem.getItemProperty(TITLE_PROPERTY) + .setValue("1 TITLE_PROPERTY"); containerItem = treeContainer.addItem("second"); containerItem.getItemProperty(NAME_PROPERTY) .setValue("2 NAME_PROPERTY"); - containerItem.getItemProperty(TITLE_PROPERTY).setValue( - "2 TITLE_PROPERTY"); + containerItem.getItemProperty(TITLE_PROPERTY) + .setValue("2 TITLE_PROPERTY"); treetable.setContainerDataSource(treeContainer); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java index de33d26051..35db40b966 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java @@ -74,8 +74,8 @@ public class TreeTableCacheOnPartialUpdates extends TestBase { TestBean tb = (TestBean) itemId; String identifier = "Item " + itemId + "/" + columnId; Button btnCol3 = new NativeButton(identifier); - btnCol3.setId("cacheTestButton-" + tb.getCol1() + "-" - + tb.getCol2()); + btnCol3.setId( + "cacheTestButton-" + tb.getCol1() + "-" + tb.getCol2()); btnCol3.addClickListener(new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbar.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbar.java index 79c967914f..eb7053ab0d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbar.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbar.java @@ -70,14 +70,16 @@ public class TreeTableExtraScrollbar extends TestBase { private class EmptyColumnGenerator implements Table.ColumnGenerator { @Override - public Object generateCell(Table table, Object itemId, Object columnId) { + public Object generateCell(Table table, Object itemId, + Object columnId) { return null; } } private class TypeColumnGenerator implements Table.ColumnGenerator { @Override - public Object generateCell(Table table, Object itemId, Object columnId) { + public Object generateCell(Table table, Object itemId, + Object columnId) { if (itemId instanceof TestObject) { return new Label(((TestObject) itemId).getValue()); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbarWithChildren.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbarWithChildren.java index 0dc98b2c2e..85d7030b46 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbarWithChildren.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbarWithChildren.java @@ -75,7 +75,8 @@ public class TreeTableExtraScrollbarWithChildren extends TestBase { private class HierarchyColumnGenerator implements Table.ColumnGenerator { @Override - public Object generateCell(Table table, Object itemId, Object columnId) { + public Object generateCell(Table table, Object itemId, + Object columnId) { Label label = new Label("this should be mostly hidden"); label.setSizeUndefined(); return label; @@ -84,7 +85,8 @@ public class TreeTableExtraScrollbarWithChildren extends TestBase { private class TypeColumnGenerator implements Table.ColumnGenerator { @Override - public Object generateCell(Table table, Object itemId, Object columnId) { + public Object generateCell(Table table, Object itemId, + Object columnId) { if (itemId instanceof TestObject) { return new Label(((TestObject) itemId).getValue()); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUI.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUI.java index ba057f4c41..ebe3f0e1a8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUI.java @@ -19,8 +19,8 @@ import com.vaadin.tests.components.table.TableItemDescriptionGeneratorUI; import com.vaadin.ui.Table; import com.vaadin.ui.TreeTable; -public class TreeTableItemDescriptionGeneratorUI extends - TableItemDescriptionGeneratorUI { +public class TreeTableItemDescriptionGeneratorUI + extends TableItemDescriptionGeneratorUI { @Override protected Table createTable() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java index 02ce397a05..133b024004 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java @@ -33,8 +33,8 @@ public class TreeTableModifyAndSetCollapsed extends TestBase { int parentId = counter++; Item parent = container.addItem(parentId); tt.setCollapsed(parentId, false); - parent.getItemProperty("value").setValue( - "parent " + (counter++) + ""); + parent.getItemProperty("value") + .setValue("parent " + (counter++) + ""); for (int i = 0; i < 4; i++) { int childId = counter++; Item child = container.addItem(childId); diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java index 78d67ee090..467eaba120 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java @@ -45,7 +45,8 @@ public class TreeTablePartialUpdates extends AbstractTestUI { } @SuppressWarnings("unchecked") - private void addNodesToRoot(HierarchicalContainer hc, Object root, int count) { + private void addNodesToRoot(HierarchicalContainer hc, Object root, + int count) { for (int ix = 0; ix < count; ix++) { Object id = hc.addItem(); hc.getItem(id).getItemProperty("p1").setValue(String.valueOf(ix)); diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java index 686d86a0dc..002ea08429 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java @@ -50,7 +50,8 @@ public class TreeTablePartialUpdatesPageLength0 extends AbstractTestUI { } @SuppressWarnings("unchecked") - private void addNodesToRoot(HierarchicalContainer hc, Object root, int count) { + private void addNodesToRoot(HierarchicalContainer hc, Object root, + int count) { for (int ix = 0; ix < count; ix++) { Object id = hc.addItem(); hc.getItem(id).getItemProperty("p1").setValue(String.valueOf(ix)); diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowIcons.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowIcons.java index 0668a6aeeb..b32644cd29 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowIcons.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowIcons.java @@ -18,8 +18,8 @@ public class TreeTableRowIcons extends AbstractTestUI { layout.setSpacing(true); addComponent(layout); - layout.addComponent(createTreeTableAndPopulate(new ThemeResource( - "../runo/icons/16/ok.png"))); + layout.addComponent(createTreeTableAndPopulate( + new ThemeResource("../runo/icons/16/ok.png"))); layout.addComponent(createTreeTableAndPopulate(FontAwesome.ANDROID)); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableTest.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableTest.java index 02f848cd40..f3ac9fc602 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableTest.java @@ -17,8 +17,8 @@ import com.vaadin.ui.Tree.ExpandEvent; import com.vaadin.ui.Tree.ExpandListener; import com.vaadin.ui.TreeTable; -public class TreeTableTest extends Tables<TreeTable> implements - CollapseListener, ExpandListener { +public class TreeTableTest extends Tables<TreeTable> + implements CollapseListener, ExpandListener { @Override protected Class<TreeTable> getTestClass() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/ComboboxSelectedItemText.java b/uitest/src/main/java/com/vaadin/tests/components/ui/ComboboxSelectedItemText.java index d4599fc1a3..c2f640f7c8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/ComboboxSelectedItemText.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/ComboboxSelectedItemText.java @@ -8,10 +8,8 @@ import com.vaadin.ui.Label; public class ComboboxSelectedItemText extends AbstractTestUIWithLog { @Override protected void setup(VaadinRequest request) { - getLayout() - .addComponent( - new Label( - "Select first ANTIGUA AND BARBUDA from the first combobox. Then select ANTIGUA AND BARBUDA from the second combobox. Finally, click the popup button on the first combobox. Before fix you would see UA AND BAR in the field.")); + getLayout().addComponent(new Label( + "Select first ANTIGUA AND BARBUDA from the first combobox. Then select ANTIGUA AND BARBUDA from the second combobox. Finally, click the popup button on the first combobox. Before fix you would see UA AND BAR in the field.")); ComboBox combobox = new ComboBox("Text input enabled:"); combobox.setWidth("100px"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/LazyInitUIs.java b/uitest/src/main/java/com/vaadin/tests/components/ui/LazyInitUIs.java index 984ac69d6e..aa4fee34f1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/LazyInitUIs.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/LazyInitUIs.java @@ -48,7 +48,8 @@ public class LazyInitUIs extends AbstractTestUIProvider { layout.setMargin(true); setContent(layout); - layout.addComponent(getRequestInfo("LazyCreateUI", request)); + layout.addComponent( + getRequestInfo("LazyCreateUI", request)); } }; return uI; diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java index 06abb51b06..01bf8abd53 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java @@ -74,7 +74,8 @@ public class LoadingIndicatorConfigurationTest extends AbstractTestUIWithLog { } - private LegacyTextField createIntegerTextField(String caption, int initialValue) { + private LegacyTextField createIntegerTextField(String caption, + int initialValue) { LegacyTextField tf = new LegacyTextField(caption); tf.setId(caption); tf.setConverter(Integer.class); diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/MultiFileUploadTest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/MultiFileUploadTest.java index 007a49e0e2..4f98f5b7d6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/MultiFileUploadTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/MultiFileUploadTest.java @@ -51,8 +51,8 @@ public class MultiFileUploadTest extends AbstractTestUIWithLog { @Override protected void setup(VaadinRequest request) { - getPage().getStyles().add( - ".v-upload-hidden-button .v-button {display:none};"); + getPage().getStyles() + .add(".v-upload-hidden-button .v-button {display:none};"); addUpload(); addComponent(uploadsLayout); addComponent(new Button("Upload files", new ClickListener() { @@ -95,7 +95,8 @@ public class MultiFileUploadTest extends AbstractTestUIWithLog { upload.setReceiver(new Receiver() { @Override - public OutputStream receiveUpload(String filename, String mimeType) { + public OutputStream receiveUpload(String filename, + String mimeType) { return new OutputStream() { @Override public void write(int arg0) throws IOException { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/MultipleUIUploadTest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/MultipleUIUploadTest.java index f92e22d06b..a44d64db83 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/MultipleUIUploadTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/MultipleUIUploadTest.java @@ -58,8 +58,8 @@ public class MultipleUIUploadTest extends AbstractTestUI { } - public class MemoryBuffer implements StreamResource.StreamSource, - Upload.Receiver { + public class MemoryBuffer + implements StreamResource.StreamSource, Upload.Receiver { ByteArrayOutputStream outputBuffer = null; String mimeType; diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/PollListening.java b/uitest/src/main/java/com/vaadin/tests/components/ui/PollListening.java index 1ec4f4d9f7..b5f0100982 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/PollListening.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/PollListening.java @@ -34,8 +34,8 @@ public class PollListening extends AbstractTestUI { @Override public void poll(PollEvent event) { setPollInterval(-1); - statusLabel.setValue(event.getClass().getSimpleName() - + " received"); + statusLabel.setValue( + event.getClass().getSimpleName() + " received"); removePollListener(this); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivity.java b/uitest/src/main/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivity.java index cb62ccdb19..a45ab704d1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivity.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivity.java @@ -67,8 +67,8 @@ public class TimeoutRedirectResetsOnActivity extends AbstractTestUI { } private void setupTimeout(VaadinRequest request) { - request.getService().setSystemMessagesProvider( - new SystemMessagesProvider() { + request.getService() + .setSystemMessagesProvider(new SystemMessagesProvider() { @Override public SystemMessages getSystemMessages( SystemMessagesInfo systemMessagesInfo) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccess.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccess.java index 70a69ef7d3..15643a9700 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccess.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccess.java @@ -52,8 +52,8 @@ public class UIAccess extends AbstractTestUIWithLog { @Override protected void setup(VaadinRequest request) { - addComponent(new Button("Access from UI thread", - new Button.ClickListener() { + addComponent( + new Button("Access from UI thread", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { @@ -84,14 +84,15 @@ public class UIAccess extends AbstractTestUIWithLog { .getCurrentResponse() != null; // session is locked by request thread at this // point - final Future<Void> initialFuture = access(new Runnable() { - @Override - public void run() { - log("Initial background message"); - log("Thread has current response? " - + threadHasCurrentResponse); - } - }); + final Future<Void> initialFuture = access( + new Runnable() { + @Override + public void run() { + log("Initial background message"); + log("Thread has current response? " + + threadHasCurrentResponse); + } + }); // Let request thread continue latch.countDown(); @@ -171,8 +172,8 @@ public class UIAccess extends AbstractTestUIWithLog { log("future was cancelled, should not start"); } })); - addComponent(new Button("Cancel running future", - new Button.ClickListener() { + addComponent( + new Button("Cancel running future", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { log.clear(); @@ -232,10 +233,11 @@ public class UIAccess extends AbstractTestUIWithLog { @Override public void run() { log.log("accessSynchronously has request? " - + (VaadinService.getCurrentRequest() != null)); + + (VaadinService + .getCurrentRequest() != null)); log.log("Test value in accessSynchronously: " - + CurrentInstance - .get(CurrentInstanceTestType.class)); + + CurrentInstance.get( + CurrentInstanceTestType.class)); CurrentInstance.set( CurrentInstanceTestType.class, new CurrentInstanceTestType( @@ -255,18 +257,18 @@ public class UIAccess extends AbstractTestUIWithLog { public void buttonClick(ClickEvent event) { log.clear(); // accessSynchronously should maintain values - CurrentInstance - .setInheritable(CurrentInstanceTestType.class, - new CurrentInstanceTestType( - "Set before access")); + CurrentInstance.setInheritable( + CurrentInstanceTestType.class, + new CurrentInstanceTestType( + "Set before access")); access(new Runnable() { @Override public void run() { - log.log("access has request? " - + (VaadinService.getCurrentRequest() != null)); + log.log("access has request? " + (VaadinService + .getCurrentRequest() != null)); log.log("Test value in access: " - + CurrentInstance - .get(CurrentInstanceTestType.class)); + + CurrentInstance.get( + CurrentInstanceTestType.class)); CurrentInstance.setInheritable( CurrentInstanceTestType.class, new CurrentInstanceTestType( @@ -278,14 +280,13 @@ public class UIAccess extends AbstractTestUIWithLog { new CurrentInstanceTestType( "Set before run pending")); - getSession().getService().runPendingAccessTasks( - getSession()); + getSession().getService() + .runPendingAccessTasks(getSession()); log.log("has request after access? " + (VaadinService.getCurrentRequest() != null)); - log("Test value after access: " - + CurrentInstance - .get(CurrentInstanceTestType.class)); + log("Test value after access: " + CurrentInstance + .get(CurrentInstanceTestType.class)); } })); @@ -294,7 +295,8 @@ public class UIAccess extends AbstractTestUIWithLog { @Override public void buttonClick(ClickEvent event) { log.clear(); - if (getPushConfiguration().getPushMode() != PushMode.AUTOMATIC) { + if (getPushConfiguration() + .getPushMode() != PushMode.AUTOMATIC) { log("Can only test with automatic push enabled"); return; } diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccessExceptionHandling.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccessExceptionHandling.java index bd18d93328..0a386fa47a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccessExceptionHandling.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccessExceptionHandling.java @@ -30,8 +30,8 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; import com.vaadin.util.CurrentInstance; -public class UIAccessExceptionHandling extends AbstractTestUIWithLog implements - ErrorHandler { +public class UIAccessExceptionHandling extends AbstractTestUIWithLog + implements ErrorHandler { private Future<Void> future; @@ -81,35 +81,36 @@ public class UIAccessExceptionHandling extends AbstractTestUIWithLog implements } })); - addComponent(new Button( - "Throw RuntimeException after removing instances", - new Button.ClickListener() { + addComponent( + new Button("Throw RuntimeException after removing instances", + new Button.ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - log.clear(); + @Override + public void buttonClick(ClickEvent event) { + log.clear(); - // Ensure beforeClientResponse is invoked - markAsDirty(); + // Ensure beforeClientResponse is invoked + markAsDirty(); - assert UI.getCurrent() == UIAccessExceptionHandling.this; + assert UI + .getCurrent() == UIAccessExceptionHandling.this; - Map<Class<?>, CurrentInstance> instances = CurrentInstance - .getInstances(false); - CurrentInstance.clearAll(); + Map<Class<?>, CurrentInstance> instances = CurrentInstance + .getInstances(false); + CurrentInstance.clearAll(); - assert UI.getCurrent() == null; + assert UI.getCurrent() == null; - future = access(new Runnable() { - @Override - public void run() { - throw new RuntimeException(); - } - }); + future = access(new Runnable() { + @Override + public void run() { + throw new RuntimeException(); + } + }); - CurrentInstance.restoreInstances(instances); - } - })); + CurrentInstance.restoreInstances(instances); + } + })); addComponent(new Button("Clear", new Button.ClickListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UISerialization.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UISerialization.java index cbd317b027..b76b2292d1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/UISerialization.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UISerialization.java @@ -55,8 +55,8 @@ public class UISerialization extends AbstractTestUI { .getDiffState(UISerialization.this); UISerialization app = (UISerialization) deserialize(result); log.log("Deserialized UI in " + elapsed + "ms"); - Object diffStateAfter = getConnectorTracker().getDiffState( - UISerialization.this); + Object diffStateAfter = getConnectorTracker() + .getDiffState(UISerialization.this); if (diffStateBefore.equals(diffStateAfter)) { log.log("Diff states match, size: " + diffStateBefore.toString().length()); @@ -67,8 +67,8 @@ public class UISerialization extends AbstractTestUI { log.log("Exception caught: " + e.getMessage()); StringWriter sw = new StringWriter(); e.printStackTrace(new PrintWriter(sw)); - addComponent(new Label(sw.toString(), - ContentMode.PREFORMATTED)); + addComponent( + new Label(sw.toString(), ContentMode.PREFORMATTED)); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UriFragment.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UriFragment.java index c726c49b12..bcad8589d6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/UriFragment.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UriFragment.java @@ -29,7 +29,8 @@ public class UriFragment extends AbstractTestUI { addComponent(createButton("null", "setUriFragment(null)", null)); } - private Button createButton(String id, String caption, final String fragment) { + private Button createButton(String id, String caption, + final String fragment) { Button button = new Button(caption, new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java index 51eb776ebf..37168a6033 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java @@ -35,7 +35,8 @@ public class BackButtonTest extends AbstractTestUI { new UriFragmentChangedListener() { @Override - public void uriFragmentChanged(UriFragmentChangedEvent event) { + public void uriFragmentChanged( + UriFragmentChangedEvent event) { String f = event.getUriFragment(); if ("page2".equals(f)) { showPage2(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/TestSampler.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/TestSampler.java index fce2ef680d..aac5bdc5e6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/uitest/TestSampler.java +++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/TestSampler.java @@ -163,7 +163,8 @@ public class TestSampler extends TabSheet { createComponentLayout(caption, hl); } - private void createComponentLayout(String caption, ComponentContainer layout) { + private void createComponentLayout(String caption, + ComponentContainer layout) { addTab(layout, caption); currentTab = layout; } diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/EmbeddedCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/EmbeddedCssTest.java index 57783f6eb3..3108341216 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/EmbeddedCssTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/EmbeddedCssTest.java @@ -10,8 +10,8 @@ public class EmbeddedCssTest { private int debugIdCounter = 0; public EmbeddedCssTest(TestSampler parent) { - Embedded e = new Embedded("Embedded with a caption", new ThemeResource( - parent.ICON_URL)); + Embedded e = new Embedded("Embedded with a caption", + new ThemeResource(parent.ICON_URL)); e.setId("embedded" + debugIdCounter); parent.addComponent(e); diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/LayoutsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/LayoutsCssTest.java index 0ef37bf5c4..0e4cc931f3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/LayoutsCssTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/LayoutsCssTest.java @@ -101,8 +101,8 @@ public class LayoutsCssTest extends GridLayout { CustomLayout custom; try { - custom = new CustomLayout(new ByteArrayInputStream( - customLayoutSrc.getBytes())); + custom = new CustomLayout( + new ByteArrayInputStream(customLayoutSrc.getBytes())); custom.addComponent(new Label("Some content"), "pos1"); custom.setComponentError(new UserError("A error mesasge...")); custom.setCaption("CustomLayout"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/SelectsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/SelectsCssTest.java index cf63222ee8..9c3f91c661 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/SelectsCssTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/SelectsCssTest.java @@ -76,7 +76,8 @@ public class SelectsCssTest extends GridLayout { addComponent(s); createComboBoxWith(null, null, "100px"); - createComboBoxWith("CB Search", ChameleonTheme.COMBOBOX_SEARCH, "100px"); + createComboBoxWith("CB Search", ChameleonTheme.COMBOBOX_SEARCH, + "100px"); createComboBoxWith("SelectButton", ChameleonTheme.COMBOBOX_SELECT_BUTTON, "100px"); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TabSheetsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TabSheetsCssTest.java index b05eb2f32a..40fcac0d82 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TabSheetsCssTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TabSheetsCssTest.java @@ -31,8 +31,8 @@ public class TabSheetsCssTest { Reindeer.TABSHEET_MINIMAL); parent.addComponent(minimal); - TabSheet hoverClosable = createTabSheetWith( - "A hover-closable TabSheet", Reindeer.TABSHEET_HOVER_CLOSABLE); + TabSheet hoverClosable = createTabSheetWith("A hover-closable TabSheet", + Reindeer.TABSHEET_HOVER_CLOSABLE); parent.addComponent(hoverClosable); TabSheet selectedClosable = createTabSheetWith( diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TablesCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TablesCssTest.java index 2d77354174..2d914f98f1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TablesCssTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TablesCssTest.java @@ -67,8 +67,8 @@ public class TablesCssTest extends GridLayout { t.setColumnReorderingAllowed(true); t.setColumnCollapsingAllowed(true); // t.setColumnHeaders(new String[] { "Country", "Code", "Icon file" }); - t.setColumnIcon(TestUtils.iso3166_PROPERTY_NAME, new ThemeResource( - parent.ICON_URL)); + t.setColumnIcon(TestUtils.iso3166_PROPERTY_NAME, + new ThemeResource(parent.ICON_URL)); // Actions (a.k.a context menu) t.addActionHandler(new Action.Handler() { @@ -82,7 +82,8 @@ public class TablesCssTest extends GridLayout { } @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { // We just want the actions UI.. don't care about the logic... if (ACTION_MARK == action) { markedRows.add(target); diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java index 0f50ca9f1b..a1e649884c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java @@ -71,8 +71,8 @@ public class TextFieldsCssTest extends GridLayout { @Override public void addComponent(Component component, int column1, int row1, - int column2, int row2) throws OverlapsException, - OutOfBoundsException { + int column2, int row2) + throws OverlapsException, OutOfBoundsException { parent.registerComponent(component); super.addComponent(component, column1, row1, column2, row2); diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TreeCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TreeCssTest.java index 0508bfc0f9..626d9f47a0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TreeCssTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TreeCssTest.java @@ -25,7 +25,8 @@ public class TreeCssTest { tree.addActionHandler(new Action.Handler() { @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { // We don't care about functionality, we just want the UI for // testing.. diff --git a/uitest/src/main/java/com/vaadin/tests/components/upload/TestFileUpload.java b/uitest/src/main/java/com/vaadin/tests/components/upload/TestFileUpload.java index b57c236b20..621141ce31 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/upload/TestFileUpload.java +++ b/uitest/src/main/java/com/vaadin/tests/components/upload/TestFileUpload.java @@ -25,7 +25,8 @@ public class TestFileUpload extends TestBase implements Receiver { Upload u = new Upload("Upload", new Upload.Receiver() { @Override - public OutputStream receiveUpload(String filename, String mimeType) { + public OutputStream receiveUpload(String filename, + String mimeType) { return baos; } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/upload/TestFileUploadSize.java b/uitest/src/main/java/com/vaadin/tests/components/upload/TestFileUploadSize.java index 178f8f9393..4744c935c6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/upload/TestFileUploadSize.java +++ b/uitest/src/main/java/com/vaadin/tests/components/upload/TestFileUploadSize.java @@ -29,7 +29,8 @@ public class TestFileUploadSize extends TestBase implements Receiver { Upload u = new Upload("Upload", new Upload.Receiver() { @Override - public OutputStream receiveUpload(String filename, String mimeType) { + public OutputStream receiveUpload(String filename, + String mimeType) { return baos; } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java b/uitest/src/main/java/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java index 7607536357..5ac15a7814 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java @@ -11,8 +11,8 @@ import com.vaadin.ui.FormLayout; import com.vaadin.ui.Upload; import com.vaadin.ui.Upload.Receiver; -public class TestImmediateUploadInFormLayout extends - ComponentTestCase<FormLayout> implements Receiver { +public class TestImmediateUploadInFormLayout + extends ComponentTestCase<FormLayout> implements Receiver { @Override protected String getDescription() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/upload/UploadNoSelection.java b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadNoSelection.java index ecde5760c9..a34e0a0d1d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/upload/UploadNoSelection.java +++ b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadNoSelection.java @@ -25,8 +25,8 @@ import com.vaadin.ui.Upload.FailedEvent; import com.vaadin.ui.Upload.FinishedEvent; import com.vaadin.ui.Upload.Receiver; -public class UploadNoSelection extends AbstractTestUIWithLog implements - Receiver { +public class UploadNoSelection extends AbstractTestUIWithLog + implements Receiver { static final String LOG_ID_PREFIX = "Log_row_"; static final String UPLOAD_ID = "u"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/CenteredInVisualViewport.java b/uitest/src/main/java/com/vaadin/tests/components/window/CenteredInVisualViewport.java index 428b2ae3f9..c241d42dff 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/CenteredInVisualViewport.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/CenteredInVisualViewport.java @@ -30,8 +30,8 @@ public class CenteredInVisualViewport extends TestBase { @Override public void buttonClick(ClickEvent event) { - Window centered = new Window("A window", new Label( - "Centered window")); + Window centered = new Window("A window", + new Label("Centered window")); centered.center(); getMainWindow().addWindow(centered); } @@ -42,8 +42,8 @@ public class CenteredInVisualViewport extends TestBase { @Override public void buttonClick(ClickEvent event) { - Window centered = new Window("A window", new Label( - "Centered window")); + Window centered = new Window("A window", + new Label("Centered window")); centered.center(); getMainWindow().addWindow(centered); } @@ -54,8 +54,8 @@ public class CenteredInVisualViewport extends TestBase { @Override public void buttonClick(ClickEvent event) { - Window centered = new Window("A window", new Label( - "Centered window")); + Window centered = new Window("A window", + new Label("Centered window")); centered.center(); getMainWindow().addWindow(centered); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/DownloadAndUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/window/DownloadAndUpdate.java index 573f55b29d..cd057f48b0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/DownloadAndUpdate.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/DownloadAndUpdate.java @@ -10,8 +10,8 @@ public class DownloadAndUpdate extends TestBase { @Override protected void setup() { - addComponent(new Button("Download and update", - new Button.ClickListener() { + addComponent( + new Button("Download and update", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { downloadAndUpdate(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShown.java b/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShown.java index 92fbcffd01..925dfd28c6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShown.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShown.java @@ -22,8 +22,8 @@ public class ExtraWindowShown extends AbstractTestUI { layout.setMargin(true); final Window w = new Window("Sub window", layout); w.center(); - layout.addComponent(new Button("Close", - new Button.ClickListener() { + layout.addComponent( + new Button("Close", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/LegacyWindowOpenTest.java b/uitest/src/main/java/com/vaadin/tests/components/window/LegacyWindowOpenTest.java index ad36e04d88..3a46d8c299 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/LegacyWindowOpenTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/LegacyWindowOpenTest.java @@ -53,7 +53,8 @@ public class LegacyWindowOpenTest extends TestBase { new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - win.executeJavaScript("window.open(\"http://www.google.com\", \"_blank\");"); + win.executeJavaScript( + "window.open(\"http://www.google.com\", \"_blank\");"); } })); addComponent(new Button( @@ -61,7 +62,8 @@ public class LegacyWindowOpenTest extends TestBase { new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - win.executeJavaScript("window.open(\"http://www.google.com\", \"_blank\", \"resizable=yes,menubar=yes,toolbar=yes,directories=yes,location=yes,scrollbars=yes,status=yes\");"); + win.executeJavaScript( + "window.open(\"http://www.google.com\", \"_blank\", \"resizable=yes,menubar=yes,toolbar=yes,directories=yes,location=yes,scrollbars=yes,status=yes\");"); } })); diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/LongNotifications.java b/uitest/src/main/java/com/vaadin/tests/components/window/LongNotifications.java index be67cfe9a0..621c869e43 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/LongNotifications.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/LongNotifications.java @@ -28,8 +28,7 @@ public class LongNotifications extends TestBase { @Override public void buttonClick(ClickEvent event) { - getMainWindow().showNotification( - text, + getMainWindow().showNotification(text, "This is description for the same notifications." + text, Notification.TYPE_HUMANIZED_MESSAGE); @@ -56,12 +55,10 @@ public class LongNotifications extends TestBase { @Override public void buttonClick(ClickEvent event) { - getMainWindow() - .showNotification( - text, - "This is description for the same notifications." - + text, - Notification.TYPE_ERROR_MESSAGE); + getMainWindow().showNotification(text, + "This is description for the same notifications." + + text, + Notification.TYPE_ERROR_MESSAGE); } }); getLayout().addComponent(b); diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/MaximizedWindowOrder.java b/uitest/src/main/java/com/vaadin/tests/components/window/MaximizedWindowOrder.java index 7da1517e8f..fb53eaba72 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/MaximizedWindowOrder.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/MaximizedWindowOrder.java @@ -42,8 +42,8 @@ public class MaximizedWindowOrder extends AbstractTestUI { layout.addComponent(button); window.setContent(layout); - window.setWindowMode(maximized ? WindowMode.MAXIMIZED - : WindowMode.NORMAL); + window.setWindowMode( + maximized ? WindowMode.MAXIMIZED : WindowMode.NORMAL); addWindow(window); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/PageOpenTest.java b/uitest/src/main/java/com/vaadin/tests/components/window/PageOpenTest.java index a566b09cdc..6816417208 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/PageOpenTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/PageOpenTest.java @@ -54,10 +54,8 @@ public class PageOpenTest extends AbstractTestUI { new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - JavaScript - .getCurrent() - .execute( - "window.open(\"http://www.google.com\", \"_blank\");"); + JavaScript.getCurrent().execute( + "window.open(\"http://www.google.com\", \"_blank\");"); } })); addComponent(new Button( @@ -65,10 +63,8 @@ public class PageOpenTest extends AbstractTestUI { new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - JavaScript - .getCurrent() - .execute( - "window.open(\"http://www.google.com\", \"_blank\", \"resizable=yes,menubar=yes,toolbar=yes,directories=yes,location=yes,scrollbars=yes,status=yes\");"); + JavaScript.getCurrent().execute( + "window.open(\"http://www.google.com\", \"_blank\", \"resizable=yes,menubar=yes,toolbar=yes,directories=yes,location=yes,scrollbars=yes,status=yes\");"); } })); diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java index 2571ab2f02..efea510999 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java @@ -71,8 +71,8 @@ public class SubWindowFocus extends TestBase { if (action == esc) { getMainWindow().removeWindow(win); } else { - getMainWindow().showNotification( - action.getCaption()); + getMainWindow() + .showNotification(action.getCaption()); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java index 473b3e1f9c..8e47c608f2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java @@ -42,7 +42,8 @@ public class SubWindowWithUndefinedHeight extends TestBase { tabsheet.addComponent(table); tabsheet.addListener(new TabSheet.SelectedTabChangeListener() { @Override - public void selectedTabChange(TabSheet.SelectedTabChangeEvent event) { + public void selectedTabChange( + TabSheet.SelectedTabChangeEvent event) { if (tabsheet.getSelectedTab() == tabButton) { tabsheet.setSizeUndefined(); layout.setSizeUndefined(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java b/uitest/src/main/java/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java index 669774f715..d4e94d88cd 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java @@ -36,12 +36,11 @@ public class TestTooSmallSubwindowSize extends AbstractTestUI { VerticalLayout layout = new VerticalLayout(); layout.setMargin(true); Window w = new Window("Scroll", layout); - Label desc = new Label( - "This is a new child window with a preset" - + " width, height and position. Resizing has been" - + " disabled for this window. Additionally, this text label" - + " is intentionally too large to fit the window. You can" - + " use the scrollbars to view different parts of the window content."); + Label desc = new Label("This is a new child window with a preset" + + " width, height and position. Resizing has been" + + " disabled for this window. Additionally, this text label" + + " is intentionally too large to fit the window. You can" + + " use the scrollbars to view different parts of the window content."); layout.addComponent(desc); // Set window position @@ -62,13 +61,12 @@ public class TestTooSmallSubwindowSize extends AbstractTestUI { VerticalLayout layout = new VerticalLayout(); layout.setMargin(true); Window w = new Window("Scroll", layout); - Label desc = new Label( - "This is a new child window with a preset" - + " width, height and position. Resizing has been" - + " disabled for this window. Additionally, this text label" - + " is intentionally too large to fit the window. You could" - + " use the scrollbars to view different parts of the window content," - + " except it's too small for that either."); + Label desc = new Label("This is a new child window with a preset" + + " width, height and position. Resizing has been" + + " disabled for this window. Additionally, this text label" + + " is intentionally too large to fit the window. You could" + + " use the scrollbars to view different parts of the window content," + + " except it's too small for that either."); // disable wrapping desc.setSizeUndefined(); layout.addComponent(desc); @@ -91,12 +89,11 @@ public class TestTooSmallSubwindowSize extends AbstractTestUI { VerticalLayout layout = new VerticalLayout(); layout.setMargin(true); Window w = new Window("Resize", layout); - Label desc = new Label( - "This is a new child window with a preset" - + " width, height and position. Resizing has not been" - + " disabled for this window. Additionally, this text label" - + " is intentionally too large to fit the window. You can resize or" - + " use the scrollbars to view different parts of the window content."); + Label desc = new Label("This is a new child window with a preset" + + " width, height and position. Resizing has not been" + + " disabled for this window. Additionally, this text label" + + " is intentionally too large to fit the window. You can resize or" + + " use the scrollbars to view different parts of the window content."); layout.addComponent(desc); // Set window position @@ -116,12 +113,11 @@ public class TestTooSmallSubwindowSize extends AbstractTestUI { VerticalLayout layout = new VerticalLayout(); layout.setMargin(true); Window w = new Window("Resize", layout); - Label desc = new Label( - "This is a new child window with a preset" - + " width, height and position. Resizing has not been" - + " disabled for this window. Additionally, this text label" - + " is intentionally too large to fit the window. You can resize" - + " to view different parts of the window content."); + Label desc = new Label("This is a new child window with a preset" + + " width, height and position. Resizing has not been" + + " disabled for this window. Additionally, this text label" + + " is intentionally too large to fit the window. You can resize" + + " to view different parts of the window content."); // disable wrapping desc.setSizeUndefined(); layout.addComponent(desc); diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowCaption.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowCaption.java index fcb915f363..7e5ec7f4a9 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowCaption.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowCaption.java @@ -48,7 +48,8 @@ public class WindowCaption extends AbstractTestUI { Button red = new Button("Red", new ClickListener() { @Override public void buttonClick(ClickEvent event) { - setWindowCaption("<font style='color: red;'>This may or may not be red</font>"); + setWindowCaption( + "<font style='color: red;'>This may or may not be red</font>"); } }); Button plainText = new Button("Plain text", new ClickListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.java index fef6b9c58b..b60ef45d13 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.java @@ -135,8 +135,8 @@ public class WindowMaximizeRestoreTest extends AbstractTestUI { @Override public void windowClose(CloseEvent e) { Item item = addWindowAgain.addItem(w); - addWindowAgain.setItemCaption(w, "Window " - + w.getData().toString()); + addWindowAgain.setItemCaption(w, + "Window " + w.getData().toString()); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java index 09d03cdd28..94ff75386b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java @@ -60,16 +60,16 @@ public class WindowScrollingComponentIntoView extends AbstractTestCase { window.setPositionX(200); window.setPositionY(200); - layout.addComponent(new Button("Scroll mainwin to X9", - new ClickListener() { + layout.addComponent( + new Button("Scroll mainwin to X9", new ClickListener() { @Override public void buttonClick(ClickEvent event) { getMainWindow().scrollIntoView(x9); } })); - layout.addComponent(new Button("Scroll mainwin to Y9", - new ClickListener() { + layout.addComponent( + new Button("Scroll mainwin to Y9", new ClickListener() { @Override public void buttonClick(ClickEvent event) { getMainWindow().scrollIntoView(y9); diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java index 172b0f592f..a86475dadd 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java @@ -81,7 +81,8 @@ public class WindowShouldRemoveActionHandler extends AbstractTestUI { } @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { Notification.show("Handling action " + action.getCaption()); } @@ -101,7 +102,8 @@ public class WindowShouldRemoveActionHandler extends AbstractTestUI { } @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { Notification.show("Handling action " + action.getCaption()); } @@ -113,8 +115,8 @@ public class WindowShouldRemoveActionHandler extends AbstractTestUI { private void addHandler(Handler actionHandler) { actionHandlers.add(actionHandler); addActionHandler(actionHandler); - state.setValue("An UI with " + actionHandlers.size() - + " action handlers"); + state.setValue( + "An UI with " + actionHandlers.size() + " action handlers"); } } diff --git a/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java b/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java index 55be12f644..7e23b2f8d2 100644 --- a/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java +++ b/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java @@ -105,8 +105,9 @@ public class BeanItemContainerFilteringTest extends TestBase { new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - container.addItem(new TestBean("addItem() " - + nextToAdd, "value " + nextToAdd)); + container.addItem( + new TestBean("addItem() " + nextToAdd, + "value " + nextToAdd)); nextToAdd++; nextLabel.setCaption("Next id: " + nextToAdd); } @@ -122,13 +123,14 @@ public class BeanItemContainerFilteringTest extends TestBase { if (selection == null) { return; } - TestBean bean = new TestBean("addItemAfter() " - + nextToAdd, "value " + nextToAdd); + TestBean bean = new TestBean( + "addItemAfter() " + nextToAdd, + "value " + nextToAdd); Item item = container.addItemAfter(selection, bean); if (item == null) { - getMainWindow().showNotification( - "Adding item after " + selection - + " failed"); + getMainWindow() + .showNotification("Adding item after " + + selection + " failed"); } nextToAdd++; nextLabel.setCaption("Next id: " + nextToAdd); @@ -144,10 +146,11 @@ public class BeanItemContainerFilteringTest extends TestBase { new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - int index = Integer.parseInt(position.getValue() - .toString()); - TestBean bean = new TestBean("addItemAt() " - + nextToAdd, "value " + nextToAdd); + int index = Integer + .parseInt(position.getValue().toString()); + TestBean bean = new TestBean( + "addItemAt() " + nextToAdd, + "value " + nextToAdd); Item item = container.addItemAt(index, bean); if (item == null) { getMainWindow().showNotification( diff --git a/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerTest.java b/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerTest.java index 905ec2f9ff..bb077660f7 100644 --- a/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerTest.java +++ b/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerTest.java @@ -13,8 +13,8 @@ public class BeanItemContainerTest { * @throws IllegalAccessException * @throws InstantiationException */ - public static void main(String[] args) throws InstantiationException, - IllegalAccessException { + public static void main(String[] args) + throws InstantiationException, IllegalAccessException { BeanItemContainer<Hello> c = new BeanItemContainer<Hello>(Hello.class); c.addItem(new Hello()); diff --git a/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java b/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java index 82cf5b2da4..85694bfeba 100644 --- a/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java +++ b/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java @@ -55,8 +55,8 @@ public class IndexedContainerFilteringTest extends TestBase { cb.addValueChangeListener(event -> { container.removeAllContainerFilters(); if (event.getValue()) { - container.addContainerFilter("column1", filterString - .getValue().toString(), false, false); + container.addContainerFilter("column1", + filterString.getValue().toString(), false, false); } }); cb.setImmediate(true); @@ -74,8 +74,8 @@ public class IndexedContainerFilteringTest extends TestBase { public void buttonClick(ClickEvent event) { Item item = container.addItem("addItem() " + nextToAdd); if (item != null) { - item.getItemProperty("column1").setValue( - "addItem() " + nextToAdd); + item.getItemProperty("column1") + .setValue("addItem() " + nextToAdd); } nextToAdd++; nextLabel.setCaption("Next id: " + nextToAdd); @@ -98,9 +98,9 @@ public class IndexedContainerFilteringTest extends TestBase { item.getItemProperty("column1").setValue(id); table.setValue(id); } else { - getMainWindow().showNotification( - "Adding item after " + selection - + " failed"); + getMainWindow() + .showNotification("Adding item after " + + selection + " failed"); } nextToAdd++; nextLabel.setCaption("Next id: " + nextToAdd); @@ -116,16 +116,16 @@ public class IndexedContainerFilteringTest extends TestBase { new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - int index = Integer.parseInt(position.getValue() - .toString()); + int index = Integer + .parseInt(position.getValue().toString()); String id = "addItemAt() " + nextToAdd; Item item = container.addItemAt(index, id); if (item != null) { item.getItemProperty("column1").setValue(id); table.setValue(id); } else { - getMainWindow().showNotification( - "Adding item at index " + getMainWindow() + .showNotification("Adding item at index " + position.getValue() + " failed"); } nextToAdd++; diff --git a/uitest/src/main/java/com/vaadin/tests/containers/TableWithFileSystemContainer.java b/uitest/src/main/java/com/vaadin/tests/containers/TableWithFileSystemContainer.java index 25d0053fb2..8e9a5bb3af 100644 --- a/uitest/src/main/java/com/vaadin/tests/containers/TableWithFileSystemContainer.java +++ b/uitest/src/main/java/com/vaadin/tests/containers/TableWithFileSystemContainer.java @@ -12,8 +12,8 @@ public class TableWithFileSystemContainer extends TestBase { @Override public void setup() { - Table table = new Table("Documents", new FilesystemContainer(new File( - testPath))); + Table table = new Table("Documents", + new FilesystemContainer(new File(testPath))); table.setWidth("100%"); getMainWindow().addComponent(table); } diff --git a/uitest/src/main/java/com/vaadin/tests/containers/TestItemSorter.java b/uitest/src/main/java/com/vaadin/tests/containers/TestItemSorter.java index 2e217fd961..e9fd01ec71 100644 --- a/uitest/src/main/java/com/vaadin/tests/containers/TestItemSorter.java +++ b/uitest/src/main/java/com/vaadin/tests/containers/TestItemSorter.java @@ -38,8 +38,8 @@ public class TestItemSorter extends TestBase { return caption1.compareTo(caption2); } else if (o1 instanceof String && o2 instanceof String) { - return ((String) o1).toLowerCase().compareTo( - ((String) o2).toLowerCase()); + return ((String) o1).toLowerCase() + .compareTo(((String) o2).toLowerCase()); } return 0; @@ -61,8 +61,8 @@ public class TestItemSorter extends TestBase { Item item = container.getItem(id); item.getItemProperty(STRING).setValue(s); item.getItemProperty(BUTTON).setValue(new Button(s)); - item.getItemProperty(CHECKBOX).setValue( - new CheckBox("", s.equals("true"))); + item.getItemProperty(CHECKBOX) + .setValue(new CheckBox("", s.equals("true"))); } } diff --git a/uitest/src/main/java/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java b/uitest/src/main/java/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java index c9d4a07c22..57e2ad95ce 100644 --- a/uitest/src/main/java/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java +++ b/uitest/src/main/java/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java @@ -71,16 +71,16 @@ public class FileSystemContainerInTreeTable extends TestBase { HorizontalLayout buttonLayout = new HorizontalLayout(); buttonLayout.setSpacing(true); - buttonLayout.addComponent(new Button("Create dir11", - new Button.ClickListener() { + buttonLayout.addComponent( + new Button("Create dir11", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { new File(folder, "dir11").mkdir(); log.log("Row dir11 created"); } })); - buttonLayout.addComponent(new Button("Delete dir11", - new Button.ClickListener() { + buttonLayout.addComponent( + new Button("Delete dir11", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { new File(folder, "dir11").delete(); @@ -88,8 +88,8 @@ public class FileSystemContainerInTreeTable extends TestBase { } })); // to clean up explicitly before ending an automated test - buttonLayout.addComponent(new Button("Clean all files", - new Button.ClickListener() { + buttonLayout.addComponent( + new Button("Clean all files", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { folder.delete(); diff --git a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java index 93bd265eda..63e4357621 100644 --- a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java +++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java @@ -42,34 +42,22 @@ class DatabaseHelper { } switch (SQLTestsConstants.db) { case HSQLDB: - statement - .execute("create table " - + TABLENAME - + " (id integer GENERATED BY DEFAULT AS IDENTITY, field1 varchar(100), field2 boolean, primary key(id))"); - statement - .execute("create table " - + LARGE_TABLENAME - + " (id integer GENERATED BY DEFAULT AS IDENTITY, field1 varchar(100), primary key(id))"); + statement.execute("create table " + TABLENAME + + " (id integer GENERATED BY DEFAULT AS IDENTITY, field1 varchar(100), field2 boolean, primary key(id))"); + statement.execute("create table " + LARGE_TABLENAME + + " (id integer GENERATED BY DEFAULT AS IDENTITY, field1 varchar(100), primary key(id))"); break; case MYSQL: - statement - .execute("create table " - + TABLENAME - + " (id integer auto_increment not null, field1 varchar(100), field2 boolean, primary key(id))"); - statement - .execute("create table " - + LARGE_TABLENAME - + " (id integer auto_increment not null, field1 varchar(100), primary key(id))"); + statement.execute("create table " + TABLENAME + + " (id integer auto_increment not null, field1 varchar(100), field2 boolean, primary key(id))"); + statement.execute("create table " + LARGE_TABLENAME + + " (id integer auto_increment not null, field1 varchar(100), primary key(id))"); break; case POSTGRESQL: - statement - .execute("create table " - + TABLENAME - + " (\"id\" serial primary key, \"field1\" varchar(100), \"field2\" boolean)"); - statement - .execute("create table " - + LARGE_TABLENAME - + " (\"id\" serial primary key, \"field1\" varchar(100))"); + statement.execute("create table " + TABLENAME + + " (\"id\" serial primary key, \"field1\" varchar(100), \"field2\" boolean)"); + statement.execute("create table " + LARGE_TABLENAME + + " (\"id\" serial primary key, \"field1\" varchar(100))"); break; } statement.executeUpdate("insert into " + TABLENAME diff --git a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java index d099b92fb3..8d368bfa78 100644 --- a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java +++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java @@ -72,18 +72,18 @@ public class MassInsertMemoryLeakTestApp extends LegacyApplication { SQLContainer c = new SQLContainer(q); for (int i = 0; i < 100; i++) { Object id = c.addItem(); - c.getContainerProperty(id, "FIRST_NAMES").setValue( - getRandonName()); - c.getContainerProperty(id, "LAST_NAME").setValue( - getRandonName()); + c.getContainerProperty(id, "FIRST_NAMES") + .setValue(getRandonName()); + c.getContainerProperty(id, "LAST_NAME") + .setValue(getRandonName()); } c.commit(); getContext().lock(); try { proggress .setValue(new Float((1.0f * cent) / cents)); - proggress.setCaption("" + 100 * cent - + " rows inserted"); + proggress.setCaption( + "" + 100 * cent + " rows inserted"); } finally { getContext().unlock(); } diff --git a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java index 2ff74a76ef..c4a9385dda 100644 --- a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java +++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java @@ -51,8 +51,8 @@ public class TableQueryWithNonUniqueFirstPrimaryKey extends AbstractTestUI { @Override public void valueChange(ValueChangeEvent event) { if (myCombo.getValue() != null) { - Item item = myCombo.getItem(event.getProperty() - .getValue()); + Item item = myCombo + .getItem(event.getProperty().getValue()); String selected = item.getItemProperty("MYFIELD") .getValue().toString(); System.out.println("Selected " + selected); @@ -80,8 +80,7 @@ public class TableQueryWithNonUniqueFirstPrimaryKey extends AbstractTestUI { } catch (SQLException e) { } String q = "CREATE TABLE mytable2 (id INTEGER GENERATED BY DEFAULT AS IDENTITY," - + " MYFIELD varchar(60)," - + " PFX varchar(1)," + + " MYFIELD varchar(60)," + " PFX varchar(1)," + " numero integer" + ", PRIMARY KEY (pfx,numero));"; statement.execute(q); statement.close(); @@ -106,8 +105,8 @@ public class TableQueryWithNonUniqueFirstPrimaryKey extends AbstractTestUI { conn = connectionPool.reserveConnection(); Statement statement = conn.createStatement(); - statement - .executeUpdate("insert into mytable2(myfield,pfx,numero) values ('COSTRUEDIL DI GAGLIOSTRO & C.SNC','C',6),('AUTOBUDA SRL','C',7),('CAFARELLI TINDARO AUTORICAMBI','C',8),('LARTE DEL MOBILE DI QUINTO CUTRI','C',9),('GRAPHIC DESIGN','C',10),('FOTI CARMELO','C',11),('MALAGRECA MICHELE OFF.ELETTR.','C',12),('CLIENTE NUOVO FRANCESCO','C',13),('LAROCCA ETTORE','C',14),('ALCAM SNC DI MARAFIOTI ALESSANDRO E','C',15),('EUROPA TYRES S.R.L.','C',16),('CROCE ROSSA ITALIANA COM.LOCALE','C',17),('RUGNETTA BRUNO','C',18),('BOSA VINCENZO TUTTO PER LA PESCA','C',19),('C.P.R.CENTRO POSE ROMEO','C',20),('VIOLI ORESTE OFF.AUTOCARROZ.','C',21),('LIGATO SALVATORE','C',22),('DECORFORM DI IANNINO DARIO','C',23),('BEVI SUD DI DAGOSTINO GIUSEPPE','C',24),('BUSTE E CARTA DI GALLICO DARIO','C',25),('CELESTINO CRISAFULLI','C',26),('IMPRESA EDILE IS.AS.DI SALVATORE','C',27),('RASO GIUSEPPE','C',28),('EUROTECNICA 3A SAS DI ANELLO FRANC.','C',29),('EXO AUTOMOTIVE S.P.A.','C',30),('GHEA SISTEM S.R.L.','C',31),('AUTOTECNICA DI IANNELLI GIUSEPPE','C',32),('NATURAL SALUMI DI ARENA GIANCARLO','C',33),('LOIACONO PASQUALE & C. S.a.s.','C',34),('LONGO CLAUDIO','C',35),('CLASS SERVICING S.R.L.','C',36),('CADI SNC F.LLI MILASI','C',37),('MARTURANO FRANCESCO','C',38),('ARICOASSICUR.DI ARICOMARIATERESA','C',39),('','C',40),('SICILIANO FRANCESCO','C',41),('PREVITERA CATERINA ALIMENTARI','C',42),('AUTOFFICINA LUCAGIOVANNI','C',43),('NON UTILIZZARE','C',44),('','C',45),('SAFFIOTI MELO MACELLERIA GASTRON.','C',46),('MANGERUGA SERAFINO','C',47),('S.D.A. s.a.s.di Palmitessa Carlo','C',48),('IPER SCAVI S.R.L.','C',49),('','C',50),('FABBRICA ARTIGIANA LUIGI COLOMBO','C',51),('ELETTRO GLOBAL SERVICE DI ELIA','C',52),('FORTUNATO','C',53),('STEFANO BAJLO','C',54),('.','C',55),('FORTUGNO S.R.L.','C',56),('PARRELLO GIUSEPPE','C',57),('GAS E CUCINE DI SANTORO GIOVANNI','C',58),('LUPPINO MAURIZIO','C',59),('','C',60),('CHARTER LINE SAS','C',61),('CAMPAGNA GIUSEPPE EREDE DI CAMPAGNA','C',62),('TREBI DI BARBARO FRANCESCO','C',63),('COOPERATIVA SOCIALE ONLUS','C',64),('','C',65),('SASOL ITALY S.P.A.','C',66),('AVATI ROCCO','C',67),('DOLCE FREDDO DI DAGOSTINO G.PPE','C',68),('GUERRERA FRANCESCO','C',69),('','C',70),('AGRICOLA PALMESE DI ARICO EMAN.&C.','C',71),('BORRELLO COSIMO TENDAGGI TAPPEZZ.','C',72),('DAMIANO PUTRINO OFF.MECC.','C',73),('CENTRO FORNITURE S.R.L.','C',74),('','C',75),('CLIENTE NUOVO FORTUNATO','C',76),('AVV.FERDINANDO DE LEONARDIS','C',77),('INSTALLAZIONE DI IMPINATI ELETTR.','C',78),('VIOLI PIETRO','C',79),('','C',80),('BASILE VINCENZO','C',81),('SAFFIOTI APPALTI & COSTRUZIONI','C',82),('SOC.COOP.MULTISERVICE MAMMOLA','C',83),('ARCH.TIZIANA GAGLIOTI','C',84),('','C',85),('GAGLIOTI SRL','C',86),('PINO MICHELE IMPRESA COSTRUZ.','C',87),('','C',88),('BORGESE GIUSEPPE','C',89),('','C',90),('PREVITERA SALVATORE','C',91),('PASTORE SRL','C',92),('OFF.LUCI CARMELO','C',93),('GIOFFRE CARMELO','C',94),('','C',95),('COGIMI S.R.L.','C',96),('CANTINE ZAGARI SNC','C',97),('ALBEDA IMPIANTI DI LOPRETE ANTONIO','C',98),('VETRARIA BRUTIA S.R.L. UNIPERSONALE','C',99),('COSTANZO TOTI','C',100),('GRASSO DAVIDE','C',101),('SGROMO BERNARDO','C',102),('PANIFICIO CIAPPINA','C',103),('ARCA INDUSTRIAL SUPPLIES S.R.L.','C',104),('','C',105),('ZUMBO DR.TOMMASO','C',106),('PUNTO SIDIS DI SACCA PASQUALE','C',107),('BARRARA SALVATORE','C',108),('IMEX P-TRADE S.R.L.','C',109),('','C',110),('DOTT.AGR.VINCENZO CILONA','C',111),('PIANEGONDA DARIO S.A.S.','C',112),('DALOI GIUSEPPE AUTOFFICINA','C',113),('BARBARO MOTO SAS','C',114),('','C',115),('DE FRANCESCO VINCENZO','C',116),('RICAUTO SPA','C',117),('GERICO SAS','C',118),('GISMONDO VINCENZO','C',119),('','C',120),('IMPRESA COSTR.EUROEDIL DI MOIO F.SC','C',121),('SUD.INFORMATICA S.R.L.','C',122),('CRAZY MOBIL SNC DI GAGLIOTI G.PPE','C',123),('A.D.S.S.E. SRL DI RUGGIERO PACIFICO','C',124),('','C',125),('GRAMUGLIA VINCENZO','C',126),('LUIGI NIZZARI SUBAGENTE ALLIANZ SPA','C',127),('BRUZZESE ANNUNZIATA','C',128),('HOTEL STELLA MARIS SRL','C',129),('','C',130),('ATRE EXPRESS SRL','C',131),('GATTO ANTONINO','C',132),('BO.GE.CO. S.R.L.','C',133),('VALENTINO TECNICA SNC','C',134),('','C',135),('NASO GIUSEPPE','C',136),('GALIBERTI LUCIANO STEFANO','C',137),('MURACE FRANCESCO','C',138),('GEOM.GIOFFRE SAVERIO','C',139),('','C',140),('PIANA PALMI MULTISERVIZI S.P.A.','C',141),('GOLDEN GROUP SNC','C',142),('DE CREA FORTUNATO','C',143),('LUPPINO MICHELE','C',144),('','C',145),('STILLITANO SRL','C',146),('FERREDIL DI MANUCRA GEOM.MARIO','C',147),('L & R LABORATORI E RICERCHE SRL','C',148),('EDIL SUD DI MALACRINOALESSIO G.','C',149),('','C',150),('FRESH BLU DI MELISSARI CETTINA','C',151),('BAGALA ROBERTO','C',152),('SERGI ROSALBA','C',153),('CO.MEC. DI VIOLI DOMENICO','C',154),('','C',155),('RADIO FRECCIA NET WORK','C',156),('GIOVINAZZO IPPOLITO','C',157),('ELECTRONIC CENTER DI ZAGARI ROSARIO','C',158),('EMPORIO ROGGIO GIUSEPPE','C',159),('','C',160),('CALAFIORE ANTONIO','C',161),('PARRELLO GIUSEPPE','C',162),('RUGGERI & PIAZZA SNC','C',163),('FRESCHEZZA IN TAVOLA DI FOTI ROSA','C',164),('','C',165),('AUGIMERI CARMINE AUTOFFICINA','C',166),('MATTIANI DOMENICO','C',167),('CALDERAZZO GIANCARLO','C',168),('ROMANIN ELVIO STUDIO COMMERCIALE','C',169),('','C',170),('G.TRIPODI SRL','C',171),('DEDMONDO FRANCESCO','C',172),('IDROCAR DI IANTORNO MARIO','C',173),('ZAGARI PAOLO IMP.ELETTRICI','C',174),('','C',175),('SELF AREA AGIP \"LA SOSTA S.A.S.\"DI','C',176),('MARKET MIMMO DI MAMMONE ANNA MARIA','C',177),('OSRAV ALFEO MORET S.P.A.','C',178),('A.S.PALLAVOLO PALMI','C',179),('','C',180),('GN.RISTRUTTUR.DI GANGEMI NICOLA','C',181),('ANNULLATO PRESO PER TRADE EVOLUT','C',182),('PULEIO PASQUALE','C',183),('ROTONDO S.R.L.','C',184),('','C',185),('DOMENICO ORTUSO & C. S.a.s','C',186),('FABIO PIERANGELI','C',187),('EDIL PALMI SAS di CRUCITTI F.SCO &C','C',188),('MLD LOGISTICA E DISTRIBUZIONE SRL','C',189),('','C',190),('HOTEL SANTA CROCE','C',191),('CUBA MOTOR','C',192),('CENTRO SERVIZI AUTO DI FURFARO','C',193),('TRAS PUGLIA DI SPINA GIUSEPPE','C',194),('','C',195),('LAMINAZIONE SOTTILE SPA','C',196),('FULCO DOMENICO OFFICINA','C',197),('DAMICO MICHELE AUTOFFICINA','C',198),('CAPRARI ADRIANO','C',199),('','C',200),('FARINA ANTONIO','C',201),('CALABROROSARIO DOMENICO','C',202),('NUOVA CASALAUTO DI CREPALDI GIAN','C',203),('AS TAUREANA CARS DI PALMA FEBBO','C',204),('REPACI TEODORO TRASPORTO MERCI','C',205),('GIEMME IMPIANTI DI IANNELLO MICHELE','C',206),('MUSICO S.R.L.','C',207),('GULLI CARMELO','C',208),('CASCIANO GIACOMO','C',209),('MARKET MARTURANO LETTERIO','C',210),('FOGLIARO FORTUNATO & C. SNC','C',211),('RAVAGLI VITTORIO FERRAMENTA UTENS.','C',212),('GRIMI AUTO DI GRIMI DOMENICO SNC','C',213),('BARONE DOMENICO','C',214),('RANUCCIO SONIA AZIENDA AGRICOLA','C',215),('A.B.COMPUTING DI BAGALAANTONIO','C',216),('GIOIA CAR SRL','C',217),('TOTO MONTAGGI DI MARINO ANTONIO G.','C',218),('GEOM.GIUSEPPE OLIVERI','C',219),('IMPRESA COSTR.EDILI CILONA G.PPE','C',220),('TERMOIDRAULICA DI TALLARIDA G.PPE','C',221),('RIGHETTINI EMANUELE','C',222),('CM INDUSTRIE SRL','C',223),('AUTOGOLD DI DE SANCTIS G.','C',224),('RIGON GIAN CARLO AUTOTRASPORTI','C',225),('IMPIOMBATO ANTONINO','C',226),('I.F.E.S.DI CUTRI GIUSEPPE','C',227),('COMPANIE DHOTELLERIE SUISSE SRL','C',228),('LARTE DEL FALEGNAME SNC','C',230),('AUTOSERVICE 2000 SAS','C',231),('SERVICE RICAMBI E ACCESSORI DI','C',232),('CAPPONE MICHELE LAV.VETRI','C',250),('COLELLA FRANCECSO','C',251),('LA PIANA SNC DI BARBARO ANGELINA','C',252),('SURACE GIANFRANCO','C',253),('EDIL CERAMICHE PALMI DI SCHIPILLITI','C',254),('AGOSTINO ROMEO SRL','C',260),('SGROFRANCESCO','C',261),('IMPRESA EDILE DI CERAVOLO GIUSEPPE','C',262),('FICARRA ROBERTO IMPRESA EDILE MOV.','C',263),('CAR SERVICE DI GALLO DANIELE','C',264),('LAGRICOLA DI BALDO FRANCESCO & C.','C',265),('ARENA VINCENZO','C',266),('ROMEO MARIA','C',267),('BERTIM EDILIZIA E COSTA SRL','C',268),('ITALIA TRASPORTI E LOGISTICA SRL','C',269),('STUDIO DI PROGETTAZIONE ARCHITETTO','C',270),('CALOGERO SALVATORE','C',271),('CANANZI AUTO','C',272),('OLEIFICIO BORGESE FILOMENA','C',273),('ASSOCIAZ.DI VOLONTARIATO PRESENZA','C',274),('IPO S.R.L.','C',275),('SMAC SNC & C. DI MERCURI SALVATORE','C',276),('MODAFFERI MICHELE ELETTRAUTO','C',277),('ROMEO FORTUNATO','C',278),('BAR BRUZZESE FRANCESCO','C',279),('AUTOFFICINA MARCELLO GULLI','C',280),('SCAVA ROSARIO','C',281),('CASELLA DOTT.MARIO DOMENICO','C',290),('SAFFIOTI ROCCO','C',999),('POINT CAR SERVICE SAS','C',1000),('AUTORICAMBI PRAIA SAS DI UGO','C',3001),('AUTOF.CATANANTI DI DIBIANCO GIOV.NI','C',3002),('AUTOPIU DI GRIFFO V.&.C. sas','C',3003),('ARMENI AUTO DI ARMENI ANDREA & C.','C',3004),('LA BELLA ROBERTO','C',3005),('TERMOIDRAULICA DI IANNINO SOCCORSA','C',3006),('AUTOBUDA DI ZAPPIA ANTONELLA','C',3007),('BELCASTRO ROSARIO R.B.AUTOR.','C',3008),('PNEUSERVICE SRL','C',3009),('AUTOFORNITURE MILANESI SPA','C',3010),('ORTOLANI CARLUMBERTO','C',3011),('AZZARA CARMELO','C',3012),('AUTOSILA S.R.L.','C',3013),('ATTISANO MICHELE','C',3014),('AMMENDOLA GIUSEPPE','C',3023),('ANNULLATO AUTOPARTS DI FIEROMONTE T','C',3026),('CENT.TELEFONIA DE PASCALE DANIELA','C',3027),('TYRE HUNTER DI CANTISANI CARMINE','C',3028),('AUTOFFICINA AMMENDOLA DEMETRIO','C',3029),('CENTER CAR S.R.L.','C',3032),('MACELLERIA DI BARBERA FRANCESCO','C',3101),('BLEVIO PIETRO','C',3103),('AZIENDA AGRICOLA SURACE GIUSEPPINA','C',3104),('C.F.S.CARRELL FULL SERVICE DUE sas','C',3106),('IMPRESA COSTRUZ.GEOM.CIAPPINA F.SCO','C',3107),('BELLISSIMO ANTONIO','C',3108),('BARBARO GIUSEPPE DITTA','C',3111),('BARILLARI GABRIELE AUTORICAMBI','C',3112),('BORGESE GIUSEPPE','C',3113),('BARA GIUSEPPE OFF.& RICAMBI','C',3114),('AUTO IARIA S.R.L.','C',3115),('TRIPODI GEOM.ANTONINO IMPRESA EDILE','C',3120),('BARRECA DEMETRIO','C',3129),('BOVA VINCENZO','C',3139),('BRUNO AUTORICAMBI S.a.s.','C',3145),('CILIONE & C. SRL','C',3200),('CANDIDO GIULIO','C',3202),('LUDDENI MARIO MARKET DEL RIC.','C',3205),('RIOTTO SAVERIO','C',3207),('MOTORSPORT DI CIRICOSTA G.PPE','C',3209),('CE.D.R.A. DI CUCUNATO NATALE','C',3211),('S.D.S. CARBURANTI S.A.S.','C',3215),('TURANO G.PPE & C.snc AUTORICAMBI','C',3216),('CILIONE CONSOLATO !! SOSPESO !!','C',3217),('PUGLIESE ERNESTO','C',3219),('CALABRO LORENZO','C',3220),('LAGANADOMENICO','C',3222),('ANNULLATO INVIATO A TETI A.','C',3224),('AUTO SERVICE DI IOPPOLO G.GIULINO','C',3226),('TRIPODI FORTUNATO','C',3228),('COMEDIL DI P.SGRO & C. sas','C',3232),('SGROORLANDO AUTORICAMBI','C',3234),('DOTT.PALMIRO ZAPPONE','C',3236),('POLIRICAMBI SRLS','C',3240),('ROCCHETTO RENATO','C',3241),('CURRA ANTONINO','C',3242),('COLOSI FRANCESCO INFISSI IN','C',3244),('CUORE ANTONIO','C',3245),('GRAMUGLIA DOMENICO OFF.MECC.','C',3246),('CALIO srl RICAMBI AUTO','C',3248),('COZZA ELIO','C',3252),('OERRE PARTS S.R.L.','C',3257),('EURODIESEL DI CASSALIA MAURIZIO','C',3262),('@ 2X INSTALLAZIONI DI PUGLIESE A.','C',3263),('TECNO TRADE SRL','C',3265),('CROCCO FRANCO','C',3267),('CARTELLA MASSIMO','C',3269),('SCARMATO FORTUNATO','C',3275),('C.M.G. BRAM SRL','C',3278),('CARONZOLO ROSARIO','C',3279),('CALIPARI SERAFINO','C',3286),('EDIL DORA DI BRUNO ROMEO','C',3294),('EXIDE TECHNOLOGIES SRL','C',3295),('IL TEMPIO DEL RIC.DI GIORDANO LUIGI','C',3301),('OFFICINA DE GRAZIA SAS','C',3302),('REGALI E SORRISI DI GUERRERA D.CO','C',3304),('UNIFLUID SUD SRL','C',3305),('CONSORZIO PDA','C',3307),('SURACE ROCCO','C',3308),('DITTA CILONA VINCENZO','C',3309),('DAGOSTINO AUTORICAMBI','C',3310),('DATTOLA AUTO & C. snc','C',3312),('DE NISI DOMENICO','C',3315),('IMPRESA COSTRUZ.SIMONETTA VINCENZO','C',3316),('AUTORICAMBI E ACCESSORI DI MARZIA','C',3317),('CHIAPPALONE ANNUNZIATO','C',3319),('EUROPA RICAMBI DI DE MARIA CARLO &','C',3320),('BRUZZESE FRANCESCO','C',3323),('DE GREGORIO SRL','C',3325),('LOGATTO VINCENZO V.L AUTORICAMBI','C',3326),('TARUSCIO GIOVANNI','C',3331),('TODARO SAVERIO','C',3334),('FERRARO LUIGI','C',3403),('AUTORICAMBI ERRIGO C.& C. S.A.S','C',3404),('PISANO GAETANO','C',3409),('AGRINOVA DI CORRADO NICOLA','C',3501),('FE e SA & C. DI SANTORO B. sas','C',3502),('CAR SHOP AUTORICAMBI','C',3503),('BRIGA LUCIANO','C',3504),('FIDALE GIACOMO & C.sas CAR SERVICES','C',3505),('FERRERO MASSIMILIANO IF.AUTORIC.','C',3506),('ASSOCIAZIONE RADIOAMATORI ITALIANI','C',3507),('FALBO ANTONIO','C',3508),('DAGOSTINO BIRRE DI GINO','C',3510),('FULLONE MARIO','C',3512),('EMMEDUE COSTRUZIONI','C',3514),('PALMCART OLIVERIO GIUSEPPE','C',3516),('BORGESE RANIERI & CLAUDIO SNC','C',3519),('FUTIA SALVATORE','C',3522),('FRANCHINA MASSIMILIANO Autoricambi','C',3523),('FUTIA DOMENICO Ricambi Auto','C',3525),('IMPRESA EDILE SCHIPILLITI V.ZO','C',3526),('MEDITERRANEA TRASPORTI SOC.COOP','C',3527),('AGENZIA LOGISTICA MERIDIONALE','C',3528),('RAGO UMILE RICAMBI-OFFICINA','C',3531),('SE.MA.C. SRL','C',3534),('IMPRESA EDILE GAGLIOSTRO V.ZO','C',3541),('FIGLIUZZI SALVATORE','C',3544),('FRAGOMENI DOMENICO','C',3548),('FIEROMONTE & CHIAPPALONE sas','C',3551),('F.T.R. F.LLI TRIULCIO SRL','C',3553),('GIORDANELLI SERGIO','C',3602),('F.LLI GUIDA sas','C',3603),('GRILLO GIUSEPPE','C',3604),('GALLO STANISLAO MANGIMI CONCIMI','C',3605),('COARSA SOC.CONS.IMP.SANLURESI SRL','C',3606),('PASCHOU MARIA','C',3607),('PELLEGRINO PIETRO ROCCO AZIENDA','C',3608),('ROSANNA EX GRM RICAMBI','C',3609),('INDUSTRIA BOSCHIVA DICH.STEL.','C',3610),('GILBERTO DROGHETTI DOTT.','C',3611),('GALLE NICOLA','C',3615),('EUROELETTRA S.N.C.DI NICOLOSI &','C',3616),('PALETTA ALBERTO AUTORIC.','C',3617),('GIOFFRE GIUSEPPE','C',3620),('PRINTING CENTER S.A.S.','C',3621),('SUD CARNI DI LEONELLO PASQUALE','C',3622),('GIOVINAZZO AUTORICAMBI','C',3623),('GENCARELLI GIUSEPPE','C',3627),('GRASSO FRANCESCO','C',3631),('GALLO GIOVANBATTISTA','C',3632),('CIESSEGI SNC DI CATOZZA MARIO & C.','C',3639),('AUTOMARKET DI PAPALIA ROBERTO','C',3646),('CENTRO RICAMBI DI MARINO & C.SNC','C',3700),('IMPRESA EDILE RECHICHI GIANCARLO','C',3701),('G.R.RICAMBI SRL','C',3704),('BRUZIA RICAMBI DI HRISCU CARMEN','C',3705),('AUTORIC.IANNI DI IANNI FRANCESCO','C',3706),('ITAL RICAMBI DI IAROPOLI V.& C.sas','C',3708),('INFORTUNA SANTO','C',3710),('IOVINE NICOLA','C',3711),('FILIPPONE ANTONINO','C',3712),('INFANTINO GIUSEPPE ELETTRAUTO','C',3717),('IDA RAG.ENZO','C',3719),('DE MASI PASQUALE DE.CA AUTORICAMBI','C',3800),('CANTIERI NAUTICI COSTA VIOLA','C',3803),('BG.CAFFE DI GIUSEPPE BALO','C',3805),('GUARASCIO LUIGI AUTORICAMBI','C',3806),('GIOFFREGAETANO','C',3807),('CENTRO AUTO MOTO DI LAGANA sas','C',3810),('LONGO CLAUDIO','C',3811),('LAGANA GIOVANNI','C',3814),('EDILDECORO DI FORTUGNO & SAFFIOTI','C',3815),('ATC DI PUGLIESE ALBERTO & C.SAS','C',3818),('LONDINO SERGIO','C',3822),('ANANIA ROCCO & GRILLO F.SCO SNC','C',3825),('FARMACIA FORGIONE DANIELA','C',3827),('AUTORICAMBI RAG.SAVERIO LAGAZZO','C',3828),('SERVICE AUTO SAS CENTRO REVISIONI','C',3829),('MASSARA NICOLA ACCESSORI PER AUTO','C',3832),('FANELLI GIOVANNI','C',3833),('LOIACONO GIUSEPPE','C',3835),('ANNULLATO UTILIZZATO PER IL WEB','C',3843),('ANNULLATO','C',3844),('AUTORICAMBI LAGANAROBERTO DI','C',3845),('ANNULLATO UTILIZZATO PER IL WEB','C',3846),('MELITO GIAMPIERO','C',3901),('MRC RICAMBI S.R.L.','C',3903),('MARONGELLI ANTONIO','C',3908),('MORELLO ANTONIO','C',3911),('M.A.I.R.S.AGATA DI DE BENEDETTO N.A','C',3912),('MONTELEONE MICHELE Autoricambi','C',3913),('FOTI PASQUALE','C',3914),('METALLURGICA RIVORALESE SPA','C',3915),('MARTINO DOMENICO','C',3917),('MALIZIA PASQUALE','C',3918),('DE SIBIO MECCANICA sas DI DESIBIO D','C',3924),('PUBBLIWORLD DI GULLO ANTONINO','C',3926),('MAZZITELLI & TASSONE S.N.C.','C',3927),('LANDRO AUTOMOBILI','C',3928),('MEZZATESTA ANTONIO','C',3931),('MOTOR SHOP Autoricambi sas','C',3932),('REPACI GIOVANNI','C',3933),('MERLINO CARMELO','C',3934),('ONESHOT S.A.S.','C',3935),('MANARITI GIUSEPPE','C',3936),('FESTA LEONA','C',3937),('CB SPECIAL COMPONENTS DI BERTOT','C',3939),('EDICOLA ARCURI LUCIA','C',3942),('LANDRO LEONE','C',3943),('COOPERATIVA REGGINA 08','C',3944),('MUZZI BRUNO','C',3952),('CAMERA ANTONIO','C',3957),('MAMONE GERARDO CENTRO RICAMBI AUTO','C',3961),('MALARA GIUSEPPE','C',3962),('R.C. TUNING DI LORENZO ANTIMO','C',3963),('MAIO CESARE','C',3966),('MACELLERIA LEONELLO SALVATORE','C',3967),('CAMERA DOMENICO','C',3972),('COZZOLINO SAVERIO AUTOPARTS','C',3976),('MARINO GABRIELE & F. sas','C',3978),('SYSTEM SUD SNC','C',3981),('MSC AUTOVEICOLI DI MUSICOARNALDO','C',4001),('GALATI ANTONIO AUTOTRASPORTI','C',4003),('NILAUTO srl','C',4004),('NUCERA FILOMENO','C',4007),('NUCERA MAURIZIO','C',4008),('OTTOBRE TRADE SRL','C',4205),('CONDOLUCI MARIA GIUSEPPA','C',4207),('PUGLIESE SALVATORE RICAMBI AUTO','C',4208),('NOVEMBRE ROSANNA MINUT.E MECC.','C',4210),('CABBOI GRAZIELLA','C',4212),('PETRONAS LUBRICANTS ITALY SPA','C',4213),('PERRI MIMMO','C',4215),('D.SSA ZAPPONE LILIANA','C',4222),('PUPO GIUSEPPE AUTORICAMBI','C',4226),('OFF.MECC.FRATELLI PIRILLI','C',4229),('RACO ELISABETTA RIF.TAMOIL','C',4230),('PICCOLO MARIO AUTORICAMBI','C',4232),('AUTORICAMBI VENTURA VINCENZO','C',4236),('TECNO EDIL DI VIOLA SANTO','C',4242),('PALMA AUTORICAMBI S.R.L.','C',4243),('PULIMENI ANTONIO & C. sas','C',4244),('PALERMO OLIVA Autoricambi','C',4246),('MAX MOTO DI PELLEGRINO M.A.','C',4249),('POLIMENI FRANCO','C',4256),('PEZZANO PIETRO','C',4261),('POLITI FRANCESCO Elettrauto','C',4263),('TROPEANO STEFANO RICAMBI AUTO','C',4303),('ROPERTO ALDO CENTRO COMMERC.RICAMBI','C',4304),('TENUTA GIANFRANCO AUTORICAMBI','C',4305),('F.LLI ROSE Snc di UMILE & FRANCO R','C',4308),('AUTORICAMBI RUGGIERO sas','C',4310),('VIOLA ERMANNO STAZ.SERV.ERG','C',4312),('R.AUTO IN snc','C',4313),('GOMMAUTO DI RODA & C. snc','C',4314),('DECA S.a.s. DI G.PPE DE PASCALI &C.','C',4318),('A.G.C.SRL','C',4320),('NUOVA RIMA DI CAPULA RAFFAELE','C',4324),('CRUCITTI GROUP SRL','C',4325),('INFORAMA DI DENISI V.ZO E C.SAS','C',4328),('EVALTO FRANCESCO & FIGLI','C',4401),('SCHIPANI RICAMBI','C',4404),('SPINA ALEXANDRO','C',4405),('SCUOLA CALCIO VIGOR PALMI 2004','C',4406),('SURIANO ALV SAS','C',4407),('AUDINO SAVERIO','C',4408),('SOBER RICAMBI AUTO sas','C',4409),('ROMEO VINCENZO & C. SNC','C',4411),('SAIM snc DI TAVELLA ANTONIA','C',4414),('SAINATO PASQUALE','C',4415),('SMEC SRL','C',4416),('F.LLI SINOPOLI snc Ric.Auto-Moto','C',4417),('F.LLI SPINELLI snc','C',4418),('AZ.AGR SORGES DI ROSA SORLETI','C',4420),('DUEMME S.A.S.','C',4421),('SPOLETO NUOVA AUTOACCESSORI','C',4422),('LOMBARDO DOMENICO FU GREGORIO','C',4423),('MULTISERVIZI M.G.D. DI PARRELLO','C',4427),('SCIARRONE SPA','C',4429),('SCRIVO ANTONIO','C',4432),('SERRATORE FRANCESCO','C',4440),('ANNULLATO UTILIZZATO PER IL WEB','C',4441),('LA BOTTEGA DEL RESTAURO DI FOTI R.','C',4442),('EREDI SURACE LORENZO di SURACE','C',4443),('S.D.R. sas','C',4446),('SAMA & CODISPOTI SAS','C',4451),('SCIONTI ROCCO Jr.','C',4452),('SOFI PAOLO','C',4454),('SISCA ANTONIO MECCANICO ARTIGIANO','C',4460),('ITALCOGE SPA','C',4463),('ANNULLATO TASSO SAL','C',4466),('BISCARDI LUIGI TUTTO PER LAUTO','C',4501),('B.P.SOLLEVAMENTI di ETTORE BELLINI','C',4502),('TROVATO AUTORIPARAZIONE','C',4506),('TASSONE PASQUALE','C',4514),('LA TIRRENICA DI CAPUA GIUSEPPE','C',4517),('TASSONE sas DI TASSONE GUERINO & C.','C',4521),('TASSO ANTONIO LEONE AUTORICAMBI','C',4522),('MAZZA ANDREA','C',4523),('TORCHIA ANGELO','C',4525),('TAVELLA ANTONIO','C',4533),('ANNULATO','C',4600),('VENTRA SAS di VENTRA VINCENZO & C.','C',4601),('VALOTTA FRANCESCO','C',4606),('VONO S.A.S. DI VONO G.& CO.','C',4607),('MEG DI ROMEO CARMELO','C',4611),('VENTRE AUTORICAMBI DI VENTRE G.PPE','C',4612),('TECHNO BUS SRL','C',4613),('LA FLAVIA DI FILIPPO SPINELLI','C',4614),('VRENNA LUCA MECC.& SICUREZZA','C',4615),('DELIZIE DI CALABRIA S.A.S DI ARENA','C',4621),('GENTILE FRANCESCO','C',4702),('ZICARELLI SALVATORE','C',4704),('ZAPPIA CARMELO','C',4705),('ATTENZIONE ! LA MECCANICA 2','C',5000),('EVA TECH S.A.S.DI DANIELE MEGALIZZI','C',5002),('RESTUCCIA ROSA RITA BOSCH CAR SERV.','C',5003),('PIMEC SRL','C',5004),('DAVIGIUSEPPE','C',5007),('VITETTA ANTONINO','C',5009),('STIL GOMMA DI NINO IANNELLI','C',5011),('ANNULLATO UTILIZZATO PER IL WEB','C',5017),('OFF.MECCANICA ROTONDO ANTONIO','C',5019),('COMBUSTION AND ENERGEY SRL','C',5020),('HOTEL RESIDENCE \"ARCOBALENO\"','C',5022),('BRANDO CARMELO','C',5024),('CASILE ROBERTO','C',5029),('AVVENTURA SOC.COOPERATIVA ARL','C',5035),('RA.DI SRL','C',5036),('CENTRO GOMME DI CONDINA GIOVANNI','C',5040),('JOLLY FRUTTA DI PAPASERGIO ANGELA','C',5043),('SURACE ANTONINO','C',5055),('FORTEBUONO METALLINFISSI S.r.l.','C',5056),('BAGALAGIUSEPPE','C',5057),('CASEIFICIO IL GRANATORE DI ZAGARI','C',5060),('RUSSO GAETANO AUTORICAMBI','C',5062),('RAFFAELI SRL','C',5073),('ALESSI PINA IMPRESA EDILE','C',5075),('ERREBI SRL','C',5076),('LA CORTE DELLA CARNE DI PEPPINO','C',5078),('MANOCCIO GENNARO','C',5084),('DE CARIA MOTORS SRL','C',5085),('DOTT.MARCELLO MELARA','C',5087),('F.LLI ATTISANO SRL ORTOFRUTTA','C',5088),('GIOFFRE PASQUALE','C',5089),('M.G. LOGISTIES SERVICES SRL','C',5091),('CONSORZIO ACQUEDOTTO VINA','C',5094),('MD COLLECTION DI MARRA DOMENICO','C',5100),('CRUCITTI SRL','C',5101),('VITALONE ROCCO OFF.MECC.','C',5102),('MOTORCYCLE & AUTO REPAIRS','C',5107),('QUASED SRL','C',5108),('CADI SERVICE S.A.S.','C',5110),('CO.DI.M. SRL','C',5114),('LEUZZI GIANCARLO','C',5115),('SCUTERI FRANCESCO','C',5116),('DI PINO TINDARO AUTORICAMBI','C',5117),('COMUNE DI SEMINARA','C',5123),('MATINA DOMENICO','C',5125),('ACCARDO ANNUNZIATO FILIPPO','C',5127),('BOLIGNANO ROBERTA DONATELLA','C',5131),('EVENTI FIORITI DI ROBERTA ANGALO','C',5132),('RAZIONALE ROSARIO HIPPONIO AUTO EL.','C',5133),('ERREMME di ROMEO DOMENICO MASSIMO','C',5134),('MAXICAR DI A.TRICOMI','C',5136),('MONTELEONE MARIA MADDALENA','C',5141),('REGGIORICAMBI DI MICHELANGELO','C',5142),('IL GENIO DEL PANE DI GARZO GREGORIO','C',5143),('ANNULLATO UTILIZZATO PER IL WEB','C',5144),('DAL MASO GIADOMENICO','C',5146),('RIZZITANO ANTONINO','C',5147),('MAURO AUTORICAMBI DI BADAMI MARIA','C',5150),('EDIL QUATTRO DI SAPONE G.& C. SNC','C',5151),('MARIA MADDALENA SICA','C',5163),('CILONA ANTONINO','C',5164),('MAGAZZU ARREDAMENTI','C',5165),('BORGESE VINCENZO','C',5166),('ARCHIMEDE DI MATTIANI PASQUALE','C',5169),('BAR RISTORANTE ULIVARELLA','C',5174),('CENTRO RICAMBI CALABRESI SNC CRC','C',5178),('PINNERI ANTONINO','C',5179),('F.LLI SCORDAMAGLIA S.N.C DI F.SCO','C',5182),('PANUCCIO ING.DOMENICO IMPR.COSTRUZ.','C',5183),('LOMBARDO ALLESTIMENTI','C',5195),('BOSCHETTO FRANCESCO ELETTRAUTO','C',5198),('PONTECOPROGES SRL','C',5199),('G.C.SERVICE DI GAGLIOSTRO CARMELO','C',5203),('PELLICANO S.R.L.','C',5208),('MACELLERIA DA ROCCO DI PRONESTI','C',5209),('MAGNETI MARELLI AFTER MARKET PARTS','C',5210),('IL POLLICE VERDE DI FARFAGLIA','C',5212),('COMUNE DI PALMI','C',5215),('BARA MOTO DI BARA FABIO','C',5225),('SAFFIOTI MASSIMO EMILIANO','C',5226),('LOIACONO GIULIO','C',5231),('SETTECERZE VINCENZO','C',5232),('BAGNOLI ROBERTO ELETTRAUTO','C',5234),('ALAMPI SALAVATORE IMPRESA EDILE','C',5236),('PANETTA CARLO','C',5239),('MYPLANET SRL','C',5240),('AUTO 3 snc F.LLI ARTESI','C',5241),('MATTIANI GIUSEPPE','C',5243),('ASP N.5 DI REGGIO CALABRIA','C',5244),('CANNIZZARO GIUSEPPE','C',5246),('SORICAL SPA','C',5248),('ROSACE GIUSEPPE','C',5249),('MOTORSPORT SNC DI SALVATI G.PPE & C','C',5250),('SLESC-SCHITRY DI SCHIPILLITI C.LO','C',5251),('LAURENDI GIOVANNA','C',5252),('OFF.MECC.GANGEMI DOMENICO','C',5253),('CUSAN di SANTORO & C. snc','C',5256),('MAISANO MARIANNA EURORICAMBI','C',5259),('NICOLI SANTINO ASS.PIAGGIO','C',5260),('ELETTROSISTEM DI LAFACE GIUSEPPE','C',5261),('F.LLI CAPOGRECO snc','C',5263),('COSENTINO FRANCESCA','C',5264),('TERMINE CLAUDIO AUTORICAMBI','C',5266),('CHIRICO PAOLO','C',5267),('MERCURI VINCENZA','C',5268),('AZIENDA AGRICOLA BIVONE MARIA','C',5269),('ANDREARCHIO ALESSANDRO','C',5271),('SICILIANO PASQUALE','C',5272),('APEIRON S.A.S DI F.SCO BARONE & C.','C',5273),('STAR SERVICE PICCOLA SOC.COOP.ARL','C',5274),('ZOCCALI ANTONIO','C',5276),('CONDELLO MARCO ALIMENTARI','C',5278),('MARTINO PAOLO PIETRO','C',5279),('PRELIBATEZZE DI RITA ARICO','C',5280),('AMORUSO LUIGI SRL','C',5281),('MAZZULLO LUCIANO','C',5282),('POLIAUTO DI POLIZZO UMILE','C',5286),('RIGANOFRANCESCO','C',5289),('AMBROGIO GIUSEPPE','C',5290),('ISOTERM DI VIGLIANTE GEOM.D.CO','C',5296),('MACELLERIA MICHELE LUPPINO','C',5297),('MARTORANO PASQUALE','C',5299),('TECNOVIDEO DI LAGANA','C',5301),('ASSIST.RENAULT ARCISIACONO ORAZIO','C',5302),('AUTOSERVICE MINNITI S.A.S.','C',5305),('CRO.MAR TRONIC DI G.MARZULLO','C',5308),('CRD SRL','C',5310),('VALENTE PNEUMATICI srl','C',5312),('SPADA AGOSTINO','C',5316),('RAMONDINO MARCO','C',5317),('SHOPSTORE SRL','C',5319),('LOIACONO ANNALISA','C',5321),('COLLURA ALESSANDRO','C',5324),('AP.RICAMBI DI PLUMARI ANTONINO','C',5325),('CENTRO DIAGNOSI DI GRAZIANO','C',5326),('MILITANO FRANCESCANTONIO','C',5327),('EUROSERVICE 2000 DI GIANLUCA CIMINO','C',5329),('CELESTI PIETRO ELETTRAUTO','C',5336),('AUTORICAMBI GABRIELE DI GABRIELE','C',5337),('JONICA RICAMBI SNC DI MUSCOLINO E','C',5338),('THE BEST AUTORIC.S.A.S.DI GALLO','C',5339),('VOLPE CARMELA OFF.RICAMBI AUTO','C',5341),('LOCCASIONE snc di PELLICANO P & C.','C',5342),('AZ.AGR.CARMELITANO MATTEO','C',5343),('PRISCOGLIO GIUSEPPE FRANCESCO','C',5344),('ANNULLATO INVIATO A motorline','C',5347),('PUTRINO DOMENICO STUDIO DI GEOLOGIA','C',5348),('CAPUTO NATALE AUTORIC.','C',5350),('SPORTAUTO di GAGLIOSTRO VINCENZO','C',5355),('ZERBI FABIO','C',5357),('ARICONATALE','C',5358),('VALOTTA LEOLUCA OFF.ELETTROMEC.','C',5360),('BARBARO CONCETTA LUCIA','C',5361),('PENNESTRILUIGI OFF.MECC.','C',5364),('RETTIFICHE MANNINO SRL','C',5366),('SPAGNOLO DOMENICO','C',5373),('AUTORICAMBI DLC DI ABOSSIDA G&C sas','C',5375),('AMBROGIO DOMENICO','C',5376),('BENEDETTO STEFANO','C',5377),('NICOLETTA GIUSEPPE','C',5378),('ESSERICAMBI DI ANNA MARIA SCHIRRIPA','C',5379),('DOTT.DOMENICO FARERI','C',5383),('V.I.M.A.R. SAS','C',5384),('AUTORICAMBI \"RUGGERI\" DI C.&D.CAR','C',5385),('ICOREL DI IERACE ROBERTO','C',5386),('S.G.AVIATION SRL','C',5387),('SUPERMERCATO PRINCI SAS','C',5388),('CALABRIA LUCIANO AUTORICAMBI C.D.R','C',5389),('MISALE GIUSEPPE','C',5390),('LASCALA DOMENICO','C',5393),('DELIVERY EXPRESS DI NUCARA A.','C',5394),('CUCCI FERDINANDO AUTORICAMBI','C',5402),('LENTINI MONTEDORO AUTORICAMBI','C',5407),('BORGESE CARMELO','C',5408),('TECNOSTUDIO DI ZACCURI GIOVANNI','C',5409),('SOC.COOP.ARCOBALENO A.R.L.','C',5411),('DE.SAL.CAR. DI DE SALVO ROBERTO','C',5412),('PM 2 DI MILITANO NATALE','C',5416),('EURO CAR DI BARONE ANTONINO','C',5417),('ROSINA ANTONINO','C',5418),('PALMERI MICHELE','C',5419),('S.D.CAR DI SALVATORE DOMENICO','C',5421),('CENTRO RICAMBI MINNITI','C',5422),('A.B.S. AQUILA BROADCASTING SETS','C',5424),('EDIL CASA DI DANDREA DOMENICA','C',5427),('RICAMBI 2000 S.N.C. DI LAGONIA &','C',5428),('KRIOS AC S.R.L.','C',5429),('MUSICO ANTONINO','C',5430),('NSA NUOVI SERVIZI AUTO S.P.A','C',5432),('FRAMEL SRL','C',5433),('ANNUL.LA BELLA FRANCESCO','C',5434),('IMPIOMBATO ANTONIO','C',5435),('ALFIERI SALVATORE','C',5436),('PASTIFICIO LANTICO MULINO','C',5437),('RICAMBI INDUSTRIALI S.R.L.','C',5438),('ANNULLATO INVIATO A CARPOINT','C',5439),('BARBIERI AUTORICAMBI di COSMA','C',5440),('SGRO GIUSEPPE','C',5441),('GIOIA HOSPITAL','C',5442),('AUTORICAMBI MAMONE PEPPINO','C',5444),('LA SOSPENS LIDO DI GABRIELE PIETRO','C',5445),('MICHELE SURACE DOTT.COMMERCIALISTA','C',5446),('CERENZIA GAETANO','C',5447),('BARBARO CARMINE','C',5448),('CALANNI RINDINA SPRINT AUTORICAMBI','C',5449),('ALAMPI SANTO','C',5450),('GIDAR srl','C',5451),('MARTELLI GIUSEPPE','C',5452),('OFF.MECC.BARBERA MATTEO','C',5453),('MARIANO GAETANO RIC.OFF.GOMME','C',5454),('CANNISTRA FRANCESCO','C',5455),('PIZZINO GIUSEPPE','C',5456),('GRIPPAUDO VINCENZO','C',5457),('SCANDURRA TIZIANA DIMENSIONE AUTO','C',5458),('AUTOSHOP S.R.L.','C',5459),('AUTORICAMBI DIANA ROBERTO & C.SAS','C',5460),('OLIVERI FRANCESCO','C',5461),('COSENTINO VITTORIO','C',5462),('C&P CERTIFICAZIONI S.R.L..','C',5463),('AR.RICAMBI SNC ARUTA SALV.& SANDRO','C',5464),('MAZZA ANTONIO','C',5466),('GANGEMI GIUSEPPE','C',5467),('STUDIO LEG.AVV.PELLEGRINO PASQUALE','C',5468),('OLIVERIO GIOVANNI','C',5469),('CASTAGNA PASQUALE AUTORICAMBI GOMME','C',5470),('GRAFIA PUBLICITA DI CIPRI GIUSEPPE','C',5471),('SAIJA ANGELO','C',5472),('CILIBERTO RENATO','C',5473),('CATANZARO SALVATORE','C',5474),('EUROAUTO srl','C',5475),('AGENZ.VIAGGI E TURISMO DE NICOLA','C',5476),('LA CONCORDIA SNC','C',5477),('MACOS srl','C',5478),('SIC.COM. S.A.S.','C',5479),('DONATO DANIELE AUTOR.','C',5480),('TROPICAL FRUIT DI LUPPINO FRANCESCO','C',5481),('SCIARRONE VINCENZO RICAMBI','C',5482),('CLIMAUTO DI TRAPASSO GIUSEPPE SNC','C',5483),('DABATE ORAZIO C.R. CENTRO RICAMBI','C',5484),('LB RICAMBI AUTO SAS','C',5485),('FAR.O.L.RICAMBI srl FAROL','C',5486),('CAPRINO ANTONIO AUTORICAMBI','C',5487),('MEGNA ANTONIO','C',5488),('MARINCOLO SERAFINO ELETTRAUTO','C',5489),('TECNORICAMBI SNC','C',5490),('PRESTIPINO SALVATORE','C',5491),('COSENTINO GIUSEPPE','C',5492),('SANTORO ANTONINO','C',5493),('R.S.STORE SRL','C',5494),('DE LUCA SERVICE DI DELUCA F.SCO SAS','C',5495),('AUTORICAMBI BRUNO SERGIO','C',5496),('INDUSTRIAL POINT S.R.L.','C',5497),('ANNULLATO PRESO PER IL WEB','C',5498),('MORABITO LEONARDO ITALRICAMBI','C',5499),('PENNA ANTONINO IMP.AGIP 8898','C',5500),('CARUSO ROCCO','C',5501),('COMPUTER & INTERNET DI FORTUNATO','C',5502),('IGRO SUD DI MERCURI GIANCARLO','C',5503),('PISANELLI SANTO','C',5504),('PISANO ANTONIO','C',5505),('RUFFO GELSOMINA GFC AUTORICAMBI','C',5506),('SUORE SALESIANE DEI SACRI CUORI','C',5507),('ALPA AUTO S.R.L.','C',5508),('ESPOSITO LORENZO','C',5509),('GAGLIOSTRO STEFANO','C',5510),('SIRIO AUTORICAMBI DI UFRASCATI G.','C',5511),('ELETTRAUTO AMATO FAUSTO','C',5512),('ALBANESE GIUSEPPE','C',5513),('ANNULLATO PRESO PER IL WEB','C',5514),('RI.A S.R.L.','C',5515),('AUTOFORNITURE TINO DAGATE','C',5516),('GLORIOSO ADRIANO','C',5517),('AUTORICAMBI ITALIANO di CURCURUTO','C',5518),('AUTOFORNITURE GULLOTTA','C',5519),('MANGIARRATTI EMANUELE IDROTEC','C',5520),('DOMINICI SRL','C',5521),('C.R.A.E.di DI BENEDETTO PROVVIDENZA','C',5522),('SPADA CARMELA SRL','C',5523),('LOMBARDO GIUSEPPE','C',5524),('MANOLA SALVATORE SA.MA','C',5525),('FARACI RAFFAELE TUTTAUTO','C',5526),('AUTORICAMBI CIARCIA CARMELO','C',5527),('MESSINA GIUSEPPE','C',5528),('AUTORICAMBI MEGARA SNC','C',5529),('MOTORPOINT SRL','C',5530),('ANASTASI GIOVANNI','C',5531),('AUTORICAMBI G.S.di SCOZZARICARLO','C',5532),('MA.DI.DI snc AUTOMARKET 2000','C',5533),('R.A.V. DI SORRENTINO LUIGI S.A.S','C',5534),('SA.MA RICAMBI DI SALAFIA MAURO','C',5535),('O.R.A. SPALLITTA & C. snc','C',5536),('TUTTAUTO ALBERGHINA GIANFRANCO','C',5537),('VINCI CONCETTO AUTOTECNICA AUTOR.','C',5538),('ANULLATO UTILIZZATO PER IL WEB','C',5539),('GIANNUSO GIOVANNI','C',5540),('CE.RI. DI CATANIA BIAGIO & C. SAS','C',5541),('ILARDI MARGHERITA & C. SNC','C',5542),('PUNTO RICAMBI SRL','C',5543),('NIGRELLI LUIGI','C',5544),('A.R.A.T. DI MARIO DI GIOVANNI','C',5545),('DILIBERTO AUTORICAMBI','C',5546),('DI COSTA S.R.L.','C',5547),('C.R.SERVICE SRL','C',5548),('ALOISI ANTONIO','C',5549),('PAONE RICAMBI DI PAONE G. SAS','C',5550),('FERICAM DI PISU FEDERICO','C',5551),('SANTOCONO & C. R.A.I.E.snc','C',5552),('VESPO SALVATORE','C',5553),('AUTORICAMBI MOTTA srl','C',5554),('GRASSO & FIGLI sas DI GRASSO D.e C.','C',5555),('VECCHI SNC','C',5556),('F.LLI CHIARAMIDA AUTORICAMBI sas','C',5557),('FUTURA RICAMBI DI SCACCIAFERRO','C',5558),('COSENTINO F.e G. snc','C',5559),('FENECH AUTORICAMBI srl','C',5560),('SAMMITO ANGELA','C',5561),('CENTRO RICAMBI SRL','C',5562),('AUTORICAMBI STRANO SRL','C',5563),('SURIANO PAOLO','C',5564),('AUTORICAMBI GLORIOSO srl','C',5565),('VECAM DI OLIVELLI VENERANDO E C.snc','C',5566),('MEC.CARS RICAMBI DI SCIALFA G.PPE','C',5567),('PENNISI AUTO DI G.PENNISI','C',5568),('AUTORICAMBI MAGGIO GIUSEPPE','C',5569),('GRILLO NICOLA AUTOFORN.','C',5570),('AUTORICAMBI TROGYLOS SRL','C',5571),('PRIVITERA STEFANO','C',5572),('AUTOFFICINA M.A.&.V S.a.s di OSCAR','C',5573),('IEMMOLO VINCENZO','C',5574),('GENNUSA GIUSEPPE AUTORICAMBI','C',5575),('C.R.A. Snc di Salvatore Tanasi & C.','C',5576),('F.LLI MUSARRA sas','C',5577),('S.G.R. DI ROSANO V.ZO & C. sas','C',5578),('ADAMO ROBERTO','C',5579),('ELIOS AUTORICAMBI SRL','C',5580),('DIEMME SRL','C',5581),('NUZZO FILIPPO','C',5582),('AUTOR.FISICARO DI FISICARO FILIPPO','C',5583),('CENTRO RICAMBI DESARI GIUSEPPE','C',5584),('AUTORIC.PROFETA DI PROFETA ONOFRIO','C',5585),('MARTUCCI REMO AUTORICAMBI','C',5586),('CHECKS SRL','C',5587),('AUTOETNA DI INTRESSALVI M.& C. snc','C',5588),('FRICANO ROBERTO & C.RI.AS.sas','C',5589),('GAGLIARDI VALENTINO','C',5590),('MICIELI SALVATORE SNC','C',5591),('GIARDINA GIOVANNI','C',5592),('BOCCHIARO GIUSTO & C. snc','C',5593),('R.D.C. DI VALERIA FILI','C',5594),('PALAZZOLO GIUSEPPE','C',5595),('CARILLO MARTINO AUTORICAMBI','C',5596),('AUTORIC.FAVUZZA SOC.COOP.','C',5597),('F.LLI RUSSO DI GAETANO RUSSO & C','C',5598),('DI.R.MEC SRL','C',5599),('AUTOCOMPONENTI COSENTINO','C',5600),('OLIVERI FRANCESCO AUTORICAMBI','C',5601),('PULIZZI GIOACCHINO','C',5602),('AUTORICAMBI RIITANO DOMENICO','C',5603),('FARRUGGIO BIAGIO','C',5604),('DISTEFANO M.& PELLEGRINO A. S.N.C.','C',5605),('SORTINO S.r.l.','C',5606),('B.R.M. di MARINELLI G.PPE & C. snc','C',5607),('C.A.R. DI CAMPISI ISABELLA','C',5608),('ARENA SRL','C',5609),('AUTOMECHANIKA SRL','C',5610),('PRECAV S.N.C. DI CAVALLARO ROSARIO','C',5611),('COIR srl','C',5612),('DI BELLA SERVICE','C',5613),('GARDEN BAR RACITI PAOLA & C. SNC','C',5614),('TUTTORICAMBI snc DI MUSCIA V.& G.','C',5615),('RICAS RICAMBI E ACCESSORI DI','C',5616),('DI PIETRO AUTOSERVICE DI PIETRO C.','C',5617),('EUROPARTIAUTO DI COCO CARMELO','C',5618),('AUTORICAMBI ODDO CARMELO','C',5619),('LAUTORICAMBI SRL','C',5620),('CUNSOLO MARIO AUTORICAMBI','C',5621),('AUTORICAMBI GRECO FINA','C',5622),('CORRADO CASALE SNC','C',5623),('R.A.I.A.R. srl','C',5624),('CASA DEL RADIATORE','C',5625),('CENTRO CLIMA SNC','C',5626),('SCARLATO SALVATORE ELETTROCAR','C',5627),('VIOLA FRANCESCO','C',5628),('CENTRORICAMBI NIGRO srl','C',5629),('MASTROGIOVANNI SRL','C',5630),('F.LLI PIZZA SNC','C',5631),('VIOLI CARLO','C',5632),('AVV.CARMELA CLEMENTE','C',5633),('DE CARIA ROCCO AUTORICAMBI','C',5634),('DIESEL TRUCKS DI SCADUTO ANGELO','C',5635),('MESSINA FILIPPO AUTORICAMBI','C',5636),('ERRECI DI RAFFAELE CANTAFIO','C',5637),('DOTT.GIUSEPPE FAVIA GUARNIERI SRL','C',5638),('ROSSETTI ALESSANDRO','C',5639),('STAZIONE DI SERVIZIO MANGANI','C',5640),('RONDINELLI GIOVANNI BATTISTA','C',5641),('DALTORICAMBI SRL','C',5642),('CORDIANO MARCELLO','C',5643),('EURORICAMBI DI TUSCIANO GIUSEPPE','C',5644),('AUTORIPARAZIONI IORI SNC.DI GRASSI','C',5645),('RI.CAR. srl','C',5646),('CAPPARELLI FRANCESCO','C',5647),('TUTTO MARMITTE DI BORSELLINO TANINA','C',5648),('PUGLIESE ANTONINO','C',5649),('AUTOFFICINA FUDA DI','C',5650),('TUTTO RICAMBI DI PRIOLO MARCO','C',5651),('LUCKY BAR RUGARI & GALLETTA S.A.S','C',5652),('ROCCAFORTE EURORICAMBI','C',5653),('CENTRO MIDAS REGGIO CALABRIA','C',5654),('BELLANTONI VINCENZO','C',5655),('AUTOFFICINA MISIANO SALVATORE','C',5656),('DEMASI GIUSEPPE','C',5657),('DIESELTRUCK DI ALFANO FABIO','C',5658),('ARIGANELLO MASSIMO AUTORICAMBI','C',5659),('MI.RA. RICAMBI SAS MIRA','C',5660),('AGF SICILIA srl','C',5661),('MOLISE RICAMBI di A.Tamburri SNC','C',5662),('GARANZIA EUROPA GROUP SPA','C',5663),('FORESTIERI BRUNO ITALTRONYC','C',5664),('MORABITO VITO','C',5666),('MORABITO SALVATORE','C',5667),('LA MECCANICA SRL','C',5668),('GENNARO CACCIAPUOTI','C',5669),('PALAMARA GIUSEPPE PIT STOP','C',5670),('POLITO CARBURANTI DI ROCCO POLITO','C',5671),('STAZ.SERV.AGIP DI FRUCI GIUSEPPE','C',5672),('MARTINO SRL','C',5673),('SCHIPANI MARIANGELA AUTORICAMBI','C',5674),('AUTO VIP SRL','C',5675),('VECCHI GIUSEPPE RICAMBI','C',5676),('FARNO FULVIO & S. snc','C',5677),('CIRIMELLI AUTORICAMBI DI SAVERIO P.','C',5678),('IL CANNETO TAMOIL DI POLITO A. SAS','C',5679),('CARDINALE AUTOMOBILI SRL','C',5680),('D.R.A.M. snc','C',5681),('MANCUSO ILARIA AUTORICAMBI','C',5682),('COTRONEO DOMENICO','C',5683),('GRANATA F.CO F.G. AUTORICAMBI','C',5684),('RE.MA.DI ESPOSITO R.& BELSITO M.SRL','C',5685),('STAZ.SERV.AGIP DI BAGNATO SALVATORE','C',5686),('CAMMILLERI GAETANO AUTO GT','C',5687),('AGRILU DI MALVASI LUCIA','C',5688),('R.G. di ROSARIO GAROFOLO','C',5689),('AUTOELETTRONICA F.LLI DOMINICI snc','C',5690),('MELI CAR RENTALS LTD','C',5691),('RF srl','C',5692),('RUSSO GIUSEPPE','C',5693),('FALCONE FRANCESCO','C',5694),('STEFANELLI DOMENICO','C',5695),('GR srl','C',5696),('DIMENSIONE AUTO SRL','C',5697),('LATTANZIO DONATELLA','C',5698),('AUTOCOM SRL','C',5699),('GIORDANO SALVATORE OFF.CHEVROLET','C',5700),('CO.R.A.R.09 SRL','C',5701),('TRIMARCAR AUTORIC.DI MACRI PALMA','C',5702),('VIOLAUTO SRL','C',5703),('G.& V.POLICASTRI SNC','C',5704),('A.G.S.RICAMBI SRL','C',5705),('FLORI MOTORI SRL unipersonale','C',5706),('CUCINOTTA ANGELO AUTORICAMBI','C',5707),('ARCURI MARCELLO AUTORICAMBI','C',5708),('GAMMA RICAMBI SRL','C',5709),('VIOLA VINCENZO AUTORICAMBI','C',5710),('BELLOCCO RAFFAELE','C',5711),('BELCASTRO ANGELO ACCESSORI','C',5712),('SAFFIOTI CARMELO IMPRESA EDILE','C',5713),('A.M.RICAMBI DI ESPOSITO S.','C',5714),('3C RICAMBI DI COLAPRISTI VINCENZO','C',5715),('SURACE AUTO DI SURACE ROCCO','C',5716),('DIEMME SRL','C',5717),('F.LLI SCANGA SRL','C',5718),('ARTE FERRO DI ROSARIO BAGNATO','C',5719),('AUTORIC.CHIURCO DI LORICCHIO V.ZO','C',5720),('TIRRENO SNC.DI LUCCHESE V.ZO','C',5721),('CO.GE.TECH SRL','C',5722),('SALADINI SRL','C',5723),('TURANO ARMANDO','C',5724),('G.E.S.T. AUTORICAMBI SRL','C',5725),('CONDO ANTONIO','C',5726),('PUNTO MARMITTE DI FERRARA DOMENICO','C',5727),('INTERNAZIONALE RICAMBI SRL','C',5728),('A.A.R. DI CURCIO VINCENZO','C',5729),('RIC.PIAGGIO F.LLI SERGI DI SERGI G.','C',5730),('LAURITO GIUSEPPE AUTORICAMBI','C',5731),('AUTORICAMBI TRE A DI A.LUZZI','C',5732),('VISCOMI AGOSTINO','C',5733),('GROUP ECO ITALIA SRL','C',5734),('MESITI LUCA','C',5735),('AUTORICAMBI SCHIRRIPA SAS','C',5736),('TRUSCELLI ANTONIO','C',5737),('AUTORIC.GODINO DI MENDICINO LORETTA','C',5739),('MICHELE CAROLI SRL','C',5741),('CIRIA ALESSIO AUTORICAMBI','C',5742),('F.LLI LORENTI RICAMBI AUTO SRL','C',5743),('R.S.RICAMBI DI ROBERTO SGAMBELLURI','C',5744),('ARCURI SISTINO AUTORICAMBI','C',5745),('2V CAR PARTS DI VALERIO MACRI','C',5746),('BARILLARI GIUSEPPE AUTORICAMBI','C',5747),('AUTORICAMBI COSENTINO SRL uniperson','C',5748),('EURORICAMBI SRLS','C',5749),('AUTORICAMBI 2G DI GIANFRANCO GARUFI','C',9002),('A.R.A. RICAMBI VENETICO srl','C',9005),('BELLANTONI DOMENICO','C',9034),('BASILE SANTO','C',9036),('AUTORICAMBIFOX DI FOSSATI MATTEO','C',9062),('GRANDI RICAMBI DI GRANDI SIMONE','C',9070),('CARUSO CALOGERO','C',9071),('CALDERONE PAOLO FRANCESCO','C',9074),('GAGLIO GIUSEPPE Ricambi Auto e Acc.','C',9185),('GIORGIANNI AUTORICAMBI S.N.C.','C',9190),('SAPORITO MASSIMO LAUTORICAMBIO','C',9284),('LOMBARDO SANTO','C',9285),('MICALI GIOVANNI','C',9324),('MERLINO ANTONINO','C',9331),('MILONE GIUSEPPE','C',9352),('CENTRO AUTO DI TRAMONTANO','C',9380),('PINTAUDI ROCCO','C',9422),('AUTORICAMBI DI PINO SRL','C',9475),('SETTIMO GIOVANNI','C',9502),('SANFILIPPO GIUSEPPE','C',9505),('STURNIOLO ANTONINO Elettrauto','C',9507),('SUD RICAMBI snc DI GUGLIOTTA C.& C.','C',9508),('SPRINT CAR AUTORICAMBI DI GRECO A.','C',9511),('GIORGIO FRANCESCO','C',9534),('TRIFILO FILIPPO TUTTO AUTORICAMBI','C',9537),('RIGGIO GIUSEPPE & C. SNC','C',9620),('CORRISPETTIVI','C',999999),('','F',0),('SAFFIOTI CARMELO SNC','F',1),('TRENTINELLA FRANCESCO','F',2),('PRINTING.CENTER','F',3),('MAZZULLO FORTUNATO','F',4),('MGG ITALIA S.R.L. GRUPPO IMCO','F',5),('GLS GENERAL LOGISTICS SYSTEMS','F',6),('CIFANI SRL','F',7),('BARTOLINI spa','F',8),('ITALIA RECAPITI S.R.L','F',9),('UNI EURO S.P.A','F',10),('FORMAT S.A.S. DI PISCOPO ANTONIO &C','F',11),('GIAMMARRESI NICOLO','F',12),('CANNATA VINCENZO srl','F',13),('GRIMAS srl Etichette','F',14),('CONSORZIO ASSORICAMBI','F',15),('B.C.R. srl','F',16),('CADI snc F.LLI MILASI','F',17),('JET EXPRESS srl CORRIERE ESPRESSO','F',18),('PAPERNET SPA','F',19),('FIAMMA DI A.SEMINARA','F',20),('COSTANZO SALVATORE','F',21),('MONDOFFICE SRL','F',22),('SOF.INN. INFORMATICA srl','F',23),('G.TRIPODI SRL','F',24),('ARMES SPA','F',25),('J-SOFTWARE SRL','F',26),('SARITEL','F',27),('SDA EXPRESS COURIER','F',28),('TRASPORTI PE.CAM','F',29),('CONSOZIO PDA','F',30),('OPITERGINA MARMITTE DI NESPOLO','F',31),('SCATOLIFICIO VENETO S.R.L.','F',32),('AUTOCOM SRL','F',33),('LT SRL LOGISTICA E TRASPORTI','F',34),('FUTIA DOMENICO','F',35),('SETEFI SPA GRUPPO INTESABCI','F',36),('ELPIDA D.O.O.','F',37),('I.F.R. DI MAURIZIO ROMANO','F',38),('CRUCITTI SRL','F',39),('GRAFICAJONICA SNC','F',40),('PANALPINA TRASP.MOND.SPA','F',41),('ARUBA SPA','F',42),('ENGINET SRL','F',43),('POLIGRAFICO SRL','F',44),('SERIBAG DI ZAGARI DANIELA','F',46),('PISANI FRANCESCO & FIGLI SPA','F',50),('INGROSUD DI PRATICO ANTONIO','F',51),('MEDIA WORLD COMPRA ON-LINE','F',53),('PM2 DI MILITANO NATALE','F',58),('RAG.PARISI GIUSEPPE','F',60),('REDOIL ITALIA spa','F',64),('BARBARO SPORT S.A.S.','F',75),('KRIOS A.C. srl','F',83),('SERFEM DI SERGIO FEMIA','F',86),('SOVEB AUTO SRL','F',90),('SUSA TRASPORTI SPA','F',93),('SDA sas DI PALMITESSA (UNIGOM)','F',94),('NOTAIO MARCELLA CLARA RENI','F',96),('AB ELETTROSISTEMI','F',97),('SOCET srl (TOTAL)','F',100),('DELIVERY EXPRESS','F',101),('TAZZETTI GUIDO & C. SPA Div.ACR','F',102),('COMPUTER ASSIST S.A.S. DI RUFFOLO','F',103),('ALDASA DI FRANCO SILENO','F',104),('STUDIO LEGALE AVV.GIULIANA METE','F',105),('TRIONE RICAMBI S.P.A','F',107),('RICAMBIFLEX GM srl','F',110),('CASA DEL RICAMBIO SRL','F',111),('LEONARDO SNC DIGITAL STUDIO','F',112),('MUSICO MACCHINE AGRICOLE','F',115),('ROBERT BOSCH spa','F',116),('C.B.F. BALDUCCI SPA','F',117),('ENGINE COMPONENTS srl GLASER','F',118),('SEAL-TECH SRL','F',119),('SMAT NORD srl','F',120),('RIVOIRA S.P.A','F',121),('BRENTA SRL','F',122),('RAPISARDA CARLO CARMELO','F',123),('CIEFFEBI TRASPORTI','F',124),('CAST BOLZONELLA S.A.S.','F',125),('EURODECOS S.R.L.','F',126),('DALTORICAMBI SRL','F',127),('LUBEX S.P.A.','F',128),('ITALTRADE SRL','F',129),('SAMAUTO SPA','F',130),('FRAP srl','F',135),('SOGEFI FILTRATION SPA','F',140),('UNIPART NV INTERNATIONAL RADIATOR','F',145),('EXIDE ITALIA SRL','F',150),('IBS SRL','F',155),('ASSOMARMITTE SRL','F',160),('IPS PARTS SRL','F',165),('OSRAV ALFEO MORET SPA DAMPO','F',170),('EXO AUTOMOTIVE SPA REMSA-OPENPARTS','F',175),('KAYABA ITALY GmbH','F',180),('SALADINI SRL','F',185),('CARTIERA LUCCHESE SPA (LUCART)','F',190),('TIRRENA IMPEX SRL','F',195),('FAAL BATTERIE SRL','F',200),('NRF ITALIA SRL','F',205),('DICRA SPA','F',210),('MECARM srl','F',215),('LEART-DIVISIONE EUROLITES SPA','F',1202),('EUROLITES S.P.A ARIC','F',1203),('MORONI CESARE & C. snc','F',1307),('M.T.S. spa','F',1310),('MAGNETI MARELLI AFTERMARKET AND SER','F',1323),('MALO spa','F',1329),('NEWFREN SPA','F',1401),('OLYMPIA srl','F',1501),('F.LLI TRIPODI SNC','F',1502),('FL.ITALIA srl OLEOBLITZ','F',1505),('OSRAM spa','F',1507),('PHILIPS SPA','F',1602),('DAYCO EUROPE SRL','F',1605),('RICAUTO SPA','F',1804),('R.M.S. S.P.A.','F',1817),('COMMERCIALE LUCANA snc','F',1901),('ENZO PARISI S.R.L.','F',1902),('SIOM S.R.L.','F',1908),('SIA INDUSTRIA ACCUMULATORI spa','F',1914),('SIMAKA','F',1923),('SITO GRUPPO INDISTRIALE spa','F',1935),('TOMAS RENATO & BRUNO sas','F',2001),('UMMAC srl','F',2201),('VEMA srl','F',2306),('VALEO SERVICE ITALIA S.P.A.','F',2308),('WD-40 COMPANY LTD','F',2309),('A.C.S. DI CORDOVANA SALVATORE','F',3101),('DELTA SERVICE snc','F',3103),('AUTOFORNITURE MILANESI spa','F',3104),('AGIP PETROLI ( Agenzia RC )','F',3105),('ARSAUTO SRL','F',3110),('AREXONS DIVISIONE DI FL SELENIA SPA','F',3116),('BOSATTA F.LLI \"F.B.\"srl','F',3201),('BIFFI & PREMOLI srl','F',3205),('BERGAMASCHI & F. spa','F',3213),('F.G.WOLF SRL','F',3302),('C.D.A. spa','F',3303),('CENTAURO srl','F',3307),('CASA DEL BULLONE sas','F',3311),('ORIGINAL BIRTH spa','F',3314),('FORTEBUONO METALLINFISSI SRL','F',3321),('C.C.R. srl CENTRO CUSCINETTI','F',3325),('CRAMER SRL','F',3328),('TOMMASELLI srl','F',3401),('DELLORTO spa','F',3403),('FEDERAL MOGUL ITALY SRL','F',3408),('F.A. ITALIA snc','F',3620),('FODONE sas','F',3621),('GUARNITAUTO spa','F',3707),('G.V.S. DI SALA RINALDO','F',3718),('PRES-SING S.A.S.','F',3906),('CODICI ANNULLATI','F',9999),('','F',999999);"); + statement.executeUpdate( + "insert into mytable2(myfield,pfx,numero) values ('COSTRUEDIL DI GAGLIOSTRO & C.SNC','C',6),('AUTOBUDA SRL','C',7),('CAFARELLI TINDARO AUTORICAMBI','C',8),('LARTE DEL MOBILE DI QUINTO CUTRI','C',9),('GRAPHIC DESIGN','C',10),('FOTI CARMELO','C',11),('MALAGRECA MICHELE OFF.ELETTR.','C',12),('CLIENTE NUOVO FRANCESCO','C',13),('LAROCCA ETTORE','C',14),('ALCAM SNC DI MARAFIOTI ALESSANDRO E','C',15),('EUROPA TYRES S.R.L.','C',16),('CROCE ROSSA ITALIANA COM.LOCALE','C',17),('RUGNETTA BRUNO','C',18),('BOSA VINCENZO TUTTO PER LA PESCA','C',19),('C.P.R.CENTRO POSE ROMEO','C',20),('VIOLI ORESTE OFF.AUTOCARROZ.','C',21),('LIGATO SALVATORE','C',22),('DECORFORM DI IANNINO DARIO','C',23),('BEVI SUD DI DAGOSTINO GIUSEPPE','C',24),('BUSTE E CARTA DI GALLICO DARIO','C',25),('CELESTINO CRISAFULLI','C',26),('IMPRESA EDILE IS.AS.DI SALVATORE','C',27),('RASO GIUSEPPE','C',28),('EUROTECNICA 3A SAS DI ANELLO FRANC.','C',29),('EXO AUTOMOTIVE S.P.A.','C',30),('GHEA SISTEM S.R.L.','C',31),('AUTOTECNICA DI IANNELLI GIUSEPPE','C',32),('NATURAL SALUMI DI ARENA GIANCARLO','C',33),('LOIACONO PASQUALE & C. S.a.s.','C',34),('LONGO CLAUDIO','C',35),('CLASS SERVICING S.R.L.','C',36),('CADI SNC F.LLI MILASI','C',37),('MARTURANO FRANCESCO','C',38),('ARICOASSICUR.DI ARICOMARIATERESA','C',39),('','C',40),('SICILIANO FRANCESCO','C',41),('PREVITERA CATERINA ALIMENTARI','C',42),('AUTOFFICINA LUCAGIOVANNI','C',43),('NON UTILIZZARE','C',44),('','C',45),('SAFFIOTI MELO MACELLERIA GASTRON.','C',46),('MANGERUGA SERAFINO','C',47),('S.D.A. s.a.s.di Palmitessa Carlo','C',48),('IPER SCAVI S.R.L.','C',49),('','C',50),('FABBRICA ARTIGIANA LUIGI COLOMBO','C',51),('ELETTRO GLOBAL SERVICE DI ELIA','C',52),('FORTUNATO','C',53),('STEFANO BAJLO','C',54),('.','C',55),('FORTUGNO S.R.L.','C',56),('PARRELLO GIUSEPPE','C',57),('GAS E CUCINE DI SANTORO GIOVANNI','C',58),('LUPPINO MAURIZIO','C',59),('','C',60),('CHARTER LINE SAS','C',61),('CAMPAGNA GIUSEPPE EREDE DI CAMPAGNA','C',62),('TREBI DI BARBARO FRANCESCO','C',63),('COOPERATIVA SOCIALE ONLUS','C',64),('','C',65),('SASOL ITALY S.P.A.','C',66),('AVATI ROCCO','C',67),('DOLCE FREDDO DI DAGOSTINO G.PPE','C',68),('GUERRERA FRANCESCO','C',69),('','C',70),('AGRICOLA PALMESE DI ARICO EMAN.&C.','C',71),('BORRELLO COSIMO TENDAGGI TAPPEZZ.','C',72),('DAMIANO PUTRINO OFF.MECC.','C',73),('CENTRO FORNITURE S.R.L.','C',74),('','C',75),('CLIENTE NUOVO FORTUNATO','C',76),('AVV.FERDINANDO DE LEONARDIS','C',77),('INSTALLAZIONE DI IMPINATI ELETTR.','C',78),('VIOLI PIETRO','C',79),('','C',80),('BASILE VINCENZO','C',81),('SAFFIOTI APPALTI & COSTRUZIONI','C',82),('SOC.COOP.MULTISERVICE MAMMOLA','C',83),('ARCH.TIZIANA GAGLIOTI','C',84),('','C',85),('GAGLIOTI SRL','C',86),('PINO MICHELE IMPRESA COSTRUZ.','C',87),('','C',88),('BORGESE GIUSEPPE','C',89),('','C',90),('PREVITERA SALVATORE','C',91),('PASTORE SRL','C',92),('OFF.LUCI CARMELO','C',93),('GIOFFRE CARMELO','C',94),('','C',95),('COGIMI S.R.L.','C',96),('CANTINE ZAGARI SNC','C',97),('ALBEDA IMPIANTI DI LOPRETE ANTONIO','C',98),('VETRARIA BRUTIA S.R.L. UNIPERSONALE','C',99),('COSTANZO TOTI','C',100),('GRASSO DAVIDE','C',101),('SGROMO BERNARDO','C',102),('PANIFICIO CIAPPINA','C',103),('ARCA INDUSTRIAL SUPPLIES S.R.L.','C',104),('','C',105),('ZUMBO DR.TOMMASO','C',106),('PUNTO SIDIS DI SACCA PASQUALE','C',107),('BARRARA SALVATORE','C',108),('IMEX P-TRADE S.R.L.','C',109),('','C',110),('DOTT.AGR.VINCENZO CILONA','C',111),('PIANEGONDA DARIO S.A.S.','C',112),('DALOI GIUSEPPE AUTOFFICINA','C',113),('BARBARO MOTO SAS','C',114),('','C',115),('DE FRANCESCO VINCENZO','C',116),('RICAUTO SPA','C',117),('GERICO SAS','C',118),('GISMONDO VINCENZO','C',119),('','C',120),('IMPRESA COSTR.EUROEDIL DI MOIO F.SC','C',121),('SUD.INFORMATICA S.R.L.','C',122),('CRAZY MOBIL SNC DI GAGLIOTI G.PPE','C',123),('A.D.S.S.E. SRL DI RUGGIERO PACIFICO','C',124),('','C',125),('GRAMUGLIA VINCENZO','C',126),('LUIGI NIZZARI SUBAGENTE ALLIANZ SPA','C',127),('BRUZZESE ANNUNZIATA','C',128),('HOTEL STELLA MARIS SRL','C',129),('','C',130),('ATRE EXPRESS SRL','C',131),('GATTO ANTONINO','C',132),('BO.GE.CO. S.R.L.','C',133),('VALENTINO TECNICA SNC','C',134),('','C',135),('NASO GIUSEPPE','C',136),('GALIBERTI LUCIANO STEFANO','C',137),('MURACE FRANCESCO','C',138),('GEOM.GIOFFRE SAVERIO','C',139),('','C',140),('PIANA PALMI MULTISERVIZI S.P.A.','C',141),('GOLDEN GROUP SNC','C',142),('DE CREA FORTUNATO','C',143),('LUPPINO MICHELE','C',144),('','C',145),('STILLITANO SRL','C',146),('FERREDIL DI MANUCRA GEOM.MARIO','C',147),('L & R LABORATORI E RICERCHE SRL','C',148),('EDIL SUD DI MALACRINOALESSIO G.','C',149),('','C',150),('FRESH BLU DI MELISSARI CETTINA','C',151),('BAGALA ROBERTO','C',152),('SERGI ROSALBA','C',153),('CO.MEC. DI VIOLI DOMENICO','C',154),('','C',155),('RADIO FRECCIA NET WORK','C',156),('GIOVINAZZO IPPOLITO','C',157),('ELECTRONIC CENTER DI ZAGARI ROSARIO','C',158),('EMPORIO ROGGIO GIUSEPPE','C',159),('','C',160),('CALAFIORE ANTONIO','C',161),('PARRELLO GIUSEPPE','C',162),('RUGGERI & PIAZZA SNC','C',163),('FRESCHEZZA IN TAVOLA DI FOTI ROSA','C',164),('','C',165),('AUGIMERI CARMINE AUTOFFICINA','C',166),('MATTIANI DOMENICO','C',167),('CALDERAZZO GIANCARLO','C',168),('ROMANIN ELVIO STUDIO COMMERCIALE','C',169),('','C',170),('G.TRIPODI SRL','C',171),('DEDMONDO FRANCESCO','C',172),('IDROCAR DI IANTORNO MARIO','C',173),('ZAGARI PAOLO IMP.ELETTRICI','C',174),('','C',175),('SELF AREA AGIP \"LA SOSTA S.A.S.\"DI','C',176),('MARKET MIMMO DI MAMMONE ANNA MARIA','C',177),('OSRAV ALFEO MORET S.P.A.','C',178),('A.S.PALLAVOLO PALMI','C',179),('','C',180),('GN.RISTRUTTUR.DI GANGEMI NICOLA','C',181),('ANNULLATO PRESO PER TRADE EVOLUT','C',182),('PULEIO PASQUALE','C',183),('ROTONDO S.R.L.','C',184),('','C',185),('DOMENICO ORTUSO & C. S.a.s','C',186),('FABIO PIERANGELI','C',187),('EDIL PALMI SAS di CRUCITTI F.SCO &C','C',188),('MLD LOGISTICA E DISTRIBUZIONE SRL','C',189),('','C',190),('HOTEL SANTA CROCE','C',191),('CUBA MOTOR','C',192),('CENTRO SERVIZI AUTO DI FURFARO','C',193),('TRAS PUGLIA DI SPINA GIUSEPPE','C',194),('','C',195),('LAMINAZIONE SOTTILE SPA','C',196),('FULCO DOMENICO OFFICINA','C',197),('DAMICO MICHELE AUTOFFICINA','C',198),('CAPRARI ADRIANO','C',199),('','C',200),('FARINA ANTONIO','C',201),('CALABROROSARIO DOMENICO','C',202),('NUOVA CASALAUTO DI CREPALDI GIAN','C',203),('AS TAUREANA CARS DI PALMA FEBBO','C',204),('REPACI TEODORO TRASPORTO MERCI','C',205),('GIEMME IMPIANTI DI IANNELLO MICHELE','C',206),('MUSICO S.R.L.','C',207),('GULLI CARMELO','C',208),('CASCIANO GIACOMO','C',209),('MARKET MARTURANO LETTERIO','C',210),('FOGLIARO FORTUNATO & C. SNC','C',211),('RAVAGLI VITTORIO FERRAMENTA UTENS.','C',212),('GRIMI AUTO DI GRIMI DOMENICO SNC','C',213),('BARONE DOMENICO','C',214),('RANUCCIO SONIA AZIENDA AGRICOLA','C',215),('A.B.COMPUTING DI BAGALAANTONIO','C',216),('GIOIA CAR SRL','C',217),('TOTO MONTAGGI DI MARINO ANTONIO G.','C',218),('GEOM.GIUSEPPE OLIVERI','C',219),('IMPRESA COSTR.EDILI CILONA G.PPE','C',220),('TERMOIDRAULICA DI TALLARIDA G.PPE','C',221),('RIGHETTINI EMANUELE','C',222),('CM INDUSTRIE SRL','C',223),('AUTOGOLD DI DE SANCTIS G.','C',224),('RIGON GIAN CARLO AUTOTRASPORTI','C',225),('IMPIOMBATO ANTONINO','C',226),('I.F.E.S.DI CUTRI GIUSEPPE','C',227),('COMPANIE DHOTELLERIE SUISSE SRL','C',228),('LARTE DEL FALEGNAME SNC','C',230),('AUTOSERVICE 2000 SAS','C',231),('SERVICE RICAMBI E ACCESSORI DI','C',232),('CAPPONE MICHELE LAV.VETRI','C',250),('COLELLA FRANCECSO','C',251),('LA PIANA SNC DI BARBARO ANGELINA','C',252),('SURACE GIANFRANCO','C',253),('EDIL CERAMICHE PALMI DI SCHIPILLITI','C',254),('AGOSTINO ROMEO SRL','C',260),('SGROFRANCESCO','C',261),('IMPRESA EDILE DI CERAVOLO GIUSEPPE','C',262),('FICARRA ROBERTO IMPRESA EDILE MOV.','C',263),('CAR SERVICE DI GALLO DANIELE','C',264),('LAGRICOLA DI BALDO FRANCESCO & C.','C',265),('ARENA VINCENZO','C',266),('ROMEO MARIA','C',267),('BERTIM EDILIZIA E COSTA SRL','C',268),('ITALIA TRASPORTI E LOGISTICA SRL','C',269),('STUDIO DI PROGETTAZIONE ARCHITETTO','C',270),('CALOGERO SALVATORE','C',271),('CANANZI AUTO','C',272),('OLEIFICIO BORGESE FILOMENA','C',273),('ASSOCIAZ.DI VOLONTARIATO PRESENZA','C',274),('IPO S.R.L.','C',275),('SMAC SNC & C. DI MERCURI SALVATORE','C',276),('MODAFFERI MICHELE ELETTRAUTO','C',277),('ROMEO FORTUNATO','C',278),('BAR BRUZZESE FRANCESCO','C',279),('AUTOFFICINA MARCELLO GULLI','C',280),('SCAVA ROSARIO','C',281),('CASELLA DOTT.MARIO DOMENICO','C',290),('SAFFIOTI ROCCO','C',999),('POINT CAR SERVICE SAS','C',1000),('AUTORICAMBI PRAIA SAS DI UGO','C',3001),('AUTOF.CATANANTI DI DIBIANCO GIOV.NI','C',3002),('AUTOPIU DI GRIFFO V.&.C. sas','C',3003),('ARMENI AUTO DI ARMENI ANDREA & C.','C',3004),('LA BELLA ROBERTO','C',3005),('TERMOIDRAULICA DI IANNINO SOCCORSA','C',3006),('AUTOBUDA DI ZAPPIA ANTONELLA','C',3007),('BELCASTRO ROSARIO R.B.AUTOR.','C',3008),('PNEUSERVICE SRL','C',3009),('AUTOFORNITURE MILANESI SPA','C',3010),('ORTOLANI CARLUMBERTO','C',3011),('AZZARA CARMELO','C',3012),('AUTOSILA S.R.L.','C',3013),('ATTISANO MICHELE','C',3014),('AMMENDOLA GIUSEPPE','C',3023),('ANNULLATO AUTOPARTS DI FIEROMONTE T','C',3026),('CENT.TELEFONIA DE PASCALE DANIELA','C',3027),('TYRE HUNTER DI CANTISANI CARMINE','C',3028),('AUTOFFICINA AMMENDOLA DEMETRIO','C',3029),('CENTER CAR S.R.L.','C',3032),('MACELLERIA DI BARBERA FRANCESCO','C',3101),('BLEVIO PIETRO','C',3103),('AZIENDA AGRICOLA SURACE GIUSEPPINA','C',3104),('C.F.S.CARRELL FULL SERVICE DUE sas','C',3106),('IMPRESA COSTRUZ.GEOM.CIAPPINA F.SCO','C',3107),('BELLISSIMO ANTONIO','C',3108),('BARBARO GIUSEPPE DITTA','C',3111),('BARILLARI GABRIELE AUTORICAMBI','C',3112),('BORGESE GIUSEPPE','C',3113),('BARA GIUSEPPE OFF.& RICAMBI','C',3114),('AUTO IARIA S.R.L.','C',3115),('TRIPODI GEOM.ANTONINO IMPRESA EDILE','C',3120),('BARRECA DEMETRIO','C',3129),('BOVA VINCENZO','C',3139),('BRUNO AUTORICAMBI S.a.s.','C',3145),('CILIONE & C. SRL','C',3200),('CANDIDO GIULIO','C',3202),('LUDDENI MARIO MARKET DEL RIC.','C',3205),('RIOTTO SAVERIO','C',3207),('MOTORSPORT DI CIRICOSTA G.PPE','C',3209),('CE.D.R.A. DI CUCUNATO NATALE','C',3211),('S.D.S. CARBURANTI S.A.S.','C',3215),('TURANO G.PPE & C.snc AUTORICAMBI','C',3216),('CILIONE CONSOLATO !! SOSPESO !!','C',3217),('PUGLIESE ERNESTO','C',3219),('CALABRO LORENZO','C',3220),('LAGANADOMENICO','C',3222),('ANNULLATO INVIATO A TETI A.','C',3224),('AUTO SERVICE DI IOPPOLO G.GIULINO','C',3226),('TRIPODI FORTUNATO','C',3228),('COMEDIL DI P.SGRO & C. sas','C',3232),('SGROORLANDO AUTORICAMBI','C',3234),('DOTT.PALMIRO ZAPPONE','C',3236),('POLIRICAMBI SRLS','C',3240),('ROCCHETTO RENATO','C',3241),('CURRA ANTONINO','C',3242),('COLOSI FRANCESCO INFISSI IN','C',3244),('CUORE ANTONIO','C',3245),('GRAMUGLIA DOMENICO OFF.MECC.','C',3246),('CALIO srl RICAMBI AUTO','C',3248),('COZZA ELIO','C',3252),('OERRE PARTS S.R.L.','C',3257),('EURODIESEL DI CASSALIA MAURIZIO','C',3262),('@ 2X INSTALLAZIONI DI PUGLIESE A.','C',3263),('TECNO TRADE SRL','C',3265),('CROCCO FRANCO','C',3267),('CARTELLA MASSIMO','C',3269),('SCARMATO FORTUNATO','C',3275),('C.M.G. BRAM SRL','C',3278),('CARONZOLO ROSARIO','C',3279),('CALIPARI SERAFINO','C',3286),('EDIL DORA DI BRUNO ROMEO','C',3294),('EXIDE TECHNOLOGIES SRL','C',3295),('IL TEMPIO DEL RIC.DI GIORDANO LUIGI','C',3301),('OFFICINA DE GRAZIA SAS','C',3302),('REGALI E SORRISI DI GUERRERA D.CO','C',3304),('UNIFLUID SUD SRL','C',3305),('CONSORZIO PDA','C',3307),('SURACE ROCCO','C',3308),('DITTA CILONA VINCENZO','C',3309),('DAGOSTINO AUTORICAMBI','C',3310),('DATTOLA AUTO & C. snc','C',3312),('DE NISI DOMENICO','C',3315),('IMPRESA COSTRUZ.SIMONETTA VINCENZO','C',3316),('AUTORICAMBI E ACCESSORI DI MARZIA','C',3317),('CHIAPPALONE ANNUNZIATO','C',3319),('EUROPA RICAMBI DI DE MARIA CARLO &','C',3320),('BRUZZESE FRANCESCO','C',3323),('DE GREGORIO SRL','C',3325),('LOGATTO VINCENZO V.L AUTORICAMBI','C',3326),('TARUSCIO GIOVANNI','C',3331),('TODARO SAVERIO','C',3334),('FERRARO LUIGI','C',3403),('AUTORICAMBI ERRIGO C.& C. S.A.S','C',3404),('PISANO GAETANO','C',3409),('AGRINOVA DI CORRADO NICOLA','C',3501),('FE e SA & C. DI SANTORO B. sas','C',3502),('CAR SHOP AUTORICAMBI','C',3503),('BRIGA LUCIANO','C',3504),('FIDALE GIACOMO & C.sas CAR SERVICES','C',3505),('FERRERO MASSIMILIANO IF.AUTORIC.','C',3506),('ASSOCIAZIONE RADIOAMATORI ITALIANI','C',3507),('FALBO ANTONIO','C',3508),('DAGOSTINO BIRRE DI GINO','C',3510),('FULLONE MARIO','C',3512),('EMMEDUE COSTRUZIONI','C',3514),('PALMCART OLIVERIO GIUSEPPE','C',3516),('BORGESE RANIERI & CLAUDIO SNC','C',3519),('FUTIA SALVATORE','C',3522),('FRANCHINA MASSIMILIANO Autoricambi','C',3523),('FUTIA DOMENICO Ricambi Auto','C',3525),('IMPRESA EDILE SCHIPILLITI V.ZO','C',3526),('MEDITERRANEA TRASPORTI SOC.COOP','C',3527),('AGENZIA LOGISTICA MERIDIONALE','C',3528),('RAGO UMILE RICAMBI-OFFICINA','C',3531),('SE.MA.C. SRL','C',3534),('IMPRESA EDILE GAGLIOSTRO V.ZO','C',3541),('FIGLIUZZI SALVATORE','C',3544),('FRAGOMENI DOMENICO','C',3548),('FIEROMONTE & CHIAPPALONE sas','C',3551),('F.T.R. F.LLI TRIULCIO SRL','C',3553),('GIORDANELLI SERGIO','C',3602),('F.LLI GUIDA sas','C',3603),('GRILLO GIUSEPPE','C',3604),('GALLO STANISLAO MANGIMI CONCIMI','C',3605),('COARSA SOC.CONS.IMP.SANLURESI SRL','C',3606),('PASCHOU MARIA','C',3607),('PELLEGRINO PIETRO ROCCO AZIENDA','C',3608),('ROSANNA EX GRM RICAMBI','C',3609),('INDUSTRIA BOSCHIVA DICH.STEL.','C',3610),('GILBERTO DROGHETTI DOTT.','C',3611),('GALLE NICOLA','C',3615),('EUROELETTRA S.N.C.DI NICOLOSI &','C',3616),('PALETTA ALBERTO AUTORIC.','C',3617),('GIOFFRE GIUSEPPE','C',3620),('PRINTING CENTER S.A.S.','C',3621),('SUD CARNI DI LEONELLO PASQUALE','C',3622),('GIOVINAZZO AUTORICAMBI','C',3623),('GENCARELLI GIUSEPPE','C',3627),('GRASSO FRANCESCO','C',3631),('GALLO GIOVANBATTISTA','C',3632),('CIESSEGI SNC DI CATOZZA MARIO & C.','C',3639),('AUTOMARKET DI PAPALIA ROBERTO','C',3646),('CENTRO RICAMBI DI MARINO & C.SNC','C',3700),('IMPRESA EDILE RECHICHI GIANCARLO','C',3701),('G.R.RICAMBI SRL','C',3704),('BRUZIA RICAMBI DI HRISCU CARMEN','C',3705),('AUTORIC.IANNI DI IANNI FRANCESCO','C',3706),('ITAL RICAMBI DI IAROPOLI V.& C.sas','C',3708),('INFORTUNA SANTO','C',3710),('IOVINE NICOLA','C',3711),('FILIPPONE ANTONINO','C',3712),('INFANTINO GIUSEPPE ELETTRAUTO','C',3717),('IDA RAG.ENZO','C',3719),('DE MASI PASQUALE DE.CA AUTORICAMBI','C',3800),('CANTIERI NAUTICI COSTA VIOLA','C',3803),('BG.CAFFE DI GIUSEPPE BALO','C',3805),('GUARASCIO LUIGI AUTORICAMBI','C',3806),('GIOFFREGAETANO','C',3807),('CENTRO AUTO MOTO DI LAGANA sas','C',3810),('LONGO CLAUDIO','C',3811),('LAGANA GIOVANNI','C',3814),('EDILDECORO DI FORTUGNO & SAFFIOTI','C',3815),('ATC DI PUGLIESE ALBERTO & C.SAS','C',3818),('LONDINO SERGIO','C',3822),('ANANIA ROCCO & GRILLO F.SCO SNC','C',3825),('FARMACIA FORGIONE DANIELA','C',3827),('AUTORICAMBI RAG.SAVERIO LAGAZZO','C',3828),('SERVICE AUTO SAS CENTRO REVISIONI','C',3829),('MASSARA NICOLA ACCESSORI PER AUTO','C',3832),('FANELLI GIOVANNI','C',3833),('LOIACONO GIUSEPPE','C',3835),('ANNULLATO UTILIZZATO PER IL WEB','C',3843),('ANNULLATO','C',3844),('AUTORICAMBI LAGANAROBERTO DI','C',3845),('ANNULLATO UTILIZZATO PER IL WEB','C',3846),('MELITO GIAMPIERO','C',3901),('MRC RICAMBI S.R.L.','C',3903),('MARONGELLI ANTONIO','C',3908),('MORELLO ANTONIO','C',3911),('M.A.I.R.S.AGATA DI DE BENEDETTO N.A','C',3912),('MONTELEONE MICHELE Autoricambi','C',3913),('FOTI PASQUALE','C',3914),('METALLURGICA RIVORALESE SPA','C',3915),('MARTINO DOMENICO','C',3917),('MALIZIA PASQUALE','C',3918),('DE SIBIO MECCANICA sas DI DESIBIO D','C',3924),('PUBBLIWORLD DI GULLO ANTONINO','C',3926),('MAZZITELLI & TASSONE S.N.C.','C',3927),('LANDRO AUTOMOBILI','C',3928),('MEZZATESTA ANTONIO','C',3931),('MOTOR SHOP Autoricambi sas','C',3932),('REPACI GIOVANNI','C',3933),('MERLINO CARMELO','C',3934),('ONESHOT S.A.S.','C',3935),('MANARITI GIUSEPPE','C',3936),('FESTA LEONA','C',3937),('CB SPECIAL COMPONENTS DI BERTOT','C',3939),('EDICOLA ARCURI LUCIA','C',3942),('LANDRO LEONE','C',3943),('COOPERATIVA REGGINA 08','C',3944),('MUZZI BRUNO','C',3952),('CAMERA ANTONIO','C',3957),('MAMONE GERARDO CENTRO RICAMBI AUTO','C',3961),('MALARA GIUSEPPE','C',3962),('R.C. TUNING DI LORENZO ANTIMO','C',3963),('MAIO CESARE','C',3966),('MACELLERIA LEONELLO SALVATORE','C',3967),('CAMERA DOMENICO','C',3972),('COZZOLINO SAVERIO AUTOPARTS','C',3976),('MARINO GABRIELE & F. sas','C',3978),('SYSTEM SUD SNC','C',3981),('MSC AUTOVEICOLI DI MUSICOARNALDO','C',4001),('GALATI ANTONIO AUTOTRASPORTI','C',4003),('NILAUTO srl','C',4004),('NUCERA FILOMENO','C',4007),('NUCERA MAURIZIO','C',4008),('OTTOBRE TRADE SRL','C',4205),('CONDOLUCI MARIA GIUSEPPA','C',4207),('PUGLIESE SALVATORE RICAMBI AUTO','C',4208),('NOVEMBRE ROSANNA MINUT.E MECC.','C',4210),('CABBOI GRAZIELLA','C',4212),('PETRONAS LUBRICANTS ITALY SPA','C',4213),('PERRI MIMMO','C',4215),('D.SSA ZAPPONE LILIANA','C',4222),('PUPO GIUSEPPE AUTORICAMBI','C',4226),('OFF.MECC.FRATELLI PIRILLI','C',4229),('RACO ELISABETTA RIF.TAMOIL','C',4230),('PICCOLO MARIO AUTORICAMBI','C',4232),('AUTORICAMBI VENTURA VINCENZO','C',4236),('TECNO EDIL DI VIOLA SANTO','C',4242),('PALMA AUTORICAMBI S.R.L.','C',4243),('PULIMENI ANTONIO & C. sas','C',4244),('PALERMO OLIVA Autoricambi','C',4246),('MAX MOTO DI PELLEGRINO M.A.','C',4249),('POLIMENI FRANCO','C',4256),('PEZZANO PIETRO','C',4261),('POLITI FRANCESCO Elettrauto','C',4263),('TROPEANO STEFANO RICAMBI AUTO','C',4303),('ROPERTO ALDO CENTRO COMMERC.RICAMBI','C',4304),('TENUTA GIANFRANCO AUTORICAMBI','C',4305),('F.LLI ROSE Snc di UMILE & FRANCO R','C',4308),('AUTORICAMBI RUGGIERO sas','C',4310),('VIOLA ERMANNO STAZ.SERV.ERG','C',4312),('R.AUTO IN snc','C',4313),('GOMMAUTO DI RODA & C. snc','C',4314),('DECA S.a.s. DI G.PPE DE PASCALI &C.','C',4318),('A.G.C.SRL','C',4320),('NUOVA RIMA DI CAPULA RAFFAELE','C',4324),('CRUCITTI GROUP SRL','C',4325),('INFORAMA DI DENISI V.ZO E C.SAS','C',4328),('EVALTO FRANCESCO & FIGLI','C',4401),('SCHIPANI RICAMBI','C',4404),('SPINA ALEXANDRO','C',4405),('SCUOLA CALCIO VIGOR PALMI 2004','C',4406),('SURIANO ALV SAS','C',4407),('AUDINO SAVERIO','C',4408),('SOBER RICAMBI AUTO sas','C',4409),('ROMEO VINCENZO & C. SNC','C',4411),('SAIM snc DI TAVELLA ANTONIA','C',4414),('SAINATO PASQUALE','C',4415),('SMEC SRL','C',4416),('F.LLI SINOPOLI snc Ric.Auto-Moto','C',4417),('F.LLI SPINELLI snc','C',4418),('AZ.AGR SORGES DI ROSA SORLETI','C',4420),('DUEMME S.A.S.','C',4421),('SPOLETO NUOVA AUTOACCESSORI','C',4422),('LOMBARDO DOMENICO FU GREGORIO','C',4423),('MULTISERVIZI M.G.D. DI PARRELLO','C',4427),('SCIARRONE SPA','C',4429),('SCRIVO ANTONIO','C',4432),('SERRATORE FRANCESCO','C',4440),('ANNULLATO UTILIZZATO PER IL WEB','C',4441),('LA BOTTEGA DEL RESTAURO DI FOTI R.','C',4442),('EREDI SURACE LORENZO di SURACE','C',4443),('S.D.R. sas','C',4446),('SAMA & CODISPOTI SAS','C',4451),('SCIONTI ROCCO Jr.','C',4452),('SOFI PAOLO','C',4454),('SISCA ANTONIO MECCANICO ARTIGIANO','C',4460),('ITALCOGE SPA','C',4463),('ANNULLATO TASSO SAL','C',4466),('BISCARDI LUIGI TUTTO PER LAUTO','C',4501),('B.P.SOLLEVAMENTI di ETTORE BELLINI','C',4502),('TROVATO AUTORIPARAZIONE','C',4506),('TASSONE PASQUALE','C',4514),('LA TIRRENICA DI CAPUA GIUSEPPE','C',4517),('TASSONE sas DI TASSONE GUERINO & C.','C',4521),('TASSO ANTONIO LEONE AUTORICAMBI','C',4522),('MAZZA ANDREA','C',4523),('TORCHIA ANGELO','C',4525),('TAVELLA ANTONIO','C',4533),('ANNULATO','C',4600),('VENTRA SAS di VENTRA VINCENZO & C.','C',4601),('VALOTTA FRANCESCO','C',4606),('VONO S.A.S. DI VONO G.& CO.','C',4607),('MEG DI ROMEO CARMELO','C',4611),('VENTRE AUTORICAMBI DI VENTRE G.PPE','C',4612),('TECHNO BUS SRL','C',4613),('LA FLAVIA DI FILIPPO SPINELLI','C',4614),('VRENNA LUCA MECC.& SICUREZZA','C',4615),('DELIZIE DI CALABRIA S.A.S DI ARENA','C',4621),('GENTILE FRANCESCO','C',4702),('ZICARELLI SALVATORE','C',4704),('ZAPPIA CARMELO','C',4705),('ATTENZIONE ! LA MECCANICA 2','C',5000),('EVA TECH S.A.S.DI DANIELE MEGALIZZI','C',5002),('RESTUCCIA ROSA RITA BOSCH CAR SERV.','C',5003),('PIMEC SRL','C',5004),('DAVIGIUSEPPE','C',5007),('VITETTA ANTONINO','C',5009),('STIL GOMMA DI NINO IANNELLI','C',5011),('ANNULLATO UTILIZZATO PER IL WEB','C',5017),('OFF.MECCANICA ROTONDO ANTONIO','C',5019),('COMBUSTION AND ENERGEY SRL','C',5020),('HOTEL RESIDENCE \"ARCOBALENO\"','C',5022),('BRANDO CARMELO','C',5024),('CASILE ROBERTO','C',5029),('AVVENTURA SOC.COOPERATIVA ARL','C',5035),('RA.DI SRL','C',5036),('CENTRO GOMME DI CONDINA GIOVANNI','C',5040),('JOLLY FRUTTA DI PAPASERGIO ANGELA','C',5043),('SURACE ANTONINO','C',5055),('FORTEBUONO METALLINFISSI S.r.l.','C',5056),('BAGALAGIUSEPPE','C',5057),('CASEIFICIO IL GRANATORE DI ZAGARI','C',5060),('RUSSO GAETANO AUTORICAMBI','C',5062),('RAFFAELI SRL','C',5073),('ALESSI PINA IMPRESA EDILE','C',5075),('ERREBI SRL','C',5076),('LA CORTE DELLA CARNE DI PEPPINO','C',5078),('MANOCCIO GENNARO','C',5084),('DE CARIA MOTORS SRL','C',5085),('DOTT.MARCELLO MELARA','C',5087),('F.LLI ATTISANO SRL ORTOFRUTTA','C',5088),('GIOFFRE PASQUALE','C',5089),('M.G. LOGISTIES SERVICES SRL','C',5091),('CONSORZIO ACQUEDOTTO VINA','C',5094),('MD COLLECTION DI MARRA DOMENICO','C',5100),('CRUCITTI SRL','C',5101),('VITALONE ROCCO OFF.MECC.','C',5102),('MOTORCYCLE & AUTO REPAIRS','C',5107),('QUASED SRL','C',5108),('CADI SERVICE S.A.S.','C',5110),('CO.DI.M. SRL','C',5114),('LEUZZI GIANCARLO','C',5115),('SCUTERI FRANCESCO','C',5116),('DI PINO TINDARO AUTORICAMBI','C',5117),('COMUNE DI SEMINARA','C',5123),('MATINA DOMENICO','C',5125),('ACCARDO ANNUNZIATO FILIPPO','C',5127),('BOLIGNANO ROBERTA DONATELLA','C',5131),('EVENTI FIORITI DI ROBERTA ANGALO','C',5132),('RAZIONALE ROSARIO HIPPONIO AUTO EL.','C',5133),('ERREMME di ROMEO DOMENICO MASSIMO','C',5134),('MAXICAR DI A.TRICOMI','C',5136),('MONTELEONE MARIA MADDALENA','C',5141),('REGGIORICAMBI DI MICHELANGELO','C',5142),('IL GENIO DEL PANE DI GARZO GREGORIO','C',5143),('ANNULLATO UTILIZZATO PER IL WEB','C',5144),('DAL MASO GIADOMENICO','C',5146),('RIZZITANO ANTONINO','C',5147),('MAURO AUTORICAMBI DI BADAMI MARIA','C',5150),('EDIL QUATTRO DI SAPONE G.& C. SNC','C',5151),('MARIA MADDALENA SICA','C',5163),('CILONA ANTONINO','C',5164),('MAGAZZU ARREDAMENTI','C',5165),('BORGESE VINCENZO','C',5166),('ARCHIMEDE DI MATTIANI PASQUALE','C',5169),('BAR RISTORANTE ULIVARELLA','C',5174),('CENTRO RICAMBI CALABRESI SNC CRC','C',5178),('PINNERI ANTONINO','C',5179),('F.LLI SCORDAMAGLIA S.N.C DI F.SCO','C',5182),('PANUCCIO ING.DOMENICO IMPR.COSTRUZ.','C',5183),('LOMBARDO ALLESTIMENTI','C',5195),('BOSCHETTO FRANCESCO ELETTRAUTO','C',5198),('PONTECOPROGES SRL','C',5199),('G.C.SERVICE DI GAGLIOSTRO CARMELO','C',5203),('PELLICANO S.R.L.','C',5208),('MACELLERIA DA ROCCO DI PRONESTI','C',5209),('MAGNETI MARELLI AFTER MARKET PARTS','C',5210),('IL POLLICE VERDE DI FARFAGLIA','C',5212),('COMUNE DI PALMI','C',5215),('BARA MOTO DI BARA FABIO','C',5225),('SAFFIOTI MASSIMO EMILIANO','C',5226),('LOIACONO GIULIO','C',5231),('SETTECERZE VINCENZO','C',5232),('BAGNOLI ROBERTO ELETTRAUTO','C',5234),('ALAMPI SALAVATORE IMPRESA EDILE','C',5236),('PANETTA CARLO','C',5239),('MYPLANET SRL','C',5240),('AUTO 3 snc F.LLI ARTESI','C',5241),('MATTIANI GIUSEPPE','C',5243),('ASP N.5 DI REGGIO CALABRIA','C',5244),('CANNIZZARO GIUSEPPE','C',5246),('SORICAL SPA','C',5248),('ROSACE GIUSEPPE','C',5249),('MOTORSPORT SNC DI SALVATI G.PPE & C','C',5250),('SLESC-SCHITRY DI SCHIPILLITI C.LO','C',5251),('LAURENDI GIOVANNA','C',5252),('OFF.MECC.GANGEMI DOMENICO','C',5253),('CUSAN di SANTORO & C. snc','C',5256),('MAISANO MARIANNA EURORICAMBI','C',5259),('NICOLI SANTINO ASS.PIAGGIO','C',5260),('ELETTROSISTEM DI LAFACE GIUSEPPE','C',5261),('F.LLI CAPOGRECO snc','C',5263),('COSENTINO FRANCESCA','C',5264),('TERMINE CLAUDIO AUTORICAMBI','C',5266),('CHIRICO PAOLO','C',5267),('MERCURI VINCENZA','C',5268),('AZIENDA AGRICOLA BIVONE MARIA','C',5269),('ANDREARCHIO ALESSANDRO','C',5271),('SICILIANO PASQUALE','C',5272),('APEIRON S.A.S DI F.SCO BARONE & C.','C',5273),('STAR SERVICE PICCOLA SOC.COOP.ARL','C',5274),('ZOCCALI ANTONIO','C',5276),('CONDELLO MARCO ALIMENTARI','C',5278),('MARTINO PAOLO PIETRO','C',5279),('PRELIBATEZZE DI RITA ARICO','C',5280),('AMORUSO LUIGI SRL','C',5281),('MAZZULLO LUCIANO','C',5282),('POLIAUTO DI POLIZZO UMILE','C',5286),('RIGANOFRANCESCO','C',5289),('AMBROGIO GIUSEPPE','C',5290),('ISOTERM DI VIGLIANTE GEOM.D.CO','C',5296),('MACELLERIA MICHELE LUPPINO','C',5297),('MARTORANO PASQUALE','C',5299),('TECNOVIDEO DI LAGANA','C',5301),('ASSIST.RENAULT ARCISIACONO ORAZIO','C',5302),('AUTOSERVICE MINNITI S.A.S.','C',5305),('CRO.MAR TRONIC DI G.MARZULLO','C',5308),('CRD SRL','C',5310),('VALENTE PNEUMATICI srl','C',5312),('SPADA AGOSTINO','C',5316),('RAMONDINO MARCO','C',5317),('SHOPSTORE SRL','C',5319),('LOIACONO ANNALISA','C',5321),('COLLURA ALESSANDRO','C',5324),('AP.RICAMBI DI PLUMARI ANTONINO','C',5325),('CENTRO DIAGNOSI DI GRAZIANO','C',5326),('MILITANO FRANCESCANTONIO','C',5327),('EUROSERVICE 2000 DI GIANLUCA CIMINO','C',5329),('CELESTI PIETRO ELETTRAUTO','C',5336),('AUTORICAMBI GABRIELE DI GABRIELE','C',5337),('JONICA RICAMBI SNC DI MUSCOLINO E','C',5338),('THE BEST AUTORIC.S.A.S.DI GALLO','C',5339),('VOLPE CARMELA OFF.RICAMBI AUTO','C',5341),('LOCCASIONE snc di PELLICANO P & C.','C',5342),('AZ.AGR.CARMELITANO MATTEO','C',5343),('PRISCOGLIO GIUSEPPE FRANCESCO','C',5344),('ANNULLATO INVIATO A motorline','C',5347),('PUTRINO DOMENICO STUDIO DI GEOLOGIA','C',5348),('CAPUTO NATALE AUTORIC.','C',5350),('SPORTAUTO di GAGLIOSTRO VINCENZO','C',5355),('ZERBI FABIO','C',5357),('ARICONATALE','C',5358),('VALOTTA LEOLUCA OFF.ELETTROMEC.','C',5360),('BARBARO CONCETTA LUCIA','C',5361),('PENNESTRILUIGI OFF.MECC.','C',5364),('RETTIFICHE MANNINO SRL','C',5366),('SPAGNOLO DOMENICO','C',5373),('AUTORICAMBI DLC DI ABOSSIDA G&C sas','C',5375),('AMBROGIO DOMENICO','C',5376),('BENEDETTO STEFANO','C',5377),('NICOLETTA GIUSEPPE','C',5378),('ESSERICAMBI DI ANNA MARIA SCHIRRIPA','C',5379),('DOTT.DOMENICO FARERI','C',5383),('V.I.M.A.R. SAS','C',5384),('AUTORICAMBI \"RUGGERI\" DI C.&D.CAR','C',5385),('ICOREL DI IERACE ROBERTO','C',5386),('S.G.AVIATION SRL','C',5387),('SUPERMERCATO PRINCI SAS','C',5388),('CALABRIA LUCIANO AUTORICAMBI C.D.R','C',5389),('MISALE GIUSEPPE','C',5390),('LASCALA DOMENICO','C',5393),('DELIVERY EXPRESS DI NUCARA A.','C',5394),('CUCCI FERDINANDO AUTORICAMBI','C',5402),('LENTINI MONTEDORO AUTORICAMBI','C',5407),('BORGESE CARMELO','C',5408),('TECNOSTUDIO DI ZACCURI GIOVANNI','C',5409),('SOC.COOP.ARCOBALENO A.R.L.','C',5411),('DE.SAL.CAR. DI DE SALVO ROBERTO','C',5412),('PM 2 DI MILITANO NATALE','C',5416),('EURO CAR DI BARONE ANTONINO','C',5417),('ROSINA ANTONINO','C',5418),('PALMERI MICHELE','C',5419),('S.D.CAR DI SALVATORE DOMENICO','C',5421),('CENTRO RICAMBI MINNITI','C',5422),('A.B.S. AQUILA BROADCASTING SETS','C',5424),('EDIL CASA DI DANDREA DOMENICA','C',5427),('RICAMBI 2000 S.N.C. DI LAGONIA &','C',5428),('KRIOS AC S.R.L.','C',5429),('MUSICO ANTONINO','C',5430),('NSA NUOVI SERVIZI AUTO S.P.A','C',5432),('FRAMEL SRL','C',5433),('ANNUL.LA BELLA FRANCESCO','C',5434),('IMPIOMBATO ANTONIO','C',5435),('ALFIERI SALVATORE','C',5436),('PASTIFICIO LANTICO MULINO','C',5437),('RICAMBI INDUSTRIALI S.R.L.','C',5438),('ANNULLATO INVIATO A CARPOINT','C',5439),('BARBIERI AUTORICAMBI di COSMA','C',5440),('SGRO GIUSEPPE','C',5441),('GIOIA HOSPITAL','C',5442),('AUTORICAMBI MAMONE PEPPINO','C',5444),('LA SOSPENS LIDO DI GABRIELE PIETRO','C',5445),('MICHELE SURACE DOTT.COMMERCIALISTA','C',5446),('CERENZIA GAETANO','C',5447),('BARBARO CARMINE','C',5448),('CALANNI RINDINA SPRINT AUTORICAMBI','C',5449),('ALAMPI SANTO','C',5450),('GIDAR srl','C',5451),('MARTELLI GIUSEPPE','C',5452),('OFF.MECC.BARBERA MATTEO','C',5453),('MARIANO GAETANO RIC.OFF.GOMME','C',5454),('CANNISTRA FRANCESCO','C',5455),('PIZZINO GIUSEPPE','C',5456),('GRIPPAUDO VINCENZO','C',5457),('SCANDURRA TIZIANA DIMENSIONE AUTO','C',5458),('AUTOSHOP S.R.L.','C',5459),('AUTORICAMBI DIANA ROBERTO & C.SAS','C',5460),('OLIVERI FRANCESCO','C',5461),('COSENTINO VITTORIO','C',5462),('C&P CERTIFICAZIONI S.R.L..','C',5463),('AR.RICAMBI SNC ARUTA SALV.& SANDRO','C',5464),('MAZZA ANTONIO','C',5466),('GANGEMI GIUSEPPE','C',5467),('STUDIO LEG.AVV.PELLEGRINO PASQUALE','C',5468),('OLIVERIO GIOVANNI','C',5469),('CASTAGNA PASQUALE AUTORICAMBI GOMME','C',5470),('GRAFIA PUBLICITA DI CIPRI GIUSEPPE','C',5471),('SAIJA ANGELO','C',5472),('CILIBERTO RENATO','C',5473),('CATANZARO SALVATORE','C',5474),('EUROAUTO srl','C',5475),('AGENZ.VIAGGI E TURISMO DE NICOLA','C',5476),('LA CONCORDIA SNC','C',5477),('MACOS srl','C',5478),('SIC.COM. S.A.S.','C',5479),('DONATO DANIELE AUTOR.','C',5480),('TROPICAL FRUIT DI LUPPINO FRANCESCO','C',5481),('SCIARRONE VINCENZO RICAMBI','C',5482),('CLIMAUTO DI TRAPASSO GIUSEPPE SNC','C',5483),('DABATE ORAZIO C.R. CENTRO RICAMBI','C',5484),('LB RICAMBI AUTO SAS','C',5485),('FAR.O.L.RICAMBI srl FAROL','C',5486),('CAPRINO ANTONIO AUTORICAMBI','C',5487),('MEGNA ANTONIO','C',5488),('MARINCOLO SERAFINO ELETTRAUTO','C',5489),('TECNORICAMBI SNC','C',5490),('PRESTIPINO SALVATORE','C',5491),('COSENTINO GIUSEPPE','C',5492),('SANTORO ANTONINO','C',5493),('R.S.STORE SRL','C',5494),('DE LUCA SERVICE DI DELUCA F.SCO SAS','C',5495),('AUTORICAMBI BRUNO SERGIO','C',5496),('INDUSTRIAL POINT S.R.L.','C',5497),('ANNULLATO PRESO PER IL WEB','C',5498),('MORABITO LEONARDO ITALRICAMBI','C',5499),('PENNA ANTONINO IMP.AGIP 8898','C',5500),('CARUSO ROCCO','C',5501),('COMPUTER & INTERNET DI FORTUNATO','C',5502),('IGRO SUD DI MERCURI GIANCARLO','C',5503),('PISANELLI SANTO','C',5504),('PISANO ANTONIO','C',5505),('RUFFO GELSOMINA GFC AUTORICAMBI','C',5506),('SUORE SALESIANE DEI SACRI CUORI','C',5507),('ALPA AUTO S.R.L.','C',5508),('ESPOSITO LORENZO','C',5509),('GAGLIOSTRO STEFANO','C',5510),('SIRIO AUTORICAMBI DI UFRASCATI G.','C',5511),('ELETTRAUTO AMATO FAUSTO','C',5512),('ALBANESE GIUSEPPE','C',5513),('ANNULLATO PRESO PER IL WEB','C',5514),('RI.A S.R.L.','C',5515),('AUTOFORNITURE TINO DAGATE','C',5516),('GLORIOSO ADRIANO','C',5517),('AUTORICAMBI ITALIANO di CURCURUTO','C',5518),('AUTOFORNITURE GULLOTTA','C',5519),('MANGIARRATTI EMANUELE IDROTEC','C',5520),('DOMINICI SRL','C',5521),('C.R.A.E.di DI BENEDETTO PROVVIDENZA','C',5522),('SPADA CARMELA SRL','C',5523),('LOMBARDO GIUSEPPE','C',5524),('MANOLA SALVATORE SA.MA','C',5525),('FARACI RAFFAELE TUTTAUTO','C',5526),('AUTORICAMBI CIARCIA CARMELO','C',5527),('MESSINA GIUSEPPE','C',5528),('AUTORICAMBI MEGARA SNC','C',5529),('MOTORPOINT SRL','C',5530),('ANASTASI GIOVANNI','C',5531),('AUTORICAMBI G.S.di SCOZZARICARLO','C',5532),('MA.DI.DI snc AUTOMARKET 2000','C',5533),('R.A.V. DI SORRENTINO LUIGI S.A.S','C',5534),('SA.MA RICAMBI DI SALAFIA MAURO','C',5535),('O.R.A. SPALLITTA & C. snc','C',5536),('TUTTAUTO ALBERGHINA GIANFRANCO','C',5537),('VINCI CONCETTO AUTOTECNICA AUTOR.','C',5538),('ANULLATO UTILIZZATO PER IL WEB','C',5539),('GIANNUSO GIOVANNI','C',5540),('CE.RI. DI CATANIA BIAGIO & C. SAS','C',5541),('ILARDI MARGHERITA & C. SNC','C',5542),('PUNTO RICAMBI SRL','C',5543),('NIGRELLI LUIGI','C',5544),('A.R.A.T. DI MARIO DI GIOVANNI','C',5545),('DILIBERTO AUTORICAMBI','C',5546),('DI COSTA S.R.L.','C',5547),('C.R.SERVICE SRL','C',5548),('ALOISI ANTONIO','C',5549),('PAONE RICAMBI DI PAONE G. SAS','C',5550),('FERICAM DI PISU FEDERICO','C',5551),('SANTOCONO & C. R.A.I.E.snc','C',5552),('VESPO SALVATORE','C',5553),('AUTORICAMBI MOTTA srl','C',5554),('GRASSO & FIGLI sas DI GRASSO D.e C.','C',5555),('VECCHI SNC','C',5556),('F.LLI CHIARAMIDA AUTORICAMBI sas','C',5557),('FUTURA RICAMBI DI SCACCIAFERRO','C',5558),('COSENTINO F.e G. snc','C',5559),('FENECH AUTORICAMBI srl','C',5560),('SAMMITO ANGELA','C',5561),('CENTRO RICAMBI SRL','C',5562),('AUTORICAMBI STRANO SRL','C',5563),('SURIANO PAOLO','C',5564),('AUTORICAMBI GLORIOSO srl','C',5565),('VECAM DI OLIVELLI VENERANDO E C.snc','C',5566),('MEC.CARS RICAMBI DI SCIALFA G.PPE','C',5567),('PENNISI AUTO DI G.PENNISI','C',5568),('AUTORICAMBI MAGGIO GIUSEPPE','C',5569),('GRILLO NICOLA AUTOFORN.','C',5570),('AUTORICAMBI TROGYLOS SRL','C',5571),('PRIVITERA STEFANO','C',5572),('AUTOFFICINA M.A.&.V S.a.s di OSCAR','C',5573),('IEMMOLO VINCENZO','C',5574),('GENNUSA GIUSEPPE AUTORICAMBI','C',5575),('C.R.A. Snc di Salvatore Tanasi & C.','C',5576),('F.LLI MUSARRA sas','C',5577),('S.G.R. DI ROSANO V.ZO & C. sas','C',5578),('ADAMO ROBERTO','C',5579),('ELIOS AUTORICAMBI SRL','C',5580),('DIEMME SRL','C',5581),('NUZZO FILIPPO','C',5582),('AUTOR.FISICARO DI FISICARO FILIPPO','C',5583),('CENTRO RICAMBI DESARI GIUSEPPE','C',5584),('AUTORIC.PROFETA DI PROFETA ONOFRIO','C',5585),('MARTUCCI REMO AUTORICAMBI','C',5586),('CHECKS SRL','C',5587),('AUTOETNA DI INTRESSALVI M.& C. snc','C',5588),('FRICANO ROBERTO & C.RI.AS.sas','C',5589),('GAGLIARDI VALENTINO','C',5590),('MICIELI SALVATORE SNC','C',5591),('GIARDINA GIOVANNI','C',5592),('BOCCHIARO GIUSTO & C. snc','C',5593),('R.D.C. DI VALERIA FILI','C',5594),('PALAZZOLO GIUSEPPE','C',5595),('CARILLO MARTINO AUTORICAMBI','C',5596),('AUTORIC.FAVUZZA SOC.COOP.','C',5597),('F.LLI RUSSO DI GAETANO RUSSO & C','C',5598),('DI.R.MEC SRL','C',5599),('AUTOCOMPONENTI COSENTINO','C',5600),('OLIVERI FRANCESCO AUTORICAMBI','C',5601),('PULIZZI GIOACCHINO','C',5602),('AUTORICAMBI RIITANO DOMENICO','C',5603),('FARRUGGIO BIAGIO','C',5604),('DISTEFANO M.& PELLEGRINO A. S.N.C.','C',5605),('SORTINO S.r.l.','C',5606),('B.R.M. di MARINELLI G.PPE & C. snc','C',5607),('C.A.R. DI CAMPISI ISABELLA','C',5608),('ARENA SRL','C',5609),('AUTOMECHANIKA SRL','C',5610),('PRECAV S.N.C. DI CAVALLARO ROSARIO','C',5611),('COIR srl','C',5612),('DI BELLA SERVICE','C',5613),('GARDEN BAR RACITI PAOLA & C. SNC','C',5614),('TUTTORICAMBI snc DI MUSCIA V.& G.','C',5615),('RICAS RICAMBI E ACCESSORI DI','C',5616),('DI PIETRO AUTOSERVICE DI PIETRO C.','C',5617),('EUROPARTIAUTO DI COCO CARMELO','C',5618),('AUTORICAMBI ODDO CARMELO','C',5619),('LAUTORICAMBI SRL','C',5620),('CUNSOLO MARIO AUTORICAMBI','C',5621),('AUTORICAMBI GRECO FINA','C',5622),('CORRADO CASALE SNC','C',5623),('R.A.I.A.R. srl','C',5624),('CASA DEL RADIATORE','C',5625),('CENTRO CLIMA SNC','C',5626),('SCARLATO SALVATORE ELETTROCAR','C',5627),('VIOLA FRANCESCO','C',5628),('CENTRORICAMBI NIGRO srl','C',5629),('MASTROGIOVANNI SRL','C',5630),('F.LLI PIZZA SNC','C',5631),('VIOLI CARLO','C',5632),('AVV.CARMELA CLEMENTE','C',5633),('DE CARIA ROCCO AUTORICAMBI','C',5634),('DIESEL TRUCKS DI SCADUTO ANGELO','C',5635),('MESSINA FILIPPO AUTORICAMBI','C',5636),('ERRECI DI RAFFAELE CANTAFIO','C',5637),('DOTT.GIUSEPPE FAVIA GUARNIERI SRL','C',5638),('ROSSETTI ALESSANDRO','C',5639),('STAZIONE DI SERVIZIO MANGANI','C',5640),('RONDINELLI GIOVANNI BATTISTA','C',5641),('DALTORICAMBI SRL','C',5642),('CORDIANO MARCELLO','C',5643),('EURORICAMBI DI TUSCIANO GIUSEPPE','C',5644),('AUTORIPARAZIONI IORI SNC.DI GRASSI','C',5645),('RI.CAR. srl','C',5646),('CAPPARELLI FRANCESCO','C',5647),('TUTTO MARMITTE DI BORSELLINO TANINA','C',5648),('PUGLIESE ANTONINO','C',5649),('AUTOFFICINA FUDA DI','C',5650),('TUTTO RICAMBI DI PRIOLO MARCO','C',5651),('LUCKY BAR RUGARI & GALLETTA S.A.S','C',5652),('ROCCAFORTE EURORICAMBI','C',5653),('CENTRO MIDAS REGGIO CALABRIA','C',5654),('BELLANTONI VINCENZO','C',5655),('AUTOFFICINA MISIANO SALVATORE','C',5656),('DEMASI GIUSEPPE','C',5657),('DIESELTRUCK DI ALFANO FABIO','C',5658),('ARIGANELLO MASSIMO AUTORICAMBI','C',5659),('MI.RA. RICAMBI SAS MIRA','C',5660),('AGF SICILIA srl','C',5661),('MOLISE RICAMBI di A.Tamburri SNC','C',5662),('GARANZIA EUROPA GROUP SPA','C',5663),('FORESTIERI BRUNO ITALTRONYC','C',5664),('MORABITO VITO','C',5666),('MORABITO SALVATORE','C',5667),('LA MECCANICA SRL','C',5668),('GENNARO CACCIAPUOTI','C',5669),('PALAMARA GIUSEPPE PIT STOP','C',5670),('POLITO CARBURANTI DI ROCCO POLITO','C',5671),('STAZ.SERV.AGIP DI FRUCI GIUSEPPE','C',5672),('MARTINO SRL','C',5673),('SCHIPANI MARIANGELA AUTORICAMBI','C',5674),('AUTO VIP SRL','C',5675),('VECCHI GIUSEPPE RICAMBI','C',5676),('FARNO FULVIO & S. snc','C',5677),('CIRIMELLI AUTORICAMBI DI SAVERIO P.','C',5678),('IL CANNETO TAMOIL DI POLITO A. SAS','C',5679),('CARDINALE AUTOMOBILI SRL','C',5680),('D.R.A.M. snc','C',5681),('MANCUSO ILARIA AUTORICAMBI','C',5682),('COTRONEO DOMENICO','C',5683),('GRANATA F.CO F.G. AUTORICAMBI','C',5684),('RE.MA.DI ESPOSITO R.& BELSITO M.SRL','C',5685),('STAZ.SERV.AGIP DI BAGNATO SALVATORE','C',5686),('CAMMILLERI GAETANO AUTO GT','C',5687),('AGRILU DI MALVASI LUCIA','C',5688),('R.G. di ROSARIO GAROFOLO','C',5689),('AUTOELETTRONICA F.LLI DOMINICI snc','C',5690),('MELI CAR RENTALS LTD','C',5691),('RF srl','C',5692),('RUSSO GIUSEPPE','C',5693),('FALCONE FRANCESCO','C',5694),('STEFANELLI DOMENICO','C',5695),('GR srl','C',5696),('DIMENSIONE AUTO SRL','C',5697),('LATTANZIO DONATELLA','C',5698),('AUTOCOM SRL','C',5699),('GIORDANO SALVATORE OFF.CHEVROLET','C',5700),('CO.R.A.R.09 SRL','C',5701),('TRIMARCAR AUTORIC.DI MACRI PALMA','C',5702),('VIOLAUTO SRL','C',5703),('G.& V.POLICASTRI SNC','C',5704),('A.G.S.RICAMBI SRL','C',5705),('FLORI MOTORI SRL unipersonale','C',5706),('CUCINOTTA ANGELO AUTORICAMBI','C',5707),('ARCURI MARCELLO AUTORICAMBI','C',5708),('GAMMA RICAMBI SRL','C',5709),('VIOLA VINCENZO AUTORICAMBI','C',5710),('BELLOCCO RAFFAELE','C',5711),('BELCASTRO ANGELO ACCESSORI','C',5712),('SAFFIOTI CARMELO IMPRESA EDILE','C',5713),('A.M.RICAMBI DI ESPOSITO S.','C',5714),('3C RICAMBI DI COLAPRISTI VINCENZO','C',5715),('SURACE AUTO DI SURACE ROCCO','C',5716),('DIEMME SRL','C',5717),('F.LLI SCANGA SRL','C',5718),('ARTE FERRO DI ROSARIO BAGNATO','C',5719),('AUTORIC.CHIURCO DI LORICCHIO V.ZO','C',5720),('TIRRENO SNC.DI LUCCHESE V.ZO','C',5721),('CO.GE.TECH SRL','C',5722),('SALADINI SRL','C',5723),('TURANO ARMANDO','C',5724),('G.E.S.T. AUTORICAMBI SRL','C',5725),('CONDO ANTONIO','C',5726),('PUNTO MARMITTE DI FERRARA DOMENICO','C',5727),('INTERNAZIONALE RICAMBI SRL','C',5728),('A.A.R. DI CURCIO VINCENZO','C',5729),('RIC.PIAGGIO F.LLI SERGI DI SERGI G.','C',5730),('LAURITO GIUSEPPE AUTORICAMBI','C',5731),('AUTORICAMBI TRE A DI A.LUZZI','C',5732),('VISCOMI AGOSTINO','C',5733),('GROUP ECO ITALIA SRL','C',5734),('MESITI LUCA','C',5735),('AUTORICAMBI SCHIRRIPA SAS','C',5736),('TRUSCELLI ANTONIO','C',5737),('AUTORIC.GODINO DI MENDICINO LORETTA','C',5739),('MICHELE CAROLI SRL','C',5741),('CIRIA ALESSIO AUTORICAMBI','C',5742),('F.LLI LORENTI RICAMBI AUTO SRL','C',5743),('R.S.RICAMBI DI ROBERTO SGAMBELLURI','C',5744),('ARCURI SISTINO AUTORICAMBI','C',5745),('2V CAR PARTS DI VALERIO MACRI','C',5746),('BARILLARI GIUSEPPE AUTORICAMBI','C',5747),('AUTORICAMBI COSENTINO SRL uniperson','C',5748),('EURORICAMBI SRLS','C',5749),('AUTORICAMBI 2G DI GIANFRANCO GARUFI','C',9002),('A.R.A. RICAMBI VENETICO srl','C',9005),('BELLANTONI DOMENICO','C',9034),('BASILE SANTO','C',9036),('AUTORICAMBIFOX DI FOSSATI MATTEO','C',9062),('GRANDI RICAMBI DI GRANDI SIMONE','C',9070),('CARUSO CALOGERO','C',9071),('CALDERONE PAOLO FRANCESCO','C',9074),('GAGLIO GIUSEPPE Ricambi Auto e Acc.','C',9185),('GIORGIANNI AUTORICAMBI S.N.C.','C',9190),('SAPORITO MASSIMO LAUTORICAMBIO','C',9284),('LOMBARDO SANTO','C',9285),('MICALI GIOVANNI','C',9324),('MERLINO ANTONINO','C',9331),('MILONE GIUSEPPE','C',9352),('CENTRO AUTO DI TRAMONTANO','C',9380),('PINTAUDI ROCCO','C',9422),('AUTORICAMBI DI PINO SRL','C',9475),('SETTIMO GIOVANNI','C',9502),('SANFILIPPO GIUSEPPE','C',9505),('STURNIOLO ANTONINO Elettrauto','C',9507),('SUD RICAMBI snc DI GUGLIOTTA C.& C.','C',9508),('SPRINT CAR AUTORICAMBI DI GRECO A.','C',9511),('GIORGIO FRANCESCO','C',9534),('TRIFILO FILIPPO TUTTO AUTORICAMBI','C',9537),('RIGGIO GIUSEPPE & C. SNC','C',9620),('CORRISPETTIVI','C',999999),('','F',0),('SAFFIOTI CARMELO SNC','F',1),('TRENTINELLA FRANCESCO','F',2),('PRINTING.CENTER','F',3),('MAZZULLO FORTUNATO','F',4),('MGG ITALIA S.R.L. GRUPPO IMCO','F',5),('GLS GENERAL LOGISTICS SYSTEMS','F',6),('CIFANI SRL','F',7),('BARTOLINI spa','F',8),('ITALIA RECAPITI S.R.L','F',9),('UNI EURO S.P.A','F',10),('FORMAT S.A.S. DI PISCOPO ANTONIO &C','F',11),('GIAMMARRESI NICOLO','F',12),('CANNATA VINCENZO srl','F',13),('GRIMAS srl Etichette','F',14),('CONSORZIO ASSORICAMBI','F',15),('B.C.R. srl','F',16),('CADI snc F.LLI MILASI','F',17),('JET EXPRESS srl CORRIERE ESPRESSO','F',18),('PAPERNET SPA','F',19),('FIAMMA DI A.SEMINARA','F',20),('COSTANZO SALVATORE','F',21),('MONDOFFICE SRL','F',22),('SOF.INN. INFORMATICA srl','F',23),('G.TRIPODI SRL','F',24),('ARMES SPA','F',25),('J-SOFTWARE SRL','F',26),('SARITEL','F',27),('SDA EXPRESS COURIER','F',28),('TRASPORTI PE.CAM','F',29),('CONSOZIO PDA','F',30),('OPITERGINA MARMITTE DI NESPOLO','F',31),('SCATOLIFICIO VENETO S.R.L.','F',32),('AUTOCOM SRL','F',33),('LT SRL LOGISTICA E TRASPORTI','F',34),('FUTIA DOMENICO','F',35),('SETEFI SPA GRUPPO INTESABCI','F',36),('ELPIDA D.O.O.','F',37),('I.F.R. DI MAURIZIO ROMANO','F',38),('CRUCITTI SRL','F',39),('GRAFICAJONICA SNC','F',40),('PANALPINA TRASP.MOND.SPA','F',41),('ARUBA SPA','F',42),('ENGINET SRL','F',43),('POLIGRAFICO SRL','F',44),('SERIBAG DI ZAGARI DANIELA','F',46),('PISANI FRANCESCO & FIGLI SPA','F',50),('INGROSUD DI PRATICO ANTONIO','F',51),('MEDIA WORLD COMPRA ON-LINE','F',53),('PM2 DI MILITANO NATALE','F',58),('RAG.PARISI GIUSEPPE','F',60),('REDOIL ITALIA spa','F',64),('BARBARO SPORT S.A.S.','F',75),('KRIOS A.C. srl','F',83),('SERFEM DI SERGIO FEMIA','F',86),('SOVEB AUTO SRL','F',90),('SUSA TRASPORTI SPA','F',93),('SDA sas DI PALMITESSA (UNIGOM)','F',94),('NOTAIO MARCELLA CLARA RENI','F',96),('AB ELETTROSISTEMI','F',97),('SOCET srl (TOTAL)','F',100),('DELIVERY EXPRESS','F',101),('TAZZETTI GUIDO & C. SPA Div.ACR','F',102),('COMPUTER ASSIST S.A.S. DI RUFFOLO','F',103),('ALDASA DI FRANCO SILENO','F',104),('STUDIO LEGALE AVV.GIULIANA METE','F',105),('TRIONE RICAMBI S.P.A','F',107),('RICAMBIFLEX GM srl','F',110),('CASA DEL RICAMBIO SRL','F',111),('LEONARDO SNC DIGITAL STUDIO','F',112),('MUSICO MACCHINE AGRICOLE','F',115),('ROBERT BOSCH spa','F',116),('C.B.F. BALDUCCI SPA','F',117),('ENGINE COMPONENTS srl GLASER','F',118),('SEAL-TECH SRL','F',119),('SMAT NORD srl','F',120),('RIVOIRA S.P.A','F',121),('BRENTA SRL','F',122),('RAPISARDA CARLO CARMELO','F',123),('CIEFFEBI TRASPORTI','F',124),('CAST BOLZONELLA S.A.S.','F',125),('EURODECOS S.R.L.','F',126),('DALTORICAMBI SRL','F',127),('LUBEX S.P.A.','F',128),('ITALTRADE SRL','F',129),('SAMAUTO SPA','F',130),('FRAP srl','F',135),('SOGEFI FILTRATION SPA','F',140),('UNIPART NV INTERNATIONAL RADIATOR','F',145),('EXIDE ITALIA SRL','F',150),('IBS SRL','F',155),('ASSOMARMITTE SRL','F',160),('IPS PARTS SRL','F',165),('OSRAV ALFEO MORET SPA DAMPO','F',170),('EXO AUTOMOTIVE SPA REMSA-OPENPARTS','F',175),('KAYABA ITALY GmbH','F',180),('SALADINI SRL','F',185),('CARTIERA LUCCHESE SPA (LUCART)','F',190),('TIRRENA IMPEX SRL','F',195),('FAAL BATTERIE SRL','F',200),('NRF ITALIA SRL','F',205),('DICRA SPA','F',210),('MECARM srl','F',215),('LEART-DIVISIONE EUROLITES SPA','F',1202),('EUROLITES S.P.A ARIC','F',1203),('MORONI CESARE & C. snc','F',1307),('M.T.S. spa','F',1310),('MAGNETI MARELLI AFTERMARKET AND SER','F',1323),('MALO spa','F',1329),('NEWFREN SPA','F',1401),('OLYMPIA srl','F',1501),('F.LLI TRIPODI SNC','F',1502),('FL.ITALIA srl OLEOBLITZ','F',1505),('OSRAM spa','F',1507),('PHILIPS SPA','F',1602),('DAYCO EUROPE SRL','F',1605),('RICAUTO SPA','F',1804),('R.M.S. S.P.A.','F',1817),('COMMERCIALE LUCANA snc','F',1901),('ENZO PARISI S.R.L.','F',1902),('SIOM S.R.L.','F',1908),('SIA INDUSTRIA ACCUMULATORI spa','F',1914),('SIMAKA','F',1923),('SITO GRUPPO INDISTRIALE spa','F',1935),('TOMAS RENATO & BRUNO sas','F',2001),('UMMAC srl','F',2201),('VEMA srl','F',2306),('VALEO SERVICE ITALIA S.P.A.','F',2308),('WD-40 COMPANY LTD','F',2309),('A.C.S. DI CORDOVANA SALVATORE','F',3101),('DELTA SERVICE snc','F',3103),('AUTOFORNITURE MILANESI spa','F',3104),('AGIP PETROLI ( Agenzia RC )','F',3105),('ARSAUTO SRL','F',3110),('AREXONS DIVISIONE DI FL SELENIA SPA','F',3116),('BOSATTA F.LLI \"F.B.\"srl','F',3201),('BIFFI & PREMOLI srl','F',3205),('BERGAMASCHI & F. spa','F',3213),('F.G.WOLF SRL','F',3302),('C.D.A. spa','F',3303),('CENTAURO srl','F',3307),('CASA DEL BULLONE sas','F',3311),('ORIGINAL BIRTH spa','F',3314),('FORTEBUONO METALLINFISSI SRL','F',3321),('C.C.R. srl CENTRO CUSCINETTI','F',3325),('CRAMER SRL','F',3328),('TOMMASELLI srl','F',3401),('DELLORTO spa','F',3403),('FEDERAL MOGUL ITALY SRL','F',3408),('F.A. ITALIA snc','F',3620),('FODONE sas','F',3621),('GUARNITAUTO spa','F',3707),('G.V.S. DI SALA RINALDO','F',3718),('PRES-SING S.A.S.','F',3906),('CODICI ANNULLATI','F',9999),('','F',999999);"); statement.close(); conn.commit(); diff --git a/uitest/src/main/java/com/vaadin/tests/contextclick/AbstractContextClickUI.java b/uitest/src/main/java/com/vaadin/tests/contextclick/AbstractContextClickUI.java index e1d741ee88..73498ed973 100644 --- a/uitest/src/main/java/com/vaadin/tests/contextclick/AbstractContextClickUI.java +++ b/uitest/src/main/java/com/vaadin/tests/contextclick/AbstractContextClickUI.java @@ -89,9 +89,9 @@ public abstract class AbstractContextClickUI<T extends AbstractComponent, E exte protected HorizontalLayout createContextClickControls() { HorizontalLayout contextClickControls = new HorizontalLayout(); - contextClickControls.addComponent(new Button( - "Add/Remove default listener", new ListenerHandler( - defaultListener))); + contextClickControls + .addComponent(new Button("Add/Remove default listener", + new ListenerHandler(defaultListener))); contextClickControls .addComponent(new Button("Add/Remove typed listener", new ListenerHandler(typedListener))); diff --git a/uitest/src/main/java/com/vaadin/tests/contextclick/GridContextClick.java b/uitest/src/main/java/com/vaadin/tests/contextclick/GridContextClick.java index 77009a0762..498b8b4fba 100644 --- a/uitest/src/main/java/com/vaadin/tests/contextclick/GridContextClick.java +++ b/uitest/src/main/java/com/vaadin/tests/contextclick/GridContextClick.java @@ -24,8 +24,8 @@ import com.vaadin.ui.Grid; import com.vaadin.ui.Grid.GridContextClickEvent; import com.vaadin.ui.HorizontalLayout; -public class GridContextClick extends - AbstractContextClickUI<Grid, GridContextClickEvent> { +public class GridContextClick + extends AbstractContextClickUI<Grid, GridContextClickEvent> { @Override protected Grid createTestComponent() { @@ -66,8 +66,8 @@ public class GridContextClick extends @Override protected HorizontalLayout createContextClickControls() { HorizontalLayout controls = super.createContextClickControls(); - controls.addComponent(new Button("Remove all content", - new Button.ClickListener() { + controls.addComponent( + new Button("Remove all content", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { diff --git a/uitest/src/main/java/com/vaadin/tests/contextclick/TableContextClick.java b/uitest/src/main/java/com/vaadin/tests/contextclick/TableContextClick.java index 95fa85dc90..52ec68127f 100644 --- a/uitest/src/main/java/com/vaadin/tests/contextclick/TableContextClick.java +++ b/uitest/src/main/java/com/vaadin/tests/contextclick/TableContextClick.java @@ -24,8 +24,8 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Table; import com.vaadin.ui.Table.TableContextClickEvent; -public class TableContextClick extends - AbstractContextClickUI<Table, TableContextClickEvent> { +public class TableContextClick + extends AbstractContextClickUI<Table, TableContextClickEvent> { @Override protected Table createTestComponent() { @@ -57,8 +57,8 @@ public class TableContextClick extends @Override protected HorizontalLayout createContextClickControls() { HorizontalLayout controls = super.createContextClickControls(); - controls.addComponent(new Button("Remove all content", - new Button.ClickListener() { + controls.addComponent( + new Button("Remove all content", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { diff --git a/uitest/src/main/java/com/vaadin/tests/contextclick/TreeContextClick.java b/uitest/src/main/java/com/vaadin/tests/contextclick/TreeContextClick.java index 6b58138ab2..e0d763a937 100644 --- a/uitest/src/main/java/com/vaadin/tests/contextclick/TreeContextClick.java +++ b/uitest/src/main/java/com/vaadin/tests/contextclick/TreeContextClick.java @@ -18,8 +18,8 @@ package com.vaadin.tests.contextclick; import com.vaadin.ui.Tree; import com.vaadin.ui.Tree.TreeContextClickEvent; -public class TreeContextClick extends - AbstractContextClickUI<Tree, TreeContextClickEvent> { +public class TreeContextClick + extends AbstractContextClickUI<Tree, TreeContextClickEvent> { @Override protected Tree createTestComponent() { diff --git a/uitest/src/main/java/com/vaadin/tests/contextclick/TreeTableContextClick.java b/uitest/src/main/java/com/vaadin/tests/contextclick/TreeTableContextClick.java index 406f5d589e..ceb8ab416c 100644 --- a/uitest/src/main/java/com/vaadin/tests/contextclick/TreeTableContextClick.java +++ b/uitest/src/main/java/com/vaadin/tests/contextclick/TreeTableContextClick.java @@ -24,8 +24,8 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Table.TableContextClickEvent; import com.vaadin.ui.TreeTable; -public class TreeTableContextClick extends - AbstractContextClickUI<TreeTable, TableContextClickEvent> { +public class TreeTableContextClick + extends AbstractContextClickUI<TreeTable, TableContextClickEvent> { @Override protected TreeTable createTestComponent() { @@ -58,8 +58,8 @@ public class TreeTableContextClick extends @Override protected HorizontalLayout createContextClickControls() { HorizontalLayout controls = super.createContextClickControls(); - controls.addComponent(new Button("Remove all content", - new Button.ClickListener() { + controls.addComponent( + new Button("Remove all content", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { diff --git a/uitest/src/main/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java b/uitest/src/main/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java index f94aecd3de..f640061a6f 100644 --- a/uitest/src/main/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java +++ b/uitest/src/main/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java @@ -21,15 +21,14 @@ public class ConverterThatEnforcesAFormat extends AbstractTestUIWithLog { tf.addValueChangeListener(new ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - log("Value changed to " - + event.getProperty().getValue() - + "(converted value is " - + tf.getConvertedValue() + log("Value changed to " + event.getProperty().getValue() + + "(converted value is " + tf.getConvertedValue() + "). Two-way conversion gives: " + tf.getConverter().convertToPresentation( tf.getConverter().convertToModel(tf.getValue(), Double.class, tf.getLocale()), - String.class, tf.getLocale()) + ")"); + String.class, tf.getLocale()) + + ")"); } }); tf.setImmediate(true); diff --git a/uitest/src/main/java/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java b/uitest/src/main/java/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java index 7ea644c3cb..f6eee3cbc0 100644 --- a/uitest/src/main/java/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java +++ b/uitest/src/main/java/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java @@ -5,8 +5,8 @@ import java.util.Locale; import com.vaadin.legacy.data.util.converter.LegacyStringToDoubleConverter; -public class StringToDoubleConverterWithThreeFractionDigits extends - LegacyStringToDoubleConverter { +public class StringToDoubleConverterWithThreeFractionDigits + extends LegacyStringToDoubleConverter { @Override protected NumberFormat getFormat(Locale locale) { diff --git a/uitest/src/main/java/com/vaadin/tests/data/bean/Country.java b/uitest/src/main/java/com/vaadin/tests/data/bean/Country.java index afdf8dcfa1..159333212f 100644 --- a/uitest/src/main/java/com/vaadin/tests/data/bean/Country.java +++ b/uitest/src/main/java/com/vaadin/tests/data/bean/Country.java @@ -2,8 +2,8 @@ package com.vaadin.tests.data.bean; public enum Country { - FINLAND("Finland"), SWEDEN("Sweden"), USA("USA"), RUSSIA("Russia"), NETHERLANDS( - "Netherlands"), SOUTH_AFRICA("South Africa"); + FINLAND("Finland"), SWEDEN("Sweden"), USA("USA"), RUSSIA( + "Russia"), NETHERLANDS("Netherlands"), SOUTH_AFRICA("South Africa"); private String name; diff --git a/uitest/src/main/java/com/vaadin/tests/data/bean/Person.java b/uitest/src/main/java/com/vaadin/tests/data/bean/Person.java index f7bad31d0e..00d28a1cd8 100644 --- a/uitest/src/main/java/com/vaadin/tests/data/bean/Person.java +++ b/uitest/src/main/java/com/vaadin/tests/data/bean/Person.java @@ -136,8 +136,8 @@ public class Person { } public static Person createTestPerson2() { - return new Person("Maya", "Dinkelstein", "maya@foo.bar", 18, - Sex.FEMALE, new Address("Red street", 12, "Amsterdam", + return new Person("Maya", "Dinkelstein", "maya@foo.bar", 18, Sex.FEMALE, + new Address("Red street", 12, "Amsterdam", Country.NETHERLANDS)); } } diff --git a/uitest/src/main/java/com/vaadin/tests/dd/AcceptAnythingWindow.java b/uitest/src/main/java/com/vaadin/tests/dd/AcceptAnythingWindow.java index 5d57de388c..c978455cd7 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/AcceptAnythingWindow.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/AcceptAnythingWindow.java @@ -77,8 +77,8 @@ public class AcceptAnythingWindow extends Window { int clientY = eventDetails.getClientY(); try { - layout.getPosition(component).setTopValue( - Float.valueOf(clientY - top)); + layout.getPosition(component) + .setTopValue(Float.valueOf(clientY - top)); layout.getPosition(component).setLeftValue( Float.valueOf(clientX - left)); } catch (Exception e) { diff --git a/uitest/src/main/java/com/vaadin/tests/dd/AcceptFromComponent.java b/uitest/src/main/java/com/vaadin/tests/dd/AcceptFromComponent.java index 99dd069142..b01ea3c163 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/AcceptFromComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/AcceptFromComponent.java @@ -78,8 +78,9 @@ public class AcceptFromComponent extends Window { // Item id Label l = new Label(); l.setSizeUndefined(); - l.setValue("ItemId : " - + ((DataBoundTransferable) ctr).getItemId()); + l.setValue( + "ItemId : " + ((DataBoundTransferable) ctr) + .getItemId()); layout.addComponent(l); component = l; @@ -100,8 +101,8 @@ public class AcceptFromComponent extends Window { int clientY = eventDetails.getClientY(); try { - layout.getPosition(component).setTopValue( - Float.valueOf(clientY - top)); + layout.getPosition(component) + .setTopValue(Float.valueOf(clientY - top)); layout.getPosition(component).setLeftValue( Float.valueOf(clientX - left)); } catch (Exception e) { diff --git a/uitest/src/main/java/com/vaadin/tests/dd/ActiveDragSourceClassName.java b/uitest/src/main/java/com/vaadin/tests/dd/ActiveDragSourceClassName.java index 9ef1b4029b..7f60dacecf 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/ActiveDragSourceClassName.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/ActiveDragSourceClassName.java @@ -94,8 +94,8 @@ public class ActiveDragSourceClassName extends TestBase { } next = componentIterator.next(); } - if (dropTargetData.getData("horizontalLocation").equals( - "LEFT")) { + if (dropTargetData.getData("horizontalLocation") + .equals("LEFT")) { index--; if (index < 0) { index = 0; diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDInterrupt.java b/uitest/src/main/java/com/vaadin/tests/dd/DDInterrupt.java index 1939bbbce5..e377ea4402 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/DDInterrupt.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/DDInterrupt.java @@ -46,7 +46,8 @@ public class DDInterrupt extends AbstractTestUI { DragAndDropWrapper dndLayoutWrapper = new DragAndDropWrapper(layout); addComponent(dndLayoutWrapper); - DragAndDropWrapper labelWrapper = new DragAndDropWrapper(draggableLabel); + DragAndDropWrapper labelWrapper = new DragAndDropWrapper( + draggableLabel); draggableLabel.setSizeUndefined(); labelWrapper.setDragStartMode(DragStartMode.COMPONENT); labelWrapper.setSizeUndefined(); diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest1.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest1.java index 161a9b423e..64778858f2 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest1.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest1.java @@ -46,8 +46,8 @@ public class DDTest1 extends TestBase { pane1.addComponent(label); - Link l = new Link("This is link", new ExternalResource( - "http://www.google.com/")); + Link l = new Link("This is link", + new ExternalResource("http://www.google.com/")); pane1.addComponent(l, "top:100px; left: 20px;"); label = new Label("Bar"); @@ -55,7 +55,8 @@ public class DDTest1 extends TestBase { pane1.addComponent(label); DragDropPane pane2 = new DragDropPane(); - pane2.setCaption("Pane2 (accept needs server side visit, check for \"Bar\")"); + pane2.setCaption( + "Pane2 (accept needs server side visit, check for \"Bar\")"); final AcceptCriterion crit = new ServerSideCriterion() { /** * @@ -139,10 +140,8 @@ public class DDTest1 extends TestBase { Collection<?> itemPropertyIds = item .getItemPropertyIds(); for (Object propId : itemPropertyIds) { - addItem.getItemProperty(propId) - .setValue( - item.getItemProperty(propId) - .getValue()); + addItem.getItemProperty(propId).setValue(item + .getItemProperty(propId).getValue()); } } idx.setParent(childId, itemId); @@ -178,10 +177,8 @@ public class DDTest1 extends TestBase { Collection<?> itemPropertyIds = item .getItemPropertyIds(); for (Object propertyId : itemPropertyIds) { - addedItem.getItemProperty(propertyId) - .setValue( - item.getItemProperty(propertyId) - .getValue()); + addedItem.getItemProperty(propertyId).setValue(item + .getItemProperty(propertyId).getValue()); } copyChildren(source, target, childId); } @@ -249,8 +246,8 @@ public class DDTest1 extends TestBase { main.addComponent(pane3); main.addComponent(t); main.addComponent(ta); - main.addComponent(new Link("Foo", new ExternalResource( - "http://www.itmill.com/"))); + main.addComponent(new Link("Foo", + new ExternalResource("http://www.itmill.com/"))); getLayout().setSizeFull(); addComponent(main); diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java index e9fb2910b0..81fe3a2df1 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java @@ -272,8 +272,8 @@ public class DDTest2 extends TestBase { for (int i = 0; i < 10; i++) { Item addItem = table.addItem("Item" + i); Person p = testData.getIdByIndex(i); - addItem.getItemProperty("Name").setValue( - p.getFirstName() + " " + p.getLastName()); + addItem.getItemProperty("Name") + .setValue(p.getFirstName() + " " + p.getLastName()); addItem.getItemProperty("Weight").setValue(50 + r.nextInt(60)); } diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest4.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest4.java index acd54274da..c2af2cca77 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest4.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest4.java @@ -30,16 +30,14 @@ public class DDTest4 extends TestBase { protected void setup() { UI w = getLayout().getUI(); - TestUtils - .injectCSS( - w, - ".v-table-row-drag-middle .v-table-cell-content {" - + " background-color: inherit ; border-bottom: 1px solid cyan;" - + "}" - + ".v-table-row-drag-middle .v-table-cell-wrapper {" - + " margin-bottom: -1px;" + "}" + "" + TestUtils.injectCSS(w, + ".v-table-row-drag-middle .v-table-cell-content {" + + " background-color: inherit ; border-bottom: 1px solid cyan;" + + "}" + + ".v-table-row-drag-middle .v-table-cell-wrapper {" + + " margin-bottom: -1px;" + "}" + "" - ); + ); // hl.addComponent(tree1); hl.addComponent(table); @@ -86,7 +84,8 @@ public class DDTest4 extends TestBase { IndexedContainer containerDataSource = (IndexedContainer) table .getContainerDataSource(); int newIndex = containerDataSource.indexOfId(itemIdOver) - 1; - if (dropTargetData.getDropLocation() != VerticalDropLocation.TOP) { + if (dropTargetData + .getDropLocation() != VerticalDropLocation.TOP) { newIndex++; } if (newIndex < 0) { @@ -143,8 +142,8 @@ public class DDTest4 extends TestBase { for (int i = 0; i < 10; i++) { Item addItem = table.addItem("Item" + i); Person p = testData.getIdByIndex(i); - addItem.getItemProperty("Name").setValue( - p.getFirstName() + " " + p.getLastName()); + addItem.getItemProperty("Name") + .setValue(p.getFirstName() + " " + p.getLastName()); addItem.getItemProperty("Weight").setValue(50 + r.nextInt(60)); } diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest5.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest5.java index 43342fdc35..0e7fd737d0 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest5.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest5.java @@ -52,14 +52,11 @@ public class DDTest5 extends TestBase { HorizontalSortableCssLayoutWithWrappers verticalSortableCssLayoutWithWrappers = new HorizontalSortableCssLayoutWithWrappers(); w.addWindow(verticalSortableCssLayoutWithWrappers); verticalSortableCssLayoutWithWrappers.setPositionX(200); - verticalSortableCssLayoutWithWrappers.setPositionY(40); /* - * FIXME: - * subwindow - * horizontal - * position does - * not work if - * only x set - */ + verticalSortableCssLayoutWithWrappers + .setPositionY(40); /* + * FIXME: subwindow horizontal position does + * not work if only x set + */ Label l; @@ -81,8 +78,8 @@ public class DDTest5 extends TestBase { cssLayout.setHeight("300px"); dragAndDropWrapper2 = new DragAndDropWrapper(cssLayout); - dragAndDropWrapper2 - .setCaption("Drop here or sort with dd (wrapper(csslayout(n*wrapper(label))))"); + dragAndDropWrapper2.setCaption( + "Drop here or sort with dd (wrapper(csslayout(n*wrapper(label))))"); dh = new DropHandler() { @@ -99,7 +96,8 @@ public class DDTest5 extends TestBase { * here) */ - if (dropEvent.getTransferable() instanceof WrapperTransferable) { + if (dropEvent + .getTransferable() instanceof WrapperTransferable) { WrapperTransferable transferable = (WrapperTransferable) dropEvent .getTransferable(); Component sourceComponent = transferable @@ -148,8 +146,8 @@ public class DDTest5 extends TestBase { } else { // no component, add label with "Text" - String data = (String) dropEvent.getTransferable().getData( - "text/plain"); + String data = (String) dropEvent.getTransferable() + .getData("text/plain"); if (data == null || "".equals(data)) { data = "-- no Text --"; } diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java index 2122e8e982..e2705aecba 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java @@ -110,11 +110,13 @@ public class DDTest6 extends TestBase { TreeTargetDetails dropTargetData = (TreeTargetDetails) dropEvent .getTargetDetails(); folder = (Folder) dropTargetData.getItemIdInto(); - if (dropEvent.getTransferable() instanceof DataBoundTransferable) { + if (dropEvent + .getTransferable() instanceof DataBoundTransferable) { DataBoundTransferable transferable = (DataBoundTransferable) dropEvent .getTransferable(); file = (File) transferable.getItemId(); - } else if (dropEvent.getTransferable().getSourceComponent() instanceof FileIcon) { + } else if (dropEvent.getTransferable() + .getSourceComponent() instanceof FileIcon) { FileIcon draggedIcon = (FileIcon) dropEvent .getTransferable().getSourceComponent(); file = draggedIcon.file; @@ -131,7 +133,8 @@ public class DDTest6 extends TestBase { private Action[] actions = new Action[] { new Action("Remove") }; @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { ContainerHierarchicalWrapper containerDataSource = (ContainerHierarchicalWrapper) tree1 .getContainerDataSource(); containerDataSource.removeItemRecursively(target); @@ -163,15 +166,12 @@ public class DDTest6 extends TestBase { getLayout().setSizeFull(); getLayout().addComponent(sp); - TestUtils - .injectCSS( - getLayout().getUI(), - "" - + ".v-tree .v-icon {height:16px;} " - + ".v-tree-node-caption-drag-top {/*border-top: none;*/} " - + ".v-tree-node-caption-drag-bottom {border-bottom: none ;} " - + ".v-tree-node-caption-drag-center {background-color: transparent;}" - + ".v-tree-node-caption-dragfolder { background-color: cyan;} "); + TestUtils.injectCSS(getLayout().getUI(), "" + + ".v-tree .v-icon {height:16px;} " + + ".v-tree-node-caption-drag-top {/*border-top: none;*/} " + + ".v-tree-node-caption-drag-bottom {border-bottom: none ;} " + + ".v-tree-node-caption-drag-center {background-color: transparent;}" + + ".v-tree-node-caption-dragfolder { background-color: cyan;} "); } @@ -256,7 +256,8 @@ public class DDTest6 extends TestBase { private void openFile(File file) { // ATM supports only images. if (file.getType().equals("image/png")) { - Embedded embedded = new Embedded(file.getName(), file.getResource()); + Embedded embedded = new Embedded(file.getName(), + file.getResource()); VerticalLayout layout = new VerticalLayout(); layout.setMargin(true); Window w = new Window(file.getName(), layout); @@ -331,8 +332,9 @@ public class DDTest6 extends TestBase { @SuppressWarnings("static-access") void reload() { - Collection<?> children = folder == null ? DDTest6.get().tree1 - .rootItemIds() : DDTest6.get().tree1.getChildren(folder); + Collection<?> children = folder == null + ? DDTest6.get().tree1.rootItemIds() + : DDTest6.get().tree1.getChildren(folder); if (children == null) { l.removeAllComponents(); return; @@ -370,7 +372,8 @@ public class DDTest6 extends TestBase { @SuppressWarnings("static-access") public void drop(DragAndDropEvent dropEvent) { - if (dropEvent.getTransferable().getSourceComponent() instanceof FileIcon) { + if (dropEvent.getTransferable() + .getSourceComponent() instanceof FileIcon) { // update the position DragAndDropWrapper.WrapperTransferable transferable = (WrapperTransferable) dropEvent @@ -389,12 +392,14 @@ public class DDTest6 extends TestBase { int deltaY = mouseEvent.getClientY() - mouseDownEvent.getClientY(); - ComponentPosition position = l.getPosition(transferable - .getSourceComponent()); + ComponentPosition position = l + .getPosition(transferable.getSourceComponent()); position.setTop(position.getTopValue() + deltaY, UNITS_PIXELS); - position.setLeft(position.getLeftValue() + deltaX, UNITS_PIXELS); + position.setLeft(position.getLeftValue() + deltaX, + UNITS_PIXELS); - } else if (dropEvent.getTransferable().getSourceComponent() == tree1) { + } else if (dropEvent.getTransferable() + .getSourceComponent() == tree1) { // dragged something from tree to the folder shown @@ -425,7 +430,8 @@ public class DDTest6 extends TestBase { } @Override - public void onProgress(StreamingProgressEvent event) { + public void onProgress( + StreamingProgressEvent event) { } @Override @@ -536,7 +542,8 @@ public class DDTest6 extends TestBase { public void drop(DragAndDropEvent dropEvent) { File f = null; - if (dropEvent.getTransferable().getSourceComponent() instanceof FileIcon) { + if (dropEvent.getTransferable() + .getSourceComponent() instanceof FileIcon) { FileIcon new_name = (FileIcon) dropEvent .getTransferable().getSourceComponent(); f = new_name.file; diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest7.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest7.java index 3c819ce15c..32082d2fe9 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest7.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest7.java @@ -31,22 +31,18 @@ public class DDTest7 extends TestBase { protected void setup() { UI w = getLayout().getUI(); - TestUtils - .injectCSS( - w, - ".v-table-row-drag-middle .v-table-cell-content {" - + " background-color: inherit ; border-bottom: 1px solid cyan;" - + "}" - + ".v-table-row-drag-middle .v-table-cell-wrapper {" - + " margin-bottom: -1px;" - + "}" - + "" - // always show the drop hint below - + ".v-table-row-drag-top .v-table-cell-content {" - + "border-top: 0; margin-top:0;border-bottom:1px solid cyan;" - + " margin-bottom: -1px;" + "}" + "" - - ); + TestUtils.injectCSS(w, + ".v-table-row-drag-middle .v-table-cell-content {" + + " background-color: inherit ; border-bottom: 1px solid cyan;" + + "}" + + ".v-table-row-drag-middle .v-table-cell-wrapper {" + + " margin-bottom: -1px;" + "}" + "" + // always show the drop hint below + + ".v-table-row-drag-top .v-table-cell-content {" + + "border-top: 0; margin-top:0;border-bottom:1px solid cyan;" + + " margin-bottom: -1px;" + "}" + "" + + ); // hl.addComponent(tree1); hl.addComponent(table); @@ -171,8 +167,8 @@ public class DDTest7 extends TestBase { for (int i = 0; i < 40; i++) { Item addItem = table.addItem("Item" + i); Person p = testData.getIdByIndex(i); - addItem.getItemProperty("Name").setValue( - p.getFirstName() + " " + p.getLastName()); + addItem.getItemProperty("Name") + .setValue(p.getFirstName() + " " + p.getLastName()); addItem.getItemProperty("Weight").setValue(50 + r.nextInt(60)); } diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java index beaae4175e..af45a26cbf 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java @@ -76,10 +76,8 @@ public class DDTest8 extends AbstractTestUI { Collection<?> itemPropertyIds = item .getItemPropertyIds(); for (Object propId : itemPropertyIds) { - addItem.getItemProperty(propId) - .setValue( - item.getItemProperty(propId) - .getValue()); + addItem.getItemProperty(propId).setValue(item + .getItemProperty(propId).getValue()); } } idx.setParent(childId, itemId); @@ -116,10 +114,8 @@ public class DDTest8 extends AbstractTestUI { Collection<?> itemPropertyIds = item .getItemPropertyIds(); for (Object propertyId : itemPropertyIds) { - addedItem.getItemProperty(propertyId) - .setValue( - item.getItemProperty(propertyId) - .getValue()); + addedItem.getItemProperty(propertyId).setValue(item + .getItemProperty(propertyId).getValue()); } copyChildren(source, target, childId); } @@ -166,8 +162,9 @@ public class DDTest8 extends AbstractTestUI { @Override public AcceptCriterion getAcceptCriterion() { - return new Or(new AbstractSelect.TargetItemIs(tree, "Foo", - "Bar"), new AbstractSelect.AcceptItem(tree, "Foo"), + return new Or( + new AbstractSelect.TargetItemIs(tree, "Foo", "Bar"), + new AbstractSelect.AcceptItem(tree, "Foo"), tree.new TargetInSubtree("Bar5") // ); } diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DragAndDropFiles.java b/uitest/src/main/java/com/vaadin/tests/dd/DragAndDropFiles.java index 4ecabee617..384a02b87b 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/DragAndDropFiles.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/DragAndDropFiles.java @@ -51,11 +51,9 @@ public class DragAndDropFiles extends TestBase { Html5File file = files[i]; // Max 1 MB files are uploaded if (file.getFileSize() > 1024 * 1024) { - getMainWindow() - .showNotification( - "File " - + file.getFileName() - + " was too large, not transferred to the server side."); + getMainWindow().showNotification("File " + + file.getFileName() + + " was too large, not transferred to the server side."); continue; } @@ -72,32 +70,33 @@ public class DragAndDropFiles extends TestBase { } @Override - public void onProgress(StreamingProgressEvent event) { - System.err.println("Progress" - + event.getBytesReceived()); + public void onProgress( + StreamingProgressEvent event) { + System.err.println( + "Progress" + event.getBytesReceived()); } @Override public void streamingStarted( StreamingStartEvent event) { - getMainWindow().showNotification( - "Started uploading " + getMainWindow() + .showNotification("Started uploading " + event.getFileName()); } @Override public void streamingFinished( StreamingEndEvent event) { - getMainWindow().showNotification( - "Finished uploading " + getMainWindow() + .showNotification("Finished uploading " + event.getFileName()); } @Override public void streamingFailed( StreamingErrorEvent event) { - getMainWindow().showNotification( - "Failed uploading " + getMainWindow() + .showNotification("Failed uploading " + event.getFileName()); } diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java b/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java index 6296051ee2..2c3d53d99f 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java @@ -85,10 +85,10 @@ public class DragDropPane extends DragAndDropWrapper implements DropHandler { int clientY = eventDetails.getClientY(); try { - root.getPosition(component).setTopValue( - Float.valueOf(clientY - top)); - root.getPosition(component).setLeftValue( - Float.valueOf(clientX - left)); + root.getPosition(component) + .setTopValue(Float.valueOf(clientY - top)); + root.getPosition(component) + .setLeftValue(Float.valueOf(clientX - left)); } catch (Exception e) { } } else { @@ -150,13 +150,16 @@ public class DragDropPane extends DragAndDropWrapper implements DropHandler { } @Override - public void streamingStarted(StreamingStartEvent event) { + public void streamingStarted( + StreamingStartEvent event) { } @Override public void streamingFinished(StreamingEndEvent event) { - l.setValue((new String(byteArrayOutputStream - .toByteArray()).substring(0, 80) + "...")); + l.setValue((new String( + byteArrayOutputStream.toByteArray()) + .substring(0, 80) + + "...")); } @Override diff --git a/uitest/src/main/java/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java b/uitest/src/main/java/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java index fe33bce76b..c4f7c2e743 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java @@ -51,8 +51,9 @@ public class HorizontalLayoutSortableWithWrappers extends Window { } private DropHandler dh = new DropHandler() { - AcceptCriterion crit = new And(new TargetDetailIs("horizontalLocation", - "LEFT"), new Not(SourceIsTarget.get())); + AcceptCriterion crit = new And( + new TargetDetailIs("horizontalLocation", "LEFT"), + new Not(SourceIsTarget.get())); @Override public AcceptCriterion getAcceptCriterion() { @@ -78,8 +79,8 @@ public class HorizontalLayoutSortableWithWrappers extends Window { } next = componentIterator.next(); } - if (dropTargetData.getData("horizontalLocation").equals( - "LEFT")) { + if (dropTargetData.getData("horizontalLocation") + .equals("LEFT")) { index--; if (index < 0) { index = 0; @@ -96,7 +97,8 @@ public class HorizontalLayoutSortableWithWrappers extends Window { }; public HorizontalLayoutSortableWithWrappers() { - setCaption("Horizontally sortable layout via (ddwrappers): Try sorting blocks by dragging them"); + setCaption( + "Horizontally sortable layout via (ddwrappers): Try sorting blocks by dragging them"); DragAndDropWrapper pane = new DragAndDropWrapper(layout); setContent(pane); pane.setSizeFull(); diff --git a/uitest/src/main/java/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java b/uitest/src/main/java/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java index d17c618f59..1d7fb5d273 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java @@ -72,8 +72,8 @@ public class HorizontalSortableCssLayoutWithWrappers extends Window { } next = componentIterator.next(); } - if (dropTargetData.getData("horizontalLocation").equals( - "LEFT")) { + if (dropTargetData.getData("horizontalLocation") + .equals("LEFT")) { index--; if (index < 0) { index = 0; @@ -90,7 +90,8 @@ public class HorizontalSortableCssLayoutWithWrappers extends Window { }; public HorizontalSortableCssLayoutWithWrappers() { - setCaption("Horizontally sortable csslayout via (ddwrappers):Try sorting blocks by draggin them"); + setCaption( + "Horizontally sortable csslayout via (ddwrappers):Try sorting blocks by draggin them"); DragAndDropWrapper pane = new DragAndDropWrapper(cssLayout); setContent(pane); pane.setSizeFull(); diff --git a/uitest/src/main/java/com/vaadin/tests/dd/MyDragSourceConnector.java b/uitest/src/main/java/com/vaadin/tests/dd/MyDragSourceConnector.java index 66179692b4..6f37316a78 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/MyDragSourceConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/MyDragSourceConnector.java @@ -23,8 +23,8 @@ import com.vaadin.shared.ui.Connect; import com.vaadin.tests.dd.CustomDDImplementation.MyDragSource; @Connect(MyDragSource.class) -public class MyDragSourceConnector extends AbstractComponentConnector implements - Paintable { +public class MyDragSourceConnector extends AbstractComponentConnector + implements Paintable { @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { diff --git a/uitest/src/main/java/com/vaadin/tests/dd/MyDropTargetConnector.java b/uitest/src/main/java/com/vaadin/tests/dd/MyDropTargetConnector.java index 5bbb397502..3307c0ba7b 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/MyDropTargetConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/MyDropTargetConnector.java @@ -23,8 +23,8 @@ import com.vaadin.shared.ui.Connect; import com.vaadin.tests.dd.CustomDDImplementation.MyDropTarget; @Connect(MyDropTarget.class) -public class MyDropTargetConnector extends AbstractComponentConnector implements - Paintable { +public class MyDropTargetConnector extends AbstractComponentConnector + implements Paintable { @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { diff --git a/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSource.java b/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSource.java index 020a6b56c5..ba30c32155 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSource.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSource.java @@ -35,8 +35,8 @@ public class NotPaintedAcceptSource extends TestBase { public void drop(DragAndDropEvent event) { TableTransferable transferable = (TableTransferable) event .getTransferable(); - Item item = transferable.getSourceComponent().getItem( - transferable.getItemId()); + Item item = transferable.getSourceComponent() + .getItem(transferable.getItemId()); Object value = item.getItemProperty("value").getValue(); AbstractSelectTargetDetails targetDetails = (AbstractSelectTargetDetails) event .getTargetDetails(); @@ -44,8 +44,8 @@ public class NotPaintedAcceptSource extends TestBase { Object addItemAfter = target.addItemAfter(targetItemId); target.getItem(addItemAfter).getItemProperty("value") .setValue(value); - transferable.getSourceComponent().removeItem( - transferable.getItemId()); + transferable.getSourceComponent() + .removeItem(transferable.getItemId()); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java b/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java index e19bbaf2c5..974e10eb19 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java @@ -33,8 +33,8 @@ public class NotPaintedAcceptSourceInTabSheet extends TestBase { public void drop(DragAndDropEvent event) { TableTransferable transferable = (TableTransferable) event .getTransferable(); - Item item = transferable.getSourceComponent().getItem( - transferable.getItemId()); + Item item = transferable.getSourceComponent() + .getItem(transferable.getItemId()); Object value = item.getItemProperty("value").getValue(); AbstractSelectTargetDetails targetDetails = (AbstractSelectTargetDetails) event .getTargetDetails(); @@ -42,8 +42,8 @@ public class NotPaintedAcceptSourceInTabSheet extends TestBase { Object addItemAfter = target.addItemAfter(targetItemId); target.getItem(addItemAfter).getItemProperty("value") .setValue(value); - transferable.getSourceComponent().removeItem( - transferable.getItemId()); + transferable.getSourceComponent() + .removeItem(transferable.getItemId()); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/dd/StartHtml5Drag.java b/uitest/src/main/java/com/vaadin/tests/dd/StartHtml5Drag.java index 609b2fe4fc..be940f64d4 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/StartHtml5Drag.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/StartHtml5Drag.java @@ -17,14 +17,14 @@ public class StartHtml5Drag extends TestBase { @Override protected void setup() { - DragAndDropWrapper dragStart = new DragAndDropWrapper(new Label( - "Drag me")); + DragAndDropWrapper dragStart = new DragAndDropWrapper( + new Label("Drag me")); dragStart.setDragStartMode(DragStartMode.HTML5); dragStart.setHTML5DataFlavor("Text", "HTML5!"); addComponent(dragStart); - DragAndDropWrapper dropTarget = new DragAndDropWrapper(new Label( - "over here")); + DragAndDropWrapper dropTarget = new DragAndDropWrapper( + new Label("over here")); dropTarget.setDropHandler(new DropHandler() { @Override @@ -34,12 +34,9 @@ public class StartHtml5Drag extends TestBase { @Override public void drop(DragAndDropEvent event) { - getWindows() - .iterator() - .next() - .showNotification( - ((WrapperTransferable) event.getTransferable()) - .getText()); + getWindows().iterator().next().showNotification( + ((WrapperTransferable) event.getTransferable()) + .getText()); } }); addComponent(dropTarget); diff --git a/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java b/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java index b44f8c5a99..9c172dd6ee 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java @@ -35,7 +35,8 @@ public class TreeDragStart extends TestBase { CheckBox checkBox = new CheckBox("Enabled"); checkBox.setImmediate(true); checkBox.setValue(true); - checkBox.addValueChangeListener(event -> tree.setEnabled(!tree.isEnabled())); + checkBox.addValueChangeListener( + event -> tree.setEnabled(!tree.isEnabled())); addComponent(checkBox); checkBox = new CheckBox("Drag start"); checkBox.setImmediate(true); @@ -71,8 +72,8 @@ public class TreeDragStart extends TestBase { public AcceptCriterion getAcceptCriterion() { // Accept drops in the middle of container items // and below and above all items. - return new Or(Tree.TargetItemAllowsChildren.get(), new Not( - VerticalLocationIs.MIDDLE)); + return new Or(Tree.TargetItemAllowsChildren.get(), + new Not(VerticalLocationIs.MIDDLE)); } @Override @@ -249,20 +250,17 @@ public class TreeDragStart extends TestBase { new InventoryObject("+5 Quarterstaff (blessed)", 3.5, false), new InventoryObject("+3 Elven Dagger (blessed)", 0.2, false), new InventoryObject("+5 Helmet (greased)", 1.5, false), - new Object[] { - new InventoryObject("Sack", 0.2, true), + new Object[] { new InventoryObject("Sack", 0.2, true), new InventoryObject("Pick-Axe", 2.5, false), new InventoryObject("Lock Pick", 0.1, false), new InventoryObject("Tinning Kit", 0.5, false), new InventoryObject("Potion of Healing (blessed)", 0.7, false), }, - new Object[] { - new InventoryObject("Bag of Holding", 0.1, true), + new Object[] { new InventoryObject("Bag of Holding", 0.1, true), new InventoryObject("Magic Marker", 0.05, false), new InventoryObject("Can of Grease (blessed)", 0.5, false), }, - new Object[] { - new InventoryObject("Chest", 10.0, true), + new Object[] { new InventoryObject("Chest", 10.0, true), new InventoryObject("Scroll of Identify", 0.1, false), new InventoryObject("Scroll of Genocide", 0.1, false), new InventoryObject("Towel", 0.3, false), @@ -298,8 +296,8 @@ public class TreeDragStart extends TestBase { put(sub, item, container); } - inventoryStore - .put(item.getBean().getName(), item.getBean()); + inventoryStore.put(item.getBean().getName(), + item.getBean()); } } }.put(inventory, null, container); diff --git a/uitest/src/main/java/com/vaadin/tests/dd/VMyDragSource.java b/uitest/src/main/java/com/vaadin/tests/dd/VMyDragSource.java index 8cca6d6459..41f25bf02b 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/VMyDragSource.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/VMyDragSource.java @@ -17,8 +17,8 @@ import com.vaadin.client.ui.dd.VTransferable; /** * Example code to implement Component that has something to drag. */ -public class VMyDragSource extends Composite implements MouseDownHandler, - MouseMoveHandler, MouseOutHandler { +public class VMyDragSource extends Composite + implements MouseDownHandler, MouseMoveHandler, MouseOutHandler { private boolean mouseDown; private MouseDownEvent mDownEvent; diff --git a/uitest/src/main/java/com/vaadin/tests/dd/VMyDropTarget.java b/uitest/src/main/java/com/vaadin/tests/dd/VMyDropTarget.java index 58bd326524..ace53d0421 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/VMyDropTarget.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/VMyDropTarget.java @@ -7,8 +7,8 @@ import com.vaadin.client.ui.dd.VDragEvent; import com.vaadin.client.ui.dd.VDropHandler; import com.vaadin.client.ui.dd.VHasDropHandler; -public class VMyDropTarget extends Composite implements VHasDropHandler, - VDropHandler { +public class VMyDropTarget extends Composite + implements VHasDropHandler, VDropHandler { ApplicationConnection client; diff --git a/uitest/src/main/java/com/vaadin/tests/declarative/DeclarativeEditor.java b/uitest/src/main/java/com/vaadin/tests/declarative/DeclarativeEditor.java index d62f71b513..9d422a8a8f 100644 --- a/uitest/src/main/java/com/vaadin/tests/declarative/DeclarativeEditor.java +++ b/uitest/src/main/java/com/vaadin/tests/declarative/DeclarativeEditor.java @@ -54,8 +54,8 @@ public class DeclarativeEditor extends UI { editor = new TextArea(); editor.setSizeFull(); try { - editor.setValue(IOUtils.toString(getClass().getResourceAsStream( - "DeclarativeEditorInitial.html"))); + editor.setValue(IOUtils.toString(getClass() + .getResourceAsStream("DeclarativeEditorInitial.html"))); } catch (ReadOnlyException e) { e.printStackTrace(); } catch (IOException e) { diff --git a/uitest/src/main/java/com/vaadin/tests/errorhandler/ErrorHandlers.java b/uitest/src/main/java/com/vaadin/tests/errorhandler/ErrorHandlers.java index a123af0f7d..1d22a98ae2 100644 --- a/uitest/src/main/java/com/vaadin/tests/errorhandler/ErrorHandlers.java +++ b/uitest/src/main/java/com/vaadin/tests/errorhandler/ErrorHandlers.java @@ -32,8 +32,8 @@ public class ErrorHandlers extends AbstractTestUI { protected void setup(VaadinRequest request) { addComponent(runtimeExceptionOnClick(new Button("Standard button"))); addComponent(npeOnClick(new Button("Standard button with NPE"))); - Button customErrorButton = notificationErrorHandler(new Button( - "Button with notification error handler")); + Button customErrorButton = notificationErrorHandler( + new Button("Button with notification error handler")); addComponent(runtimeExceptionOnClick(customErrorButton)); final VerticalLayout layoutWithErrorHandler = new VerticalLayout( @@ -42,15 +42,14 @@ public class ErrorHandlers extends AbstractTestUI { @Override public void error(com.vaadin.server.ErrorEvent event) { - layoutWithErrorHandler.addComponent(new Label("Layout error: " - + getErrorMessage(event))); + layoutWithErrorHandler.addComponent( + new Label("Layout error: " + getErrorMessage(event))); } }; layoutWithErrorHandler.setErrorHandler(e); - layoutWithErrorHandler - .addComponent(notificationErrorHandler(npeOnClick(new Button( - "Error handler on button and parent")))); + layoutWithErrorHandler.addComponent(notificationErrorHandler( + npeOnClick(new Button("Error handler on button and parent")))); addComponent(layoutWithErrorHandler); } @@ -59,7 +58,8 @@ public class ErrorHandlers extends AbstractTestUI { return button; } - protected static String getErrorMessage(com.vaadin.server.ErrorEvent event) { + protected static String getErrorMessage( + com.vaadin.server.ErrorEvent event) { Component c = DefaultErrorHandler.findAbstractComponent(event); String errorMsg = "Error: '" + getMessage(event) + "' in "; errorMsg += c.getClass().getSimpleName() + " with caption '" diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOS.java b/uitest/src/main/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOS.java index d1b2e12e42..8825e36dd5 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOS.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOS.java @@ -18,8 +18,8 @@ public class IframeIsOpenedInNonIOS extends AbstractTestUI { protected void setup(VaadinRequest request) { final Label errorLabel = new Label("No error"); Button button = new Button("Download"); - FileDownloader downloader = new FileDownloader(new StreamResource( - new StreamResource.StreamSource() { + FileDownloader downloader = new FileDownloader( + new StreamResource(new StreamResource.StreamSource() { @Override public InputStream getStream() { return createSomeFile(); diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveUI.java b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveUI.java index f534215e18..73dba06fe3 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveUI.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveUI.java @@ -51,7 +51,8 @@ public class ResponsiveUI extends AbstractTestUI { + "span the entire width of the container.</p><p>This label will " + "adapt its font size and line height for different widths.</p>" + "<p><a href=\"http://vaadin.com/download\">Download " - + "Vaadin</a></p>", ContentMode.HTML); + + "Vaadin</a></p>", + ContentMode.HTML); description.addStyleName("description"); split.addComponent(description); diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayout.java b/uitest/src/main/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayout.java index f3df1a1176..1fc48b42ad 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayout.java @@ -32,9 +32,8 @@ public class SetThemeAndResponsiveLayout extends AbstractTestUI { responsiveLayout.addStyleName("width-and-height"); responsiveLayout.setSizeFull(); setContent(responsiveLayout); - responsiveLayout - .addComponent(new Label( - "First set the theme using the button and then resize the browser window in both dimensions to see the background color change.")); + responsiveLayout.addComponent(new Label( + "First set the theme using the button and then resize the browser window in both dimensions to see the background color change.")); Button setThemeButton = new Button("Set theme"); setThemeButton.addClickListener(new Button.ClickListener() { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java b/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java index 6f14fb301c..c3e08b2991 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java @@ -32,8 +32,8 @@ import elemental.json.JsonArray; public class SimpleJavaScriptExtensionTest extends AbstractTestUI { - public static class SimpleJavaScriptExtensionState extends - JavaScriptExtensionState { + public static class SimpleJavaScriptExtensionState + extends JavaScriptExtensionState { private String prefix; public void setPrefix(String prefix) { @@ -45,20 +45,20 @@ public class SimpleJavaScriptExtensionTest extends AbstractTestUI { } } - public static interface SimpleJavaScriptExtensionClientRpc extends - ClientRpc { + public static interface SimpleJavaScriptExtensionClientRpc + extends ClientRpc { public void greet(String message); } - public static interface SimpleJavaScriptExtensionServerRpc extends - ServerRpc { + public static interface SimpleJavaScriptExtensionServerRpc + extends ServerRpc { public void greet(String message); } @JavaScript("/statictestfiles/jsextension.js") @StyleSheet("/VAADIN/external1.css") - public static class SimpleJavascriptExtension extends - AbstractJavaScriptExtension { + public static class SimpleJavascriptExtension + extends AbstractJavaScriptExtension { public SimpleJavascriptExtension() { registerRpc(new SimpleJavaScriptExtensionServerRpc() { @@ -70,8 +70,8 @@ public class SimpleJavaScriptExtensionTest extends AbstractTestUI { addFunction("greetToServer", new JavaScriptFunction() { @Override public void call(JsonArray arguments) { - Notification.show(getState().getPrefix() - + arguments.getString(0)); + Notification.show( + getState().getPrefix() + arguments.getString(0)); } }); } @@ -100,8 +100,8 @@ public class SimpleJavaScriptExtensionTest extends AbstractTestUI { final SimpleJavascriptExtension simpleJavascriptExtension = new SimpleJavascriptExtension(); simpleJavascriptExtension.setPrefix("Prefix: "); addExtension(simpleJavascriptExtension); - addComponent(new Button("Send rpc greeting", - new Button.ClickListener() { + addComponent( + new Button("Send rpc greeting", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { simpleJavascriptExtension.greetRpc("Rpc greeting"); diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java index cf689bb0d9..4d4c00d8ce 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java @@ -115,11 +115,13 @@ public abstract class AbstractBasicCrud extends AbstractTestUIWithLog { private LegacyTextField address_streetAddress = new LegacyTextField( "Street address"); @PropertyId("address.postalCode") - private LegacyTextField address_postalCode = new LegacyTextField("Postal code"); + private LegacyTextField address_postalCode = new LegacyTextField( + "Postal code"); @PropertyId("address.city") private LegacyTextField address_city = new LegacyTextField("City"); @PropertyId("address.country") - private LegacyTextField address_country = new LegacyTextField("Country"); + private LegacyTextField address_country = new LegacyTextField( + "Country"); public CustomForm() { fieldGroup.bindMemberFields(this); diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGrid.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGrid.java index d7f66b0cd9..846a7d121f 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGrid.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGrid.java @@ -39,8 +39,8 @@ public class BasicCrudGrid extends AbstractBasicCrud { @Override public void select(SelectionEvent event) { - Item item = grid.getContainerDataSource().getItem( - grid.getSelectedRow()); + Item item = grid.getContainerDataSource() + .getItem(grid.getSelectedRow()); form.edit((BeanItem<ComplexPerson>) item); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudTable.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudTable.java index ad54cd55ba..dd9c06b20d 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudTable.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudTable.java @@ -38,8 +38,8 @@ public class BasicCrudTable extends AbstractBasicCrud { table.addValueChangeListener(new ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - form.edit((BeanItem<ComplexPerson>) table.getItem(table - .getValue())); + form.edit((BeanItem<ComplexPerson>) table + .getItem(table.getValue())); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexPerson.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexPerson.java index bb4fe89575..3570448964 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexPerson.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexPerson.java @@ -96,8 +96,8 @@ public class ComplexPerson { cp.lastName = TestDataGenerator.getLastName(r); cp.setAlive(r.nextBoolean()); cp.setBirthDate(TestDataGenerator.getBirthDate(r)); - cp.setAge((int) ((new Date(2014 - 1900, 1, 1).getTime() - cp - .getBirthDate().getTime()) / 1000 / 3600 / 24 / 365)); + cp.setAge((int) ((new Date(2014 - 1900, 1, 1).getTime() + - cp.getBirthDate().getTime()) / 1000 / 3600 / 24 / 365)); cp.setSalary(TestDataGenerator.getSalary(r)); cp.setAddress(ComplexAddress.create(r)); cp.setGender(TestDataGenerator.getEnum(Gender.class, r)); diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java index c8f595f1f2..96d5c120e4 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java @@ -82,11 +82,10 @@ public class FieldBinderWithBeanValidation extends TestBase { sex.setPageLength(0); PersonWithBeanValidationAnnotations p = new PersonWithBeanValidationAnnotations( - "John", "Doe", "john@doe.com", 64, Sex.MALE, new Address( - "John street", 11223, "John's town", Country.USA)); - fieldGroup - .setItemDataSource(new BeanItem<PersonWithBeanValidationAnnotations>( - p)); + "John", "Doe", "john@doe.com", 64, Sex.MALE, + new Address("John street", 11223, "John's town", Country.USA)); + fieldGroup.setItemDataSource( + new BeanItem<PersonWithBeanValidationAnnotations>(p)); } public static PersonWithBeanValidationAnnotations getPerson( diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java index ddc961eaf7..87bc806a06 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java @@ -28,8 +28,8 @@ public class FormBuilderWithNestedProperties extends TestBase { addComponent(streetAddress); fieldGroup.setItemDataSource(new BeanItem<Person>(new Person("Who", - "me?", "email", 1, Sex.MALE, new Address("street name", 202020, - "City", Country.FINLAND)))); + "me?", "email", 1, Sex.MALE, + new Address("street name", 202020, "City", Country.FINLAND)))); } @Override diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java index 710e52316f..097bde900f 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java @@ -21,7 +21,8 @@ public class FormWithNestedProperties extends AbstractBeanFieldGroupTest { private LegacyTextField age = new LegacyTextField("Age"); @PropertyId("address.streetAddress") - private LegacyTextField streetAddress = new LegacyTextField("Street address"); + private LegacyTextField streetAddress = new LegacyTextField( + "Street address"); private NativeSelect country; private CheckBox deceased = new CheckBox("Deceased"); @@ -45,10 +46,9 @@ public class FormWithNestedProperties extends AbstractBeanFieldGroupTest { addComponent(getDiscardButton()); addComponent(getShowBeanButton()); - getFieldBinder().setItemDataSource( - new Person("First", "Last", "Email", 52, Sex.FEMALE, - new Address("street address", 01234, "City", - Country.FINLAND))); + getFieldBinder().setItemDataSource(new Person("First", "Last", "Email", + 52, Sex.FEMALE, + new Address("street address", 01234, "City", Country.FINLAND))); } diff --git a/uitest/src/main/java/com/vaadin/tests/integration/FlagSeResource.java b/uitest/src/main/java/com/vaadin/tests/integration/FlagSeResource.java index 6c2fcdc2d4..dc214448a8 100644 --- a/uitest/src/main/java/com/vaadin/tests/integration/FlagSeResource.java +++ b/uitest/src/main/java/com/vaadin/tests/integration/FlagSeResource.java @@ -6,11 +6,9 @@ public class FlagSeResource extends ClassResource { public FlagSeResource() { super("/" - + FlagSeResource.class - .getName() - .replace('.', '/') - .replaceAll(FlagSeResource.class.getSimpleName() + "$", - "") + "se.gif"); + + FlagSeResource.class.getName().replace('.', '/').replaceAll( + FlagSeResource.class.getSimpleName() + "$", "") + + "se.gif"); } } diff --git a/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java b/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java index 40d20433b1..0c7e26861d 100644 --- a/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java +++ b/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java @@ -84,7 +84,8 @@ public class JSR286Portlet extends UI { Upload upload = new Upload("Upload a file", new Receiver() { @Override - public OutputStream receiveUpload(String filename, String mimeType) { + public OutputStream receiveUpload(String filename, + String mimeType) { return new ByteArrayOutputStream(); } }); @@ -114,18 +115,20 @@ public class JSR286Portlet extends UI { String censoredUserAgent = getPage().getWebBrowser() .getBrowserApplication(); - if (censoredUserAgent != null && censoredUserAgent.contains("Chrome/")) { + if (censoredUserAgent != null + && censoredUserAgent.contains("Chrome/")) { // Censor version info as it tends to change censoredUserAgent = censoredUserAgent.replaceAll("Chrome/[^ ]* ", "Chrome/xyz "); } userAgent.setValue(censoredUserAgent); screenWidth.setValue(String.valueOf(getPage().getBrowserWindowWidth())); - screenHeight.setValue(String - .valueOf(getPage().getBrowserWindowHeight())); + screenHeight + .setValue(String.valueOf(getPage().getBrowserWindowHeight())); boolean inViewMode = (request.getPortletMode() == PortletMode.VIEW); - boolean inNormalState = (request.getWindowState() == WindowState.NORMAL); + boolean inNormalState = (request + .getWindowState() == WindowState.NORMAL); // Portlet up-and-running, enable stuff portletEdit.setEnabled(true); portletMax.setEnabled(true); @@ -134,10 +137,10 @@ public class JSR286Portlet extends UI { tf.setEnabled(!inViewMode); // Show notification about current mode and state - getPage().showNotification( - new Notification("Portlet status", "Mode: " - + request.getPortletMode() + " State: " - + request.getWindowState(), Type.WARNING_MESSAGE)); + getPage().showNotification(new Notification( + "Portlet status", "Mode: " + request.getPortletMode() + + " State: " + request.getWindowState(), + Type.WARNING_MESSAGE)); // Display current user info Map<?, ?> uinfo = (Map<?, ?>) request @@ -195,8 +198,8 @@ public class JSR286Portlet extends UI { if (someAction == null) { url = getSession().generateActionURL("someAction"); try { - someAction = new Link("An action", new ExternalResource( - url.toString())); + someAction = new Link("An action", + new ExternalResource(url.toString())); main.addComponent(someAction); } catch (Exception e) { // Oops @@ -211,9 +214,9 @@ public class JSR286Portlet extends UI { @Override public void handleActionRequest(ActionRequest request, ActionResponse response, UI window) { - main.addComponent(new Label("Action '" - + request.getParameter("javax.portlet.action") - + "' received")); + main.addComponent(new Label( + "Action '" + request.getParameter("javax.portlet.action") + + "' received")); } @Override diff --git a/uitest/src/main/java/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java b/uitest/src/main/java/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java index c8fa448172..0ffd8977ec 100644 --- a/uitest/src/main/java/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java +++ b/uitest/src/main/java/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java @@ -11,8 +11,8 @@ import com.vaadin.ui.VerticalLayout; * * See ticket #5521. */ -public class PortletSizeInLiferayFreeformLayoutApplication extends - LegacyApplication { +public class PortletSizeInLiferayFreeformLayoutApplication + extends LegacyApplication { @Override public void init() { LegacyWindow mainWindow = new LegacyWindow("Portlet5521 Application"); diff --git a/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java b/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java index 04d493eef5..f9637b5b76 100644 --- a/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java +++ b/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java @@ -98,14 +98,12 @@ public class ProxyTest extends AbstractTestUI { ServletContextHandler contextHandler = new ServletContextHandler(); server.setHandler(contextHandler); contextHandler.setContextPath("/"); - ServletHolder servletHolder = contextHandler.addServlet( - ProxyServlet.Transparent.class, "/*"); + ServletHolder servletHolder = contextHandler + .addServlet(ProxyServlet.Transparent.class, "/*"); // Configure servlet to forward to the root of the original server - servletHolder.setInitParameter( - "ProxyTo", - "http://" + request.getLocalAddr() + ":" - + request.getLocalPort() + "/"); + servletHolder.setInitParameter("ProxyTo", "http://" + + request.getLocalAddr() + ":" + request.getLocalPort() + "/"); // Configure servlet to strip beginning of paths servletHolder.setInitParameter("Prefix", "/proxypath/"); @@ -125,8 +123,8 @@ public class ProxyTest extends AbstractTestUI { new ExternalResource(linkBase + "embed1"))); linkHolder.addComponent(new Link("Open embed1/ in proxy", new ExternalResource(linkBase + "embed1/"))); - linkHolder.addComponent(new Link("Open Buttons in proxy", - new ExternalResource(linkBase + linkHolder.addComponent( + new Link("Open Buttons in proxy", new ExternalResource(linkBase + "run/com.vaadin.tests.components.button.Buttons"))); } diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java index 7ab1a84765..e823624fe6 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java @@ -228,8 +228,8 @@ public class CaptionsInLayouts extends AbstractTestUI { for (String width : new String[] { "400px", "auto" }) { Object id = layoutSelect.addItem(); Item i = layoutSelect.getItem(id); - i.getItemProperty(CAPTION).setValue( - cls.getSimpleName() + ", " + width); + i.getItemProperty(CAPTION) + .setValue(cls.getSimpleName() + ", " + width); i.getItemProperty(CLASS).setValue(cls); i.getItemProperty(WIDTH).setValue(width); } @@ -243,10 +243,11 @@ public class CaptionsInLayouts extends AbstractTestUI { public void valueChange(ValueChangeEvent event) { Item i = layoutSelect.getItem(event.getProperty().getValue()); - setLayout(getLayout((String) i.getItemProperty(CAPTION) - .getValue(), (Class<? extends Layout>) i - .getItemProperty(CLASS).getValue(), (String) i - .getItemProperty(WIDTH).getValue())); + setLayout(getLayout( + (String) i.getItemProperty(CAPTION).getValue(), + (Class<? extends Layout>) i.getItemProperty(CLASS) + .getValue(), + (String) i.getItemProperty(WIDTH).getValue())); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java index 05895ca233..609e2fc7c6 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java @@ -10,8 +10,8 @@ import com.vaadin.ui.Label; import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class GridLayoutExpandRatioModification extends TestBase implements - ClickListener { +public class GridLayoutExpandRatioModification extends TestBase + implements ClickListener { private boolean isVisible = false; private GridLayout mainLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutInsidePanel.java b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutInsidePanel.java index 524799ab3c..413d225c22 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutInsidePanel.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutInsidePanel.java @@ -23,8 +23,8 @@ public class GridLayoutInsidePanel extends TestBase { { GridLayout gl = new GridLayout(1, 1); gl.setSizeUndefined(); - gl.addComponent(new Label( - "A label which defines the size of the GL")); + gl.addComponent( + new Label("A label which defines the size of the GL")); VerticalLayout pl = new VerticalLayout(); pl.setMargin(true); @@ -39,8 +39,8 @@ public class GridLayoutInsidePanel extends TestBase { { GridLayout gl = new GridLayout(1, 1); gl.setSizeUndefined(); - gl.addComponent(new Label( - "A label which defines the size of the GL")); + gl.addComponent( + new Label("A label which defines the size of the GL")); Panel p = new Panel("Panel 2", gl); gl.setMargin(false); diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java index 9753526a9e..814a3f128f 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java @@ -14,8 +14,9 @@ public class GridLayoutSpanExpansion extends TestBase { heightSpan.setWidth("200px"); heightSpan.addComponent(new Label("1"), 0, 0); heightSpan.addComponent(new Label("2"), 0, 1); - heightSpan.addComponent(new Label( - "This is a somewhat long text that spans over a few lines."), + heightSpan.addComponent( + new Label( + "This is a somewhat long text that spans over a few lines."), 1, 0, 1, 1); heightSpan.setRowExpandRatio(1, 1); addComponent(heightSpan); @@ -23,8 +24,9 @@ public class GridLayoutSpanExpansion extends TestBase { GridLayout widthSpan = new GridLayout(2, 2); widthSpan.setHeight("100px"); widthSpan.setWidth("200px"); - widthSpan.addComponent(new Label( - "This is a somewhat long text that spans over both columns."), + widthSpan.addComponent( + new Label( + "This is a somewhat long text that spans over both columns."), 0, 0, 1, 0); Label label1 = new Label("1"); label1.setSizeUndefined(); diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/HiddenHorizontalLayout.java b/uitest/src/main/java/com/vaadin/tests/layouts/HiddenHorizontalLayout.java index 739779a3e0..ba3716eec8 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/HiddenHorizontalLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/HiddenHorizontalLayout.java @@ -36,12 +36,13 @@ public class HiddenHorizontalLayout extends TestBase { hl.addComponent(new Label("label4")); vl.addComponent(hl); - Label l = new Label("Steps to reproduce with Vaadin 6.0.1:<br/>" - + "1. set browser size smaller than fullscreen<br/>" - + "2. Refresh page with browser<br/>" - + "3. Click \"toggle layout visibility\"<br>" - + "4. Resize browser window to full <br/>" - + "5. Click \"toggle layout visibility\"<br/>", + Label l = new Label( + "Steps to reproduce with Vaadin 6.0.1:<br/>" + + "1. set browser size smaller than fullscreen<br/>" + + "2. Refresh page with browser<br/>" + + "3. Click \"toggle layout visibility\"<br>" + + "4. Resize browser window to full <br/>" + + "5. Click \"toggle layout visibility\"<br/>", ContentMode.HTML); vl.addComponent(l); Button b = new Button("toggle layout visibility", diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java b/uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java index 481033d89b..ac2bab012c 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java @@ -34,8 +34,8 @@ public class LayoutPerformanceTests extends TestBase { AbstractOrderedLayout layout = createOrderedLayout(depth, fullHeight); - layout.addComponent(buildLayout(depth - 1, leafs, leafType, - fullHeight)); + layout.addComponent( + buildLayout(depth - 1, leafs, leafType, fullHeight)); return layout; } }, @@ -52,8 +52,8 @@ public class LayoutPerformanceTests extends TestBase { Component content = leafType.createContent(); content.setSizeUndefined(); layout.addComponent(content); - layout.addComponent(buildLayout(depth - 1, leafs, leafType, - fullHeight)); + layout.addComponent( + buildLayout(depth - 1, leafs, leafType, fullHeight)); layout.setExpandRatio(layout.getComponent(1), 1); return layout; } @@ -68,10 +68,10 @@ public class LayoutPerformanceTests extends TestBase { AbstractOrderedLayout layout = createOrderedLayout(depth, fullHeight); - layout.addComponent(buildLayout(depth - 1, leafs, leafType, - fullHeight)); - layout.addComponent(buildLayout(depth - 1, leafs, leafType, - fullHeight)); + layout.addComponent( + buildLayout(depth - 1, leafs, leafType, fullHeight)); + layout.addComponent( + buildLayout(depth - 1, leafs, leafType, fullHeight)); layout.setExpandRatio(layout.getComponent(0), 1); layout.setExpandRatio(layout.getComponent(1), 2); return layout; @@ -82,8 +82,8 @@ public class LayoutPerformanceTests extends TestBase { protected AbstractOrderedLayout createOrderedLayout(int depth, boolean fullHeight) { - AbstractOrderedLayout layout = (depth % 2) == 0 ? new VerticalLayout() - : new HorizontalLayout(); + AbstractOrderedLayout layout = (depth % 2) == 0 + ? new VerticalLayout() : new HorizontalLayout(); layout.setWidth("100%"); if (fullHeight) { layout.setHeight("100%"); @@ -254,8 +254,9 @@ public class LayoutPerformanceTests extends TestBase { if (component instanceof NativeSelect) { NativeSelect nativeSelect = (NativeSelect) component; nativeSelect.setNullSelectionAllowed(false); - nativeSelect.setValue(new ArrayList<Object>(nativeSelect - .getItemIds()).get(0)); + nativeSelect.setValue( + new ArrayList<Object>(nativeSelect.getItemIds()) + .get(0)); } controls.setComponentAlignment(component, Alignment.BOTTOM_LEFT); } diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java b/uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java index 04d318c62c..22ac9506f0 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java @@ -58,15 +58,16 @@ public class MovingComponentsWhileOldParentInvisible extends TestBase { @SuppressWarnings("unchecked") public void valueChange(ValueChangeEvent event) { HasComponents oldCC = cc; - cc = createComponentContainer((Class<? extends HasComponents>) event - .getProperty().getValue()); + cc = createComponentContainer( + (Class<? extends HasComponents>) event.getProperty() + .getValue()); addToCC(lab); replaceComponent(oldCC, cc); } }); - componentContainerSelect.setValue(componentContainerSelect.getItemIds() - .iterator().next()); + componentContainerSelect.setValue( + componentContainerSelect.getItemIds().iterator().next()); Button but1 = new Button("Move in and out of component container", new Button.ClickListener() { @@ -96,8 +97,8 @@ public class MovingComponentsWhileOldParentInvisible extends TestBase { } else if (cc instanceof SingleComponentContainer) { ((SingleComponentContainer) cc).setContent(lab); } else { - throw new RuntimeException("Don't know how to add to " - + cc.getClass().getName()); + throw new RuntimeException( + "Don't know how to add to " + cc.getClass().getName()); } } diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java b/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java index 6902bf236a..635bda8194 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java @@ -15,10 +15,10 @@ public class MovingInvisibleField extends TestBase { final VerticalLayout layout1 = new VerticalLayout(); final VerticalLayout layout2 = new VerticalLayout(); - final LegacyTextField tfHidden = new LegacyTextField("Hidden text field caption", - "A hidden text field"); - final LegacyTextField tfVisible = new LegacyTextField("Visible text field caption", - "A visible text field"); + final LegacyTextField tfHidden = new LegacyTextField( + "Hidden text field caption", "A hidden text field"); + final LegacyTextField tfVisible = new LegacyTextField( + "Visible text field caption", "A visible text field"); tfHidden.setVisible(false); Button b = new Button("Move hidden textfield to other layout"); b.addListener(new ClickListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java b/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java index 6f869383d7..5329e4191a 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java @@ -50,38 +50,68 @@ public class OrderedLayoutBasics extends TestBase { } private void createUI(Layout layout) { - layout.addComponent(wrapLayout(layout_field_100pct_button_field(new HorizontalLayout()))); - layout.addComponent(wrapLayout(layout_field_100pct_button_field(new VerticalLayout()))); - layout.addComponent(wrapLayout(layout_overfilled(new HorizontalLayout()))); - layout.addComponent(wrapLayout(layout_overfilled(new VerticalLayout()))); - layout.addComponent(wrapLayout(layout_overfilled_dynamic_height(new HorizontalLayout()))); - layout.addComponent(wrapLayout(layout_overfilled_dynamic_height(new VerticalLayout()))); - layout.addComponent(wrapLayout(layout_symmetric_fields(new HorizontalLayout()))); - layout.addComponent(wrapLayout(layout_symmetric_fields(new VerticalLayout()))); - layout.addComponent(wrapLayout(layout_leftAndRight(new HorizontalLayout()))); - layout.addComponent(wrapLayout(layout_leftAndRight(new VerticalLayout()))); - layout.addComponent(wrapLayout(layout_fixed_filled(new HorizontalLayout()))); - layout.addComponent(wrapLayout(layout_fixed_filled(new VerticalLayout()))); + layout.addComponent(wrapLayout( + layout_field_100pct_button_field(new HorizontalLayout()))); + layout.addComponent(wrapLayout( + layout_field_100pct_button_field(new VerticalLayout()))); + layout.addComponent( + wrapLayout(layout_overfilled(new HorizontalLayout()))); + layout.addComponent( + wrapLayout(layout_overfilled(new VerticalLayout()))); + layout.addComponent(wrapLayout( + layout_overfilled_dynamic_height(new HorizontalLayout()))); + layout.addComponent(wrapLayout( + layout_overfilled_dynamic_height(new VerticalLayout()))); + layout.addComponent( + wrapLayout(layout_symmetric_fields(new HorizontalLayout()))); + layout.addComponent( + wrapLayout(layout_symmetric_fields(new VerticalLayout()))); + layout.addComponent( + wrapLayout(layout_leftAndRight(new HorizontalLayout()))); + layout.addComponent( + wrapLayout(layout_leftAndRight(new VerticalLayout()))); + layout.addComponent( + wrapLayout(layout_fixed_filled(new HorizontalLayout()))); + layout.addComponent( + wrapLayout(layout_fixed_filled(new VerticalLayout()))); layout.addComponent(wrapLayout(layout_dynamic(new HorizontalLayout()))); layout.addComponent(wrapLayout(layout_dynamic(new VerticalLayout()))); layout.addComponent(wrapLayout(layout_labels(new HorizontalLayout()))); layout.addComponent(wrapLayout(layout_labels(new VerticalLayout()))); - layout.addComponent(wrapLayout(layout_captions(new HorizontalLayout()))); + layout.addComponent( + wrapLayout(layout_captions(new HorizontalLayout()))); layout.addComponent(wrapLayout(layout_captions(new VerticalLayout()))); - layout.addComponent(wrapLayout(layout_captions_fixed_size(new HorizontalLayout()))); - layout.addComponent(wrapLayout(layout_captions_fixed_size(new VerticalLayout()))); - layout.addComponent(wrapLayout(layout_captions_fixed_size_and_relative_size(new HorizontalLayout()))); - layout.addComponent(wrapLayout(layout_captions_fixed_size_and_relative_size(new VerticalLayout()))); - layout.addComponent(wrapLayout(layout_captions_fixed_size_and_fixed_size(new HorizontalLayout()))); - layout.addComponent(wrapLayout(layout_captions_fixed_size_and_fixed_size(new VerticalLayout()))); - layout.addComponent(wrapLayout(layout_add_remove_components(new HorizontalLayout()))); - layout.addComponent(wrapLayout(layout_add_remove_components(new VerticalLayout()))); - layout.addComponent(wrapLayout(layout_pctFilled(new HorizontalLayout()))); + layout.addComponent( + wrapLayout(layout_captions_fixed_size(new HorizontalLayout()))); + layout.addComponent( + wrapLayout(layout_captions_fixed_size(new VerticalLayout()))); + layout.addComponent( + wrapLayout(layout_captions_fixed_size_and_relative_size( + new HorizontalLayout()))); + layout.addComponent( + wrapLayout(layout_captions_fixed_size_and_relative_size( + new VerticalLayout()))); + layout.addComponent( + wrapLayout(layout_captions_fixed_size_and_fixed_size( + new HorizontalLayout()))); + layout.addComponent( + wrapLayout(layout_captions_fixed_size_and_fixed_size( + new VerticalLayout()))); + layout.addComponent(wrapLayout( + layout_add_remove_components(new HorizontalLayout()))); + layout.addComponent( + wrapLayout(layout_add_remove_components(new VerticalLayout()))); + layout.addComponent( + wrapLayout(layout_pctFilled(new HorizontalLayout()))); layout.addComponent(wrapLayout(layout_pctFilled(new VerticalLayout()))); - layout.addComponent(wrapLayout(layout_underFilled(new HorizontalLayout()))); - layout.addComponent(wrapLayout(layout_underFilled(new VerticalLayout()))); - layout.addComponent(wrapLayout(layout_basic_test(new HorizontalLayout()))); - layout.addComponent(wrapLayout(layout_basic_test(new VerticalLayout()))); + layout.addComponent( + wrapLayout(layout_underFilled(new HorizontalLayout()))); + layout.addComponent( + wrapLayout(layout_underFilled(new VerticalLayout()))); + layout.addComponent( + wrapLayout(layout_basic_test(new HorizontalLayout()))); + layout.addComponent( + wrapLayout(layout_basic_test(new VerticalLayout()))); } private Layout wrapLayout(Layout ol) { @@ -110,7 +140,8 @@ public class OrderedLayoutBasics extends TestBase { ol.setWidth(""); ol.setCaption("Fixed height (200px) and dynamic width"); - LegacyTextField tf = new LegacyTextField("100px high TextField, valign: bottom"); + LegacyTextField tf = new LegacyTextField( + "100px high TextField, valign: bottom"); tf.setHeight("100px"); tf.setWidth(""); ol.addComponent(tf); @@ -212,7 +243,8 @@ public class OrderedLayoutBasics extends TestBase { ol.addComponent(tf); ol.setComponentAlignment(tf, Alignment.TOP_LEFT); - tf = new LegacyTextField("100% high, 50px wide TextField, valign: bottom"); + tf = new LegacyTextField( + "100% high, 50px wide TextField, valign: bottom"); tf.setHeight("100%"); tf.setWidth("50px"); ol.addComponent(tf); @@ -267,7 +299,8 @@ public class OrderedLayoutBasics extends TestBase { ol.addComponent(tf); ol.setComponentAlignment(tf, Alignment.TOP_LEFT); - tf = new LegacyTextField("100% high, 50px wide TextField, valign: bottom"); + tf = new LegacyTextField( + "100% high, 50px wide TextField, valign: bottom"); tf.setHeight("100%"); tf.setWidth("50px"); ol.addComponent(tf); @@ -364,9 +397,8 @@ public class OrderedLayoutBasics extends TestBase { ol.setSpacing(true); // ol.setWidth(""); - ol.setCaption("Fixed width (" + ol.getWidth() - + "px) and fixed height (" + ol.getHeight() - + "px) / layout_field_100pct_button_field"); + ol.setCaption("Fixed width (" + ol.getWidth() + "px) and fixed height (" + + ol.getHeight() + "px) / layout_field_100pct_button_field"); TextArea tf; tf = new TextArea("300px x 300px Field"); @@ -406,9 +438,8 @@ public class OrderedLayoutBasics extends TestBase { ol.setSpacing(true); // ol.setWidth(""); - ol.setCaption("Fixed width (" + ol.getWidth() - + "px) and fixed height (" + ol.getHeight() - + "px) / layout_basic_test"); + ol.setCaption("Fixed width (" + ol.getWidth() + "px) and fixed height (" + + ol.getHeight() + "px) / layout_basic_test"); TextArea tf; tf = new TextArea("300px x 300px Field"); @@ -448,9 +479,8 @@ public class OrderedLayoutBasics extends TestBase { ol.setSpacing(false); // ol.setWidth(""); - ol.setCaption("Fixed width (" + ol.getWidth() - + "px) and fixed height (" + ol.getHeight() - + "px) / layout_symmetric_fields"); + ol.setCaption("Fixed width (" + ol.getWidth() + "px) and fixed height (" + + ol.getHeight() + "px) / layout_symmetric_fields"); TextArea tf; tf = new TextArea("300px x 300px Field"); @@ -487,9 +517,8 @@ public class OrderedLayoutBasics extends TestBase { ol.setSpacing(true); // ol.setWidth(""); - ol.setCaption("Fixed width (" + ol.getWidth() - + "px) and fixed height (" + ol.getHeight() - + "px) / layout_leftAndRight"); + ol.setCaption("Fixed width (" + ol.getWidth() + "px) and fixed height (" + + ol.getHeight() + "px) / layout_leftAndRight"); TextArea tf; // tf = new TextField("100%x100% Field"); @@ -733,9 +762,8 @@ public class OrderedLayoutBasics extends TestBase { ol.setSpacing(true); // ol.setWidth(""); - ol.setCaption("Fixed width (" + ol.getWidth() - + "px) and fixed height (" + ol.getHeight() - + "px) / layout_add_remove_components"); + ol.setCaption("Fixed width (" + ol.getWidth() + "px) and fixed height (" + + ol.getHeight() + "px) / layout_add_remove_components"); for (int i = 0; i < 2; i++) { AbstractOrderedLayout inner = createAddRemove(ol, "", ""); @@ -1053,7 +1081,8 @@ public class OrderedLayoutBasics extends TestBase { } - protected void addBefore(AbstractOrderedLayout ol, Component c, String width) { + protected void addBefore(AbstractOrderedLayout ol, Component c, + String width) { int index = 0; Iterator<Component> iter = ol.getComponentIterator(); while (iter.hasNext()) { diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java index 85f7db3d18..59689f3d82 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java @@ -9,8 +9,8 @@ import com.vaadin.ui.Label; import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; -public class VerticalLayoutExpandRatioModification extends TestBase implements - ClickListener { +public class VerticalLayoutExpandRatioModification extends TestBase + implements ClickListener { private boolean isVisible = false; private VerticalLayout mainLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java index f3d4029663..d00acf0983 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java @@ -7,8 +7,8 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; -public class VerticalLayoutWithRelativeSizeComponentsInitiallyHidden extends - TestBase { +public class VerticalLayoutWithRelativeSizeComponentsInitiallyHidden + extends TestBase { @Override protected String getDescription() { diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java index d192307eb2..8126a43ca9 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java @@ -29,8 +29,8 @@ public class GridLayoutMoveComponent extends AbstractTestUI { grid.addComponent(b, 0, 1); grid.addComponent(tf, 0, 2); - addComponent(new Button("Shift label right", - new Button.ClickListener() { + addComponent( + new Button("Shift label right", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { // Moving component from 0,0 -> 1,0 @@ -39,8 +39,8 @@ public class GridLayoutMoveComponent extends AbstractTestUI { } })); - addComponent(new Button("Shift button right", - new Button.ClickListener() { + addComponent( + new Button("Shift button right", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { grid.removeComponent(b); diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java index cb38e30663..7e6792af6e 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java @@ -56,8 +56,10 @@ public class BaseAddReplaceMove extends BaseLayoutTestUI { source.addComponent(new Label("OTHER LABEL 1")); source.addComponent(new Label("OTHER LABEL 2")); - final AbstractComponent c1 = new Label("<b>LABEL</b>", ContentMode.HTML); - final AbstractComponent c2 = new Label("<b>LABEL</b>", ContentMode.HTML); + final AbstractComponent c1 = new Label("<b>LABEL</b>", + ContentMode.HTML); + final AbstractComponent c2 = new Label("<b>LABEL</b>", + ContentMode.HTML); final AbstractComponent c3 = new Table("TABLE"); c3.setHeight("100px"); c3.setWidth("100%"); diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java index 320febac04..71a7c0e048 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java @@ -52,8 +52,10 @@ public class GridAddReplaceMove extends GridBaseLayoutTestUI { source.addComponent(new Label("OTHER LABEL 1")); source.addComponent(new Label("OTHER LABEL 2")); - final AbstractComponent c1 = new Label("<b>LABEL</b>", ContentMode.HTML); - final AbstractComponent c2 = new Label("<b>LABEL</b>", ContentMode.HTML); + final AbstractComponent c1 = new Label("<b>LABEL</b>", + ContentMode.HTML); + final AbstractComponent c2 = new Label("<b>LABEL</b>", + ContentMode.HTML); final AbstractComponent c3 = new Table("TABLE"); c3.setHeight("100px"); c3.setWidth("100%"); diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java index 9c1ae16c4f..ad49a824f2 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java @@ -31,7 +31,8 @@ import com.vaadin.ui.TabSheet; public class GridIcon extends GridBaseLayoutTestUI { @Override protected void setup(VaadinRequest request) { - layout.addComponent(createLabelsFields(LegacyTextField.class, true, "")); + layout.addComponent( + createLabelsFields(LegacyTextField.class, true, "")); layout.addComponent(createLabelsFields(Label.class, true, "")); layout.addComponent(createLabelsFields(Button.class, true, "")); layout.addComponent(createLabelsFields(ComboBox.class, true, "")); diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java index 7db8fb5c45..5fe4dbaec4 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java @@ -43,7 +43,8 @@ public class GridLayoutRegError extends GridBaseLayoutTestUI { layout.addComponent(createLabelsFields(Label.class, true, "")); layout.addComponent(createLabelsFields(Button.class, true, "")); layout.addComponent(createLabelsFields(TabSheet.class, true, "")); - layout.addComponent(createLabelsFields(LegacyTextField.class, true, "")); + layout.addComponent( + createLabelsFields(LegacyTextField.class, true, "")); layout.addComponent(createLabelsFields(ComboBox.class, true, "")); layout.addComponent(createLabelsFields(DateField.class, true, "")); diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java index 37a5b4bb14..d2d6980bbb 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java @@ -55,8 +55,8 @@ public class CookieMonsterUI extends UI { } else { // Create a new cookie nameCookie = new Cookie(NAME_COOKIE, name); - nameCookie - .setComment("Cookie for storing the name of the user"); + nameCookie.setComment( + "Cookie for storing the name of the user"); Notification.show("Stored name " + name + " in cookie"); } @@ -65,8 +65,8 @@ public class CookieMonsterUI extends UI { nameCookie.setMaxAge(120); // Set the cookie path. - nameCookie.setPath(VaadinService.getCurrentRequest() - .getContextPath()); + nameCookie.setPath( + VaadinService.getCurrentRequest().getContextPath()); // Save cookie VaadinService.getCurrentResponse().addCookie(nameCookie); diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginUI.java index 1f94d43abe..2d1c6bb687 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginUI.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginUI.java @@ -38,7 +38,8 @@ public class SimpleLoginUI extends UI { // Check if a user has logged in boolean isLoggedIn = getSession().getAttribute("user") != null; - boolean isLoginView = event.getNewView() instanceof SimpleLoginView; + boolean isLoginView = event + .getNewView() instanceof SimpleLoginView; if (!isLoggedIn && !isLoginView) { // Redirect to login view always if a user has not yet diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java index 63e43b29f1..d8c6e52503 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java @@ -29,26 +29,27 @@ public class CSSInjectWithColorpicker extends UI { protected void init(VaadinRequest request) { // Create a text editor - Component editor = createEditor("Lorem ipsum dolor sit amet, lacus pharetra sed, sit a " - + "tortor. Id aliquam lorem pede, orci ut enim metus, diam nulla mi " - + "suspendisse tempor tortor. Eleifend lorem proin, morbi vel diam ut. " - + "Tempor est tellus vitae, pretium condimentum facilisis sit. Sagittis " - + "quam, ac urna eros est cras id cras, eleifend eu mattis nec." - + "Lorem ipsum dolor sit amet, lacus pharetra sed, sit a " - + "tortor. Id aliquam lorem pede, orci ut enim metus, diam nulla mi " - + "suspendisse tempor tortor. Eleifend lorem proin, morbi vel diam ut. " - + "Tempor est tellus vitae, pretium condimentum facilisis sit. Sagittis " - + "quam, ac urna eros est cras id cras, eleifend eu mattis nec." - + "Lorem ipsum dolor sit amet, lacus pharetra sed, sit a " - + "tortor. Id aliquam lorem pede, orci ut enim metus, diam nulla mi " - + "suspendisse tempor tortor. Eleifend lorem proin, morbi vel diam ut. " - + "Tempor est tellus vitae, pretium condimentum facilisis sit. Sagittis " - + "quam, ac urna eros est cras id cras, eleifend eu mattis nec." - + "Lorem ipsum dolor sit amet, lacus pharetra sed, sit a " - + "tortor. Id aliquam lorem pede, orci ut enim metus, diam nulla mi " - + "suspendisse tempor tortor. Eleifend lorem proin, morbi vel diam ut. " - + "Tempor est tellus vitae, pretium condimentum facilisis sit. Sagittis " - + "quam, ac urna eros est cras id cras, eleifend eu mattis nec."); + Component editor = createEditor( + "Lorem ipsum dolor sit amet, lacus pharetra sed, sit a " + + "tortor. Id aliquam lorem pede, orci ut enim metus, diam nulla mi " + + "suspendisse tempor tortor. Eleifend lorem proin, morbi vel diam ut. " + + "Tempor est tellus vitae, pretium condimentum facilisis sit. Sagittis " + + "quam, ac urna eros est cras id cras, eleifend eu mattis nec." + + "Lorem ipsum dolor sit amet, lacus pharetra sed, sit a " + + "tortor. Id aliquam lorem pede, orci ut enim metus, diam nulla mi " + + "suspendisse tempor tortor. Eleifend lorem proin, morbi vel diam ut. " + + "Tempor est tellus vitae, pretium condimentum facilisis sit. Sagittis " + + "quam, ac urna eros est cras id cras, eleifend eu mattis nec." + + "Lorem ipsum dolor sit amet, lacus pharetra sed, sit a " + + "tortor. Id aliquam lorem pede, orci ut enim metus, diam nulla mi " + + "suspendisse tempor tortor. Eleifend lorem proin, morbi vel diam ut. " + + "Tempor est tellus vitae, pretium condimentum facilisis sit. Sagittis " + + "quam, ac urna eros est cras id cras, eleifend eu mattis nec." + + "Lorem ipsum dolor sit amet, lacus pharetra sed, sit a " + + "tortor. Id aliquam lorem pede, orci ut enim metus, diam nulla mi " + + "suspendisse tempor tortor. Eleifend lorem proin, morbi vel diam ut. " + + "Tempor est tellus vitae, pretium condimentum facilisis sit. Sagittis " + + "quam, ac urna eros est cras id cras, eleifend eu mattis nec."); VerticalLayout content = new VerticalLayout(editor); content.setMargin(true); @@ -203,8 +204,8 @@ public class CSSInjectWithColorpicker extends UI { */ private Component createFontSizeSelect() { - final ComboBox select = new ComboBox(null, Arrays.asList(8, 9, 10, 12, - 14, 16, 20, 25, 30, 40, 50)); + final ComboBox select = new ComboBox(null, + Arrays.asList(8, 9, 10, 12, 14, 16, 20, 25, 30, 40, 50)); select.setWidth("100px"); select.setValue(12); select.setInputPrompt("Font size"); diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java index c10a87635e..3c77a8efca 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java @@ -43,7 +43,8 @@ public class FormattingDataInGrid extends UI { public String getStyle(CellReference cellReference) { if ("amount".equals(cellReference.getPropertyId())) { Double value = (Double) cellReference.getValue(); - if (value.doubleValue() == Math.round(value.doubleValue())) { + if (value.doubleValue() == Math + .round(value.doubleValue())) { return "integer"; } } @@ -57,20 +58,22 @@ public class FormattingDataInGrid extends UI { NumberRenderer poundRenderer = new NumberRenderer(poundformat); grid.getColumn("amount").setRenderer(poundRenderer); - grid.getColumn("count").setConverter(new LegacyStringToIntegerConverter() { - @Override - public String convertToPresentation(Integer value, - Class<? extends String> targetType, Locale locale) - throws LegacyConverter.ConversionException { - String stringRepresentation = super.convertToPresentation( - value, targetType, locale); - if (value.intValue() % 2 == 0) { - return "<strong>" + stringRepresentation + "</strong>"; - } else { - return "<em>" + stringRepresentation + "</em>"; - } - } - }); + grid.getColumn("count") + .setConverter(new LegacyStringToIntegerConverter() { + @Override + public String convertToPresentation(Integer value, + Class<? extends String> targetType, Locale locale) + throws LegacyConverter.ConversionException { + String stringRepresentation = super.convertToPresentation( + value, targetType, locale); + if (value.intValue() % 2 == 0) { + return "<strong>" + stringRepresentation + + "</strong>"; + } else { + return "<em>" + stringRepresentation + "</em>"; + } + } + }); grid.getColumn("count").setRenderer(new HtmlRenderer()); } diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java index eaa099f3eb..cd8295efc9 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java @@ -62,13 +62,14 @@ public class ShowingExtraDataForRows extends UI { new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - Notification.show("Button clicked for " - + bean.getName()); + Notification.show( + "Button clicked for " + bean.getName()); } }); // Wrap up all the parts into a vertical layout - VerticalLayout layout = new VerticalLayout(label, image, button); + VerticalLayout layout = new VerticalLayout(label, image, + button); layout.setSpacing(true); layout.setMargin(true); return layout; diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java index 0cb4492929..e63da28dac 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java @@ -43,8 +43,8 @@ public class AutoGeneratingForm extends UI { // We need an item data source before we create the fields to be able to // find the properties, otherwise we have to specify them by hand - fieldGroup.setItemDataSource(new BeanItem<Person>(new Person("John", - "Doe", 34))); + fieldGroup.setItemDataSource( + new BeanItem<Person>(new Person("John", "Doe", 34))); // Loop through the properties, build fields for them and add the fields // to this root diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java index 7cd9804358..27b179ce51 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java @@ -39,7 +39,8 @@ public class CreatingPreserveState extends UI { @Override public void init(VaadinRequest request) { - LegacyTextField tf = new LegacyTextField("Instance #" + (++instanceCounter)); + LegacyTextField tf = new LegacyTextField( + "Instance #" + (++instanceCounter)); tf.setImmediate(true); content.addComponent(tf); @@ -48,7 +49,7 @@ public class CreatingPreserveState extends UI { @Override protected void refresh(VaadinRequest request) { - content.addComponent(new Label("UI was refreshed @" - + System.currentTimeMillis())); + content.addComponent( + new Label("UI was refreshed @" + System.currentTimeMillis())); } } diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java index 213e23982b..7e8f2aba2d 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java @@ -69,7 +69,7 @@ class TouchUI extends UI { WebBrowser webBrowser = getPage().getWebBrowser(); String screenSize = "" + webBrowser.getScreenWidth() + "x" + webBrowser.getScreenHeight(); - setContent(new Label("Using a touch enabled device with screen size" - + screenSize)); + setContent(new Label( + "Using a touch enabled device with screen size" + screenSize)); } } diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java index f4eed8ddd6..fc3cf0b30a 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java @@ -28,8 +28,8 @@ public class DynamicImageUI extends AbstractTestUI { String text = request.getParameter("text"); BufferedImage bi = new BufferedImage(100, 30, BufferedImage.TYPE_3BYTE_BGR); - bi.getGraphics().drawChars(text.toCharArray(), 0, - text.length(), 10, 20); + bi.getGraphics().drawChars(text.toCharArray(), 0, text.length(), + 10, 20); response.setContentType("image/png"); ImageIO.write(bi, "png", response.getOutputStream()); diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java index 9486a9abce..b86aacc8a9 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java @@ -78,8 +78,8 @@ public class FormUsingExistingLayout extends AbstractTestUI { MyFormLayout myFormLayout = new MyFormLayout(); // Create a field group and use it to bind the fields in the layout - FieldGroup fieldGroup = new FieldGroup(new BeanItem<Notice>(new Notice( - "John", "Doe", ""))); + FieldGroup fieldGroup = new FieldGroup( + new BeanItem<Notice>(new Notice("John", "Doe", ""))); fieldGroup.bindMemberFields(myFormLayout); addComponent(myFormLayout); diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java index 9ea5eb2355..d1d49bc9d1 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java @@ -30,19 +30,21 @@ public class FormatTableValue extends AbstractTestUI { table.getItem(itemId).getItemProperty(DEFAULT_PROPERTY) .setValue(3.1415); - table.setConverter(PERCENT_PROPERTY, new LegacyStringToDoubleConverter() { - @Override - protected NumberFormat getFormat(Locale locale) { - return NumberFormat.getPercentInstance(locale); - } - }); - - table.setConverter(CURRENCY_PROPERTY, new LegacyStringToDoubleConverter() { - @Override - protected NumberFormat getFormat(Locale locale) { - return NumberFormat.getCurrencyInstance(locale); - } - }); + table.setConverter(PERCENT_PROPERTY, + new LegacyStringToDoubleConverter() { + @Override + protected NumberFormat getFormat(Locale locale) { + return NumberFormat.getPercentInstance(locale); + } + }); + + table.setConverter(CURRENCY_PROPERTY, + new LegacyStringToDoubleConverter() { + @Override + protected NumberFormat getFormat(Locale locale) { + return NumberFormat.getCurrencyInstance(locale); + } + }); addComponent(table); } diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java index 24bba5d271..b6f48ab48a 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java @@ -32,7 +32,8 @@ public class IntegerTextFieldDataSource extends AbstractTestUI { final Property<Integer> integerProperty = beanItem .getItemProperty("value"); - final LegacyTextField textField = new LegacyTextField("Text field", integerProperty); + final LegacyTextField textField = new LegacyTextField("Text field", + integerProperty); Button submitButton = new Button("Submit value", new ClickListener() { @Override @@ -48,7 +49,8 @@ public class IntegerTextFieldDataSource extends AbstractTestUI { }); addComponent(new Label("Text field type: " + textField.getType())); - addComponent(new Label("Text field type: " + integerProperty.getType())); + addComponent( + new Label("Text field type: " + integerProperty.getType())); addComponent(textField); addComponent(submitButton); } diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java index 4ef080afc2..05e5ec851b 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java @@ -34,10 +34,10 @@ public class MultiTabApplication extends UI { private class MainView extends VerticalLayout { public MainView() { - addComponent(new Link("Edit person 1", new ExternalResource( - "?editPerson=person1"))); - addComponent(new Link("Edit person 2", new ExternalResource( - "?editPerson=person2"))); + addComponent(new Link("Edit person 1", + new ExternalResource("?editPerson=person1"))); + addComponent(new Link("Edit person 2", + new ExternalResource("?editPerson=person2"))); } } diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java index fb84a4068b..da788cb251 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java @@ -42,8 +42,8 @@ public class UsingUriFragments extends UI { layout.setMargin(true); setContent(layout); - Label label = new Label("Hello, your fragment is " - + getPage().getUriFragment()); + Label label = new Label( + "Hello, your fragment is " + getPage().getUriFragment()); layout.addComponent(label); // React to fragment changes @@ -57,8 +57,8 @@ public class UsingUriFragments extends UI { // Handle the fragment received in the initial request handleFragment(getPage().getUriFragment()); - layout.addComponent(new Button("Show and set fragment", - new Button.ClickListener() { + layout.addComponent( + new Button("Show and set fragment", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { handleFragment(getPage().getUriFragment()); diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java index 4d95d9cc48..bea51e98f9 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java @@ -56,12 +56,12 @@ public class UsingXyzWhenInitializing extends UI { String resolution = "Your browser window on startup was " + browser.getScreenWidth() + "x" + browser.getScreenHeight(); if (browser.getScreenWidth() > 1024) { - layout.addComponent(new Label( - "The is the large version of the application. " + layout.addComponent( + new Label("The is the large version of the application. " + resolution)); } else { - layout.addComponent(new Label( - "This is the small version of the application. " + layout.addComponent( + new Label("This is the small version of the application. " + resolution)); } } diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponent.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponent.java index 6512754683..7befc9dd5d 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponent.java @@ -32,8 +32,8 @@ public class MyComponent extends AbstractComponent { // nag every 5:th click if (clickCount % 5 == 0) { - getRpcProxy(MyComponentClientRpc.class).alert( - "Ok, that's enough!"); + getRpcProxy(MyComponentClientRpc.class) + .alert("Ok, that's enough!"); } setText("You have clicked " + clickCount + " times"); diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java index 8a73e90496..69281b61cc 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java @@ -32,8 +32,8 @@ import com.vaadin.client.ui.layout.ElementResizeListener; * @author Vaadin Ltd * @since 7.0.0 */ -public class MyPickerConnector extends AbstractComponentConnector implements - SimpleManagedLayout { +public class MyPickerConnector extends AbstractComponentConnector + implements SimpleManagedLayout { @Override public MyPickerWidget getWidget() { return (MyPickerWidget) super.getWidget(); diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java index 850fa1044f..8d1f4a1f9f 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java @@ -24,7 +24,8 @@ public class WidgetContainer extends AbstractComponentContainer { } @Override - public void replaceComponent(Component oldComponent, Component newComponent) { + public void replaceComponent(Component oldComponent, + Component newComponent) { int index = children.indexOf(oldComponent); if (index != -1) { children.remove(index); diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Flot.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Flot.java index 86666b12e8..a10479fa42 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Flot.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Flot.java @@ -34,8 +34,8 @@ public class Flot extends AbstractJavaScriptComponent { registerRpc(new FlotClickRpc() { @Override public void onPlotClick(int seriesIndex, int dataIndex) { - Notification.show("Clicked on [" + seriesIndex + ", " - + dataIndex + "]"); + Notification.show( + "Clicked on [" + seriesIndex + ", " + dataIndex + "]"); } }); addFunction("onPlotClick", new JavaScriptFunction() { @@ -43,8 +43,8 @@ public class Flot extends AbstractJavaScriptComponent { public void call(JsonArray arguments) { int seriesIndex = (int) arguments.getNumber(0); int dataIndex = (int) arguments.getNumber(1); - Notification.show("Clicked on [" + seriesIndex + ", " - + dataIndex + "]"); + Notification.show( + "Clicked on [" + seriesIndex + ", " + dataIndex + "]"); } }); } diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java index f6449b1997..e6f4f9df89 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java @@ -37,8 +37,8 @@ public class FlotJavaScriptUI extends UI { flot.addSeries(1, 2, 4, 8, 16); layout.addComponent(flot); - layout.addComponent(new Button("Highlight point", - new Button.ClickListener() { + layout.addComponent( + new Button("Highlight point", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { flot.highlight(0, 3); diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/JSAPIUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/JSAPIUI.java index ea9cd52d34..1c32e0c7ca 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/JSAPIUI.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/JSAPIUI.java @@ -40,9 +40,7 @@ public class JSAPIUI extends UI { } }); - setContent(new Link( - "Send message", - new ExternalResource( - "javascript:(function(){com.example.api.notify(prompt('Message'),2);})();"))); + setContent(new Link("Send message", new ExternalResource( + "javascript:(function(){com.example.api.notify(prompt('Message'),2);})();"))); } } diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/BootstrapListenerCode.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/BootstrapListenerCode.java index 422e44e402..e3c6ab427d 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/BootstrapListenerCode.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/BootstrapListenerCode.java @@ -45,7 +45,8 @@ public class BootstrapListenerCode { } @Override - public void modifyBootstrapFragment(BootstrapFragmentResponse response) { + public void modifyBootstrapFragment( + BootstrapFragmentResponse response) { // Wrap the fragment in a custom div element Element myDiv = new Element(Tag.valueOf("div"), ""); List<Node> nodes = response.getFragmentNodes(); @@ -66,8 +67,8 @@ class MyVaadinServlet extends VaadinServlet { @Override public void sessionInit(SessionInitEvent event) throws ServiceException { - event.getSession().addBootstrapListener( - BootstrapListenerCode.listener); + event.getSession() + .addBootstrapListener(BootstrapListenerCode.listener); } }); } @@ -83,8 +84,8 @@ class MyVaadinPortlet extends VaadinPortlet { @Override public void sessionInit(SessionInitEvent event) throws ServiceException { - event.getSession().addBootstrapListener( - BootstrapListenerCode.listener); + event.getSession() + .addBootstrapListener(BootstrapListenerCode.listener); } }); } diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java index 0df2c8ce66..b749fba8e4 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java @@ -42,17 +42,18 @@ public class SettingReadingSessionAttributesUI extends UI { layout.addComponent(statusHolder); layout.addComponent(textField); - layout.addComponent(new Button("Set new values", - new Button.ClickListener() { + layout.addComponent( + new Button("Set new values", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { String value = textField.getValue(); - saveValue(SettingReadingSessionAttributesUI.this, value); + saveValue(SettingReadingSessionAttributesUI.this, + value); } })); - layout.addComponent(new Button("Reload page", - new Button.ClickListener() { + layout.addComponent( + new Button("Reload page", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { getPage().setLocation(getPage().getLocation()); @@ -79,12 +80,11 @@ public class SettingReadingSessionAttributesUI extends UI { private static void showValue(SettingReadingSessionAttributesUI ui) { ui.statusHolder.removeAllComponents(); ui.statusHolder.addComponent(new Label("Value in UI: " + ui.value)); + ui.statusHolder.addComponent(new Label("Value in VaadinServiceSession: " + + ui.getSession().getAttribute("myValue"))); ui.statusHolder.addComponent(new Label( - "Value in VaadinServiceSession: " - + ui.getSession().getAttribute("myValue"))); - ui.statusHolder.addComponent(new Label("Value in HttpSession: " - + VaadinService.getCurrentRequest().getWrappedSession() - .getAttribute("myValue"))); + "Value in HttpSession: " + VaadinService.getCurrentRequest() + .getWrappedSession().getAttribute("myValue"))); } } diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b6/LettingUserDownloadFile.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b6/LettingUserDownloadFile.java index d5c99c931b..8382994518 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b6/LettingUserDownloadFile.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b6/LettingUserDownloadFile.java @@ -51,8 +51,8 @@ public class LettingUserDownloadFile extends UI { String text = "My image"; BufferedImage bi = new BufferedImage(100, 30, BufferedImage.TYPE_3BYTE_BGR); - bi.getGraphics().drawChars(text.toCharArray(), 0, - text.length(), 10, 20); + bi.getGraphics().drawChars(text.toCharArray(), 0, text.length(), + 10, 20); try { ByteArrayOutputStream bos = new ByteArrayOutputStream(); diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java index 13e2055523..23d0b832e8 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java @@ -33,8 +33,8 @@ public class LoginView extends Panel implements View { Notification.show("Ok, let's pretend you're " + email); // indicate the user is logged in - ((NavigationtestUI) UI.getCurrent()).setLoggedInUser(email - .getValue()); + ((NavigationtestUI) UI.getCurrent()) + .setLoggedInUser(email.getValue()); // navigate back to the intended place navigator.navigateTo(fragmentAndParameters); diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainView.java index 3764b7622e..38a10dd3c6 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainView.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainView.java @@ -25,20 +25,20 @@ public class MainView extends Panel implements View { new ExternalResource("#!" + CountView.NAME)); layout.addComponent(lnk); - lnk = new Link("Message: Hello", new ExternalResource("#!" - + MessageView.NAME + "/Hello")); + lnk = new Link("Message: Hello", + new ExternalResource("#!" + MessageView.NAME + "/Hello")); layout.addComponent(lnk); - lnk = new Link("Message: Bye", new ExternalResource("#!" - + MessageView.NAME + "/Bye/Goodbye")); + lnk = new Link("Message: Bye", + new ExternalResource("#!" + MessageView.NAME + "/Bye/Goodbye")); layout.addComponent(lnk); - lnk = new Link("Private message: Secret", new ExternalResource("#!" - + SecretView.NAME + "/Secret")); + lnk = new Link("Private message: Secret", + new ExternalResource("#!" + SecretView.NAME + "/Secret")); layout.addComponent(lnk); - lnk = new Link("Private message: Topsecret", new ExternalResource("#!" - + SecretView.NAME + "/Topsecret")); + lnk = new Link("Private message: Topsecret", + new ExternalResource("#!" + SecretView.NAME + "/Topsecret")); layout.addComponent(lnk); logOut = new Button("Logout", new Button.ClickListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainViewEarlierExample.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainViewEarlierExample.java index e638770346..7750bdafd6 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainViewEarlierExample.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainViewEarlierExample.java @@ -22,20 +22,20 @@ public class MainViewEarlierExample extends Panel implements View { new ExternalResource("#!" + CountView.NAME)); layout.addComponent(lnk); - lnk = new Link("Message: Hello", new ExternalResource("#!" - + MessageView.NAME + "/Hello")); + lnk = new Link("Message: Hello", + new ExternalResource("#!" + MessageView.NAME + "/Hello")); layout.addComponent(lnk); - lnk = new Link("Message: Bye", new ExternalResource("#!" - + MessageView.NAME + "/Bye/Goodbye")); + lnk = new Link("Message: Bye", + new ExternalResource("#!" + MessageView.NAME + "/Bye/Goodbye")); layout.addComponent(lnk); - lnk = new Link("Private message: Secret", new ExternalResource("#!" - + SecretView.NAME + "/Secret")); + lnk = new Link("Private message: Secret", + new ExternalResource("#!" + SecretView.NAME + "/Secret")); layout.addComponent(lnk); - lnk = new Link("Private message: Topsecret", new ExternalResource("#!" - + SecretView.NAME + "/Topsecret")); + lnk = new Link("Private message: Topsecret", + new ExternalResource("#!" + SecretView.NAME + "/Topsecret")); layout.addComponent(lnk); // login/logout toggle so we can test this diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainView__LastNavigatorExample.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainView__LastNavigatorExample.java index 5344a06a31..707ac7b05e 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainView__LastNavigatorExample.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainView__LastNavigatorExample.java @@ -14,8 +14,8 @@ public class MainView__LastNavigatorExample extends Panel implements View { public MainView__LastNavigatorExample(final Navigator navigator) { - Link lnk = new Link("Settings", new ExternalResource("#!" - + SettingsView.NAME)); + Link lnk = new Link("Settings", + new ExternalResource("#!" + SettingsView.NAME)); VerticalLayout vl = new VerticalLayout(); vl.addComponent(lnk); setContent(vl); diff --git a/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonAction.java b/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonAction.java index 5c78a3f42a..9f255fb8b3 100644 --- a/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonAction.java +++ b/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonAction.java @@ -55,8 +55,8 @@ public class NavigatorViewBlocksBackButtonAction extends AbstractTestUI { } - class ViewWithPromptedLeave extends VerticalLayout implements View, - ViewChangeListener { + class ViewWithPromptedLeave extends VerticalLayout + implements View, ViewChangeListener { public static final String NAME = "prompted"; @@ -89,17 +89,17 @@ public class NavigatorViewBlocksBackButtonAction extends AbstractTestUI { confirmationWindow.setContent(confirmationWindowLayout); confirmationWindowLayout.setMargin(true); confirmationWindowLayout.setSpacing(true); - confirmationWindowLayout.addComponent(new Label( - "Really exit this view?")); - confirmationWindowLayout.addComponent(new Button("Yeah, sure!", - new Button.ClickListener() { + confirmationWindowLayout + .addComponent(new Label("Really exit this view?")); + confirmationWindowLayout.addComponent( + new Button("Yeah, sure!", new Button.ClickListener() { @Override public void buttonClick(ClickEvent buttonEvent) { okToLeave = true; getUI().removeWindow(confirmationWindow); - event.getNavigator().navigateTo( - event.getViewName() + "/" + event.getNavigator() + .navigateTo(event.getViewName() + "/" + event.getParameters()); } })); diff --git a/uitest/src/main/java/com/vaadin/tests/overlays/OverlayTouchScrolling.java b/uitest/src/main/java/com/vaadin/tests/overlays/OverlayTouchScrolling.java index fdcfdf7266..d5f7359bb0 100644 --- a/uitest/src/main/java/com/vaadin/tests/overlays/OverlayTouchScrolling.java +++ b/uitest/src/main/java/com/vaadin/tests/overlays/OverlayTouchScrolling.java @@ -35,8 +35,8 @@ public class OverlayTouchScrolling extends AbstractTestUI { @Override public void buttonClick(ClickEvent event) { - Notification - .show("Now close this and you can scroll in mad places."); + Notification.show( + "Now close this and you can scroll in mad places."); green.addComponent(new Label( "Thank you for clicking, now scroll (with touch device) to area without green background, which shouldn't be possible.")); } diff --git a/uitest/src/main/java/com/vaadin/tests/performance/BasicPerformanceTest.java b/uitest/src/main/java/com/vaadin/tests/performance/BasicPerformanceTest.java index a97f2611d1..4e351628a3 100644 --- a/uitest/src/main/java/com/vaadin/tests/performance/BasicPerformanceTest.java +++ b/uitest/src/main/java/com/vaadin/tests/performance/BasicPerformanceTest.java @@ -49,8 +49,8 @@ public class BasicPerformanceTest extends UI { this.performanceTopic = performanceTopic; this.serverLimit = serverLimit; this.clientLimit = clientLimit; - reportPerformanceButton.setCaption("Report performance for " - + performanceTopic); + reportPerformanceButton + .setCaption("Report performance for " + performanceTopic); reportPerformanceButton.setEnabled(true); reportBootstap = false; } @@ -97,8 +97,8 @@ public class BasicPerformanceTest extends UI { } })); - leftBar.addComponent(new Button("Update all labels", - new Button.ClickListener() { + leftBar.addComponent( + new Button("Update all labels", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { Iterator<Component> componentIterator = contentLayout @@ -129,8 +129,8 @@ public class BasicPerformanceTest extends UI { } })); - leftBar.addComponent(new Button("Update one label", - new Button.ClickListener() { + leftBar.addComponent( + new Button("Update one label", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { Component child = contentLayout.getComponent(0); @@ -149,8 +149,8 @@ public class BasicPerformanceTest extends UI { } })); - leftBar.addComponent(new Button("Clear content", - new Button.ClickListener() { + leftBar.addComponent( + new Button("Clear content", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { contentLayout.removeAllComponents(); diff --git a/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java b/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java index 7379b08f5b..a73cf9cb5a 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java +++ b/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java @@ -98,7 +98,8 @@ public class BasicPush extends AbstractTestUI { access(new Runnable() { @Override public void run() { - counter2.setValue(counter2.getValue() + 1); + counter2.setValue( + counter2.getValue() + 1); } }); } diff --git a/uitest/src/main/java/com/vaadin/tests/push/EnableDisablePush.java b/uitest/src/main/java/com/vaadin/tests/push/EnableDisablePush.java index d5646c976b..98b5e3e2e8 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/EnableDisablePush.java +++ b/uitest/src/main/java/com/vaadin/tests/push/EnableDisablePush.java @@ -35,8 +35,8 @@ public class EnableDisablePush extends AbstractTestUI { log.log("Counter = " + c++); if (c == 3) { log.log("Disabling polling, enabling push"); - getPushConfiguration().setPushMode( - PushMode.AUTOMATIC); + getPushConfiguration() + .setPushMode(PushMode.AUTOMATIC); setPollInterval(-1); log.log("Polling disabled, push enabled"); } @@ -94,18 +94,19 @@ public class EnableDisablePush extends AbstractTestUI { } })); - addComponent(new Button( - "Disable push, re-enable from background thread", - new Button.ClickListener() { - @Override - public void buttonClick(Button.ClickEvent event) { - log.log("Disabling push, enabling polling"); - getPushConfiguration().setPushMode(PushMode.DISABLED); - setPollInterval(1000); - timer.schedule(new CounterTask(), new Date()); - log.log("Push disabled, polling enabled"); - } - })); + addComponent( + new Button("Disable push, re-enable from background thread", + new Button.ClickListener() { + @Override + public void buttonClick(Button.ClickEvent event) { + log.log("Disabling push, enabling polling"); + getPushConfiguration() + .setPushMode(PushMode.DISABLED); + setPollInterval(1000); + timer.schedule(new CounterTask(), new Date()); + log.log("Push disabled, polling enabled"); + } + })); addComponent(log); } diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java b/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java index 873a5c0ff7..19791acefd 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java +++ b/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java @@ -113,8 +113,8 @@ public class PushConfigurator extends VerticalLayout { pushMode.addValueChangeListener(new ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - ui.getPushConfiguration().setPushMode( - (PushMode) pushMode.getValue()); + ui.getPushConfiguration() + .setPushMode((PushMode) pushMode.getValue()); refreshStatus(); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java b/uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java index a1182c0daf..e73f776b3b 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java +++ b/uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java @@ -28,10 +28,10 @@ public class PushErrorHandling extends AbstractTestUI { @Override public void error(com.vaadin.server.ErrorEvent event) { - addComponent(new Label("An error! " - + event.getThrowable().getMessage())); - System.err.println("An error! " - + event.getThrowable().getMessage()); + addComponent(new Label( + "An error! " + event.getThrowable().getMessage())); + System.err.println( + "An error! " + event.getThrowable().getMessage()); } }); @@ -60,8 +60,8 @@ public class PushErrorHandling extends AbstractTestUI { AbstractInMemoryContainer.class) { @Override public Collection<String> getContainerPropertyIds() { - List<String> cpropIds = new ArrayList<String>(super - .getContainerPropertyIds()); + List<String> cpropIds = new ArrayList<String>( + super.getContainerPropertyIds()); cpropIds.add("testid"); return cpropIds; } diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java b/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java index aa0a7c7c58..e0daafab7b 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java +++ b/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java @@ -88,7 +88,8 @@ public abstract class PushLargeData extends AbstractTestUIWithLog { pushDuration); executor.execute(r); log.log("Starting push, size: " + pushSize + ", interval: " - + pushInterval + "ms, duration: " + pushDuration + "ms"); + + pushInterval + "ms, duration: " + pushDuration + + "ms"); } }); addComponent(b); diff --git a/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java b/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java index 9765ccc937..a3a8cd3cb1 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java +++ b/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java @@ -31,14 +31,16 @@ public class RoundTripTest extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { final RoundTripTester roundTripTester = new RoundTripTester(); - final LegacyTextField payloadSize = new LegacyTextField("Payload size (bytes)"); + final LegacyTextField payloadSize = new LegacyTextField( + "Payload size (bytes)"); payloadSize.setConverter(Integer.class); payloadSize.setConvertedValue(10000); if (request.getParameter("payload") != null) { payloadSize.setValue(request.getParameter("payload")); } addComponent(payloadSize); - final LegacyTextField testDuration = new LegacyTextField("Test duration (ms)"); + final LegacyTextField testDuration = new LegacyTextField( + "Test duration (ms)"); testDuration.setConverter(Integer.class); testDuration.setConvertedValue(10000); addComponent(testDuration); diff --git a/uitest/src/main/java/com/vaadin/tests/push/TogglePush.java b/uitest/src/main/java/com/vaadin/tests/push/TogglePush.java index 553fa8f24c..39d8d03c5e 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/TogglePush.java +++ b/uitest/src/main/java/com/vaadin/tests/push/TogglePush.java @@ -36,13 +36,12 @@ public class TogglePush extends AbstractTestUI { addComponent(counterLabel); getPushConfiguration() - .setPushMode( - "disabled".equals(request.getParameter("push")) ? PushMode.DISABLED - : PushMode.AUTOMATIC); + .setPushMode("disabled".equals(request.getParameter("push")) + ? PushMode.DISABLED : PushMode.AUTOMATIC); CheckBox pushSetting = new CheckBox("Push enabled"); - pushSetting.setValue(Boolean.valueOf(getPushConfiguration() - .getPushMode().isEnabled())); + pushSetting.setValue(Boolean + .valueOf(getPushConfiguration().getPushMode().isEnabled())); pushSetting.setImmediate(true); pushSetting.addValueChangeListener(event -> { if (event.getValue()) { @@ -53,8 +52,8 @@ public class TogglePush extends AbstractTestUI { }); addComponent(pushSetting); - addComponent(new Button("Update counter now", - new Button.ClickListener() { + addComponent( + new Button("Update counter now", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { updateCounter(); @@ -81,8 +80,8 @@ public class TogglePush extends AbstractTestUI { } public void updateCounter() { - counterLabel.setValue("Counter has been updated " + counter++ - + " times"); + counterLabel + .setValue("Counter has been updated " + counter++ + " times"); } @Override diff --git a/uitest/src/main/java/com/vaadin/tests/push/TrackMessageSizeUI.java b/uitest/src/main/java/com/vaadin/tests/push/TrackMessageSizeUI.java index 182a2e67e4..4261aeaf5a 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/TrackMessageSizeUI.java +++ b/uitest/src/main/java/com/vaadin/tests/push/TrackMessageSizeUI.java @@ -64,8 +64,8 @@ public class TrackMessageSizeUI extends AbstractTestUIWithLog { } }); - getPage().getJavaScript().execute( - methodImplementation + testMethod + buildTestCase()); + getPage().getJavaScript() + .execute(methodImplementation + testMethod + buildTestCase()); } private String buildTestCase() { diff --git a/uitest/src/main/java/com/vaadin/tests/requesthandlers/AppResource404.java b/uitest/src/main/java/com/vaadin/tests/requesthandlers/AppResource404.java index a6a5a5a084..d3b9962d96 100644 --- a/uitest/src/main/java/com/vaadin/tests/requesthandlers/AppResource404.java +++ b/uitest/src/main/java/com/vaadin/tests/requesthandlers/AppResource404.java @@ -21,8 +21,8 @@ public class AppResource404 extends TestBase { String baseUrl = request.getContextPath() + request.getServletPath(); addComponent(new Link("Existing resource", resource)); - addComponent(new Link("Non-existing resource", new ExternalResource( - baseUrl + "/APP/connector/0/4/asdfasdf"))); + addComponent(new Link("Non-existing resource", + new ExternalResource(baseUrl + "/APP/connector/0/4/asdfasdf"))); addComponent(new Link("/APP/ url that should give 404", new ExternalResource(baseUrl + "/APP/"))); addComponent(new Link("/APPLE url that should go to UI providers", diff --git a/uitest/src/main/java/com/vaadin/tests/resources/DownloadLargeFileResource.java b/uitest/src/main/java/com/vaadin/tests/resources/DownloadLargeFileResource.java index d799e1a8d4..5cc0856a5a 100644 --- a/uitest/src/main/java/com/vaadin/tests/resources/DownloadLargeFileResource.java +++ b/uitest/src/main/java/com/vaadin/tests/resources/DownloadLargeFileResource.java @@ -17,10 +17,9 @@ public class DownloadLargeFileResource extends TestBase { @Override protected void setup() { - Button b = new Button( - "Download a " - + String.format("%.1f", fileSize / 1024.0 / 1024.0) - + "MB file", new Button.ClickListener() { + Button b = new Button("Download a " + + String.format("%.1f", fileSize / 1024.0 / 1024.0) + "MB file", + new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { diff --git a/uitest/src/main/java/com/vaadin/tests/resources/NonExistingFileResource.java b/uitest/src/main/java/com/vaadin/tests/resources/NonExistingFileResource.java index f55c1f1f1d..88ca1cf5b6 100644 --- a/uitest/src/main/java/com/vaadin/tests/resources/NonExistingFileResource.java +++ b/uitest/src/main/java/com/vaadin/tests/resources/NonExistingFileResource.java @@ -25,8 +25,9 @@ public class NonExistingFileResource extends TestBase { @Override public void buttonClick(ClickEvent event) { - FileResource res = new FileResource(new File(VaadinService - .getCurrent().getBaseDirectory() + "/" + filename)); + FileResource res = new FileResource( + new File(VaadinService.getCurrent().getBaseDirectory() + + "/" + filename)); getMainWindow().open(res); } diff --git a/uitest/src/main/java/com/vaadin/tests/resources/ResourceDownload.java b/uitest/src/main/java/com/vaadin/tests/resources/ResourceDownload.java index e323f5285b..40e5192c87 100644 --- a/uitest/src/main/java/com/vaadin/tests/resources/ResourceDownload.java +++ b/uitest/src/main/java/com/vaadin/tests/resources/ResourceDownload.java @@ -51,8 +51,8 @@ public class ResourceDownload extends TestBase { b = new Button("Test", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - ResourceDownload.this.getMainWindow().showNotification( - "Still working"); + ResourceDownload.this.getMainWindow() + .showNotification("Still working"); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerUI.java b/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerUI.java index bac82f232d..0e9c3bce45 100644 --- a/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerUI.java +++ b/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerUI.java @@ -151,18 +151,11 @@ public class RPCLoggerUI extends AbstractTestUIWithLog implements ErrorHandler { for (int i = 0; i < lastActions.size(); i++) { Action action = lastActions.get(i); if (action.invocation instanceof ServerRpcMethodInvocation) { - msg += "\n" - + (i + 1) - + " " - + formatAction(action.target, - (ServerRpcMethodInvocation) action.invocation); + msg += "\n" + (i + 1) + " " + formatAction(action.target, + (ServerRpcMethodInvocation) action.invocation); } else { - msg += "\n" - + (i + 1) - + " " - + formatAction( - action.target, - (LegacyChangeVariablesInvocation) action.invocation); + msg += "\n" + (i + 1) + " " + formatAction(action.target, + (LegacyChangeVariablesInvocation) action.invocation); } } diff --git a/uitest/src/main/java/com/vaadin/tests/serialization/EncodeResultDisplay.java b/uitest/src/main/java/com/vaadin/tests/serialization/EncodeResultDisplay.java index 01d1b14243..1ee8c64bdf 100644 --- a/uitest/src/main/java/com/vaadin/tests/serialization/EncodeResultDisplay.java +++ b/uitest/src/main/java/com/vaadin/tests/serialization/EncodeResultDisplay.java @@ -26,7 +26,8 @@ import com.vaadin.tests.widgetset.client.EncoderResultDisplayConnector.ReportRpc @Widgetset(TestingWidgetSet.NAME) public class EncodeResultDisplay extends AbstractTestUIWithLog { - public static class EncoderResultDisplayExtension extends AbstractExtension { + public static class EncoderResultDisplayExtension + extends AbstractExtension { public EncoderResultDisplayExtension( EncoderResultDisplayConnector.ReportRpc rpc) { registerRpc(rpc); diff --git a/uitest/src/main/java/com/vaadin/tests/serialization/LegacySerializerUI.java b/uitest/src/main/java/com/vaadin/tests/serialization/LegacySerializerUI.java index 618462b203..d0a542f99f 100644 --- a/uitest/src/main/java/com/vaadin/tests/serialization/LegacySerializerUI.java +++ b/uitest/src/main/java/com/vaadin/tests/serialization/LegacySerializerUI.java @@ -29,11 +29,12 @@ import com.vaadin.ui.LegacyComponent; @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet") public class LegacySerializerUI extends AbstractTestUIWithLog { - public class LegacySerializerComponent extends AbstractComponent implements - LegacyComponent { + public class LegacySerializerComponent extends AbstractComponent + implements LegacyComponent { @Override - public void changeVariables(Object source, Map<String, Object> variables) { + public void changeVariables(Object source, + Map<String, Object> variables) { log("doubleInfinity: " + variables.get("doubleInfinity")); } diff --git a/uitest/src/main/java/com/vaadin/tests/serialization/NoLayout.java b/uitest/src/main/java/com/vaadin/tests/serialization/NoLayout.java index 380d83fe28..8fe575a691 100644 --- a/uitest/src/main/java/com/vaadin/tests/serialization/NoLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/serialization/NoLayout.java @@ -43,8 +43,8 @@ public class NoLayout extends AbstractTestUI { }); addComponent(uiPolling); - addComponent(new Button("Change regular state", - new Button.ClickListener() { + addComponent( + new Button("Change regular state", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { event.getButton().setCaption( diff --git a/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java b/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java index d1af180d4e..7f05c91e5f 100644 --- a/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java +++ b/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java @@ -80,14 +80,15 @@ public class SerializerTest extends AbstractTestUI { } }; - rpc.sendBoolean(true, Boolean.FALSE, new boolean[] { true, true, false, - true, false, false }); + rpc.sendBoolean(true, Boolean.FALSE, + new boolean[] { true, true, false, true, false, false }); state.booleanValue = true; state.booleanObjectValue = Boolean.FALSE; state.booleanArray = new boolean[] { true, true, false, true, false, false }; - rpc.sendByte((byte) 5, Byte.valueOf((byte) -12), new byte[] { 3, 1, 2 }); + rpc.sendByte((byte) 5, Byte.valueOf((byte) -12), + new byte[] { 3, 1, 2 }); state.byteValue = (byte) 5; state.byteObjectValue = Byte.valueOf((byte) -12); state.byteArray = new byte[] { 3, 1, 2 }; @@ -102,20 +103,20 @@ public class SerializerTest extends AbstractTestUI { state.intObjectValue = Integer.valueOf(42); state.intArray = new int[] { 5, 7 }; - rpc.sendLong(577431841358l, Long.valueOf(0), new long[] { - -57841235865l, 57 }); + rpc.sendLong(577431841358l, Long.valueOf(0), + new long[] { -57841235865l, 57 }); state.longValue = 577431841359l; state.longObjectValue = Long.valueOf(577431841360l); state.longArray = new long[] { -57841235865l, 57 }; - rpc.sendFloat(3.14159f, Float.valueOf(Math.nextUp(1)), new float[] { - 57, 0, -12 }); + rpc.sendFloat(3.14159f, Float.valueOf(Math.nextUp(1)), + new float[] { 57, 0, -12 }); state.floatValue = 3.14159f; state.floatObjectValue = Float.valueOf(Math.nextUp(1)); state.floatArray = new float[] { 57, 0, -12 }; - rpc.sendDouble(Math.PI, Double.valueOf(-Math.E), new double[] { - Double.MAX_VALUE, Double.MIN_VALUE }); + rpc.sendDouble(Math.PI, Double.valueOf(-Math.E), + new double[] { Double.MAX_VALUE, Double.MIN_VALUE }); state.doubleValue = Math.PI; state.doubleObjectValue = Double.valueOf(-Math.E); state.doubleArray = new double[] { Double.MAX_VALUE, Double.MIN_VALUE }; @@ -129,42 +130,43 @@ public class SerializerTest extends AbstractTestUI { rpc.sendBean( new ComplexTestBean(new SimpleTestBean(0), - new SimpleTestBean(1), Arrays.asList( - new SimpleTestBean(3), new SimpleTestBean(4)), - 5), new SimpleTestBean(6), + new SimpleTestBean(1), + Arrays.asList(new SimpleTestBean(3), + new SimpleTestBean(4)), + 5), + new SimpleTestBean(6), new SimpleTestBean[] { new SimpleTestBean(7) }); state.complexTestBean = new ComplexTestBean(new SimpleTestBean(0), - new SimpleTestBean(1), Arrays.asList(new SimpleTestBean(3), - new SimpleTestBean(4)), 5); + new SimpleTestBean(1), + Arrays.asList(new SimpleTestBean(3), new SimpleTestBean(4)), 5); state.simpleTestBean = new SimpleTestBean(6); - state.simpleTestBeanArray = new SimpleTestBean[] { new SimpleTestBean(7) }; + state.simpleTestBeanArray = new SimpleTestBean[] { + new SimpleTestBean(7) }; rpc.sendNull("Not null", null); state.nullString = null; rpc.sendNestedArray(new int[][] { { 5 }, { 7 } }, - new SimpleTestBean[][] { { new SimpleTestBean(4), - new SimpleTestBean(2) } }); + new SimpleTestBean[][] { + { new SimpleTestBean(4), new SimpleTestBean(2) } }); state.nestedIntArray = new int[][] { { 5 }, { 7 } }; - state.nestedBeanArray = new SimpleTestBean[][] { { - new SimpleTestBean(4), new SimpleTestBean(2) } }; + state.nestedBeanArray = new SimpleTestBean[][] { + { new SimpleTestBean(4), new SimpleTestBean(2) } }; - rpc.sendList(Arrays.asList(5, 8, -234), Arrays.<Connector> asList(this, - testExtension), Arrays.asList(new SimpleTestBean(234), - new SimpleTestBean(-568))); + rpc.sendList(Arrays.asList(5, 8, -234), + Arrays.<Connector> asList(this, testExtension), Arrays.asList( + new SimpleTestBean(234), new SimpleTestBean(-568))); state.intList = Arrays.asList(5, 8, -234); state.connectorList = Arrays.<Connector> asList(this, testExtension); state.simpleTestBeanList = Arrays.asList(new SimpleTestBean(234), new SimpleTestBean(-568)); - rpc.sendArrayList( - Arrays.asList(new int[] { 1, 2 }, new int[] { 3, 4 }), + rpc.sendArrayList(Arrays.asList(new int[] { 1, 2 }, new int[] { 3, 4 }), Arrays.asList(new Integer[] { 5, 6 }, new Integer[] { 7, 8 }), - Collections - .singletonList(new SimpleTestBean[] { new SimpleTestBean( - 7) })); - state.primitiveArrayList = Arrays.asList(new int[] { 1, 2 }, new int[] { - 3, 4 }); + Collections.singletonList( + new SimpleTestBean[] { new SimpleTestBean(7) })); + state.primitiveArrayList = Arrays.asList(new int[] { 1, 2 }, + new int[] { 3, 4 }); state.objectArrayList = Arrays.asList(new Integer[] { 5, 6 }, new Integer[] { 7, 8 }); state.beanArrayList = Collections @@ -174,14 +176,15 @@ public class SerializerTest extends AbstractTestUI { // rpc.sendListArray( // new List[] { Arrays.asList(1, 2), Arrays.asList(3, 4) }, // new List[] { Collections.singletonList(new SimpleTestBean(-1)) }); - rpc.sendSet(new HashSet<Integer>(Arrays.asList(4, 7, 12)), Collections - .singleton((Connector) this), new HashSet<SimpleTestBean>( - Arrays.asList(new SimpleTestBean(1), new SimpleTestBean(2)))); + rpc.sendSet(new HashSet<Integer>(Arrays.asList(4, 7, 12)), + Collections.singleton((Connector) this), + new HashSet<SimpleTestBean>(Arrays.asList(new SimpleTestBean(1), + new SimpleTestBean(2)))); state.intSet = new HashSet<Integer>(Arrays.asList(4, 7, 12)); state.connectorSet = Collections.singleton((Connector) this); - state.beanSet = new HashSet<SimpleTestBean>(Arrays.asList( - new SimpleTestBean(1), new SimpleTestBean(2))); + state.beanSet = new HashSet<SimpleTestBean>( + Arrays.asList(new SimpleTestBean(1), new SimpleTestBean(2))); rpc.sendMap(new HashMap<String, SimpleTestBean>() { { @@ -229,17 +232,19 @@ public class SerializerTest extends AbstractTestUI { } }; - rpc.sendWrappedGenerics(new HashMap<Set<SimpleTestBean>, Map<Integer, List<SimpleTestBean>>>() { - { - put(Collections.singleton(new SimpleTestBean(42)), - new HashMap<Integer, List<SimpleTestBean>>() { - { - put(1, Arrays.asList(new SimpleTestBean(1), - new SimpleTestBean(3))); - } - }); - } - }); + rpc.sendWrappedGenerics( + new HashMap<Set<SimpleTestBean>, Map<Integer, List<SimpleTestBean>>>() { + { + put(Collections.singleton(new SimpleTestBean(42)), + new HashMap<Integer, List<SimpleTestBean>>() { + { + put(1, Arrays.asList( + new SimpleTestBean(1), + new SimpleTestBean(3))); + } + }); + } + }); state.generics = new HashMap<Set<SimpleTestBean>, Map<Integer, List<SimpleTestBean>>>() { { put(Collections.singleton(new SimpleTestBean(42)), @@ -252,8 +257,8 @@ public class SerializerTest extends AbstractTestUI { } }; - rpc.sendEnum(ContentMode.TEXT, new ContentMode[] { - ContentMode.PREFORMATTED, ContentMode.XML }, + rpc.sendEnum(ContentMode.TEXT, + new ContentMode[] { ContentMode.PREFORMATTED, ContentMode.XML }, Arrays.asList(ContentMode.HTML, ContentMode.RAW)); state.contentMode = ContentMode.TEXT; @@ -290,7 +295,8 @@ public class SerializerTest extends AbstractTestUI { } @Override - public void sendChar(char value, Character boxedValue, char[] array) { + public void sendChar(char value, Character boxedValue, + char[] array) { log.log("sendChar: " + value + ", " + boxedValue + ", " + Arrays.toString(array)); } @@ -308,7 +314,8 @@ public class SerializerTest extends AbstractTestUI { } @Override - public void sendFloat(float value, Float boxedValue, float[] array) { + public void sendFloat(float value, Float boxedValue, + float[] array) { log.log("sendFloat: " + value + ", " + boxedValue + ", " + Arrays.toString(array)); } @@ -352,7 +359,8 @@ public class SerializerTest extends AbstractTestUI { @Override public void sendList(List<Integer> intList, - List<Connector> connectorList, List<SimpleTestBean> beanList) { + List<Connector> connectorList, + List<SimpleTestBean> beanList) { log.log("sendList: " + intList + ", " + connectorCollectionToString(connectorList) + ", " + beanList); @@ -519,8 +527,8 @@ public class SerializerTest extends AbstractTestUI { } } - private static class SimpleBeanComparator implements - Comparator<SimpleTestBean> { + private static class SimpleBeanComparator + implements Comparator<SimpleTestBean> { @Override public int compare(SimpleTestBean o1, SimpleTestBean o2) { return Integer.valueOf(o1.getValue()).compareTo(o2.getValue()); diff --git a/uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java b/uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java index 738d8fc681..0612d5f855 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java @@ -65,8 +65,8 @@ public class CSSInjectTest extends TestBase { @Override public InputStream getStream() { - return new ByteArrayInputStream(css - .getBytes()); + return new ByteArrayInputStream( + css.getBytes()); } }, UUID.randomUUID().toString() + ".css")); @@ -75,8 +75,8 @@ public class CSSInjectTest extends TestBase { }); addComponent(injectRandom); - addComponent(new Button("Inject initial again!", - new Button.ClickListener() { + addComponent( + new Button("Inject initial again!", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { stylesheet.add(initialResource); diff --git a/uitest/src/main/java/com/vaadin/tests/themes/LegacyComponentThemeChange.java b/uitest/src/main/java/com/vaadin/tests/themes/LegacyComponentThemeChange.java index 0a57b77aa3..9579888e6d 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/LegacyComponentThemeChange.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/LegacyComponentThemeChange.java @@ -85,7 +85,8 @@ public class LegacyComponentThemeChange extends AbstractTestUIWithLog { Table t = new Table(); t.addActionHandler(new Handler() { @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { } @Override diff --git a/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeOnTheFly.java b/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeOnTheFly.java index 0ea5c18bc9..ad1e0745d5 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeOnTheFly.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeOnTheFly.java @@ -40,8 +40,8 @@ public class ThemeChangeOnTheFly extends AbstractTestUIWithLog { @Override public void buttonClick(ClickEvent event) { - getPage().getStyles().add( - ".v-app { background: blue !important;}"); + getPage().getStyles() + .add(".v-app { background: blue !important;}"); } }); @@ -78,11 +78,11 @@ public class ThemeChangeOnTheFly extends AbstractTestUIWithLog { Label l = new Label("Chameleon theme image in caption"); l.setIcon(new ThemeResource("img/magnifier.png")); images.addComponent(l); - Image image = new Image("Runo theme image", new ThemeResource( - "icons/64/ok.png")); + Image image = new Image("Runo theme image", + new ThemeResource("icons/64/ok.png")); images.addComponent(image); - image = new Image("Reindeer theme image", new ThemeResource( - "button/img/left-focus.png")); + image = new Image("Reindeer theme image", + new ThemeResource("button/img/left-focus.png")); images.addComponent(image); addComponent(images); addComponent(gl); diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ButtonsAndLinks.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ButtonsAndLinks.java index ee88595ba7..20b3612e78 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ButtonsAndLinks.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ButtonsAndLinks.java @@ -34,8 +34,8 @@ import com.vaadin.ui.themes.ValoTheme; */ public class ButtonsAndLinks extends VerticalLayout implements View { /** - * - */ + * + */ public ButtonsAndLinks() { setMargin(true); @@ -157,12 +157,12 @@ public class ButtonsAndLinks extends VerticalLayout implements View { row.setSpacing(true); addComponent(row); - Link link = new Link("vaadin.com", new ExternalResource( - "https://vaadin.com")); + Link link = new Link("vaadin.com", + new ExternalResource("https://vaadin.com")); row.addComponent(link); - link = new Link("Link with icon", new ExternalResource( - "https://vaadin.com")); + link = new Link("Link with icon", + new ExternalResource("https://vaadin.com")); link.addStyleName("color3"); link.setIcon(testIcon.get()); row.addComponent(link); diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/CheckBoxes.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/CheckBoxes.java index f77cf9a315..f9260d31d2 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/CheckBoxes.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/CheckBoxes.java @@ -102,8 +102,8 @@ public class CheckBoxes extends VerticalLayout implements View { OptionGroup options = new OptionGroup("Choose one, explicit width"); options.setWidth("200px"); options.addItem("Option One"); - Item two = options - .addItem("Option Two, with a longer caption that should wrap when the components width is explicitly set."); + Item two = options.addItem( + "Option Two, with a longer caption that should wrap when the components width is explicitly set."); options.addItem("Option Three"); options.select("Option One"); options.setItemIcon("Option One", testIcon.get()); @@ -115,8 +115,8 @@ public class CheckBoxes extends VerticalLayout implements View { options.setMultiSelect(true); options.setWidth("200px"); options.addItem("Option One"); - two = options - .addItem("Option Two, with a longer caption that should wrap when the components width is explicitly set."); + two = options.addItem( + "Option Two, with a longer caption that should wrap when the components width is explicitly set."); options.addItem("Option Three"); options.select("Option One"); options.setItemIcon("Option One", testIcon.get()); diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/CommonParts.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/CommonParts.java index 8c4d9c2e3c..4198e28910 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/CommonParts.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/CommonParts.java @@ -185,8 +185,8 @@ public class CommonParts extends VerticalLayout implements View { } } }); - description - .setValue("A more informative message about what has happened. Nihil hic munitissimus habendi senatus locus, nihil horum? Inmensae subtilitatis, obscuris et malesuada fames. Hi omnes lingua, institutis, legibus inter se differunt."); + description.setValue( + "A more informative message about what has happened. Nihil hic munitissimus habendi senatus locus, nihil horum? Inmensae subtilitatis, obscuris et malesuada fames. Hi omnes lingua, institutis, legibus inter se differunt."); description.setWidth("100%"); addComponent(description); @@ -198,9 +198,9 @@ public class CommonParts extends VerticalLayout implements View { notification.setStyleName(styleString.trim()); } else { typeString = selectedItem.getText().toLowerCase(); - notification - .setStyleName((typeString + " " + styleString - .trim()).trim()); + notification.setStyleName( + (typeString + " " + styleString.trim()) + .trim()); } for (MenuItem item : type.getItems()) { item.setChecked(false); @@ -231,9 +231,9 @@ public class CommonParts extends VerticalLayout implements View { } } if (styleString.trim().length() > 0) { - notification - .setStyleName((typeString + " " + styleString - .trim()).trim()); + notification.setStyleName( + (typeString + " " + styleString.trim()) + .trim()); } else if (typeString.length() > 0) { notification.setStyleName(typeString.trim()); } else { @@ -265,8 +265,8 @@ public class CommonParts extends VerticalLayout implements View { @Override public void valueChange(ValueChangeEvent event) { try { - notification.setDelayMsec(Integer.parseInt(delay - .getValue())); + notification.setDelayMsec( + Integer.parseInt(delay.getValue())); } catch (Exception e) { notification.setDelayMsec(-1); delay.setValue(""); @@ -410,19 +410,21 @@ public class CommonParts extends VerticalLayout implements View { label = new Label("Long"); label.addStyleName(ValoTheme.LABEL_BOLD); - label.setDescription("Long tooltip message. Inmensae subtilitatis, obscuris et malesuada fames. Salutantibus vitae elit libero, a pharetra augue."); + label.setDescription( + "Long tooltip message. Inmensae subtilitatis, obscuris et malesuada fames. Salutantibus vitae elit libero, a pharetra augue."); addComponent(label); label = new Label("HTML tooltip"); label.addStyleName(ValoTheme.LABEL_BOLD); - label.setDescription("<div><h1>Ut enim ad minim veniam, quis nostrud exercitation</h1><p><span>Morbi fringilla convallis sapien, id pulvinar odio volutpat.</span> <span>Vivamus sagittis lacus vel augue laoreet rutrum faucibus.</span> <span>Donec sed odio operae, eu vulputate felis rhoncus.</span> <span>At nos hinc posthac, sitientis piros Afros.</span> <span>Tu quoque, Brute, fili mi, nihil timor populi, nihil!</span></p><p><span>Gallia est omnis divisa in partes tres, quarum.</span> <span>Praeterea iter est quasdam res quas ex communi.</span> <span>Cum ceteris in veneratione tui montes, nascetur mus.</span> <span>Quam temere in vitiis, legem sancimus haerentia.</span> <span>Idque Caesaris facere voluntate liceret: sese habere.</span></p></div>"); + label.setDescription( + "<div><h1>Ut enim ad minim veniam, quis nostrud exercitation</h1><p><span>Morbi fringilla convallis sapien, id pulvinar odio volutpat.</span> <span>Vivamus sagittis lacus vel augue laoreet rutrum faucibus.</span> <span>Donec sed odio operae, eu vulputate felis rhoncus.</span> <span>At nos hinc posthac, sitientis piros Afros.</span> <span>Tu quoque, Brute, fili mi, nihil timor populi, nihil!</span></p><p><span>Gallia est omnis divisa in partes tres, quarum.</span> <span>Praeterea iter est quasdam res quas ex communi.</span> <span>Cum ceteris in veneratione tui montes, nascetur mus.</span> <span>Quam temere in vitiis, legem sancimus haerentia.</span> <span>Idque Caesaris facere voluntate liceret: sese habere.</span></p></div>"); addComponent(label); label = new Label("With an error message"); label.addStyleName(ValoTheme.LABEL_BOLD); label.setDescription("Simple tooltip message"); - label.setComponentError(new UserError( - "Something terrible has happened")); + label.setComponentError( + new UserError("Something terrible has happened")); addComponent(label); label = new Label("With a long error message"); @@ -436,8 +438,8 @@ public class CommonParts extends VerticalLayout implements View { label = new Label("Error message only"); label.addStyleName(ValoTheme.LABEL_BOLD); - label.setComponentError(new UserError( - "Something terrible has happened")); + label.setComponentError( + new UserError("Something terrible has happened")); addComponent(label); } }; @@ -500,17 +502,18 @@ public class CommonParts extends VerticalLayout implements View { tabs.addTab(new Label(" ", ContentMode.HTML), "One more"); tabs.addStyleName(ValoTheme.TABSHEET_PADDED_TABBAR); - tabs.addSelectedTabChangeListener(new SelectedTabChangeListener() { - @Override - public void selectedTabChange( - SelectedTabChangeEvent event) { - try { - Thread.sleep(600); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - }); + tabs.addSelectedTabChangeListener( + new SelectedTabChangeListener() { + @Override + public void selectedTabChange( + SelectedTabChangeEvent event) { + try { + Thread.sleep(600); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + }); content = tabs; } else if (!autoHeight) { Panel p = new Panel(); @@ -609,14 +612,15 @@ public class CommonParts extends VerticalLayout implements View { footerToolbar = selectedItem.isChecked(); } - if (selectedItem.getText().equals("Top Toolbar layout")) { + if (selectedItem.getText() + .equals("Top Toolbar layout")) { toolbarLayout = selectedItem.isChecked(); } if (selectedItem.getText() .equals("Borderless Toolbars")) { - toolbarStyle = selectedItem.isChecked() ? ValoTheme.MENUBAR_BORDERLESS - : null; + toolbarStyle = selectedItem.isChecked() + ? ValoTheme.MENUBAR_BORDERLESS : null; } win.setContent(windowContent()); @@ -625,8 +629,8 @@ public class CommonParts extends VerticalLayout implements View { MenuBar options = new MenuBar(); options.setCaption("Content"); - options.addItem("Auto Height", optionsCommand).setCheckable( - true); + options.addItem("Auto Height", optionsCommand) + .setCheckable(true); options.addItem("Tabs", optionsCommand).setCheckable(true); MenuItem option = options.addItem("Footer", optionsCommand); option.setCheckable(true); @@ -636,10 +640,10 @@ public class CommonParts extends VerticalLayout implements View { options = new MenuBar(); options.setCaption("Toolbars"); - options.addItem("Footer Toolbar", optionsCommand).setCheckable( - true); - options.addItem("Top Toolbar", optionsCommand).setCheckable( - true); + options.addItem("Footer Toolbar", optionsCommand) + .setCheckable(true); + options.addItem("Top Toolbar", optionsCommand) + .setCheckable(true); options.addItem("Top Toolbar layout", optionsCommand) .setCheckable(true); options.addItem("Borderless Toolbars", optionsCommand) @@ -651,8 +655,8 @@ public class CommonParts extends VerticalLayout implements View { @Override public void menuSelected(MenuItem selectedItem) { if (selectedItem.getText().equals("Caption")) { - win.setCaption(selectedItem.isChecked() ? "Window Caption" - : null); + win.setCaption(selectedItem.isChecked() + ? "Window Caption" : null); } else if (selectedItem.getText().equals("Closable")) { win.setClosable(selectedItem.isChecked()); } else if (selectedItem.getText().equals("Resizable")) { diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Dragging.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Dragging.java index 8de518be23..d5aec713df 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Dragging.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Dragging.java @@ -75,9 +75,11 @@ public class Dragging extends VerticalLayout implements View { @Override public void menuSelected(MenuItem selectedItem) { if (selectedItem.isChecked()) { - sample.removeStyleName(ValoTheme.DRAG_AND_DROP_WRAPPER_NO_VERTICAL_DRAG_HINTS); + sample.removeStyleName( + ValoTheme.DRAG_AND_DROP_WRAPPER_NO_VERTICAL_DRAG_HINTS); } else { - sample.addStyleName(ValoTheme.DRAG_AND_DROP_WRAPPER_NO_VERTICAL_DRAG_HINTS); + sample.addStyleName( + ValoTheme.DRAG_AND_DROP_WRAPPER_NO_VERTICAL_DRAG_HINTS); } } }); @@ -88,9 +90,11 @@ public class Dragging extends VerticalLayout implements View { @Override public void menuSelected(MenuItem selectedItem) { if (selectedItem.isChecked()) { - sample.removeStyleName(ValoTheme.DRAG_AND_DROP_WRAPPER_NO_HORIZONTAL_DRAG_HINTS); + sample.removeStyleName( + ValoTheme.DRAG_AND_DROP_WRAPPER_NO_HORIZONTAL_DRAG_HINTS); } else { - sample.addStyleName(ValoTheme.DRAG_AND_DROP_WRAPPER_NO_HORIZONTAL_DRAG_HINTS); + sample.addStyleName( + ValoTheme.DRAG_AND_DROP_WRAPPER_NO_HORIZONTAL_DRAG_HINTS); } } }); @@ -101,9 +105,11 @@ public class Dragging extends VerticalLayout implements View { @Override public void menuSelected(MenuItem selectedItem) { if (selectedItem.isChecked()) { - sample.removeStyleName(ValoTheme.DRAG_AND_DROP_WRAPPER_NO_BOX_DRAG_HINTS); + sample.removeStyleName( + ValoTheme.DRAG_AND_DROP_WRAPPER_NO_BOX_DRAG_HINTS); } else { - sample.addStyleName(ValoTheme.DRAG_AND_DROP_WRAPPER_NO_BOX_DRAG_HINTS); + sample.addStyleName( + ValoTheme.DRAG_AND_DROP_WRAPPER_NO_BOX_DRAG_HINTS); } } }); @@ -130,15 +136,15 @@ public class Dragging extends VerticalLayout implements View { label.setWidth("120px"); components.add(label); - final Embedded image = new Embedded("", new ThemeResource( - "../runo/icons/64/document.png")); + final Embedded image = new Embedded("", + new ThemeResource("../runo/icons/64/document.png")); components.add(image); final CssLayout documentLayout = new CssLayout(); documentLayout.setWidth("19px"); for (int i = 0; i < 5; ++i) { - final Embedded e = new Embedded(null, new ThemeResource( - "../runo/icons/16/document.png")); + final Embedded e = new Embedded(null, + new ThemeResource("../runo/icons/16/document.png")); e.setHeight("16px"); e.setWidth("16px"); documentLayout.addComponent(e); @@ -202,16 +208,16 @@ public class Dragging extends VerticalLayout implements View { } // drop on top of target? - if (dropTargetData.getData("horizontalLocation").equals( - HorizontalDropLocation.CENTER.toString())) { + if (dropTargetData.getData("horizontalLocation") + .equals(HorizontalDropLocation.CENTER.toString())) { if (sourceWasAfterTarget) { index--; } } // drop before the target? - else if (dropTargetData.getData("horizontalLocation").equals( - HorizontalDropLocation.LEFT.toString())) { + else if (dropTargetData.getData("horizontalLocation") + .equals(HorizontalDropLocation.LEFT.toString())) { index--; if (index < 0) { index = 0; diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/FormLayoutInsideTable.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/FormLayoutInsideTable.java index 1d7ba7eefb..b7a231763a 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/FormLayoutInsideTable.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/FormLayoutInsideTable.java @@ -18,7 +18,8 @@ public class FormLayoutInsideTable extends AbstractTestUI { private static final long serialVersionUID = 1L; @Override - public Object generateCell(Table source, Object itemId, Object columnId) { + public Object generateCell(Table source, Object itemId, + Object columnId) { FormLayout layout = new FormLayout(); layout.addComponent(new Label("Line 1 " + itemId)); layout.addComponent(new Label("Line 2 " + itemId)); @@ -30,4 +31,5 @@ public class FormLayoutInsideTable extends AbstractTestUI { table.setSizeFull(); table.addItem("abc0"); addComponent(table); - }} + } +} diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/MenuBars.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/MenuBars.java index fc74166b29..0eec1a71f4 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/MenuBars.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/MenuBars.java @@ -161,8 +161,8 @@ public class MenuBars extends VerticalLayout implements View { Command check = new Command() { @Override public void menuSelected(MenuItem selectedItem) { - Notification.show(selectedItem.isChecked() ? "Checked" - : "Unchecked"); + Notification.show( + selectedItem.isChecked() ? "Checked" : "Unchecked"); } }; diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java index 58988c06d6..896801dba0 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java @@ -74,11 +74,13 @@ public class PopupViews extends VerticalLayout implements View { return new VerticalLayout() { { setMargin(true); - addComponent(new Label( - "<h3>Thanks for waiting!</h3><p>You've opened this popup <b>" - + ++count + " time" - + (count > 1 ? "s" : " only") - + "</b>.</p>", ContentMode.HTML)); + addComponent( + new Label( + "<h3>Thanks for waiting!</h3><p>You've opened this popup <b>" + + ++count + " time" + + (count > 1 ? "s" : " only") + + "</b>.</p>", + ContentMode.HTML)); } }; } diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java index e20d3c49c5..194c4cf31c 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java @@ -178,7 +178,8 @@ public class Tables extends VerticalLayout implements View { table.removeGeneratedColumn("progress"); if (componentsInRows) { - table.addContainerProperty("textfield", LegacyTextField.class, null); + table.addContainerProperty("textfield", LegacyTextField.class, + null); table.addGeneratedColumn("textfield", new ColumnGenerator() { @Override public Object generateCell(Table source, Object itemId, @@ -193,7 +194,8 @@ public class Tables extends VerticalLayout implements View { } }); - table.addContainerProperty("datefield", LegacyTextField.class, null); + table.addContainerProperty("datefield", LegacyTextField.class, + null); table.addGeneratedColumn("datefield", new ColumnGenerator() { @Override public Object generateCell(Table source, Object itemId, @@ -255,7 +257,8 @@ public class Tables extends VerticalLayout implements View { } }); - table.addContainerProperty("optiongroup", LegacyTextField.class, null); + table.addContainerProperty("optiongroup", LegacyTextField.class, + null); table.addGeneratedColumn("optiongroup", new ColumnGenerator() { @Override public Object generateCell(Table source, Object itemId, diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Tabsheets.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Tabsheets.java index f808cc1525..f06549317d 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Tabsheets.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Tabsheets.java @@ -115,15 +115,14 @@ public class Tabsheets extends VerticalLayout implements View { style += padded.getValue() ? " padded-tabbar" : ""; style += compact.getValue() ? " compact-tabbar" : ""; style += iconsOnTop.getValue() ? " icons-on-top" : ""; - style += selectedOnly.getValue() ? " only-selected-closable" - : ""; + style += selectedOnly.getValue() ? " only-selected-closable" : ""; if (tabs != null) { removeComponent(tabs); } tabs = getTabSheet(caption.getValue(), style.trim(), - closable.getValue(), overflow.getValue(), - icon.getValue(), disable.getValue()); + closable.getValue(), overflow.getValue(), icon.getValue(), + disable.getValue()); addComponent(tabs); }; closable.addValueChangeListener(update); @@ -144,8 +143,8 @@ public class Tabsheets extends VerticalLayout implements View { icon.setValue(true); } - static TabSheet getTabSheet(boolean caption, String style, - boolean closable, boolean scrolling, boolean icon, boolean disable) { + static TabSheet getTabSheet(boolean caption, String style, boolean closable, + boolean scrolling, boolean icon, boolean disable) { TestIcon testIcon = new TestIcon(60); TabSheet ts = new TabSheet(); @@ -153,8 +152,8 @@ public class Tabsheets extends VerticalLayout implements View { StringGenerator sg = new StringGenerator(); for (int i = 1; i <= (scrolling ? 10 : 3); i++) { - String tabcaption = caption ? sg.nextString(true) + " " - + sg.nextString(false) : null; + String tabcaption = caption + ? sg.nextString(true) + " " + sg.nextString(false) : null; VerticalLayout content = new VerticalLayout(); content.setMargin(true); diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/TestIcon.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/TestIcon.java index 0d34bf2b63..db58dd1feb 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/TestIcon.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/TestIcon.java @@ -50,7 +50,8 @@ public class TestIcon { } return ICONS.get(iconCount); } - return new ThemeResource("../runo/icons/" + imageSize + "/document.png"); + return new ThemeResource( + "../runo/icons/" + imageSize + "/document.png"); } static List<FontAwesome> ICONS = new ArrayList<FontAwesome>(); diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java index 3bf6fd7ca3..091bff5698 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java @@ -92,8 +92,8 @@ public class ValoThemeUI extends UI { testMode = true; if (browserCantRenderFontsConsistently()) { - getPage().getStyles().add( - ".v-app.v-app.v-app {font-family: Sans-Serif;}"); + getPage().getStyles() + .add(".v-app.v-app.v-app {font-family: Sans-Serif;}"); } } @@ -159,9 +159,8 @@ public class ValoThemeUI extends UI { for (Iterator<Component> it = menuItemsLayout .iterator(); it.hasNext();) { Component c = it.next(); - if (c.getCaption() != null - && c.getCaption().startsWith( - item.getValue())) { + if (c.getCaption() != null && c.getCaption() + .startsWith(item.getValue())) { c.addStyleName("selected"); break; } @@ -281,8 +280,9 @@ public class ValoThemeUI extends UI { StringGenerator sg = new StringGenerator(); MenuItem settingsItem = settings.addItem( sg.nextString(true) + " " + sg.nextString(true) - + sg.nextString(false), new ThemeResource( - "../tests-valo/img/profile-pic-300px.jpg"), null); + + sg.nextString(false), + new ThemeResource("../tests-valo/img/profile-pic-300px.jpg"), + null); settingsItem.addItem("Edit Profile", null); settingsItem.addItem("Preferences", null); settingsItem.addSeparator(); @@ -303,9 +303,9 @@ public class ValoThemeUI extends UI { menuItemsLayout.addComponent(label); } if (item.getKey().equals("panels")) { - label.setValue(label.getValue() - + " <span class=\"valo-menu-badge\">" + count - + "</span>"); + label.setValue( + label.getValue() + " <span class=\"valo-menu-badge\">" + + count + "</span>"); count = 0; label = new Label("Containers", ContentMode.HTML); label.setPrimaryStyleName(ValoTheme.MENU_SUBTITLE); @@ -314,9 +314,9 @@ public class ValoThemeUI extends UI { menuItemsLayout.addComponent(label); } if (item.getKey().equals("calendar")) { - label.setValue(label.getValue() - + " <span class=\"valo-menu-badge\">" + count - + "</span>"); + label.setValue( + label.getValue() + " <span class=\"valo-menu-badge\">" + + count + "</span>"); count = 0; label = new Label("Other", ContentMode.HTML); label.setPrimaryStyleName(ValoTheme.MENU_SUBTITLE); @@ -404,16 +404,16 @@ public class ValoThemeUI extends UI { container.addContainerProperty(CAPTION_PROPERTY, String.class, null); container.addContainerProperty(ICON_PROPERTY, Resource.class, null); container.addContainerProperty(INDEX_PROPERTY, Integer.class, null); - container - .addContainerProperty(DESCRIPTION_PROPERTY, String.class, null); + container.addContainerProperty(DESCRIPTION_PROPERTY, String.class, + null); for (int i = 1; i < size + 1; i++) { Item item = container.addItem(i); - item.getItemProperty(CAPTION_PROPERTY).setValue( - sg.nextString(true) + " " + sg.nextString(false)); + item.getItemProperty(CAPTION_PROPERTY) + .setValue(sg.nextString(true) + " " + sg.nextString(false)); item.getItemProperty(INDEX_PROPERTY).setValue(i); - item.getItemProperty(DESCRIPTION_PROPERTY).setValue( - sg.nextString(true) + " " + sg.nextString(false) + " " - + sg.nextString(false)); + item.getItemProperty(DESCRIPTION_PROPERTY) + .setValue(sg.nextString(true) + " " + sg.nextString(false) + + " " + sg.nextString(false)); item.getItemProperty(ICON_PROPERTY).setValue(testIcon.get()); } container.getItem(container.getIdByIndex(0)) @@ -426,28 +426,28 @@ public class ValoThemeUI extends UI { Item child = container.addItem(id); child.getItemProperty(CAPTION_PROPERTY).setValue( sg.nextString(true) + " " + sg.nextString(false)); - child.getItemProperty(ICON_PROPERTY).setValue( - testIcon.get()); + child.getItemProperty(ICON_PROPERTY) + .setValue(testIcon.get()); ((Hierarchical) container).setParent(id, i); for (int k = 1; k < 6; k++) { String id2 = id + " -> " + k; child = container.addItem(id2); - child.getItemProperty(CAPTION_PROPERTY).setValue( - sg.nextString(true) + " " + child.getItemProperty(CAPTION_PROPERTY) + .setValue(sg.nextString(true) + " " + sg.nextString(false)); - child.getItemProperty(ICON_PROPERTY).setValue( - testIcon.get()); + child.getItemProperty(ICON_PROPERTY) + .setValue(testIcon.get()); ((Hierarchical) container).setParent(id2, id); for (int l = 1; l < 5; l++) { String id3 = id2 + " -> " + l; child = container.addItem(id3); - child.getItemProperty(CAPTION_PROPERTY).setValue( - sg.nextString(true) + " " + child.getItemProperty(CAPTION_PROPERTY) + .setValue(sg.nextString(true) + " " + sg.nextString(false)); - child.getItemProperty(ICON_PROPERTY).setValue( - testIcon.get()); + child.getItemProperty(ICON_PROPERTY) + .setValue(testIcon.get()); ((Hierarchical) container).setParent(id3, id2); } } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1230.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1230.java index 3a707934b6..e2038b19b1 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1230.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1230.java @@ -124,8 +124,8 @@ public class Ticket1230 extends LegacyApplication { } - w.addComponent(new Button("print select values", - new Button.ClickListener() { + w.addComponent( + new Button("print select values", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { printState(); @@ -152,8 +152,8 @@ public class Ticket1230 extends LegacyApplication { void printState() { System.out.println(" Select without null item " + selectWithoutNullItem.getValue()); - System.out.println(" Select with null item " - + selectWithNullItem.getValue()); + System.out.println( + " Select with null item " + selectWithNullItem.getValue()); } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1397.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1397.java index e176d4637f..6ba6236e4a 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1397.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1397.java @@ -95,7 +95,8 @@ public class Ticket1397 extends LegacyApplication { panel3Layout.setMargin(true); final Panel panel3 = new Panel("Editor popup for a property", panel3Layout); - LegacyTextField tf2 = new LegacyTextField("TextField for editing a property"); + LegacyTextField tf2 = new LegacyTextField( + "TextField for editing a property"); final ObjectProperty<String> op = new ObjectProperty<String>( "This is property text."); tf2.setPropertyDataSource(op); @@ -141,7 +142,8 @@ public class Ticket1397 extends LegacyApplication { final int lineNum = i; PopupView pp2 = new PopupView(new PopupView.Content() { - LegacyTextField tf = new LegacyTextField("Editor for line " + lineNum, + LegacyTextField tf = new LegacyTextField( + "Editor for line " + lineNum, "Try to edit the contents for this textfield on line " + lineNum diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1435.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1435.java index 9c8f400e1d..930a3bd0ec 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1435.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1435.java @@ -139,8 +139,8 @@ public class Ticket1435 extends LegacyApplication { } else { root.setHeight(lastHeight, lastHeightUnit); } - event.getButton().setCaption( - visible ? "Expand" : "Collapse"); + event.getButton() + .setCaption(visible ? "Expand" : "Collapse"); } } }); @@ -225,8 +225,9 @@ public class Ticket1435 extends LegacyApplication { for (int i = 0; i < 10; i++) { String name = "Name " + i; - table.addItem(new Object[] { new CheckBox(), name, - "02-22-2007 13:37" }, new Integer(i)); + table.addItem( + new Object[] { new CheckBox(), name, "02-22-2007 13:37" }, + new Integer(i)); } panel.setPanelComponent(table); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_Panel.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_Panel.java index b59b7f8e5e..31db37c279 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_Panel.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_Panel.java @@ -25,8 +25,9 @@ public class Ticket1506_Panel extends Panel { layout.addComponent(initSelect(new Ticket1506_TestContainer(), "Test select", property1)); layout.addComponent(initButton(property1)); - layout.addComponent(initSelect(new Ticket1506_TestContainer2(), - "Test select 2", new ObjectProperty<String>(null, String.class))); + layout.addComponent( + initSelect(new Ticket1506_TestContainer2(), "Test select 2", + new ObjectProperty<String>(null, String.class))); } private Component initButton(final ObjectProperty<?> property) { diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_TestContainer.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_TestContainer.java index d6b53db7c7..d8d074404a 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_TestContainer.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_TestContainer.java @@ -24,17 +24,17 @@ public class Ticket1506_TestContainer implements Container { private void loadItems() { final PropertysetItem item1 = new PropertysetItem(); - item1.addItemProperty(PROPERTY_1_ID, new ObjectProperty<String>( - "value 1", String.class)); - item1.addItemProperty(PROPERTY_2_ID, new ObjectProperty<String>( - "name 1", String.class)); + item1.addItemProperty(PROPERTY_1_ID, + new ObjectProperty<String>("value 1", String.class)); + item1.addItemProperty(PROPERTY_2_ID, + new ObjectProperty<String>("name 1", String.class)); items.put(ITEM_1_ID, item1); final PropertysetItem item2 = new PropertysetItem(); - item2.addItemProperty(PROPERTY_1_ID, new ObjectProperty<String>( - "value 2", String.class)); - item2.addItemProperty(PROPERTY_2_ID, new ObjectProperty<String>( - "name 2", String.class)); + item2.addItemProperty(PROPERTY_1_ID, + new ObjectProperty<String>("value 2", String.class)); + item2.addItemProperty(PROPERTY_2_ID, + new ObjectProperty<String>("name 2", String.class)); items.put(ITEM_2_ID, item2); } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java index 288a9ef7d2..2854125fe4 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java @@ -25,10 +25,10 @@ public class Ticket1506_TestContainer2 implements Container { private void loadItems() { for (int i = 1; i < 15; i++) { final PropertysetItem item = new PropertysetItem(); - item.addItemProperty(PROPERTY_1_ID, new ObjectProperty<String>( - "value " + i, String.class)); - item.addItemProperty(PROPERTY_2_ID, new ObjectProperty<String>( - "name " + i, String.class)); + item.addItemProperty(PROPERTY_1_ID, + new ObjectProperty<String>("value " + i, String.class)); + item.addItemProperty(PROPERTY_2_ID, + new ObjectProperty<String>("name " + i, String.class)); items.put(String.valueOf(i), item); } } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1598.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1598.java index a890c08ddb..926551ad3b 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1598.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1598.java @@ -47,8 +47,8 @@ public class Ticket1598 extends LegacyApplication { @Override public void menuSelected(MenuItem selected) { - main.showNotification("Action " - + selected.getText()); + main.showNotification( + "Action " + selected.getText()); } }); } @@ -60,8 +60,8 @@ public class Ticket1598 extends LegacyApplication { @Override public void menuSelected(MenuItem selected) { - main.showNotification("Action " - + selected.getText()); + main.showNotification( + "Action " + selected.getText()); } }); } @@ -74,8 +74,8 @@ public class Ticket1598 extends LegacyApplication { @Override public void menuSelected(MenuItem selected) { - main.showNotification("Action " - + selected.getText()); + main.showNotification( + "Action " + selected.getText()); } }); } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1632.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1632.java index c227bcc3d8..c2c38d029c 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1632.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1632.java @@ -49,7 +49,8 @@ public class Ticket1632 extends LegacyApplication { public void buttonClick(ClickEvent event) { visible = !visible; if (visible) { - t.setVisibleColumns(new Object[] { "col1", "col2", "col3" }); + t.setVisibleColumns( + new Object[] { "col1", "col2", "col3" }); } else { t.setVisibleColumns(new Object[] { "col1", "col2" }); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1659.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1659.java index 826a5539d8..5f017e95ad 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1659.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1659.java @@ -12,14 +12,13 @@ public class Ticket1659 extends LegacyApplication { public void init() { final LegacyWindow mainWin = new LegacyWindow(); setMainWindow(mainWin); - mainWin.addComponent(new Button( - "Change URI using Application.getURL()", + mainWin.addComponent(new Button("Change URI using Application.getURL()", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - mainWin.open(new ExternalResource(getURL() + "#" - + System.currentTimeMillis())); + mainWin.open(new ExternalResource( + getURL() + "#" + System.currentTimeMillis())); } })); mainWin.addComponent(new Button("Change URI uring Window.getURL()", @@ -27,8 +26,8 @@ public class Ticket1659 extends LegacyApplication { @Override public void buttonClick(ClickEvent event) { - mainWin.open(new ExternalResource(mainWin.getURL() - + "#" + System.currentTimeMillis())); + mainWin.open(new ExternalResource(mainWin.getURL() + "#" + + System.currentTimeMillis())); } })); } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1663.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1663.java index 9978cb24d1..69ec6f0b70 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1663.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1663.java @@ -13,9 +13,10 @@ public class Ticket1663 extends com.vaadin.server.LegacyApplication { setMainWindow(main); LegacyTextField tf = new LegacyTextField("First name"); - tf.setDescription("The first name is used for the administration user interfaces only."); - tf.setComponentError(new SystemError( - "You must enter only one first name.")); + tf.setDescription( + "The first name is used for the administration user interfaces only."); + tf.setComponentError( + new SystemError("You must enter only one first name.")); main.addComponent(tf); } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1737.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1737.java index 33515bad87..9db5665cf7 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1737.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1737.java @@ -12,7 +12,8 @@ import com.vaadin.ui.VerticalLayout; public class Ticket1737 extends LegacyApplication { - Resource slowRes = new ClassResource(Ticket1737.class, "m-bullet-blue.gif") { + Resource slowRes = new ClassResource(Ticket1737.class, + "m-bullet-blue.gif") { @Override public DownloadStream getStream() { try { @@ -39,8 +40,8 @@ public class Ticket1737 extends LegacyApplication { Panel p = new Panel("Test panel", pl); p.setSizeFull(); - pl.addComponent(new Label( - "Second component is embedded with a slow resource " + pl.addComponent( + new Label("Second component is embedded with a slow resource " + "and thus should break layout if Embedded cannot" + " request re-layout after load.")); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1772.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1772.java index 50b01134ce..267afc5fa2 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1772.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1772.java @@ -27,8 +27,8 @@ public class Ticket1772 extends com.vaadin.server.LegacyApplication { @Override public void buttonClick(ClickEvent event) { - gridLayout - .addComponent(new LegacyTextField("Content " + (++counter))); + gridLayout.addComponent( + new LegacyTextField("Content " + (++counter))); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1804.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1804.java index fed4f6b151..bd451b9b80 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1804.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1804.java @@ -39,37 +39,42 @@ public class Ticket1804 extends com.vaadin.server.LegacyApplication { s = new Select("Testcase from the ticket #1804"); s.setNullSelectionAllowed(false); - s.setPropertyDataSource(new MethodProperty<String>(new TestPojo(), "id")); - s.addValidator(new EmptyStringValidator( - "Selection required for test-field")); + s.setPropertyDataSource( + new MethodProperty<String>(new TestPojo(), "id")); + s.addValidator( + new EmptyStringValidator("Selection required for test-field")); s.setRequired(true); listOfAllFields.add(s); s = new Select("Testcase from the ticket #1804, but without validator"); s.setNullSelectionAllowed(false); - s.setPropertyDataSource(new MethodProperty<String>(new TestPojo(), "id")); + s.setPropertyDataSource( + new MethodProperty<String>(new TestPojo(), "id")); s.setRequired(true); listOfAllFields.add(s); s = new Select( "Testcase from the ticket #1804, but with required=false"); s.setNullSelectionAllowed(false); - s.setPropertyDataSource(new MethodProperty<String>(new TestPojo(), "id")); - s.addValidator(new EmptyStringValidator( - "Selection required for test-field")); + s.setPropertyDataSource( + new MethodProperty<String>(new TestPojo(), "id")); + s.addValidator( + new EmptyStringValidator("Selection required for test-field")); listOfAllFields.add(s); s = new Select( "Testcase from the ticket #1804, but without validator and with required=false"); s.setNullSelectionAllowed(false); - s.setPropertyDataSource(new MethodProperty<String>(new TestPojo(), "id")); + s.setPropertyDataSource( + new MethodProperty<String>(new TestPojo(), "id")); listOfAllFields.add(s); s = new Select( "Required=true, custom error message, null selection not allowed"); s.setRequired(true); s.setNullSelectionAllowed(false); - s.setPropertyDataSource(new MethodProperty<String>(new TestPojo(), "id")); + s.setPropertyDataSource( + new MethodProperty<String>(new TestPojo(), "id")); s.setValue(null); s.setComponentError(new SystemError("Test error message")); listOfAllFields.add(s); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1805.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1805.java index 81434d3316..2e387ea9bc 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1805.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1805.java @@ -28,7 +28,8 @@ public class Ticket1805 extends com.vaadin.server.LegacyApplication { final GridLayout grid = new GridLayout(4, 1); - final LegacyTextField size = new LegacyTextField("Grid width in css unit"); + final LegacyTextField size = new LegacyTextField( + "Grid width in css unit"); size.addListener(new ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1806.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1806.java index 8705112f75..e55fa72d10 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1806.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1806.java @@ -29,15 +29,15 @@ public class Ticket1806 extends com.vaadin.server.LegacyApplication { tf1.commit(); } })); - main.addComponent(new Button("Show property value", - new Button.ClickListener() { + main.addComponent( + new Button("Show property value", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { main.showNotification("'" + prop.getValue() + "'"); } })); - main.addComponent(new Button("Show field value", - new Button.ClickListener() { + main.addComponent( + new Button("Show field value", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { main.showNotification("'" + tf1.getValue() + "'"); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java index 60078daacd..1fd72efd78 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java @@ -9,8 +9,8 @@ import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; -public class Ticket1834PanelScrolling extends - com.vaadin.server.LegacyApplication { +public class Ticket1834PanelScrolling + extends com.vaadin.server.LegacyApplication { private static final int ROWS = 50; @@ -79,10 +79,8 @@ public class Ticket1834PanelScrolling extends p = new Panel("TestPanel", pl); for (int i = 0; i < ROWS; i++) { - pl.addComponent(new Label( - "Label" - + i - + ".................................................................................................................")); + pl.addComponent(new Label("Label" + i + + ".................................................................................................................")); } p.setHeight("300px"); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1857.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1857.java index 3d64f9d426..f956a172d1 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1857.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1857.java @@ -54,14 +54,13 @@ public class Ticket1857 extends LegacyApplication implements Handler { @Override public String getStyle(Table source, Object itemId, Object propertyId) { - Object cell = t.getContainerProperty(itemId, - propertyId).getValue(); + Object cell = t.getContainerProperty(itemId, propertyId) + .getValue(); if (!(cell instanceof Integer)) { return null; } int age = ((Integer) cell).intValue(); - return age > 65 ? "old" : (age < 18 ? "young" - : null); + return age > 65 ? "old" : (age < 18 ? "young" : null); } }); } else { diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1921.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1921.java index ab43b45576..07c9090485 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1921.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1921.java @@ -109,8 +109,8 @@ public class Ticket1921 extends LegacyApplication implements RequestHandler { int rr = Integer.parseInt(v[0]); int rs = Integer.parseInt(v[1]); if (rr < round || (rr == round && rs < state)) { - getMainWindow().showNotification( - "Already past requested " + s[0]); + getMainWindow() + .showNotification("Already past requested " + s[0]); return false; } while (round < rr || state < rs) { diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1923.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1923.java index 939fe05e58..69efc3d9a9 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1923.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1923.java @@ -23,10 +23,8 @@ public class Ticket1923 extends com.vaadin.server.LegacyApplication { // p.getLayout().setWidth("100%"); // p.setContent(new GridLayout(1, 100)); for (int i = 0; i < ROWS; i++) { - pl.addComponent(new Label( - "Label" - + i - + " 5067w09adsfasdjfahlsdfjhalfjhaldjfhalsjdfhlajdhflajhdfljahdslfjahldsjfhaljdfhaljfdhlajsdhflajshdflkajhsdlfkjahsldfkjahsldfhalskjfdhlksjfdh857idifhaljsdfhlajsdhflajhdflajhdfljahldfjhaljdfhalsjdfhalkjdhflkajhdfljahsdlfjahlsdjfhaldjfhaljfdhlajdhflajshdfljahsdlfjhalsjdfhalskjhfdlhusfglksuhdflgjshflgjhslfghslfjghsljfglsjhfglsjhfgljshfgljshflgjhslfghsljfgsljdfglsdjhfglsjhflgkjshfldjgh")); + pl.addComponent(new Label("Label" + i + + " 5067w09adsfasdjfahlsdfjhalfjhaldjfhalsjdfhlajdhflajhdfljahdslfjahldsjfhaljdfhaljfdhlajsdhflajshdflkajhsdlfkjahsldfkjahsldfhalskjfdhlksjfdh857idifhaljsdfhlajsdhflajhdflajhdfljahldfjhaljdfhalsjdfhalkjdhflkajhdfljahsdlfjahlsdjfhaldjfhaljfdhlajdhflajshdfljahsdlfjhalsjdfhalskjhfdlhusfglksuhdflgjshflgjhslfghslfjghsljfglsjhfglsjhfgljshfgljshflgjhslfghsljfgsljdfglsdjhfglsjhflgkjshfldjgh")); } // main.getLayout().setSizeFull(); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1939.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1939.java index 29786fa646..0ab447488f 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1939.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1939.java @@ -24,8 +24,8 @@ public class Ticket1939 extends LegacyApplication { l.addComponent(t); w.addComponent(l); - w.addComponent(new Button("show me the bug", - new Button.ClickListener() { + w.addComponent( + new Button("show me the bug", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { l.setWidth(null); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966.java index 2023094458..dff2bd1769 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966.java @@ -103,9 +103,9 @@ public class Ticket1966 extends LegacyApplication { } private Button getButton(Layout l, Alignment align) { - Button b = new Button("Narrow Button - " - + align.getHorizontalAlignment() + " - " - + align.getVerticalAlignment()); + Button b = new Button( + "Narrow Button - " + align.getHorizontalAlignment() + " - " + + align.getVerticalAlignment()); b.setWidth("100px"); ((AlignmentHandler) l).setComponentAlignment(b, align); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966_3.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966_3.java index 60088582a5..686027e9c1 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966_3.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966_3.java @@ -29,7 +29,8 @@ public class Ticket1966_3 extends LegacyApplication { p.setHeight("300px"); ol.setSizeFull(); - LegacyTextField tf = new LegacyTextField("Long caption, longer than 100 pixels"); + LegacyTextField tf = new LegacyTextField( + "Long caption, longer than 100 pixels"); tf.setWidth("100px"); ol.addComponent(tf); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1969.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1969.java index 73746fb07d..a33aea1565 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1969.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1969.java @@ -43,8 +43,7 @@ public class Ticket1969 extends com.vaadin.server.LegacyApplication { Button b; - b = new Button( - "change introduction caption (should add * to tab name)", + b = new Button("change introduction caption (should add * to tab name)", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1970.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1970.java index eb98153be0..98cd131197 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1970.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1970.java @@ -35,14 +35,14 @@ public class Ticket1970 extends LegacyApplication { addWindow(w); w.addComponent(new Label( "This window has been created on fly for name: " + name)); - w.addComponent(new Button("Show open windows", - new Button.ClickListener() { + w.addComponent( + new Button("Show open windows", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { String openWindows = ""; - for (Iterator<LegacyWindow> i = getWindows().iterator(); i - .hasNext();) { + for (Iterator<LegacyWindow> i = getWindows() + .iterator(); i.hasNext();) { LegacyWindow t = i.next(); openWindows += (openWindows.length() > 0 ? "," : "") + t.getName(); @@ -60,12 +60,14 @@ public class Ticket1970 extends LegacyApplication { new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - w.showNotification("Name of this window = " - + w.getName()); + w.showNotification( + "Name of this window = " + w.getName()); } })); - w.addComponent(new Label("<a href='" + getURL().toExternalForm() + "'>" - + getURL().toExternalForm() + "</a>", ContentMode.HTML)); + w.addComponent(new Label( + "<a href='" + getURL().toExternalForm() + "'>" + + getURL().toExternalForm() + "</a>", + ContentMode.HTML)); w.addComponent(new Label( "<h2>How to reproduce</h2>Open the above link in another browser" + " window and then press the Show-button on this window.", diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1975.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1975.java index 18caac808b..921b4573eb 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1975.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1975.java @@ -34,8 +34,8 @@ public class Ticket1975 extends LegacyApplication { cl1 = new CustomLayout(new ByteArrayInputStream(s.getBytes())); layout.addComponent(cl1); - layout.addComponent(new Button("Disable/Enable", - new ClickListener() { + layout.addComponent( + new Button("Disable/Enable", new ClickListener() { @Override public void buttonClick(ClickEvent event) { diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1982.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1982.java index d8ec0f63fb..de162c50c6 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1982.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1982.java @@ -67,8 +67,8 @@ public class Ticket1982 extends LegacyApplication { min.setVisible(true); max.setVisible(false); TitleBar.this.layout.removeAllComponents(); - TitleBar.this.layout - .addComponent(TitleBar.this, 0, 0, 1, 1); + TitleBar.this.layout.addComponent(TitleBar.this, 0, 0, 1, + 1); } }); min.addListener(new ClickListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1983.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1983.java index 7ebd9c421a..993663b6e5 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1983.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1983.java @@ -50,25 +50,17 @@ public class Ticket1983 extends LegacyApplication { dataSource.addContainerProperty(propId, String.class, null); dataSource.addContainerProperty(propId2, String.class, null); final Object itemId = dataSource.addItem(); - dataSource - .getItem(itemId) - .getItemProperty(propId) - .setValue( - "Very long value that makes a scrollbar appear for sure"); - dataSource - .getItem(itemId) - .getItemProperty(propId2) - .setValue( - "Very long value that makes a scrollbar appear for sure"); + dataSource.getItem(itemId).getItemProperty(propId).setValue( + "Very long value that makes a scrollbar appear for sure"); + dataSource.getItem(itemId).getItemProperty(propId2).setValue( + "Very long value that makes a scrollbar appear for sure"); for (int i = 0; i < 150; i++) { Object id = dataSource.addItem(); - dataSource - .getItem(id) - .getItemProperty(propId) - .setValue( - (i == 100 ? "Very long value that makes a scrollbar appear for sure" - : "Short")); + dataSource.getItem(id).getItemProperty(propId) + .setValue((i == 100 + ? "Very long value that makes a scrollbar appear for sure" + : "Short")); dataSource.getItem(id).getItemProperty(propId2) .setValue("Short"); } @@ -92,14 +84,10 @@ public class Ticket1983 extends LegacyApplication { .setValue("Short value"); isLong = false; } else { - dataSource - .getItem(itemId) - .getItemProperty(propId) + dataSource.getItem(itemId).getItemProperty(propId) .setValue( "Very long value that makes a scrollbar appear for sure"); - dataSource - .getItem(itemId) - .getItemProperty(propId2) + dataSource.getItem(itemId).getItemProperty(propId2) .setValue( "Very long value that makes a scrollbar appear for sure"); isLong = true; diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1995.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1995.java index 402baa1d34..977d5413da 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1995.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1995.java @@ -31,8 +31,8 @@ public class Ticket1995 extends LegacyApplication { Filterable filterable = (Container.Filterable) table .getContainerDataSource(); - filterable.addContainerFilter(new SimpleStringFilter(PROPERTY_1, "Row", - true, false)); + filterable.addContainerFilter( + new SimpleStringFilter(PROPERTY_1, "Row", true, false)); table.setColumnHeader(PROPERTY_1, "Test (filter: Row)"); @@ -61,8 +61,8 @@ public class Ticket1995 extends LegacyApplication { getMainWindow().showNotification("Tried to add item 'abc', " + res); - filterable.addContainerFilter(new SimpleStringFilter(PROPERTY_1, "Row", - true, false)); + filterable.addContainerFilter( + new SimpleStringFilter(PROPERTY_1, "Row", true, false)); } } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2002.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2002.java index 3252ee550c..c894a73e5e 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2002.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2002.java @@ -34,7 +34,8 @@ public class Ticket2002 extends LegacyApplication { GridLayout layout = new GridLayout(2, 2); layout.setSpacing(true); - LegacyTextField f1 = new LegacyTextField("Non-immediate/Long text field", + LegacyTextField f1 = new LegacyTextField( + "Non-immediate/Long text field", new MethodProperty<Long>(this, "long1")); f1.setImmediate(false); f1.setNullSettingAllowed(true); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2009.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2009.java index 5cb7edf39a..4cb9382d1b 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2009.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2009.java @@ -47,8 +47,8 @@ public class Ticket2009 extends com.vaadin.server.LegacyApplication { events.addComponent(new Label(new Label("Click:" + (event.isDoubleClick() ? "double" : "single") + " button:" + event.getButtonName() + " propertyId:" - + event.getPropertyId() + " itemID:" - + event.getItemId() + " item:" + event.getItem()))); + + event.getPropertyId() + " itemID:" + event.getItemId() + + " item:" + event.getItem()))); } }); @@ -72,8 +72,8 @@ public class Ticket2009 extends com.vaadin.server.LegacyApplication { events2.addComponent(new Label("Click:" + (event.isDoubleClick() ? "double" : "single") + " button:" + event.getButtonName() + " propertyId:" - + event.getPropertyId() + " itemID:" - + event.getItemId() + " item:" + event.getItem())); + + event.getPropertyId() + " itemID:" + event.getItemId() + + " item:" + event.getItem())); if (event.isDoubleClick()) { new PropertyEditor(event); } @@ -110,8 +110,8 @@ public class Ticket2009 extends com.vaadin.server.LegacyApplication { setCaption("Editing " + itemid + " : " + propertyid); - editor.setPropertyDataSource(c.getContainerProperty(itemid, - propertyid)); + editor.setPropertyDataSource( + c.getContainerProperty(itemid, propertyid)); layout.addComponent(editor); layout.addComponent(done); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2014.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2014.java index 7fdd56df67..a8d50ab18f 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2014.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2014.java @@ -31,8 +31,8 @@ public class Ticket2014 extends LegacyApplication { private void createUI(GridLayout layout) { createPanel(layout); - layout.addComponent(new Button("Change class name", - new ClickListener() { + layout.addComponent( + new Button("Change class name", new ClickListener() { @Override public void buttonClick(ClickEvent event) { diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2023.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2023.java index 7c79f86fb2..76237b94ca 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2023.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2023.java @@ -6,8 +6,8 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.GridLayout; import com.vaadin.ui.LegacyWindow; -public class Ticket2023 extends com.vaadin.server.LegacyApplication implements - Button.ClickListener { +public class Ticket2023 extends com.vaadin.server.LegacyApplication + implements Button.ClickListener { AbstractComponent c = new Button(); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2024.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2024.java index eed338ccd0..2eee70e352 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2024.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2024.java @@ -21,9 +21,10 @@ public class Ticket2024 extends LegacyApplication { w.getContent().setHeight("2000"); w.addComponent(layout); - layout.addComponent(new Label( - "This should NOT get stuck when scrolling down")); - layout.addComponent(new LegacyTextField("This should not get stuck either...")); + layout.addComponent( + new Label("This should NOT get stuck when scrolling down")); + layout.addComponent( + new LegacyTextField("This should not get stuck either...")); VerticalLayout ol = new VerticalLayout(); ol.setHeight("1000"); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2038.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2038.java index f4c767b258..ba6aa0841e 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2038.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2038.java @@ -23,8 +23,9 @@ public class Ticket2038 extends LegacyApplication { @Override public void valueChange(ValueChangeEvent event) { - w.showNotification("TextField is " + (tf.isValid() ? "" : "in") - + "valid, with error: " + tf.getErrorMessage(), + w.showNotification( + "TextField is " + (tf.isValid() ? "" : "in") + + "valid, with error: " + tf.getErrorMessage(), Notification.TYPE_WARNING_MESSAGE); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2048.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2048.java index 8fa7c296d0..eca1fd84df 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2048.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2048.java @@ -64,8 +64,8 @@ public class Ticket2048 extends LegacyApplication { l.setHeight("400px"); ol.addComponent(l); - embedded = new Embedded(null, new ThemeResource( - "icons/64/folder-add.png")); + embedded = new Embedded(null, + new ThemeResource("icons/64/folder-add.png")); layout.addComponent(embedded); Button b = new Button( "Replace image with new embedded component (flashes)", @@ -92,7 +92,8 @@ public class Ticket2048 extends LegacyApplication { .contains("folder-add")) { img = "folder-delete"; } - embedded.setSource(new ThemeResource("icons/64/" + img + ".png")); + embedded.setSource( + new ThemeResource("icons/64/" + img + ".png")); } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2053.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2053.java index 9dd684f587..3331386247 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2053.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2053.java @@ -21,9 +21,10 @@ public class Ticket2053 extends LegacyApplication { setMainWindow(main); Button nothing = new Button("Do nothing"); main.addComponent(nothing); - nothing.setDescription("Even though no action is taked, this window is refreshed to " - + "draw changes not originating from this window. Such changes include changes " - + "made by other browser-windows."); + nothing.setDescription( + "Even though no action is taked, this window is refreshed to " + + "draw changes not originating from this window. Such changes include changes " + + "made by other browser-windows."); Button add = new Button("Add a window", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { @@ -33,19 +34,20 @@ public class Ticket2053 extends LegacyApplication { addWindow(c); main.open(new ExternalResource(c.getURL()), "_new"); main.addComponent(new Label(name + " opened")); - final LegacyTextField tf = new LegacyTextField("Non immediate textfield"); + final LegacyTextField tf = new LegacyTextField( + "Non immediate textfield"); c.addComponent(tf); tf.addListener(new Property.ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - main.addComponent(new Label(name + " send text:" - + tf.getValue())); + main.addComponent(new Label( + name + " send text:" + tf.getValue())); } }); for (int i = 0; i < 3; i++) { final String caption = "Slow button " + i; - c.addComponent(new Button(caption, - new Button.ClickListener() { + c.addComponent( + new Button(caption, new Button.ClickListener() { @Override public synchronized void buttonClick( ClickEvent event) { @@ -53,8 +55,8 @@ public class Ticket2053 extends LegacyApplication { this.wait(2000); } catch (InterruptedException e) { } - main.addComponent(new Label(caption - + " pressed")); + main.addComponent( + new Label(caption + " pressed")); } })); } @@ -62,10 +64,11 @@ public class Ticket2053 extends LegacyApplication { } }); main.addComponent(add); - add.setDescription("This button opens a new browser window. Closing the browser " - + "window should do two things: 1) submit all unsubmitted state to server " - + "(print any changes to textfield to main window) and 2) call window.close()" - + " on the child window (print closed on the main window)"); + add.setDescription( + "This button opens a new browser window. Closing the browser " + + "window should do two things: 1) submit all unsubmitted state to server " + + "(print any changes to textfield to main window) and 2) call window.close()" + + " on the child window (print closed on the main window)"); } } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061.java index 3838986bfa..05ce244f6a 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061.java @@ -33,8 +33,8 @@ public class Ticket2061 extends LegacyApplication { MyTable table3 = new MyTable(24, "table3"); table3.loadTable(1000); - MyAccordion accordion = new MyAccordion(new Component[] { table1, - table2 }, "Test"); + MyAccordion accordion = new MyAccordion( + new Component[] { table1, table2 }, "Test"); Tabs tab = new Tabs(new Component[] { accordion, table3 }); @@ -42,7 +42,8 @@ public class Ticket2061 extends LegacyApplication { } - public class MyTable extends CustomComponent implements ValueChangeListener { + public class MyTable extends CustomComponent + implements ValueChangeListener { private Table table = new Table(); private String[] columns; @@ -72,8 +73,8 @@ public class Ticket2061 extends LegacyApplication { Item rowItem = table.addItem(j); if (rowItem != null) { for (int i = 0; i < columns.length; i++) { - rowItem.getItemProperty(columns[i]).setValue( - "Value" + j); + rowItem.getItemProperty(columns[i]) + .setValue("Value" + j); } } } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061b.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061b.java index dbcd190503..008d2381f1 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061b.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061b.java @@ -21,8 +21,8 @@ import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; -public class Ticket2061b extends LegacyApplication implements - SelectedTabChangeListener { +public class Ticket2061b extends LegacyApplication + implements SelectedTabChangeListener { private LegacyWindow mainWindow; private Panel p; @@ -101,7 +101,8 @@ public class Ticket2061b extends LegacyApplication implements tab.addTab(p, "Panel with panel", null); } - public class MyTable extends CustomComponent implements ValueChangeListener { + public class MyTable extends CustomComponent + implements ValueChangeListener { private Table table = new Table(); private String[] columns; @@ -131,8 +132,8 @@ public class Ticket2061b extends LegacyApplication implements Item rowItem = table.addItem(j); if (rowItem != null) { for (int i = 0; i < columns.length; i++) { - rowItem.getItemProperty(columns[i]).setValue( - "Value" + j); + rowItem.getItemProperty(columns[i]) + .setValue("Value" + j); } } } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061c.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061c.java index e6255d71c7..9a3b129775 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061c.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061c.java @@ -17,8 +17,8 @@ import com.vaadin.ui.TabSheet.SelectedTabChangeListener; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; -public class Ticket2061c extends LegacyApplication implements - SelectedTabChangeListener { +public class Ticket2061c extends LegacyApplication + implements SelectedTabChangeListener { private LegacyWindow mainWindow; private Panel p; @@ -60,7 +60,8 @@ public class Ticket2061c extends LegacyApplication implements } - public class MyTable extends CustomComponent implements ValueChangeListener { + public class MyTable extends CustomComponent + implements ValueChangeListener { private Table table = new Table(); private String[] columns; @@ -90,8 +91,8 @@ public class Ticket2061c extends LegacyApplication implements Item rowItem = table.addItem(j); if (rowItem != null) { for (int i = 0; i < columns.length; i++) { - rowItem.getItemProperty(columns[i]).setValue( - "Value" + j); + rowItem.getItemProperty(columns[i]) + .setValue("Value" + j); } } } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2083.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2083.java index a94dafafcb..9294911188 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2083.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2083.java @@ -23,7 +23,8 @@ public class Ticket2083 extends LegacyApplication { VerticalLayout pl = new VerticalLayout(); pl.setMargin(true); Panel p = new Panel( - "This is a panel with a longer caption than it should have", pl); + "This is a panel with a longer caption than it should have", + pl); p.setWidth("100px"); pl.addComponent(new Label("Contents")); layout.addComponent(p); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2095.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2095.java index 270da9dc3f..43d839732b 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2095.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2095.java @@ -18,7 +18,8 @@ public class Ticket2095 extends LegacyApplication { Embedded em = new Embedded(); em.setType(Embedded.TYPE_BROWSER); - em.setSource(new ExternalResource("../statictestfiles/ticket2095.html")); + em.setSource( + new ExternalResource("../statictestfiles/ticket2095.html")); em.setId("MYIFRAME"); em.setSizeFull(); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2103.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2103.java index a21864a67d..40a2e48fb4 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2103.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2103.java @@ -72,8 +72,8 @@ public class Ticket2103 extends LegacyApplication { Item rowItem = table.addItem(j); if (rowItem != null) { for (int i = 0; i < columns.length; i++) { - rowItem.getItemProperty(columns[i]).setValue( - "Value" + j); + rowItem.getItemProperty(columns[i]) + .setValue("Value" + j); } } } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2104.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2104.java index e52ab33ffd..a69663eb72 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2104.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2104.java @@ -84,9 +84,8 @@ public class Ticket2104 extends LegacyApplication { tree.addListener(new ItemClickListener() { @Override public void itemClick(ItemClickEvent event) { - getMainWindow().addComponent( - new Label(event.toString() + " // " + event.getItemId() - + "//" + event.getSource())); + getMainWindow().addComponent(new Label(event.toString() + " // " + + event.getItemId() + "//" + event.getSource())); } }); @@ -95,7 +94,8 @@ public class Ticket2104 extends LegacyApplication { main.addComponent(ol); cb = new CheckBox("immediate"); cb.setValue(table.isImmediate()); - cb.addValueChangeListener(event -> table.setImmediate(event.getValue())); + cb.addValueChangeListener( + event -> table.setImmediate(event.getValue())); cb.setImmediate(true); ol.addComponent(cb); cb = new CheckBox("selectable"); @@ -127,9 +127,8 @@ public class Ticket2104 extends LegacyApplication { table.addListener(new ItemClickListener() { @Override public void itemClick(ItemClickEvent event) { - getMainWindow().addComponent( - new Label(event.toString() + " // " + event.getItemId() - + "//" + event.getSource())); + getMainWindow().addComponent(new Label(event.toString() + " // " + + event.getItemId() + "//" + event.getSource())); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2106.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2106.java index 08b7a738a7..5c478a678e 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2106.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2106.java @@ -31,9 +31,8 @@ public class Ticket2106 extends LegacyApplication { new Button("Do nothing", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - getMainWindow().addComponent( - new Label("Last time did nothing: " - + new Date())); + getMainWindow().addComponent(new Label( + "Last time did nothing: " + new Date())); } })); } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2117.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2117.java index 9cfa63b29e..59004ac88c 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2117.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2117.java @@ -50,12 +50,9 @@ public class Ticket2117 extends LegacyApplication { private LegacyWindow createWindow() { final LegacyWindow w = new LegacyWindow(); - w.addComponent(new Label( - "Click this link: <a target=\"_blank\" href='" - + getURL().toExternalForm() - + "'>" - + getURL().toExternalForm() - + "</a> which opens new windows to this uri. They should end up having a separate Window and URL.", + w.addComponent(new Label("Click this link: <a target=\"_blank\" href='" + + getURL().toExternalForm() + "'>" + getURL().toExternalForm() + + "</a> which opens new windows to this uri. They should end up having a separate Window and URL.", ContentMode.HTML)); return w; } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2119.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2119.java index c8002ff2cb..65d78c269f 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2119.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2119.java @@ -50,13 +50,12 @@ public class Ticket2119 extends LegacyApplication { private Layout testLayout() { final Layout layout = new VerticalLayout(); - final Label label = new Label( - "Instructions to reproduce:\n" - + " - Open this application in two browser windows\n" - + " - Click the Button in first Window\n" - + " - Go to the second Window\n" - + " - Click the arrow in the Select\n" - + " --> The opened list correctly shows the new value but the old one is shown in the \"input\" part"); + final Label label = new Label("Instructions to reproduce:\n" + + " - Open this application in two browser windows\n" + + " - Click the Button in first Window\n" + + " - Go to the second Window\n" + + " - Click the arrow in the Select\n" + + " --> The opened list correctly shows the new value but the old one is shown in the \"input\" part"); label.setContentMode(ContentMode.PREFORMATTED); layout.addComponent(label); @@ -77,8 +76,8 @@ public class Ticket2119 extends LegacyApplication { @Override public void valueChange(Property.ValueChangeEvent event) { Object value = event.getProperty().getValue(); - valueProperty.setValue((null != value) ? value.toString() - : null); + valueProperty + .setValue((null != value) ? value.toString() : null); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2125.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2125.java index 77a08248f4..5dc92c71c3 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2125.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2125.java @@ -56,7 +56,8 @@ public class Ticket2125 extends LegacyApplication { }); CheckBox b = new CheckBox("editmode"); b.setValue(table.isEditable()); - b.addValueChangeListener(event -> table.setEditable(event.getValue())); + b.addValueChangeListener( + event -> table.setEditable(event.getValue())); b.setImmediate(true); addComponent(b); } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2181.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2181.java index a25543d75e..bec49d77a1 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2181.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2181.java @@ -16,16 +16,18 @@ import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.OptionGroup; import com.vaadin.ui.VerticalLayout; -public class Ticket2181 extends LegacyApplication implements - Button.ClickListener { +public class Ticket2181 extends LegacyApplication + implements Button.ClickListener { // private static final Object PROPERTY_VALUE = new Object(); // private static final Object PROPERTY_CAPTION = new Object(); private static final String caption = "This is a caption which is very long and nice and perhaps sometimes should be clipped"; LegacyWindow main = new LegacyWindow("#2181 test"); - LegacyTextField tf1 = new LegacyTextField(caption, "Test field - undefined width"); - LegacyTextField tf2 = new LegacyTextField(caption, "Test field - 150px wide"); + LegacyTextField tf1 = new LegacyTextField(caption, + "Test field - undefined width"); + LegacyTextField tf2 = new LegacyTextField(caption, + "Test field - 150px wide"); Button setButton = new Button("Set", this); private Random random = new Random(123); private OptionGroup options; @@ -93,8 +95,9 @@ public class Ticket2181 extends LegacyApplication implements tf.setCaption(caption); } else if (value.equals("Icon")) { String timestamp = String.valueOf(new Date().getTime()); - tf.setIcon(new ThemeResource(icons.get(random.nextInt(icons - .size())) + "?" + timestamp)); + tf.setIcon(new ThemeResource( + icons.get(random.nextInt(icons.size())) + "?" + + timestamp)); } else if (value.equals("Required")) { tf.setRequired(true); } else if (value.equals("Error")) { diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2186.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2186.java index 8a467d385e..fe508434bb 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2186.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2186.java @@ -36,7 +36,7 @@ public class Ticket2186 extends LegacyApplication { table.addItem(new Object[] { i + " Joku Ihminen", "Testiviesti" }, - new Object()); + new Object()); } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2232.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2232.java index 16fec93c44..9dcc773891 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2232.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2232.java @@ -16,10 +16,8 @@ public class Ticket2232 extends LegacyApplication { setMainWindow(new LegacyWindow()); setTheme("tests-tickets"); - getMainWindow() - .addComponent( - new Label( - "Defining spacing must be possible also with pure CSS")); + getMainWindow().addComponent(new Label( + "Defining spacing must be possible also with pure CSS")); Layout gl; gl = new VerticalLayout(); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2242.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2242.java index d100f61e30..3a219ffd82 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2242.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2242.java @@ -13,8 +13,8 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Table; -public class Ticket2242 extends LegacyApplication implements - ValueChangeListener { +public class Ticket2242 extends LegacyApplication + implements ValueChangeListener { private Object tableValue = null; private Table t; @@ -62,8 +62,8 @@ public class Ticket2242 extends LegacyApplication implements IndexedContainer ic = new IndexedContainer(); ic.addContainerProperty("a", String.class, null); - for (String s : new String[] { "Lorem", "ipsum", "dolor", "sit", - "amet", "consectetuer" }) { + for (String s : new String[] { "Lorem", "ipsum", "dolor", "sit", "amet", + "consectetuer" }) { Item item = ic.addItem(s); item.getItemProperty("a").setValue(s); @@ -74,8 +74,8 @@ public class Ticket2242 extends LegacyApplication implements @Override public void valueChange(ValueChangeEvent event) { - System.out.println("Value change from " + tableValue + " to " - + t.getValue()); + System.out.println( + "Value change from " + tableValue + " to " + t.getValue()); tableValue = t.getValue(); } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2292.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2292.java index b50a1d073e..2f658e3fa4 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2292.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2292.java @@ -21,8 +21,8 @@ import com.vaadin.ui.Label; import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Link; -public class Ticket2292 extends com.vaadin.server.LegacyApplication implements - RequestHandler { +public class Ticket2292 extends com.vaadin.server.LegacyApplication + implements RequestHandler { @Override public void init() { diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2297.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2297.java index b4a3d02efa..f1773a5561 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2297.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2297.java @@ -20,18 +20,14 @@ public class Ticket2297 extends Ticket2292 { "Icon is built by servlet with a slow method, so it will show the bug (components not firing requestLayout).")); try { - CustomLayout cl = new CustomLayout( - new ByteArrayInputStream( - ("This is an empty CustomLayout with as slow image. <img src=\"" - + url.toString() + "/icon.png\" />") - .getBytes())); + CustomLayout cl = new CustomLayout(new ByteArrayInputStream( + ("This is an empty CustomLayout with as slow image. <img src=\"" + + url.toString() + "/icon.png\" />").getBytes())); main.addComponent(cl); - cl = new CustomLayout( - new ByteArrayInputStream( - ("This is an empty CustomLayout with as slow image. <img src=\"" - + url.toString() + "/icon.png\" />") - .getBytes())); + cl = new CustomLayout(new ByteArrayInputStream( + ("This is an empty CustomLayout with as slow image. <img src=\"" + + url.toString() + "/icon.png\" />").getBytes())); main.addComponent(cl); } catch (IOException e) { // TODO Auto-generated catch block diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2303.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2303.java index be85f2d481..8a6aaabc6e 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2303.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2303.java @@ -18,8 +18,8 @@ public class Ticket2303 extends LegacyApplication { String customlayout = "<div location=\"test\"></div>"; CustomLayout cl = null; try { - cl = new CustomLayout(new ByteArrayInputStream( - customlayout.getBytes())); + cl = new CustomLayout( + new ByteArrayInputStream(customlayout.getBytes())); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2339.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2339.java index 8683711bdc..358ae402b0 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2339.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2339.java @@ -13,15 +13,14 @@ public class Ticket2339 extends LegacyApplication { @Override public void init() { - final LegacyWindow mainWin = new LegacyWindow(getClass() - .getSimpleName()); + final LegacyWindow mainWin = new LegacyWindow( + getClass().getSimpleName()); setMainWindow(mainWin); try { - CustomLayout cl = new CustomLayout( - new ByteArrayInputStream( - "<div style=\"width:400px;overflow:hidden;background-color:red;\"><div style=\"border:1em solid blue; height:4em; padding:1em 1.5em;\" location=\"b\"></div></div>" - .getBytes())); + CustomLayout cl = new CustomLayout(new ByteArrayInputStream( + "<div style=\"width:400px;overflow:hidden;background-color:red;\"><div style=\"border:1em solid blue; height:4em; padding:1em 1.5em;\" location=\"b\"></div></div>" + .getBytes())); Button button = new Button("b"); button.setSizeFull(); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2344.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2344.java index a24351c3aa..7380428025 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2344.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2344.java @@ -43,7 +43,8 @@ public class Ticket2344 extends LegacyApplication { vl.addComponent(b); t.addItem(new Object[] { vl, "String 2", "String 3", "String 4", - new Button("String 5") }, new Integer(new Random().nextInt())); + new Button("String 5") }, + new Integer(new Random().nextInt())); } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2365.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2365.java index b9e96c2f37..a69419da21 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2365.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2365.java @@ -12,8 +12,8 @@ public class Ticket2365 extends LegacyApplication { @Override public void init() { - final LegacyWindow mainWin = new LegacyWindow(getClass() - .getSimpleName()); + final LegacyWindow mainWin = new LegacyWindow( + getClass().getSimpleName()); setMainWindow(mainWin); VerticalLayout lo = new VerticalLayout(); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2411.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2411.java index 6437a1f514..99341b8f7e 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2411.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2411.java @@ -19,8 +19,8 @@ public class Ticket2411 extends LegacyApplication { l.setHeight("504px"); for (int i = 1; i <= 5; i++) { - Button b = new Button("Button " + i - + " should be 100px or 101px high"); + Button b = new Button( + "Button " + i + " should be 100px or 101px high"); b.setHeight("100%"); l.addComponent(b); } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2426.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2426.java index a80a8464b6..33ce9fe509 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2426.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2426.java @@ -14,14 +14,15 @@ public class Ticket2426 extends LegacyApplication { final String content = "<select/>"; - w.addComponent(new Label("CONTENT_DEFAULT: " + content, - ContentMode.TEXT)); + w.addComponent( + new Label("CONTENT_DEFAULT: " + content, ContentMode.TEXT)); w.addComponent(new Label("CONTENT_PREFORMATTED: " + content, ContentMode.PREFORMATTED)); w.addComponent(new Label("CONTENT_RAW: " + content, ContentMode.RAW)); w.addComponent(new Label("CONTENT_TEXT: " + content, ContentMode.TEXT)); w.addComponent(new Label("CONTENT_XML: " + content, ContentMode.XML)); - w.addComponent(new Label("CONTENT_XHTML: " + content, ContentMode.HTML)); + w.addComponent( + new Label("CONTENT_XHTML: " + content, ContentMode.HTML)); } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2431.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2431.java index 3228dc87ed..66a0f31d13 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2431.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2431.java @@ -36,7 +36,8 @@ public class Ticket2431 extends LegacyApplication { } @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { if (action == a1) { getMainWindow().addComponent(new Label("CTRL X hit")); } else { diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket34.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket34.java index e733845aad..c7b44f3802 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket34.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket34.java @@ -50,8 +50,8 @@ public class Ticket34 extends LegacyApplication { private void setView(String string) { Component component = views.get(string); if (component == null) { - getMainWindow().showNotification( - "View called " + string + " not found!"); + getMainWindow() + .showNotification("View called " + string + " not found!"); } else if (component != currentView) { if (currentView != null) { mainLayout.replaceComponent(currentView, component); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket5952.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket5952.java index f09fb955a1..f85d1b465e 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket5952.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket5952.java @@ -14,15 +14,9 @@ public class Ticket5952 extends LegacyApplication { setMainWindow(mainWindow); String mathml = "<math mode='display' xmlns='http://www.w3.org/1998/Math/MathML'>" - + "<mrow>" - + " <msup>" - + " <mi>x</mi>" - + " <mn>2</mn>" - + " </msup>" - + " <msup>" - + " <mi>c</mi>" - + " <mn>2</mn>" - + " </msup>" + + "<mrow>" + " <msup>" + " <mi>x</mi>" + + " <mn>2</mn>" + " </msup>" + " <msup>" + + " <mi>c</mi>" + " <mn>2</mn>" + " </msup>" + " </mrow>" + "</math>"; Label mathLabel = new Label(mathml, ContentMode.XML); mainWindow.addComponent(mathLabel); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket6002.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket6002.java index a15603a5ba..857e855569 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket6002.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket6002.java @@ -18,8 +18,8 @@ public class Ticket6002 extends TestBase { final VerticalLayout mainLayout = new VerticalLayout(); main.setContent(mainLayout); - mainLayout.addComponent(new Label( - "Replace the floating-point values with an integer")); + mainLayout.addComponent( + new Label("Replace the floating-point values with an integer")); // /////////////////////////////////////////////////// // Better working case diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket695.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket695.java index d5ae9bb09f..5d3fb05b3d 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket695.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket695.java @@ -32,7 +32,8 @@ public class Ticket695 extends LegacyApplication { + (System.currentTimeMillis() - t) + "ms"); } catch (IOException e) { e.printStackTrace(); - w.showNotification("ApplicationContext serialization failed - see console for stacktrace"); + w.showNotification( + "ApplicationContext serialization failed - see console for stacktrace"); } } diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/DragAndDropWrapperTooltips.java b/uitest/src/main/java/com/vaadin/tests/tooltip/DragAndDropWrapperTooltips.java index 606a773141..956d05518b 100644 --- a/uitest/src/main/java/com/vaadin/tests/tooltip/DragAndDropWrapperTooltips.java +++ b/uitest/src/main/java/com/vaadin/tests/tooltip/DragAndDropWrapperTooltips.java @@ -36,8 +36,8 @@ public class DragAndDropWrapperTooltips extends AbstractTestUI { l.setWidth("400px"); l.setHeight("100px"); dragAndDropWrapper = new DragAndDropWrapper(cssLayout); - dragAndDropWrapper - .setDescription("Tooltip for the wrapper wrapping all the draggable layouts"); + dragAndDropWrapper.setDescription( + "Tooltip for the wrapper wrapping all the draggable layouts"); dragAndDropWrapper.setSizeFull(); l.addComponent(dragAndDropWrapper); @@ -104,8 +104,8 @@ public class DragAndDropWrapperTooltips extends AbstractTestUI { } next = componentIterator.next(); } - if (dropTargetData.getData("horizontalLocation").equals( - "LEFT")) { + if (dropTargetData.getData("horizontalLocation") + .equals("LEFT")) { index--; if (index < 0) { index = 0; @@ -115,8 +115,8 @@ public class DragAndDropWrapperTooltips extends AbstractTestUI { cssLayout.removeComponent(sourceComponent); cssLayout.addComponent(sourceComponent, index); - dragAndDropWrapper - .setDescription("Drag was performed and tooltip was changed"); + dragAndDropWrapper.setDescription( + "Drag was performed and tooltip was changed"); } } } diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/MenuBarTooltip.java b/uitest/src/main/java/com/vaadin/tests/tooltip/MenuBarTooltip.java index ff470336f5..356d431efe 100644 --- a/uitest/src/main/java/com/vaadin/tests/tooltip/MenuBarTooltip.java +++ b/uitest/src/main/java/com/vaadin/tests/tooltip/MenuBarTooltip.java @@ -13,10 +13,12 @@ public class MenuBarTooltip extends AbstractTestUI { MenuBar.MenuItem menuitem = menubar.addItem("Menu item", null, null); menuitem.setDescription("Menu item description"); - MenuBar.MenuItem submenuitem1 = menuitem.addItem("Submenu item 1", null, null); + MenuBar.MenuItem submenuitem1 = menuitem.addItem("Submenu item 1", null, + null); submenuitem1.setDescription("Submenu item 1 description"); - MenuBar.MenuItem submenuitem2 = menuitem.addItem("Submenu item 2", null, null); + MenuBar.MenuItem submenuitem2 = menuitem.addItem("Submenu item 2", null, + null); submenuitem2.setDescription("Submenu item 2 description"); addComponent(menubar); diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java index 0a63744caf..7655a5192c 100644 --- a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java +++ b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java @@ -23,7 +23,8 @@ public class TooltipConfiguration extends AbstractTestUIWithLog { componentWithShortTooltip.setDescription("This is a short tooltip"); componentWithShortTooltip.setId("shortTooltip"); - NativeButton componentWithLongTooltip = new NativeButton("Long tooltip"); + NativeButton componentWithLongTooltip = new NativeButton( + "Long tooltip"); componentWithLongTooltip.setId("longTooltip"); componentWithLongTooltip.setDescription(LoremIpsum.get(5000)); @@ -68,8 +69,8 @@ public class TooltipConfiguration extends AbstractTestUIWithLog { @Override public void valueChange(ValueChangeEvent event) { if (quickOpenDelay.getConvertedValue() != null) { - getTooltipConfiguration().setQuickOpenDelay( - (Integer) quickOpenDelay + getTooltipConfiguration() + .setQuickOpenDelay((Integer) quickOpenDelay .getConvertedValue()); } } @@ -97,7 +98,8 @@ public class TooltipConfiguration extends AbstractTestUIWithLog { } - private LegacyTextField createIntegerTextField(String caption, int initialValue) { + private LegacyTextField createIntegerTextField(String caption, + int initialValue) { LegacyTextField tf = new LegacyTextField(caption); tf.setId(caption); tf.setConverter(Integer.class); diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java index c1f9c3a450..24c6487d0a 100644 --- a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java +++ b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java @@ -30,7 +30,8 @@ public class TooltipWidthUpdating extends AbstractTestUI { getTooltipConfiguration().setMaxWidth(MAX_WIDTH); getTooltipConfiguration().setCloseTimeout(200); - NativeButton componentWithLongTooltip = new NativeButton("Long tooltip"); + NativeButton componentWithLongTooltip = new NativeButton( + "Long tooltip"); componentWithLongTooltip.setId("longTooltip"); componentWithLongTooltip.setDescription(LONG_TOOLTIP_TEXT); diff --git a/uitest/src/main/java/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdate.java b/uitest/src/main/java/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdate.java index 9cd2929ca6..b808a3d973 100644 --- a/uitest/src/main/java/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdate.java +++ b/uitest/src/main/java/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdate.java @@ -52,7 +52,8 @@ public class FragmentHandlingAndAsynchUIUpdate extends AbstractTestUIWithLog { return new UriFragmentChangedListener() { @Override - public void uriFragmentChanged(final UriFragmentChangedEvent event) { + public void uriFragmentChanged( + final UriFragmentChangedEvent event) { log(String.format("uriFragmentChanged %s", event.getUriFragment())); @@ -81,8 +82,8 @@ public class FragmentHandlingAndAsynchUIUpdate extends AbstractTestUIWithLog { createThread(frag, fragLabel).start(); - fragLabel.setCaption(String.format("Thread running for %s!", - frag)); + fragLabel.setCaption( + String.format("Thread running for %s!", frag)); UI.getCurrent().setPollInterval(1000); } }; @@ -113,9 +114,9 @@ public class FragmentHandlingAndAsynchUIUpdate extends AbstractTestUIWithLog { "setCaption in synch mode for fragment %s", frag)); java.util.Random rand = new java.util.Random(); - fragLabel.setCaption(String.format( - "Thread finished on %s (%s)", frag, - rand.nextInt())); + fragLabel.setCaption( + String.format("Thread finished on %s (%s)", + frag, rand.nextInt())); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/util/CheckBoxWithPropertyDataSource.java b/uitest/src/main/java/com/vaadin/tests/util/CheckBoxWithPropertyDataSource.java index ca3c2a6a86..5327eb7d27 100644 --- a/uitest/src/main/java/com/vaadin/tests/util/CheckBoxWithPropertyDataSource.java +++ b/uitest/src/main/java/com/vaadin/tests/util/CheckBoxWithPropertyDataSource.java @@ -27,7 +27,8 @@ public class CheckBoxWithPropertyDataSource extends CheckBox { public void validate() { if (isRequired() && !getValue()) { - throw new InvalidValueException("Required CheckBox should be checked"); + throw new InvalidValueException( + "Required CheckBox should be checked"); } } diff --git a/uitest/src/main/java/com/vaadin/tests/util/LargeContainer.java b/uitest/src/main/java/com/vaadin/tests/util/LargeContainer.java index a6430ec0c2..8a925e9842 100644 --- a/uitest/src/main/java/com/vaadin/tests/util/LargeContainer.java +++ b/uitest/src/main/java/com/vaadin/tests/util/LargeContainer.java @@ -12,8 +12,8 @@ import com.vaadin.data.Property; import com.vaadin.data.util.AbstractContainer; import com.vaadin.data.util.ObjectProperty; -public class LargeContainer extends AbstractContainer implements - Container.Indexed { +public class LargeContainer extends AbstractContainer + implements Container.Indexed { public class TestItem implements Item { diff --git a/uitest/src/main/java/com/vaadin/tests/util/PersonContainer.java b/uitest/src/main/java/com/vaadin/tests/util/PersonContainer.java index 709086be29..2f0e4f0d6f 100644 --- a/uitest/src/main/java/com/vaadin/tests/util/PersonContainer.java +++ b/uitest/src/main/java/com/vaadin/tests/util/PersonContainer.java @@ -6,15 +6,15 @@ import java.util.Random; import com.vaadin.data.util.BeanItemContainer; @SuppressWarnings("serial") -public class PersonContainer extends BeanItemContainer<Person> implements - Serializable { +public class PersonContainer extends BeanItemContainer<Person> + implements Serializable { /** * Natural property order for Person bean. Used in tables and forms. */ - public static final Object[] NATURAL_COL_ORDER = new Object[] { - "firstName", "lastName", "email", "phoneNumber", - "address.streetAddress", "address.postalCode", "address.city" }; + public static final Object[] NATURAL_COL_ORDER = new Object[] { "firstName", + "lastName", "email", "phoneNumber", "address.streetAddress", + "address.postalCode", "address.city" }; /** * "Human readable" captions for properties in same order as in @@ -49,8 +49,8 @@ public class PersonContainer extends BeanItemContainer<Person> implements p.setPhoneNumber(TestDataGenerator.getPhoneNumber(r)); p.getAddress().setPostalCode(TestDataGenerator.getPostalCode(r)); - p.getAddress().setStreetAddress( - TestDataGenerator.getStreetAddress(r)); + p.getAddress() + .setStreetAddress(TestDataGenerator.getStreetAddress(r)); c.addItem(p); } diff --git a/uitest/src/main/java/com/vaadin/tests/util/ResizeTerrorizer.java b/uitest/src/main/java/com/vaadin/tests/util/ResizeTerrorizer.java index 679baa0d26..a18eb6f6ea 100644 --- a/uitest/src/main/java/com/vaadin/tests/util/ResizeTerrorizer.java +++ b/uitest/src/main/java/com/vaadin/tests/util/ResizeTerrorizer.java @@ -23,8 +23,8 @@ import com.vaadin.ui.VerticalLayout; public class ResizeTerrorizer extends VerticalLayout { private final ResizeTerrorizerControl control; - public class ResizeTerrorizerControl extends AbstractComponent implements - Component { + public class ResizeTerrorizerControl extends AbstractComponent + implements Component { public ResizeTerrorizerControl(Component target) { getState().target = target; diff --git a/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java b/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java index a4829334a5..1a83fbe1c8 100644 --- a/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java +++ b/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java @@ -43,7 +43,8 @@ public class SampleDirectory { * @param application * @return file pointing to sample directory */ - public static File getDirectory(VaadinSession application, LegacyWindow uI) { + public static File getDirectory(VaadinSession application, + LegacyWindow uI) { String errorMessage = "Access to application " + "context base directory failed, " + "possible security constraint with Application " @@ -82,8 +83,8 @@ public class SampleDirectory { final Panel errorPanel = new Panel("Demo application error", errorLayout); errorPanel.setStyleName("strong"); - errorPanel.setComponentError(new SystemError( - "Cannot provide sample directory")); + errorPanel.setComponentError( + new SystemError("Cannot provide sample directory")); errorLayout.addComponent(new Label(errorMessage, ContentMode.HTML)); // Remove all components from applications main window uI.removeAllComponents(); diff --git a/uitest/src/main/java/com/vaadin/tests/util/TestDataGenerator.java b/uitest/src/main/java/com/vaadin/tests/util/TestDataGenerator.java index 8becb709f0..d356670a0b 100644 --- a/uitest/src/main/java/com/vaadin/tests/util/TestDataGenerator.java +++ b/uitest/src/main/java/com/vaadin/tests/util/TestDataGenerator.java @@ -29,8 +29,8 @@ public class TestDataGenerator { "Olivia", "Nina", "Alex", "Rita", "Dan", "Umberto", "Henrik", "Rene", "Lisa", "Marge" }; final static String[] lnames = { "Smith", "Gordon", "Simpson", "Brown", - "Clavel", "Simons", "Verne", "Scott", "Allison", "Gates", - "Rowling", "Barks", "Ross", "Schneider", "Tate" }; + "Clavel", "Simons", "Verne", "Scott", "Allison", "Gates", "Rowling", + "Barks", "Ross", "Schneider", "Tate" }; final static String cities[] = { "Amsterdam", "Berlin", "Helsinki", "Hong Kong", "London", "Luxemburg", "New York", "Oslo", "Paris", "Rome", "Stockholm", "Tokyo", "Turku" }; diff --git a/uitest/src/main/java/com/vaadin/tests/util/TestUtils.java b/uitest/src/main/java/com/vaadin/tests/util/TestUtils.java index 5c6315a23a..93139a8d98 100644 --- a/uitest/src/main/java/com/vaadin/tests/util/TestUtils.java +++ b/uitest/src/main/java/com/vaadin/tests/util/TestUtils.java @@ -13,21 +13,21 @@ public class TestUtils { private static final String[] iso3166 = new String[] { "AFGHANISTAN", "AF", "ÅLAND ISLANDS", "AX", "ALBANIA", "AL", "ALGERIA", "DZ", - "AMERICAN SAMOA", "AS", "ANDORRA", "AD", "ANGOLA", "AO", - "ANGUILLA", "AI", "ANTARCTICA", "AQ", "ANTIGUA AND BARBUDA", "AG", - "ARGENTINA", "AR", "ARMENIA", "AM", "ARUBA", "AW", "AUSTRALIA", - "AU", "AUSTRIA", "AT", "AZERBAIJAN", "AZ", "BAHAMAS", "BS", - "BAHRAIN", "BH", "BANGLADESH", "BD", "BARBADOS", "BB", "BELARUS", - "BY", "BELGIUM", "BE", "BELIZE", "BZ", "BENIN", "BJ", "BERMUDA", - "BM", "BHUTAN", "BT", "BOLIVIA", "BO", "BOSNIA AND HERZEGOVINA", - "BA", "BOTSWANA", "BW", "BOUVET ISLAND", "BV", "BRAZIL", "BR", + "AMERICAN SAMOA", "AS", "ANDORRA", "AD", "ANGOLA", "AO", "ANGUILLA", + "AI", "ANTARCTICA", "AQ", "ANTIGUA AND BARBUDA", "AG", "ARGENTINA", + "AR", "ARMENIA", "AM", "ARUBA", "AW", "AUSTRALIA", "AU", "AUSTRIA", + "AT", "AZERBAIJAN", "AZ", "BAHAMAS", "BS", "BAHRAIN", "BH", + "BANGLADESH", "BD", "BARBADOS", "BB", "BELARUS", "BY", "BELGIUM", + "BE", "BELIZE", "BZ", "BENIN", "BJ", "BERMUDA", "BM", "BHUTAN", + "BT", "BOLIVIA", "BO", "BOSNIA AND HERZEGOVINA", "BA", "BOTSWANA", + "BW", "BOUVET ISLAND", "BV", "BRAZIL", "BR", "BRITISH INDIAN OCEAN TERRITORY", "IO", "BRUNEI DARUSSALAM", "BN", - "BULGARIA", "BG", "BURKINA FASO", "BF", "BURUNDI", "BI", - "CAMBODIA", "KH", "CAMEROON", "CM", "CANADA", "CA", "CAPE VERDE", - "CV", "CAYMAN ISLANDS", "KY", "CENTRAL AFRICAN REPUBLIC", "CF", - "CHAD", "TD", "CHILE", "CL", "CHINA", "CN", "CHRISTMAS ISLAND", - "CX", "COCOS (KEELING) ISLANDS", "CC", "COLOMBIA", "CO", "COMOROS", - "KM", "CONGO", "CG", "CONGO, THE DEMOCRATIC REPUBLIC OF THE", "CD", + "BULGARIA", "BG", "BURKINA FASO", "BF", "BURUNDI", "BI", "CAMBODIA", + "KH", "CAMEROON", "CM", "CANADA", "CA", "CAPE VERDE", "CV", + "CAYMAN ISLANDS", "KY", "CENTRAL AFRICAN REPUBLIC", "CF", "CHAD", + "TD", "CHILE", "CL", "CHINA", "CN", "CHRISTMAS ISLAND", "CX", + "COCOS (KEELING) ISLANDS", "CC", "COLOMBIA", "CO", "COMOROS", "KM", + "CONGO", "CG", "CONGO, THE DEMOCRATIC REPUBLIC OF THE", "CD", "COOK ISLANDS", "CK", "COSTA RICA", "CR", "CÔTE D'IVOIRE", "CI", "CROATIA", "HR", "CUBA", "CU", "CYPRUS", "CY", "CZECH REPUBLIC", "CZ", "DENMARK", "DK", "DJIBOUTI", "DJ", "DOMINICA", "DM", @@ -45,28 +45,27 @@ public class TestUtils { "HOLY SEE (VATICAN CITY STATE)", "VA", "HONDURAS", "HN", "HONG KONG", "HK", "HUNGARY", "HU", "ICELAND", "IS", "INDIA", "IN", "INDONESIA", "ID", "IRAN, ISLAMIC REPUBLIC OF", "IR", "IRAQ", "IQ", - "IRELAND", "IE", "ISLE OF MAN", "IM", "ISRAEL", "IL", "ITALY", - "IT", "JAMAICA", "JM", "JAPAN", "JP", "JERSEY", "JE", "JORDAN", - "JO", "KAZAKHSTAN", "KZ", "KENYA", "KE", "KIRIBATI", "KI", + "IRELAND", "IE", "ISLE OF MAN", "IM", "ISRAEL", "IL", "ITALY", "IT", + "JAMAICA", "JM", "JAPAN", "JP", "JERSEY", "JE", "JORDAN", "JO", + "KAZAKHSTAN", "KZ", "KENYA", "KE", "KIRIBATI", "KI", "KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF", "KP", "KOREA, REPUBLIC OF", "KR", "KUWAIT", "KW", "KYRGYZSTAN", "KG", - "LAO PEOPLE'S DEMOCRATIC REPUBLIC", "LA", "LATVIA", "LV", - "LEBANON", "LB", "LESOTHO", "LS", "LIBERIA", "LR", - "LIBYAN ARAB JAMAHIRIYA", "LY", "LIECHTENSTEIN", "LI", "LITHUANIA", - "LT", "LUXEMBOURG", "LU", "MACAO", "MO", - "MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF", "MK", "MADAGASCAR", - "MG", "MALAWI", "MW", "MALAYSIA", "MY", "MALDIVES", "MV", "MALI", - "ML", "MALTA", "MT", "MARSHALL ISLANDS", "MH", "MARTINIQUE", "MQ", - "MAURITANIA", "MR", "MAURITIUS", "MU", "MAYOTTE", "YT", "MEXICO", - "MX", "MICRONESIA, FEDERATED STATES OF", "FM", - "MOLDOVA, REPUBLIC OF", "MD", "MONACO", "MC", "MONGOLIA", "MN", - "MONTENEGRO", "ME", "MONTSERRAT", "MS", "MOROCCO", "MA", - "MOZAMBIQUE", "MZ", "MYANMAR", "MM", "NAMIBIA", "NA", "NAURU", - "NR", "NEPAL", "NP", "NETHERLANDS", "NL", "NETHERLANDS ANTILLES", - "AN", "NEW CALEDONIA", "NC", "NEW ZEALAND", "NZ", "NICARAGUA", - "NI", "NIGER", "NE", "NIGERIA", "NG", "NIUE", "NU", - "NORFOLK ISLAND", "NF", "NORTHERN MARIANA ISLANDS", "MP", "NORWAY", - "NO", "OMAN", "OM", "PAKISTAN", "PK", "PALAU", "PW", + "LAO PEOPLE'S DEMOCRATIC REPUBLIC", "LA", "LATVIA", "LV", "LEBANON", + "LB", "LESOTHO", "LS", "LIBERIA", "LR", "LIBYAN ARAB JAMAHIRIYA", + "LY", "LIECHTENSTEIN", "LI", "LITHUANIA", "LT", "LUXEMBOURG", "LU", + "MACAO", "MO", "MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF", "MK", + "MADAGASCAR", "MG", "MALAWI", "MW", "MALAYSIA", "MY", "MALDIVES", + "MV", "MALI", "ML", "MALTA", "MT", "MARSHALL ISLANDS", "MH", + "MARTINIQUE", "MQ", "MAURITANIA", "MR", "MAURITIUS", "MU", + "MAYOTTE", "YT", "MEXICO", "MX", "MICRONESIA, FEDERATED STATES OF", + "FM", "MOLDOVA, REPUBLIC OF", "MD", "MONACO", "MC", "MONGOLIA", + "MN", "MONTENEGRO", "ME", "MONTSERRAT", "MS", "MOROCCO", "MA", + "MOZAMBIQUE", "MZ", "MYANMAR", "MM", "NAMIBIA", "NA", "NAURU", "NR", + "NEPAL", "NP", "NETHERLANDS", "NL", "NETHERLANDS ANTILLES", "AN", + "NEW CALEDONIA", "NC", "NEW ZEALAND", "NZ", "NICARAGUA", "NI", + "NIGER", "NE", "NIGERIA", "NG", "NIUE", "NU", "NORFOLK ISLAND", + "NF", "NORTHERN MARIANA ISLANDS", "MP", "NORWAY", "NO", "OMAN", + "OM", "PAKISTAN", "PK", "PALAU", "PW", "PALESTINIAN TERRITORY, OCCUPIED", "PS", "PANAMA", "PA", "PAPUA NEW GUINEA", "PG", "PARAGUAY", "PY", "PERU", "PE", "PHILIPPINES", "PH", "PITCAIRN", "PN", "POLAND", "PL", "PORTUGAL", @@ -81,8 +80,8 @@ public class TestUtils { "SIERRA LEONE", "SL", "SINGAPORE", "SG", "SLOVAKIA", "SK", "SLOVENIA", "SI", "SOLOMON ISLANDS", "SB", "SOMALIA", "SO", "SOUTH AFRICA", "ZA", - "SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS", "GS", "SPAIN", - "ES", "SRI LANKA", "LK", "SUDAN", "SD", "SURINAME", "SR", + "SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS", "GS", "SPAIN", "ES", + "SRI LANKA", "LK", "SUDAN", "SD", "SURINAME", "SR", "SVALBARD AND JAN MAYEN", "SJ", "SWAZILAND", "SZ", "SWEDEN", "SE", "SWITZERLAND", "CH", "SYRIAN ARAB REPUBLIC", "SY", "TAIWAN, PROVINCE OF CHINA", "TW", "TAJIKISTAN", "TJ", @@ -90,13 +89,13 @@ public class TestUtils { "TIMOR-LESTE", "TL", "TOGO", "TG", "TOKELAU", "TK", "TONGA", "TO", "TRINIDAD AND TOBAGO", "TT", "TUNISIA", "TN", "TURKEY", "TR", "TURKMENISTAN", "TM", "TURKS AND CAICOS ISLANDS", "TC", "TUVALU", - "TV", "UGANDA", "UG", "UKRAINE", "UA", "UNITED ARAB EMIRATES", - "AE", "UNITED KINGDOM", "GB", "UNITED STATES", "US", + "TV", "UGANDA", "UG", "UKRAINE", "UA", "UNITED ARAB EMIRATES", "AE", + "UNITED KINGDOM", "GB", "UNITED STATES", "US", "UNITED STATES MINOR OUTLYING ISLANDS", "UM", "URUGUAY", "UY", "UZBEKISTAN", "UZ", "VANUATU", "VU", "VENEZUELA", "VE", "VIET NAM", - "VN", "VIRGIN ISLANDS, BRITISH", "VG", "VIRGIN ISLANDS, U.S.", - "VI", "WALLIS AND FUTUNA", "WF", "WESTERN SAHARA", "EH", "YEMEN", - "YE", "ZAMBIA", "ZM", "ZIMBABWE", "ZW" }; + "VN", "VIRGIN ISLANDS, BRITISH", "VG", "VIRGIN ISLANDS, U.S.", "VI", + "WALLIS AND FUTUNA", "WF", "WESTERN SAHARA", "EH", "YEMEN", "YE", + "ZAMBIA", "ZM", "ZIMBABWE", "ZW" }; /** * Crossbrowser hack to dynamically add css current window. Can be used to @@ -106,8 +105,7 @@ public class TestUtils { */ public static void injectCSS(UI w, String cssString) { String script = "if ('\\v'=='v') /* ie only */ {\n" - + " document.createStyleSheet().cssText = '" - + cssString + + " document.createStyleSheet().cssText = '" + cssString + "';\n" + " } else {var tag = document.createElement('style'); tag.type = 'text/css';" + " document.getElementsByTagName('head')[0].appendChild(tag);tag[ (typeof " @@ -133,10 +131,9 @@ public class TestUtils { public static void reportPerformance(String topic, int serverLimit, int clientLimit, boolean bootstrapTime) { - JavaScript - .eval("window.reportVaadinPerformance(\"" + topic + "\", " - + serverLimit + ", " + clientLimit + "," - + bootstrapTime + ");"); + JavaScript.eval("window.reportVaadinPerformance(\"" + topic + "\", " + + serverLimit + ", " + clientLimit + "," + bootstrapTime + + ");"); } public static IndexedContainer getISO3166Container() { diff --git a/uitest/src/main/java/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java b/uitest/src/main/java/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java index 3849268bf7..74da947f40 100644 --- a/uitest/src/main/java/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java +++ b/uitest/src/main/java/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java @@ -47,7 +47,8 @@ public class BootstrapModifyUI extends AbstractTestUI { } }); addComponent(c); - c.setEnabled(getSession().getAttribute(INSTALLED_ATRIBUTE_NAME) == null); + c.setEnabled( + getSession().getAttribute(INSTALLED_ATRIBUTE_NAME) == null); } private static BootstrapListener createBootstrapListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ComplexTestBean.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ComplexTestBean.java index 0d6a1292e2..42d6c5581d 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ComplexTestBean.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ComplexTestBean.java @@ -31,8 +31,7 @@ public class ComplexTestBean extends SharedState { // Default } - public ComplexTestBean(SimpleTestBean innerBean1, - SimpleTestBean innerBean2, + public ComplexTestBean(SimpleTestBean innerBean1, SimpleTestBean innerBean2, List<SimpleTestBean> innerBeanCollection, int privimite) { this.innerBean1 = innerBean1; this.innerBean2 = innerBean2; @@ -60,7 +59,8 @@ public class ComplexTestBean extends SharedState { return innerBeanCollection; } - public void setInnerBeanCollection(List<SimpleTestBean> innerBeanCollection) { + public void setInnerBeanCollection( + List<SimpleTestBean> innerBeanCollection) { this.innerBeanCollection = innerBeanCollection; } diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/EncoderResultDisplayConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/EncoderResultDisplayConnector.java index f2e9710404..32c0e1a618 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/EncoderResultDisplayConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/EncoderResultDisplayConnector.java @@ -51,11 +51,9 @@ public class EncoderResultDisplayConnector extends AbstractExtensionConnector { reportEncode(Double.valueOf("2.2")); reportEncode(new String[] { "One", "Two" }); - reportEncode( - "List", - Arrays.asList("Three", "Four"), - new Type(List.class.getName(), new Type[] { TypeData - .getType(String.class) })); + reportEncode("List", Arrays.asList("Three", "Four"), + new Type(List.class.getName(), + new Type[] { TypeData.getType(String.class) })); reportEncode(new SimpleTestBean(5)); reportEncode(Void.class.getSimpleName(), null, diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/IntermediateReplaceConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/IntermediateReplaceConnector.java index 7f2b5a9a93..97f7c0df79 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/IntermediateReplaceConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/IntermediateReplaceConnector.java @@ -24,8 +24,7 @@ public class IntermediateReplaceConnector extends ReplacedConnector { @Override protected void init() { super.init(); - getWidget().setHTML( - IntermediateReplaceConnector.class.getName() - + ", should not be used"); + getWidget().setHTML(IntermediateReplaceConnector.class.getName() + + ", should not be used"); } } diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutDetectorConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutDetectorConnector.java index e999c83b75..099b169f96 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutDetectorConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutDetectorConnector.java @@ -53,9 +53,8 @@ public class LayoutDetectorConnector extends AbstractComponentConnector } private void updateText() { - getWidget().setHTML( - "Layout count: <span id='layoutCount'>" + layoutCount - + "</span><br />RPC count: <span id='rpcCount'>" - + rpcCount + "</span>"); + getWidget().setHTML("Layout count: <span id='layoutCount'>" + + layoutCount + "</span><br />RPC count: <span id='rpcCount'>" + + rpcCount + "</span>"); } } diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutDuringStateUpdateConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutDuringStateUpdateConnector.java index 799fe9ebee..13204c8cd6 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutDuringStateUpdateConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutDuringStateUpdateConnector.java @@ -23,8 +23,8 @@ import com.vaadin.shared.ui.Connect; import com.vaadin.tests.widgetset.server.LayoutDuringStateUpdateComponent; @Connect(LayoutDuringStateUpdateComponent.class) -public class LayoutDuringStateUpdateConnector extends - AbstractComponentConnector implements PostLayoutListener { +public class LayoutDuringStateUpdateConnector extends AbstractComponentConnector + implements PostLayoutListener { private int layoutCount = 0; @Override diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutMemoryUsageIE8ExtensionConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutMemoryUsageIE8ExtensionConnector.java index 718706da97..bd3dbf7d69 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutMemoryUsageIE8ExtensionConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutMemoryUsageIE8ExtensionConnector.java @@ -24,8 +24,8 @@ import com.vaadin.shared.ui.Connect; import com.vaadin.tests.extensions.LayoutMemoryUsageIE8Extension; @Connect(LayoutMemoryUsageIE8Extension.class) -public class LayoutMemoryUsageIE8ExtensionConnector extends - AbstractExtensionConnector { +public class LayoutMemoryUsageIE8ExtensionConnector + extends AbstractExtensionConnector { @Override protected void extend(ServerConnector target) { diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java index 5fdec05970..63585a6bb3 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java @@ -21,8 +21,8 @@ import com.vaadin.shared.ui.Connect; import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent; @Connect(MissingFromDefaultWidgetsetComponent.class) -public class MissingFromDefaultWidgetsetConnector extends - AbstractComponentConnector { +public class MissingFromDefaultWidgetsetConnector + extends AbstractComponentConnector { @Override public VLabel getWidget() { return (VLabel) super.getWidget(); @@ -30,9 +30,8 @@ public class MissingFromDefaultWidgetsetConnector extends @Override protected void init() { - getWidget() - .setText( - "This component is available in TestingWidgetset, but not in DefaultWidgetset"); + getWidget().setText( + "This component is available in TestingWidgetset, but not in DefaultWidgetset"); super.init(); } } diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/MockApplicationConnection.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MockApplicationConnection.java index 8237d75c6c..b4ba3625c0 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/MockApplicationConnection.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MockApplicationConnection.java @@ -41,8 +41,7 @@ public class MockApplicationConnection extends ApplicationConnection { @Override public MockServerCommunicationHandler getMessageSender() { - return (MockServerCommunicationHandler) super - .getMessageSender(); + return (MockServerCommunicationHandler) super.getMessageSender(); } /** diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ResizeTerrorizerControlConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ResizeTerrorizerControlConnector.java index d3a0c78948..1e2ade8313 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ResizeTerrorizerControlConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ResizeTerrorizerControlConnector.java @@ -42,8 +42,8 @@ import com.vaadin.shared.ui.Connect; import com.vaadin.tests.util.ResizeTerrorizer; @Connect(ResizeTerrorizer.ResizeTerrorizerControl.class) -public class ResizeTerrorizerControlConnector extends - AbstractComponentConnector implements PostLayoutListener { +public class ResizeTerrorizerControlConnector extends AbstractComponentConnector + implements PostLayoutListener { public static class ResizeTerorrizerState extends AbstractComponentState { public Connector target; @@ -131,8 +131,8 @@ public class ResizeTerrorizerControlConnector extends updateFromHistoryToken(History.getToken()); // Then add history change listener - historyHandlerRegistration = History - .addValueChangeHandler(new ValueChangeHandler<String>() { + historyHandlerRegistration = History.addValueChangeHandler( + new ValueChangeHandler<String>() { @Override public void onValueChange( ValueChangeEvent<String> event) { @@ -202,11 +202,11 @@ public class ResizeTerrorizerControlConnector extends double progress = time / duration; - double widthToSet = startWidth + (endWidth - startWidth) - * progress; + double widthToSet = startWidth + + (endWidth - startWidth) * progress; - double heightToSet = startHeight + (endHeight - startHeight) - * progress; + double heightToSet = startHeight + + (endHeight - startHeight) * progress; if (widthToSet != startWidth) { target.getWidget().setWidth(widthToSet + "px"); @@ -264,8 +264,8 @@ public class ResizeTerrorizerControlConnector extends if (getWidget().startHeight.getValue() == null) { int height = getTarget().getWidget().getElement().getOffsetHeight(); getWidget().startHeight.setValue(height); - getWidget().endHeight.setValue(height - + getState().defaultHeightOffset); + getWidget().endHeight + .setValue(height + getState().defaultHeightOffset); } } diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/RunOverflowFixConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/RunOverflowFixConnector.java index a6789ebaf6..4255e2fb6d 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/RunOverflowFixConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/RunOverflowFixConnector.java @@ -21,8 +21,8 @@ import com.vaadin.tests.components.customlayout.OverflowAutoFix; @SuppressWarnings("deprecation") @Connect(OverflowAutoFix.RunOverflowFix.class) -public class RunOverflowFixConnector extends - AbstractComponentContainerConnector { +public class RunOverflowFixConnector + extends AbstractComponentContainerConnector { private static final String CONTENT1 = "Overflow:<br>Fix1 (scroll): Both scrollbars should be shown<br>Fix2 (visible): no scrollbars should be shown"; private static final String CONTENT2 = "OverflowX:<br>Fix1 (hidden): Horizontal scrollbar should be hidden, vertical shown<br>Fix2 (scroll): Both scrollbars should be shown"; @@ -46,18 +46,18 @@ public class RunOverflowFixConnector extends public void onClick(ClickEvent event) { overflow.getElement().getStyle() .setOverflow(Style.Overflow.SCROLL); - WidgetUtil.runWebkitOverflowAutoFix(overflow - .getElement()); + WidgetUtil.runWebkitOverflowAutoFix( + overflow.getElement()); overflowX.getElement().getStyle() .setOverflowX(Style.Overflow.HIDDEN); - WidgetUtil.runWebkitOverflowAutoFix(overflowX - .getElement()); + WidgetUtil.runWebkitOverflowAutoFix( + overflowX.getElement()); overflowY.getElement().getStyle() .setOverflowY(Style.Overflow.HIDDEN); - WidgetUtil.runWebkitOverflowAutoFix(overflowY - .getElement()); + WidgetUtil.runWebkitOverflowAutoFix( + overflowY.getElement()); } }); runFix.addStyleName("run-button-one"); @@ -69,18 +69,18 @@ public class RunOverflowFixConnector extends public void onClick(ClickEvent event) { overflow.getElement().getStyle() .setOverflow(Style.Overflow.VISIBLE); - WidgetUtil.runWebkitOverflowAutoFix(overflow - .getElement()); + WidgetUtil.runWebkitOverflowAutoFix( + overflow.getElement()); overflowX.getElement().getStyle() .setOverflowX(Style.Overflow.SCROLL); - WidgetUtil.runWebkitOverflowAutoFix(overflowX - .getElement()); + WidgetUtil.runWebkitOverflowAutoFix( + overflowX.getElement()); overflowY.getElement().getStyle() .setOverflowY(Style.Overflow.AUTO); - WidgetUtil.runWebkitOverflowAutoFix(overflowY - .getElement()); + WidgetUtil.runWebkitOverflowAutoFix( + overflowY.getElement()); } }); runFix2.addStyleName("run-button-two"); diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ScrollableGridLayoutConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ScrollableGridLayoutConnector.java index d6431ac9f9..60a5723c3b 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ScrollableGridLayoutConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ScrollableGridLayoutConnector.java @@ -26,7 +26,8 @@ import com.vaadin.tests.widgetset.server.ScrollableGridLayout; public class ScrollableGridLayoutConnector extends GridLayoutConnector implements MayScrollChildren { @Override - public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) { + public void onConnectorHierarchyChange( + ConnectorHierarchyChangeEvent event) { super.onConnectorHierarchyChange(event); for (VGridLayout.Cell cell : getWidget().widgetToCell.values()) { diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestConnector.java index 124b1b5600..08fba91643 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestConnector.java @@ -56,14 +56,14 @@ public class SerializerTestConnector extends AbstractExtensionConnector { SimpleTestBean firstValue = generics.values().iterator().next() .get(Integer.valueOf(1)).get(0); - Set<SimpleTestBean> key = new HashSet<SimpleTestBean>(Arrays - .asList(firstValue)); + Set<SimpleTestBean> key = new HashSet<SimpleTestBean>( + Arrays.asList(firstValue)); Map<Integer, List<SimpleTestBean>> value = new HashMap<Integer, List<SimpleTestBean>>(); - Set<SimpleTestBean> firstKeyValue = generics.keySet() - .iterator().next(); - value.put(Integer.valueOf(1), new ArrayList<SimpleTestBean>( - firstKeyValue)); + Set<SimpleTestBean> firstKeyValue = generics.keySet().iterator() + .next(); + value.put(Integer.valueOf(1), + new ArrayList<SimpleTestBean>(firstKeyValue)); updated.put(key, value); @@ -74,8 +74,8 @@ public class SerializerTestConnector extends AbstractExtensionConnector { public void sendString(String value, String[] array) { char[] chars = value.toCharArray(); Arrays.sort(chars); - rpc.sendString(new String(chars), new String[] { array[1], - array[0] }); + rpc.sendString(new String(chars), + new String[] { array[1], array[0] }); } @Override @@ -95,9 +95,11 @@ public class SerializerTestConnector extends AbstractExtensionConnector { @Override public void sendNestedArray(int[][] nestedIntArray, SimpleTestBean[][] nestedBeanArray) { - rpc.sendNestedArray(new int[][] { { nestedIntArray[1][0], - nestedIntArray[0][0] } }, new SimpleTestBean[][] { - { nestedBeanArray[0][1] }, { nestedBeanArray[0][0] } }); + rpc.sendNestedArray( + new int[][] { { nestedIntArray[1][0], + nestedIntArray[0][0] } }, + new SimpleTestBean[][] { { nestedBeanArray[0][1] }, + { nestedBeanArray[0][0] } }); } @Override @@ -116,18 +118,20 @@ public class SerializerTestConnector extends AbstractExtensionConnector { connectorMap.get(getUIConnector())), Collections.singletonMap( Integer.valueOf(stringMap.size()), - getThisConnector()), updatedBeanMap); + getThisConnector()), + updatedBeanMap); } @Override public void sendLong(long value, Long boxedValue, long[] array) { - rpc.sendLong(array[0], Long.valueOf(value), new long[] { - array[1], boxedValue.longValue() }); + rpc.sendLong(array[0], Long.valueOf(value), + new long[] { array[1], boxedValue.longValue() }); } @Override public void sendList(List<Integer> intList, - List<Connector> connectorList, List<SimpleTestBean> beanList) { + List<Connector> connectorList, + List<SimpleTestBean> beanList) { Collections.sort(intList); Collections.reverse(beanList); rpc.sendList(intList, @@ -137,12 +141,13 @@ public class SerializerTestConnector extends AbstractExtensionConnector { @Override public void sendInt(int value, Integer boxedValue, int[] array) { - rpc.sendInt(array.length, Integer.valueOf(array[0]), new int[] { - value, boxedValue.intValue() }); + rpc.sendInt(array.length, Integer.valueOf(array[0]), + new int[] { value, boxedValue.intValue() }); } @Override - public void sendFloat(float value, Float boxedValue, float[] array) { + public void sendFloat(float value, Float boxedValue, + float[] array) { Arrays.sort(array); rpc.sendFloat(boxedValue.floatValue(), Float.valueOf(value), array); @@ -162,10 +167,11 @@ public class SerializerTestConnector extends AbstractExtensionConnector { } @Override - public void sendChar(char value, Character boxedValue, char[] array) { + public void sendChar(char value, Character boxedValue, + char[] array) { rpc.sendChar(Character.toUpperCase(boxedValue.charValue()), - Character.valueOf(value), new String(array) - .toLowerCase().toCharArray()); + Character.valueOf(value), + new String(array).toLowerCase().toCharArray()); } @Override @@ -191,15 +197,15 @@ public class SerializerTestConnector extends AbstractExtensionConnector { public void sendBean(ComplexTestBean complexBean, SimpleTestBean simpleBean, SimpleTestBean[] array) { SimpleTestBean updatedSimpleBean = new SimpleTestBean(); - updatedSimpleBean.setValue(complexBean.getInnerBean1() - .getValue()); + updatedSimpleBean + .setValue(complexBean.getInnerBean1().getValue()); ComplexTestBean updatedComplexBean = new ComplexTestBean(); updatedComplexBean.setInnerBean1(complexBean.getInnerBean2()); - updatedComplexBean.setInnerBean2(complexBean - .getInnerBeanCollection().get(0)); - updatedComplexBean.setInnerBeanCollection(Arrays.asList( - simpleBean, updatedSimpleBean)); + updatedComplexBean.setInnerBean2( + complexBean.getInnerBeanCollection().get(0)); + updatedComplexBean.setInnerBeanCollection( + Arrays.asList(simpleBean, updatedSimpleBean)); updatedComplexBean.setPrivimite(complexBean.getPrivimite() + 1); ArrayList<SimpleTestBean> arrayList = new ArrayList<SimpleTestBean>( @@ -217,14 +223,14 @@ public class SerializerTestConnector extends AbstractExtensionConnector { Collections.reverse(beanArrayList); List<Integer[]> updatedObjectArrayList = new ArrayList<Integer[]>(); for (int[] array : primitiveArrayList) { - updatedObjectArrayList.add(new Integer[] { - Integer.valueOf(array.length), - Integer.valueOf(array[0]) }); + updatedObjectArrayList + .add(new Integer[] { Integer.valueOf(array.length), + Integer.valueOf(array[0]) }); } - rpc.sendArrayList(Arrays.asList( - new int[] { primitiveArrayList.size() }, - new int[] { objectArrayList.get(0).length }), + rpc.sendArrayList( + Arrays.asList(new int[] { primitiveArrayList.size() }, + new int[] { objectArrayList.get(0).length }), updatedObjectArrayList, beanArrayList); } @@ -236,16 +242,17 @@ public class SerializerTestConnector extends AbstractExtensionConnector { @Override public void sendListArray(List<Integer>[] objectListArray, List<SimpleTestBean>[] beanListArray) { - rpc.sendListArray(new List[] { objectListArray[1], - objectListArray[0] }, new List[] { Collections - .singletonList(beanListArray[0].get(0)) }); + rpc.sendListArray( + new List[] { objectListArray[1], objectListArray[0] }, + new List[] { Collections + .singletonList(beanListArray[0].get(0)) }); } @Override public void sendEnum(ContentMode contentMode, ContentMode[] array, List<ContentMode> list) { - ContentMode nextContentMode = ContentMode.values()[contentMode - .ordinal() + 1]; + ContentMode nextContentMode = ContentMode + .values()[contentMode.ordinal() + 1]; rpc.sendEnum(nextContentMode, list.toArray(new ContentMode[list.size()]), Arrays.asList(array)); @@ -275,13 +282,13 @@ public class SerializerTestConnector extends AbstractExtensionConnector { public void sendJson(JsonValue value1, JsonValue value2, JsonString string) { if (value1.getType() != JsonType.BOOLEAN) { - throw new RuntimeException("Expected boolean, got " - + value1.toJson()); + throw new RuntimeException( + "Expected boolean, got " + value1.toJson()); } if (value2.getType() != JsonType.NULL) { - throw new RuntimeException("Expected null, got " - + value2.toJson()); + throw new RuntimeException( + "Expected null, got " + value2.toJson()); } JsonObject returnObject = Json.createObject(); @@ -343,10 +350,12 @@ public class SerializerTestConnector extends AbstractExtensionConnector { rpc.log("state.doubleValue: " + getState().doubleValue); rpc.log("state.doubleObjectValue: " + getState().doubleObjectValue); - rpc.log("state.doubleArray: " + Arrays.toString(getState().doubleArray)); + rpc.log("state.doubleArray: " + + Arrays.toString(getState().doubleArray)); rpc.log("state.string: " + getState().string); - rpc.log("state.stringArray: " + Arrays.toString(getState().stringArray)); + rpc.log("state.stringArray: " + + Arrays.toString(getState().stringArray)); rpc.log("state.jsonNull: " + getState().jsonNull.getType().name()); rpc.log("state.jsonString: " diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestRpc.java index 95c04ebcfe..6a35edd234 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestRpc.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestRpc.java @@ -49,8 +49,8 @@ public interface SerializerTestRpc extends ServerRpc, ClientRpc { public void sendConnector(Connector connector); - public void sendBean(ComplexTestBean complexBean, - SimpleTestBean simpleBean, SimpleTestBean[] array); + public void sendBean(ComplexTestBean complexBean, SimpleTestBean simpleBean, + SimpleTestBean[] array); public void sendNull(String value1, String value2); diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/TestWidgetConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/TestWidgetConnector.java index 33a8956810..f72f779d77 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/TestWidgetConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/TestWidgetConnector.java @@ -33,8 +33,8 @@ import com.vaadin.tests.widgetset.server.TestWidgetComponent; @Connect(TestWidgetComponent.class) public class TestWidgetConnector extends AbstractComponentConnector { - public static class SubPartAwareSimplePanel extends SimplePanel implements - SubPartAware { + public static class SubPartAwareSimplePanel extends SimplePanel + implements SubPartAware { @Override public Element getSubPartElement(String subPart) { Widget target = getWidget(); diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnector.java index 948c1ece3d..ed41bb63b9 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnector.java @@ -25,8 +25,8 @@ import com.vaadin.shared.ui.Connect; import com.vaadin.tests.widgetset.server.UseStateFromHierachyComponent; @Connect(UseStateFromHierachyComponent.class) -public class UseStateFromHierachyChangeConnector extends - AbstractSingleComponentContainerConnector { +public class UseStateFromHierachyChangeConnector + extends AbstractSingleComponentContainerConnector { @Override public SimplePanel getWidget() { diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnectorState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnectorState.java index 9dbededb50..66dbf98f22 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnectorState.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnectorState.java @@ -19,7 +19,7 @@ package com.vaadin.tests.widgetset.client; import com.vaadin.shared.AbstractComponentState; import com.vaadin.shared.Connector; -public class UseStateFromHierachyChangeConnectorState extends - AbstractComponentState { +public class UseStateFromHierachyChangeConnectorState + extends AbstractComponentState { public Connector child; } diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/csrf/CsrfButtonConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/csrf/CsrfButtonConnector.java index 39dca8d799..3d689165d5 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/csrf/CsrfButtonConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/csrf/CsrfButtonConnector.java @@ -70,8 +70,8 @@ public class CsrfButtonConnector extends AbstractComponentConnector { } private String csrfTokenInfo() { - return getMockConnection().getMessageHandler().getCsrfToken() - + ", " + getMockConnection().getLastCsrfTokenReceiver() + ", " + return getMockConnection().getMessageHandler().getCsrfToken() + ", " + + getMockConnection().getLastCsrfTokenReceiver() + ", " + getMockConnection().getLastCsrfTokenSent(); } diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/dd/SpacebarPannerConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/dd/SpacebarPannerConnector.java index e13dd5030b..d2939e5b4e 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/dd/SpacebarPannerConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/dd/SpacebarPannerConnector.java @@ -20,8 +20,8 @@ import com.vaadin.shared.ui.Connect; @Connect(com.vaadin.tests.dd.SpacebarPanner.class) public class SpacebarPannerConnector extends AbstractExtensionConnector { - Logger logger = Logger.getLogger(SpacebarPannerConnector.class - .getSimpleName()); + Logger logger = Logger + .getLogger(SpacebarPannerConnector.class.getSimpleName()); private boolean trigger = false; private VUI vui; diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/extension/BrowserContextMenuExtensionConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/extension/BrowserContextMenuExtensionConnector.java index 9b05ff35d8..6f404c779b 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/extension/BrowserContextMenuExtensionConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/extension/BrowserContextMenuExtensionConnector.java @@ -27,8 +27,8 @@ import com.vaadin.tests.contextclick.BrowserContextMenuInSubComponent.BrowserCon * Client-side connector of the {@link BrowserContextMenuExtension}. */ @Connect(BrowserContextMenuExtension.class) -public class BrowserContextMenuExtensionConnector extends - AbstractExtensionConnector { +public class BrowserContextMenuExtensionConnector + extends AbstractExtensionConnector { @Override protected void extend(ServerConnector target) { diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorBasicClientFeaturesWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorBasicClientFeaturesWidget.java index c735797731..f39c8119be 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorBasicClientFeaturesWidget.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorBasicClientFeaturesWidget.java @@ -19,8 +19,8 @@ import com.vaadin.client.widget.escalator.SpacerUpdater; import com.vaadin.client.widgets.Escalator; import com.vaadin.shared.ui.grid.ScrollDestination; -public class EscalatorBasicClientFeaturesWidget extends - PureGWTTestApplication<Escalator> { +public class EscalatorBasicClientFeaturesWidget + extends PureGWTTestApplication<Escalator> { public static class LogWidget extends Composite { @@ -66,12 +66,13 @@ public class EscalatorBasicClientFeaturesWidget extends } } - public static class UpdaterLifetimeWidget extends - EscalatorBasicClientFeaturesWidget { + public static class UpdaterLifetimeWidget + extends EscalatorBasicClientFeaturesWidget { private final EscalatorUpdater debugUpdater = new EscalatorUpdater() { @Override - public void preAttach(Row row, Iterable<FlyweightCell> cellsToAttach) { + public void preAttach(Row row, + Iterable<FlyweightCell> cellsToAttach) { log("preAttach", cellsToAttach); } @@ -87,7 +88,8 @@ public class EscalatorBasicClientFeaturesWidget extends } @Override - public void preDetach(Row row, Iterable<FlyweightCell> cellsToDetach) { + public void preDetach(Row row, + Iterable<FlyweightCell> cellsToDetach) { log("preDetach", cellsToDetach); } @@ -105,9 +107,10 @@ public class EscalatorBasicClientFeaturesWidget extends TableCellElement cellElement = cells.iterator().next() .getElement(); boolean isAttached = cellElement.getParentElement() != null - && cellElement.getParentElement().getParentElement() != null; - logWidget.log(methodName + ": elementIsAttached == " - + isAttached); + && cellElement.getParentElement() + .getParentElement() != null; + logWidget.log( + methodName + ": elementIsAttached == " + isAttached); } }; @@ -123,8 +126,8 @@ public class EscalatorBasicClientFeaturesWidget extends private static final String GENERAL_MENU = "General"; private static final String FEATURES_MENU = "Features"; - private static abstract class TestEscalatorUpdater implements - EscalatorUpdater { + private static abstract class TestEscalatorUpdater + implements EscalatorUpdater { @Override public void preAttach(Row row, Iterable<FlyweightCell> cellsToAttach) { @@ -466,8 +469,8 @@ public class EscalatorBasicClientFeaturesWidget extends addMenuCommand("Add one column to end", new ScheduledCommand() { @Override public void execute() { - insertColumns(escalator.getColumnConfiguration() - .getColumnCount(), 1); + insertColumns( + escalator.getColumnConfiguration().getColumnCount(), 1); } }, menupath); addMenuCommand("Add ten columns", new ScheduledCommand() { @@ -486,8 +489,9 @@ public class EscalatorBasicClientFeaturesWidget extends addMenuCommand("Remove one column from end", new ScheduledCommand() { @Override public void execute() { - removeColumns(escalator.getColumnConfiguration() - .getColumnCount() - 1, 1); + removeColumns( + escalator.getColumnConfiguration().getColumnCount() - 1, + 1); } }, menupath); @@ -502,8 +506,8 @@ public class EscalatorBasicClientFeaturesWidget extends new ScheduledCommand() { @Override public void execute() { - escalator.getColumnConfiguration() - .setColumnWidth(0, -1); + escalator.getColumnConfiguration().setColumnWidth(0, + -1); } }, menupath); @@ -544,31 +548,31 @@ public class EscalatorBasicClientFeaturesWidget extends addMenuCommand("Remove 5 rows from bottom", new ScheduledCommand() { @Override public void execute() { - removeRows(escalator.getBody(), escalator.getBody() - .getRowCount() - 5, 5); + removeRows(escalator.getBody(), + escalator.getBody().getRowCount() - 5, 5); } }, menupath); addMenuCommand("Remove 50 rows from bottom", new ScheduledCommand() { @Override public void execute() { - removeRows(escalator.getBody(), escalator.getBody() - .getRowCount() - 50, 50); + removeRows(escalator.getBody(), + escalator.getBody().getRowCount() - 50, 50); } }, menupath); addMenuCommand("Remove 50 rows from almost bottom", new ScheduledCommand() { @Override public void execute() { - removeRows(escalator.getBody(), escalator.getBody() - .getRowCount() - 60, 50); + removeRows(escalator.getBody(), + escalator.getBody().getRowCount() - 60, 50); } }, menupath); addMenuCommand("Remove all, insert 30 and scroll 40px", new ScheduledCommand() { @Override public void execute() { - removeRows(escalator.getBody(), 0, escalator.getBody() - .getRowCount()); + removeRows(escalator.getBody(), 0, + escalator.getBody().getRowCount()); insertRows(escalator.getBody(), 0, 30); escalator.setScrollTop(40); } @@ -595,7 +599,8 @@ public class EscalatorBasicClientFeaturesWidget extends }, menupath); } - private void createRowsMenu(final RowContainer container, String[] menupath) { + private void createRowsMenu(final RowContainer container, + String[] menupath) { addMenuCommand("Add one row to beginning", new ScheduledCommand() { @Override public void execute() { @@ -650,8 +655,8 @@ public class EscalatorBasicClientFeaturesWidget extends @Override public void init(Spacer spacer) { - spacer.getElement().setInnerText( - "Spacer for row " + spacer.getRow()); + spacer.getElement() + .setInnerText("Spacer for row " + spacer.getRow()); } }; @@ -690,7 +695,8 @@ public class EscalatorBasicClientFeaturesWidget extends createSpacersMenuForRow(99, menupath); } - private void createSpacersMenuForRow(final int rowIndex, String[] menupath) { + private void createSpacersMenuForRow(final int rowIndex, + String[] menupath) { menupath = new String[] { menupath[0], menupath[1], "Row " + rowIndex }; addMenuCommand("Set 100px", new ScheduledCommand() { @Override @@ -726,7 +732,8 @@ public class EscalatorBasicClientFeaturesWidget extends }, menupath); } - private void insertRows(final RowContainer container, int offset, int number) { + private void insertRows(final RowContainer container, int offset, + int number) { if (container == escalator.getBody()) { data.insertRows(offset, number); escalator.getBody().insertRows(offset, number); @@ -735,7 +742,8 @@ public class EscalatorBasicClientFeaturesWidget extends } } - private void removeRows(final RowContainer container, int offset, int number) { + private void removeRows(final RowContainer container, int offset, + int number) { if (container == escalator.getBody()) { data.removeRows(offset, number); escalator.getBody().removeRows(offset, number); @@ -756,44 +764,44 @@ public class EscalatorBasicClientFeaturesWidget extends private void resetColRow() { if (escalator.getColumnConfiguration().getColumnCount() > 0) { - removeColumns(0, escalator.getColumnConfiguration() - .getColumnCount()); + removeColumns(0, + escalator.getColumnConfiguration().getColumnCount()); } if (escalator.getFooter().getRowCount() > 0) { - removeRows(escalator.getFooter(), 0, escalator.getFooter() - .getRowCount()); + removeRows(escalator.getFooter(), 0, + escalator.getFooter().getRowCount()); } if (escalator.getBody().getRowCount() > 0) { - removeRows(escalator.getBody(), 0, escalator.getBody() - .getRowCount()); + removeRows(escalator.getBody(), 0, + escalator.getBody().getRowCount()); } if (escalator.getHeader().getRowCount() > 0) { - removeRows(escalator.getHeader(), 0, escalator.getHeader() - .getRowCount()); + removeRows(escalator.getHeader(), 0, + escalator.getHeader().getRowCount()); } } private void resetRowCol() { if (escalator.getFooter().getRowCount() > 0) { - removeRows(escalator.getFooter(), 0, escalator.getFooter() - .getRowCount()); + removeRows(escalator.getFooter(), 0, + escalator.getFooter().getRowCount()); } if (escalator.getBody().getRowCount() > 0) { - removeRows(escalator.getBody(), 0, escalator.getBody() - .getRowCount()); + removeRows(escalator.getBody(), 0, + escalator.getBody().getRowCount()); } if (escalator.getHeader().getRowCount() > 0) { - removeRows(escalator.getHeader(), 0, escalator.getHeader() - .getRowCount()); + removeRows(escalator.getHeader(), 0, + escalator.getHeader().getRowCount()); } if (escalator.getColumnConfiguration().getColumnCount() > 0) { - removeColumns(0, escalator.getColumnConfiguration() - .getColumnCount()); + removeColumns(0, + escalator.getColumnConfiguration().getColumnCount()); } } diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java index e7ebcfeb51..5e596a5006 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java @@ -33,7 +33,8 @@ public class EscalatorProxy extends Escalator { private class ColumnConfigurationProxy implements ColumnConfiguration { private ColumnConfiguration columnConfiguration; - public ColumnConfigurationProxy(ColumnConfiguration columnConfiguration) { + public ColumnConfigurationProxy( + ColumnConfiguration columnConfiguration) { this.columnConfiguration = columnConfiguration; } @@ -76,7 +77,8 @@ public class EscalatorProxy extends Escalator { } @Override - public double getColumnWidth(int index) throws IllegalArgumentException { + public double getColumnWidth(int index) + throws IllegalArgumentException { return columnConfiguration.getColumnWidth(index); } @@ -99,8 +101,8 @@ public class EscalatorProxy extends Escalator { } } - private class BodyRowContainerProxy extends RowContainerProxy implements - BodyRowContainer { + private class BodyRowContainerProxy extends RowContainerProxy + implements BodyRowContainer { private BodyRowContainer rowContainer; public BodyRowContainerProxy(BodyRowContainer rowContainer) { diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java index b6386afe44..769c88aa51 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java @@ -96,8 +96,8 @@ import com.vaadin.tests.widgetset.client.grid.GridBasicClientFeaturesWidget.Data * @since * @author Vaadin Ltd */ -public class GridBasicClientFeaturesWidget extends - PureGWTTestApplication<Grid<List<Data>>> { +public class GridBasicClientFeaturesWidget + extends PureGWTTestApplication<Grid<List<Data>>> { public static final String ROW_STYLE_GENERATOR_NONE = "None"; public static final String ROW_STYLE_GENERATOR_ROW_INDEX = "Row numbers"; public static final String ROW_STYLE_GENERATOR_EVERY_THIRD = "Every third"; @@ -125,7 +125,8 @@ public class GridBasicClientFeaturesWidget extends public void bind(EditorRequest<List<Data>> request) { List<Data> rowData = ds.getRow(request.getRowIndex()); - boolean hasSelectionColumn = !(grid.getSelectionModel() instanceof None); + boolean hasSelectionColumn = !(grid + .getSelectionModel() instanceof None); for (int i = 0; i < rowData.size(); i++) { int columnIndex = hasSelectionColumn ? i + 1 : i; getWidget(columnIndex).setText(rowData.get(i).value.toString()); @@ -144,8 +145,8 @@ public class GridBasicClientFeaturesWidget extends request.failure( "Syntethic fail of editor in column 2. " + "This message is so long that it doesn't fit into its box", - Collections.<Column<?, List<Data>>> singleton(grid - .getColumn(2))); + Collections.<Column<?, List<Data>>> singleton( + grid.getColumn(2))); return; } try { @@ -472,8 +473,8 @@ public class GridBasicClientFeaturesWidget extends final Label columnOrderLabel = new Label(); columnOrderLabel.getElement().setId("columnreorder"); addLineEnd(columnOrderLabel, 300); - columnReorderHandler = grid - .addColumnReorderHandler(new ColumnReorderHandler<List<Data>>() { + columnReorderHandler = grid.addColumnReorderHandler( + new ColumnReorderHandler<List<Data>>() { private int eventIndex = 0; @@ -508,17 +509,14 @@ public class GridBasicClientFeaturesWidget extends columnOrderLabel.getElement().setAttribute( "counter", "" + (++eventIndex)); columnOrderLabel.getElement().setAttribute( - "useroriginated", - (Boolean.toString(event - .isUserOriginated()))); + "useroriginated", (Boolean.toString( + event.isUserOriginated()))); columnOrderLabel.getElement().setAttribute( "ishidden", (Boolean.toString(event.isHidden()))); columnOrderLabel.getElement().setAttribute( - "columnindex", - "" - + grid.getColumns().indexOf( - event.getColumn())); + "columnindex", "" + grid.getColumns() + .indexOf(event.getColumn())); } }; @@ -546,9 +544,8 @@ public class GridBasicClientFeaturesWidget extends location = "somewhere"; } - getLogger().info( - "Prevented opening a context menu in grid " - + location); + getLogger().info("Prevented opening a context menu in grid " + + location); } }; @@ -644,8 +641,8 @@ public class GridBasicClientFeaturesWidget extends @Override public void execute() { DataSource<List<Data>> ds = grid.getDataSource(); - final RowHandle<List<Data>> rowHandle = ds.getHandle(ds - .getRow(0)); + final RowHandle<List<Data>> rowHandle = ds + .getHandle(ds.getRow(0)); new Timer() { @Override @@ -671,13 +668,14 @@ public class GridBasicClientFeaturesWidget extends grid.setRowStyleGenerator(new RowStyleGenerator<List<Data>>() { @Override - public String getStyle(RowReference<List<Data>> rowReference) { + public String getStyle( + RowReference<List<Data>> rowReference) { if (rowReference.getRowIndex() % 3 == 0) { return "third"; } else { // First manual col is integer - Integer value = (Integer) rowReference.getRow() - .get(COLUMNS - MANUALLY_FORMATTED_COLUMNS).value; + Integer value = (Integer) rowReference.getRow().get( + COLUMNS - MANUALLY_FORMATTED_COLUMNS).value; return value.toString(); } } @@ -692,7 +690,8 @@ public class GridBasicClientFeaturesWidget extends grid.setRowStyleGenerator(new RowStyleGenerator<List<Data>>() { @Override - public String getStyle(RowReference<List<Data>> rowReference) { + public String getStyle( + RowReference<List<Data>> rowReference) { return Integer.toString(rowReference.getRowIndex()); } }); @@ -710,43 +709,44 @@ public class GridBasicClientFeaturesWidget extends addMenuCommand(CELL_STYLE_GENERATOR_SIMPLE, new ScheduledCommand() { @Override public void execute() { - grid.setCellStyleGenerator(new CellStyleGenerator<List<Data>>() { - - @Override - public String getStyle( - CellReference<List<Data>> cellReference) { - Grid.Column<?, List<Data>> column = cellReference - .getColumn(); - if (column == grid.getColumn(2)) { - return "two"; - } else if (column == grid.getColumn(COLUMNS - - MANUALLY_FORMATTED_COLUMNS)) { - // First manual col is integer - Integer value = (Integer) column - .getValue(cellReference.getRow()); - return value.toString(); + grid.setCellStyleGenerator( + new CellStyleGenerator<List<Data>>() { - } else { - return null; - } - } - }); + @Override + public String getStyle( + CellReference<List<Data>> cellReference) { + Grid.Column<?, List<Data>> column = cellReference + .getColumn(); + if (column == grid.getColumn(2)) { + return "two"; + } else if (column == grid.getColumn( + COLUMNS - MANUALLY_FORMATTED_COLUMNS)) { + // First manual col is integer + Integer value = (Integer) column + .getValue(cellReference.getRow()); + return value.toString(); + + } else { + return null; + } + } + }); } }, cellStyleGeneratorNamePath); addMenuCommand(CELL_STYLE_GENERATOR_COL_INDEX, new ScheduledCommand() { @Override public void execute() { - grid.setCellStyleGenerator(new CellStyleGenerator<List<Data>>() { + grid.setCellStyleGenerator( + new CellStyleGenerator<List<Data>>() { - @Override - public String getStyle( - CellReference<List<Data>> cellReference) { - return cellReference.getRowIndex() - + "_" - + grid.getColumns().indexOf( - cellReference.getColumn()); - } - }); + @Override + public String getStyle( + CellReference<List<Data>> cellReference) { + return cellReference.getRowIndex() + "_" + + grid.getColumns().indexOf( + cellReference.getColumn()); + } + }); } }, cellStyleGeneratorNamePath); @@ -776,15 +776,16 @@ public class GridBasicClientFeaturesWidget extends public void execute() { List<Column> columns = new ArrayList<Column>(grid.getColumns()); Collections.reverse(columns); - grid.setColumnOrder(columns.toArray(new Column[columns.size()])); + grid.setColumnOrder( + columns.toArray(new Column[columns.size()])); } }, "Component", "State"); addMenuCommand("Column Reordering", new ScheduledCommand() { @Override public void execute() { - grid.setColumnReorderingAllowed(!grid - .isColumnReorderingAllowed()); + grid.setColumnReorderingAllowed( + !grid.isColumnReorderingAllowed()); } }, "Component", "State"); addMenuCommand("250px", new ScheduledCommand() { @@ -820,8 +821,8 @@ public class GridBasicClientFeaturesWidget extends } private void createScrollToRowMenu() { - String[] menupath = new String[] { "Component", "State", - "Scroll to...", null }; + String[] menupath = new String[] { "Component", "State", "Scroll to...", + null }; for (int i = 0; i < ROWS; i += 100) { menupath[3] = "Row " + i + "..."; @@ -988,8 +989,8 @@ public class GridBasicClientFeaturesWidget extends Column<?, List<Data>> col = reordered.remove(index); reordered.add(index - 1, col); } - grid.setColumnOrder(reordered.toArray(new Column[reordered - .size()])); + grid.setColumnOrder( + reordered.toArray(new Column[reordered.size()])); } }, "Component", "Columns", "Column " + i); } @@ -1051,8 +1052,8 @@ public class GridBasicClientFeaturesWidget extends addMenuCommand("Bottom", new ScheduledCommand() { @Override public void execute() { - grid.setDefaultHeaderRow(grid.getHeaderRow(grid - .getHeaderRowCount() - 1)); + grid.setDefaultHeaderRow( + grid.getHeaderRow(grid.getHeaderRowCount() - 1)); } }, "Component", "Header", "Default row"); addMenuCommand("Unset", new ScheduledCommand() { @@ -1099,8 +1100,8 @@ public class GridBasicClientFeaturesWidget extends @Override public void execute() { row.join(row.getCell(grid.getColumn(0)), - row.getCell(grid.getColumn(1))).setText( - "Join column cells 0, 1"); + row.getCell(grid.getColumn(1))) + .setText("Join column cells 0, 1"); } }, menuPath); @@ -1109,8 +1110,8 @@ public class GridBasicClientFeaturesWidget extends @Override public void execute() { - row.join(grid.getColumn(1), grid.getColumn(2)).setText( - "Join columns 1, 2"); + row.join(grid.getColumn(1), grid.getColumn(2)) + .setText("Join columns 1, 2"); ; } @@ -1130,9 +1131,8 @@ public class GridBasicClientFeaturesWidget extends @Override public void execute() { - row.join( - grid.getColumns().toArray( - new Grid.Column[grid.getColumnCount()])) + row.join(grid.getColumns() + .toArray(new Grid.Column[grid.getColumnCount()])) .setText("Join all columns"); ; @@ -1245,8 +1245,8 @@ public class GridBasicClientFeaturesWidget extends @Override public void execute() { row.join(row.getCell(grid.getColumn(0)), - row.getCell(grid.getColumn(1))).setText( - "Join column cells 0, 1"); + row.getCell(grid.getColumn(1))) + .setText("Join column cells 0, 1"); } }, menuPath); @@ -1255,8 +1255,8 @@ public class GridBasicClientFeaturesWidget extends @Override public void execute() { - row.join(grid.getColumn(1), grid.getColumn(2)).setText( - "Join columns 1, 2"); + row.join(grid.getColumn(1), grid.getColumn(2)) + .setText("Join columns 1, 2"); ; } @@ -1266,9 +1266,8 @@ public class GridBasicClientFeaturesWidget extends @Override public void execute() { - row.join( - grid.getColumns().toArray( - new Grid.Column[grid.getColumnCount()])) + row.join(grid.getColumns() + .toArray(new Grid.Column[grid.getColumnCount()])) .setText("Join all columns"); ; @@ -1312,7 +1311,8 @@ public class GridBasicClientFeaturesWidget extends return new HtmlRenderer() { @Override - public void render(RendererCellReference cell, String htmlString) { + public void render(RendererCellReference cell, + String htmlString) { super.render(cell, "<b>" + htmlString + "</b>"); } }; @@ -1346,8 +1346,8 @@ public class GridBasicClientFeaturesWidget extends @Override public void onKeyDown(GridKeyDownEvent event) { CellReference<?> focused = event.getFocusedCell(); - updateLabel(label, event.toDebugString(), - focused.getRowIndex(), focused.getColumnIndex()); + updateLabel(label, event.toDebugString(), focused.getRowIndex(), + focused.getColumnIndex()); } }); @@ -1357,8 +1357,8 @@ public class GridBasicClientFeaturesWidget extends @Override public void onKeyDown(GridKeyDownEvent event) { CellReference<?> focused = event.getFocusedCell(); - updateLabel(label, event.toDebugString(), - focused.getRowIndex(), focused.getColumnIndex()); + updateLabel(label, event.toDebugString(), focused.getRowIndex(), + focused.getColumnIndex()); } }); @@ -1368,8 +1368,8 @@ public class GridBasicClientFeaturesWidget extends @Override public void onKeyDown(GridKeyDownEvent event) { CellReference<?> focused = event.getFocusedCell(); - updateLabel(label, event.toDebugString(), - focused.getRowIndex(), focused.getColumnIndex()); + updateLabel(label, event.toDebugString(), focused.getRowIndex(), + focused.getColumnIndex()); } }); @@ -1380,8 +1380,8 @@ public class GridBasicClientFeaturesWidget extends @Override public void onKeyUp(GridKeyUpEvent event) { CellReference<?> focused = event.getFocusedCell(); - updateLabel(label, event.toDebugString(), - focused.getRowIndex(), focused.getColumnIndex()); + updateLabel(label, event.toDebugString(), focused.getRowIndex(), + focused.getColumnIndex()); } }); @@ -1391,8 +1391,8 @@ public class GridBasicClientFeaturesWidget extends @Override public void onKeyUp(GridKeyUpEvent event) { CellReference<?> focused = event.getFocusedCell(); - updateLabel(label, event.toDebugString(), - focused.getRowIndex(), focused.getColumnIndex()); + updateLabel(label, event.toDebugString(), focused.getRowIndex(), + focused.getColumnIndex()); } }); @@ -1402,8 +1402,8 @@ public class GridBasicClientFeaturesWidget extends @Override public void onKeyUp(GridKeyUpEvent event) { CellReference<?> focused = event.getFocusedCell(); - updateLabel(label, event.toDebugString(), - focused.getRowIndex(), focused.getColumnIndex()); + updateLabel(label, event.toDebugString(), focused.getRowIndex(), + focused.getColumnIndex()); } }); @@ -1414,8 +1414,8 @@ public class GridBasicClientFeaturesWidget extends @Override public void onKeyPress(GridKeyPressEvent event) { CellReference<?> focused = event.getFocusedCell(); - updateLabel(label, event.toDebugString(), - focused.getRowIndex(), focused.getColumnIndex()); + updateLabel(label, event.toDebugString(), focused.getRowIndex(), + focused.getColumnIndex()); } }); @@ -1425,8 +1425,8 @@ public class GridBasicClientFeaturesWidget extends @Override public void onKeyPress(GridKeyPressEvent event) { CellReference<?> focused = event.getFocusedCell(); - updateLabel(label, event.toDebugString(), - focused.getRowIndex(), focused.getColumnIndex()); + updateLabel(label, event.toDebugString(), focused.getRowIndex(), + focused.getColumnIndex()); } }); @@ -1436,14 +1436,15 @@ public class GridBasicClientFeaturesWidget extends @Override public void onKeyPress(GridKeyPressEvent event) { CellReference<?> focused = event.getFocusedCell(); - updateLabel(label, event.toDebugString(), - focused.getRowIndex(), focused.getColumnIndex()); + updateLabel(label, event.toDebugString(), focused.getRowIndex(), + focused.getColumnIndex()); } }); } - private void updateLabel(VLabel label, String output, int object, int column) { + private void updateLabel(VLabel label, String output, int object, + int column) { String coords = "(" + object + ", " + column + ")"; label.setText(coords + " " + output); } @@ -1600,18 +1601,19 @@ public class GridBasicClientFeaturesWidget extends public void execute() { grid.setSidebarOpen(true); - Scheduler.get().scheduleFixedDelay(new Scheduler.RepeatingCommand() { - @Override - public boolean execute() { - if(grid.isSidebarOpen()) { - grid.setEnabled(false); + Scheduler.get() + .scheduleFixedDelay(new Scheduler.RepeatingCommand() { + @Override + public boolean execute() { + if (grid.isSidebarOpen()) { + grid.setEnabled(false); - return false; - } + return false; + } - return true; - } - }, 250); + return true; + } + }, 250); } }, menupath); } diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridCellFocusOnResetSizeWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridCellFocusOnResetSizeWidget.java index b2893463a7..b949a0df2d 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridCellFocusOnResetSizeWidget.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridCellFocusOnResetSizeWidget.java @@ -27,8 +27,8 @@ import com.vaadin.client.renderers.HtmlRenderer; import com.vaadin.client.widgets.Grid; import com.vaadin.client.widgets.Grid.SelectionMode; -public class GridCellFocusOnResetSizeWidget extends - PureGWTTestApplication<Grid<String[]>> { +public class GridCellFocusOnResetSizeWidget + extends PureGWTTestApplication<Grid<String[]>> { private Grid<String[]> grid; diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClickExtensionConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClickExtensionConnector.java index 64020683f6..629f7f424f 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClickExtensionConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClickExtensionConnector.java @@ -47,8 +47,8 @@ public class GridClickExtensionConnector extends AbstractExtensionConnector { CellReference<?> cellRef = event.getTargetCell(); // Gather needed information. - String rowKey = getParent().getRowKey( - (JsonObject) cellRef.getRow()); + String rowKey = getParent() + .getRowKey((JsonObject) cellRef.getRow()); String columnId = getParent().getColumnId(cellRef.getColumn()); MouseEventDetails clickDetails = MouseEventDetailsBuilder .buildMouseEventDetails(event.getNativeEvent()); diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java index 2b8f454ed1..c5b08204ae 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java @@ -51,8 +51,8 @@ import com.vaadin.shared.ui.Connect; import com.vaadin.tests.widgetset.server.grid.GridClientColumnRenderers; @Connect(GridClientColumnRenderers.GridController.class) -public class GridClientColumnRendererConnector extends - AbstractComponentConnector { +public class GridClientColumnRendererConnector + extends AbstractComponentConnector { public static enum Renderers { TEXT_RENDERER, WIDGET_RENDERER, HTML_RENDERER, NUMBER_RENDERER, DATE_RENDERER, CPLX_RENDERER; @@ -84,8 +84,8 @@ public class GridClientColumnRendererConnector extends DelayedDataSource.this.firstRowIndex = firstRowIndex; DelayedDataSource.this.numberOfRows = numberOfRows; dataChangeHandler.dataUpdated(firstRowIndex, numberOfRows); - dataChangeHandler - .dataAvailable(firstRowIndex, numberOfRows); + dataChangeHandler.dataAvailable(firstRowIndex, + numberOfRows); } }.schedule(latency); } @@ -130,14 +130,15 @@ public class GridClientColumnRendererConnector extends // Provide data as data source if (Location.getParameter("latency") != null) { grid.setDataSource(new DelayedDataSource( - new ListDataSource<String>(columnData), Integer - .parseInt(Location.getParameter("latency")))); + new ListDataSource<String>(columnData), + Integer.parseInt(Location.getParameter("latency")))); } else { grid.setDataSource(new ListDataSource<String>(columnData)); } // Add a column to display the data in - Grid.Column<String, String> c = createColumnWithRenderer(Renderers.TEXT_RENDERER); + Grid.Column<String, String> c = createColumnWithRenderer( + Renderers.TEXT_RENDERER); grid.addColumn(c); grid.getDefaultHeaderRow().getCell(c).setText("Column 1"); @@ -150,8 +151,8 @@ public class GridClientColumnRendererConnector extends grid.addSortHandler(new SortHandler<String>() { @Override public void sort(SortEvent<String> event) { - Element console = Document.get().getElementById( - "testDebugConsole"); + Element console = Document.get() + .getElementById("testDebugConsole"); String text = "Client-side sort event received<br>" + "Columns: " + event.getOrder().size() + ", order: "; for (SortOrder order : event.getOrder()) { @@ -181,13 +182,9 @@ public class GridClientColumnRendererConnector extends } getWidget().addColumn(column); - getWidget() - .getDefaultHeaderRow() - .getCell(column) - .setText( - "Column " - + String.valueOf(getWidget() - .getColumnCount() + 1)); + getWidget().getDefaultHeaderRow().getCell(column) + .setText("Column " + String.valueOf( + getWidget().getColumnCount() + 1)); } @Override @@ -211,7 +208,8 @@ public class GridClientColumnRendererConnector extends @SuppressWarnings("unchecked") public void triggerClientSortingTest() { Grid<String> grid = getWidget(); - ListSorter<String> sorter = new ListSorter<String>(grid); + ListSorter<String> sorter = new ListSorter<String>( + grid); // Make sorter sort the numbers in natural order sorter.setComparator( @@ -294,7 +292,8 @@ public class GridClientColumnRendererConnector extends return new HtmlRenderer() { @Override - public void render(RendererCellReference cell, String htmlString) { + public void render(RendererCellReference cell, + String htmlString) { super.render(cell, "<b>" + htmlString + "</b>"); } }; diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientDataSourcesWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientDataSourcesWidget.java index e352b10064..07c23262ca 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientDataSourcesWidget.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientDataSourcesWidget.java @@ -25,8 +25,8 @@ import com.vaadin.client.renderers.TextRenderer; import com.vaadin.client.widgets.Grid; import com.vaadin.client.widgets.Grid.SelectionMode; -public class GridClientDataSourcesWidget extends - PureGWTTestApplication<Grid<String[]>> { +public class GridClientDataSourcesWidget + extends PureGWTTestApplication<Grid<String[]>> { private interface RestCallback { void onResponse(RestishDataSource.Backend.Result result); @@ -75,7 +75,7 @@ public class GridClientDataSourcesWidget extends * somewhere. * <p> * It's scoped inside the RDS class only because it's tied to that. - * */ + */ private class Backend { public class Result { public int size; @@ -100,11 +100,13 @@ public class GridClientDataSourcesWidget extends } - private List<String[]> fetchRows(int firstRowIndex, int numberOfRows) { + private List<String[]> fetchRows(int firstRowIndex, + int numberOfRows) { List<String[]> rows = new ArrayList<String[]>(); for (int i = 0; i < numberOfRows; i++) { String id = String.valueOf(firstRowIndex + i); - rows.add(new String[] { id, "cell " + id + " #" + modCount }); + rows.add(new String[] { id, + "cell " + id + " #" + modCount }); } return rows; } diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridColumnAutoWidthClientWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridColumnAutoWidthClientWidget.java index d73bc84227..8ac700edce 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridColumnAutoWidthClientWidget.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridColumnAutoWidthClientWidget.java @@ -24,8 +24,8 @@ import com.vaadin.client.widget.grid.datasources.ListDataSource; import com.vaadin.client.widgets.Grid; import com.vaadin.client.widgets.Grid.SelectionMode; -public class GridColumnAutoWidthClientWidget extends - PureGWTTestApplication<Grid<List<String>>> { +public class GridColumnAutoWidthClientWidget + extends PureGWTTestApplication<Grid<List<String>>> { private Grid<List<String>> grid; diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridDataChangeHandlerWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridDataChangeHandlerWidget.java index a865d90b43..52d6ea51d0 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridDataChangeHandlerWidget.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridDataChangeHandlerWidget.java @@ -57,8 +57,8 @@ public class GridDataChangeHandlerWidget extends Composite { } } - public static class RemoteDelayedDataSource extends - AbstractRemoteDataSource<String> { + public static class RemoteDelayedDataSource + extends AbstractRemoteDataSource<String> { private List<String> rows; @@ -93,8 +93,8 @@ public class GridDataChangeHandlerWidget extends Composite { initWidget(panel); panel.setWidget(grid); - grid.setDataSource(new RemoteDelayedDataSource(Arrays.asList("A", "B", - "C", "D", "E"))); + grid.setDataSource(new RemoteDelayedDataSource( + Arrays.asList("A", "B", "C", "D", "E"))); grid.addColumn(new Column<String, String>("letter") { @Override public String getValue(String row) { @@ -107,8 +107,8 @@ public class GridDataChangeHandlerWidget extends Composite { @Override public boolean execute() { - grid.setDataSource(new DelayedDataSource(Arrays.asList("X", - "Y", "Z"))); + grid.setDataSource( + new DelayedDataSource(Arrays.asList("X", "Y", "Z"))); if (run) { return false; } diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridDefaultTextRendererWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridDefaultTextRendererWidget.java index 4f1ea48be5..4bd2623c4a 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridDefaultTextRendererWidget.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridDefaultTextRendererWidget.java @@ -21,8 +21,8 @@ import com.vaadin.client.widgets.Grid.Column; import com.vaadin.client.widgets.Grid.SelectionMode; import com.vaadin.shared.ui.grid.HeightMode; -public class GridDefaultTextRendererWidget extends - PureGWTTestApplication<Grid<String>> { +public class GridDefaultTextRendererWidget + extends PureGWTTestApplication<Grid<String>> { /* * This can't be null, because grid thinks that a row object of null means * "data is still being fetched". diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridHeightByRowOnInitWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridHeightByRowOnInitWidget.java index 8202c2ccc0..d961f08389 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridHeightByRowOnInitWidget.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridHeightByRowOnInitWidget.java @@ -17,8 +17,8 @@ public class GridHeightByRowOnInitWidget extends Composite { initWidget(panel); panel.setWidget(grid); - grid.setDataSource(new ListDataSource<String>(Arrays.asList("A", "B", - "C", "D", "E"))); + grid.setDataSource(new ListDataSource<String>( + Arrays.asList("A", "B", "C", "D", "E"))); grid.addColumn(new Column<String, String>("letter") { @Override public String getValue(String row) { diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridRendererChangeWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridRendererChangeWidget.java index d35580b3c6..68933c0c20 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridRendererChangeWidget.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridRendererChangeWidget.java @@ -24,8 +24,8 @@ import com.vaadin.client.widget.grid.datasources.ListDataSource; import com.vaadin.client.widgets.Grid; import com.vaadin.client.widgets.Grid.Column; -public class GridRendererChangeWidget extends - PureGWTTestApplication<Grid<String[]>> { +public class GridRendererChangeWidget + extends PureGWTTestApplication<Grid<String[]>> { public class MyButtonRenderer extends ButtonRenderer { diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/IntArrayRendererConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/IntArrayRendererConnector.java index e89057a148..f140e825f6 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/IntArrayRendererConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/IntArrayRendererConnector.java @@ -21,7 +21,8 @@ import com.vaadin.client.widget.grid.RendererCellReference; import com.vaadin.shared.ui.Connect; @Connect(com.vaadin.tests.components.grid.IntArrayRenderer.class) -public class IntArrayRendererConnector extends AbstractRendererConnector<int[]> { +public class IntArrayRendererConnector + extends AbstractRendererConnector<int[]> { public static class IntArrayRenderer implements Renderer<int[]> { private static final String JOINER = " :: "; diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PojoRendererConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PojoRendererConnector.java index 04dd08d274..a5c3192af2 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PojoRendererConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PojoRendererConnector.java @@ -22,8 +22,8 @@ import com.vaadin.shared.ui.Connect; import com.vaadin.tests.widgetset.client.SimpleTestBean; @Connect(com.vaadin.tests.components.grid.BeanRenderer.class) -public class PojoRendererConnector extends - AbstractRendererConnector<SimpleTestBean> { +public class PojoRendererConnector + extends AbstractRendererConnector<SimpleTestBean> { public static class BeanRenderer implements Renderer<SimpleTestBean> { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java index 63faf1d651..967ee764ce 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java @@ -60,7 +60,8 @@ public class RowAwareRendererConnector extends AbstractRendererConnector<Void> { } @Override - public boolean onBrowserEvent(CellReference<?> cell, NativeEvent event) { + public boolean onBrowserEvent(CellReference<?> cell, + NativeEvent event) { String key = getRowKey((JsonObject) cell.getRow()); getRpcProxy(RowAwareRendererRpc.class).clicky(key); cell.getElement().setInnerText( diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcButtonConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcButtonConnector.java index 43d96afd2b..c6d7a7ff74 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcButtonConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcButtonConnector.java @@ -39,8 +39,8 @@ import com.vaadin.tests.widgetset.server.gwtrpc.GwtRpcButton; @Connect(GwtRpcButton.class) public class GwtRpcButtonConnector extends AbstractComponentConnector { - static Logger logger = Logger.getLogger(GwtRpcButtonConnector.class - .getName()); + static Logger logger = Logger + .getLogger(GwtRpcButtonConnector.class.getName()); static { logger.setLevel(Level.ALL); } diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcServiceTestAsync.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcServiceTestAsync.java index 93eda8ca34..efe7607f51 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcServiceTestAsync.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcServiceTestAsync.java @@ -27,6 +27,7 @@ public interface GwtRpcServiceTestAsync { /* * Dummy async method to verify if RPC works. */ - void giveMeThat(String that, String haveThis, AsyncCallback<String> callback); + void giveMeThat(String that, String haveThis, + AsyncCallback<String> callback); } diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java index 6b12e7d3c6..4c7f01949b 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java @@ -29,9 +29,8 @@ public class ComponentInStateStateConnector extends AbstractComponentConnector { public void onStateChanged(StateChangeEvent stateChangeEvent) { super.onStateChanged(stateChangeEvent); - getWidget().setText( - "Client-side type of other component: " - + getOtherComponent().getClass().getName()); + getWidget().setText("Client-side type of other component: " + + getOtherComponent().getClass().getName()); } public ComponentConnector getOtherComponent() { diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java index 36c54c8ee6..aee16c334d 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java @@ -14,8 +14,8 @@ import com.vaadin.tests.minitutorials.v7a2.MyComponent; @Connect(MyComponent.class) public class MyComponentConnector extends AbstractComponentConnector { - MyComponentServerRpc rpc = RpcProxy - .create(MyComponentServerRpc.class, this); + MyComponentServerRpc rpc = RpcProxy.create(MyComponentServerRpc.class, + this); public MyComponentConnector() { getWidget().addClickHandler(new ClickHandler() { diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java index 88911e245d..823bdecf81 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java @@ -9,11 +9,12 @@ import com.vaadin.shared.ui.Connect; import com.vaadin.tests.minitutorials.v7a2.WidgetContainer; @Connect(WidgetContainer.class) -public class WidgetContainerConnector extends - AbstractComponentContainerConnector { +public class WidgetContainerConnector + extends AbstractComponentContainerConnector { @Override - public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) { + public void onConnectorHierarchyChange( + ConnectorHierarchyChangeEvent event) { List<ComponentConnector> children = getChildComponents(); VWidgetContainer widget = getWidget(); widget.clear(); diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningWithRpcConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningWithRpcConnector.java index 2f1d31a9d7..d8d1f43c32 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningWithRpcConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningWithRpcConnector.java @@ -12,7 +12,8 @@ import com.vaadin.shared.ui.Connect; import com.vaadin.tests.minitutorials.v7b1.CapsLockWarningWithRpc; @Connect(CapsLockWarningWithRpc.class) -public class CapsLockWarningWithRpcConnector extends AbstractExtensionConnector { +public class CapsLockWarningWithRpcConnector + extends AbstractExtensionConnector { private CapsLockWarningRpc rpc = getRpcProxy(CapsLockWarningRpc.class); diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/rebind/TestWidgetRegistryGenerator.java b/uitest/src/main/java/com/vaadin/tests/widgetset/rebind/TestWidgetRegistryGenerator.java index c7b29e271b..ffed717730 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/rebind/TestWidgetRegistryGenerator.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/rebind/TestWidgetRegistryGenerator.java @@ -89,7 +89,8 @@ public class TestWidgetRegistryGenerator extends Generator { Invoker.class.getCanonicalName()); w.indent(); - w.println("public Object invoke(Object target, Object... params) {"); + w.println( + "public Object invoke(Object target, Object... params) {"); w.indent(); w.println("return new %s();", diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/TestWidgetComponent.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/TestWidgetComponent.java index 1750e99727..864d64662e 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/TestWidgetComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/TestWidgetComponent.java @@ -52,10 +52,10 @@ public class TestWidgetComponent extends AbstractComponent { Widgetset widgetset = uiClass.getAnnotation(Widgetset.class); if (widgetset == null || !widgetset.value().equals(TestingWidgetSet.NAME)) { - throw new IllegalStateException("You must add @" - + Widgetset.class.getSimpleName() + "(" - + TestingWidgetSet.class.getSimpleName() + ".NAME) to " - + uiClass.getSimpleName()); + throw new IllegalStateException( + "You must add @" + Widgetset.class.getSimpleName() + "(" + + TestingWidgetSet.class.getSimpleName() + + ".NAME) to " + uiClass.getSimpleName()); } } diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/UseStateFromHierachyComponent.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/UseStateFromHierachyComponent.java index 3349024340..6cac7dbaf3 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/UseStateFromHierachyComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/UseStateFromHierachyComponent.java @@ -20,8 +20,8 @@ import com.vaadin.tests.widgetset.client.UseStateFromHierachyChangeConnectorStat import com.vaadin.ui.AbstractSingleComponentContainer; import com.vaadin.ui.Component; -public class UseStateFromHierachyComponent extends - AbstractSingleComponentContainer { +public class UseStateFromHierachyComponent + extends AbstractSingleComponentContainer { @Override protected UseStateFromHierachyChangeConnectorState getState() { diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabled.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabled.java index 6283285b40..1a70dd0718 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabled.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabled.java @@ -29,7 +29,8 @@ import com.vaadin.launcher.CustomDeploymentConfiguration.Conf; * @author Vaadin Ltd */ @SuppressWarnings("serial") -@CustomDeploymentConfiguration({ @Conf(name = "disable-xsrf-protection", value = "true") }) +@CustomDeploymentConfiguration({ + @Conf(name = "disable-xsrf-protection", value = "true") }) public class CsrfTokenDisabled extends AbstractCsrfTokenUI { } diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabled.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabled.java index cd02c6da77..ef244372b9 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabled.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabled.java @@ -19,7 +19,8 @@ import com.vaadin.launcher.CustomDeploymentConfiguration; import com.vaadin.launcher.CustomDeploymentConfiguration.Conf; @SuppressWarnings("serial") -@CustomDeploymentConfiguration({ @Conf(name = "disable-xsrf-protection", value = "false") }) +@CustomDeploymentConfiguration({ + @Conf(name = "disable-xsrf-protection", value = "false") }) public class CsrfTokenEnabled extends AbstractCsrfTokenUI { } diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java index ce260f108d..3f028450b1 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java @@ -92,8 +92,8 @@ public class GridClientColumnRenderers extends UI { content.addComponent(controls); setContent(content); - final NativeSelect select = new NativeSelect( - "Add Column with Renderer", Arrays.asList(Renderers.values())); + final NativeSelect select = new NativeSelect("Add Column with Renderer", + Arrays.asList(Renderers.values())); select.setItemCaptionMode(ItemCaptionMode.EXPLICIT); for (Renderers renderer : Renderers.values()) { select.setItemCaption(renderer, renderer.toString()); diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcServletTest.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcServletTest.java index df01b4dc81..d484e2cf30 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcServletTest.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcServletTest.java @@ -24,8 +24,8 @@ import com.vaadin.tests.widgetset.client.gwtrpc.GwtRpcServiceTest; * @author Vaadin Ltd */ @SuppressWarnings("serial") -public class GwtRpcServletTest extends RemoteServiceServlet implements - GwtRpcServiceTest { +public class GwtRpcServletTest extends RemoteServiceServlet + implements GwtRpcServiceTest { @Override public String giveMeThat(String that, String haveThis) { diff --git a/uitest/src/test/java/com/vaadin/tests/CurrentTimeMillisTest.java b/uitest/src/test/java/com/vaadin/tests/CurrentTimeMillisTest.java index 656b269c06..23237fbebe 100644 --- a/uitest/src/test/java/com/vaadin/tests/CurrentTimeMillisTest.java +++ b/uitest/src/test/java/com/vaadin/tests/CurrentTimeMillisTest.java @@ -56,12 +56,14 @@ public class CurrentTimeMillisTest extends MultiBrowserTest { if (BrowserUtil.isChrome(getDesiredCapabilities())) { // Chrome (version 33 at least) sometimes doesn't use high res // time if number of ms is less then 1 - Assert.assertTrue("High resolution time is not used in " - + "JSON parsing mesurement. Time=" + time, + Assert.assertTrue( + "High resolution time is not used in " + + "JSON parsing mesurement. Time=" + time, time.equals("0") || time.indexOf('.') > 0); } else { - Assert.assertTrue("High resolution time is not used in " - + "JSON parsing mesurement. Time=" + time, + Assert.assertTrue( + "High resolution time is not used in " + + "JSON parsing mesurement. Time=" + time, time.indexOf('.') > 0); } } else { @@ -78,8 +80,8 @@ public class CurrentTimeMillisTest extends MultiBrowserTest { actions.sendKeys(Keys.SPACE).perform(); findElement(By.className("v-debugwindow-tab")).click(); - List<WebElement> messages = findElements(By - .className("v-debugwindow-message")); + List<WebElement> messages = findElements( + By.className("v-debugwindow-message")); for (WebElement message : messages) { if (message.getAttribute("innerHTML").startsWith("JSON parsing")) { String text = message.getAttribute("innerHTML"); diff --git a/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java index 70accdd0d0..e6fd33149d 100644 --- a/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java @@ -39,8 +39,8 @@ public class VerifyBrowserVersionTest extends MultiBrowserTest { if (BrowserUtil.isChrome(getDesiredCapabilities())) { // Chrome version does not necessarily match the desired version // because of auto updates... - browserIdentifier = getExpectedUserAgentString(getDesiredCapabilities()) - + "52"; + browserIdentifier = getExpectedUserAgentString( + getDesiredCapabilities()) + "52"; } else { browserIdentifier = getExpectedUserAgentString(desiredCapabilities) + desiredCapabilities.getVersion(); diff --git a/uitest/src/test/java/com/vaadin/tests/accessibility/WindowWaiAriaRolesTest.java b/uitest/src/test/java/com/vaadin/tests/accessibility/WindowWaiAriaRolesTest.java index e1d0452708..d5056b2334 100644 --- a/uitest/src/test/java/com/vaadin/tests/accessibility/WindowWaiAriaRolesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/accessibility/WindowWaiAriaRolesTest.java @@ -35,8 +35,9 @@ public class WindowWaiAriaRolesTest extends MultiBrowserTest { $(ButtonElement.class).caption("Regular").first().click(); String role = getWindowRole(); - Assert.assertTrue("Dialog has incorrect role '" + role - + "', expected 'dialog'", "dialog".equals(role)); + Assert.assertTrue( + "Dialog has incorrect role '" + role + "', expected 'dialog'", + "dialog".equals(role)); } @Test @@ -44,8 +45,10 @@ public class WindowWaiAriaRolesTest extends MultiBrowserTest { openTestURL(); $(ButtonElement.class).caption("Alert").first().click(); String role = getWindowRole(); - Assert.assertTrue("Dialog has incorrect role '" + role - + "', expected 'alertdialog'", "alertdialog".equals(role)); + Assert.assertTrue( + "Dialog has incorrect role '" + role + + "', expected 'alertdialog'", + "alertdialog".equals(role)); } public String getWindowRole() { diff --git a/uitest/src/test/java/com/vaadin/tests/application/DetachOldUIOnReloadTest.java b/uitest/src/test/java/com/vaadin/tests/application/DetachOldUIOnReloadTest.java index 1e156c3e46..7f95d4f59c 100644 --- a/uitest/src/test/java/com/vaadin/tests/application/DetachOldUIOnReloadTest.java +++ b/uitest/src/test/java/com/vaadin/tests/application/DetachOldUIOnReloadTest.java @@ -38,8 +38,8 @@ public class DetachOldUIOnReloadTest extends MultiBrowserTest { assertEquals("initial label incorrect", "This is UI 0", lastLabelText(labels)); - assertFalse("reloading button not found", $(ButtonElement.class) - .caption(RELOAD).all().isEmpty()); + assertFalse("reloading button not found", + $(ButtonElement.class).caption(RELOAD).all().isEmpty()); openTestURL(); click(READ_LOG); @@ -68,9 +68,12 @@ public class DetachOldUIOnReloadTest extends MultiBrowserTest { String.format("label incorrect after %s reload", descriptor), String.format("This is UI %s", index), lastLabelText(labels)); if (!"final".equals(descriptor)) { - assertEquals(String.format("log message incorrect after %s reload", - descriptor), String.format("%s. UI %s has been detached", - index, index - 1), labels.get(0).getText()); + assertEquals( + String.format("log message incorrect after %s reload", + descriptor), + String.format("%s. UI %s has been detached", index, + index - 1), + labels.get(0).getText()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/application/MissingHierarchyDetectionTest.java b/uitest/src/test/java/com/vaadin/tests/application/MissingHierarchyDetectionTest.java index 3d43b8f885..93dded8862 100644 --- a/uitest/src/test/java/com/vaadin/tests/application/MissingHierarchyDetectionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/application/MissingHierarchyDetectionTest.java @@ -30,8 +30,8 @@ public class MissingHierarchyDetectionTest extends SingleBrowserTest { Assert.assertTrue(isElementPresent(By.id("label"))); - ButtonElement toggleProperly = $(ButtonElement.class).caption( - "Toggle properly").first(); + ButtonElement toggleProperly = $(ButtonElement.class) + .caption("Toggle properly").first(); toggleProperly.click(); assertNoSystemNotifications(); @@ -41,8 +41,8 @@ public class MissingHierarchyDetectionTest extends SingleBrowserTest { assertNoSystemNotifications(); Assert.assertTrue(isElementPresent(LabelElement.class)); - ButtonElement toggleInproperly = $(ButtonElement.class).caption( - "Toggle improperly").first(); + ButtonElement toggleInproperly = $(ButtonElement.class) + .caption("Toggle improperly").first(); toggleInproperly.click(); assertSystemNotification(); diff --git a/uitest/src/test/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeatTest.java b/uitest/src/test/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeatTest.java index 04dbdca31e..05918e6740 100644 --- a/uitest/src/test/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeatTest.java +++ b/uitest/src/test/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeatTest.java @@ -32,7 +32,8 @@ public class PreserveWithExpiredHeartbeatTest extends SingleBrowserTest { long startTime = System.currentTimeMillis(); - while (System.currentTimeMillis() - startTime < heartbeatInterval * 3.1) { + while (System.currentTimeMillis() - startTime < heartbeatInterval + * 3.1) { // "Close" the tab driver.get("about:blank"); diff --git a/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogThemeTest.java b/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogThemeTest.java index eb55a7fb5e..ad2bb3261b 100644 --- a/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogThemeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogThemeTest.java @@ -70,8 +70,8 @@ public class ReconnectDialogThemeTest extends MultiBrowserThemeTestWithProxy { // Show spinner and make sure it is shown by comparing to the screenshot // without a spinner executeScript("arguments[0].style.visibility='visible';", spinner); - BufferedImage fullScreen = ImageIO.read(new ByteArrayInputStream( - ((TakesScreenshot) getDriver()) + BufferedImage fullScreen = ImageIO + .read(new ByteArrayInputStream(((TakesScreenshot) getDriver()) .getScreenshotAs(OutputType.BYTES))); BufferedImage spinnerImage = CustomTestBenchCommandExecutor .cropToElement(spinner, fullScreen, @@ -109,7 +109,8 @@ public class ReconnectDialogThemeTest extends MultiBrowserThemeTestWithProxy { @Override public Boolean apply(WebDriver input) { try { - final WebElement reconnectDialog = findElement(ReconnectDialogThemeTest.reconnectDialogBy); + final WebElement reconnectDialog = findElement( + ReconnectDialogThemeTest.reconnectDialogBy); return reconnectDialog.findElement(By.className("text")) .getText().equals(text); } catch (Exception e) { @@ -120,11 +121,13 @@ public class ReconnectDialogThemeTest extends MultiBrowserThemeTestWithProxy { } - private void assertHasManyColors(String message, BufferedImage spinnerImage) { + private void assertHasManyColors(String message, + BufferedImage spinnerImage) { int backgroundColor = spinnerImage.getRGB(0, 0); for (int x = 0; x < spinnerImage.getWidth(); x++) { for (int y = 0; y < spinnerImage.getHeight(); y++) { - if (Math.abs(spinnerImage.getRGB(x, y) - backgroundColor) > 50) { + if (Math.abs( + spinnerImage.getRGB(x, y) - backgroundColor) > 50) { return; } } diff --git a/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogUITest.java b/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogUITest.java index b07124c216..68abb9875f 100644 --- a/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogUITest.java @@ -54,7 +54,8 @@ public class ReconnectDialogUITest extends MultiBrowserTestWithProxy { Assert.assertEquals("1. Hello from the server", getLogRow(0)); disconnectProxy(); getButton().click(); - waitForReconnectDialogWithText("Server connection lost, trying to reconnect..."); + waitForReconnectDialogWithText( + "Server connection lost, trying to reconnect..."); connectProxy(); waitForReconnectDialogToDisappear(); Assert.assertEquals("2. Hello from the server", getLogRow(0)); @@ -62,7 +63,8 @@ public class ReconnectDialogUITest extends MultiBrowserTestWithProxy { private void waitForReconnectDialogWithText(final String text) { waitForReconnectDialogPresent(); - final WebElement reconnectDialog = findElement(ReconnectDialogThemeTest.reconnectDialogBy); + final WebElement reconnectDialog = findElement( + ReconnectDialogThemeTest.reconnectDialogBy); waitUntil(new ExpectedCondition<Boolean>() { @Override public Boolean apply(WebDriver input) { diff --git a/uitest/src/test/java/com/vaadin/tests/application/RefreshStatePreserveTest.java b/uitest/src/test/java/com/vaadin/tests/application/RefreshStatePreserveTest.java index a54d8b4ce9..3257e3429f 100644 --- a/uitest/src/test/java/com/vaadin/tests/application/RefreshStatePreserveTest.java +++ b/uitest/src/test/java/com/vaadin/tests/application/RefreshStatePreserveTest.java @@ -24,6 +24,7 @@ public class RefreshStatePreserveTest extends MultiBrowserTest { private void assertCorrectState() { waitForElementPresent(By.className("v-label")); LabelElement uiIdLabel = $(LabelElement.class).get(7); - Assert.assertEquals("Incorrect UI id,", UI_ID_TEXT, uiIdLabel.getText()); + Assert.assertEquals("Incorrect UI id,", UI_ID_TEXT, + uiIdLabel.getText()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/application/ResynchronizeUITest.java b/uitest/src/test/java/com/vaadin/tests/application/ResynchronizeUITest.java index 726616d7b8..044de52e8c 100644 --- a/uitest/src/test/java/com/vaadin/tests/application/ResynchronizeUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/application/ResynchronizeUITest.java @@ -36,8 +36,8 @@ public class ResynchronizeUITest extends SingleBrowserTest { @Override public List<DesiredCapabilities> getBrowsersToTest() { // PhantomJS does not send onload events for styles - return Collections.singletonList(Browser.FIREFOX - .getDesiredCapabilities()); + return Collections + .singletonList(Browser.FIREFOX.getDesiredCapabilities()); } @Test @@ -51,7 +51,8 @@ public class ResynchronizeUITest extends SingleBrowserTest { waitForThemeToChange("runo"); try { button.click(); - Assert.fail("The old button element should have been removed by the click and replaced by a new one."); + Assert.fail( + "The old button element should have been removed by the click and replaced by a new one."); } catch (StaleElementReferenceException e) { // This is what should happen } diff --git a/uitest/src/test/java/com/vaadin/tests/applicationcontext/CleanupBrokenUITest.java b/uitest/src/test/java/com/vaadin/tests/applicationcontext/CleanupBrokenUITest.java index 404e05eefc..9a1ff15c82 100644 --- a/uitest/src/test/java/com/vaadin/tests/applicationcontext/CleanupBrokenUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/applicationcontext/CleanupBrokenUITest.java @@ -28,8 +28,8 @@ public class CleanupBrokenUITest extends SingleBrowserTest { // UI 1 has not yet been added in UI.init where logging takes place Assert.assertEquals("1. UIs in session: 0", getLogRow(0)); - String url = getTestURL(getUIClass()) - .replace("restartApplication", "1"); + String url = getTestURL(getUIClass()).replace("restartApplication", + "1"); driver.get(url); // UI 1 remains in session during UI2 init where logging takes place Assert.assertEquals("1. UIs in session: 1", getLogRow(0)); diff --git a/uitest/src/test/java/com/vaadin/tests/applicationcontext/CloseSessionTest.java b/uitest/src/test/java/com/vaadin/tests/applicationcontext/CloseSessionTest.java index 1d6bf3f9bf..5d0ef4e1a8 100644 --- a/uitest/src/test/java/com/vaadin/tests/applicationcontext/CloseSessionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/applicationcontext/CloseSessionTest.java @@ -45,8 +45,8 @@ public class CloseSessionTest extends MultiBrowserTest { public void testCloseVaadinServiceAndRedirect() { clickButton("Close VaadinServiceSession and redirect elsewhere"); Assert.assertEquals("Unexpected page contents,", - "This is a static file", findElement(By.xpath("//h1")) - .getText()); + "This is a static file", + findElement(By.xpath("//h1")).getText()); } /** diff --git a/uitest/src/test/java/com/vaadin/tests/applicationcontext/RpcForClosedUITest.java b/uitest/src/test/java/com/vaadin/tests/applicationcontext/RpcForClosedUITest.java index bb9d2a9294..d2818205df 100644 --- a/uitest/src/test/java/com/vaadin/tests/applicationcontext/RpcForClosedUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/applicationcontext/RpcForClosedUITest.java @@ -21,8 +21,8 @@ public class RpcForClosedUITest extends MultiBrowserTest { clickButton("Log 'hello'"); /* Ensure 'hello' was not logged */ checkLogMatches("2. Current WrappedSession id: .*"); - Assert.assertFalse("Page contains word 'Hello'", driver.getPageSource() - .contains("Hello")); + Assert.assertFalse("Page contains word 'Hello'", + driver.getPageSource().contains("Hello")); } private void clickButton(String caption) { diff --git a/uitest/src/test/java/com/vaadin/tests/applicationservlet/MultipleServletConfigurationTest.java b/uitest/src/test/java/com/vaadin/tests/applicationservlet/MultipleServletConfigurationTest.java index 39e8d04ffc..9ee118bae2 100644 --- a/uitest/src/test/java/com/vaadin/tests/applicationservlet/MultipleServletConfigurationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/applicationservlet/MultipleServletConfigurationTest.java @@ -15,11 +15,14 @@ public class MultipleServletConfigurationTest extends MultiBrowserTest { @Test public void testMultipleServletConfiguration() throws Exception { getDriver().get(getBaseURL() + "/embed1"); - assertLabelText("A generic test for Buttons in different configurations"); + assertLabelText( + "A generic test for Buttons in different configurations"); getDriver().get(getBaseURL() + "/embed2"); - assertLabelText("Margins inside labels should not be allowed to collapse out of the label as it causes problems with layotus measuring the label."); + assertLabelText( + "Margins inside labels should not be allowed to collapse out of the label as it causes problems with layotus measuring the label."); getDriver().get(getBaseURL() + "/embed1"); - assertLabelText("A generic test for Buttons in different configurations"); + assertLabelText( + "A generic test for Buttons in different configurations"); } private void assertLabelText(String expected) { diff --git a/uitest/src/test/java/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java b/uitest/src/test/java/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java index 3faf5bde72..4bf2b06ef2 100644 --- a/uitest/src/test/java/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java +++ b/uitest/src/test/java/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java @@ -32,8 +32,8 @@ public class NoApplicationClassTest extends SingleBrowserTest { Assert.assertTrue( String.format( "Unexpected error message.\n expected to contain: '%s'\n was: %s", - expected, exceptionMessage), exceptionMessage - .contains(expected)); + expected, exceptionMessage), + exceptionMessage.contains(expected)); } @Override diff --git a/uitest/src/test/java/com/vaadin/tests/applicationservlet/SystemMessagesTest.java b/uitest/src/test/java/com/vaadin/tests/applicationservlet/SystemMessagesTest.java index bbbb49b39c..dd5248ce76 100644 --- a/uitest/src/test/java/com/vaadin/tests/applicationservlet/SystemMessagesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/applicationservlet/SystemMessagesTest.java @@ -29,6 +29,7 @@ public class SystemMessagesTest extends MultiBrowserTest { Assert.assertEquals("Incorrect notification caption,", notification.getCaption(), "Internal error"); Assert.assertEquals("Incorrect notification description,", - notification.getDescription(), "MessagesInfo locale: " + locale); + notification.getDescription(), + "MessagesInfo locale: " + locale); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptionsTest.java b/uitest/src/test/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptionsTest.java index 69e4aaa06c..6c7d57c173 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptionsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptionsTest.java @@ -40,13 +40,13 @@ public class AbstractOrderedLayoutWithCaptionsTest extends MultiBrowserTest { public void CaptionHeightMeasuredCorrectly() { openTestURL(); - WebElement div = getDriver().findElement( - By.cssSelector(".v-panel-content > div > div")); + WebElement div = getDriver() + .findElement(By.cssSelector(".v-panel-content > div > div")); String paddingTop = div.getCssValue("padding-top"); - Integer paddingHeight = Integer.parseInt(paddingTop.substring(0, - paddingTop.length() - 2)); - List<WebElement> children = getDriver().findElements( - By.cssSelector(".v-panel-content .v-slot")); + Integer paddingHeight = Integer + .parseInt(paddingTop.substring(0, paddingTop.length() - 2)); + List<WebElement> children = getDriver() + .findElements(By.cssSelector(".v-panel-content .v-slot")); assertThat(children.size(), is(3)); Integer neededHeight = children.get(0).getSize().getHeight() diff --git a/uitest/src/test/java/com/vaadin/tests/components/SaneErrorsTest.java b/uitest/src/test/java/com/vaadin/tests/components/SaneErrorsTest.java index a43db58fd0..5b52cbb887 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/SaneErrorsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/SaneErrorsTest.java @@ -41,8 +41,8 @@ public class SaneErrorsTest extends MultiBrowserTest { @Test public void test() { openTestURL(); - List<WebElement> elements = getDriver().findElements( - By.xpath("//*[text() = 'Show me my NPE!']")); + List<WebElement> elements = getDriver() + .findElements(By.xpath("//*[text() = 'Show me my NPE!']")); for (WebElement webElement : elements) { webElement.click(); } @@ -50,8 +50,8 @@ public class SaneErrorsTest extends MultiBrowserTest { getDriver().findElement(By.xpath("//*[text() = 'Collect exceptions']")) .click(); - List<WebElement> errorMessages = getDriver().findElements( - By.className("v-label")); + List<WebElement> errorMessages = getDriver() + .findElements(By.className("v-label")); for (WebElement webElement : errorMessages) { String text = webElement.getText(); Assert.assertEquals("java.lang.NullPointerException", text); diff --git a/uitest/src/test/java/com/vaadin/tests/components/TooltipPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/TooltipPositionTest.java index 8e1df42f50..99e032a40b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/TooltipPositionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/TooltipPositionTest.java @@ -164,10 +164,10 @@ public class TooltipPositionTest extends MultiBrowserTest { int yTop = topLeft.getY(); int xRight = xLeft + tooltipSize.getWidth() - 1; int yBottom = yTop + tooltipSize.getHeight() - 1; - boolean overlapHorizontally = !(xRight < 0 || xLeft >= windowSize - .getWidth()); - boolean overlapVertically = !(yBottom < 0 || yTop >= windowSize - .getHeight()); + boolean overlapHorizontally = !(xRight < 0 + || xLeft >= windowSize.getWidth()); + boolean overlapVertically = !(yBottom < 0 + || yTop >= windowSize.getHeight()); return !(overlapHorizontally && overlapVertically); } }
\ No newline at end of file diff --git a/uitest/src/test/java/com/vaadin/tests/components/UnknownComponentConnectorTest.java b/uitest/src/test/java/com/vaadin/tests/components/UnknownComponentConnectorTest.java index 49539fcae1..d992695164 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/UnknownComponentConnectorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/UnknownComponentConnectorTest.java @@ -31,11 +31,9 @@ public class UnknownComponentConnectorTest extends MultiBrowserTest { public void testConnectorNotFoundInWidgetset() throws Exception { openTestURL(); WebElement component = vaadinElementById("no-connector-component"); - assertTrue(component - .getText() - .startsWith( - "Widgetset 'com.vaadin.DefaultWidgetSet' does not contain " - + "implementation for com.vaadin.tests.components.UnknownComponentConnector." - + "ComponentWithoutConnector.")); + assertTrue(component.getText().startsWith( + "Widgetset 'com.vaadin.DefaultWidgetSet' does not contain " + + "implementation for com.vaadin.tests.components.UnknownComponentConnector." + + "ComponentWithoutConnector.")); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ContextClickUITest.java b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ContextClickUITest.java index 4b975dbecc..f0330d3f7c 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ContextClickUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ContextClickUITest.java @@ -61,7 +61,7 @@ public class ContextClickUITest extends MultiBrowserTest { .moveToElement($(UIElement.class).first(), 10, 10).click() .perform(); - assertTrue("Context click should not be handled.", getLogRow(0).trim() - .isEmpty()); + assertTrue("Context click should not be handled.", + getLogRow(0).trim().isEmpty()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java index 8500fbe18d..84a7b820a2 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java @@ -35,16 +35,16 @@ public class PrimaryStyleTest extends MultiBrowserTest { openTestURL(); // Verify the initial class names for all three components. - List<WebElement> initialElements = driver.findElements(By - .className("initial-state")); + List<WebElement> initialElements = driver + .findElements(By.className("initial-state")); assertThat(initialElements, hasSize(3)); // Click on a button that updates the styles. $(ButtonElement.class).id("update-button").click(); // Verify that the class names where updated as expected. - List<WebElement> updatedElements = driver.findElements(By - .className("updated-correctly")); + List<WebElement> updatedElements = driver + .findElements(By.className("updated-correctly")); assertThat(updatedElements, hasSize(initialElements.size())); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionAddTabTest.java b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionAddTabTest.java index 95b7a9c416..f495146c96 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionAddTabTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionAddTabTest.java @@ -41,8 +41,10 @@ public class AccordionAddTabTest extends MultiBrowserTest { List<WebElement> panels = driver.findElements(By.className("v-panel")); - Assert.assertEquals("Found two widgets inside one tab after " - + "subsequent tab removal and addition", 1, panels.size()); + Assert.assertEquals( + "Found two widgets inside one tab after " + + "subsequent tab removal and addition", + 1, panels.size()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionRemoveTabTest.java b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionRemoveTabTest.java index 1047c070c8..d20929017f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionRemoveTabTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionRemoveTabTest.java @@ -48,18 +48,18 @@ public class AccordionRemoveTabTest extends MultiBrowserTest { public void testConsoleErrorOnSwitch() { setDebug(true); openTestURL(); - WebElement firstItem = driver.findElement(By - .className("v-accordion-item-first")); - WebElement caption = firstItem.findElement(By - .className("v-accordion-item-caption")); + WebElement firstItem = driver + .findElement(By.className("v-accordion-item-first")); + WebElement caption = firstItem + .findElement(By.className("v-accordion-item-caption")); caption.click(); Assert.assertEquals("Errors present in console", 0, findElements(By.className("SEVERE")).size()); } private void checkFirstItemHeight(String text) { - WebElement firstItem = driver.findElement(By - .className("v-accordion-item-first")); + WebElement firstItem = driver + .findElement(By.className("v-accordion-item-first")); WebElement label = firstItem.findElement(By.className("v-label")); Assert.assertEquals("Unexpected text in first item", text, label.getText()); diff --git a/uitest/src/test/java/com/vaadin/tests/components/button/ButtonClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/button/ButtonClickTest.java index 4ea02b20d0..56b50c624a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/button/ButtonClickTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/button/ButtonClickTest.java @@ -29,8 +29,10 @@ public class ButtonClickTest extends MultiBrowserTest { public void buttonMouseDownOutOverUp() { openTestURL(); - WebElement clickedButton = vaadinElement("/VVerticalLayout[0]/VButton[0]"); - WebElement visitedButton = vaadinElement("/VVerticalLayout[0]/VButton[1]"); + WebElement clickedButton = vaadinElement( + "/VVerticalLayout[0]/VButton[0]"); + WebElement visitedButton = vaadinElement( + "/VVerticalLayout[0]/VButton[1]"); new Actions(driver).moveToElement(clickedButton).clickAndHold() .moveToElement(visitedButton).moveToElement(clickedButton) diff --git a/uitest/src/test/java/com/vaadin/tests/components/button/ButtonKeyboardClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/button/ButtonKeyboardClickTest.java index 110d729a36..e55e3ebf6d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/button/ButtonKeyboardClickTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/button/ButtonKeyboardClickTest.java @@ -72,37 +72,45 @@ public class ButtonKeyboardClickTest extends MultiBrowserTest { getValue("x") > button.getLocation().getX()); Assert.assertTrue( "Client X click cooridnate is greater than right button " - + "border coordinate", getValue("x") < button - .getLocation().getX() + button.getSize().getWidth()); + + "border coordinate", + getValue("x") < button.getLocation().getX() + + button.getSize().getWidth()); Assert.assertTrue( "Client Y click cooridnate is lower than Y button coordinate", getValue("y") > button.getLocation().getY()); Assert.assertTrue( "Client Y click cooridnate is greater than bottom button " - + "border coordinate", getValue("y") < button - .getLocation().getY() + button.getSize().getHeight()); + + "border coordinate", + getValue("y") < button.getLocation().getY() + + button.getSize().getHeight()); Assert.assertTrue( "Client X click cooridnate is greater than X middle button " - + "coordinate", button.getLocation().getX() + + "coordinate", + button.getLocation().getX() + button.getSize().getWidth() / 2 >= getValue("x") - 1); Assert.assertTrue( "Client Y click cooridnate is greater than Y middle button coordinate", - button.getLocation().getY() + button.getSize().getHeight() / 2 >= getValue("y") - 1); + button.getLocation().getY() + + button.getSize().getHeight() / 2 >= getValue("y") + - 1); Assert.assertTrue( "Client X click cooridnate is lower than X middle button " - + "coordinate", button.getLocation().getX() + + "coordinate", + button.getLocation().getX() + button.getSize().getWidth() / 2 <= getValue("x") + 1); Assert.assertTrue( "Client Y click cooridnate is lower than Y middle button coordinate", - button.getLocation().getY() + button.getSize().getHeight() / 2 <= getValue("y") + 1); + button.getLocation().getY() + + button.getSize().getHeight() / 2 <= getValue("y") + + 1); } private int getValue(String style) { - return Integer.parseInt(getDriver().findElement( - By.className("v-label-" + style)).getText()); + return Integer.parseInt(getDriver() + .findElement(By.className("v-label-" + style)).getText()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/button/ButtonUndefinedWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/button/ButtonUndefinedWidthTest.java index 850dd1229c..deb37acf5c 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/button/ButtonUndefinedWidthTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/button/ButtonUndefinedWidthTest.java @@ -55,8 +55,8 @@ public class ButtonUndefinedWidthTest extends MultiBrowserTest { getDriver().findElement(By.className("v-app")).click(); // check button widths in VerticalLayout - VerticalLayoutElement vLayout = $(VerticalLayoutElement.class).$( - VerticalLayoutElement.class).first(); + VerticalLayoutElement vLayout = $(VerticalLayoutElement.class) + .$(VerticalLayoutElement.class).first(); int containerWidth = vLayout.getSize().getWidth(); NativeButtonElement nativeButton = vLayout.$(NativeButtonElement.class) @@ -71,12 +71,12 @@ public class ButtonUndefinedWidthTest extends MultiBrowserTest { // check button widths in table, also make sure that there is some // spacing between the table edges and buttons - List<WebElement> rows = findElements(By - .className("v-table-cell-content")); + List<WebElement> rows = findElements( + By.className("v-table-cell-content")); int rowWidth = rows.get(0).getSize().getWidth(); - List<WebElement> rowWrappers = findElements(By - .className("v-table-cell-wrapper")); + List<WebElement> rowWrappers = findElements( + By.className("v-table-cell-wrapper")); WebElement row = rowWrappers.get(0); containerWidth = row.getSize().getWidth(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/BeanItemContainerLongEventTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/BeanItemContainerLongEventTest.java index 740d451b0f..c54adeb1bb 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/calendar/BeanItemContainerLongEventTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/BeanItemContainerLongEventTest.java @@ -40,8 +40,8 @@ public class BeanItemContainerLongEventTest extends MultiBrowserTest { @Test public void testEventDisplayedInWeekView() { openTestURL(); - WebElement target = driver.findElements( - By.className("v-calendar-week-number")).get(1); + WebElement target = driver + .findElements(By.className("v-calendar-week-number")).get(1); target.click(); target = driver.findElement(By.className("v-calendar-event")); Assert.assertEquals("Wrong event name", "Long event", target.getText()); @@ -50,8 +50,8 @@ public class BeanItemContainerLongEventTest extends MultiBrowserTest { @Test public void testEventDisplayedInDayView() { openTestURL(); - WebElement target = driver.findElements( - By.className("v-calendar-day-number")).get(5); + WebElement target = driver + .findElements(By.className("v-calendar-day-number")).get(5); target.click(); target = driver.findElement(By.className("v-calendar-event")); Assert.assertEquals("Wrong event name", "Long event", target.getText()); diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarActionEventSourceTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarActionEventSourceTest.java index 161f927681..993cc8ec86 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarActionEventSourceTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarActionEventSourceTest.java @@ -38,8 +38,8 @@ public class CalendarActionEventSourceTest extends PrivateTB3Configuration { openTestURL(); // perform action on empty cell - WebElement element = getDriver().findElement( - By.className("v-calendar-spacer")); + WebElement element = getDriver() + .findElement(By.className("v-calendar-spacer")); performAction(element); checkEventSourceIsCalendar(); @@ -50,8 +50,8 @@ public class CalendarActionEventSourceTest extends PrivateTB3Configuration { openTestURL(); // perform action on calendar event - WebElement element = getDriver().findElement( - By.className("v-calendar-event")); + WebElement element = getDriver() + .findElement(By.className("v-calendar-event")); performAction(element); checkEventSourceIsCalendar(); @@ -60,16 +60,16 @@ public class CalendarActionEventSourceTest extends PrivateTB3Configuration { private void performAction(WebElement element) { // right click new Actions(getDriver()).contextClick(element).perform(); - WebElement menuItem = getDriver().findElement( - By.className("gwt-MenuItem")); + WebElement menuItem = getDriver() + .findElement(By.className("gwt-MenuItem")); menuItem.click(); } private void checkEventSourceIsCalendar() { String calendarObject = getDriver().findElement(By.id("calendarlabel")) .getText(); - String actionSourceObject = getDriver().findElement( - By.id("senderlabel")).getText(); + String actionSourceObject = getDriver() + .findElement(By.id("senderlabel")).getText(); Assert.assertEquals( "Calendar action event source must be the calendar itself", calendarObject, actionSourceObject); diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarBackwardForwardTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarBackwardForwardTest.java index 98773f475b..6bdcac5254 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarBackwardForwardTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarBackwardForwardTest.java @@ -41,26 +41,26 @@ public class CalendarBackwardForwardTest extends MultiBrowserTest { openDayView(); clickCalendarNext(); - WebElement headerDayElement = getDriver().findElement( - By.className("v-calendar-header-day")); + WebElement headerDayElement = getDriver() + .findElement(By.className("v-calendar-header-day")); - assertThat("This day should be Monday 9/9/13", headerDayElement - .getText().equals("Monday 9/9/13")); + assertThat("This day should be Monday 9/9/13", + headerDayElement.getText().equals("Monday 9/9/13")); for (int i = 0; i < 6; i++) { clickCalendarBack(); } - headerDayElement = getDriver().findElement( - By.className("v-calendar-header-day")); + headerDayElement = getDriver() + .findElement(By.className("v-calendar-header-day")); - assertThat("This day should be Friday 8/30/13", headerDayElement - .getText().equals("Friday 8/30/13")); + assertThat("This day should be Friday 8/30/13", + headerDayElement.getText().equals("Friday 8/30/13")); } private void openWeekView() { - List<WebElement> elements = getDriver().findElements( - By.className("v-calendar-week-number")); + List<WebElement> elements = getDriver() + .findElements(By.className("v-calendar-week-number")); for (WebElement webElement : elements) { if (webElement.getText().equals("36")) { @@ -71,8 +71,8 @@ public class CalendarBackwardForwardTest extends MultiBrowserTest { } private void openDayView() { - List<WebElement> elements = getDriver().findElements( - By.className("v-calendar-header-day")); + List<WebElement> elements = getDriver() + .findElements(By.className("v-calendar-header-day")); for (WebElement webElement : elements) { if (webElement.getText().contains("Friday 9/6/13")) { @@ -83,15 +83,15 @@ public class CalendarBackwardForwardTest extends MultiBrowserTest { } private void clickCalendarNext() { - List<WebElement> elements = getDriver().findElements( - By.className("v-calendar-next")); + List<WebElement> elements = getDriver() + .findElements(By.className("v-calendar-next")); elements.get(0).click(); } private void clickCalendarBack() { - List<WebElement> elements = getDriver().findElements( - By.className("v-calendar-back")); + List<WebElement> elements = getDriver() + .findElements(By.className("v-calendar-back")); elements.get(0).click(); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarDisabledTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarDisabledTest.java index 8b8122dcf9..fb8d03d613 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarDisabledTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarDisabledTest.java @@ -46,7 +46,7 @@ public class CalendarDisabledTest extends MultiBrowserTest { } private void assertCalendarInMonthView() { - assertTrue("Calendar wasn't in month view.", getCalendar() - .hasMonthView()); + assertTrue("Calendar wasn't in month view.", + getCalendar().hasMonthView()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java index 077ab7f7ec..fb16063427 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java @@ -49,7 +49,8 @@ public class CalendarHtmlInEventsTest extends SingleBrowserTest { click(htmlAllowed); Assert.assertEquals("1. HTML in event caption: true", getLogRow(0)); - Assert.assertEquals(getMonthEvent(0).getText(), "12:00 AM Hello world!"); + Assert.assertEquals(getMonthEvent(0).getText(), + "12:00 AM Hello world!"); } @Test @@ -78,22 +79,22 @@ public class CalendarHtmlInEventsTest extends SingleBrowserTest { } private WebElement getMonthEvent(int dayInCalendar) { - return getMonthDay(dayInCalendar).findElement( - By.className("v-calendar-event")); + return getMonthDay(dayInCalendar) + .findElement(By.className("v-calendar-event")); } private WebElement getWeekEvent(int dayInCalendar) { - return getWeekDay(dayInCalendar).findElement( - By.className("v-calendar-event")); + return getWeekDay(dayInCalendar) + .findElement(By.className("v-calendar-event")); } private WebElement getMonthDay(int i) { - return calendar.findElements(By.className("v-calendar-month-day")).get( - i); + return calendar.findElements(By.className("v-calendar-month-day")) + .get(i); } private WebElement getWeekDay(int i) { - return calendar.findElements(By.className("v-calendar-day-times")).get( - i); + return calendar.findElements(By.className("v-calendar-day-times")) + .get(i); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEventTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEventTest.java index 3248804eed..aee29e7897 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEventTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEventTest.java @@ -44,8 +44,8 @@ public class CalendarMonthViewDndEventTest extends DndActionsTest { // does calendar have space on the right for one more event (i.e. day // cell on the right). - boolean moveRight = event.getLocation().getX() + 2 - * event.getSize().getWidth() <= calendarRight; + boolean moveRight = event.getLocation().getX() + + 2 * event.getSize().getWidth() <= calendarRight; WebElement cell = getParentCell(event, "v-calendar-month-day"); @@ -67,9 +67,9 @@ public class CalendarMonthViewDndEventTest extends DndActionsTest { Assert.assertTrue( "Moved event has wrong Y position (not the same row), new Y position=" - + newY + ", cell Y position=" + cellY - + ", cell height=" + cellHeight, newY >= cellY - && newY < cellY + cellHeight); + + newY + ", cell Y position=" + cellY + ", cell height=" + + cellHeight, + newY >= cellY && newY < cellY + cellHeight); if (moveRight) { Assert.assertTrue( "Moved event has wrong X position (not after original event)", diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarNotificationsTestIE.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarNotificationsTestIE.java index 62223ccc25..f97d29da6e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarNotificationsTestIE.java +++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarNotificationsTestIE.java @@ -62,15 +62,15 @@ public class CalendarNotificationsTestIE extends MultiBrowserTest { WebElement day = findElements(By.className("v-calendar-day-number")) .get(2); // IE8 requires you to click on the text part to fire the event - new Actions(getDriver()) - .moveToElement(day, day.getSize().getWidth() - 3, - day.getSize().getHeight() / 2).click().perform(); + new Actions(getDriver()).moveToElement(day, + day.getSize().getWidth() - 3, day.getSize().getHeight() / 2) + .click().perform(); // check that a notification was opened, this is done with a log instead // of a screenshot or element presence check due to problems with IE // webdriver - String text = findElement(By.id("Log")).findElement( - By.className("v-label")).getText(); + String text = findElement(By.id("Log")) + .findElement(By.className("v-label")).getText(); Assert.assertTrue("Notification should've opened", "1. Opening a notification".equals(text)); diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarReadOnlyTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarReadOnlyTest.java index 142353f314..eef3ca5439 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarReadOnlyTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarReadOnlyTest.java @@ -27,7 +27,8 @@ public class CalendarReadOnlyTest extends MultiBrowserTest { public void weekViewCanBeOpenedFromMonthView() { openWeekView(); - assertTrue("Calendar wasn't in week view.", getCalendar().hasWeekView()); + assertTrue("Calendar wasn't in week view.", + getCalendar().hasWeekView()); } @Test @@ -100,16 +101,16 @@ public class CalendarReadOnlyTest extends MultiBrowserTest { public void hiddenEventsCanBeExpanded() { WebElement dayWithEvents = getFirstDayWithEvents(); - assertThat("Incorrect event count.", getVisibleEvents(dayWithEvents) - .size(), is(2)); + assertThat("Incorrect event count.", + getVisibleEvents(dayWithEvents).size(), is(2)); toggleExpandEvents(dayWithEvents).click(); - assertThat("Incorrect event count.", getVisibleEvents(dayWithEvents) - .size(), is(4)); + assertThat("Incorrect event count.", + getVisibleEvents(dayWithEvents).size(), is(4)); toggleExpandEvents(dayWithEvents).click(); - assertThat("Incorrect event count.", getVisibleEvents(dayWithEvents) - .size(), is(2)); + assertThat("Incorrect event count.", + getVisibleEvents(dayWithEvents).size(), is(2)); } private CalendarElement getCalendar() { @@ -139,8 +140,8 @@ public class CalendarReadOnlyTest extends MultiBrowserTest { } private WebElement toggleExpandEvents(WebElement dayWithEvents) { - return dayWithEvents.findElement(By - .className("v-calendar-bottom-spacer")); + return dayWithEvents + .findElement(By.className("v-calendar-bottom-spacer")); } private List<WebElement> getVisibleEvents(WebElement dayWithEvents) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarRescheduleEventTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarRescheduleEventTest.java index fb8cce7d53..ac58e1a167 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarRescheduleEventTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarRescheduleEventTest.java @@ -69,13 +69,13 @@ public class CalendarRescheduleEventTest extends DndActionsTest { * DnD event by Y axis */ private int rescheduleEvent(int yOffset) { - WebElement eventCaption = getDriver().findElement( - By.className("v-calendar-event-caption")); + WebElement eventCaption = getDriver() + .findElement(By.className("v-calendar-event-caption")); dragAndDrop(eventCaption, 0, yOffset); - eventCaption = getDriver().findElement( - By.className("v-calendar-event-caption")); + eventCaption = getDriver() + .findElement(By.className("v-calendar-event-caption")); return eventCaption.getLocation().getY(); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEventsTest.java index e3e5606089..cbcb4285d5 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEventsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEventsTest.java @@ -76,20 +76,23 @@ public class CalendarResizeOverlappingEventsTest extends DndActionsTest { int actualWidth = firstEvent.getSize().getWidth(); int expectedWidth = firstEventExpectedWidth; - Assert.assertTrue(String.format(errorMessage, expectedWidth, - widthTolerance, actualWidth), + Assert.assertTrue( + String.format(errorMessage, expectedWidth, widthTolerance, + actualWidth), isAproximateWidth(actualWidth, expectedWidth, widthTolerance)); actualWidth = secondEvent.getSize().getWidth(); expectedWidth = secondEventExpectedWidth; - Assert.assertTrue(String.format(errorMessage, expectedWidth, - widthTolerance, actualWidth), + Assert.assertTrue( + String.format(errorMessage, expectedWidth, widthTolerance, + actualWidth), isAproximateWidth(actualWidth, expectedWidth, widthTolerance)); actualWidth = thirdEvent.getSize().getWidth(); expectedWidth = thirdEventExpectedWidth; - Assert.assertTrue(String.format(errorMessage, expectedWidth, - widthTolerance, actualWidth), + Assert.assertTrue( + String.format(errorMessage, expectedWidth, widthTolerance, + actualWidth), isAproximateWidth(actualWidth, expectedWidth, widthTolerance)); } @@ -103,8 +106,8 @@ public class CalendarResizeOverlappingEventsTest extends DndActionsTest { } private void initParams() { - WebElement dateSlot = getDriver().findElement( - By.className("v-datecellslot")); + WebElement dateSlot = getDriver() + .findElement(By.className("v-datecellslot")); int dateSlotWidth = dateSlot.getSize().getWidth(); noOverlapWidth = dateSlotWidth; oneOverlapWidth = dateSlotWidth / 2; @@ -119,15 +122,15 @@ public class CalendarResizeOverlappingEventsTest extends DndActionsTest { } }; - List<WebElement> eventElements = getDriver().findElements( - By.className("v-calendar-event-content")); + List<WebElement> eventElements = getDriver() + .findElements(By.className("v-calendar-event-content")); Collections.sort(eventElements, startTimeComparator); firstEvent = eventElements.get(0); secondEvent = eventElements.get(1); thirdEvent = eventElements.get(2); - List<WebElement> resizeBottomElements = getDriver().findElements( - By.className("v-calendar-event-resizebottom")); + List<WebElement> resizeBottomElements = getDriver() + .findElements(By.className("v-calendar-event-resizebottom")); Collections.sort(resizeBottomElements, startTimeComparator); firstEventBottomResize = resizeBottomElements.get(0); secondEventBottomResize = resizeBottomElements.get(1); diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfViewTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfViewTest.java index 9db65c89c6..80d348e0c8 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfViewTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfViewTest.java @@ -28,8 +28,8 @@ import com.vaadin.tests.tb3.MultiBrowserTest; * Tests calendar via prepared screenshots 'Calendar event not shown correctly * when partially out of view' (#7261) */ -public class CalendarShownNotCorrectlyWhenPartiallyOutOfViewTest extends - MultiBrowserTest { +public class CalendarShownNotCorrectlyWhenPartiallyOutOfViewTest + extends MultiBrowserTest { @Test public void testCalendar() throws InterruptedException, IOException { @@ -43,8 +43,8 @@ public class CalendarShownNotCorrectlyWhenPartiallyOutOfViewTest extends } private void openWeekView() { - List<WebElement> elements = getDriver().findElements( - By.className("v-calendar-week-number")); + List<WebElement> elements = getDriver() + .findElements(By.className("v-calendar-week-number")); for (WebElement webElement : elements) { if (webElement.getText().equals("36")) { @@ -55,8 +55,8 @@ public class CalendarShownNotCorrectlyWhenPartiallyOutOfViewTest extends } private void openDayView() { - List<WebElement> elements = getDriver().findElements( - By.className("v-calendar-header-day")); + List<WebElement> elements = getDriver() + .findElements(By.className("v-calendar-header-day")); for (WebElement webElement : elements) { if (webElement.getText().contains("Thursday 9/5/13")) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarVisibleHoursTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarVisibleHoursTest.java index 5306ee3909..fb74340312 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarVisibleHoursTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarVisibleHoursTest.java @@ -43,8 +43,8 @@ public class CalendarVisibleHoursTest extends MultiBrowserTest { } private void openWeekView() { - List<WebElement> elements = getDriver().findElements( - By.className("v-calendar-week-number")); + List<WebElement> elements = getDriver() + .findElements(By.className("v-calendar-week-number")); for (WebElement webElement : elements) { if (webElement.getText().equals("36")) { @@ -55,8 +55,8 @@ public class CalendarVisibleHoursTest extends MultiBrowserTest { } private void openDayView() { - List<WebElement> elements = getDriver().findElements( - By.className("v-calendar-header-day")); + List<WebElement> elements = getDriver() + .findElements(By.className("v-calendar-header-day")); for (WebElement webElement : elements) { if (webElement.getText().contains("Thursday 9/5/13")) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarWeekSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarWeekSelectionTest.java index 83f41994ae..facf44775b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarWeekSelectionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarWeekSelectionTest.java @@ -31,7 +31,8 @@ public class CalendarWeekSelectionTest extends MultiBrowserTest { } private void clickOnWeek(String week) { - for (WebElement e : findElements(By.className("v-calendar-week-number"))) { + for (WebElement e : findElements( + By.className("v-calendar-week-number"))) { if (e.getText().equals(week)) { e.click(); break; diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDayTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDayTest.java index a41fb8360a..8db0243a43 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDayTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDayTest.java @@ -48,15 +48,15 @@ public class SetFirstVisibleHourOfDayTest extends MultiBrowserTest { // first of all check if event is present in calendar view waitForElementPresent(By.className("v-calendar-event-content")); - WebElement event = getDriver().findElement( - By.className("v-calendar-event-content")); - WebElement dateSlot = getDriver().findElement( - By.className("v-datecellslot")); + WebElement event = getDriver() + .findElement(By.className("v-calendar-event-content")); + WebElement dateSlot = getDriver() + .findElement(By.className("v-datecellslot")); Assert.assertEquals( "The height of shown part of calendar event should be equal to 12 datecell slots", - dateSlot.getSize().getHeight() * 12, event.getSize() - .getHeight()); + dateSlot.getSize().getHeight() * 12, + event.getSize().getHeight()); } @Test @@ -70,15 +70,15 @@ public class SetFirstVisibleHourOfDayTest extends MultiBrowserTest { // first of all check if event is present in calendar view waitForElementPresent(By.className("v-calendar-event-content")); - WebElement event = getDriver().findElement( - By.className("v-calendar-event-content")); - WebElement dateSlot = getDriver().findElement( - By.className("v-datecellslot")); + WebElement event = getDriver() + .findElement(By.className("v-calendar-event-content")); + WebElement dateSlot = getDriver() + .findElement(By.className("v-datecellslot")); Assert.assertEquals( "The height of shown part of calendar event should be equal to 12 datecell slots", - dateSlot.getSize().getHeight() * 12, event.getSize() - .getHeight()); + dateSlot.getSize().getHeight() * 12, + event.getSize().getHeight()); } private void clickElement(String className, String text) { @@ -93,8 +93,8 @@ public class SetFirstVisibleHourOfDayTest extends MultiBrowserTest { // sometimes the element only gets focus from click and // we need to click the text, which is in the right edge // of the element - testBenchElement(webElement).click( - webElement.getSize().getWidth() - 5, 9); + testBenchElement(webElement) + .click(webElement.getSize().getWidth() - 5, 9); } catch (StaleElementReferenceException e) { // the first click succeeded after all } diff --git a/uitest/src/test/java/com/vaadin/tests/components/colorpicker/ColorPickerInputFormatsTest.java b/uitest/src/test/java/com/vaadin/tests/components/colorpicker/ColorPickerInputFormatsTest.java index 096b07546a..1bf1df866e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/colorpicker/ColorPickerInputFormatsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/colorpicker/ColorPickerInputFormatsTest.java @@ -77,8 +77,8 @@ public class ColorPickerInputFormatsTest extends MultiBrowserTest { getDriver().findElement(By.id("colorpicker1")).click(); // Add RGB value - WebElement field = getDriver().findElement( - By.className("v-colorpicker-preview-textfield")); + WebElement field = getDriver() + .findElement(By.className("v-colorpicker-preview-textfield")); // Select all text field.sendKeys(Keys.chord(Keys.CONTROL, "a")); @@ -91,8 +91,8 @@ public class ColorPickerInputFormatsTest extends MultiBrowserTest { } private String getColorpickerValue() { - WebElement field = getDriver().findElement( - By.className("v-colorpicker-preview-textfield")); + WebElement field = getDriver() + .findElement(By.className("v-colorpicker-preview-textfield")); return field.getAttribute("value"); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigationTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigationTest.java index ebf6ba4773..187d6d40f4 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigationTest.java @@ -13,8 +13,8 @@ import com.vaadin.testbench.By; import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2; import com.vaadin.tests.tb3.newelements.ComboBoxElement; -public class ComboBoxEmptyItemsKeyboardNavigationTest extends - SingleBrowserTestPhantomJS2 { +public class ComboBoxEmptyItemsKeyboardNavigationTest + extends SingleBrowserTestPhantomJS2 { @Test public void navigatingUpOnAnEmptyMenuDoesntThrowErrors() { diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java index 66173db554..3b9c01ffcd 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java @@ -35,13 +35,13 @@ public class ComboBoxItemAddingWithFocusListenerTest extends MultiBrowserTest { cBox.openPopup(); int i = 0; while (i < 3) { - assertTrue("No item added on focus", cBox.getPopupSuggestions() - .contains("Focus" + i++)); + assertTrue("No item added on focus", + cBox.getPopupSuggestions().contains("Focus" + i++)); focusTarget.focus(); ((TestBenchElement) cBox.findElement(By.vaadin("#textbox"))) .focus(); } - assertTrue("No item added on focus", cBox.getPopupSuggestions() - .contains("Focus" + i)); + assertTrue("No item added on focus", + cBox.getPopupSuggestions().contains("Focus" + i)); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java index 20c460e342..a4d8b7df7e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java @@ -37,8 +37,8 @@ public class ComboBoxItemStyleGeneratorTest extends SingleBrowserTest { comboBox.openPopup(); - List<WebElement> boldItems = findElements(By - .className("v-filterselect-item-bold")); + List<WebElement> boldItems = findElements( + By.className("v-filterselect-item-bold")); Assert.assertEquals(1, boldItems.size()); Assert.assertEquals("Item 5", boldItems.get(0).getText()); diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java index 407ab7aa04..f2dcdee4ef 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java @@ -21,8 +21,8 @@ public class ComboBoxLargeIconsTest extends MultiBrowserTest { NativeSelectElement iconSelect = $(NativeSelectElement.class).first(); iconSelect.selectByText("16x16"); - ComboBoxElement cb = $(ComboBoxElement.class).caption( - "Undefined wide select with 50 items").first(); + ComboBoxElement cb = $(ComboBoxElement.class) + .caption("Undefined wide select with 50 items").first(); cb.openPopup(); compareScreen("icons-16x16-page1"); cb.openNextPage(); @@ -39,18 +39,18 @@ public class ComboBoxLargeIconsTest extends MultiBrowserTest { iconSelect.selectByText("64x64"); - ComboBoxElement pageLength0cb = $(ComboBoxElement.class).caption( - "Pagelength 0").first(); + ComboBoxElement pageLength0cb = $(ComboBoxElement.class) + .caption("Pagelength 0").first(); pageLength0cb.openPopup(); pageLength0cb.findElement(By.vaadin("#popup/item1")).click(); - ComboBoxElement cb200px = $(ComboBoxElement.class).caption( - "200px wide select with 50 items").first(); + ComboBoxElement cb200px = $(ComboBoxElement.class) + .caption("200px wide select with 50 items").first(); cb200px.openPopup(); cb200px.findElement(By.vaadin("#popup/item1")).click(); - ComboBoxElement cb150px = $(ComboBoxElement.class).caption( - "150px wide select with 5 items").first(); + ComboBoxElement cb150px = $(ComboBoxElement.class) + .caption("150px wide select with 5 items").first(); new Actions(driver).sendKeys(cb150px, Keys.DOWN).perform(); compareScreen("icons-64x64-page1-highlight-first"); diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInputTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInputTest.java index cb4cd54559..a6677181d1 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInputTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInputTest.java @@ -42,7 +42,8 @@ public class ComboBoxNoTextInputTest extends MultiBrowserTest { } @Test - public void testComboBoxWithTextInputNoPopupOpensOnClick() throws Exception { + public void testComboBoxWithTextInputNoPopupOpensOnClick() + throws Exception { openTestURL(); // click and check that no popup appears diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java index f48f2bbdeb..c4699d75ba 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java @@ -73,8 +73,8 @@ public class ComboBoxOnSmallScreenTest extends MultiBrowserTest { final int popupBottom = popupTop + popup.getSize().getHeight(); final int rootHeight = findElement(By.tagName("body")).getSize().height; - assertThat("Popup overlay out of the screen", popupTop < 0 - || popupBottom > rootHeight, is(false)); + assertThat("Popup overlay out of the screen", + popupTop < 0 || popupBottom > rootHeight, is(false)); } private Window getWindow() { diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java index 0295f4ba41..b4db8c572c 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java @@ -37,14 +37,14 @@ public class ComboBoxResetValueTest extends MultiBrowserTest { openTestURL(); - comboBoxWithNullSelectionItemId = $(ComboBoxElement.class).id( - ComboBoxResetValue.WITH_SET_NULL_SELECTION_ITEM_ID); + comboBoxWithNullSelectionItemId = $(ComboBoxElement.class) + .id(ComboBoxResetValue.WITH_SET_NULL_SELECTION_ITEM_ID); - comboBoxWithoutNullSelectionItemId = $(ComboBoxElement.class).id( - ComboBoxResetValue.WITHOUT_NULL_SELECTION_ITEM_ID); + comboBoxWithoutNullSelectionItemId = $(ComboBoxElement.class) + .id(ComboBoxResetValue.WITHOUT_NULL_SELECTION_ITEM_ID); - comboBoxWithNullNotAllowed = $(ComboBoxElement.class).id( - ComboBoxResetValue.NULL_SELECTION_NOT_ALLOWED); + comboBoxWithNullNotAllowed = $(ComboBoxElement.class) + .id(ComboBoxResetValue.NULL_SELECTION_NOT_ALLOWED); clickResetButton(); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java index a95301acc7..12e0e4640a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java @@ -72,8 +72,8 @@ public class ComboBoxScrollingWithArrowsTest extends MultiBrowserTest { } private String getSelectedItemText() { - List<WebElement> items = driver.findElements(By - .className("gwt-MenuItem-selected")); + List<WebElement> items = driver + .findElements(By.className("gwt-MenuItem-selected")); return items.get(0).getText(); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java index ce8e614e10..629c8af20e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java @@ -39,8 +39,8 @@ public class ComboBoxSetNullWhenNewItemsAllowedTest extends MultiBrowserTest { setDebug(true); openTestURL(); - WebElement element = $(ComboBoxElement.class).first().findElement( - By.vaadin("#textbox")); + WebElement element = $(ComboBoxElement.class).first() + .findElement(By.vaadin("#textbox")); ((TestBenchElementCommands) element).click(8, 7); element.clear(); element.sendKeys("New value"); diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSlowTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSlowTest.java index e547e68fc1..84d4dcc3dd 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSlowTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSlowTest.java @@ -60,15 +60,15 @@ public class ComboBoxSlowTest extends MultiBrowserTest { sleep(250); typeString("Item 12"); - final WebElement popup = driver.findElement(By - .className("v-filterselect-suggestpopup")); + final WebElement popup = driver + .findElement(By.className("v-filterselect-suggestpopup")); List<WebElement> filteredItems = getFilteredItems(popup); - assertEquals("unexpected amount of suggestions found on first page", - 10, filteredItems.size()); - assertEquals("wrong filtering result", "Item 12", filteredItems.get(0) - .getText()); - assertEquals("wrong filtering result", "Item 128", filteredItems.get(9) - .getText()); + assertEquals("unexpected amount of suggestions found on first page", 10, + filteredItems.size()); + assertEquals("wrong filtering result", "Item 12", + filteredItems.get(0).getText()); + assertEquals("wrong filtering result", "Item 128", + filteredItems.get(9).getText()); assertTrue(isPagingActive()); goToNextPage(); @@ -89,20 +89,20 @@ public class ComboBoxSlowTest extends MultiBrowserTest { typeString("Item 100"); assertFalse(isPagingActive()); - WebElement popup = driver.findElement(By - .className("v-filterselect-suggestpopup")); + WebElement popup = driver + .findElement(By.className("v-filterselect-suggestpopup")); List<WebElement> filteredItems = getFilteredItems(popup); assertEquals("unexpected amount of suggestions found", 2, filteredItems.size()); - assertEquals("wrong filtering result", "Item 100", filteredItems.get(0) - .getText()); - assertEquals("wrong filtering result", "Item 1000", filteredItems - .get(1).getText()); + assertEquals("wrong filtering result", "Item 100", + filteredItems.get(0).getText()); + assertEquals("wrong filtering result", "Item 1000", + filteredItems.get(1).getText()); } private void clickComboBoxTextArea() { - WebElement cb = getDriver().findElement( - By.className("v-filterselect-input")); + WebElement cb = getDriver() + .findElement(By.className("v-filterselect-input")); cb.click(); } @@ -114,20 +114,20 @@ public class ComboBoxSlowTest extends MultiBrowserTest { private int getNumberOfSuggestions() { - List<WebElement> elements = getDriver().findElements( - By.className("gwt-MenuItem")); + List<WebElement> elements = getDriver() + .findElements(By.className("gwt-MenuItem")); return elements.size(); } private boolean isPagingActive() { - List<WebElement> elements = getDriver().findElements( - By.className("v-filterselect-nextpage")); + List<WebElement> elements = getDriver() + .findElements(By.className("v-filterselect-nextpage")); return elements.size() == 1; } private void goToNextPage() { - WebElement nextPage = getDriver().findElement( - By.className("v-filterselect-nextpage")); + WebElement nextPage = getDriver() + .findElement(By.className("v-filterselect-nextpage")); nextPage.click(); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java index 7ed3268dd4..3b023b623c 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java @@ -56,8 +56,8 @@ public class ComboBoxSuggestionPageLengthTest extends MultiBrowserTest { private List<String> getSuggestionsOnScreen() { List<WebElement> suggestionElements = getDriver() - .findElements( - By.cssSelector(".v-filterselect-suggestpopup .gwt-MenuItem span")); + .findElements(By.cssSelector( + ".v-filterselect-suggestpopup .gwt-MenuItem span")); List<String> suggestions = new ArrayList<String>(); for (WebElement suggestion : suggestionElements) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java index 5e9e076cac..2a99945c98 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java @@ -40,8 +40,8 @@ public class ComboBoxSuggestionPopupCloseTest extends MultiBrowserTest { waitForElementVisible(By.className("v-filterselect")); - selectTextbox = $(ComboBoxElement.class).first().findElement( - By.vaadin("#textbox")); + selectTextbox = $(ComboBoxElement.class).first() + .findElement(By.vaadin("#textbox")); selectTextbox.click(); // open popup and select first element @@ -50,7 +50,8 @@ public class ComboBoxSuggestionPopupCloseTest extends MultiBrowserTest { // open popup and hit enter to close it sendKeys(new Keys[] { ARROW_DOWN, ENTER }); - assertFalse(isElementPresent(By.className("v-filterselect-suggestmenu"))); + assertFalse( + isElementPresent(By.className("v-filterselect-suggestmenu"))); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentageTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentageTest.java index 2e5dcb380e..edc4ad489a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentageTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentageTest.java @@ -27,8 +27,8 @@ import com.vaadin.tests.tb3.MultiBrowserTest; /** * @author Vaadin Ltd */ -public class ComboBoxSuggestionPopupWidthPercentageTest extends - MultiBrowserTest { +public class ComboBoxSuggestionPopupWidthPercentageTest + extends MultiBrowserTest { @Test public void suggestionPopupPersentageWidthTest() throws Exception { diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthTest.java index 11e7629b2d..b2502a720c 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthTest.java @@ -33,8 +33,7 @@ public class ComboBoxSuggestionPopupWidthTest extends MultiBrowserTest { public void suggestionPopupWidthTest() throws Exception { openTestURL(); - waitForElementVisible(By - .className("width-as-percentage")); + waitForElementVisible(By.className("width-as-percentage")); WebElement selectTextbox = $(ComboBoxElement.class).first() .findElement(By.vaadin("#textbox")); diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java index 318ffbe549..5f6cea8855 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java @@ -42,7 +42,8 @@ public class ComboBoxValueInputTest extends MultiBrowserTest { openTestURL(); }; - private void sendKeysToComboBox(ComboBoxElement comboBox, CharSequence keys) { + private void sendKeysToComboBox(ComboBoxElement comboBox, + CharSequence keys) { getComboBoxInput(comboBox).sendKeys(keys); } @@ -77,7 +78,8 @@ public class ComboBoxValueInputTest extends MultiBrowserTest { assertThatComboBoxSuggestionsAreHidden(comboBox); } - private void assertThatComboBoxSuggestionsAreHidden(ComboBoxElement comboBox) { + private void assertThatComboBoxSuggestionsAreHidden( + ComboBoxElement comboBox) { assertThat(comboBox.isElementPresent(By.vaadin("#popup")), is(false)); } @@ -133,8 +135,8 @@ public class ComboBoxValueInputTest extends MultiBrowserTest { // selectByText doesn't work when filtering is off. comboBox.openPopup(); - List<WebElement> filteredItems = findElements(By - .className("gwt-MenuItem")); + List<WebElement> filteredItems = findElements( + By.className("gwt-MenuItem")); filteredItems.get(1).click(); sendKeysToComboBox(comboBox, "mnop"); diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java index 280328694c..6457f59cb9 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java @@ -24,8 +24,8 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @SuppressWarnings("serial") -public class ComboSelectedValueBeyondTheFirstDropdownPageTest extends - MultiBrowserTest { +public class ComboSelectedValueBeyondTheFirstDropdownPageTest + extends MultiBrowserTest { @Test public void valueOnSecondPageIsSelected() { diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java index 5c8c971194..71060bbc90 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java @@ -46,8 +46,8 @@ public class ComboboxMenuBarAutoopenTest extends MultiBrowserTest { openPopup(); menuBar = selectMenuBar(); - WebElement menuBarItem = findElement(By - .className("v-menubar-menuitem-caption")); + WebElement menuBarItem = findElement( + By.className("v-menubar-menuitem-caption")); Actions actions = new Actions(getDriver()); actions.moveToElement(menuBarItem).build().perform(); menuBar.click(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScrollTest.java index e88dd2eb85..68c11313a5 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScrollTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScrollTest.java @@ -40,7 +40,8 @@ public class ComboboxPageLengthZeroScrollTest extends MultiBrowserTest { public void testComboboxPageLength() { openTestURL(); - WebElement comboBox = vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VFilterSelect[0]#textbox"); + WebElement comboBox = vaadinElement( + "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VFilterSelect[0]#textbox"); // navigate to the next page. keyboard navigation is the preferred // method here since it's much easier to implement. diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPopupScrollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPopupScrollingTest.java index ec5bc088da..f9daf2c9e5 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPopupScrollingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPopupScrollingTest.java @@ -50,8 +50,8 @@ public class ComboboxPopupScrollingTest extends MultiBrowserTest { String caption = cb.getCaption(); cb.openPopup(); WebElement popup = cb.getSuggestionPopup(); - WebElement scrollable = popup.findElement(By - .className("v-filterselect-suggestmenu")); + WebElement scrollable = popup + .findElement(By.className("v-filterselect-suggestmenu")); assertNoHorizontalScrollbar(scrollable, caption); assertNoVerticalScrollbar(scrollable, caption); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplateTest.java b/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplateTest.java index 668d43f18f..8dfc3c3967 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplateTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplateTest.java @@ -31,13 +31,14 @@ public class CustomLayoutWithNullTemplateTest extends SingleBrowserTest { public void testChildComponents() { openTestURL(); - ElementQuery<CustomLayoutElement> customLayout = $(CustomLayoutElement.class); + ElementQuery<CustomLayoutElement> customLayout = $( + CustomLayoutElement.class); // Verify the Button and Label are rendered inside the CustomLayout. assertTrue("Button was not rendered.", customLayout.$(ButtonElement.class).exists()); - assertTrue("Label was not rendered.", customLayout - .$(LabelElement.class).exists()); + assertTrue("Label was not rendered.", + customLayout.$(LabelElement.class).exists()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplateTest.java b/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplateTest.java index 695d9cceff..03b5d90304 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplateTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplateTest.java @@ -31,13 +31,14 @@ public class CustomLayoutWithoutTemplateTest extends SingleBrowserTest { public void testChildComponents() { openTestURL(); - ElementQuery<CustomLayoutElement> customLayout = $(CustomLayoutElement.class); + ElementQuery<CustomLayoutElement> customLayout = $( + CustomLayoutElement.class); // Verify the Button and Label are rendered inside the CustomLayout. assertTrue("Button was not rendered.", customLayout.$(ButtonElement.class).exists()); - assertTrue("Label was not rendered.", customLayout - .$(LabelElement.class).exists()); + assertTrue("Label was not rendered.", + customLayout.$(LabelElement.class).exists()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/customlayout/OverflowAutoFixTest.java b/uitest/src/test/java/com/vaadin/tests/components/customlayout/OverflowAutoFixTest.java index d56e07f60b..20fdb5dfe3 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/customlayout/OverflowAutoFixTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/customlayout/OverflowAutoFixTest.java @@ -35,9 +35,11 @@ public class OverflowAutoFixTest extends MultiBrowserTest { private void assertElementCssValueEquals(String className, String propertyName, String expected) { - Assert.assertEquals(String.format( - "Unexpected value for property '%s' on element '%s',", - propertyName, className), expected, + Assert.assertEquals( + String.format( + "Unexpected value for property '%s' on element '%s',", + propertyName, className), + expected, findElement(By.className(className)).getCssValue(propertyName)); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/AriaDisabledTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/AriaDisabledTest.java index f37042396b..64719f7f0f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/AriaDisabledTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/AriaDisabledTest.java @@ -29,8 +29,9 @@ public class AriaDisabledTest extends MultiBrowserTest { openTestURL(); // Expect aria-disabled="false" on the enabled DateField. - String ariaDisabled = driver.findElement( - By.vaadin("/VVerticalLayout[0]/VPopupCalendar[1]#popupButton")) + String ariaDisabled = driver + .findElement(By + .vaadin("/VVerticalLayout[0]/VPopupCalendar[1]#popupButton")) .getAttribute("aria-disabled"); assertEquals("false", ariaDisabled); diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/CustomDateFormatEEETest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/CustomDateFormatEEETest.java index 98094515e8..d9b8051ea0 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/CustomDateFormatEEETest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/CustomDateFormatEEETest.java @@ -28,8 +28,9 @@ public class CustomDateFormatEEETest extends MultiBrowserTest { public void verifyDatePattern() { openTestURL(); - String dateValue = driver.findElement( - By.className("v-datefield-textfield")).getAttribute("value"); + String dateValue = driver + .findElement(By.className("v-datefield-textfield")) + .getAttribute("value"); assertEquals("14/03/2014 Fri", dateValue); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldChangeResolutionTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldChangeResolutionTest.java index e3c85224c0..62c254b2ab 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldChangeResolutionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldChangeResolutionTest.java @@ -86,8 +86,8 @@ public class DateFieldChangeResolutionTest extends MultiBrowserTest { private void initialize() { openTestURL(); WebElement dateField = driver.findElement(By.id(DATEFIELD_ID)); - dateFieldButton = dateField.findElement(By - .className("v-datefield-button")); + dateFieldButton = dateField + .findElement(By.className("v-datefield-button")); textField = dateField .findElement(By.className("v-datefield-textfield")); resolutionSecond = driver.findElement(By.id(BUTTON_BASE_ID + "second")); @@ -111,7 +111,8 @@ public class DateFieldChangeResolutionTest extends MultiBrowserTest { } else { checkYearHeader(); } - if (resolution.getCalendarField() >= Resolution.DAY.getCalendarField()) { + if (resolution.getCalendarField() >= Resolution.DAY + .getCalendarField()) { assertTrue( "A calendar with the chosen resolution should have a body", calendarHasBody()); @@ -150,37 +151,36 @@ public class DateFieldChangeResolutionTest extends MultiBrowserTest { if (buttonsExpected) { assertTrue( "The calendar should have a button for switching to the previous month", - isElementPresent(By - .cssSelector(".v-datefield-calendarpanel-header .v-datefield-calendarpanel-prevmonth .v-button-prevmonth"))); + isElementPresent(By.cssSelector( + ".v-datefield-calendarpanel-header .v-datefield-calendarpanel-prevmonth .v-button-prevmonth"))); assertTrue( "The calendar should have a button for switching to the next month", - isElementPresent(By - .cssSelector(".v-datefield-calendarpanel-header .v-datefield-calendarpanel-nextmonth .v-button-nextmonth"))); + isElementPresent(By.cssSelector( + ".v-datefield-calendarpanel-header .v-datefield-calendarpanel-nextmonth .v-button-nextmonth"))); } else { assertFalse( "The calendar should not have a button for switching to the previous month", - isElementPresent(By - .cssSelector(".v-datefield-calendarpanel-header .v-datefield-calendarpanel-prevmonth .v-button-prevmonth"))); + isElementPresent(By.cssSelector( + ".v-datefield-calendarpanel-header .v-datefield-calendarpanel-prevmonth .v-button-prevmonth"))); assertFalse( "The calendar should not have a button for switching to the next month", - isElementPresent(By - .cssSelector(".v-datefield-calendarpanel-header .v-datefield-calendarpanel-nextmonth .v-button-nextmonth"))); + isElementPresent(By.cssSelector( + ".v-datefield-calendarpanel-header .v-datefield-calendarpanel-nextmonth .v-button-nextmonth"))); } } private void checkHeaderForYear() { assertTrue( "The calendar should have a button for switching to the previous year", - isElementPresent(By - .cssSelector(".v-datefield-calendarpanel-header .v-datefield-calendarpanel-prevyear .v-button-prevyear"))); - assertTrue( - "The calendar header should show the selected year", - isElementPresent(By - .cssSelector(".v-datefield-calendarpanel-header .v-datefield-calendarpanel-month"))); + isElementPresent(By.cssSelector( + ".v-datefield-calendarpanel-header .v-datefield-calendarpanel-prevyear .v-button-prevyear"))); + assertTrue("The calendar header should show the selected year", + isElementPresent(By.cssSelector( + ".v-datefield-calendarpanel-header .v-datefield-calendarpanel-month"))); assertTrue( "The calendar should have a button for switching to the next year", - isElementPresent(By - .cssSelector(".v-datefield-calendarpanel-header .v-datefield-calendarpanel-nextyear .v-button-nextyear"))); + isElementPresent(By.cssSelector( + ".v-datefield-calendarpanel-header .v-datefield-calendarpanel-nextyear .v-button-nextyear"))); } @@ -193,8 +193,8 @@ public class DateFieldChangeResolutionTest extends MultiBrowserTest { } private void closePopupDateField() { - WebElement element = driver.findElement(By - .cssSelector(".v-datefield-calendarpanel")); + WebElement element = driver + .findElement(By.cssSelector(".v-datefield-calendarpanel")); element.sendKeys(Keys.ESCAPE); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldCloseTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldCloseTest.java index e6f7520813..800c175203 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldCloseTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldCloseTest.java @@ -40,8 +40,8 @@ public class DateFieldCloseTest extends MultiBrowserTest { } private void checkForCalendarHeader(boolean headerShouldExist) { - boolean headerExists = isElementPresent(By - .className("v-datefield-calendarpanel-header")); + boolean headerExists = isElementPresent( + By.className("v-datefield-calendarpanel-header")); if (headerShouldExist) { assertTrue("The calendar should be visible", headerExists); } else { @@ -50,14 +50,14 @@ public class DateFieldCloseTest extends MultiBrowserTest { } private void clickButton() { - WebElement dateFieldButton = dateField.findElement(By - .className("v-datefield-button")); + WebElement dateFieldButton = dateField + .findElement(By.className("v-datefield-button")); testBenchElement(dateFieldButton).click(5, 5); } private void closePopup() { - WebElement dateFieldButton = dateField.findElement(By - .className("v-datefield-button")); + WebElement dateFieldButton = dateField + .findElement(By.className("v-datefield-button")); // To work reliably with IE, need to click and hold instead of just // clicking the button. Actions actions = new Actions(driver); diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldFastForwardTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldFastForwardTest.java index 63d96e9bf9..509e31ed6f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldFastForwardTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldFastForwardTest.java @@ -32,8 +32,8 @@ public class DateFieldFastForwardTest extends MultiBrowserTest { public void testFastForwardOnRightMouseClick() throws Exception { openTestURL(); String firstMonth = getSelectedMonth(); - WebElement nextMonthButton = driver.findElement(By - .className("v-button-nextmonth")); + WebElement nextMonthButton = driver + .findElement(By.className("v-button-nextmonth")); // Click and hold left mouse button to start fast forwarding. new Actions(driver).clickAndHold(nextMonthButton).perform(); @@ -63,8 +63,9 @@ public class DateFieldFastForwardTest extends MultiBrowserTest { } private String getSelectedMonth() { - return driver.findElement( - By.className("v-inline-datefield-calendarpanel-month")) + return driver + .findElement( + By.className("v-inline-datefield-calendarpanel-month")) .getText(); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateRangeWithSqlDateTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateRangeWithSqlDateTest.java index 2352011585..6e88ea8a65 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateRangeWithSqlDateTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateRangeWithSqlDateTest.java @@ -32,8 +32,8 @@ public class DateRangeWithSqlDateTest extends MultiBrowserTest { openTestURL(); // Get all cells of the inline datefield. - List<WebElement> cells = driver.findElements(By - .className("v-inline-datefield-calendarpanel-day")); + List<WebElement> cells = driver.findElements( + By.className("v-inline-datefield-calendarpanel-day")); // Verify the range is rendered correctly. assertCell(cells.get(0), "30", true); @@ -42,7 +42,8 @@ public class DateRangeWithSqlDateTest extends MultiBrowserTest { assertCell(cells.get(3), "3", true); } - private void assertCell(WebElement cell, String text, boolean outsideRange) { + private void assertCell(WebElement cell, String text, + boolean outsideRange) { assertEquals(text, cell.getText()); assertEquals(outsideRange, cell.getAttribute("class").contains("outside-range")); diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopupTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopupTest.java index 4775441af2..866959e6f6 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopupTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopupTest.java @@ -39,8 +39,8 @@ public class DisabledDateFieldPopupTest extends MultiBrowserTest { public void testPopup() throws IOException { openTestURL(); - WebElement button = driver.findElement(By - .className("v-datefield-button")); + WebElement button = driver + .findElement(By.className("v-datefield-button")); new Actions(driver).moveToElement(button).click() .sendKeys(Keys.ARROW_DOWN).perform(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledInlineDateFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledInlineDateFieldTest.java index 2c50030461..2ce93624b2 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledInlineDateFieldTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledInlineDateFieldTest.java @@ -56,8 +56,8 @@ public class DisabledInlineDateFieldTest extends MultiBrowserTest { private void testDaySelection(String cssClass) { // We know that the first day element is not selected, because of the // fixed date in the test. - WebElement nonSelectedDay = driver.findElement(By.cssSelector(cssClass - + " .v-inline-datefield-calendarpanel-day")); + WebElement nonSelectedDay = driver.findElement(By.cssSelector( + cssClass + " .v-inline-datefield-calendarpanel-day")); // Assert it is not selected before click. assertFalse(nonSelectedDay.getAttribute("class").contains("selected")); @@ -70,8 +70,8 @@ public class DisabledInlineDateFieldTest extends MultiBrowserTest { } private String getSelectedMonth(String selectorPrefix) { - return driver.findElement( - By.cssSelector(selectorPrefix + return driver + .findElement(By.cssSelector(selectorPrefix + " .v-inline-datefield-calendarpanel-month")) .getText(); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java index 76486bf340..8e36c32676 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java @@ -35,16 +35,16 @@ public class DisabledParentLayoutTest extends MultiBrowserTest { WebElement button = driver.findElement(By.className("v-button")); button.click(); - WebElement textField = driver.findElement(By - .className("v-datefield-textfield")); + WebElement textField = driver + .findElement(By.className("v-datefield-textfield")); textField.click(); Assert.assertFalse( "Date input text field shoud be disabled for disabled DateField", textField.isEnabled()); - WebElement dataFieldButton = driver.findElement(By - .className("v-datefield-button")); + WebElement dataFieldButton = driver + .findElement(By.className("v-datefield-button")); dataFieldButton.click(); Assert.assertFalse( diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/LocaleChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/LocaleChangeTest.java index 38e4b7e0b8..f788404ebe 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/LocaleChangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/LocaleChangeTest.java @@ -64,8 +64,9 @@ public class LocaleChangeTest extends MultiBrowserTest { if (!BrowserUtil.isIE(getDesiredCapabilities())) { driver.findElement(By.className("v-datefield-button")).click(); } else { - boolean popupOpen = driver.findElements( - By.className("v-datefield-popup")).size() == 1; + boolean popupOpen = driver + .findElements(By.className("v-datefield-popup")) + .size() == 1; if (popupOpen) { driver.findElement( By.className("v-datefield-calendarpanel-day-selected")) diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupClosingWithEscTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupClosingWithEscTest.java index 1366d38705..f4597d9bf9 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupClosingWithEscTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupClosingWithEscTest.java @@ -36,8 +36,8 @@ public class PopupClosingWithEscTest extends MultiBrowserTest { // Send ESC to the select element to simulate user being // focused on the select while hitting the ESC key. - WebElement select = driver.findElement(By - .cssSelector(".v-datefield-popup select:first-child")); + WebElement select = driver.findElement( + By.cssSelector(".v-datefield-popup select:first-child")); select.sendKeys(Keys.ESCAPE); assertFalse(isPopupVisible()); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java index c34f3fdd01..cb3364d1e0 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java @@ -63,10 +63,9 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { // verify contents WebElement popup = findElement(By.className("v-datefield-popup")); - assertEquals("unexpected month", "tammikuu 2011", - popup.findElements( - By.className("v-datefield-calendarpanel-month")).get(1) - .getText()); + assertEquals("unexpected month", "tammikuu 2011", popup + .findElements(By.className("v-datefield-calendarpanel-month")) + .get(1).getText()); List<WebElement> headerElements = popup .findElement(By.className("v-datefield-calendarpanel-weekdays")) .findElements(By.tagName("td")); @@ -104,10 +103,9 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { .findElement(By.tagName("button")).click(); // verify contents - assertEquals("unexpected month", "joulukuu 2010", - popup.findElements( - By.className("v-datefield-calendarpanel-month")).get(1) - .getText()); + assertEquals("unexpected month", "joulukuu 2010", popup + .findElements(By.className("v-datefield-calendarpanel-month")) + .get(1).getText()); assertEquals("unexpected selection", "1", popup.findElement( By.className("v-datefield-calendarpanel-day-selected")) @@ -129,10 +127,9 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { .findElement(By.tagName("button")).click(); // verify contents - assertEquals("unexpected month", "joulukuu 2009", - popup.findElements( - By.className("v-datefield-calendarpanel-month")).get(1) - .getText()); + assertEquals("unexpected month", "joulukuu 2009", popup + .findElements(By.className("v-datefield-calendarpanel-month")) + .get(1).getText()); assertEquals("unexpected selection", 0, popup.findElements( By.className("v-datefield-calendarpanel-day-selected")) @@ -173,10 +170,9 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { // verify contents WebElement popup = findElement(By.className("v-datefield-popup")); - assertEquals("unexpected month", "February 2010", - popup.findElements( - By.className("v-datefield-calendarpanel-month")).get(1) - .getText()); + assertEquals("unexpected month", "February 2010", popup + .findElements(By.className("v-datefield-calendarpanel-month")) + .get(1).getText()); List<WebElement> headerElements = popup .findElement(By.className("v-datefield-calendarpanel-weekdays")) .findElements(By.tagName("td")); @@ -224,10 +220,9 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { popupBody.sendKeys(Keys.ARROW_DOWN); // verify contents - assertEquals("unexpected month", "March 2010", - popup.findElements( - By.className("v-datefield-calendarpanel-month")).get(1) - .getText()); + assertEquals("unexpected month", "March 2010", popup + .findElements(By.className("v-datefield-calendarpanel-month")) + .get(1).getText()); assertEquals("unexpected selection", 0, popup.findElements( By.className("v-datefield-calendarpanel-day-selected")) @@ -259,10 +254,9 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { popupBody.sendKeys(Keys.ARROW_LEFT); // verify contents - assertEquals("unexpected month", "February 2010", - popup.findElements( - By.className("v-datefield-calendarpanel-month")).get(1) - .getText()); + assertEquals("unexpected month", "February 2010", popup + .findElements(By.className("v-datefield-calendarpanel-month")) + .get(1).getText()); assertEquals("unexpected selection", "16", popup.findElement( By.className("v-datefield-calendarpanel-day-selected")) @@ -303,10 +297,9 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { // verify contents WebElement popup = findElement(By.className("v-datefield-popup")); - assertEquals("unexpected month", "helmikuu 2010", - popup.findElements( - By.className("v-datefield-calendarpanel-month")).get(1) - .getText()); + assertEquals("unexpected month", "helmikuu 2010", popup + .findElements(By.className("v-datefield-calendarpanel-month")) + .get(1).getText()); List<WebElement> headerElements = popup .findElement(By.className("v-datefield-calendarpanel-weekdays")) .findElements(By.tagName("td")); @@ -358,10 +351,9 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { } // verify contents - assertEquals("unexpected month", "tammikuu 2010", - popup.findElements( - By.className("v-datefield-calendarpanel-month")).get(1) - .getText()); + assertEquals("unexpected month", "tammikuu 2010", popup + .findElements(By.className("v-datefield-calendarpanel-month")) + .get(1).getText()); weeknumbers = popup.findElements( By.className("v-datefield-calendarpanel-weeknumber")); assertEquals("unexpected weeknumber count", 6, weeknumbers.size()); @@ -400,10 +392,9 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { .findElement(By.tagName("button")).click(); // verify contents - assertEquals("unexpected month", "tammikuu 2009", - popup.findElements( - By.className("v-datefield-calendarpanel-month")).get(1) - .getText()); + assertEquals("unexpected month", "tammikuu 2009", popup + .findElements(By.className("v-datefield-calendarpanel-month")) + .get(1).getText()); weeknumbers = popup.findElements( By.className("v-datefield-calendarpanel-weeknumber")); assertEquals("unexpected weeknumber count", 6, weeknumbers.size()); diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldStatesTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldStatesTest.java index 8c5ba20ecc..5f82bab831 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldStatesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldStatesTest.java @@ -9,8 +9,8 @@ import com.vaadin.tests.tb3.MultiBrowserTest; public class PopupDateFieldStatesTest extends MultiBrowserTest { @Test - public void readOnlyDateFieldPopupShouldNotOpen() throws IOException, - InterruptedException { + public void readOnlyDateFieldPopupShouldNotOpen() + throws IOException, InterruptedException { openTestURL(); compareScreen("dateFieldStates"); diff --git a/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidthTest.java index 9cb7a63046..06323f79ba 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidthTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidthTest.java @@ -45,8 +45,8 @@ public class DragAndDropRelativeWidthTest extends MultiBrowserTest { actions.moveByOffset(100, 100); actions.build().perform(); - WebElement dragImage = getDriver().findElement( - By.className("v-drag-element")); + WebElement dragImage = getDriver() + .findElement(By.className("v-drag-element")); Assert.assertEquals("Drag image element height is unexpected", height, dragImage.getSize().getHeight()); diff --git a/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextAreaTest.java b/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextAreaTest.java index c60eead918..0d3b88b2d7 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextAreaTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextAreaTest.java @@ -37,15 +37,15 @@ public class DragAndDropTextAreaTest extends MultiBrowserTest { public void testTextAreaDndImage() { openTestURL(); - WebElement wrapper = driver.findElement(By - .className("v-verticallayout")); + WebElement wrapper = driver + .findElement(By.className("v-verticallayout")); Actions actions = new Actions(driver); actions.clickAndHold(wrapper); actions.moveByOffset(50, 50); actions.perform(); - WebElement dragElement = driver.findElement(By - .className("v-drag-element")); + WebElement dragElement = driver + .findElement(By.className("v-drag-element")); List<WebElement> children = dragElement.findElements(By.xpath(".//*")); boolean found = false; for (WebElement child : children) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragStartModesTest.java b/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragStartModesTest.java index 4e60b43ea2..0d8ea4e50a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragStartModesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragStartModesTest.java @@ -28,7 +28,8 @@ public class DragStartModesTest extends MultiBrowserTest { @Test public void testDragStartModes() throws IOException { openTestURL(); - WebElement dropTarget = vaadinElement("/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[0]"); + WebElement dropTarget = vaadinElement( + "/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[0]"); dragToTarget("COMPONENT", dropTarget); dragToTarget("WRAPPER", dropTarget); dragToTarget("COMPONENT_OTHER", dropTarget); diff --git a/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedAltTextTest.java b/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedAltTextTest.java index 23dcddd8d0..6fbf68cbc7 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedAltTextTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedAltTextTest.java @@ -54,7 +54,7 @@ public class EmbeddedAltTextTest extends MultiBrowserTest { } private String getAltText(EmbeddedElement embedded) { - return embedded.findElement(By.vaadin("/domChild[0]")).getAttribute( - "alt"); + return embedded.findElement(By.vaadin("/domChild[0]")) + .getAttribute("alt"); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinatesTest.java b/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinatesTest.java index 6bed0117f8..6cd13a461e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinatesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinatesTest.java @@ -25,8 +25,8 @@ import com.vaadin.testbench.elements.LabelElement; import com.vaadin.testbench.parallel.BrowserUtil; import com.vaadin.tests.tb3.MultiBrowserTest; -public class EmbeddedClickListenerRelativeCoordinatesTest extends - MultiBrowserTest { +public class EmbeddedClickListenerRelativeCoordinatesTest + extends MultiBrowserTest { @Before @Override diff --git a/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedThemeResourceTest.java b/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedThemeResourceTest.java index f892775ea3..55eda6ff60 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedThemeResourceTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedThemeResourceTest.java @@ -51,8 +51,8 @@ public class EmbeddedThemeResourceTest extends SingleBrowserTest { public List<DesiredCapabilities> getBrowsersToTest() { // Seems like stylesheet onload is not fired on PhantomJS // https://github.com/ariya/phantomjs/issues/12332 - return Collections.singletonList(Browser.FIREFOX - .getDesiredCapabilities()); + return Collections + .singletonList(Browser.FIREFOX.getDesiredCapabilities()); } @Before @@ -104,8 +104,8 @@ public class EmbeddedThemeResourceTest extends SingleBrowserTest { } }); - assertTrue("ThemeResource image source didn't update correctly.", image - .getAttribute("src").contains("/reindeer/")); + assertTrue("ThemeResource image source didn't update correctly.", + image.getAttribute("src").contains("/reindeer/")); assertThat( "Embedded and Image aren't using the same source for the image despite sharing the ThemeResource.", embedded.findElement(By.tagName("img")).getAttribute("src"), diff --git a/uitest/src/test/java/com/vaadin/tests/components/embedded/FlashIsVisibleTest.java b/uitest/src/test/java/com/vaadin/tests/components/embedded/FlashIsVisibleTest.java index 64d70df88f..92ddbc91b2 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/embedded/FlashIsVisibleTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/embedded/FlashIsVisibleTest.java @@ -19,8 +19,8 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -public class FlashIsVisibleTest extends - com.vaadin.tests.components.flash.FlashIsVisibleTest { +public class FlashIsVisibleTest + extends com.vaadin.tests.components.flash.FlashIsVisibleTest { @Override @Test diff --git a/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayoutTest.java index 89e7c9a06e..d43f120ca3 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayoutTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayoutTest.java @@ -37,8 +37,8 @@ public class FormLayoutInVerticalLayoutTest extends MultiBrowserTest { List<WebElement> labels = findElements(By.className("v-label-h2")); String formLabelMargin = labels.get(0).getCssValue("margin-top"); - String verticalLayoutLabelMargin = labels.get(1).getCssValue( - "margin-top"); + String verticalLayoutLabelMargin = labels.get(1) + .getCssValue("margin-top"); Assert.assertNotEquals( "'margin-top' values for header label in vertical layout " + "and form layout are the same", diff --git a/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java index 3285503aeb..b6c7516562 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java @@ -58,8 +58,8 @@ public class FormLayoutResizingTest extends MultiBrowserThemeTest { int[] expandedWidths = getWidths(tables); - Assert.assertEquals("Table should have grown ", - originalWidths[0] + 200, expandedWidths[0]); + Assert.assertEquals("Table should have grown ", originalWidths[0] + 200, + expandedWidths[0]); Assert.assertEquals("Wrapped table should have grown ", originalWidths[1] + 200, expandedWidths[1]); @@ -79,8 +79,8 @@ public class FormLayoutResizingTest extends MultiBrowserThemeTest { expandedWidths = getWidths(tables); - Assert.assertEquals("Table should have grown ", - originalWidths[0] + 200, expandedWidths[0]); + Assert.assertEquals("Table should have grown ", originalWidths[0] + 200, + expandedWidths[0]); Assert.assertEquals("Wrapped table should have grown ", originalWidths[1] + 200, expandedWidths[1]); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayoutTest.java index 95130e8a0c..bf7db40353 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayoutTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayoutTest.java @@ -30,8 +30,8 @@ public class HtmlCaptionInFormLayoutTest extends SingleBrowserTest { public void testHtmlCaptions() { openTestURL(); - List<WebElement> captions = getDriver().findElements( - By.cssSelector(".v-formlayout-captioncell span")); + List<WebElement> captions = getDriver() + .findElements(By.cssSelector(".v-formlayout-captioncell span")); Assert.assertEquals("Should be two formlayout captions", 2, captions.size()); @@ -46,8 +46,8 @@ public class HtmlCaptionInFormLayoutTest extends SingleBrowserTest { $(ButtonElement.class).caption("Toggle").first().click(); - List<WebElement> captions = getDriver().findElements( - By.cssSelector(".v-formlayout-captioncell span")); + List<WebElement> captions = getDriver() + .findElements(By.cssSelector(".v-formlayout-captioncell span")); Assert.assertEquals("Should be two formlayout captions", 2, captions.size()); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/AbstractGridColumnAutoWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/AbstractGridColumnAutoWidthTest.java index cf3ff0c3ef..17bf97bb93 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/AbstractGridColumnAutoWidthTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/AbstractGridColumnAutoWidthTest.java @@ -100,10 +100,10 @@ public abstract class AbstractGridColumnAutoWidthTest extends MultiBrowserTest { WebElement[] col = new WebElement[3]; col[0] = getDriver().findElement( By.xpath("//thead//th[" + (i + 1) + "]/div[1]/span")); - col[1] = getDriver().findElement( - By.xpath("//tbody//td[" + (i + 1) + "]//span")); - col[2] = getDriver().findElement( - By.xpath("//tbody//td[" + (i + 1) + "]")); + col[1] = getDriver() + .findElement(By.xpath("//tbody//td[" + (i + 1) + "]//span")); + col[2] = getDriver() + .findElement(By.xpath("//tbody//td[" + (i + 1) + "]")); return col; } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java index d5e01a9de8..9b39179e20 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java @@ -33,8 +33,8 @@ public class CustomRendererTest extends MultiBrowserTest { openTestURL(); GridElement grid = findGrid(); - assertEquals("1 :: 1 :: 2 :: 3 :: 5 :: 8 :: 13", grid.getCell(0, 0) - .getText()); + assertEquals("1 :: 1 :: 2 :: 3 :: 5 :: 8 :: 13", + grid.getCell(0, 0).getText()); } @Test @@ -43,8 +43,8 @@ public class CustomRendererTest extends MultiBrowserTest { GridElement grid = findGrid(); assertEquals("Click me!", grid.getCell(0, 1).getText()); - assertEquals(CustomRenderer.INIT_DEBUG_LABEL_CAPTION, findDebugLabel() - .getText()); + assertEquals(CustomRenderer.INIT_DEBUG_LABEL_CAPTION, + findDebugLabel().getText()); grid.getCell(0, 1).click(); assertEquals("row: 0, key: 1", grid.getCell(0, 1).getText()); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSizeTest.java index cccb306369..ca6bc9b655 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSizeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSizeTest.java @@ -41,19 +41,19 @@ public class GridCellFocusOnResetSizeTest extends MultiBrowserTest { GridElement grid = $(MyGridElement.class).first(); int rowIndex = 9; grid.getCell(rowIndex, 0).click(); - assertTrue("Row was not focused after click.", grid.getRow(rowIndex) - .isFocused()); + assertTrue("Row was not focused after click.", + grid.getRow(rowIndex).isFocused()); // Clicking the button decreases size until it is down to 5 rows. while (rowIndex > 4) { findElement(By.tagName("button")).click(); - assertTrue("Row focus was not moved when size decreased", grid - .getRow(--rowIndex).isFocused()); + assertTrue("Row focus was not moved when size decreased", + grid.getRow(--rowIndex).isFocused()); } // Next click increases size back to 10, this should not move focus. findElement(By.tagName("button")).click(); - assertTrue("Row focus should not have moved when size increased", grid - .getRow(4).isFocused()); + assertTrue("Row focus should not have moved when size increased", + grid.getRow(4).isFocused()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java index 6e2312e34c..d2448a9a78 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java @@ -35,8 +35,8 @@ public class GridCheckBoxDisplayTest extends SingleBrowserTest { Assert.assertEquals("First item had wrong value", "true", grid.getCell(0, 0).getText()); - Assert.assertEquals("Second item had wrong value", "false", grid - .getCell(1, 0).getText()); + Assert.assertEquals("Second item had wrong value", "false", + grid.getCell(1, 0).getText()); // First edit false item and see that the CheckBox is unchecked grid.getCell(1, 0).doubleClick(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java index 4139bb0c5f..3620faff85 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java @@ -81,8 +81,8 @@ public class GridClientRenderers extends MultiBrowserTest { openTestURL(); // Add widget renderer column - $(NativeSelectElement.class).first().selectByText( - Renderers.WIDGET_RENDERER.toString()); + $(NativeSelectElement.class).first() + .selectByText(Renderers.WIDGET_RENDERER.toString()); $(NativeButtonElement.class).caption("Add").first().click(); // Click the button in cell 1,1 @@ -100,8 +100,8 @@ public class GridClientRenderers extends MultiBrowserTest { openTestURL(); // Add widget renderer column - $(NativeSelectElement.class).first().selectByText( - Renderers.WIDGET_RENDERER.toString()); + $(NativeSelectElement.class).first() + .selectByText(Renderers.WIDGET_RENDERER.toString()); $(NativeButtonElement.class).caption("Add").first().click(); // Detach and re-attach the Grid @@ -131,8 +131,7 @@ public class GridClientRenderers extends MultiBrowserTest { TestBenchElement row = getGrid().getRow(51); String className = row.getAttribute("class"); - assertFalse( - "Row should not yet contain style name v-grid-row-has-data", + assertFalse("Row should not yet contain style name v-grid-row-has-data", className.contains("v-grid-row-has-data")); // Wait for data to arrive @@ -171,7 +170,8 @@ public class GridClientRenderers extends MultiBrowserTest { // Test initial renderering with contentVisible = False TestBenchElement cell = getGrid().getCell(51, 1); String backgroundColor = cell.getCssValue("backgroundColor"); - assertEquals("Background color was not red.", colorRed, backgroundColor); + assertEquals("Background color was not red.", colorRed, + backgroundColor); // data arrives... sleep((int) (latency * SLEEP_MULTIPLIER)); @@ -187,15 +187,15 @@ public class GridClientRenderers extends MultiBrowserTest { // Cell should be red (setContentVisible set cell red) cell = getGrid().getCell(55, 1); backgroundColor = cell.getCssValue("backgroundColor"); - assertEquals("Background color was not red.", colorRed, backgroundColor); + assertEquals("Background color was not red.", colorRed, + backgroundColor); // data arrives... sleep((int) (latency * SLEEP_MULTIPLIER)); // Cell should no longer be red backgroundColor = cell.getCssValue("backgroundColor"); - assertTrue( - "Background color was not reset", + assertTrue("Background color was not reset", backgroundColor.equals(colorWhite) || backgroundColor.equals(colorDark)); } @@ -272,8 +272,8 @@ public class GridClientRenderers extends MultiBrowserTest { cell = getGrid().getCell(4, 1); cell.click(); new Actions(getDriver()).moveToElement(cell).doubleClick().perform(); - assertEquals("onActivate was not called on double click.", - "Activated!", cell.getText()); + assertEquals("onActivate was not called on double click.", "Activated!", + cell.getText()); } private GridElement getGrid() { diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java index d99272d506..840cf904cd 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java @@ -61,15 +61,15 @@ public class GridColspansTest extends MultiBrowserTest { openTestURL(); GridElement grid = $(GridElement.class).first(); - assertEquals("Failed initial condition.", "all the stuff", grid - .getHeaderCell(0, 1).getText().toLowerCase()); - assertEquals("Failed initial condition.", "first name", grid - .getHeaderCell(2, 1).getText().toLowerCase()); + assertEquals("Failed initial condition.", "all the stuff", + grid.getHeaderCell(0, 1).getText().toLowerCase()); + assertEquals("Failed initial condition.", "first name", + grid.getHeaderCell(2, 1).getText().toLowerCase()); $(ButtonElement.class).caption("Show/Hide firstName").first().click(); assertEquals("Header text changed on column hide.", "all the stuff", grid.getHeaderCell(0, 1).getText().toLowerCase()); - assertEquals("Failed initial condition.", "last name", grid - .getHeaderCell(2, 1).getText().toLowerCase()); + assertEquals("Failed initial condition.", "last name", + grid.getHeaderCell(2, 1).getText().toLowerCase()); } @Test @@ -78,10 +78,10 @@ public class GridColspansTest extends MultiBrowserTest { GridElement grid = $(GridElement.class).first(); GridCellElement headerCell = grid.getHeaderCell(1, 1); - assertEquals("Failed initial condition.", "full name", headerCell - .getText().toLowerCase()); - assertEquals("Failed initial condition.", "first name", grid - .getHeaderCell(2, 1).getText().toLowerCase()); + assertEquals("Failed initial condition.", "full name", + headerCell.getText().toLowerCase()); + assertEquals("Failed initial condition.", "first name", + grid.getHeaderCell(2, 1).getText().toLowerCase()); $(ButtonElement.class).get(1).click(); headerCell = grid.getHeaderCell(1, 1); assertEquals("Header text not changed on column reorder.", "address", diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java index 64c56e174e..bce84fed0f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java @@ -32,8 +32,8 @@ public class GridColumnAutoExpandTest extends MultiBrowserTest { GridCellElement headerCell = $(GridElement.class).first() .getHeaderCell(0, 1); - assertTrue("Column did not expand as expected", headerCell.getSize() - .getWidth() > 400); + assertTrue("Column did not expand as expected", + headerCell.getSize().getWidth() > 400); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoWidthClientTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoWidthClientTest.java index 999f72682e..cd8a452676 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoWidthClientTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoWidthClientTest.java @@ -18,8 +18,8 @@ package com.vaadin.tests.components.grid; import com.vaadin.testbench.parallel.TestCategory; @TestCategory("grid") -public class GridColumnAutoWidthClientTest extends - AbstractGridColumnAutoWidthTest { +public class GridColumnAutoWidthClientTest + extends AbstractGridColumnAutoWidthTest { @Override protected Class<?> getUIClass() { return GridColumnAutoWidthClient.class; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoWidthServerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoWidthServerTest.java index 3a4e2bfc72..a2653ab233 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoWidthServerTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoWidthServerTest.java @@ -18,8 +18,8 @@ package com.vaadin.tests.components.grid; import com.vaadin.testbench.parallel.TestCategory; @TestCategory("grid") -public class GridColumnAutoWidthServerTest extends - AbstractGridColumnAutoWidthTest { +public class GridColumnAutoWidthServerTest + extends AbstractGridColumnAutoWidthTest { @Override protected Class<?> getUIClass() { return GridColumnAutoWidth.class; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculationTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculationTest.java index 17bfcfc6c1..774fb4368f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculationTest.java @@ -41,8 +41,7 @@ public class GridColumnWidthRecalculationTest extends SingleBrowserTest { public void columnWidthAfterSwap() { int column0Width = getColumnWidth(0); int column1Width = getColumnWidth(1); - Assert.assertTrue( - "Column 0 should be narrower than column 1 initially", + Assert.assertTrue("Column 0 should be narrower than column 1 initially", column0Width < column1Width); $(ButtonElement.class).caption("Swap content").first().click(); @@ -59,8 +58,7 @@ public class GridColumnWidthRecalculationTest extends SingleBrowserTest { public void columnWidthAfterSwapAndRecalculate() { int column0Width = getColumnWidth(0); int column1Width = getColumnWidth(1); - Assert.assertTrue( - "Column 0 should be narrower than column 1 initially", + Assert.assertTrue("Column 0 should be narrower than column 1 initially", column0Width < column1Width); $(ButtonElement.class).caption("Swap content and recalculate columns") diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java index 976e1e78fe..d229b6b344 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java @@ -40,8 +40,8 @@ public class GridCustomSelectionModelTest extends MultiBrowserTest { assertTrue("First column of Grid should not have an input element", cell.findElements(By.className("input")).isEmpty()); - assertFalse("Row should not be selected initially", grid.getRow(0) - .isSelected()); + assertFalse("Row should not be selected initially", + grid.getRow(0).isSelected()); cell.click(5, 5); assertTrue("Click should select row", grid.getRow(0).isSelected()); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java index f7ea63e371..8cb588dadd 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java @@ -34,17 +34,17 @@ public class GridDataSourceResetTest extends SingleBrowserTest { assertTrue("First row was not selected", grid.getRow(0).isSelected()); for (int i = 1; i < 10; ++i) { - assertFalse("Only first row should be selected", grid.getRow(i) - .isSelected()); + assertFalse("Only first row should be selected", + grid.getRow(i).isSelected()); } $(ButtonElement.class).first().click(); - assertTrue("First row was not selected after remove", grid.getRow(0) - .isSelected()); + assertTrue("First row was not selected after remove", + grid.getRow(0).isSelected()); for (int i = 1; i < 9; ++i) { - assertFalse("Only first row should be selected after remove", grid - .getRow(i).isSelected()); + assertFalse("Only first row should be selected after remove", + grid.getRow(i).isSelected()); } } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java index df306ee1e6..f746a50caf 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java @@ -34,13 +34,13 @@ public class GridDefaultSelectionModeTest extends MultiBrowserTest { $(ButtonElement.class).caption("Select on server").first().click(); - assertTrue("Row should be selected.", $(GridElement.class).first() - .getRow(0).isSelected()); + assertTrue("Row should be selected.", + $(GridElement.class).first().getRow(0).isSelected()); $(ButtonElement.class).caption("Deselect on server").first().click(); - assertFalse("Row should not be selected.", $(GridElement.class).first() - .getRow(0).isSelected()); + assertFalse("Row should not be selected.", + $(GridElement.class).first().getRow(0).isSelected()); assertNoErrorNotifications(); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java index 6ea72540b5..6c0ff6fe80 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java @@ -70,7 +70,8 @@ public class GridDetailsLayoutExpandTest extends MultiBrowserTest { private void assertLabelWidth(String id, double expectedWidth) { // 1px leeway for calculations - assertThat("Unexpected label width.", (double) $(LabelElement.class) - .id(id).getSize().width, closeTo(expectedWidth, 1d)); + assertThat("Unexpected label width.", + (double) $(LabelElement.class).id(id).getSize().width, + closeTo(expectedWidth, 1d)); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLocationTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLocationTest.java index a395d7e721..60a72ffa88 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLocationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLocationTest.java @@ -163,14 +163,15 @@ public class GridDetailsLocationTest extends MultiBrowserTest { int visibleIndexOfSpacer) { waitForDetailsVisible(); WebElement details = getDetailsElement(visibleIndexOfSpacer); - Assert.assertEquals("Wrong details row height", expectedHeight, details - .getSize().getHeight()); + Assert.assertEquals("Wrong details row height", expectedHeight, + details.getSize().getHeight()); } private void verifyDetailsDecoratorLocation(int row, int visibleIndexOfSpacer, int visibleIndexOfDeco) { WebElement detailsElement = getDetailsElement(visibleIndexOfSpacer); - WebElement detailsDecoElement = getDetailsDecoElement(visibleIndexOfDeco); + WebElement detailsDecoElement = getDetailsDecoElement( + visibleIndexOfDeco); GridRowElement rowElement = getGrid().getRow(row); int diff = 0; @@ -180,8 +181,8 @@ public class GridDetailsLocationTest extends MultiBrowserTest { Assert.assertEquals( "Details deco top position does not match row top pos", - rowElement.getLocation().getY(), detailsDecoElement - .getLocation().getY()); + rowElement.getLocation().getY(), + detailsDecoElement.getLocation().getY()); Assert.assertEquals( "Details deco bottom position does not match details bottom pos", detailsElement.getLocation().getY() @@ -216,9 +217,8 @@ public class GridDetailsLocationTest extends MultiBrowserTest { + bottomBoundary + " decoratorBotton:" + detailsBottom, detailsBottom, bottomBoundary); - verifyDetailsRowHeight(param.getRowIndex(), - param.useGenerator() ? getDefinedHeight() - : detailsDefaultHeight, 0); + verifyDetailsRowHeight(param.getRowIndex(), param.useGenerator() + ? getDefinedHeight() : detailsDefaultHeight, 0); verifyDetailsDecoratorLocation(param.getRowIndex(), 0, 0); Assert.assertFalse("Notification was present", @@ -247,8 +247,8 @@ public class GridDetailsLocationTest extends MultiBrowserTest { try { WebElement detailsElement = getDetailsElement(); return detailsElement.isDisplayed() - && detailsElement.getSize().getHeight() > 3 ? detailsElement - : null; + && detailsElement.getSize().getHeight() > 3 + ? detailsElement : null; } catch (StaleElementReferenceException e) { return null; } @@ -322,14 +322,14 @@ public class GridDetailsLocationTest extends MultiBrowserTest { } private WebElement getVerticalScrollbar() { - WebElement scrollBar = getGrid().findElement( - By.className("v-grid-scroller-vertical")); + WebElement scrollBar = getGrid() + .findElement(By.className("v-grid-scroller-vertical")); return scrollBar; } private WebElement getHorizontalScrollbar() { - WebElement scrollBar = getGrid().findElement( - By.className("v-grid-scroller-horizontal")); + WebElement scrollBar = getGrid() + .findElement(By.className("v-grid-scroller-horizontal")); return scrollBar; } }
\ No newline at end of file diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java index 2def2d0279..3dbb84b4d2 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java @@ -83,9 +83,9 @@ public class GridDetailsWidthTest extends SingleBrowserTest { WebElement spacer = findElement(By.className("v-grid-spacer")); Assert.assertEquals("Grid was not sorted correctly", "Hello 0", cell.getText()); - Assert.assertEquals("Details row was not in correct location", cell - .getLocation().getY() + cell.getSize().getHeight(), spacer - .getLocation().getY()); + Assert.assertEquals("Details row was not in correct location", + cell.getLocation().getY() + cell.getSize().getHeight(), + spacer.getLocation().getY()); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDisabledMultiselectTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDisabledMultiselectTest.java index 390b855c55..d3383cbf44 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDisabledMultiselectTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDisabledMultiselectTest.java @@ -70,11 +70,10 @@ public class GridDisabledMultiselectTest extends MultiBrowserTest { setMultiselect(); disable(); - WebElement firstCheckBoxSpan - = findElements(By.cssSelector("span")).get(1); - new Actions(driver).moveToElement(firstCheckBoxSpan, 1, 1) - .click() - .perform(); + WebElement firstCheckBoxSpan = findElements(By.cssSelector("span")) + .get(1); + new Actions(driver).moveToElement(firstCheckBoxSpan, 1, 1).click() + .perform(); assertThat(getFirstSelectCheckBox().isSelected(), is(false)); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDisabledSideBarTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDisabledSideBarTest.java index 0f207b68f2..5ecd1d4d88 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDisabledSideBarTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDisabledSideBarTest.java @@ -29,10 +29,12 @@ public class GridDisabledSideBarTest extends GridBasicClientFeaturesTest { @Override public Boolean apply(WebDriver input) { - return !findElement(By.className("v-grid-sidebar-button")).isEnabled(); + return !findElement(By.className("v-grid-sidebar-button")) + .isEnabled(); } }); } + private void clickSideBarButton() { findElement(By.cssSelector(".v-grid-sidebar-button")).click(); } @@ -42,7 +44,8 @@ public class GridDisabledSideBarTest extends GridBasicClientFeaturesTest { } private void assertSideBarContainsClass(String cssClass) { - assertThat(findElement(By.cssSelector(".v-grid-sidebar")).getAttribute("class"), containsString(cssClass)); + assertThat(findElement(By.cssSelector(".v-grid-sidebar")) + .getAttribute("class"), containsString(cssClass)); } @Test diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java index f2e3a8e77e..24e7b57339 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java @@ -42,8 +42,8 @@ public class GridDragSelectionWhileScrolledTest extends MultiBrowserTest { // Scroll grid to view GridElement grid = $(GridElement.class).first(); - ((JavascriptExecutor) getDriver()).executeScript( - "arguments[0].scrollIntoView(true);", grid); + ((JavascriptExecutor) getDriver()) + .executeScript("arguments[0].scrollIntoView(true);", grid); // Drag select 2 rows new Actions(getDriver()).moveToElement(grid.getCell(3, 0), 5, 5) @@ -53,7 +53,9 @@ public class GridDragSelectionWhileScrolledTest extends MultiBrowserTest { // Assert only those are selected. assertTrue("Row 3 should be selected", grid.getRow(3).isSelected()); assertTrue("Row 2 should be selected", grid.getRow(2).isSelected()); - assertFalse("Row 4 should not be selected", grid.getRow(4).isSelected()); - assertFalse("Row 1 should not be selected", grid.getRow(1).isSelected()); + assertFalse("Row 4 should not be selected", + grid.getRow(4).isSelected()); + assertFalse("Row 1 should not be selected", + grid.getRow(1).isSelected()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java index 8a67d180c6..3d0bfe3aa9 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java @@ -32,7 +32,7 @@ public class GridEditingWithNoScrollBarsTest extends MultiBrowserTest { GridElement grid = $(GridElement.class).first(); grid.getCell(1, 1).doubleClick(); - assertEquals(grid.getEditor().getSize().width, grid.getTableWrapper() - .getSize().width); + assertEquals(grid.getEditor().getSize().width, + grid.getTableWrapper().getSize().width); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java index 75d71a3c40..480f5af032 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java @@ -71,8 +71,7 @@ public class GridEditorFrozenColumnsUITest extends MultiBrowserTest { } private WebElement getGridHorizontalScrollbar() { - return getDriver() - .findElement( - By.xpath("//div[contains(@class, \"v-grid-scroller-horizontal\")]")); + return getDriver().findElement(By.xpath( + "//div[contains(@class, \"v-grid-scroller-horizontal\")]")); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java index 9b53766d96..a2175ca37f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java @@ -40,18 +40,19 @@ public class GridEditorMultiselectTest extends MultiBrowserTest { private GridElement openEditor() { GridElement grid = $(GridElement.class).first(); grid.getRow(0).doubleClick(); - Assert.assertTrue("Grid editor should be displayed.", grid.getEditor() - .isDisplayed()); + Assert.assertTrue("Grid editor should be displayed.", + grid.getEditor().isDisplayed()); return grid; } private void assertCheckboxesEnabled(GridElement grid, boolean isEnabled) { - List<WebElement> checkboxes = grid.findElements(By - .xpath("//input[@type='checkbox']")); + List<WebElement> checkboxes = grid + .findElements(By.xpath("//input[@type='checkbox']")); for (WebElement checkbox : checkboxes) { - Assert.assertEquals("Select checkboxes should be " - + (isEnabled ? "enabled" : "disabled"), isEnabled, - checkbox.isEnabled()); + Assert.assertEquals( + "Select checkboxes should be " + + (isEnabled ? "enabled" : "disabled"), + isEnabled, checkbox.isEnabled()); } } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java index d50879e65e..a5d62232e4 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java @@ -34,8 +34,8 @@ public class GridGeneratedPropertiesTest extends MultiBrowserTest { public void testMilesColumnExists() { openTestURL(); GridElement grid = $(GridElement.class).first(); - assertEquals("Miles header wasn't present.", "miles", grid - .getHeaderCell(0, 2).getText().toLowerCase()); + assertEquals("Miles header wasn't present.", "miles", + grid.getHeaderCell(0, 2).getText().toLowerCase()); } @Test @@ -46,14 +46,14 @@ public class GridGeneratedPropertiesTest extends MultiBrowserTest { // Overwritten foo property should not be sortable GridCellElement fooHeader = grid.getHeaderCell(0, 0); fooHeader.click(); - assertFalse("Column foo was unexpectedly sorted.", fooHeader - .getAttribute("class").contains("sort")); + assertFalse("Column foo was unexpectedly sorted.", + fooHeader.getAttribute("class").contains("sort")); // Generated property miles is not sortable GridCellElement milesHeader = grid.getHeaderCell(0, 2); milesHeader.click(); - assertFalse("Column miles was unexpectedly sorted.", milesHeader - .getAttribute("class").contains("sort")); + assertFalse("Column miles was unexpectedly sorted.", + milesHeader.getAttribute("class").contains("sort")); } @Test @@ -64,11 +64,11 @@ public class GridGeneratedPropertiesTest extends MultiBrowserTest { // Generated property baz is sortable GridCellElement bazHeader = grid.getHeaderCell(0, 3); bazHeader.click(); - assertTrue("Column baz was not sorted ascending", bazHeader - .getAttribute("class").contains("sort-asc")); + assertTrue("Column baz was not sorted ascending", + bazHeader.getAttribute("class").contains("sort-asc")); bazHeader.click(); - assertTrue("Column baz was not sorted descending", bazHeader - .getAttribute("class").contains("sort-desc")); + assertTrue("Column baz was not sorted descending", + bazHeader.getAttribute("class").contains("sort-desc")); } @Test @@ -82,8 +82,8 @@ public class GridGeneratedPropertiesTest extends MultiBrowserTest { GridCellElement kmHeader = grid.getHeaderCell(0, 1); assertFalse("Column km was unexpectedly sorted", - kmHeader.getAttribute("class").contains("sort-asc") - || kmHeader.getAttribute("class").contains("sort-desc")); + kmHeader.getAttribute("class").contains("sort-asc") || kmHeader + .getAttribute("class").contains("sort-desc")); assertFalse("Unexpected client-side exception was visible", isElementPresent(NotificationElement.class)); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFooterComponentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFooterComponentsTest.java index e8d3abf42d..19c1bf637d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFooterComponentsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFooterComponentsTest.java @@ -62,7 +62,8 @@ public class GridHeaderFooterComponentsTest extends SingleBrowserTest { assertNoErrorNotifications(); } - private TextFieldElement getHeaderElement(GridElement grid, int row, int col) { + private TextFieldElement getHeaderElement(GridElement grid, int row, + int col) { GridCellElement cell = grid.getHeaderCell(row, col); List<TextFieldElement> all = cell.$(TextFieldElement.class).all(); if (all.size() == 0) { @@ -71,8 +72,8 @@ public class GridHeaderFooterComponentsTest extends SingleBrowserTest { return all.get(0); } else { throw new RuntimeException( - "Multiple elements found in the header cell at " + row - + "," + col); + "Multiple elements found in the header cell at " + row + "," + + col); } } @@ -99,7 +100,8 @@ public class GridHeaderFooterComponentsTest extends SingleBrowserTest { assertNoErrorNotifications(); } - private TextFieldElement getFooterElement(GridElement grid, int row, int col) { + private TextFieldElement getFooterElement(GridElement grid, int row, + int col) { GridCellElement cell = grid.getFooterCell(row, col); List<TextFieldElement> all = cell.$(TextFieldElement.class).all(); if (all.size() == 0) { @@ -108,8 +110,8 @@ public class GridHeaderFooterComponentsTest extends SingleBrowserTest { return all.get(0); } else { throw new RuntimeException( - "Multiple elements found in the footer cell at " + row - + "," + col); + "Multiple elements found in the footer cell at " + row + "," + + col); } } @@ -121,18 +123,16 @@ public class GridHeaderFooterComponentsTest extends SingleBrowserTest { // Remove Header $(GridElement.class).first().getHeaderCell(i, 0) .$(ButtonElement.class).first().click(); - assertFalse( - "Header " + i + " should not be present.", - $(GridElement.class).first().isElementPresent( - By.vaadin("#header[" + i + "]"))); + assertFalse("Header " + i + " should not be present.", + $(GridElement.class).first() + .isElementPresent(By.vaadin("#header[" + i + "]"))); // Remove Footer $(GridElement.class).first().getFooterCell(i, 0) .$(ButtonElement.class).first().click(); - assertFalse( - "Footer " + i + " should not be present.", - $(GridElement.class).first().isElementPresent( - By.vaadin("#footer[" + i + "]"))); + assertFalse("Footer " + i + " should not be present.", + $(GridElement.class).first() + .isElementPresent(By.vaadin("#footer[" + i + "]"))); } assertNoErrorNotifications(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFormatChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFormatChangeTest.java index 0e2a3d6ac6..fe0f21f63e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFormatChangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFormatChangeTest.java @@ -34,16 +34,15 @@ public class GridHeaderFormatChangeTest extends MultiBrowserTest { // Assert that we do not have the select all checkbox Assert.assertTrue( - "Found input in header even though none should exist.", grid - .getHeader().findElements(By.tagName("input")) - .isEmpty()); + "Found input in header even though none should exist.", + grid.getHeader().findElements(By.tagName("input")).isEmpty()); // Set grid into multiselection mode toggleSelectionMode(); // Assert that we now have a select all checkbox in the header - Assert.assertFalse("Expected one input field in header", grid - .getHeader().findElements(By.tagName("input")).isEmpty()); + Assert.assertFalse("Expected one input field in header", + grid.getHeader().findElements(By.tagName("input")).isEmpty()); // Hide the firstName column from the grid. toggleFirstName(); @@ -57,9 +56,8 @@ public class GridHeaderFormatChangeTest extends MultiBrowserTest { // Assert that we still have the select all checkbox in the header. Assert.assertFalse( - "Header was missing checkbox after bringing back column", grid - .getHeader().findElements(By.tagName("input")) - .isEmpty()); + "Header was missing checkbox after bringing back column", + grid.getHeader().findElements(By.tagName("input")).isEmpty()); } @Test @@ -69,16 +67,15 @@ public class GridHeaderFormatChangeTest extends MultiBrowserTest { // Assert that we do not have the select all checkbox Assert.assertTrue( - "Found input in header even though none should exist.", grid - .getHeader().findElements(By.tagName("input")) - .isEmpty()); + "Found input in header even though none should exist.", + grid.getHeader().findElements(By.tagName("input")).isEmpty()); // Set grid into multiselection mode toggleSelectionMode(); // Assert that we now have a select all checkbox in the header - Assert.assertFalse("Expected one input field in header", grid - .getHeader().findElements(By.tagName("input")).isEmpty()); + Assert.assertFalse("Expected one input field in header", + grid.getHeader().findElements(By.tagName("input")).isEmpty()); // Add Join columns header toggleJoin(); @@ -92,9 +89,8 @@ public class GridHeaderFormatChangeTest extends MultiBrowserTest { // Assert that we still have the select all checkbox in the header. Assert.assertFalse( - "Header was missing checkbox after bringing back column", grid - .getHeader().findElements(By.tagName("input")) - .isEmpty()); + "Header was missing checkbox after bringing back column", + grid.getHeader().findElements(By.tagName("input")).isEmpty()); } @Test @@ -104,16 +100,15 @@ public class GridHeaderFormatChangeTest extends MultiBrowserTest { // Assert that we do not have the select all checkbox Assert.assertTrue( - "Found input in header even though none should exist.", grid - .getHeader().findElements(By.tagName("input")) - .isEmpty()); + "Found input in header even though none should exist.", + grid.getHeader().findElements(By.tagName("input")).isEmpty()); // Set grid into multiselection mode toggleSelectionMode(); // Assert that we now have a select all checkbox in the header - Assert.assertFalse("Should not be selected after adding", grid - .getHeader().findElement(By.tagName("input")).isSelected()); + Assert.assertFalse("Should not be selected after adding", + grid.getHeader().findElement(By.tagName("input")).isSelected()); grid.getHeader().findElement(By.tagName("input")).click(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderStyleNamesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderStyleNamesTest.java index 6dffe16a40..427d0dc854 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderStyleNamesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderStyleNamesTest.java @@ -58,8 +58,8 @@ public class GridHeaderStyleNamesTest extends SingleBrowserTest { @Test public void cellStyleNamesCanBeAddedAndRemoved() { - ButtonElement toggleStyles = $(ButtonElement.class).caption( - "Toggle styles").first(); + ButtonElement toggleStyles = $(ButtonElement.class) + .caption("Toggle styles").first(); assertStylesSet(true); toggleStyles.click(); @@ -70,8 +70,8 @@ public class GridHeaderStyleNamesTest extends SingleBrowserTest { @Test public void rowStyleNamesCanBeAddedAndRemoved() { - ButtonElement toggleStyles = $(ButtonElement.class).caption( - "Toggle styles").first(); + ButtonElement toggleStyles = $(ButtonElement.class) + .caption("Toggle styles").first(); assertRowStylesSet(true); toggleStyles.click(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeightTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeightTest.java index 14ad0224d6..bc36472b4a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeightTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeightTest.java @@ -83,11 +83,11 @@ public class GridHeightTest extends MultiBrowserTest { } else { caption = (String) gridHeight; } - $(OptionGroupElement.class).id("gridHeightSelector").selectByText( - caption); + $(OptionGroupElement.class).id("gridHeightSelector") + .selectByText(caption); for (String gridWidth : GridHeight.gridWidths) { - $(OptionGroupElement.class).id("gridWidthSelector").selectByText( - gridWidth); + $(OptionGroupElement.class).id("gridWidthSelector") + .selectByText(gridWidth); for (String detailsRowHeight : GridHeight.detailsRowHeights) { $(OptionGroupElement.class).id("detailsHeightSelector") .selectByText(detailsRowHeight); @@ -110,9 +110,8 @@ public class GridHeightTest extends MultiBrowserTest { int openHeight = grid.getSize().getHeight(); try { // check height with details row opened - assertGridHeight( - getExpectedOpenedHeight(gridHeight, - detailsRowHeight), openHeight); + assertGridHeight(getExpectedOpenedHeight(gridHeight, + detailsRowHeight), openHeight); } catch (AssertionError e) { errors.put(e, new Object[] { gridHeight, gridWidth, detailsRowHeight, "opened" }); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInTabSheetTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInTabSheetTest.java index f9f8d1309b..251ab47949 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInTabSheetTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInTabSheetTest.java @@ -41,8 +41,8 @@ public class GridInTabSheetTest extends MultiBrowserTest { for (int i = 0; i < 3; ++i) { addGridRow(); - assertEquals("" + (100 + i), getGridElement().getCell(i, 1) - .getText()); + assertEquals("" + (100 + i), + getGridElement().getCell(i, 1).getText()); } assertNoNotification(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInWindowResizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInWindowResizeTest.java index ae4914bf1c..440af1e8af 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInWindowResizeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInWindowResizeTest.java @@ -31,8 +31,8 @@ public class GridInWindowResizeTest extends MultiBrowserTest { @Override public List<DesiredCapabilities> getBrowsersToTest() { // Must test on a browser with animations - return Collections.singletonList(Browser.CHROME - .getDesiredCapabilities()); + return Collections + .singletonList(Browser.CHROME.getDesiredCapabilities()); } @Test diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java index 732cd4aa41..4a44e7db0f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java @@ -53,8 +53,8 @@ public class GridInitiallyHiddenColumnsTest extends SingleBrowserTest { // TODO: as to the getX methods reuse ones from GridBasicFeaturesTest? protected WebElement getSidebarOpenButton(GridElement grid) { - List<WebElement> elements = grid.findElements(By - .className("v-grid-sidebar-button")); + List<WebElement> elements = grid + .findElements(By.className("v-grid-sidebar-button")); return elements.isEmpty() ? null : elements.get(0); } @@ -62,10 +62,11 @@ public class GridInitiallyHiddenColumnsTest extends SingleBrowserTest { * Returns the toggle inside the sidebar for hiding the column at the given * index, or null if not found. */ - protected WebElement getColumnHidingToggle(GridElement grid, String caption) { + protected WebElement getColumnHidingToggle(GridElement grid, + String caption) { WebElement sidebar = getSidebar(grid); - List<WebElement> elements = sidebar.findElements(By - .className("column-hiding-toggle")); + List<WebElement> elements = sidebar + .findElements(By.className("column-hiding-toggle")); for (WebElement e : elements) { if (caption.equalsIgnoreCase(e.getText())) { return e; @@ -75,8 +76,8 @@ public class GridInitiallyHiddenColumnsTest extends SingleBrowserTest { } protected WebElement getSidebar(GridElement grid) { - List<WebElement> elements = findElements(By - .className("v-grid-sidebar-popup")); + List<WebElement> elements = findElements( + By.className("v-grid-sidebar-popup")); return elements.isEmpty() ? null : elements.get(0); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridItemSetChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridItemSetChangeTest.java index dca1d71cb5..868bb47473 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridItemSetChangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridItemSetChangeTest.java @@ -30,12 +30,12 @@ public class GridItemSetChangeTest extends SingleBrowserTest { openTestURL(); GridElement grid = $(GridElement.class).first(); - assertEquals("Last name initially wrong", "Bar", grid.getCell(0, 1) - .getText()); + assertEquals("Last name initially wrong", "Bar", + grid.getCell(0, 1).getText()); $(ButtonElement.class).caption("Modify").first().click(); - assertEquals("Last name was not updated", "Spam", grid.getCell(0, 1) - .getText()); + assertEquals("Last name was not updated", "Spam", + grid.getCell(0, 1).getText()); $(ButtonElement.class).caption("Reset").first().click(); assertEquals("Last name was not updated on reset", "Baz", diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java index 5fe2ff0cc3..0937ad3a7b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java @@ -58,7 +58,8 @@ public class GridLayoutDetailsRowTest extends MultiBrowserTest { private void assertLabelHeight(String id, double expectedHeight) { // 1px leeway for calculations - assertThat("Unexpected label height.", (double) $(LabelElement.class) - .id(id).getSize().height, closeTo(expectedHeight, 1d)); + assertThat("Unexpected label height.", + (double) $(LabelElement.class).id(id).getSize().height, + closeTo(expectedHeight, 1d)); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java index cf85f4eecd..de827234a0 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java @@ -31,8 +31,7 @@ public class GridMultiSelectionScrollBarTest extends MultiBrowserTest { setDebug(true); openTestURL(); - assertTrue( - "Horizontal scrollbar should not be visible.", + assertTrue("Horizontal scrollbar should not be visible.", $(GridElement.class).first().getHorizontalScroller() .getAttribute("style").toLowerCase() .contains("display: none;")); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridRowHeightChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridRowHeightChangeTest.java index 1e1cab5577..faba380fab 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridRowHeightChangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridRowHeightChangeTest.java @@ -13,8 +13,8 @@ import static org.junit.Assert.assertEquals; public class GridRowHeightChangeTest extends MultiBrowserTest { - private final List<String> themes = Arrays - .asList("valo", "reindeer", "runo", "chameleon", "base"); + private final List<String> themes = Arrays.asList("valo", "reindeer", + "runo", "chameleon", "base"); @Override public void setup() throws Exception { @@ -32,8 +32,8 @@ public class GridRowHeightChangeTest extends MultiBrowserTest { int gridHeight = grid.getSize().getHeight(); int tabsheetHeight = findElements( - By.className("v-tabsheet-content")) - .get(0).getSize().getHeight(); + By.className("v-tabsheet-content")).get(0).getSize() + .getHeight(); assertEquals("Grid's visible height should be equal to Grid height", gridHeight, tabsheetHeight, 1); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllCellTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllCellTest.java index 423a9f419b..7b0e33cc6c 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllCellTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllCellTest.java @@ -24,11 +24,14 @@ public class GridSelectAllCellTest extends MultiBrowserTest { @Test public void selectAllCellCanBeClicked() throws IOException { - GridElement.GridCellElement selectAllCell = $(GridElement.class).first().getHeaderCell(0, 0); + GridElement.GridCellElement selectAllCell = $(GridElement.class).first() + .getHeaderCell(0, 0); - new Actions(getDriver()).moveToElement(selectAllCell, 2, 2).click().perform(); + new Actions(getDriver()).moveToElement(selectAllCell, 2, 2).click() + .perform(); - WebElement selectAllCheckbox = selectAllCell.findElement(By.cssSelector("input")); + WebElement selectAllCheckbox = selectAllCell + .findElement(By.cssSelector("input")); assertThat(selectAllCheckbox.isSelected(), is(true)); } }
\ No newline at end of file diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSidebarPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSidebarPositionTest.java index 88771b50ca..5eebb7ff4b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSidebarPositionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSidebarPositionTest.java @@ -33,21 +33,21 @@ public class GridSidebarPositionTest extends MultiBrowserTest { @Test public void heightRestrictedToBrowserWindow() { openTestURL(); - GridElement gridWithVeryManyColumns = $(GridElement.class).id( - GridSidebarPosition.POPUP_WINDOW_HEIGHT); + GridElement gridWithVeryManyColumns = $(GridElement.class) + .id(GridSidebarPosition.POPUP_WINDOW_HEIGHT); getSidebarOpenButton(gridWithVeryManyColumns).click(); Dimension popupSize = getSidebarPopup().getSize(); Dimension browserWindowSize = getDriver().manage().window().getSize(); - Assert.assertTrue(popupSize.getHeight() <= browserWindowSize - .getHeight()); + Assert.assertTrue( + popupSize.getHeight() <= browserWindowSize.getHeight()); } @Test public void popupNotBelowBrowserWindow() { openTestURL(); - GridElement gridAtBottom = $(GridElement.class).id( - GridSidebarPosition.POPUP_WINDOW_MOVED_UP); + GridElement gridAtBottom = $(GridElement.class) + .id(GridSidebarPosition.POPUP_WINDOW_MOVED_UP); getSidebarOpenButton(gridAtBottom).click(); WebElement sidebarPopup = getSidebarPopup(); Dimension popupSize = sidebarPopup.getSize(); @@ -61,8 +61,8 @@ public class GridSidebarPositionTest extends MultiBrowserTest { @Test public void popupAbove() { openTestURL(); - GridElement gridPopupAbove = $(GridElement.class).id( - GridSidebarPosition.POPUP_ABOVE); + GridElement gridPopupAbove = $(GridElement.class) + .id(GridSidebarPosition.POPUP_ABOVE); WebElement sidebarOpenButton = getSidebarOpenButton(gridPopupAbove); sidebarOpenButton.click(); WebElement sidebarPopup = getSidebarPopup(); @@ -81,14 +81,14 @@ public class GridSidebarPositionTest extends MultiBrowserTest { } protected WebElement getSidebarOpenButton(GridElement grid) { - List<WebElement> elements = grid.findElements(By - .className("v-grid-sidebar-button")); + List<WebElement> elements = grid + .findElements(By.className("v-grid-sidebar-button")); return elements.isEmpty() ? null : elements.get(0); } protected WebElement getSidebarPopup() { - List<WebElement> elements = findElements(By - .className("v-grid-sidebar-popup")); + List<WebElement> elements = findElements( + By.className("v-grid-sidebar-popup")); return elements.isEmpty() ? null : elements.get(0); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSingleColumnTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSingleColumnTest.java index a3fbb00cf2..0c01ef97c2 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSingleColumnTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSingleColumnTest.java @@ -32,8 +32,8 @@ public class GridSingleColumnTest extends MultiBrowserTest { openTestURL(); GridCellElement cell = $(GridElement.class).first().getHeaderCell(0, 0); - Assert.assertTrue("No header available", cell.getText() - .equalsIgnoreCase("header")); + Assert.assertTrue("No header available", + cell.getText().equalsIgnoreCase("header")); } @Test diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSpacerDecoClipTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSpacerDecoClipTest.java index f08ab7a8a4..5c1ebb6157 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSpacerDecoClipTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSpacerDecoClipTest.java @@ -92,7 +92,7 @@ public class GridSpacerDecoClipTest extends MultiBrowserTest { private TestBenchElement getSpacerDeco(int index) { SearchContext context = getContext(); - return (TestBenchElement) context.findElements( - By.className(SPACER_CSS_CLASS_DECO)).get(index); + return (TestBenchElement) context + .findElements(By.className(SPACER_CSS_CLASS_DECO)).get(index); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidgetRendererChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidgetRendererChangeTest.java index 5098a0e7d8..2addd07b64 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidgetRendererChangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidgetRendererChangeTest.java @@ -56,8 +56,8 @@ public class GridWidgetRendererChangeTest extends SingleBrowserTest { @Override protected WebElement getMenuElement(String menuCaption) { - return getDriver().findElement( - By.xpath("//td[text() = '" + menuCaption + "']")); + return getDriver() + .findElement(By.xpath("//td[text() = '" + menuCaption + "']")); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidthIncreaseTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidthIncreaseTest.java index 6f39253fb0..64a2b20aa7 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidthIncreaseTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidthIncreaseTest.java @@ -63,8 +63,8 @@ public class GridWidthIncreaseTest extends MultiBrowserTest { * Selenium doesn't support subpixels correctly, we use a rough * estimation. */ - assertEquals(grid.getRow(0).getSize().getWidth(), grid - .getTableWrapper().getSize().getWidth(), accuracy); + assertEquals(grid.getRow(0).getSize().getWidth(), + grid.getTableWrapper().getSize().getWidth(), accuracy); } } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithoutRendererTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithoutRendererTest.java index fc93e99188..44eb23a886 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithoutRendererTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithoutRendererTest.java @@ -34,8 +34,8 @@ public class GridWithoutRendererTest extends SingleBrowserTest { // WebElement errorIndicator = findElement(By // .cssSelector("v-error-indicator")); // System.out.println(errorIndicator); - List<WebElement> errorIndicator = findElements(By - .xpath("//span[@class='v-errorindicator']")); + List<WebElement> errorIndicator = findElements( + By.xpath("//span[@class='v-errorindicator']")); Assert.assertTrue("There should not be an error indicator", errorIndicator.isEmpty()); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java index 917245188a..047c34e213 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java @@ -46,7 +46,7 @@ public class JavaScriptRenderersTest extends MultiBrowserTest { // Verify onbrowserevent cell_1_1.click(); - Assert.assertTrue(cell_1_1.getText().startsWith( - "Clicked 1 with key 2 at")); + Assert.assertTrue( + cell_1_1.getText().startsWith("Clicked 1 with key 2 at")); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/NullHeadersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/NullHeadersTest.java index 55f1238326..de871e2a7b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/NullHeadersTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/NullHeadersTest.java @@ -41,7 +41,8 @@ public class NullHeadersTest extends SingleBrowserTest { private void assertRow(GridElement grid, int row, String... contents) { for (int col = 0; col < contents.length; col++) { - Assert.assertEquals(contents[col], grid.getCell(row, col).getText()); + Assert.assertEquals(contents[col], + grid.getCell(row, col).getText()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/ProgrammaticEditorControlTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/ProgrammaticEditorControlTest.java index efbc164e15..43c6deae30 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/ProgrammaticEditorControlTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/ProgrammaticEditorControlTest.java @@ -47,8 +47,8 @@ public class ProgrammaticEditorControlTest extends SingleBrowserTest { } private void assertEditorFieldContents(GridElement grid, String text) { - TextFieldElement editorField = wrap(TextFieldElement.class, grid - .getEditor().getField(0)); + TextFieldElement editorField = wrap(TextFieldElement.class, + grid.getEditor().getField(0)); Assert.assertEquals(text, editorField.getValue()); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/WidgetRenderersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/WidgetRenderersTest.java index 063d05b735..3835922645 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/WidgetRenderersTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/WidgetRenderersTest.java @@ -51,14 +51,14 @@ public class WidgetRenderersTest extends MultiBrowserTest { @Test public void testProgressBarRenderer() { - assertTrue(getGridCell(0, 0).isElementPresent( - By.className("v-progressbar"))); + assertTrue(getGridCell(0, 0) + .isElementPresent(By.className("v-progressbar"))); } @Test public void testButtonRenderer() { - WebElement button = getGridCell(0, 1).findElement( - By.className("v-nativebutton")); + WebElement button = getGridCell(0, 1) + .findElement(By.className("v-nativebutton")); button.click(); @@ -76,10 +76,10 @@ public class WidgetRenderersTest extends MultiBrowserTest { assertTrue("cell should be focused after focusing", buttonCell.isFocused()); - WebElement button = buttonCell.findElement(By - .className("v-nativebutton")); - assertNotEquals("Button should not be clicked before click", - "Clicked!", button.getText()); + WebElement button = buttonCell + .findElement(By.className("v-nativebutton")); + assertNotEquals("Button should not be clicked before click", "Clicked!", + button.getText()); new Actions(getDriver()).moveToElement(button).click().perform(); @@ -88,8 +88,8 @@ public class WidgetRenderersTest extends MultiBrowserTest { @Test public void testImageRenderer() { - final WebElement image = getGridCell(0, 2).findElement( - By.className("gwt-Image")); + final WebElement image = getGridCell(0, 2) + .findElement(By.className("gwt-Image")); waitUntilmageSrcEndsWith(image, "window/img/close.png"); @@ -110,9 +110,9 @@ public class WidgetRenderersTest extends MultiBrowserTest { @Override public String toString() { // Timed out after 10 seconds waiting for ... - return String - .format("image source to update. Supposed to end with '%s' (was: '%s').", - expectedText, image.getAttribute("src")); + return String.format( + "image source to update. Supposed to end with '%s' (was: '%s').", + expectedText, image.getAttribute("src")); } }); } @@ -124,18 +124,18 @@ public class WidgetRenderersTest extends MultiBrowserTest { assertFalse("Notification was present", isElementPresent(NotificationElement.class)); - assertTrue(getGridCell(0, 0) - .isElementPresent(By.className("gwt-Image"))); - assertTrue(getGridCell(0, 1).isElementPresent( - By.className("v-progressbar"))); - assertTrue(getGridCell(0, 2).isElementPresent( - By.className("v-nativebutton"))); + assertTrue( + getGridCell(0, 0).isElementPresent(By.className("gwt-Image"))); + assertTrue(getGridCell(0, 1) + .isElementPresent(By.className("v-progressbar"))); + assertTrue(getGridCell(0, 2) + .isElementPresent(By.className("v-nativebutton"))); } @Test public void testPropertyIdInEvent() { - WebElement button = getGridCell(0, 3).findElement( - By.className("v-nativebutton")); + WebElement button = getGridCell(0, 3) + .findElement(By.className("v-nativebutton")); button.click(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java index 5367d32328..a5d659e1ac 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java @@ -30,7 +30,8 @@ import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; @TestCategory("grid") -public abstract class EscalatorBasicClientFeaturesTest extends MultiBrowserTest { +public abstract class EscalatorBasicClientFeaturesTest + extends MultiBrowserTest { private static final String LOGICAL_ROW_ATTRIBUTE_NAME = "vLogicalRow"; private static final String SPACER_CSS_CLASS = "v-escalator-spacer"; @@ -217,8 +218,8 @@ public abstract class EscalatorBasicClientFeaturesTest extends MultiBrowserTest @Override protected WebElement getMenuElement(String menuCaption) { - return getDriver().findElement( - By.xpath("//td[text() = '" + menuCaption + "']")); + return getDriver() + .findElement(By.xpath("//td[text() = '" + menuCaption + "']")); } protected void assertLogContains(String substring) { @@ -261,8 +262,8 @@ public abstract class EscalatorBasicClientFeaturesTest extends MultiBrowserTest } private TestBenchElement getVerticalScrollbar() { - return (TestBenchElement) getEscalator().findElement( - By.className("v-escalator-scroller-vertical")); + return (TestBenchElement) getEscalator() + .findElement(By.className("v-escalator-scroller-vertical")); } protected void scrollHorizontallyTo(int px) { @@ -275,8 +276,8 @@ public abstract class EscalatorBasicClientFeaturesTest extends MultiBrowserTest } protected TestBenchElement getHorizontalScrollbar() { - return (TestBenchElement) getEscalator().findElement( - By.className("v-escalator-scroller-horizontal")); + return (TestBenchElement) getEscalator() + .findElement(By.className("v-escalator-scroller-horizontal")); } @Override diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java index 0a1b1735fa..1c0061d2eb 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java @@ -29,7 +29,8 @@ import com.vaadin.tests.components.grid.basicfeatures.element.CustomGridElement; * @since * @author Vaadin Ltd */ -public abstract class GridBasicClientFeaturesTest extends GridBasicFeaturesTest { +public abstract class GridBasicClientFeaturesTest + extends GridBasicFeaturesTest { private boolean composite = false; @@ -59,17 +60,17 @@ public abstract class GridBasicClientFeaturesTest extends GridBasicFeaturesTest @Override protected WebElement getMenuElement(String menuCaption) { - return getDriver().findElement( - By.xpath("//td[text() = '" + menuCaption + "']")); + return getDriver() + .findElement(By.xpath("//td[text() = '" + menuCaption + "']")); } @Override protected CustomGridElement getGridElement() { if (composite) { // Composite requires the basic client features widget for subparts - return ((TestBenchElement) findElement(By - .vaadin("//TestWidgetComponent"))) - .wrap(CustomGridElement.class); + return ((TestBenchElement) findElement( + By.vaadin("//TestWidgetComponent"))) + .wrap(CustomGridElement.class); } else { return super.getGridElement(); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java index 640c4a448b..7b7d2a4ad3 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java @@ -87,8 +87,8 @@ public abstract class GridBasicFeaturesTest extends MultiBrowserTest { } protected WebElement getEditor() { - List<WebElement> elems = getGridElement().findElements( - By.className("v-grid-editor")); + List<WebElement> elems = getGridElement() + .findElements(By.className("v-grid-editor")); assertLessThanOrEqual("number of editors", elems.size(), 1); @@ -108,15 +108,13 @@ public abstract class GridBasicFeaturesTest extends MultiBrowserTest { } protected WebElement getGridVerticalScrollbar() { - return getDriver() - .findElement( - By.xpath("//div[contains(@class, \"v-grid-scroller-vertical\")]")); + return getDriver().findElement(By.xpath( + "//div[contains(@class, \"v-grid-scroller-vertical\")]")); } protected WebElement getGridHorizontalScrollbar() { - return getDriver() - .findElement( - By.xpath("//div[contains(@class, \"v-grid-scroller-horizontal\")]")); + return getDriver().findElement(By.xpath( + "//div[contains(@class, \"v-grid-scroller-horizontal\")]")); } /** @@ -148,25 +146,25 @@ public abstract class GridBasicFeaturesTest extends MultiBrowserTest { protected void assertColumnHeader(String expectedHeaderCaption, TestBenchElement testBenchElement) { - assertEquals(expectedHeaderCaption.toLowerCase(), testBenchElement - .getText().toLowerCase()); + assertEquals(expectedHeaderCaption.toLowerCase(), + testBenchElement.getText().toLowerCase()); } protected GridCellElement getDefaultColumnHeader(int index) { - List<GridCellElement> headerRowCells = getGridElement().getHeaderCells( - 0); + List<GridCellElement> headerRowCells = getGridElement() + .getHeaderCells(0); return headerRowCells.get(index); } protected void dragAndDropDefaultColumnHeader(int draggedColumnHeaderIndex, int onTopOfColumnHeaderIndex, CellSide cellSide) { - GridCellElement columnHeader = getDefaultColumnHeader(onTopOfColumnHeaderIndex); + GridCellElement columnHeader = getDefaultColumnHeader( + onTopOfColumnHeaderIndex); new Actions(getDriver()) .clickAndHold(getDefaultColumnHeader(draggedColumnHeaderIndex)) - .moveToElement( - columnHeader, - getHorizontalOffsetForDragAndDrop(columnHeader, - cellSide), 0).release().perform(); + .moveToElement(columnHeader, getHorizontalOffsetForDragAndDrop( + columnHeader, cellSide), 0) + .release().perform(); } private int getHorizontalOffsetForDragAndDrop(GridCellElement columnHeader, @@ -185,13 +183,12 @@ public abstract class GridBasicFeaturesTest extends MultiBrowserTest { GridCellElement headerCell = getGridElement().getHeaderCell(headerRow, onTopOfColumnHeaderIndex); new Actions(getDriver()) - .clickAndHold( - getGridElement().getHeaderCell(headerRow, - draggedColumnHeaderIndex)) - .moveToElement( - headerCell, + .clickAndHold(getGridElement().getHeaderCell(headerRow, + draggedColumnHeaderIndex)) + .moveToElement(headerCell, getHorizontalOffsetForDragAndDrop(headerCell, cellSide), - 0).release().perform(); + 0) + .release().perform(); } protected void dragAndDropColumnHeader(int headerRow, @@ -200,9 +197,8 @@ public abstract class GridBasicFeaturesTest extends MultiBrowserTest { GridCellElement headerCell = getGridElement().getHeaderCell(headerRow, onTopOfColumnHeaderIndex); new Actions(getDriver()) - .clickAndHold( - getGridElement().getHeaderCell(headerRow, - draggedColumnHeaderIndex)) + .clickAndHold(getGridElement().getHeaderCell(headerRow, + draggedColumnHeaderIndex)) .moveToElement(headerCell, horizontalOffset, 0).release() .perform(); } @@ -218,8 +214,8 @@ public abstract class GridBasicFeaturesTest extends MultiBrowserTest { } protected WebElement getSidebarPopup() { - List<WebElement> elements = findElements(By - .className("v-grid-sidebar-popup")); + List<WebElement> elements = findElements( + By.className("v-grid-sidebar-popup")); if (elements.isEmpty()) { getSidebarOpenButton().click(); elements = findElements(By.className("v-grid-sidebar-popup")); @@ -228,14 +224,14 @@ public abstract class GridBasicFeaturesTest extends MultiBrowserTest { } protected WebElement getSidebarPopupIfPresent() { - List<WebElement> elements = findElements(By - .className("v-grid-sidebar-popup")); + List<WebElement> elements = findElements( + By.className("v-grid-sidebar-popup")); return elements.isEmpty() ? null : elements.get(0); } protected WebElement getSidebarOpenButton() { - List<WebElement> elements = findElements(By - .className("v-grid-sidebar-button")); + List<WebElement> elements = findElements( + By.className("v-grid-sidebar-button")); return elements.isEmpty() ? null : elements.get(0); } @@ -245,10 +241,11 @@ public abstract class GridBasicFeaturesTest extends MultiBrowserTest { */ protected WebElement getColumnHidingToggle(int columnIndex) { WebElement sidebar = getSidebarPopup(); - List<WebElement> elements = sidebar.findElements(By - .className("column-hiding-toggle")); + List<WebElement> elements = sidebar + .findElements(By.className("column-hiding-toggle")); for (WebElement e : elements) { - if ((e.getText().toLowerCase()).startsWith("column " + columnIndex)) { + if ((e.getText().toLowerCase()) + .startsWith("column " + columnIndex)) { return e; } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSourcesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSourcesTest.java index c406f85c0c..4a649dd3ca 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSourcesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSourcesTest.java @@ -101,15 +101,16 @@ public class GridClientDataSourcesTest extends MultiBrowserTest { } private void assertCellPresent(String content) { - assertNotNull("A cell with content \"" + content - + "\" should've been found", findByXPath("//td[text()='" - + content + "']")); + assertNotNull( + "A cell with content \"" + content + "\" should've been found", + findByXPath("//td[text()='" + content + "']")); } private void assertCellNotPresent(String content) { - assertNull("A cell with content \"" + content - + "\" should've not been found", findByXPath("//td[text()='" - + content + "']")); + assertNull( + "A cell with content \"" + content + + "\" should've not been found", + findByXPath("//td[text()='" + content + "']")); } private void scrollToTop() { @@ -129,7 +130,8 @@ public class GridClientDataSourcesTest extends MultiBrowserTest { } private void scrollVerticallyTo(int px) { - executeScript("arguments[0].scrollTop = " + px, findVerticalScrollbar()); + executeScript("arguments[0].scrollTop = " + px, + findVerticalScrollbar()); } private Object executeScript(String script, Object args) { @@ -145,9 +147,8 @@ public class GridClientDataSourcesTest extends MultiBrowserTest { } private WebElement findVerticalScrollbar() { - return getDriver().findElement( - By.xpath("//div[contains(@class, " - + "\"v-grid-scroller-vertical\")]")); + return getDriver().findElement(By.xpath( + "//div[contains(@class, " + "\"v-grid-scroller-vertical\")]")); } @Override @@ -158,8 +159,8 @@ public class GridClientDataSourcesTest extends MultiBrowserTest { @Override protected WebElement getMenuElement(String menuCaption) { - return getDriver().findElement( - By.xpath("//td[text() = '" + menuCaption + "']")); + return getDriver() + .findElement(By.xpath("//td[text() = '" + menuCaption + "']")); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridClientHeightByRowOnInitTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridClientHeightByRowOnInitTest.java index 86686225d0..7aec919080 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridClientHeightByRowOnInitTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridClientHeightByRowOnInitTest.java @@ -13,7 +13,8 @@ public class GridClientHeightByRowOnInitTest extends MultiBrowserTest { public void gridHeightIsMoreThanACoupleOfRows() { openTestURL(); int height = findElement(By.className("v-grid")).getSize().getHeight(); - assertGreater("Grid should be much taller than 150px (was " + height - + "px)", height, 150); + assertGreater( + "Grid should be much taller than 150px (was " + height + "px)", + height, 150); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java index 02e94ec6c4..3f2bd61678 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java @@ -113,12 +113,12 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest { WebElement webElement = findElement(By.id("columnvisibility")); int counter = Integer.parseInt(webElement.getAttribute("counter")); - int columnIndex = Integer.parseInt(webElement - .getAttribute("columnindex")); - boolean userOriginated = Boolean.parseBoolean(webElement - .getAttribute("useroriginated")); - boolean hidden = Boolean.parseBoolean(webElement - .getAttribute("ishidden")); + int columnIndex = Integer + .parseInt(webElement.getAttribute("columnindex")); + boolean userOriginated = Boolean + .parseBoolean(webElement.getAttribute("useroriginated")); + boolean hidden = Boolean + .parseBoolean(webElement.getAttribute("ishidden")); assertNotNull("no event fired", webElement); assertEquals(1, counter); @@ -132,8 +132,8 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest { webElement = findElement(By.id("columnvisibility")); counter = Integer.parseInt(webElement.getAttribute("counter")); columnIndex = Integer.parseInt(webElement.getAttribute("columnIndex")); - userOriginated = Boolean.parseBoolean(webElement - .getAttribute("userOriginated")); + userOriginated = Boolean + .parseBoolean(webElement.getAttribute("userOriginated")); hidden = Boolean.parseBoolean(webElement.getAttribute("ishidden")); assertNotNull("no event fired", webElement); @@ -156,12 +156,12 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest { WebElement webElement = findElement(By.id("columnvisibility")); int counter = Integer.parseInt(webElement.getAttribute("counter")); - int columnIndex = Integer.parseInt(webElement - .getAttribute("columnindex")); - boolean userOriginated = Boolean.parseBoolean(webElement - .getAttribute("useroriginated")); - boolean hidden = Boolean.parseBoolean(webElement - .getAttribute("ishidden")); + int columnIndex = Integer + .parseInt(webElement.getAttribute("columnindex")); + boolean userOriginated = Boolean + .parseBoolean(webElement.getAttribute("useroriginated")); + boolean hidden = Boolean + .parseBoolean(webElement.getAttribute("ishidden")); assertNotNull("no event fired", webElement); assertEquals(1, counter); @@ -175,8 +175,8 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest { webElement = findElement(By.id("columnvisibility")); counter = Integer.parseInt(webElement.getAttribute("counter")); columnIndex = Integer.parseInt(webElement.getAttribute("columnIndex")); - userOriginated = Boolean.parseBoolean(webElement - .getAttribute("userOriginated")); + userOriginated = Boolean + .parseBoolean(webElement.getAttribute("userOriginated")); hidden = Boolean.parseBoolean(webElement.getAttribute("ishidden")); assertNotNull("no event fired", webElement); @@ -827,20 +827,20 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest { selectMenuPath("Component", "Row details", "Toggle details for...", "Row 1"); assertColumnHeaderOrder(0, 1, 2, 3, 4); - Assert.assertNotNull("Details not found", getGridElement() - .getDetails(1)); + Assert.assertNotNull("Details not found", + getGridElement().getDetails(1)); toggleHideColumnAPI(0); assertColumnHeaderOrder(1, 2, 3, 4); - Assert.assertNotNull("Details not found", getGridElement() - .getDetails(1)); + Assert.assertNotNull("Details not found", + getGridElement().getDetails(1)); toggleHideColumnAPI(0); assertColumnHeaderOrder(0, 1, 2, 3, 4); - Assert.assertNotNull("Details not found", getGridElement() - .getDetails(1)); + Assert.assertNotNull("Details not found", + getGridElement().getDetails(1)); } @Test @@ -884,17 +884,17 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest { toggleHideColumnAPI(1); getGridElement().scrollToRow(500); - Assert.assertEquals("(500, 0)", getGridElement().getCell(500, 0) - .getText()); - Assert.assertEquals("(500, 2)", getGridElement().getCell(500, 1) - .getText()); + Assert.assertEquals("(500, 0)", + getGridElement().getCell(500, 0).getText()); + Assert.assertEquals("(500, 2)", + getGridElement().getCell(500, 1).getText()); toggleHideColumnAPI(1); - Assert.assertEquals("(500, 0)", getGridElement().getCell(500, 0) - .getText()); - Assert.assertEquals("(500, 1)", getGridElement().getCell(500, 1) - .getText()); + Assert.assertEquals("(500, 0)", + getGridElement().getCell(500, 0).getText()); + Assert.assertEquals("(500, 1)", + getGridElement().getCell(500, 1).getText()); } @Test @@ -902,26 +902,26 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest { toggleHidableColumnAPI(0); toggleHidableColumnAPI(1); - Assert.assertEquals("(500, 0)", getGridElement().getCell(500, 0) - .getText()); - Assert.assertEquals("(500, 1)", getGridElement().getCell(500, 1) - .getText()); + Assert.assertEquals("(500, 0)", + getGridElement().getCell(500, 0).getText()); + Assert.assertEquals("(500, 1)", + getGridElement().getCell(500, 1).getText()); toggleHideColumnAPI(0); toggleHideColumnAPI(1); - Assert.assertEquals("(500, 2)", getGridElement().getCell(500, 0) - .getText()); - Assert.assertEquals("(500, 3)", getGridElement().getCell(500, 1) - .getText()); + Assert.assertEquals("(500, 2)", + getGridElement().getCell(500, 0).getText()); + Assert.assertEquals("(500, 3)", + getGridElement().getCell(500, 1).getText()); toggleHideColumnAPI(0); toggleHideColumnAPI(1); - Assert.assertEquals("(500, 0)", getGridElement().getCell(500, 0) - .getText()); - Assert.assertEquals("(500, 1)", getGridElement().getCell(500, 1) - .getText()); + Assert.assertEquals("(500, 0)", + getGridElement().getCell(500, 0).getText()); + Assert.assertEquals("(500, 1)", + getGridElement().getCell(500, 1).getText()); } private void loadSpannedCellsFixture() { @@ -955,20 +955,22 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest { } private void toggleFrozenColumns(int count) { - selectMenuPath("Component", "State", "Frozen column count", count - + " columns"); + selectMenuPath("Component", "State", "Frozen column count", + count + " columns"); } private void verifyHeaderCellColspan(int row, int column, int colspan) { try { - assertEquals(Integer.valueOf(colspan), Integer.valueOf(Integer - .parseInt(getGridElement().getHeaderCell(row, column) - .getAttribute("colspan")))); + assertEquals(Integer.valueOf(colspan), + Integer.valueOf(Integer.parseInt( + getGridElement().getHeaderCell(row, column) + .getAttribute("colspan")))); } catch (NumberFormatException nfe) { // IE8 has colSpan - assertEquals(Integer.valueOf(colspan), Integer.valueOf(Integer - .parseInt(getGridElement().getHeaderCell(row, column) - .getAttribute("colSpan")))); + assertEquals(Integer.valueOf(colspan), + Integer.valueOf(Integer.parseInt( + getGridElement().getHeaderCell(row, column) + .getAttribute("colSpan")))); } } @@ -983,8 +985,8 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest { } private void verifyHeaderCellContent(int row, int column, String content) { - GridCellElement headerCell = getGridElement() - .getHeaderCell(row, column); + GridCellElement headerCell = getGridElement().getHeaderCell(row, + column); assertEquals(content.toLowerCase(), headerCell.getText().toLowerCase()); assertTrue(headerCell.isDisplayed()); } @@ -999,12 +1001,12 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest { private void verifyColumnHidingTogglesOrder(int... indices) { WebElement sidebar = getSidebarPopup(); - List<WebElement> elements = sidebar.findElements(By - .className("column-hiding-toggle")); + List<WebElement> elements = sidebar + .findElements(By.className("column-hiding-toggle")); for (int i = 0; i < indices.length; i++) { WebElement e = elements.get(i); - assertTrue(("Header (0," + indices[i] + ")").equalsIgnoreCase(e - .getText())); + assertTrue(("Header (0," + indices[i] + ")") + .equalsIgnoreCase(e.getText())); } } @@ -1041,8 +1043,8 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest { @Override protected WebElement getColumnHidingToggle(int columnIndex) { WebElement sidebar = getSidebarPopup(); - List<WebElement> elements = sidebar.findElements(By - .className("column-hiding-toggle")); + List<WebElement> elements = sidebar + .findElements(By.className("column-hiding-toggle")); for (WebElement e : elements) { if (("Header (0," + columnIndex + ")") .equalsIgnoreCase(e.getText())) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnReorderTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnReorderTest.java index d779a5c81a..5ab4bf4d13 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnReorderTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnReorderTest.java @@ -43,10 +43,10 @@ public class GridColumnReorderTest extends GridBasicClientFeaturesTest { public void columnReorderEventTriggered() { final int firstIndex = 3; final int secondIndex = 4; - final String firstHeaderText = getGridElement().getHeaderCell(0, - firstIndex).getText(); - final String secondHeaderText = getGridElement().getHeaderCell(0, - secondIndex).getText(); + final String firstHeaderText = getGridElement() + .getHeaderCell(0, firstIndex).getText(); + final String secondHeaderText = getGridElement() + .getHeaderCell(0, secondIndex).getText(); selectMenuPath("Component", "Internals", "Listeners", "Add ColumnReorder listener"); selectMenuPath("Component", "Columns", "Column " + secondIndex, @@ -60,16 +60,16 @@ public class GridColumnReorderTest extends GridBasicClientFeaturesTest { // the reorder event should have typed the order to this label WebElement columnReorderElement = findElement(By.id("columnreorder")); - int eventIndex = Integer.parseInt(columnReorderElement - .getAttribute("columns")); + int eventIndex = Integer + .parseInt(columnReorderElement.getAttribute("columns")); assertEquals(1, eventIndex); // trigger another event selectMenuPath("Component", "Columns", "Column " + secondIndex, "Move column left"); columnReorderElement = findElement(By.id("columnreorder")); - eventIndex = Integer.parseInt(columnReorderElement - .getAttribute("columns")); + eventIndex = Integer + .parseInt(columnReorderElement.getAttribute("columns")); assertEquals(2, eventIndex); } @@ -77,10 +77,10 @@ public class GridColumnReorderTest extends GridBasicClientFeaturesTest { public void testColumnReorder_onReorder_columnReorderEventTriggered() { final int firstIndex = 3; final int secondIndex = 4; - final String firstHeaderText = getGridElement().getHeaderCell(0, - firstIndex).getText(); - final String secondHeaderText = getGridElement().getHeaderCell(0, - secondIndex).getText(); + final String firstHeaderText = getGridElement() + .getHeaderCell(0, firstIndex).getText(); + final String secondHeaderText = getGridElement() + .getHeaderCell(0, secondIndex).getText(); selectMenuPath("Component", "Internals", "Listeners", "Add ColumnReorder listener"); selectMenuPath("Component", "Columns", "Column " + secondIndex, @@ -94,16 +94,16 @@ public class GridColumnReorderTest extends GridBasicClientFeaturesTest { // the reorder event should have typed the order to this label WebElement columnReorderElement = findElement(By.id("columnreorder")); - int eventIndex = Integer.parseInt(columnReorderElement - .getAttribute("columns")); + int eventIndex = Integer + .parseInt(columnReorderElement.getAttribute("columns")); assertEquals(1, eventIndex); // trigger another event selectMenuPath("Component", "Columns", "Column " + secondIndex, "Move column left"); columnReorderElement = findElement(By.id("columnreorder")); - eventIndex = Integer.parseInt(columnReorderElement - .getAttribute("columns")); + eventIndex = Integer + .parseInt(columnReorderElement.getAttribute("columns")); assertEquals(2, eventIndex); } @@ -280,7 +280,8 @@ public class GridColumnReorderTest extends GridBasicClientFeaturesTest { toggleColumnReorder(); selectMenuPath("Component", "Header", "Append row"); selectMenuPath("Component", "Header", "Append row"); - selectMenuPath("Component", "Header", "Row 2", "Join column cells 0, 1"); + selectMenuPath("Component", "Header", "Row 2", + "Join column cells 0, 1"); selectMenuPath("Component", "Header", "Row 3", "Join columns 1, 2"); dragAndDropColumnHeader(0, 3, 0, CellSide.LEFT); assertColumnHeaderOrder(3, 0, 1, 2, 4); @@ -298,7 +299,8 @@ public class GridColumnReorderTest extends GridBasicClientFeaturesTest { toggleColumnReorder(); selectMenuPath("Component", "Header", "Append row"); selectMenuPath("Component", "Header", "Append row"); - selectMenuPath("Component", "Header", "Row 2", "Join column cells 0, 1"); + selectMenuPath("Component", "Header", "Row 2", + "Join column cells 0, 1"); selectMenuPath("Component", "Header", "Row 3", "Join columns 1, 2"); dragAndDropColumnHeader(0, 3, 0, CellSide.LEFT); assertColumnHeaderOrder(3, 0, 1, 2, 4); @@ -415,7 +417,8 @@ public class GridColumnReorderTest extends GridBasicClientFeaturesTest { toggleColumnReorder(); selectMenuPath("Component", "Footer", "Append row"); selectMenuPath("Component", "Footer", "Append row"); - selectMenuPath("Component", "Footer", "Row 1", "Join column cells 0, 1"); + selectMenuPath("Component", "Footer", "Row 1", + "Join column cells 0, 1"); selectMenuPath("Component", "Footer", "Row 2", "Join columns 1, 2"); dragAndDropColumnHeader(0, 3, 0, CellSide.LEFT); assertColumnHeaderOrder(3, 0, 1, 2, 4); @@ -500,7 +503,8 @@ public class GridColumnReorderTest extends GridBasicClientFeaturesTest { selectMenuPath("Component", "Header", "Append row"); selectMenuPath("Component", "Header", "Row 2", "Join columns 1, 2"); selectMenuPath("Component", "Header", "Append row"); - selectMenuPath("Component", "Header", "Row 3", "Join column cells 0, 1"); + selectMenuPath("Component", "Header", "Row 3", + "Join column cells 0, 1"); assertColumnHeaderOrder(0, 1, 2, 3, 4); // when diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java index ae9a8fe381..e13f4f79c4 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java @@ -50,19 +50,19 @@ public class GridDefaultTextRendererTest extends MultiBrowserTest { @Test public void testNullIsRenderedAsEmptyStringByDefaultTextRenderer() { - assertTrue("First cell should've been empty", grid.getCell(0, 0) - .getText().isEmpty()); + assertTrue("First cell should've been empty", + grid.getCell(0, 0).getText().isEmpty()); } @Test public void testStringIsRenderedAsStringByDefaultTextRenderer() { - assertEquals("Second cell should've been populated ", "string", grid - .getCell(1, 0).getText()); + assertEquals("Second cell should've been populated ", "string", + grid.getCell(1, 0).getText()); } @Test public void testWarningShouldNotBeInDebugLog() { - assertFalse("Warning visible with string content.", - isElementPresent(By.xpath("//span[contains(.,'attached:#1')]"))); + assertFalse("Warning visible with string content.", isElementPresent( + By.xpath("//span[contains(.,'attached:#1')]"))); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDescriptionGeneratorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDescriptionGeneratorTest.java index ac494efc2c..e753b27c4d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDescriptionGeneratorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDescriptionGeneratorTest.java @@ -39,7 +39,8 @@ public class GridDescriptionGeneratorTest extends GridBasicFeaturesTest { getGridElement().getCell(1, 1).showTooltip(); assertTrue("Tooltip should not be present in cell (1, 1) ", - findElement(By.className("v-tooltip-text")).getText().isEmpty()); + findElement(By.className("v-tooltip-text")).getText() + .isEmpty()); } @Test diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java index 651cd3a763..94e16f537c 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java @@ -14,7 +14,8 @@ public class GridHeightByRowOnInitTest extends MultiBrowserTest { public void gridHeightIsMoreThanACoupleOfRows() { openTestURL(); int height = $(GridElement.class).first().getSize().getHeight(); - assertGreater("Grid should be much taller than 150px (was " + height - + "px)", height, 150); + assertGreater( + "Grid should be much taller than 150px (was " + height + "px)", + height, 150); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridCellStyleGeneratorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridCellStyleGeneratorTest.java index 8188553e61..3faa9b02f7 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridCellStyleGeneratorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridCellStyleGeneratorTest.java @@ -29,8 +29,10 @@ public class GridCellStyleGeneratorTest extends GridBasicClientFeaturesTest { public void testStyleNameGeneratorScrolling() throws Exception { openTestURL(); - selectCellStyleNameGenerator(GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_COL_INDEX); - selectRowStyleNameGenerator(GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_ROW_INDEX); + selectCellStyleNameGenerator( + GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_COL_INDEX); + selectRowStyleNameGenerator( + GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_ROW_INDEX); GridRowElement row2 = getGridElement().getRow(2); GridCellElement cell4_2 = getGridElement().getCell(4, 2); @@ -51,8 +53,10 @@ public class GridCellStyleGeneratorTest extends GridBasicClientFeaturesTest { public void testDisableStyleNameGenerator() throws Exception { openTestURL(); - selectCellStyleNameGenerator(GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_COL_INDEX); - selectRowStyleNameGenerator(GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_ROW_INDEX); + selectCellStyleNameGenerator( + GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_COL_INDEX); + selectRowStyleNameGenerator( + GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_ROW_INDEX); // Just verify that change was effective GridRowElement row2 = getGridElement().getRow(2); @@ -62,8 +66,10 @@ public class GridCellStyleGeneratorTest extends GridBasicClientFeaturesTest { Assert.assertTrue(hasCssClass(cell4_2, "4_2")); // Disable the generator and check again - selectCellStyleNameGenerator(GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_NONE); - selectRowStyleNameGenerator(GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_NONE); + selectCellStyleNameGenerator( + GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_NONE); + selectRowStyleNameGenerator( + GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_NONE); Assert.assertFalse(hasCssClass(row2, "2")); Assert.assertFalse(hasCssClass(cell4_2, "4_2")); @@ -73,8 +79,10 @@ public class GridCellStyleGeneratorTest extends GridBasicClientFeaturesTest { public void testChangeStyleNameGenerator() throws Exception { openTestURL(); - selectCellStyleNameGenerator(GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_COL_INDEX); - selectRowStyleNameGenerator(GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_ROW_INDEX); + selectCellStyleNameGenerator( + GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_COL_INDEX); + selectRowStyleNameGenerator( + GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_ROW_INDEX); // Just verify that change was effective GridRowElement row2 = getGridElement().getRow(2); @@ -84,8 +92,10 @@ public class GridCellStyleGeneratorTest extends GridBasicClientFeaturesTest { Assert.assertTrue(hasCssClass(cell4_2, "4_2")); // Change the generator and check again - selectRowStyleNameGenerator(GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_NONE); - selectCellStyleNameGenerator(GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_SIMPLE); + selectRowStyleNameGenerator( + GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_NONE); + selectCellStyleNameGenerator( + GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_SIMPLE); // Old styles removed? Assert.assertFalse(hasCssClass(row2, "2")); @@ -99,8 +109,10 @@ public class GridCellStyleGeneratorTest extends GridBasicClientFeaturesTest { public void testStyleNameGeneratorChangePrimary() throws Exception { openTestURL(); - selectCellStyleNameGenerator(GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_COL_INDEX); - selectRowStyleNameGenerator(GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_ROW_INDEX); + selectCellStyleNameGenerator( + GridBasicClientFeaturesWidget.CELL_STYLE_GENERATOR_COL_INDEX); + selectRowStyleNameGenerator( + GridBasicClientFeaturesWidget.ROW_STYLE_GENERATOR_ROW_INDEX); // Just verify that change was effective GridRowElement row2 = getGridElement().getRow(2); @@ -110,7 +122,8 @@ public class GridCellStyleGeneratorTest extends GridBasicClientFeaturesTest { Assert.assertTrue(hasCssClass(cell4_2, "4_2")); // Change primary stylename - selectMenuPath("Component", "State", "Primary Stylename", "v-escalator"); + selectMenuPath("Component", "State", "Primary Stylename", + "v-escalator"); // Styles still present Assert.assertTrue(hasCssClass(row2, "2")); @@ -118,7 +131,8 @@ public class GridCellStyleGeneratorTest extends GridBasicClientFeaturesTest { // New styles present? Assert.assertFalse(hasCssClass(row2, "v-escalator-row-2")); - Assert.assertFalse(hasCssClass(cell4_2, "v-escalator-cell-content-4_2")); + Assert.assertFalse( + hasCssClass(cell4_2, "v-escalator-cell-content-4_2")); } private void selectCellStyleNameGenerator(String name) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java index 2f5d0e7291..256735bc00 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java @@ -30,7 +30,8 @@ import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.tests.components.grid.basicfeatures.GridBasicClientFeaturesTest; import com.vaadin.tests.widgetset.client.grid.GridBasicClientFeaturesWidget; -public class GridClientColumnPropertiesTest extends GridBasicClientFeaturesTest { +public class GridClientColumnPropertiesTest + extends GridBasicClientFeaturesTest { @Test public void initialColumnWidths() { @@ -72,7 +73,8 @@ public class GridClientColumnPropertiesTest extends GridBasicClientFeaturesTest assertFalse(cellIsFrozen(0, 0)); assertFalse(cellIsFrozen(0, 1)); - selectMenuPath("Component", "State", "Frozen column count", "1 columns"); + selectMenuPath("Component", "State", "Frozen column count", + "1 columns"); assertTrue(cellIsFrozen(1, 0)); assertFalse(cellIsFrozen(1, 1)); @@ -82,7 +84,8 @@ public class GridClientColumnPropertiesTest extends GridBasicClientFeaturesTest assertTrue(cellIsFrozen(1, 1)); assertFalse(cellIsFrozen(1, 2)); - selectMenuPath("Component", "State", "Frozen column count", "0 columns"); + selectMenuPath("Component", "State", "Frozen column count", + "0 columns"); assertTrue(cellIsFrozen(1, 0)); assertFalse(cellIsFrozen(1, 1)); @@ -97,7 +100,8 @@ public class GridClientColumnPropertiesTest extends GridBasicClientFeaturesTest public void testFrozenColumns_columnsReordered_frozenColumnsKept() { openTestURL(); - selectMenuPath("Component", "State", "Frozen column count", "2 columns"); + selectMenuPath("Component", "State", "Frozen column count", + "2 columns"); assertTrue(cellIsFrozen(1, 0)); assertTrue(cellIsFrozen(1, 1)); @@ -136,11 +140,11 @@ public class GridClientColumnPropertiesTest extends GridBasicClientFeaturesTest assertFalse("Text in broken cell should have old value", "(0, 0)".equals(gridElement.getCell(0, 0).getText())); - assertEquals("Neighbour cell should be updated", "(0, 1)", gridElement - .getCell(0, 1).getText()); + assertEquals("Neighbour cell should be updated", "(0, 1)", + gridElement.getCell(0, 1).getText()); - assertEquals("Neighbour cell should be updated", "(1, 0)", gridElement - .getCell(1, 0).getText()); + assertEquals("Neighbour cell should be updated", "(1, 0)", + gridElement.getCell(1, 0).getText()); } @Test @@ -166,7 +170,8 @@ public class GridClientColumnPropertiesTest extends GridBasicClientFeaturesTest // Avoid issues with inaccuracies regarding subpixels. assertEquals( "Column widths don't match after reset, index after flip " - + i, columnWidths.get(i), + + i, + columnWidths.get(i), headerCells.get(size - 1 - i).getSize().getWidth(), 1.0d); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientContextMenuEventTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientContextMenuEventTest.java index b7242c87be..2abb7ffbd6 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientContextMenuEventTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientContextMenuEventTest.java @@ -26,7 +26,8 @@ import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.tests.components.grid.basicfeatures.GridBasicClientFeaturesTest; -public class GridClientContextMenuEventTest extends GridBasicClientFeaturesTest { +public class GridClientContextMenuEventTest + extends GridBasicClientFeaturesTest { @Override public List<DesiredCapabilities> getBrowsersToTest() { @@ -49,19 +50,15 @@ public class GridClientContextMenuEventTest extends GridBasicClientFeaturesTest .moveToElement(getGridElement().getCell(0, 0), 5, 5) .contextClick().perform(); - assertTrue( - "Debug log was not visible", - isElementPresent(By - .xpath("//span[text() = 'Prevented opening a context menu in grid body']"))); + assertTrue("Debug log was not visible", isElementPresent(By.xpath( + "//span[text() = 'Prevented opening a context menu in grid body']"))); new Actions(getDriver()) .moveToElement(getGridElement().getHeaderCell(0, 0), 5, 5) .contextClick().perform(); - assertTrue( - "Debug log was not visible", - isElementPresent(By - .xpath("//span[text() = 'Prevented opening a context menu in grid header']"))); + assertTrue("Debug log was not visible", isElementPresent(By.xpath( + "//span[text() = 'Prevented opening a context menu in grid header']"))); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientKeyEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientKeyEventsTest.java index 740eaf3f09..7ed092d523 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientKeyEventsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientKeyEventsTest.java @@ -94,7 +94,8 @@ public class GridClientKeyEventsTest extends GridBasicClientFeaturesTest { selectMenuPath("Component", "State", "Selection mode", "multi"); // IE8 does not handle 1k rows well with assertions enabled. Less rows! - selectMenuPath("Component", "DataSource", "Reset with 100 rows of Data"); + selectMenuPath("Component", "DataSource", + "Reset with 100 rows of Data"); // Focus cell above select all checkbox getGridElement().getHeaderCell(0, 0).click(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientSelectionTest.java index d1d7b21e11..ecfd8d1f88 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientSelectionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientSelectionTest.java @@ -33,11 +33,11 @@ public class GridClientSelectionTest extends GridBasicClientFeaturesTest { openTestURL(); setSelectionModelNone(); - assertTrue("First column was selection column", getGridElement() - .getCell(0, 0).getText().equals("(0, 0)")); + assertTrue("First column was selection column", + getGridElement().getCell(0, 0).getText().equals("(0, 0)")); setSelectionModelMulti(); - assertTrue("First column was not selection column", getGridElement() - .getCell(0, 1).getText().equals("(0, 0)")); + assertTrue("First column was not selection column", + getGridElement().getCell(0, 1).getText().equals("(0, 0)")); } @Test @@ -45,20 +45,21 @@ public class GridClientSelectionTest extends GridBasicClientFeaturesTest { openTestURL(); setSelectionModelMulti(); - selectMenuPath("Component", "DataSource", "Reset with 100 rows of Data"); + selectMenuPath("Component", "DataSource", + "Reset with 100 rows of Data"); GridCellElement header = getGridElement().getHeaderCell(0, 0); assertTrue("No checkbox", header.isElementPresent(By.tagName("input"))); header.findElement(By.tagName("input")).click(); for (int i = 0; i < 100; i += 10) { - assertTrue("Row " + i + " was not selected.", getGridElement() - .getRow(i).isSelected()); + assertTrue("Row " + i + " was not selected.", + getGridElement().getRow(i).isSelected()); } header.findElement(By.tagName("input")).click(); - assertFalse("Row 52 was still selected", getGridElement().getRow(52) - .isSelected()); + assertFalse("Row 52 was still selected", + getGridElement().getRow(52).isSelected()); } @Test diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientStructureTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientStructureTest.java index 74cf368da9..e2c9e6d7e6 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientStructureTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientStructureTest.java @@ -28,8 +28,8 @@ public class GridClientStructureTest extends GridBasicClientFeaturesTest { // it's easier to notice with valo openTestURL("theme=valo"); - WebElement topDeco = getGridElement().findElement( - By.className("v-grid-header-deco")); + WebElement topDeco = getGridElement() + .findElement(By.className("v-grid-header-deco")); assertGreater( "The header deco in Valo hasn't been recalculated after initial rendering", topDeco.getSize().getHeight(), 20); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java index 01e7e52923..422b8f4297 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java @@ -111,7 +111,8 @@ public class GridDetailsClientTest extends GridBasicClientFeaturesTest { selectMenuPath(SET_FAULTY_GENERATOR); toggleDetailsFor(1); - ElementQuery<FixedNotificationElement> notification = $(FixedNotificationElement.class); + ElementQuery<FixedNotificationElement> notification = $( + FixedNotificationElement.class); assertTrue("Was expecting an error notification here", notification.exists()); notification.first().close(); @@ -140,9 +141,8 @@ public class GridDetailsClientTest extends GridBasicClientFeaturesTest { selectMenuPath(SET_GENERATOR); toggleDetailsFor(1); - assertNotEquals( - "New details should've been generated even after error", "", - getGridElement().getDetails(1).getText()); + assertNotEquals("New details should've been generated even after error", + "", getGridElement().getDetails(1).getText()); } @Test @@ -161,8 +161,8 @@ public class GridDetailsClientTest extends GridBasicClientFeaturesTest { toggleDetailsFor(1); TestBenchElement detailsElement = getGridElement().getDetails(1); - WebElement button = detailsElement.findElement(By - .className("gwt-Button")); + WebElement button = detailsElement + .findElement(By.className("gwt-Button")); button.click(); WebElement label = detailsElement @@ -175,8 +175,8 @@ public class GridDetailsClientTest extends GridBasicClientFeaturesTest { selectMenuPath(SET_EMPTY_GENERATOR); toggleDetailsFor(1); - assertEquals("empty generator did not produce an empty details row", - "", getGridElement().getDetails(1).getText()); + assertEquals("empty generator did not produce an empty details row", "", + getGridElement().getDetails(1).getText()); } @Test(expected = NoSuchElementException.class) @@ -194,8 +194,8 @@ public class GridDetailsClientTest extends GridBasicClientFeaturesTest { toggleDetailsFor(0); toggleDetailsFor(1); - List<WebElement> elements = getGridElement().findElements( - By.className("v-grid-spacer")); + List<WebElement> elements = getGridElement() + .findElements(By.className("v-grid-spacer")); assertEquals("v-grid-spacer", elements.get(0).getAttribute("class")); assertEquals("v-grid-spacer stripe", elements.get(1).getAttribute("class")); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java index 0dd137db48..654cc22e36 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java @@ -128,8 +128,8 @@ public class GridEditorClientTest extends GridBasicClientFeaturesTest { selectMenuPath(EDIT_ROW_100); WebElement editor = getEditor(); - List<WebElement> widgets = editor.findElements(By - .className("gwt-TextBox")); + List<WebElement> widgets = editor + .findElements(By.className("gwt-TextBox")); assertEquals(GridBasicFeatures.EDITABLE_COLUMNS, widgets.size()); @@ -150,27 +150,27 @@ public class GridEditorClientTest extends GridBasicClientFeaturesTest { WebElement editorCells = findElements( By.className("v-grid-editor-cells")).get(1); - List<WebElement> selectorDivs = editorCells.findElements(By - .cssSelector("div")); + List<WebElement> selectorDivs = editorCells + .findElements(By.cssSelector("div")); - assertFalse("selector column cell should've had contents", selectorDivs - .get(0).getAttribute("innerHTML").isEmpty()); - assertFalse("normal column cell shoul've had contents", selectorDivs - .get(1).getAttribute("innerHTML").isEmpty()); + assertFalse("selector column cell should've had contents", + selectorDivs.get(0).getAttribute("innerHTML").isEmpty()); + assertFalse("normal column cell shoul've had contents", + selectorDivs.get(1).getAttribute("innerHTML").isEmpty()); } @Test public void testSave() { selectMenuPath(EDIT_ROW_100); - WebElement textField = getEditor().findElements( - By.className("gwt-TextBox")).get(0); + WebElement textField = getEditor() + .findElements(By.className("gwt-TextBox")).get(0); textField.clear(); textField.sendKeys("Changed"); - WebElement saveButton = getEditor().findElement( - By.className("v-grid-editor-save")); + WebElement saveButton = getEditor() + .findElement(By.className("v-grid-editor-save")); saveButton.click(); @@ -181,8 +181,8 @@ public class GridEditorClientTest extends GridBasicClientFeaturesTest { public void testProgrammaticSave() { selectMenuPath(EDIT_ROW_100); - WebElement textField = getEditor().findElements( - By.className("gwt-TextBox")).get(0); + WebElement textField = getEditor() + .findElements(By.className("gwt-TextBox")).get(0); textField.clear(); textField.sendKeys("Changed"); @@ -200,8 +200,8 @@ public class GridEditorClientTest extends GridBasicClientFeaturesTest { GridConstants.DEFAULT_SAVE_CAPTION, getSaveButton().getText()); assertEquals("Cancel button caption should've been \"" + GridConstants.DEFAULT_CANCEL_CAPTION + "\" to begin with", - GridConstants.DEFAULT_CANCEL_CAPTION, getCancelButton() - .getText()); + GridConstants.DEFAULT_CANCEL_CAPTION, + getCancelButton().getText()); selectMenuPath("Component", "Editor", "Change Save Caption"); assertNotEquals( @@ -214,8 +214,8 @@ public class GridEditorClientTest extends GridBasicClientFeaturesTest { selectMenuPath(EDIT_ROW_5); assertNotEquals( "Cancel button caption should've changed while editor is closed", - GridConstants.DEFAULT_CANCEL_CAPTION, getCancelButton() - .getText()); + GridConstants.DEFAULT_CANCEL_CAPTION, + getCancelButton().getText()); } @Test @@ -240,10 +240,9 @@ public class GridEditorClientTest extends GridBasicClientFeaturesTest { selectMenuPath("Component", "Editor", "Toggle second editor error"); getSaveButton().click(); - assertEquals("Unexpected amount of error fields", 1, editor - .findElements(By.className("error")).size()); - assertEquals( - "Unexpedted error message", + assertEquals("Unexpected amount of error fields", 1, + editor.findElements(By.className("error")).size()); + assertEquals("Unexpedted error message", "Syntethic fail of editor in column 2. " + "This message is so long that it doesn't fit into its box", editor.getErrorMessage()); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridFooterTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridFooterTest.java index 8b65ba315b..4844ba3b58 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridFooterTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridFooterTest.java @@ -99,15 +99,16 @@ public class GridFooterTest extends GridStaticSectionTest { selectMenuPath("Component", "Footer", "Append row"); - selectMenuPath("Component", "Footer", "Row 1", "Join column cells 0, 1"); + selectMenuPath("Component", "Footer", "Row 1", + "Join column cells 0, 1"); GridCellElement spannedCell = getGridElement().getFooterCell(0, 0); assertTrue(spannedCell.isDisplayed()); assertEquals("2", spannedCell.getAttribute("colspan")); // TestBench returns the spanned cell for all columns - assertEquals(spannedCell.getText(), getGridElement() - .getFooterCell(0, 1).getText()); + assertEquals(spannedCell.getText(), + getGridElement().getFooterCell(0, 1).getText()); } @Test @@ -123,8 +124,8 @@ public class GridFooterTest extends GridStaticSectionTest { assertEquals("2", spannedCell.getAttribute("colspan")); // TestBench returns the spanned cell for all columns - assertEquals(spannedCell.getText(), getGridElement() - .getFooterCell(0, 2).getText()); + assertEquals(spannedCell.getText(), + getGridElement().getFooterCell(0, 2).getText()); } @Test diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridHeaderTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridHeaderTest.java index 8cf7f7374f..dc3f20a620 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridHeaderTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridHeaderTest.java @@ -144,7 +144,8 @@ public class GridHeaderTest extends GridStaticSectionTest { selectMenuPath("Component", "Header", "Append row"); - selectMenuPath("Component", "Header", "Row 2", "Join column cells 0, 1"); + selectMenuPath("Component", "Header", "Row 2", + "Join column cells 0, 1"); GridCellElement spannedCell = getGridElement().getHeaderCell(1, 0); assertTrue(spannedCell.isDisplayed()); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridRowHandleRefreshTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridRowHandleRefreshTest.java index c7a509da45..00ed8d303c 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridRowHandleRefreshTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridRowHandleRefreshTest.java @@ -27,8 +27,8 @@ public class GridRowHandleRefreshTest extends GridBasicClientFeaturesTest { public void testRefreshingThroughRowHandle() { openTestURL(); - assertEquals("Unexpected initial state", "(0, 0)", getGridElement() - .getCell(0, 0).getText()); + assertEquals("Unexpected initial state", "(0, 0)", + getGridElement().getCell(0, 0).getText()); selectMenuPath("Component", "State", "Edit and refresh Row 0"); assertEquals("Cell contents did not update correctly", "Foo", getGridElement().getCell(0, 0).getText()); @@ -39,8 +39,8 @@ public class GridRowHandleRefreshTest extends GridBasicClientFeaturesTest { throws InterruptedException { openTestURL(); - assertEquals("Unexpected initial state", "(0, 0)", getGridElement() - .getCell(0, 0).getText()); + assertEquals("Unexpected initial state", "(0, 0)", + getGridElement().getCell(0, 0).getText()); selectMenuPath("Component", "State", "Delayed edit of Row 0"); // Still the same data assertEquals("Cell contents did not update correctly", "(0, 0)", @@ -55,8 +55,8 @@ public class GridRowHandleRefreshTest extends GridBasicClientFeaturesTest { public void testRefreshingWhenNotInViewThroughRowHandle() { openTestURL(); - assertEquals("Unexpected initial state", "(0, 0)", getGridElement() - .getCell(0, 0).getText()); + assertEquals("Unexpected initial state", "(0, 0)", + getGridElement().getCell(0, 0).getText()); getGridElement().scrollToRow(100); selectMenuPath("Component", "State", "Edit and refresh Row 0"); assertEquals("Cell contents did not update correctly", "Foo", diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java index 1b9d1a0728..3523cc6bac 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java @@ -38,8 +38,8 @@ public class GridSidebarContentTest extends GridBasicClientFeaturesTest { getSidebarOpenButton().click(); - WebElement toggle = getSidebarPopup().findElement( - By.className("column-hiding-toggle")); + WebElement toggle = getSidebarPopup() + .findElement(By.className("column-hiding-toggle")); Assert.assertEquals("Column 0 should be togglable", "Header (0,0)", toggle.getText()); @@ -64,8 +64,8 @@ public class GridSidebarContentTest extends GridBasicClientFeaturesTest { sidebarItem.click(); - Assert.assertEquals("Sidebar should be closed after clicking item 0", - 0, countBySelector(".v-grid-sidebar-content")); + Assert.assertEquals("Sidebar should be closed after clicking item 0", 0, + countBySelector(".v-grid-sidebar-content")); } @Test @@ -122,8 +122,8 @@ public class GridSidebarContentTest extends GridBasicClientFeaturesTest { } private void assertSidebarMenuItems(String... items) { - List<WebElement> menuItems = getSidebarPopup().findElements( - By.cssSelector(".v-grid-sidebar-content td")); + List<WebElement> menuItems = getSidebarPopup() + .findElements(By.cssSelector(".v-grid-sidebar-content td")); Assert.assertEquals("Expected " + items.length + " menu items", items.length, menuItems.size()); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridStaticSectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridStaticSectionTest.java index ef7d15ff3d..610ff63b20 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridStaticSectionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridStaticSectionTest.java @@ -30,11 +30,13 @@ import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeatures; * @since * @author Vaadin Ltd */ -public abstract class GridStaticSectionTest extends GridBasicClientFeaturesTest { +public abstract class GridStaticSectionTest + extends GridBasicClientFeaturesTest { protected void assertHeaderTexts(int headerId, int rowIndex) { int i = 0; - for (TestBenchElement cell : getGridElement().getHeaderCells(rowIndex)) { + for (TestBenchElement cell : getGridElement() + .getHeaderCells(rowIndex)) { WebElement content = cell.findElement(By.tagName("div")); if (i % 3 == 0) { @@ -56,7 +58,8 @@ public abstract class GridStaticSectionTest extends GridBasicClientFeaturesTest protected void assertFooterTexts(int footerId, int rowIndex) { int i = 0; - for (TestBenchElement cell : getGridElement().getFooterCells(rowIndex)) { + for (TestBenchElement cell : getGridElement() + .getFooterCells(rowIndex)) { WebElement content = cell.findElement(By.tagName("div")); if (i % 3 == 0) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridStylingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridStylingTest.java index cbf27a69d9..bf77179e31 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridStylingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridStylingTest.java @@ -47,13 +47,13 @@ public class GridStylingTest extends GridStaticSectionTest { String classNames = getGridElement().getAttribute("class"); assertEquals(stylename, classNames); - classNames = getGridElement().getVerticalScroller().getAttribute( - "class"); + classNames = getGridElement().getVerticalScroller() + .getAttribute("class"); assertTrue(classNames.contains(stylename + "-scroller")); assertTrue(classNames.contains(stylename + "-scroller-vertical")); - classNames = getGridElement().getHorizontalScroller().getAttribute( - "class"); + classNames = getGridElement().getHorizontalScroller() + .getAttribute("class"); assertTrue(classNames.contains(stylename + "-scroller")); assertTrue(classNames.contains(stylename + "-scroller-horizontal")); @@ -64,8 +64,8 @@ public class GridStylingTest extends GridStaticSectionTest { assertEquals(stylename + "-header", classNames); for (int row = 0; row < getGridElement().getHeaderCount(); row++) { - classNames = getGridElement().getHeaderRow(row).getAttribute( - "class"); + classNames = getGridElement().getHeaderRow(row) + .getAttribute("class"); assertEquals(stylename + "-row", classNames); for (int col = 0; col < GridBasicFeatures.COLUMNS; col++) { @@ -86,12 +86,13 @@ public class GridStylingTest extends GridStaticSectionTest { assertTrue(classNames.contains(stylename + "-row-has-data")); for (int col = 0; col < GridBasicFeatures.COLUMNS; col++) { - classNames = getGridElement().getCell(row, col).getAttribute( - "class"); + classNames = getGridElement().getCell(row, col) + .getAttribute("class"); assertTrue(classNames.contains(stylename + "-cell")); if (row == 0 && col == 0) { - assertTrue(classNames.contains(stylename + "-cell-focused")); + assertTrue( + classNames.contains(stylename + "-cell-focused")); } } } @@ -100,8 +101,8 @@ public class GridStylingTest extends GridStaticSectionTest { assertEquals(stylename + "-footer", classNames); for (int row = 0; row < getGridElement().getFooterCount(); row++) { - classNames = getGridElement().getFooterRow(row).getAttribute( - "class"); + classNames = getGridElement().getFooterRow(row) + .getAttribute("class"); assertEquals(stylename + "-row", classNames); for (int col = 0; col < GridBasicFeatures.COLUMNS; col++) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColumnFreezingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColumnFreezingTest.java index e808001cf7..4dec786bb4 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColumnFreezingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColumnFreezingTest.java @@ -27,8 +27,8 @@ import org.openqa.selenium.WebElement; import com.vaadin.tests.components.grid.basicfeatures.EscalatorBasicClientFeaturesTest; -public class EscalatorColumnFreezingTest extends - EscalatorBasicClientFeaturesTest { +public class EscalatorColumnFreezingTest + extends EscalatorBasicClientFeaturesTest { private final static Pattern TRANSFORM_PATTERN = Pattern.compile(// @formatter:off // any start of the string @@ -48,8 +48,8 @@ public class EscalatorColumnFreezingTest extends // @formatter:on - private final static Pattern LEFT_PATTERN = Pattern.compile( - ".*left: (\\d+)px.*", Pattern.CASE_INSENSITIVE); + private final static Pattern LEFT_PATTERN = Pattern + .compile(".*left: (\\d+)px.*", Pattern.CASE_INSENSITIVE); private static final int NO_FREEZE = -1; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRemoveAndAddRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRemoveAndAddRowsTest.java index 19ba72b49d..ac605c2104 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRemoveAndAddRowsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRemoveAndAddRowsTest.java @@ -27,8 +27,8 @@ import com.vaadin.tests.components.grid.basicfeatures.EscalatorBasicClientFeatur /** * Test class to test the escalator level issue for ticket #16832 */ -public class EscalatorRemoveAndAddRowsTest extends - EscalatorBasicClientFeaturesTest { +public class EscalatorRemoveAndAddRowsTest + extends EscalatorBasicClientFeaturesTest { @Test public void testRemoveAllRowsAndAddThirtyThenScroll() throws IOException { diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java index 66c131255f..15ab5d3321 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java @@ -96,8 +96,8 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest { private final static Pattern TRANSLATE_VALUE_PATTERN = Pattern .compile(TRANSLATE_VALUE_REGEX); - private final static Pattern PIXEL_VALUE_PATTERN = Pattern.compile( - PIXEL_VALUE_REGEX, Pattern.CASE_INSENSITIVE); + private final static Pattern PIXEL_VALUE_PATTERN = Pattern + .compile(PIXEL_VALUE_REGEX, Pattern.CASE_INSENSITIVE); @Before public void before() { @@ -191,8 +191,10 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest { long oldBottomScrollTop = getScrollTop(); selectMenuPath(FEATURES, SPACERS, ROW_99, SET_100PX); - assertEquals("Adding a spacer underneath the current viewport should " - + "not scroll anywhere", oldBottomScrollTop, getScrollTop()); + assertEquals( + "Adding a spacer underneath the current viewport should " + + "not scroll anywhere", + oldBottomScrollTop, getScrollTop()); assertFalse("Got an unexpected notification", $(NotificationElement.class).exists()); @@ -238,15 +240,17 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest { public void spacersAreFixedInViewport_firstFreezeThenScroll() { selectMenuPath(FEATURES, FROZEN_COLUMNS, FREEZE_1_COLUMN); selectMenuPath(FEATURES, SPACERS, ROW_1, SET_100PX); - assertEquals("Spacer's left position should've been 0 at the " - + "beginning", 0d, getElementLeft(getSpacer(1)), - WidgetUtil.PIXEL_EPSILON); + assertEquals( + "Spacer's left position should've been 0 at the " + "beginning", + 0d, getElementLeft(getSpacer(1)), WidgetUtil.PIXEL_EPSILON); int scrollTo = 10; scrollHorizontallyTo(scrollTo); - assertEquals("Spacer's left position should've been " + scrollTo - + " after scrolling " + scrollTo + "px", scrollTo, - getElementLeft(getSpacer(1)), WidgetUtil.PIXEL_EPSILON); + assertEquals( + "Spacer's left position should've been " + scrollTo + + " after scrolling " + scrollTo + "px", + scrollTo, getElementLeft(getSpacer(1)), + WidgetUtil.PIXEL_EPSILON); } @Test @@ -255,9 +259,11 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest { int scrollTo = 10; scrollHorizontallyTo(scrollTo); selectMenuPath(FEATURES, SPACERS, ROW_1, SET_100PX); - assertEquals("Spacer's left position should've been " + scrollTo - + " after scrolling " + scrollTo + "px", scrollTo, - getElementLeft(getSpacer(1)), WidgetUtil.PIXEL_EPSILON); + assertEquals( + "Spacer's left position should've been " + scrollTo + + " after scrolling " + scrollTo + "px", + scrollTo, getElementLeft(getSpacer(1)), + WidgetUtil.PIXEL_EPSILON); } @Test @@ -389,8 +395,8 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest { selectMenuPath(FEATURES, SPACERS, FOCUSABLE_UPDATER); selectMenuPath(FEATURES, SPACERS, ROW_1, SET_100PX); - WebElement inputElement = getEscalator().findElement( - By.tagName("input")); + WebElement inputElement = getEscalator() + .findElement(By.tagName("input")); inputElement.click(); scrollVerticallyTo(30); @@ -398,8 +404,8 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest { // the DOM reordering to take place. Thread.sleep(500); - assertFalse("Error message detected", $(NotificationElement.class) - .exists()); + assertFalse("Error message detected", + $(NotificationElement.class).exists()); } @Test @@ -409,8 +415,9 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest { WebElement tbody = getEscalator().findElement(By.tagName("tbody")); WebElement spacer = getChild(tbody, 2); String cssClass = spacer.getAttribute("class"); - assertTrue("element index 2 was not a spacer (class=\"" + cssClass - + "\")", cssClass.contains("-spacer")); + assertTrue( + "element index 2 was not a spacer (class=\"" + cssClass + "\")", + cssClass.contains("-spacer")); } @Test @@ -422,8 +429,9 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest { WebElement tbody = getEscalator().findElement(By.tagName("tbody")); WebElement spacer = getChild(tbody, 1); String cssClass = spacer.getAttribute("class"); - assertTrue("element index 1 was not a spacer (class=\"" + cssClass - + "\")", cssClass.contains("-spacer")); + assertTrue( + "element index 1 was not a spacer (class=\"" + cssClass + "\")", + cssClass.contains("-spacer")); } @Test @@ -493,8 +501,8 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest { } private WebElement getChild(WebElement parent, int childIndex) { - return (WebElement) executeScript("return arguments[0].children[" - + childIndex + "];", parent); + return (WebElement) executeScript( + "return arguments[0].children[" + childIndex + "];", parent); } private static double[] getElementDimensions(WebElement element) { @@ -574,8 +582,9 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest { private static double getPixelValue(String top) { Matcher matcher = PIXEL_VALUE_PATTERN.matcher(top); - assertTrue("no matches for \"" + top + "\" against " - + PIXEL_VALUE_PATTERN, matcher.find()); + assertTrue( + "no matches for \"" + top + "\" against " + PIXEL_VALUE_PATTERN, + matcher.find()); assertEquals("wrong amount of groups matched in " + top, 1, matcher.groupCount()); return Double.parseDouble(matcher.group(1)); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java index 0c26ceb5c9..e642d0c992 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java @@ -38,13 +38,13 @@ public class GridCellFocusAdjustmentTest extends GridBasicFeaturesTest { grid.getCell(1, 0).isFocused()); selectMenuPath("Component", "Body rows", "Add 18 rows"); - assertTrue("Cell focus was not moved when adding multiple rows", grid - .getCell(19, 0).isFocused()); + assertTrue("Cell focus was not moved when adding multiple rows", + grid.getCell(19, 0).isFocused()); for (int i = 18; i <= 0; --i) { selectMenuPath("Component", "Body rows", "Remove first row"); - assertTrue("Cell focus was not moved when removing a row", grid - .getCell(i, 0).isFocused()); + assertTrue("Cell focus was not moved when removing a row", + grid.getCell(i, 0).isFocused()); } } @@ -53,12 +53,12 @@ public class GridCellFocusAdjustmentTest extends GridBasicFeaturesTest { openTestURL(); getGridElement().getCell(0, 0).click(); new Actions(getDriver()).sendKeys(Keys.UP).perform(); - assertTrue("Header 0,0 should've become focused", getGridElement() - .getHeaderCell(0, 0).isFocused()); + assertTrue("Header 0,0 should've become focused", + getGridElement().getHeaderCell(0, 0).isFocused()); selectMenuPath("Component", "Body rows", "Add first row"); - assertTrue("Header 0,0 should've remained focused", getGridElement() - .getHeaderCell(0, 0).isFocused()); + assertTrue("Header 0,0 should've remained focused", + getGridElement().getHeaderCell(0, 0).isFocused()); } @Test @@ -79,8 +79,8 @@ public class GridCellFocusAdjustmentTest extends GridBasicFeaturesTest { getGridElement().getCell(0, 0).isFocused()); selectMenuPath("Component", "Body rows", "Add third row"); - assertTrue("Body 0,0 should've remained focused", getGridElement() - .getCell(0, 0).isFocused()); + assertTrue("Body 0,0 should've remained focused", + getGridElement().getCell(0, 0).isFocused()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellStyleGeneratorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellStyleGeneratorTest.java index f013b76075..8a6ab48f72 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellStyleGeneratorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellStyleGeneratorTest.java @@ -31,8 +31,10 @@ public class GridCellStyleGeneratorTest extends GridBasicFeaturesTest { public void testStyleNameGeneratorScrolling() throws Exception { openTestURL(); - selectRowStyleNameGenerator(GridBasicFeatures.ROW_STYLE_GENERATOR_ROW_NUMBERS_FOR_3_OF_4); - selectCellStyleNameGenerator(GridBasicFeatures.CELL_STYLE_GENERATOR_SPECIAL); + selectRowStyleNameGenerator( + GridBasicFeatures.ROW_STYLE_GENERATOR_ROW_NUMBERS_FOR_3_OF_4); + selectCellStyleNameGenerator( + GridBasicFeatures.CELL_STYLE_GENERATOR_SPECIAL); GridRowElement row = getGridElement().getRow(2); GridCellElement cell = getGridElement().getCell(3, 2); @@ -55,8 +57,10 @@ public class GridCellStyleGeneratorTest extends GridBasicFeaturesTest { public void testDisableStyleNameGenerator() throws Exception { openTestURL(); - selectRowStyleNameGenerator(GridBasicFeatures.ROW_STYLE_GENERATOR_ROW_NUMBERS_FOR_3_OF_4); - selectCellStyleNameGenerator(GridBasicFeatures.CELL_STYLE_GENERATOR_SPECIAL); + selectRowStyleNameGenerator( + GridBasicFeatures.ROW_STYLE_GENERATOR_ROW_NUMBERS_FOR_3_OF_4); + selectCellStyleNameGenerator( + GridBasicFeatures.CELL_STYLE_GENERATOR_SPECIAL); // Just verify that change was effective GridRowElement row2 = getGridElement().getRow(2); @@ -67,7 +71,8 @@ public class GridCellStyleGeneratorTest extends GridBasicFeaturesTest { // Disable the generator and check again selectRowStyleNameGenerator(GridBasicFeatures.ROW_STYLE_GENERATOR_NONE); - selectCellStyleNameGenerator(GridBasicFeatures.CELL_STYLE_GENERATOR_NONE); + selectCellStyleNameGenerator( + GridBasicFeatures.CELL_STYLE_GENERATOR_NONE); Assert.assertFalse(hasCssClass(row2, "row2")); Assert.assertFalse(hasCssClass(cell3_2, "Column_2")); @@ -77,8 +82,10 @@ public class GridCellStyleGeneratorTest extends GridBasicFeaturesTest { public void testChangeStyleNameGenerator() throws Exception { openTestURL(); - selectRowStyleNameGenerator(GridBasicFeatures.ROW_STYLE_GENERATOR_ROW_NUMBERS_FOR_3_OF_4); - selectCellStyleNameGenerator(GridBasicFeatures.CELL_STYLE_GENERATOR_SPECIAL); + selectRowStyleNameGenerator( + GridBasicFeatures.ROW_STYLE_GENERATOR_ROW_NUMBERS_FOR_3_OF_4); + selectCellStyleNameGenerator( + GridBasicFeatures.CELL_STYLE_GENERATOR_SPECIAL); // Just verify that change was effective GridRowElement row2 = getGridElement().getRow(2); @@ -89,7 +96,8 @@ public class GridCellStyleGeneratorTest extends GridBasicFeaturesTest { // Change the generator and check again selectRowStyleNameGenerator(GridBasicFeatures.ROW_STYLE_GENERATOR_NONE); - selectCellStyleNameGenerator(GridBasicFeatures.CELL_STYLE_GENERATOR_PROPERTY_TO_STRING); + selectCellStyleNameGenerator( + GridBasicFeatures.CELL_STYLE_GENERATOR_PROPERTY_TO_STRING); // Old styles removed? Assert.assertFalse(hasCssClass(row2, "row2")); @@ -105,7 +113,8 @@ public class GridCellStyleGeneratorTest extends GridBasicFeaturesTest { openTestURL(); selectMenuPath("Component", "State", "Selection mode", "multi"); - selectCellStyleNameGenerator(GridBasicFeatures.CELL_STYLE_GENERATOR_SPECIAL); + selectCellStyleNameGenerator( + GridBasicFeatures.CELL_STYLE_GENERATOR_SPECIAL); assertFalse("Error notification was present", isElementPresent(NotificationElement.class)); @@ -123,8 +132,10 @@ public class GridCellStyleGeneratorTest extends GridBasicFeaturesTest { public void testEmptyStringStyleGenerator() { setDebug(true); openTestURL(); - selectCellStyleNameGenerator(GridBasicFeatures.CELL_STYLE_GENERATOR_EMPTY); - selectRowStyleNameGenerator(GridBasicFeatures.ROW_STYLE_GENERATOR_EMPTY); + selectCellStyleNameGenerator( + GridBasicFeatures.CELL_STYLE_GENERATOR_EMPTY); + selectRowStyleNameGenerator( + GridBasicFeatures.ROW_STYLE_GENERATOR_EMPTY); assertFalse("Error notification was present", isElementPresent(NotificationElement.class)); @@ -134,7 +145,8 @@ public class GridCellStyleGeneratorTest extends GridBasicFeaturesTest { public void testNullStringStyleGenerator() { setDebug(true); openTestURL(); - selectCellStyleNameGenerator(GridBasicFeatures.CELL_STYLE_GENERATOR_NULL); + selectCellStyleNameGenerator( + GridBasicFeatures.CELL_STYLE_GENERATOR_NULL); selectRowStyleNameGenerator(GridBasicFeatures.ROW_STYLE_GENERATOR_NULL); assertFalse("Error notification was present", diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java index 91b5d04ab6..f6f8de87b5 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java @@ -37,15 +37,15 @@ public class GridClearContainerTest extends MultiBrowserTest { @Test public void clearAndReadd() { openTestURL(); - ButtonElement button = $(ButtonElement.class).caption( - "Clear and re-add").first(); + ButtonElement button = $(ButtonElement.class) + .caption("Clear and re-add").first(); GridElement grid = $(GridElement.class).first(); Assert.assertEquals(ERRORNOTE, "default", grid.getCell(0, 0).getText()); Assert.assertEquals(ERRORNOTE, "default", grid.getCell(1, 0).getText()); button.click(); - Assert.assertEquals(ERRORNOTE, "Updated value 1", grid.getCell(0, 0) - .getText()); - Assert.assertEquals(ERRORNOTE, "Updated value 2", grid.getCell(1, 0) - .getText()); + Assert.assertEquals(ERRORNOTE, "Updated value 1", + grid.getCell(0, 0).getText()); + Assert.assertEquals(ERRORNOTE, "Updated value 2", + grid.getCell(1, 0).getText()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnReorderTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnReorderTest.java index 62be202277..c3b4e6623e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnReorderTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnReorderTest.java @@ -331,21 +331,23 @@ public class GridColumnReorderTest extends GridBasicFeaturesTest { selectMenuPath("Component", "Size", "Width", "900px"); assertColumnHeaderOrder(0, 1, 2, 3); - GridCellElement draggedHeaderCell = getGridElement() - .getHeaderCell(0, 1); + GridCellElement draggedHeaderCell = getGridElement().getHeaderCell(0, + 1); final int xOffset = 500; new Actions(getDriver()).moveToElement(draggedHeaderCell, 20, 10) .clickAndHold().moveByOffset(xOffset, 0).build().perform(); - WebElement floatingDragElement = findElement(By - .className("dragged-column-header")); + WebElement floatingDragElement = findElement( + By.className("dragged-column-header")); - int expectedLeft = draggedHeaderCell.getLocation().getX() + xOffset - + 20 - (floatingDragElement.getSize().getWidth() / 2); + int expectedLeft = draggedHeaderCell.getLocation().getX() + xOffset + 20 + - (floatingDragElement.getSize().getWidth() / 2); int realLeft = floatingDragElement.getLocation().getX(); - assertTrue("Dragged element location wrong, expected " + expectedLeft - + " was " + realLeft, Math.abs(expectedLeft - realLeft) < 10); + assertTrue( + "Dragged element location wrong, expected " + expectedLeft + + " was " + realLeft, + Math.abs(expectedLeft - realLeft) < 10); } @Test @@ -362,14 +364,15 @@ public class GridColumnReorderTest extends GridBasicFeaturesTest { new Actions(getDriver()).clickAndHold(getDefaultColumnHeader(10)) .moveByOffset(800, 0).build().perform(); - WebElement dragDropMarker = findElement(By - .className("v-grid-drop-marker")); + WebElement dragDropMarker = findElement( + By.className("v-grid-drop-marker")); WebElement sidebar = findElement(By.className("v-grid-sidebar")); int dragDropMarkerX = dragDropMarker.getLocation().getX(); int sidebarX = sidebar.getLocation().getX(); - assertTrue("Drop marker misplaced " + dragDropMarkerX - + " compared to sidebar open button " + sidebarX, + assertTrue( + "Drop marker misplaced " + dragDropMarkerX + + " compared to sidebar open button " + sidebarX, dragDropMarkerX <= sidebarX); } @@ -382,14 +385,14 @@ public class GridColumnReorderTest extends GridBasicFeaturesTest { } private void moveColumnManuallyLeftByOne(int index) { - selectMenuPath(new String[] { "Component", "Columns", - "Column " + index, "Move left" }); + selectMenuPath(new String[] { "Component", "Columns", "Column " + index, + "Move left" }); } private void assertColumnReorderEvent(boolean userOriginated) { final String logRow = getLogRow(0); - assertTrue(logRow.contains("Columns reordered, userOriginated: " - + userOriginated)); + assertTrue(logRow.contains( + "Columns reordered, userOriginated: " + userOriginated)); } private void assertNoColumnReorderEvent() { diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnResizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnResizeTest.java index 7fdf7acbab..93e4c9399d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnResizeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnResizeTest.java @@ -122,8 +122,8 @@ public class GridColumnResizeTest extends GridBasicFeaturesTest { Dimension size = headerCell.getSize(); new Actions(getDriver()) .moveToElement(headerCell, size.getWidth() + posX, - size.getHeight() / 2).clickAndHold() - .moveByOffset(offset, 0).release().perform(); + size.getHeight() / 2) + .clickAndHold().moveByOffset(offset, 0).release().perform(); } private void assertResizable(int columnIndex, boolean resizable) { @@ -133,8 +133,8 @@ public class GridColumnResizeTest extends GridBasicFeaturesTest { private void assertResizable(GridCellElement cell, boolean resizable) { assertEquals("Header resize handle present", resizable, - cell.isElementPresent(By - .cssSelector("div.v-grid-column-resize-handle"))); + cell.isElementPresent( + By.cssSelector("div.v-grid-column-resize-handle"))); } @Test diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnVisibilityTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnVisibilityTest.java index 6e0d7cc87a..87b5a225a7 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnVisibilityTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnVisibilityTest.java @@ -49,20 +49,20 @@ public class GridColumnVisibilityTest extends GridBasicFeaturesTest { @Test public void columnIsNotShownWhenHidden() { - assertEquals("column 0", getGridElement().getHeaderCell(0, 0).getText() - .toLowerCase()); + assertEquals("column 0", + getGridElement().getHeaderCell(0, 0).getText().toLowerCase()); selectMenuPath(TOGGLE_HIDE_COLUMN_0); - assertEquals("column 1", getGridElement().getHeaderCell(0, 0).getText() - .toLowerCase()); + assertEquals("column 1", + getGridElement().getHeaderCell(0, 0).getText().toLowerCase()); } @Test public void columnIsShownWhenUnhidden() { selectMenuPath(TOGGLE_HIDE_COLUMN_0); selectMenuPath(TOGGLE_HIDE_COLUMN_0); - assertEquals("column 0", getGridElement().getHeaderCell(0, 0).getText() - .toLowerCase()); + assertEquals("column 0", + getGridElement().getHeaderCell(0, 0).getText().toLowerCase()); } @Test @@ -168,15 +168,15 @@ public class GridColumnVisibilityTest extends GridBasicFeaturesTest { public void testColumnHidingToggleCaption_settingToggleCaption_updatesToggle() { toggleColumnHidable(1); getSidebarOpenButton().click(); - assertEquals("column 1", getGridElement().getHeaderCell(0, 1).getText() - .toLowerCase()); + assertEquals("column 1", + getGridElement().getHeaderCell(0, 1).getText().toLowerCase()); assertEquals("Column 1", getColumnHidingToggle(1).getText()); toggleColumnHidingToggleCaptionChange(1); getSidebarOpenButton().click(); - assertEquals("column 1", getGridElement().getHeaderCell(0, 1).getText() - .toLowerCase()); + assertEquals("column 1", + getGridElement().getHeaderCell(0, 1).getText().toLowerCase()); assertEquals("Column 1 caption 0", getColumnHidingToggle(1).getText()); toggleColumnHidingToggleCaptionChange(1); @@ -188,8 +188,8 @@ public class GridColumnVisibilityTest extends GridBasicFeaturesTest { public void testColumnHidingToggleCaption_settingWidgetToHeader_toggleCaptionStays() { toggleColumnHidable(1); getSidebarOpenButton().click(); - assertEquals("column 1", getGridElement().getHeaderCell(0, 1).getText() - .toLowerCase()); + assertEquals("column 1", + getGridElement().getHeaderCell(0, 1).getText().toLowerCase()); assertEquals("Column 1", getColumnHidingToggle(1).getText()); selectMenuPath("Component", "Columns", "Column 1", "Header Type", @@ -207,8 +207,8 @@ public class GridColumnVisibilityTest extends GridBasicFeaturesTest { "Change header caption"); getSidebarOpenButton().click(); - assertEquals("column 1 header 0", getGridElement().getHeaderCell(0, 1) - .getText().toLowerCase()); + assertEquals("column 1 header 0", + getGridElement().getHeaderCell(0, 1).getText().toLowerCase()); assertEquals("Column 1 header 0", getColumnHidingToggle(1).getText()); } @@ -222,8 +222,8 @@ public class GridColumnVisibilityTest extends GridBasicFeaturesTest { "Change header caption"); getSidebarOpenButton().click(); - assertEquals("column 1 header 0", getGridElement().getHeaderCell(0, 1) - .getText().toLowerCase()); + assertEquals("column 1 header 0", + getGridElement().getHeaderCell(0, 1).getText().toLowerCase()); assertEquals("Column 1 caption 0", getColumnHidingToggle(1).getText()); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridDetailsServerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridDetailsServerTest.java index dda9c03f94..49ba1c8867 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridDetailsServerTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridDetailsServerTest.java @@ -50,8 +50,8 @@ public class GridDetailsServerTest extends GridBasicFeaturesTest { "Component", "Details", "Generators", "\"Watching\"" }; private static final String[] DETAILS_GENERATOR_PERSISTING = new String[] { "Component", "Details", "Generators", "Persisting" }; - private static final String[] CHANGE_HIERARCHY = new String[] { - "Component", "Details", "Generators", "- Change Component" }; + private static final String[] CHANGE_HIERARCHY = new String[] { "Component", + "Details", "Generators", "- Change Component" }; @Before public void setUp() { @@ -93,8 +93,8 @@ public class GridDetailsServerTest extends GridBasicFeaturesTest { selectMenuPath(OPEN_FIRST_ITEM_DETAILS); getGridElement().scroll(0); Thread.sleep(50); - assertNotNull("details should've been opened", getGridElement() - .getDetails(0)); + assertNotNull("details should've been opened", + getGridElement().getDetails(0)); } @Test(expected = NoSuchElementException.class) @@ -149,8 +149,8 @@ public class GridDetailsServerTest extends GridBasicFeaturesTest { getGridElement().scrollToRow(0); // if this fails, it'll fail before the assertNotNull - assertNotNull("unexpected null details row", getGridElement() - .getDetails(0)); + assertNotNull("unexpected null details row", + getGridElement().getDetails(0)); } @Test @@ -171,8 +171,8 @@ public class GridDetailsServerTest extends GridBasicFeaturesTest { selectMenuPath(OPEN_ALMOST_LAST_ITEM_DETAILS); scrollGridVerticallyTo(100000); - TestBenchElement details = getGridElement().getDetails( - ALMOST_LAST_INDEX); + TestBenchElement details = getGridElement() + .getDetails(ALMOST_LAST_INDEX); assertNotNull(details); assertTrue("Unexpected details content", details.getText().endsWith(ALMOST_LAST_INDEX + " (0)")); @@ -205,8 +205,8 @@ public class GridDetailsServerTest extends GridBasicFeaturesTest { assertEquals("One", getGridElement().getDetails(0).getText()); selectMenuPath(OPEN_FIRST_ITEM_DETAILS); - assertFalse("Details should be detached", getGridElement() - .isElementPresent(By.vaadin("#details[0]"))); + assertFalse("Details should be detached", + getGridElement().isElementPresent(By.vaadin("#details[0]"))); selectMenuPath(CHANGE_HIERARCHY); selectMenuPath(OPEN_FIRST_ITEM_DETAILS); @@ -225,8 +225,8 @@ public class GridDetailsServerTest extends GridBasicFeaturesTest { public void swappingDetailsGenerators_shownDetails() { selectMenuPath(DETAILS_GENERATOR_PERSISTING); selectMenuPath(OPEN_FIRST_ITEM_DETAILS); - assertTrue("Details should contain 'One' at first", getGridElement() - .getDetails(0).getText().contains("One")); + assertTrue("Details should contain 'One' at first", + getGridElement().getDetails(0).getText().contains("One")); selectMenuPath(DETAILS_GENERATOR_WATCHING); assertFalse( @@ -251,8 +251,8 @@ public class GridDetailsServerTest extends GridBasicFeaturesTest { scrollGridVerticallyTo(0); assertFalse("Got some errors", $(NotificationElement.class).exists()); - assertNotNull("Could not find a details", getGridElement() - .getDetails(0)); + assertNotNull("Could not find a details", + getGridElement().getDetails(0)); } @Test @@ -263,8 +263,8 @@ public class GridDetailsServerTest extends GridBasicFeaturesTest { scrollGridVerticallyTo(1000); assertFalse("Got some errors", $(NotificationElement.class).exists()); - assertNotNull("Could not find a details", getGridElement() - .getDetails(0)); + assertNotNull("Could not find a details", + getGridElement().getDetails(0)); } @Test @@ -276,8 +276,8 @@ public class GridDetailsServerTest extends GridBasicFeaturesTest { scrollGridVerticallyTo(0); assertFalse("Got some errors", $(NotificationElement.class).exists()); - assertNotNull("Could not find a details", getGridElement() - .getDetails(0)); + assertNotNull("Could not find a details", + getGridElement().getDetails(0)); } @Test diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorBufferedTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorBufferedTest.java index 8340c40b4b..fc01f5cdc0 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorBufferedTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorBufferedTest.java @@ -59,8 +59,8 @@ public class GridEditorBufferedTest extends GridEditorTest { new Actions(getDriver()).sendKeys(Keys.ENTER).perform(); assertEditorClosed(); - assertEquals("(100, 0) changed", getGridElement().getCell(100, 0) - .getText()); + assertEquals("(100, 0) changed", + getGridElement().getCell(100, 0).getText()); } @Test @@ -101,13 +101,13 @@ public class GridEditorBufferedTest extends GridEditorTest { textField.sendKeys(" changed"); - WebElement saveButton = getEditor().findElement( - By.className("v-grid-editor-save")); + WebElement saveButton = getEditor() + .findElement(By.className("v-grid-editor-save")); saveButton.click(); - assertEquals("(100, 0) changed", getGridElement().getCell(100, 0) - .getText()); + assertEquals("(100, 0) changed", + getGridElement().getCell(100, 0).getText()); } @Test @@ -125,8 +125,8 @@ public class GridEditorBufferedTest extends GridEditorTest { selectMenuPath("Component", "Editor", "Save"); - assertEquals("(100, 0) changed", getGridElement().getCell(100, 0) - .getText()); + assertEquals("(100, 0) changed", + getGridElement().getCell(100, 0).getText()); } @Test @@ -151,7 +151,8 @@ public class GridEditorBufferedTest extends GridEditorTest { private void makeInvalidEdition() { selectMenuPath(EDIT_ITEM_5); - assertFalse(logContainsText("Exception occured, java.lang.IllegalStateException")); + assertFalse(logContainsText( + "Exception occured, java.lang.IllegalStateException")); GridEditorElement editor = getGridElement().getEditor(); @@ -197,8 +198,8 @@ public class GridEditorBufferedTest extends GridEditorTest { GridConstants.DEFAULT_SAVE_CAPTION, getSaveButton().getText()); assertEquals("Cancel button caption should've been \"" + GridConstants.DEFAULT_CANCEL_CAPTION + "\" to begin with", - GridConstants.DEFAULT_CANCEL_CAPTION, getCancelButton() - .getText()); + GridConstants.DEFAULT_CANCEL_CAPTION, + getCancelButton().getText()); selectMenuPath("Component", "Editor", "Change save caption"); assertNotEquals( @@ -211,8 +212,8 @@ public class GridEditorBufferedTest extends GridEditorTest { selectMenuPath(EDIT_ITEM_5); assertNotEquals( "Cancel button caption should've changed while editor is closed", - GridConstants.DEFAULT_CANCEL_CAPTION, getCancelButton() - .getText()); + GridConstants.DEFAULT_CANCEL_CAPTION, + getCancelButton().getText()); } @Test(expected = NoSuchElementException.class) @@ -288,11 +289,12 @@ public class GridEditorBufferedTest extends GridEditorTest { public void testProgrammaticOpeningDisabledWhenOpen() { selectMenuPath(EDIT_ITEM_5); assertEditorOpen(); - assertEquals("Editor should edit row 5", "(5, 0)", getEditorWidgets() - .get(0).getAttribute("value")); + assertEquals("Editor should edit row 5", "(5, 0)", + getEditorWidgets().get(0).getAttribute("value")); selectMenuPath(EDIT_ITEM_100); - boolean thrown = logContainsText("Exception occured, java.lang.IllegalStateException"); + boolean thrown = logContainsText( + "Exception occured, java.lang.IllegalStateException"); assertTrue("IllegalStateException thrown", thrown); assertEditorOpen(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java index 0cba2ce34b..8131ac01df 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java @@ -70,7 +70,8 @@ public abstract class GridEditorTest extends GridBasicFeaturesTest { selectMenuPath(TOGGLE_EDIT_ENABLED); selectMenuPath(EDIT_ITEM_5); assertEditorClosed(); - boolean thrown = logContainsText("Exception occured, java.lang.IllegalStateException"); + boolean thrown = logContainsText( + "Exception occured, java.lang.IllegalStateException"); assertTrue("IllegalStateException thrown", thrown); } @@ -79,7 +80,8 @@ public abstract class GridEditorTest extends GridBasicFeaturesTest { selectMenuPath(EDIT_ITEM_5); selectMenuPath(TOGGLE_EDIT_ENABLED); assertEditorOpen(); - boolean thrown = logContainsText("Exception occured, java.lang.IllegalStateException"); + boolean thrown = logContainsText( + "Exception occured, java.lang.IllegalStateException"); assertTrue("IllegalStateException thrown", thrown); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java index c4d1893875..280eeca58d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java @@ -62,7 +62,8 @@ public class GridEditorUnbufferedTest extends GridEditorTest { selectMenuPath(EDIT_ITEM_5); assertEditorOpen(); selectMenuPath(TOGGLE_EDITOR_BUFFERED); - boolean thrown = logContainsText("Exception occured, java.lang.IllegalStateException"); + boolean thrown = logContainsText( + "Exception occured, java.lang.IllegalStateException"); assertTrue("IllegalStateException thrown", thrown); } @@ -110,8 +111,8 @@ public class GridEditorUnbufferedTest extends GridEditorTest { firstFieldValue = getEditorWidgets().get(0).getAttribute("value"); int row = 100 - i; - assertEquals("Editor should move to row " + row, - "(" + row + ", 0)", firstFieldValue); + assertEquals("Editor should move to row " + row, "(" + row + ", 0)", + firstFieldValue); } } @@ -156,8 +157,8 @@ public class GridEditorUnbufferedTest extends GridEditorTest { assertEditorOpen(); - WebElement editorFooter = getEditor().findElement( - By.className("v-grid-editor-footer")); + WebElement editorFooter = getEditor() + .findElement(By.className("v-grid-editor-footer")); assertTrue("Editor footer should not be visible when there's no error", editorFooter.getCssValue("display").equalsIgnoreCase("none")); @@ -236,8 +237,8 @@ public class GridEditorUnbufferedTest extends GridEditorTest { public void testProgrammaticOpeningWhenOpen() { selectMenuPath(EDIT_ITEM_5); assertEditorOpen(); - assertEquals("Editor should edit row 5", "(5, 0)", getEditorWidgets() - .get(0).getAttribute("value")); + assertEquals("Editor should edit row 5", "(5, 0)", + getEditorWidgets().get(0).getAttribute("value")); selectMenuPath(EDIT_ITEM_100); assertEditorOpen(); @@ -282,13 +283,12 @@ public class GridEditorUnbufferedTest extends GridEditorTest { editor.click(5, 5); editor.sendKeys("Foo", Keys.ENTER); - assertEquals("Editor did not move.", "(6, 0)", getGridElement() - .getEditor().getField(0).getAttribute("value")); - assertEquals("Editor field value did not update from server.", - "(6, 2)", getGridElement().getEditor().getField(2) - .getAttribute("value")); + assertEquals("Editor did not move.", "(6, 0)", + getGridElement().getEditor().getField(0).getAttribute("value")); + assertEquals("Editor field value did not update from server.", "(6, 2)", + getGridElement().getEditor().getField(2).getAttribute("value")); - assertEquals("Edited value was not saved.", "Foo", getGridElement() - .getCell(5, 2).getText()); + assertEquals("Edited value was not saved.", "Foo", + getGridElement().getCell(5, 2).getText()); } }
\ No newline at end of file diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridFocusTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridFocusTest.java index ca9d78409c..43ad7c0bb0 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridFocusTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridFocusTest.java @@ -62,8 +62,8 @@ public class GridFocusTest extends GridBasicFeaturesTest { public void testProgrammaticFocus() { selectMenuPath("Component", "State", "Set focus"); - assertTrue("Grid cell (0, 0) should be focused", getGridElement() - .getCell(0, 0).isFocused()); + assertTrue("Grid cell (0, 0) should be focused", + getGridElement().getCell(0, 0).isFocused()); } @Test diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridItemClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridItemClickTest.java index 57fc56c995..f358b1e560 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridItemClickTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridItemClickTest.java @@ -34,7 +34,8 @@ public class GridItemClickTest extends GridBasicFeaturesTest { GridCellElement cell = getGridElement().getCell(3, 2); new Actions(getDriver()).moveToElement(cell).click().perform(); - assertTrue("No click in log", logContainsText(itemClickOn(3, 2, false))); + assertTrue("No click in log", + logContainsText(itemClickOn(3, 2, false))); } @Test diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java index 6724a7bb49..9ab0bc688a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java @@ -35,13 +35,13 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest { openTestURL(); GridElement grid = getGridElement(); - assertTrue("Body cell 0, 0 is not focused on init.", grid.getCell(0, 0) - .isFocused()); + assertTrue("Body cell 0, 0 is not focused on init.", + grid.getCell(0, 0).isFocused()); grid.getCell(5, 2).click(); - assertFalse("Body cell 0, 0 was still focused after clicking", grid - .getCell(0, 0).isFocused()); - assertTrue("Body cell 5, 2 is not focused after clicking", grid - .getCell(5, 2).isFocused()); + assertFalse("Body cell 0, 0 was still focused after clicking", + grid.getCell(0, 0).isFocused()); + assertTrue("Body cell 5, 2 is not focused after clicking", + grid.getCell(5, 2).isFocused()); } @Test @@ -49,11 +49,11 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest { openTestURL(); GridElement grid = getGridElement(); - assertTrue("Body cell 0, 0 is not focused on init.", grid.getCell(0, 0) - .isFocused()); + assertTrue("Body cell 0, 0 is not focused on init.", + grid.getCell(0, 0).isFocused()); grid.getHeaderCell(0, 3).click(); - assertFalse("Body cell 0, 0 is focused after click on header.", grid - .getCell(0, 0).isFocused()); + assertFalse("Body cell 0, 0 is focused after click on header.", + grid.getCell(0, 0).isFocused()); assertTrue("Header cell 0, 3 is not focused after click on header.", grid.getHeaderCell(0, 3).isFocused()); } @@ -82,8 +82,8 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest { isElementPresent(By.xpath("//td[text() = '(0, 0)']"))); assertTrue("Cell focus is not visible", isElementPresent(By.xpath("//td[text() = '(" + i + ", 0)']"))); - assertTrue("Body cell " + i + ", 1 is not focused", grid.getCell(i, 1) - .isFocused()); + assertTrue("Body cell " + i + ", 1 is not focused", + grid.getCell(i, 1).isFocused()); } @Test @@ -96,11 +96,11 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest { .perform(); grid.scrollToRow(280); - assertTrue("Header cell is not focused.", grid.getHeaderCell(0, 7) - .isFocused()); + assertTrue("Header cell is not focused.", + grid.getHeaderCell(0, 7).isFocused()); new Actions(getDriver()).sendKeys(Keys.ARROW_DOWN).perform(); - assertTrue("Body cell 280, 7 is not focused", grid.getCell(280, 7) - .isFocused()); + assertTrue("Body cell 280, 7 is not focused", + grid.getCell(280, 7).isFocused()); } @Test @@ -113,11 +113,11 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest { grid.scrollToRow(300); grid.getFooterCell(0, 2).click(); - assertTrue("Footer cell does not have focus.", grid.getFooterCell(0, 2) - .isFocused()); + assertTrue("Footer cell does not have focus.", + grid.getFooterCell(0, 2).isFocused()); new Actions(getDriver()).sendKeys(Keys.ARROW_UP).perform(); - assertTrue("Body cell 300, 2 does not have focus.", grid - .getCell(300, 2).isFocused()); + assertTrue("Body cell 300, 2 does not have focus.", + grid.getCell(300, 2).isFocused()); } @Test @@ -127,15 +127,15 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest { GridElement grid = getGridElement(); grid.getCell(10, 2).click(); - assertTrue("Body cell 10, 2 does not have focus", grid.getCell(10, 2) - .isFocused()); + assertTrue("Body cell 10, 2 does not have focus", + grid.getCell(10, 2).isFocused()); new Actions(getDriver()).keyDown(Keys.SHIFT).sendKeys(Keys.TAB) .keyUp(Keys.SHIFT).perform(); assertTrue("Header cell 0, 2 does not have focus", grid.getHeaderCell(0, 2).isFocused()); new Actions(getDriver()).sendKeys(Keys.TAB).perform(); - assertTrue("Body cell 10, 2 does not have focus", grid.getCell(10, 2) - .isFocused()); + assertTrue("Body cell 10, 2 does not have focus", + grid.getCell(10, 2).isFocused()); // Navigate out of the Grid and try to navigate with arrow keys. new Actions(getDriver()).keyDown(Keys.SHIFT).sendKeys(Keys.TAB) @@ -154,15 +154,15 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest { GridElement grid = getGridElement(); grid.getCell(10, 2).click(); - assertTrue("Body cell 10, 2 does not have focus", grid.getCell(10, 2) - .isFocused()); + assertTrue("Body cell 10, 2 does not have focus", + grid.getCell(10, 2).isFocused()); new Actions(getDriver()).sendKeys(Keys.TAB).perform(); assertTrue("Footer cell 0, 2 does not have focus", grid.getFooterCell(0, 2).isFocused()); new Actions(getDriver()).keyDown(Keys.SHIFT).sendKeys(Keys.TAB) .keyUp(Keys.SHIFT).perform(); - assertTrue("Body cell 10, 2 does not have focus", grid.getCell(10, 2) - .isFocused()); + assertTrue("Body cell 10, 2 does not have focus", + grid.getCell(10, 2).isFocused()); // Navigate out of the Grid and try to navigate with arrow keys. new Actions(getDriver()).sendKeys(Keys.TAB).sendKeys(Keys.TAB) @@ -178,13 +178,12 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest { getGridElement().getCell(100, 2).click(); new Actions(getDriver()).sendKeys(Keys.HOME).perform(); - assertTrue("First row is not visible", getGridElement().getCell(0, 2) - .isDisplayed()); + assertTrue("First row is not visible", + getGridElement().getCell(0, 2).isDisplayed()); new Actions(getDriver()).sendKeys(Keys.END).perform(); - assertTrue("Last row cell not visible", - getGridElement().getCell(GridBasicFeatures.ROWS - 1, 2) - .isDisplayed()); + assertTrue("Last row cell not visible", getGridElement() + .getCell(GridBasicFeatures.ROWS - 1, 2).isDisplayed()); } @Test @@ -215,8 +214,8 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest { } private void checkFocusedCell(int row, int column, int rowTolerance) { - WebElement focusedCell = getGridElement().findElement( - By.className("v-grid-cell-focused")); + WebElement focusedCell = getGridElement() + .findElement(By.className("v-grid-cell-focused")); String cellContents = focusedCell.getText(); String[] rowAndCol = cellContents.replaceAll("[()\\s]", "").split(","); int focusedRow = Integer.parseInt(rowAndCol[0].trim()); @@ -224,8 +223,9 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest { // rowTolerance is the maximal allowed difference from the expected // focused row. It is required because scrolling using page up/down // may not move the position by exactly the visible height of the grid. - assertTrue("The wrong cell is focused. Expected (" + row + "," + column - + "), was " + cellContents, + assertTrue( + "The wrong cell is focused. Expected (" + row + "," + column + + "), was " + cellContents, column == focusedColumn && Math.abs(row - focusedRow) <= rowTolerance); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridMultiSortingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridMultiSortingTest.java index a3cf5872f0..72477c12ba 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridMultiSortingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridMultiSortingTest.java @@ -58,9 +58,8 @@ public class GridMultiSortingTest extends GridBasicFeaturesTest { prev = getGridElement().getCell(0, 0).getText(); for (int i = 1; i <= 6; ++i) { - assertTrue( - "Grid is not sorted by column 0.", - prev.compareTo(getGridElement().getCell(i, 0).getText()) < 0); + assertTrue("Grid is not sorted by column 0.", prev + .compareTo(getGridElement().getCell(i, 0).getText()) < 0); } } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java index 9313b40770..3a3a6caa38 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java @@ -33,8 +33,8 @@ public class GridScrollTest extends GridBasicFeaturesTest { getLogRow(1).equals("0. Requested items 0 - 40")); // Client response varies a bit between browsers as different amount of // rows is cached. - assertTrue("First row request from client not found", getLogRow(0) - .startsWith("1. Requested items 0 - ")); + assertTrue("First row request from client not found", + getLogRow(0).startsWith("1. Requested items 0 - ")); selectMenuPath("Component", "Size", "HeightMode Row"); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSelectionTest.java index 44a632bc49..82a8699657 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSelectionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSelectionTest.java @@ -40,8 +40,8 @@ public class GridSelectionTest extends GridBasicFeaturesTest { setSelectionModelMulti(); - assertFalse("row shouldn't start out as selected", getRow(0) - .isSelected()); + assertFalse("row shouldn't start out as selected", + getRow(0).isSelected()); toggleFirstRowSelection(); assertTrue("row should become selected", getRow(0).isSelected()); toggleFirstRowSelection(); @@ -54,8 +54,8 @@ public class GridSelectionTest extends GridBasicFeaturesTest { setSelectionModelMulti(); - assertFalse("row shouldn't start out as selected", getRow(0) - .isSelected()); + assertFalse("row shouldn't start out as selected", + getRow(0).isSelected()); toggleFirstRowSelection(); assertTrue("row should become selected", getRow(0).isSelected()); @@ -72,8 +72,8 @@ public class GridSelectionTest extends GridBasicFeaturesTest { setSelectionModelMulti(); - assertFalse("row shouldn't start out as selected", getRow(0) - .isSelected()); + assertFalse("row shouldn't start out as selected", + getRow(0).isSelected()); scrollGridVerticallyTo(10000); // make sure the row is out of cache toggleFirstRowSelection(); @@ -92,16 +92,17 @@ public class GridSelectionTest extends GridBasicFeaturesTest { setSelectionModelMulti(); - assertFalse("row shouldn't start out as selected", getRow(0) - .isSelected()); + assertFalse("row shouldn't start out as selected", + getRow(0).isSelected()); scrollGridVerticallyTo(10000); // make sure the row is out of cache toggleFirstRowSelection(); toggleFirstRowSelection(); scrollGridVerticallyTo(0); // make sure the row is out of cache - assertFalse("row shouldn't be selected when scrolling " - + "back into view", getRow(0).isSelected()); + assertFalse( + "row shouldn't be selected when scrolling " + "back into view", + getRow(0).isSelected()); } @Test @@ -110,8 +111,8 @@ public class GridSelectionTest extends GridBasicFeaturesTest { setSelectionModelSingle(); GridElement grid = getGridElement(); - assertFalse("First row was selected from start", grid.getRow(0) - .isSelected()); + assertFalse("First row was selected from start", + grid.getRow(0).isSelected()); toggleFirstRowSelection(); assertTrue("First row was not selected.", getRow(0).isSelected()); assertTrue("Selection event was not correct", @@ -151,20 +152,20 @@ public class GridSelectionTest extends GridBasicFeaturesTest { grid.getCell(3, 1).click(); new Actions(getDriver()).sendKeys(Keys.SPACE).perform(); - assertTrue("Grid row 3 was not selected with space key.", grid - .getRow(3).isSelected()); + assertTrue("Grid row 3 was not selected with space key.", + grid.getRow(3).isSelected()); new Actions(getDriver()).sendKeys(Keys.SPACE).perform(); - assertTrue("Grid row 3 was not deselected with space key.", !grid - .getRow(3).isSelected()); + assertTrue("Grid row 3 was not deselected with space key.", + !grid.getRow(3).isSelected()); grid.scrollToRow(500); new Actions(getDriver()).sendKeys(Keys.SPACE).perform(); - assertTrue("Grid row 3 was not selected with space key.", grid - .getRow(3).isSelected()); + assertTrue("Grid row 3 was not selected with space key.", + grid.getRow(3).isSelected()); } @Test @@ -175,25 +176,25 @@ public class GridSelectionTest extends GridBasicFeaturesTest { GridElement grid = getGridElement(); grid.getCell(3, 1).click(); - assertTrue("Grid row 3 was not selected with clicking.", grid.getRow(3) - .isSelected()); + assertTrue("Grid row 3 was not selected with clicking.", + grid.getRow(3).isSelected()); new Actions(getDriver()).sendKeys(Keys.SPACE).perform(); - assertTrue("Grid row 3 was not deselected with space key.", !grid - .getRow(3).isSelected()); + assertTrue("Grid row 3 was not deselected with space key.", + !grid.getRow(3).isSelected()); new Actions(getDriver()).sendKeys(Keys.SPACE).perform(); - assertTrue("Grid row 3 was not selected with space key.", grid - .getRow(3).isSelected()); + assertTrue("Grid row 3 was not selected with space key.", + grid.getRow(3).isSelected()); grid.scrollToRow(500); new Actions(getDriver()).sendKeys(Keys.SPACE).perform(); - assertTrue("Grid row 3 was not deselected with space key.", !grid - .getRow(3).isSelected()); + assertTrue("Grid row 3 was not deselected with space key.", + !grid.getRow(3).isSelected()); } @Test @@ -207,13 +208,13 @@ public class GridSelectionTest extends GridBasicFeaturesTest { header.findElement(By.tagName("input")).click(); for (int i = 0; i < GridBasicFeatures.ROWS; i += 100) { - assertTrue("Row " + i + " was not selected.", getGridElement() - .getRow(i).isSelected()); + assertTrue("Row " + i + " was not selected.", + getGridElement().getRow(i).isSelected()); } header.findElement(By.tagName("input")).click(); - assertFalse("Row 100 was still selected", getGridElement().getRow(100) - .isSelected()); + assertFalse("Row 100 was still selected", + getGridElement().getRow(100).isSelected()); } @Test @@ -227,14 +228,13 @@ public class GridSelectionTest extends GridBasicFeaturesTest { getGridElement().getHeaderCell(0, 1).click(); - WebElement selectionBox = getGridElement().getCell(4, 0).findElement( - By.tagName("input")); + WebElement selectionBox = getGridElement().getCell(4, 0) + .findElement(By.tagName("input")); selectionBox.click(); selectionBox.click(); - assertFalse( - "Exception occured on row reselection.", - logContainsText("Exception occured, java.lang.IllegalStateException: No item id for key 101 found.")); + assertFalse("Exception occured on row reselection.", logContainsText( + "Exception occured, java.lang.IllegalStateException: No item id for key 101 found.")); } @Test @@ -261,8 +261,8 @@ public class GridSelectionTest extends GridBasicFeaturesTest { // Single selection model shouldn't have selection column to begin with assertFalse( "Selection columnn shouldn't have been in grid for Single Selection Model", - getGridElement().getCell(0, 1).isElementPresent( - By.tagName("input"))); + getGridElement().getCell(0, 1) + .isElementPresent(By.tagName("input"))); setSelectionModelNone(); header = getGridElement().getHeaderCell(0, 0); @@ -295,19 +295,19 @@ public class GridSelectionTest extends GridBasicFeaturesTest { getGridElement().getCell(5, 1).click(); getGridElement().getCell(5, 1).click(); - assertFalse("Row should be not selected after two clicks", getRow(5) - .isSelected()); + assertFalse("Row should be not selected after two clicks", + getRow(5).isSelected()); selectMenuPath("Component", "State", "Single select allow deselect"); getGridElement().getCell(5, 1).click(); getGridElement().getCell(5, 1).click(); - assertTrue("Row should be selected after two clicks", getRow(5) - .isSelected()); + assertTrue("Row should be selected after two clicks", + getRow(5).isSelected()); selectMenuPath("Component", "State", "Single select allow deselect"); getGridElement().getCell(5, 1).click(); - assertFalse("Row should be not selected after another click", getRow(5) - .isSelected()); + assertFalse("Row should be not selected after another click", + getRow(5).isSelected()); // Also verify that state is updated together with the model setSelectionModelNone(); @@ -317,8 +317,8 @@ public class GridSelectionTest extends GridBasicFeaturesTest { getGridElement().getCell(5, 1).click(); getGridElement().getCell(5, 1).click(); - assertTrue("Row should stay selected after two clicks", getRow(5) - .isSelected()); + assertTrue("Row should stay selected after two clicks", + getRow(5).isSelected()); } @Test @@ -328,12 +328,11 @@ public class GridSelectionTest extends GridBasicFeaturesTest { setSelectionModelSingle(); getGridElement().getCell(5, 1).click(); - assertTrue("Row should be selected after clicking", getRow(5) - .isSelected()); + assertTrue("Row should be selected after clicking", + getRow(5).isSelected()); setSelectionModelNone(); - assertFalse( - "Row should not be selected after changing selection model", + assertFalse("Row should not be selected after changing selection model", getRow(5).isSelected()); } @@ -393,7 +392,8 @@ public class GridSelectionTest extends GridBasicFeaturesTest { assertFalse( "Unexpected NullPointerException when removing selected rows", - logContainsText("Exception occured, java.lang.NullPointerException: null")); + logContainsText( + "Exception occured, java.lang.NullPointerException: null")); } private void waitUntilCheckBoxValue(final WebElement checkBoxElememnt, diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java index c23e5d1f11..4fb3431a70 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java @@ -86,8 +86,10 @@ public class GridSortingTest extends GridBasicFeaturesTest { row += "9"; String expected = "(" + row + ", 0)"; String cellValue = getGridElement().getCell(i, 0).getText(); - assertEquals("Grid is not sorted by Column 9 " - + "using descending direction.", expected, cellValue); + assertEquals( + "Grid is not sorted by Column 9 " + + "using descending direction.", + expected, cellValue); } // Column 10 is random numbers from Random with seed 13334 @@ -100,10 +102,10 @@ public class GridSortingTest extends GridBasicFeaturesTest { assertColumnsAreSortedAs(_(10, 1, SortDirection.ASCENDING)); for (int i = 0; i < 5; ++i) { - Integer firstRow = Integer.valueOf(getGridElement().getCell(i + 1, - 10).getText()); - Integer secondRow = Integer.valueOf(getGridElement().getCell(i, 10) - .getText()); + Integer firstRow = Integer + .valueOf(getGridElement().getCell(i + 1, 10).getText()); + Integer secondRow = Integer + .valueOf(getGridElement().getCell(i, 10).getText()); assertGreater("Grid is not sorted by Column 10 using" + " ascending direction", firstRow, secondRow); @@ -114,8 +116,8 @@ public class GridSortingTest extends GridBasicFeaturesTest { sortBy("Column 7, DESC"); for (int i = 0; i < 3; ++i) { String expected = "(" + i + ", 0)"; - String cellContent = getGridElement().getCell( - GridBasicFeatures.ROWS - (i + 1), 0).getText(); + String cellContent = getGridElement() + .getCell(GridBasicFeatures.ROWS - (i + 1), 0).getText(); assertEquals("Grid is not sorted by Column 7 using " + "descending direction", expected, cellContent); } @@ -167,8 +169,8 @@ public class GridSortingTest extends GridBasicFeaturesTest { assertColumnsAreSortedAs(_(10, 1, SortDirection.ASCENDING)); for (int i = 0; i < 5; ++i) { - Integer firstRow = Integer.valueOf(grid.getCell(i + 1, 10) - .getText()); + Integer firstRow = Integer + .valueOf(grid.getCell(i + 1, 10).getText()); Integer secondRow = Integer.valueOf(grid.getCell(i, 10).getText()); assertGreater( "Grid is not sorted by Column 10 using ascending direction", @@ -190,7 +192,8 @@ public class GridSortingTest extends GridBasicFeaturesTest { assertEquals( "Grid is not sorted by Column 7 using descending direction", "(" + i + ", 0)", - grid.getCell(GridBasicFeatures.ROWS - (i + 1), 0).getText()); + grid.getCell(GridBasicFeatures.ROWS - (i + 1), 0) + .getText()); } } @@ -377,9 +380,8 @@ public class GridSortingTest extends GridBasicFeaturesTest { private void assertLastSortIsUserOriginated(boolean isUserOriginated) { // Find a message in the log - List<WebElement> userOriginatedMessages = getDriver() - .findElements( - By.xpath("//div[@id='Log']//*[contains(text(),'SortEvent: isUserOriginated')]")); + List<WebElement> userOriginatedMessages = getDriver().findElements(By + .xpath("//div[@id='Log']//*[contains(text(),'SortEvent: isUserOriginated')]")); Collections.sort(userOriginatedMessages, new Comparator<WebElement>() { @Override @@ -388,8 +390,8 @@ public class GridSortingTest extends GridBasicFeaturesTest { } }); - String newestEntry = userOriginatedMessages.get( - userOriginatedMessages.size() - 1).getText(); + String newestEntry = userOriginatedMessages + .get(userOriginatedMessages.size() - 1).getText(); String[] parts = newestEntry.split(" "); boolean wasUserOriginated = Boolean diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStaticSectionComponentTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStaticSectionComponentTest.java index 2fbaa58cab..c923ed111d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStaticSectionComponentTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStaticSectionComponentTest.java @@ -64,8 +64,8 @@ public class GridStaticSectionComponentTest extends GridBasicFeaturesTest { assertTrue("No notifications should've been shown", !$(NotificationElement.class).exists()); assertEquals("Header should've been reverted back to text header", - "text header", getGridElement().getHeaderCell(0, 1).getText() - .toLowerCase()); + "text header", + getGridElement().getHeaderCell(0, 1).getText().toLowerCase()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java index 7c50ae5d6e..9676c1940b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java @@ -49,8 +49,8 @@ public class GridStructureTest extends GridBasicFeaturesTest { assertFalse(isElementPresent(NotificationElement.class)); } - assertEquals("Headers still visible.", 0, getGridHeaderRowCells() - .size()); + assertEquals("Headers still visible.", 0, + getGridHeaderRowCells().size()); } @Test @@ -58,16 +58,16 @@ public class GridStructureTest extends GridBasicFeaturesTest { setDebug(true); openTestURL(); - assertEquals("column 0", getGridElement().getHeaderCell(0, 0).getText() - .toLowerCase()); + assertEquals("column 0", + getGridElement().getHeaderCell(0, 0).getText().toLowerCase()); selectMenuPath("Component", "Columns", "Column 0", "Add / Remove"); - assertEquals("column 1", getGridElement().getHeaderCell(0, 0).getText() - .toLowerCase()); + assertEquals("column 1", + getGridElement().getHeaderCell(0, 0).getText().toLowerCase()); selectMenuPath("Component", "Columns", "Column 0", "Add / Remove"); // Column 0 is now the last column in Grid. - assertEquals("Unexpected column content", "(0, 0)", getGridElement() - .getCell(0, 11).getText()); + assertEquals("Unexpected column content", "(0, 0)", + getGridElement().getCell(0, 11).getText()); } @Test @@ -316,9 +316,10 @@ public class GridStructureTest extends GridBasicFeaturesTest { try { GridCellElement cell = getGridElement().getCell(row, 1); foundElements = true; - assertTrue("Unexpected cell contents. " - + "Did the ItemSetChange work after all?", cell - .getText().startsWith("(23")); + assertTrue( + "Unexpected cell contents. " + + "Did the ItemSetChange work after all?", + cell.getText().startsWith("(23")); } catch (NoSuchElementException e) { assertTrue("No rows were found", foundElements); return; @@ -357,10 +358,11 @@ public class GridStructureTest extends GridBasicFeaturesTest { // Compare with reversed order for (int i = 0; i < gridData.length; ++i) { final int column = gridData.length - 1 - i; - final String newText = grid.getCell(0, column).getAttribute( - "innerHTML"); - assertEquals("Grid contained unexpected values. (0, " + column - + ")", gridData[i], newText); + final String newText = grid.getCell(0, column) + .getAttribute("innerHTML"); + assertEquals( + "Grid contained unexpected values. (0, " + column + ")", + gridData[i], newText); } } @@ -369,10 +371,11 @@ public class GridStructureTest extends GridBasicFeaturesTest { setDebug(true); openTestURL(); - assertNotEquals("property value", getGridElement().getCell(0, 0) - .getText()); + assertNotEquals("property value", + getGridElement().getCell(0, 0).getText()); selectMenuPath("Component", "Properties", "Prepend property"); - assertEquals("property value", getGridElement().getCell(0, 0).getText()); + assertEquals("property value", + getGridElement().getCell(0, 0).getText()); } @Test @@ -380,20 +383,20 @@ public class GridStructureTest extends GridBasicFeaturesTest { openTestURL(); assertEquals("(0, 0)", getGridElement().getCell(0, 0).getText()); - assertNotEquals("property value", getGridElement().getCell(0, 0) - .getText()); + assertNotEquals("property value", + getGridElement().getCell(0, 0).getText()); selectMenuPath("Component", "Properties", "Prepend property"); selectMenuPath("Component", "Properties", "Prepend property"); - assertNotEquals("property value", getGridElement().getCell(0, 0) - .getText()); + assertNotEquals("property value", + getGridElement().getCell(0, 0).getText()); assertEquals("(0, 0)", getGridElement().getCell(0, 0).getText()); } private boolean verticalScrollbarIsPresent() { - return "scroll".equals(getGridVerticalScrollbar().getCssValue( - "overflow-y")); + return "scroll" + .equals(getGridVerticalScrollbar().getCssValue("overflow-y")); } @Test @@ -444,7 +447,8 @@ public class GridStructureTest extends GridBasicFeaturesTest { assertFalse("Error notification was present after removing all rows", isElementPresent(NotificationElement.class)); - assertFalse(getGridElement().isElementPresent(By.vaadin("#cell[0][0]"))); + assertFalse( + getGridElement().isElementPresent(By.vaadin("#cell[0][0]"))); } private void assertPrimaryStylename(String stylename) { @@ -457,8 +461,8 @@ public class GridStructureTest extends GridBasicFeaturesTest { String hscrollStyleName = getGridElement().getHorizontalScroller() .getAttribute("class"); assertTrue(hscrollStyleName.contains(stylename + "-scroller")); - assertTrue(hscrollStyleName - .contains(stylename + "-scroller-horizontal")); + assertTrue( + hscrollStyleName.contains(stylename + "-scroller-horizontal")); String vscrollStyleName = getGridElement().getVerticalScroller() .getAttribute("class"); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java index f4771b9067..fa44988a11 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java @@ -45,11 +45,11 @@ public class LoadingIndicatorTest extends GridBasicFeaturesTest { gridElement.getCell(200, 1); // Wait for loading indicator delay - waitUntil(ExpectedConditions.visibilityOfElementLocated(By - .className("v-loading-indicator"))); + waitUntil(ExpectedConditions.visibilityOfElementLocated( + By.className("v-loading-indicator"))); - waitUntilNot(ExpectedConditions.visibilityOfElementLocated(By - .className("v-loading-indicator"))); + waitUntilNot(ExpectedConditions.visibilityOfElementLocated( + By.className("v-loading-indicator"))); // Scroll so much that more data gets fetched, but not so much that // missing rows are shown diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutBaseTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutBaseTest.java index 8bbb5cfe1a..b240ad2031 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutBaseTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutBaseTest.java @@ -50,7 +50,8 @@ public abstract class GridLayoutBaseTest extends MultiBrowserTest { } } - private void waitUntilColumnAndRowAreHidden(final List<WebElement> slots4x4) { + private void waitUntilColumnAndRowAreHidden( + final List<WebElement> slots4x4) { waitUntil(new ExpectedCondition<Boolean>() { @Override public Boolean apply(WebDriver input) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUITest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUITest.java index 8c753b1f5c..35678c1960 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUITest.java @@ -90,9 +90,9 @@ public class GridLayoutCellSizesUITest extends MultiBrowserTest { private void assertNotMatchesSmallHeight(int firstSlotHeight, int i, String id) { - Assert.assertNotEquals("Big slot '" + id - + "' matched small slots in height", firstSlotHeight, - getSlotHeight(i)); + Assert.assertNotEquals( + "Big slot '" + id + "' matched small slots in height", + firstSlotHeight, getSlotHeight(i)); } private int getSlotHeight(int slot) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExpandWithManyRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExpandWithManyRowsTest.java index 693fdc73db..39648a5083 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExpandWithManyRowsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExpandWithManyRowsTest.java @@ -21,8 +21,8 @@ public class GridLayoutExpandWithManyRowsTest extends SingleBrowserTest { // to the first N rows. // The tests uses rowspan=2 so one row in the DOM should be max 2 pixels // lower than the first row - List<WebElement> slots = gridlayout.findElements(By - .className("v-gridlayout-slot")); + List<WebElement> slots = gridlayout + .findElements(By.className("v-gridlayout-slot")); Assert.assertEquals(GridLayoutExpandWithManyRows.POPULATED_ROWS, slots.size()); diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacingTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacingTest.java index 22c9c0d4e3..6a4d009c65 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacingTest.java @@ -40,8 +40,8 @@ public class GridLayoutExtraSpacingTest extends MultiBrowserTest { // There should be 3 * 6px spacing (red) above the csslayout verifySpacingAbove(3 * 6, gridLayout, component); - CheckBoxElement spacingCheckbox = $(CheckBoxElement.class).caption( - "spacing").first(); + CheckBoxElement spacingCheckbox = $(CheckBoxElement.class) + .caption("spacing").first(); check(spacingCheckbox); // Spacing off, not hiding empty rows/columns @@ -100,6 +100,7 @@ public class GridLayoutExtraSpacingTest extends MultiBrowserTest { } private void assertHeight(WebElement component, int height, int tolerance) { - Assert.assertTrue(Math.abs(height - component.getSize().getHeight()) <= tolerance); + Assert.assertTrue(Math + .abs(height - component.getSize().getHeight()) <= tolerance); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java index 95152e1416..2c512b0552 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java @@ -9,8 +9,8 @@ import java.io.IOException; import static org.junit.Assert.*; -public class MoveComponentsFromGridLayoutToInnerLayoutTest extends - MultiBrowserTest { +public class MoveComponentsFromGridLayoutToInnerLayoutTest + extends MultiBrowserTest { @Test public void buttonIsMovedInsideInnerLayout() throws IOException { diff --git a/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentTest.java b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentTest.java index ea610dccda..9626e9d537 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentTest.java @@ -29,7 +29,8 @@ public class BasicJavaScriptComponentTest extends MultiBrowserTest { } Assert.assertEquals( "9. Argument[4][aDate] type: elemental.json.impl.JreJsonString, value: " - + expected, getLogRow(idx++)); + + expected, + getLogRow(idx++)); Assert.assertEquals( "8. Argument[4][aBoolean] type: elemental.json.impl.JreJsonBoolean, value: false", getLogRow(idx++)); @@ -59,7 +60,8 @@ public class BasicJavaScriptComponentTest extends MultiBrowserTest { Assert.assertEquals( "1. Argument[0] type: elemental.json.impl.JreJsonString, value: " - + expected, getLogRow(idx++)); + + expected, + getLogRow(idx++)); // Component attributes AbstractJavaScriptComponentElement jsComponent = $( @@ -67,8 +69,8 @@ public class BasicJavaScriptComponentTest extends MultiBrowserTest { Assert.assertEquals("Component caption", getCaption(jsComponent)); // app://APP/connector/[uiid]/[cid]/[key]/[filename] - Assert.assertTrue(getChildText(jsComponent, 0).matches( - "4. Url: .*/run/APP/connector/0/\\d+/test")); + Assert.assertTrue(getChildText(jsComponent, 0) + .matches("4. Url: .*/run/APP/connector/0/\\d+/test")); Assert.assertEquals("3. State message: Second state message", getChildText(jsComponent, 1)); Assert.assertEquals("2. State message: First state message", diff --git a/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloadingTest.java b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloadingTest.java index 4009365814..682ab9a4f9 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloadingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloadingTest.java @@ -42,14 +42,14 @@ public class JavaScriptPreloadingTest extends MultiBrowserTest { openTestURL(); try { - new WebDriverWait(driver, 10).until(ExpectedConditions - .alertIsPresent()); + new WebDriverWait(driver, 10) + .until(ExpectedConditions.alertIsPresent()); Alert alert = driver.switchTo().alert(); assertEquals("First", alert.getText()); alert.accept(); - new WebDriverWait(driver, 10).until(ExpectedConditions - .alertIsPresent()); + new WebDriverWait(driver, 10) + .until(ExpectedConditions.alertIsPresent()); alert = driver.switchTo().alert(); assertEquals("Second", alert.getText()); alert.accept(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/label/LabelTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/components/label/LabelTooltipTest.java index 36606b9972..212e00a72d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/label/LabelTooltipTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/label/LabelTooltipTest.java @@ -53,10 +53,12 @@ public class LabelTooltipTest extends MultiBrowserTest { private void assertTooltips() throws IOException { $(LabelElement.class).get(2).showTooltip(); - Assert.assertEquals("Default tooltip content", getTooltipElement() - .getText()); + Assert.assertEquals("Default tooltip content", + getTooltipElement().getText()); - /* Some cases tooltip doesn't disappear without some extra mouse events */ + /* + * Some cases tooltip doesn't disappear without some extra mouse events + */ new Actions(getDriver()).moveByOffset(100, -40).perform(); new Actions(getDriver()).moveToElement($(LabelElement.class).get(1)) .click().perform(); @@ -65,8 +67,8 @@ public class LabelTooltipTest extends MultiBrowserTest { Assert.assertEquals( "Error inside tooltip together with the regular tooltip message.", getTooltipErrorElement().getText()); - Assert.assertEquals("Default tooltip content", getTooltipElement() - .getText()); + Assert.assertEquals("Default tooltip content", + getTooltipElement().getText()); /* Visual comparison */ compareScreen("tooltipVisible"); diff --git a/uitest/src/test/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponentTest.java b/uitest/src/test/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponentTest.java index 09d19034e6..8366a013d9 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponentTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponentTest.java @@ -36,8 +36,8 @@ import com.vaadin.tests.tb3.MultiBrowserTest; * * @author Vaadin Ltd */ -public class EmptySpaceOnPageAfterExpandedComponentTest extends - MultiBrowserTest { +public class EmptySpaceOnPageAfterExpandedComponentTest + extends MultiBrowserTest { @Test public void testNoEmptySpaceOnPageAfterExpandedComponent() { @@ -49,8 +49,8 @@ public class EmptySpaceOnPageAfterExpandedComponentTest extends waitUntil(new ExpectedCondition<Boolean>() { @Override public Boolean apply(WebDriver input) { - int expandedElementBottom = expandedElement.getLocation() - .getY() + expandedElement.getSize().getHeight(); + int expandedElementBottom = expandedElement.getLocation().getY() + + expandedElement.getSize().getHeight(); int containerElementBottom = containerElement.getLocation() .getY() + containerElement.getSize().getHeight(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItemsTest.java b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItemsTest.java index dd694995f1..e3a813b473 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItemsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItemsTest.java @@ -53,8 +53,8 @@ public class ListSelectAddRemoveItemsTest extends SingleBrowserTest { } private void assertOptions(String... options) { - Assert.assertEquals(Arrays.asList(options), $(ListSelectElement.class) - .first().getOptions()); + Assert.assertEquals(Arrays.asList(options), + $(ListSelectElement.class).first().getOptions()); } private void click(String caption) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChangesTest.java b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChangesTest.java index a13482d175..200201423b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChangesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChangesTest.java @@ -28,15 +28,15 @@ import com.vaadin.testbench.elements.ListSelectElement; import com.vaadin.testbench.elements.OptionGroupElement; import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2; -public class ListSelectPushSelectionChangesTest extends - SingleBrowserTestPhantomJS2 { +public class ListSelectPushSelectionChangesTest + extends SingleBrowserTestPhantomJS2 { @Test public void testMultiSelectBehavior() { openTestURL(); Assert.assertEquals( - "Should have null item + 3 options in single selection mode", - 4, getListSelect().getOptions().size()); + "Should have null item + 3 options in single selection mode", 4, + getListSelect().getOptions().size()); $(OptionGroupElement.class).caption("Mode").first() .selectByText("Multi"); @@ -124,7 +124,8 @@ public class ListSelectPushSelectionChangesTest extends private List<WebElement> getSelectedOptions() { ListSelectElement listSelect = getListSelect(); - Select select = new Select(listSelect.findElement(By.tagName("select"))); + Select select = new Select( + listSelect.findElement(By.tagName("select"))); return select.getAllSelectedOptions(); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarClickOpenedMenuTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarClickOpenedMenuTest.java index 5f5e6c8abc..18a830d2db 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarClickOpenedMenuTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarClickOpenedMenuTest.java @@ -75,7 +75,8 @@ public class MenuBarClickOpenedMenuTest extends MultiBrowserTest { waitUntil(new ExpectedCondition<Boolean>() { @Override public Boolean apply(WebDriver input) { - return isElementPresent(By.className(menuItemClassName)) == present; + return isElementPresent( + By.className(menuItemClassName)) == present; } @Override diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java index a4f8023ea2..e105006a6c 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java @@ -10,8 +10,8 @@ import com.vaadin.tests.tb3.MultiBrowserTest; public class MenuBarNavigationMouseTest extends MultiBrowserTest { @ServerClass("com.vaadin.ui.MenuBar") - public static class MenuBarElement extends - com.vaadin.testbench.elements.MenuBarElement { + public static class MenuBarElement + extends com.vaadin.testbench.elements.MenuBarElement { public void openMenuPath(String... captions) { for (String c : captions) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValoTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValoTest.java index b7ed88c9ca..ea8c2c2e7e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValoTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValoTest.java @@ -55,8 +55,8 @@ public class MenuBarSubmenusClosingValoTest extends MultiBrowserTest { Mouse mouse = ((HasInputDevices) getDriver()).getMouse(); - List<WebElement> menuItemList = driver.findElements(By - .className("v-menubar-menuitem")); + List<WebElement> menuItemList = driver + .findElements(By.className("v-menubar-menuitem")); mouse.click(((Locatable) menuItemList.get(0)).getCoordinates()); waitForElementPresent(By.className("v-menubar-popup")); diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdgeTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdgeTest.java index a460290ee0..499661f793 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdgeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdgeTest.java @@ -54,7 +54,7 @@ public class MenuBarTooltipsNearEdgeTest extends MultiBrowserTest { mouse.click(menuLocation); mouse.mouseMove(menuLocation, 5, -40); WebElement tooltip = getTooltipElement(); - assertThat(tooltip.getLocation().x, is(lessThan(menuLocation.onPage().x - - tooltip.getSize().getWidth()))); + assertThat(tooltip.getLocation().x, is(lessThan( + menuLocation.onPage().x - tooltip.getSize().getWidth()))); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarsWithNestingTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarsWithNestingTest.java index 4c3383c5d6..5a9f8fc043 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarsWithNestingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarsWithNestingTest.java @@ -53,8 +53,8 @@ public class MenuBarsWithNestingTest extends MultiBrowserTest { fileMenu.click(); WebElement exportMenu = fileMenu.findElement(By.vaadin("#Export..")); exportMenu.click(); - waitUntil(ExpectedConditions.visibilityOfElementLocated(By - .xpath(".//*[text() = 'As PDF...']"))); + waitUntil(ExpectedConditions.visibilityOfElementLocated( + By.xpath(".//*[text() = 'As PDF...']"))); } @Test @@ -72,8 +72,8 @@ public class MenuBarsWithNestingTest extends MultiBrowserTest { public void testNestedMenuWithIcons() throws InterruptedException { String selection = itemNames[itemNames.length - 1]; for (String itemName : nestedItemnames) { - WebElement lastMenuItem = secondMenuBar.findElement(By.vaadin("#" - + selection)); + WebElement lastMenuItem = secondMenuBar + .findElement(By.vaadin("#" + selection)); lastMenuItem.click(); lastMenuItem.findElement(By.vaadin("#" + itemName)).click(); waitUntil(ExpectedConditions.textToBePresentInElement( diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuItemStyleRemovedTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuItemStyleRemovedTest.java index e25aa664cd..24a7fb21bb 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuItemStyleRemovedTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuItemStyleRemovedTest.java @@ -19,8 +19,8 @@ public class MenuItemStyleRemovedTest extends MultiBrowserTest { $(ButtonElement.class).caption("Add styles").first().click(); MenuBarElement menu = $(MenuBarElement.class).first(); - List<WebElement> elements = menu.findElements(By - .className("custom-menu-item")); + List<WebElement> elements = menu + .findElements(By.className("custom-menu-item")); Assert.assertEquals(2, elements.size()); menu.clickItem("first"); diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuTooltipTest.java index 091f7be954..ef644f13dd 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuTooltipTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuTooltipTest.java @@ -47,8 +47,8 @@ public class MenuTooltipTest extends MultiBrowserTest { public void testToolTipDelay() throws InterruptedException { openTestURL(); - Coordinates elementCoordinates = getCoordinates($(MenuBarElement.class) - .first()); + Coordinates elementCoordinates = getCoordinates( + $(MenuBarElement.class).first()); sleep(1000); Mouse mouse = ((HasInputDevices) getDriver()).getMouse(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigationTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigationTest.java index a32a611d9a..8756c715c0 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigationTest.java @@ -42,8 +42,8 @@ public class SpaceMenuBarNavigationTest extends MultiBrowserTest { menu.sendKeys(Keys.ARROW_RIGHT); menu.sendKeys(Keys.ENTER); - List<WebElement> captions = driver.findElements(By - .className("v-menubar-menuitem-caption")); + List<WebElement> captions = driver + .findElements(By.className("v-menubar-menuitem-caption")); boolean found = false; for (WebElement caption : captions) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsAndChromeKeyboardNavigationTest.java b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsAndChromeKeyboardNavigationTest.java index 4e23db8eb7..edeb83b7e7 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsAndChromeKeyboardNavigationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsAndChromeKeyboardNavigationTest.java @@ -28,8 +28,8 @@ import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.parallel.Browser; import com.vaadin.tests.tb3.MultiBrowserTest; -public class NativeSelectsAndChromeKeyboardNavigationTest extends - MultiBrowserTest { +public class NativeSelectsAndChromeKeyboardNavigationTest + extends MultiBrowserTest { @Override public List<DesiredCapabilities> getBrowsersToTest() { diff --git a/uitest/src/test/java/com/vaadin/tests/components/notification/MiddleNotificationPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/notification/MiddleNotificationPositionTest.java index dc43b9d19a..78a4169341 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/notification/MiddleNotificationPositionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/notification/MiddleNotificationPositionTest.java @@ -35,12 +35,12 @@ public class MiddleNotificationPositionTest extends MultiBrowserTest { public void testMiddleLeft() { openTestURL(); - WebElement webElement = driver.findElement(By - .className("show-middle-left")); + WebElement webElement = driver + .findElement(By.className("show-middle-left")); webElement.click(); - WebElement notification = driver.findElement(By - .className("v-Notification")); + WebElement notification = driver + .findElement(By.className("v-Notification")); Assert.assertNotNull(notification); String left = notification.getCssValue("left"); @@ -65,12 +65,12 @@ public class MiddleNotificationPositionTest extends MultiBrowserTest { public void testMiddleRight() { openTestURL(); - WebElement webElement = driver.findElement(By - .className("show-middle-right")); + WebElement webElement = driver + .findElement(By.className("show-middle-right")); webElement.click(); - WebElement notification = driver.findElement(By - .className("v-Notification")); + WebElement notification = driver + .findElement(By.className("v-Notification")); Assert.assertNotNull(notification); String right = notification.getCssValue("right"); diff --git a/uitest/src/test/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroupTest.java b/uitest/src/test/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroupTest.java index 090286b1ad..0889b4c240 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroupTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroupTest.java @@ -40,8 +40,9 @@ public class ReadOnlyOptionGroupTest extends MultiBrowserTest { assertNoErrorNotifications(); - Assert.assertFalse("Radio button in option group is still disabled " - + "after unset reaonly", + Assert.assertFalse( + "Radio button in option group is still disabled " + + "after unset reaonly", isElementPresent(By.className("v-radiobutton-disabled"))); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/CaptionLeakTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/CaptionLeakTest.java index 9bb53d8742..557c93282f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/CaptionLeakTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/CaptionLeakTest.java @@ -75,8 +75,7 @@ public class CaptionLeakTest extends MultiBrowserTest { } private void checkConnectorCount() { - getDriver() - .findElement( - By.xpath("//span[text() = 'Measured 3 non connector elements']")); + getDriver().findElement(By + .xpath("//span[text() = 'Measured 3 non connector elements']")); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsgTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsgTest.java index ea78d9f30c..0be61b09c5 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsgTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsgTest.java @@ -23,8 +23,8 @@ import org.openqa.selenium.WebElement; import com.vaadin.tests.tb3.MultiBrowserTest; -public class HorizontalLayoutFullsizeContentWithErrorMsgTest extends - MultiBrowserTest { +public class HorizontalLayoutFullsizeContentWithErrorMsgTest + extends MultiBrowserTest { @Test public void test() { diff --git a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHoverTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHoverTest.java index 1cddbc28c3..4c78d3d933 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHoverTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHoverTest.java @@ -38,8 +38,8 @@ public class NestedLayoutCaptionHoverTest extends MultiBrowserTest { public void testTooltipInNestedLayout() throws Exception { openTestURL(); - WebElement caption = getDriver().findElement( - By.className("v-captiontext")); + WebElement caption = getDriver() + .findElement(By.className("v-captiontext")); assertEquals("inner layout", caption.getText()); diff --git a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/SpacingLeakTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/SpacingLeakTest.java index 565c11c1f0..aeb6ae2339 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/SpacingLeakTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/SpacingLeakTest.java @@ -33,8 +33,7 @@ public class SpacingLeakTest extends MultiBrowserTest { getDriver().findElement(By.id("removebutton")).click(); // this should be present - getDriver() - .findElement( - By.xpath("//span[text() = 'Measured 0 non connector elements']")); + getDriver().findElement(By + .xpath("//span[text() = 'Measured 0 non connector elements']")); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicatorTest.java index 815c00bfac..c1208c3ca0 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicatorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicatorTest.java @@ -32,8 +32,8 @@ public class TooltipOnRequiredIndicatorTest extends TooltipTest { // caption checkTooltip( - $(VerticalLayoutElement.class).get(1).findElement( - By.className("v-captiontext")), + $(VerticalLayoutElement.class).get(1) + .findElement(By.className("v-captiontext")), "Vertical layout tooltip"); // required indicator checkTooltip(By.className("v-required-field-indicator"), @@ -41,8 +41,8 @@ public class TooltipOnRequiredIndicatorTest extends TooltipTest { // caption checkTooltip( - $(HorizontalLayoutElement.class).first().findElement( - By.className("v-captiontext")), + $(HorizontalLayoutElement.class).first() + .findElement(By.className("v-captiontext")), "Horizontal layout tooltip"); // required indicator checkTooltip( diff --git a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChangesTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChangesTest.java index 0890414fea..deff50d904 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChangesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChangesTest.java @@ -35,8 +35,8 @@ public class VerticalLayoutFocusWithDOMChangesTest extends MultiBrowserTest { @Test public void inputTextAndChangeFocus() throws InterruptedException { openTestURL(); - List<WebElement> textFields = getDriver().findElements( - By.tagName("input")); + List<WebElement> textFields = getDriver() + .findElements(By.tagName("input")); WebElement tf1 = textFields.get(0); WebElement tf2 = textFields.get(1); tf1.sendKeys(initialText); @@ -69,8 +69,8 @@ public class VerticalLayoutFocusWithDOMChangesTest extends MultiBrowserTest { @Test public void moveFocusAndChangeFieldWithValue() { openTestURL(); - List<WebElement> textFields = getDriver().findElements( - By.tagName("input")); + List<WebElement> textFields = getDriver() + .findElements(By.tagName("input")); WebElement tf1 = textFields.get(0); WebElement tf2 = textFields.get(1); diff --git a/uitest/src/test/java/com/vaadin/tests/components/panel/PanelChangeContentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/panel/PanelChangeContentsTest.java index 039b054040..f2a4368d42 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/panel/PanelChangeContentsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/panel/PanelChangeContentsTest.java @@ -27,27 +27,24 @@ public class PanelChangeContentsTest extends MultiBrowserTest { setPush(true); openTestURL(); - Assert.assertEquals( - "stats", + Assert.assertEquals("stats", vaadinElement( "/VVerticalLayout[0]/Slot[1]/VPanel[0]/VVerticalLayout[0]/Slot[0]/VLabel[0]") - .getText()); + .getText()); vaadinElement( "/VVerticalLayout[0]/Slot[0]/VHorizontalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]") - .click(); - Assert.assertEquals( - "companies", + .click(); + Assert.assertEquals("companies", vaadinElement( "/VVerticalLayout[0]/Slot[1]/VPanel[0]/VVerticalLayout[0]/Slot[0]/VLabel[0]") - .getText()); + .getText()); vaadinElement( "/VVerticalLayout[0]/Slot[0]/VHorizontalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]") - .click(); - Assert.assertEquals( - "stats", + .click(); + Assert.assertEquals("stats", vaadinElement( "/VVerticalLayout[0]/Slot[1]/VPanel[0]/VVerticalLayout[0]/Slot[0]/VLabel[0]") - .getText()); + .getText()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/panel/PanelRemoveShortcutListenerTest.java b/uitest/src/test/java/com/vaadin/tests/components/panel/PanelRemoveShortcutListenerTest.java index 872abe9191..32df494129 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/panel/PanelRemoveShortcutListenerTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/panel/PanelRemoveShortcutListenerTest.java @@ -63,8 +63,9 @@ public class PanelRemoveShortcutListenerTest extends MultiBrowserTest { @Test public void testToggleWithShortcut() { - assertThat(panel.findElement(By.className("v-panel-caption")) - .findElement(By.tagName("span")).getText(), + assertThat( + panel.findElement(By.className("v-panel-caption")) + .findElement(By.tagName("span")).getText(), is("No shortcut effects (press 'A')")); attemptShortcut("A on"); diff --git a/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandlerTest.java b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandlerTest.java index 6155820990..0d8289c51a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandlerTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandlerTest.java @@ -44,8 +44,8 @@ public class PopupViewShortcutActionHandlerTest extends MultiBrowserTest { openTestURL(); getDriver().findElement(By.className("v-popupview")).click(); - WebElement textField = getDriver().findElement( - By.className("v-textfield")); + WebElement textField = getDriver() + .findElement(By.className("v-textfield")); textField.sendKeys("a", Keys.ENTER); Assert.assertTrue( diff --git a/uitest/src/test/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResizeTest.java index 5c31ce4dc7..64abbd727e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResizeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResizeTest.java @@ -31,8 +31,8 @@ public class RichTextAreaRelativeHeightResizeTest extends MultiBrowserTest { .findElement(By.cssSelector(".v-richtextarea")).getSize() .getHeight(); int originalEditorHeight = driver - .findElement(By.cssSelector(".v-richtextarea iframe")) - .getSize().getHeight(); + .findElement(By.cssSelector(".v-richtextarea iframe")).getSize() + .getHeight(); // Increase the component height driver.findElement(By.cssSelector(".v-button")).click(); @@ -40,8 +40,8 @@ public class RichTextAreaRelativeHeightResizeTest extends MultiBrowserTest { int newHeight = driver.findElement(By.cssSelector(".v-richtextarea")) .getSize().getHeight(); int newEditorHeight = driver - .findElement(By.cssSelector(".v-richtextarea iframe")) - .getSize().getHeight(); + .findElement(By.cssSelector(".v-richtextarea iframe")).getSize() + .getHeight(); // Check that the component height changed and that the editor height // changed equally as much @@ -49,7 +49,7 @@ public class RichTextAreaRelativeHeightResizeTest extends MultiBrowserTest { newHeight != originalHeight); Assert.assertEquals( "Editor height change didn't match the Component height change", - newHeight - originalHeight, newEditorHeight - - originalEditorHeight); + newHeight - originalHeight, + newEditorHeight - originalEditorHeight); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java b/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java index c0429baa31..26a9803a8e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java @@ -55,7 +55,7 @@ public class EnumSelectTest extends SingleBrowserTest { List<String> options = cb.getPopupSuggestions(); Assert.assertEquals("Only one item should match filter", 1, options.size()); - Assert.assertEquals("Invalid option matched filter", - "Some other value", options.get(0)); + Assert.assertEquals("Invalid option matched filter", "Some other value", + options.get(0)); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java b/uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java index bbef30bf1d..966a8fdac1 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java @@ -26,10 +26,10 @@ public class SelectWithIntegersTest extends SingleBrowserTest { public void testSelectWithIntegers() { openTestURL(); - ListSelectElement defaultSelect = $(ListSelectElement.class).caption( - "Default").first(); - ListSelectElement toStringSelect = $(ListSelectElement.class).caption( - "ID_TOSTRING").first(); + ListSelectElement defaultSelect = $(ListSelectElement.class) + .caption("Default").first(); + ListSelectElement toStringSelect = $(ListSelectElement.class) + .caption("ID_TOSTRING").first(); Assert.assertEquals("2,014", defaultSelect.getOptions().get(0)); Assert.assertEquals("2014", toStringSelect.getOptions().get(0)); diff --git a/uitest/src/test/java/com/vaadin/tests/components/slider/SliderDisableTest.java b/uitest/src/test/java/com/vaadin/tests/components/slider/SliderDisableTest.java index 12d26b8f8f..bcf221f60e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/slider/SliderDisableTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/slider/SliderDisableTest.java @@ -52,7 +52,8 @@ public class SliderDisableTest extends MultiBrowserTest { } private void moveSlider(int offset) { - WebElement element = vaadinElement("/VVerticalLayout[0]/Slot[0]/VSlider[0]/domChild[2]/domChild[0]"); + WebElement element = vaadinElement( + "/VVerticalLayout[0]/Slot[0]/VSlider[0]/domChild[2]/domChild[0]"); new Actions(driver).dragAndDropBy(element, offset, 0).perform(); testBench().waitForVaadin(); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/slider/SliderFeedbackTest.java b/uitest/src/test/java/com/vaadin/tests/components/slider/SliderFeedbackTest.java index 86bc351480..3f7f580b3f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/slider/SliderFeedbackTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/slider/SliderFeedbackTest.java @@ -32,8 +32,8 @@ public class SliderFeedbackTest extends MultiBrowserTest { new Actions(driver).dragAndDropBy(handle, 400, 0).perform(); testBench().waitForVaadin(); - double value = Double.valueOf(findElement( - By.className("v-slider-feedback")).getText()); + double value = Double.valueOf( + findElement(By.className("v-slider-feedback")).getText()); // Allow for some tolerance due to, you guessed it, IE8 assertLessThan("Unexpected feedback value {1} < {0}", 505000000000.0, diff --git a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeightTest.java b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeightTest.java index 0ceca66dd3..befb3f90f3 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeightTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeightTest.java @@ -60,11 +60,12 @@ public class HorizontalSplitPanelHeightTest extends MultiBrowserTest { private void testSplitPanel(String id) { WebElement splitPanel = findElement(By.id(id)); WebElement label = splitPanel.findElement(By.className("target")); - Assert.assertTrue(id + ": split panel height (" - + splitPanel.getSize().getHeight() + ") is less than " - + "height of second component (" + label.getSize().getHeight() - + ")", splitPanel.getSize().getHeight() >= label.getSize() - .getHeight()); + Assert.assertTrue( + id + ": split panel height (" + splitPanel.getSize().getHeight() + + ") is less than " + "height of second component (" + + label.getSize().getHeight() + ")", + splitPanel.getSize().getHeight() >= label.getSize() + .getHeight()); Assert.assertEquals("Label text in the second panel is not visible", "Label", label.getText()); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponentTest.java b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponentTest.java index 1bf5212185..d2898db31e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponentTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponentTest.java @@ -37,19 +37,17 @@ public class SplitPanelMoveComponentTest extends MultiBrowserTest { } private WebElement getFirstChild() { - WebElement container = getDriver() - .findElement( - By.xpath("//div[contains(@class,'v-splitpanel-first-container')]")); - return container.findElement(By - .xpath("//div[contains(@class, 'v-button')]")); + WebElement container = getDriver().findElement(By.xpath( + "//div[contains(@class,'v-splitpanel-first-container')]")); + return container + .findElement(By.xpath("//div[contains(@class, 'v-button')]")); } private WebElement getSecondChild() { - WebElement container = getDriver() - .findElement( - By.xpath("//div[contains(@class,'v-splitpanel-second-container')]")); - return container.findElement(By - .xpath("//div[contains(@class, 'v-button')]")); + WebElement container = getDriver().findElement(By.xpath( + "//div[contains(@class,'v-splitpanel-second-container')]")); + return container + .findElement(By.xpath("//div[contains(@class, 'v-button')]")); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximumTest.java b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximumTest.java index b8592e1bd8..e89c5c22da 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximumTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximumTest.java @@ -65,9 +65,11 @@ public class SplitPanelWithMinimumAndMaximumTest extends MultiBrowserTest { // Due to minor browser differences and sub-pixels we must allow 1px // of play between the expected and measured value - assertTrue("When moving left, the splitter at index " + i - + " was at position " + newX + " (expected " + expectedX - + ").", Math.abs(newX - expectedX) <= 1); + assertTrue( + "When moving left, the splitter at index " + i + + " was at position " + newX + " (expected " + + expectedX + ").", + Math.abs(newX - expectedX) <= 1); } // Amount of pixels to move each splitter (to right) @@ -84,9 +86,11 @@ public class SplitPanelWithMinimumAndMaximumTest extends MultiBrowserTest { double newX = parseHorizontalPosition(splitter, i < 4); int expectedX = finalPositions[i]; - assertTrue("When moving right, the splitter at index " + i - + " was at position " + newX + " (expected " + expectedX - + ").", Math.abs(newX - expectedX) <= 1); + assertTrue( + "When moving right, the splitter at index " + i + + " was at position " + newX + " (expected " + + expectedX + ").", + Math.abs(newX - expectedX) <= 1); } } @@ -113,9 +117,11 @@ public class SplitPanelWithMinimumAndMaximumTest extends MultiBrowserTest { double newY = parseVerticalPosition(splitter, i < 4); int expectedY = finalPositions[i]; - assertTrue("When moving up, the splitter at index " + i - + " was at position " + newY + " (expected " + expectedY - + ").", Math.abs(newY - expectedY) <= 1); + assertTrue( + "When moving up, the splitter at index " + i + + " was at position " + newY + " (expected " + + expectedY + ").", + Math.abs(newY - expectedY) <= 1); } // Amount of pixels to move each splitter (down) @@ -132,9 +138,11 @@ public class SplitPanelWithMinimumAndMaximumTest extends MultiBrowserTest { double newY = parseVerticalPosition(splitter, i < 4); int expectedY = finalPositions[i]; - assertTrue("When moving down, the splitter at index " + i - + " was at position " + newY + " (expected " + expectedY - + ").", Math.abs(newY - expectedY) <= 1); + assertTrue( + "When moving down, the splitter at index " + i + + " was at position " + newY + " (expected " + + expectedY + ").", + Math.abs(newY - expectedY) <= 1); } } @@ -161,8 +169,9 @@ public class SplitPanelWithMinimumAndMaximumTest extends MultiBrowserTest { double newX = parseHorizontalPosition(splitter, true); int expectedX = finalPositions[0]; - assertTrue("When moving to left limit, the splitter was at position " - + newX + " (expected " + expectedX + ").", + assertTrue( + "When moving to left limit, the splitter was at position " + + newX + " (expected " + expectedX + ").", Math.abs(newX - expectedX) <= 1); // Disable left limit @@ -196,8 +205,9 @@ public class SplitPanelWithMinimumAndMaximumTest extends MultiBrowserTest { newX = parseHorizontalPosition(splitter, true); expectedX = finalPositions[2]; - assertTrue("When moving to right limit, the splitter was at position " - + newX + " (expected " + expectedX + ").", + assertTrue( + "When moving to right limit, the splitter was at position " + + newX + " (expected " + expectedX + ").", Math.abs(newX - expectedX) <= 1); // Disable right limit @@ -229,21 +239,22 @@ public class SplitPanelWithMinimumAndMaximumTest extends MultiBrowserTest { private double parseHorizontalPosition(TestBenchElement splitter, boolean left) { if (left) { - return Double.parseDouble(splitter.getCssValue("left").replace( - "px", "")); + return Double.parseDouble( + splitter.getCssValue("left").replace("px", "")); } else { - return Double.parseDouble(splitter.getCssValue("right").replace( - "px", "")); + return Double.parseDouble( + splitter.getCssValue("right").replace("px", "")); } } - private double parseVerticalPosition(TestBenchElement splitter, boolean top) { + private double parseVerticalPosition(TestBenchElement splitter, + boolean top) { if (top) { - return Double.parseDouble(splitter.getCssValue("top").replace("px", - "")); + return Double + .parseDouble(splitter.getCssValue("top").replace("px", "")); } else { - return Double.parseDouble(splitter.getCssValue("bottom").replace( - "px", "")); + return Double.parseDouble( + splitter.getCssValue("bottom").replace("px", "")); } } }
\ No newline at end of file diff --git a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPositionChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPositionChangeTest.java index 43edb56f3a..2cb09d383b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPositionChangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPositionChangeTest.java @@ -43,8 +43,8 @@ public class SplitPositionChangeTest extends MultiBrowserTest { public void testHorizontalSplit() { HorizontalSplitPanelElement split = $(HorizontalSplitPanelElement.class) .first(); - WebElement splitter = split.findElement(By - .className("v-splitpanel-hsplitter")); + WebElement splitter = split + .findElement(By.className("v-splitpanel-hsplitter")); int position = splitter.getLocation().getX(); Actions actions = new Actions(driver); actions.clickAndHold(splitter).moveByOffset(50, 0).release().perform(); @@ -56,8 +56,8 @@ public class SplitPositionChangeTest extends MultiBrowserTest { public void testVerticalSplit() { VerticalSplitPanelElement split = $(VerticalSplitPanelElement.class) .first(); - WebElement splitter = split.findElement(By - .className("v-splitpanel-vsplitter")); + WebElement splitter = split + .findElement(By.className("v-splitpanel-vsplitter")); int position = splitter.getLocation().getY(); Actions actions = new Actions(driver); actions.clickAndHold(splitter).moveByOffset(0, 50).release().perform(); @@ -74,9 +74,8 @@ public class SplitPositionChangeTest extends MultiBrowserTest { "1. Split position changed: %s, position: .*", horizontal ? "horizontal" : "vertical"); String actual = getLogRow(0); - Assert.assertTrue( - String.format( - "Log content didn't match the expected format.\nexpected: '%s'\nwas: '%s'", - expected, actual), actual.matches(expected)); + Assert.assertTrue(String.format( + "Log content didn't match the expected format.\nexpected: '%s'\nwas: '%s'", + expected, actual), actual.matches(expected)); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/AddSelectionToRemovedRangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/AddSelectionToRemovedRangeTest.java index 68b3748472..c0e80a5ef8 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/AddSelectionToRemovedRangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/AddSelectionToRemovedRangeTest.java @@ -45,8 +45,8 @@ public class AddSelectionToRemovedRangeTest extends MultiBrowserTest { @Test public void addAndRemoveItemToRemovedRange() throws IOException { openTestURL(); - List<WebElement> rows = driver.findElements(By - .className("v-table-cell-wrapper")); + List<WebElement> rows = driver + .findElements(By.className("v-table-cell-wrapper")); WebElement rangeStart = rows.get(0); WebElement rangeEnd = rows.get(1); rangeStart.click(); @@ -54,8 +54,8 @@ public class AddSelectionToRemovedRangeTest extends MultiBrowserTest { rangeEnd.click(); new Actions(driver).keyUp(Keys.SHIFT).perform(); driver.findElement(By.className("v-button")).click(); - WebElement extraRow = driver.findElements( - By.className("v-table-cell-wrapper")).get(1); + WebElement extraRow = driver + .findElements(By.className("v-table-cell-wrapper")).get(1); new Actions(driver).keyDown(Keys.CONTROL).click(extraRow) .click(extraRow).keyUp(Keys.CONTROL).perform(); driver.findElement(By.className("v-button")).click(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java index 4a5947c145..418ff76a01 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java @@ -21,8 +21,8 @@ public class ColumnReorderingWithManyColumnsTest extends MultiBrowserTest { TableHeaderElement sourceCell = table.getHeaderCell(0); TableHeaderElement targetCell = table.getHeaderCell(10); drag(sourceCell, targetCell); - WebElement markedElement = table.findElement(By - .className("v-table-focus-slot-right")); + WebElement markedElement = table + .findElement(By.className("v-table-focus-slot-right")); String markedColumnName = markedElement.findElement(By.xpath("..")) .getText(); assertEquals("col-9", markedColumnName.toLowerCase()); diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrderTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrderTest.java index 970b832e0c..df46f265d0 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrderTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrderTest.java @@ -26,8 +26,8 @@ import org.openqa.selenium.WebElement; import com.vaadin.tests.tb3.MultiBrowserTest; -public class ColumnWidthsAfterChangeTableColumnsCountOrOrderTest extends - MultiBrowserTest { +public class ColumnWidthsAfterChangeTableColumnsCountOrOrderTest + extends MultiBrowserTest { @Test public void testColumnWidthAfterChangeTableColumnsOrder() { @@ -62,11 +62,8 @@ public class ColumnWidthsAfterChangeTableColumnsCountOrOrderTest extends } private int getDescriptionColumnWidth() { - return driver - .findElement( - By.xpath("//div[@class='v-table-cell-wrapper'" - + " and text() = 'descr1']")).getSize() - .getWidth(); + return driver.findElement(By.xpath("//div[@class='v-table-cell-wrapper'" + + " and text() = 'descr1']")).getSize().getWidth(); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java index e13238e10d..d248d22720 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java @@ -21,12 +21,12 @@ import com.vaadin.tests.tb3.MultiBrowserTest; public class ContainerSizeChangeTest extends MultiBrowserTest { @Test - public void tableShouldLoadCorrectItems() throws IOException, - InterruptedException { + public void tableShouldLoadCorrectItems() + throws IOException, InterruptedException { openTestURL(); - ButtonElement decreaseSize = $(ButtonElement.class).caption( - "Decrease size").first(); + ButtonElement decreaseSize = $(ButtonElement.class) + .caption("Decrease size").first(); decreaseSize.click(); // decreasing container size from 50 to 40 decreaseSize.click(); // decreasing container size from 40 to 30 diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/CtrlShiftMultiselectTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/CtrlShiftMultiselectTest.java index add7db93f2..854d9dda0a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/CtrlShiftMultiselectTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/CtrlShiftMultiselectTest.java @@ -65,7 +65,8 @@ public class CtrlShiftMultiselectTest extends MultiBrowserTest { } private List<WebElement> getAllRows() { - WebElement table = vaadinElement("/VVerticalLayout[0]/VVerticalLayout[0]/VScrollTable[0]"); + WebElement table = vaadinElement( + "/VVerticalLayout[0]/VVerticalLayout[0]/VScrollTable[0]"); return table.findElements(By.cssSelector(".v-table-table tr")); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/CustomTableElement.java b/uitest/src/test/java/com/vaadin/tests/components/table/CustomTableElement.java index f1df98fb38..b4773e7138 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/CustomTableElement.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/CustomTableElement.java @@ -27,8 +27,8 @@ public class CustomTableElement extends TableElement { public CollapseMenu openCollapseMenu() { getCollapseMenuToggle().click(); - WebElement cm = getDriver().findElement( - By.xpath("//*[@id='PID_VAADIN_CM']")); + WebElement cm = getDriver() + .findElement(By.xpath("//*[@id='PID_VAADIN_CM']")); return wrapElement(cm, getCommandExecutor()).wrap(CollapseMenu.class); } @@ -42,16 +42,16 @@ public class CustomTableElement extends TableElement { public static class ContextMenuElement extends AbstractElement { public WebElement getItem(int index) { - return findElement(By.xpath(".//table//tr[" + (index + 1) - + "]//td/*")); + return findElement( + By.xpath(".//table//tr[" + (index + 1) + "]//td/*")); } } public ContextMenuElement getContextMenu() { WebElement cm = getDriver().findElement(By.className("v-contextmenu")); - return wrapElement(cm, getCommandExecutor()).wrap( - ContextMenuElement.class); + return wrapElement(cm, getCommandExecutor()) + .wrap(ContextMenuElement.class); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java index 73a5e68da9..c5838096bc 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java @@ -91,8 +91,8 @@ public class DisabledSortingTableTest extends MultiBrowserTest { @Override public String toString() { // Timed out after 10 seconds waiting for ... - return String - .format("header to get class name '%s'", className); + return String.format("header to get class name '%s'", + className); } }); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/DndTableTargetDetailsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/DndTableTargetDetailsTest.java index 5ad99d3084..eea191c9f7 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/DndTableTargetDetailsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/DndTableTargetDetailsTest.java @@ -45,8 +45,8 @@ public class DndTableTargetDetailsTest extends DndActionsTest { } protected WebElement getTarget() { - return findElement(By.className("target")).findElement( - By.className("v-table-cell-wrapper")); + return findElement(By.className("target")) + .findElement(By.className("v-table-cell-wrapper")); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java index 56b30dcb7c..2e1d92acbf 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java @@ -54,8 +54,8 @@ public class EditableModeChangeTest extends MultiBrowserTest { sleep(100); // fetch the updated cell - WebElement textField = table.getCell(1, 0).findElement( - By.className("v-textfield")); + WebElement textField = table.getCell(1, 0) + .findElement(By.className("v-textfield")); assertEquals( "original value not found, wrong cell or contents (1st column of the 2nd row expected)", "Teppo", textField.getAttribute("value")); @@ -73,13 +73,13 @@ public class EditableModeChangeTest extends MultiBrowserTest { "baa", table.getCell(1, 0).getText()); // check that selection got updated correctly - List<WebElement> selected = table.findElement( - By.className("v-table-body")).findElements( - By.className("v-selected")); + List<WebElement> selected = table + .findElement(By.className("v-table-body")) + .findElements(By.className("v-selected")); assertEquals(1, selected.size()); - WebElement content = selected.get(0).findElement( - By.className("v-table-cell-wrapper")); + WebElement content = selected.get(0) + .findElement(By.className("v-table-cell-wrapper")); assertEquals( "expected value not found, wrong cell or contents (1st column of the 1st row expected)", "Teemu", content.getText()); diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceConditionTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceConditionTest.java index 1602f1bae5..c5098356e1 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceConditionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceConditionTest.java @@ -28,8 +28,8 @@ import org.openqa.selenium.WebElement; import com.vaadin.tests.tb3.MultiBrowserTest; -public class ExpandingContainerVisibleRowRaceConditionTest extends - MultiBrowserTest { +public class ExpandingContainerVisibleRowRaceConditionTest + extends MultiBrowserTest { private static final int ROW_HEIGHT = 20; @@ -76,15 +76,15 @@ public class ExpandingContainerVisibleRowRaceConditionTest extends private void assertScrollPositionIsNotVisible() { WebElement table = vaadinElementById(TABLE); - WebElement scrollPosition = table.findElement(By - .className("v-table-scrollposition")); + WebElement scrollPosition = table + .findElement(By.className("v-table-scrollposition")); assertFalse(scrollPosition.isDisplayed()); } private List<WebElement> getCellsOfFirstColumn() { WebElement table = vaadinElementById(TABLE); - List<WebElement> firstCellOfRows = table.findElements(By - .cssSelector(".v-table-table tr > td")); + List<WebElement> firstCellOfRows = table + .findElements(By.cssSelector(".v-table-table tr > td")); return firstCellOfRows; } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java index 14a0718325..a6f78e9031 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java @@ -50,9 +50,9 @@ public class FocusOnSelectedItemTest extends MultiBrowserTest { supposedlyFocusedRow = $(TableElement.class).first().getCell(198, 0); - Assert.assertTrue("Incorrect row was selected", selectedRow - .getLocation().getY() == supposedlyFocusedRow.getLocation() - .getY()); + Assert.assertTrue("Incorrect row was selected", + selectedRow.getLocation().getY() == supposedlyFocusedRow + .getLocation().getY()); Assert.assertTrue("No row had the focused style.", isElementPresent(By.className("v-table-focus"))); diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java index 11a6838234..fb41a07550 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java @@ -204,8 +204,8 @@ public class FooterTest extends MultiBrowserTest { @Override public String toString() { // Timed out after 10 seconds waiting for ... - return String.format("footer cell %s's text was'%s'", - "" + cell, footerCell.getText()); + return String.format("footer cell %s's text was'%s'", "" + cell, + footerCell.getText()); } }); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java index 25a3139489..d344b62ecc 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java @@ -89,9 +89,9 @@ public class LabelEmbeddedClickThroughForTableTest extends MultiBrowserTest { } private void checkRowSelected(TableElement table, int rowIndex) { - List<WebElement> selectedRows = table.findElement( - By.className("v-table-body")).findElements( - By.className("v-selected")); + List<WebElement> selectedRows = table + .findElement(By.className("v-table-body")) + .findElements(By.className("v-selected")); assertEquals("unexpected table selection size", 1, selectedRows.size()); assertEquals( "contents of the selected row don't match contents of the row #" diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/LeftColumnAlignmentTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/LeftColumnAlignmentTest.java index 3d613fd726..186e976d92 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/LeftColumnAlignmentTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/LeftColumnAlignmentTest.java @@ -39,17 +39,17 @@ public class LeftColumnAlignmentTest extends MultiBrowserTest { webElement.click(); Assert.assertTrue("Table caption is not aligned to the left", - isElementPresent(By - .className("v-table-caption-container-align-left"))); + isElementPresent( + By.className("v-table-caption-container-align-left"))); - WebElement footer = driver.findElement(By - .className("v-table-footer-container")); + WebElement footer = driver + .findElement(By.className("v-table-footer-container")); Assert.assertEquals("Table footer is not aligned to the left", "left", footer.getCssValue("text-align")); - WebElement cell = driver.findElement(By - .className("v-table-cell-wrapper")); + WebElement cell = driver + .findElement(By.className("v-table-cell-wrapper")); Assert.assertEquals("Table cell is not aligned to the left", "left", cell.getCssValue("text-align")); diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java index e9f3bbb355..52cdd2d8ec 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java @@ -49,8 +49,8 @@ public class LongMultiselectTest extends MultiBrowserTest { scrollToBottom(); new Actions(getDriver()).keyDown(Keys.SHIFT) - .click(getTable().getCell(LASTSELECTEDROW, 0)) - .keyUp(Keys.SHIFT).build().perform(); + .click(getTable().getCell(LASTSELECTEDROW, 0)).keyUp(Keys.SHIFT) + .build().perform(); } private TableElement getTable() { diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java index b254d27b58..7b9a9f1679 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java @@ -84,8 +84,8 @@ public class MemoryLeakTableTest extends MultiBrowserTest { // Method scroll in TalbeElement class has a bug // private void scrollTable(TableElement tbl, int value) { - WebElement actualElement = tbl.findElement(By - .className("v-table-body-wrapper")); + WebElement actualElement = tbl + .findElement(By.className("v-table-body-wrapper")); JavascriptExecutor js = tbl.getCommandExecutor(); js.executeScript("arguments[0].scrollTop = " + value, actualElement); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java index c92e00ab29..e201b2ad96 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java @@ -64,8 +64,8 @@ public class ReloadWidgetsTest extends MultiBrowserTest { waitUntil(new ExpectedCondition<Boolean>() { @Override public Boolean apply(WebDriver input) { - List<WebElement> elements = findElements(By - .className("v-table-scrollposition")); + List<WebElement> elements = findElements( + By.className("v-table-scrollposition")); return elements.isEmpty() || !elements.get(0).isDisplayed(); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java index 504957e773..8925fb3493 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java @@ -39,8 +39,8 @@ public class SelectAllConstantViewportTest extends MultiBrowserTest { CheckBoxElement checkbox = $(CheckBoxElement.class).first(); WebElement row = $(TableElement.class).first().getCell(190, 0); - final WebElement scrollPositionDisplay = getDriver().findElement( - By.className("v-table-scrollposition")); + final WebElement scrollPositionDisplay = getDriver() + .findElement(By.className("v-table-scrollposition")); waitUntilNot(new ExpectedCondition<Boolean>() { @Override diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatiosTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatiosTest.java index 58628a9d56..3c42fe0cef 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatiosTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatiosTest.java @@ -47,10 +47,10 @@ public class TableAfterRemovingExpandRatiosTest extends MultiBrowserTest { List<WebElement> tables = driver.findElements(By.className("v-table")); - initialHeader = tables.get(0).findElement( - By.className("v-table-header-cell")); - expandedHeader = tables.get(1).findElement( - By.className("v-table-header-cell")); + initialHeader = tables.get(0) + .findElement(By.className("v-table-header-cell")); + expandedHeader = tables.get(1) + .findElement(By.className("v-table-header-cell")); expandButton = getDriver().findElement(By.id("expand-button")); unExpandButton = getDriver().findElement(By.id("unexpand-button")); @@ -61,13 +61,13 @@ public class TableAfterRemovingExpandRatiosTest extends MultiBrowserTest { clickAndWait(expandButton); assertThat("Column widths should not be equal after expanding", - initialHeader.getSize().getWidth(), not(expandedHeader - .getSize().getWidth())); + initialHeader.getSize().getWidth(), + not(expandedHeader.getSize().getWidth())); clickAndWait(unExpandButton); assertThat("Column widths should be equal after unexpanding", - initialHeader.getSize().getWidth(), is(expandedHeader.getSize() - .getWidth())); + initialHeader.getSize().getWidth(), + is(expandedHeader.getSize().getWidth())); } @Test @@ -80,8 +80,8 @@ public class TableAfterRemovingExpandRatiosTest extends MultiBrowserTest { clickAndWait(unExpandButton); assertThat( "Column widths should be equal after adding item and unexpanding", - initialHeader.getSize().getWidth(), is(expandedHeader.getSize() - .getWidth())); + initialHeader.getSize().getWidth(), + is(expandedHeader.getSize().getWidth())); } private void clickAndWait(WebElement elem) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java index 4a9d17c02d..a962db4b70 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java @@ -105,8 +105,8 @@ public class TableClickAndDragOnIconAndComponentsTest extends MultiBrowserTest { } private void assertThatFocusTextFieldHasText(String text) { - List<WebElement> focused = getTable().findElements( - By.className("v-textfield-focus")); + List<WebElement> focused = getTable() + .findElements(By.className("v-textfield-focus")); assertThat(focused.get(0).getAttribute("value"), is(text)); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java index e42f86a975..d52b93a845 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java @@ -33,8 +33,8 @@ public class TableColumnAddAndResizeTest extends MultiBrowserTest { openTestURL(); $(ButtonElement.class).caption("Add and Resize").first().click(); - assertFalse("Error notification present.", $(NotificationElement.class) - .exists()); + assertFalse("Error notification present.", + $(NotificationElement.class).exists()); assertEquals("Unexpected column width. ", 200, $(TableElement.class) .first().getCell(0, 1).getSize().getWidth()); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java index 9072d13263..2f77b584f5 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java @@ -50,8 +50,8 @@ public class TableColumnResizeContentsWidthTest extends MultiBrowserTest { List<ButtonElement> buttons = $(ButtonElement.class).all(); - WebElement resizer = getTable().findElement( - By.className("v-table-resizer")); + WebElement resizer = getTable() + .findElement(By.className("v-table-resizer")); assertEquals(100, getTextFieldWidth()); @@ -81,8 +81,8 @@ public class TableColumnResizeContentsWidthTest extends MultiBrowserTest { private int getTextFieldWidth() { TableElement table = getTable(); - final WebElement textField = table.findElement(By - .className("v-textfield")); + final WebElement textField = table + .findElement(By.className("v-textfield")); return textField.getSize().width; } diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java index bd2d2ad28b..fbc5a43a93 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java @@ -36,12 +36,13 @@ public class TableDragColumnTest extends MultiBrowserTest { public void testDragColumn() { openTestURL(); - selectMenuPath("Component", "Columns", "Property 1", "Icon", "ok 16x16"); + selectMenuPath("Component", "Columns", "Property 1", "Icon", + "ok 16x16"); TableElement table = $(TableElement.class).first(); TableHeaderElement dragged = table.getHeaderCell(0); - String imgSrc = dragged.findElement(By.tagName("img")).getAttribute( - "src"); + String imgSrc = dragged.findElement(By.tagName("img")) + .getAttribute("src"); new Actions(getDriver()).moveToElement(dragged).clickAndHold() .moveByOffset(-6, 0).perform(); @@ -50,22 +51,21 @@ public class TableDragColumnTest extends MultiBrowserTest { WebElement dragImage = findElement(By.className("v-table-header-drag")); String cellContent = dragged.getText(); - Assert.assertEquals( - "Drag image had different content than header cell", + Assert.assertEquals("Drag image had different content than header cell", cellContent, dragImage.getText()); - Assert.assertEquals("Drag image had different icon", imgSrc, dragImage - .findElement(By.tagName("img")).getAttribute("src")); + Assert.assertEquals("Drag image had different icon", imgSrc, + dragImage.findElement(By.tagName("img")).getAttribute("src")); TableHeaderElement target = table.getHeaderCell(3); new Actions(getDriver()) - .moveToElement(target, target.getSize().width - 5, 10) - .release().perform(); + .moveToElement(target, target.getSize().width - 5, 10).release() + .perform(); dragged = table.getHeaderCell(3); Assert.assertEquals("Column was not dropped where expected.", cellContent, dragged.getText()); - Assert.assertEquals("Drag image had different icon", imgSrc, dragged - .findElement(By.tagName("img")).getAttribute("src")); + Assert.assertEquals("Drag image had different icon", imgSrc, + dragged.findElement(By.tagName("img")).getAttribute("src")); } @Test @@ -94,8 +94,7 @@ public class TableDragColumnTest extends MultiBrowserTest { WebElement dragImage = findElement(By.className("v-table-header-drag")); String cellContent = dragged.getText(); - Assert.assertEquals( - "Drag image had different content than header cell", + Assert.assertEquals("Drag image had different content than header cell", cellContent, dragImage.getText()); Assert.assertTrue("Missing CSS class " + styleName, hasCssClass(dragImage, styleName)); diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java index 074958d671..571ec0e80d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java @@ -76,8 +76,9 @@ public class TableInIframeRowClickScrollJumpTest extends MultiBrowserTest { Long scrollPosition2 = getWindowsScrollPosition(); - assertThat("Scroll position should stay about the same. Old was " - + scrollPosition + " and new one " + scrollPosition2, + assertThat( + "Scroll position should stay about the same. Old was " + + scrollPosition + " and new one " + scrollPosition2, Math.abs(scrollPosition - scrollPosition2) < 10); } @@ -104,8 +105,8 @@ public class TableInIframeRowClickScrollJumpTest extends MultiBrowserTest { driver.switchTo().defaultContent(); JavascriptExecutor executor = (JavascriptExecutor) driver; - Long value = (Long) executor - .executeScript("if (window.pageYOffset) return window.pageYOffset;else if (window.document.documentElement.scrollTop) return window.document.documentElement.scrollTop;else return window.document.body.scrollTop;"); + Long value = (Long) executor.executeScript( + "if (window.pageYOffset) return window.pageYOffset;else if (window.document.documentElement.scrollTop) return window.document.documentElement.scrollTop;else return window.document.body.scrollTop;"); // back to the iframe switchIntoIframe(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java index ea730ea30e..51d8e674a6 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java @@ -140,8 +140,8 @@ public class TableMatchesMouseDownMouseUpElementTest extends MultiBrowserTest { } private List<WebElement> getSelectedRows() { - return table.findElement(By.className("v-table-body")).findElements( - By.className("v-selected")); + return table.findElement(By.className("v-table-body")) + .findElements(By.className("v-selected")); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java index 30bddc2666..dfc9088570 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java @@ -40,8 +40,8 @@ public class TableMoveFocusWithSelectionTest extends MultiBrowserTest { getDriver().findElement(By.id("row-5")).click(); // Ensure row 5 gets focused - WebElement row5TableRow = getDriver().findElement( - By.xpath("//div[@id='row-5']/../../..")); + WebElement row5TableRow = getDriver() + .findElement(By.xpath("//div[@id='row-5']/../../..")); String row5StyleName = row5TableRow.getAttribute("class"); assertTrue(row5StyleName.contains("v-table-focus")); } @@ -58,8 +58,8 @@ public class TableMoveFocusWithSelectionTest extends MultiBrowserTest { getDriver().findElement(By.id("row-7")).click(); // Clicking a row should get the row focus - WebElement row7TableRow = getDriver().findElement( - By.xpath("//div[@id='row-7']/../../..")); + WebElement row7TableRow = getDriver() + .findElement(By.xpath("//div[@id='row-7']/../../..")); String row7StyleName = row7TableRow.getAttribute("class"); assertTrue(row7StyleName.contains("v-table-focus")); @@ -73,8 +73,8 @@ public class TableMoveFocusWithSelectionTest extends MultiBrowserTest { getDriver().findElement(By.id("test-table")).click(); // Ensure row 7 is still focused - row7TableRow = getDriver().findElement( - By.xpath("//div[@id='row-7']/../../..")); + row7TableRow = getDriver() + .findElement(By.xpath("//div[@id='row-7']/../../..")); row7StyleName = row7TableRow.getAttribute("class"); assertTrue(row7StyleName.contains("v-table-focus")); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java index 4ab42a5f94..61d914b1b1 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java @@ -116,8 +116,8 @@ public class TableNavigationPageDownTest extends MultiBrowserTest { // page downs. // Can't use v-table-body height because lower rows haven't been // fetched yet. - testBenchElement(wrapper).scroll( - ROW_NUMBER * rowHeight - (int) (2.8 * pageHeight)); + testBenchElement(wrapper) + .scroll(ROW_NUMBER * rowHeight - (int) (2.8 * pageHeight)); waitForScrollToFinish(); getLastVisibleRow().click(); @@ -166,8 +166,8 @@ public class TableNavigationPageDownTest extends MultiBrowserTest { waitUntil(new ExpectedCondition<Boolean>() { @Override public Boolean apply(WebDriver input) { - List<WebElement> elements = findElements(By - .className("v-table-scrollposition")); + List<WebElement> elements = findElements( + By.className("v-table-scrollposition")); return elements.isEmpty() || !elements.get(0).isDisplayed(); } @@ -183,8 +183,8 @@ public class TableNavigationPageDownTest extends MultiBrowserTest { * Returns row number from its first cell */ private int getRowNumber(WebElement row) { - return Integer.valueOf(row.findElement( - By.className("v-table-cell-wrapper")).getText()); + return Integer.valueOf(row + .findElement(By.className("v-table-cell-wrapper")).getText()); } /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCallsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCallsTest.java index 968b742aa9..30a2815ff8 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCallsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCallsTest.java @@ -23,8 +23,8 @@ import org.openqa.selenium.WebElement; import com.vaadin.tests.tb3.MultiBrowserTest; -public class TableRemovedQuicklySendsInvalidRpcCallsTest extends - MultiBrowserTest { +public class TableRemovedQuicklySendsInvalidRpcCallsTest + extends MultiBrowserTest { private static final String BUTTON_ID = TableRemovedQuicklySendsInvalidRpcCalls.BUTTON_ID; private static final String FAILURE_CAPTION = TableRemovedQuicklySendsInvalidRpcCalls.FAILURE_CAPTION; @@ -35,18 +35,18 @@ public class TableRemovedQuicklySendsInvalidRpcCallsTest extends setDebug(true); openTestURL(); - assertFalse("Test started with the error present.", button().getText() - .equals(FAILURE_CAPTION)); + assertFalse("Test started with the error present.", + button().getText().equals(FAILURE_CAPTION)); assertFalse("Test jumped the gun.", button().getText().equals(SUCCESS_CAPTION)); button().click(); Thread.sleep(5000); - assertFalse("Test failed after trying to trigger the error.", button() - .getText().equals(FAILURE_CAPTION)); - assertTrue("Test didn't end up in correct success state.", button() - .getText().equals(SUCCESS_CAPTION)); + assertFalse("Test failed after trying to trigger the error.", + button().getText().equals(FAILURE_CAPTION)); + assertTrue("Test didn't end up in correct success state.", + button().getText().equals(SUCCESS_CAPTION)); } private WebElement button() { diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java index 4ca3ed406b..1cc31e375a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java @@ -30,8 +30,8 @@ import com.vaadin.tests.tb3.MultiBrowserTest; * * @author Vaadin Ltd */ -public class TableRepairsScrollPositionOnReAddingAllRowsTest extends - MultiBrowserTest { +public class TableRepairsScrollPositionOnReAddingAllRowsTest + extends MultiBrowserTest { private int rowLocation0; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableRequiredIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRequiredIndicatorTest.java index b94ddaee45..5913c72470 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableRequiredIndicatorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRequiredIndicatorTest.java @@ -32,8 +32,8 @@ public class TableRequiredIndicatorTest extends MultiBrowserTest { @Test public void testRequiredIndicatorIsVisible() { openTestURL(); - Assert.assertTrue(isElementPresent(By - .className("v-required-field-indicator"))); + Assert.assertTrue( + isElementPresent(By.className("v-required-field-indicator"))); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java index 0fad02b410..eb00a539f1 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java @@ -60,8 +60,8 @@ public class TableRowScrolledBottomTest extends MultiBrowserTest { button.click(); sleep(500); - rows = table.findElement(By.className("v-table-body")).findElements( - By.tagName("tr")); + rows = table.findElement(By.className("v-table-body")) + .findElements(By.tagName("tr")); // check that the final row is the one intended finalRow = rows.get(rows.size() - 1); diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollAfterAddRowTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollAfterAddRowTest.java index d390b57823..9c020a9276 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollAfterAddRowTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollAfterAddRowTest.java @@ -65,8 +65,8 @@ public class TableScrollAfterAddRowTest extends MultiBrowserTest { } private void scrollUp() { - WebElement actualElement = getDriver().findElement( - By.className("v-table-body-wrapper")); + WebElement actualElement = getDriver() + .findElement(By.className("v-table-body-wrapper")); JavascriptExecutor js = new TestBenchCommandExecutor(getDriver(), new ImageComparison(), new ReferenceNameGenerator()); js.executeScript("arguments[0].scrollTop = " + 30, actualElement); diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java index b2fde31b93..240c81eef6 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java @@ -40,8 +40,8 @@ public class TableScrollUpOnSelectTest extends MultiBrowserTest { // WebElement table = driver.findElement(By.vaadin("//Table")); WebElement row = $(TableElement.class).first().getCell(49, 0); - final WebElement scrollPositionDisplay = getDriver().findElement( - By.className("v-table-scrollposition")); + final WebElement scrollPositionDisplay = getDriver() + .findElement(By.className("v-table-scrollposition")); waitUntilNot(new ExpectedCondition<Boolean>() { @Override diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableSizeInTabsheetTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableSizeInTabsheetTest.java index a984ed81e5..c8491e1498 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableSizeInTabsheetTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableSizeInTabsheetTest.java @@ -43,8 +43,8 @@ public class TableSizeInTabsheetTest extends MultiBrowserTest { } private int getTableSheetContentHeight() { - WebElement tabsheetContent = vaadinElementById(TABSHEET).findElement( - By.className(TABSHEET_CONTENT_STYLENAME)); + WebElement tabsheetContent = vaadinElementById(TABSHEET) + .findElement(By.className(TABSHEET_CONTENT_STYLENAME)); return tabsheetContent.getSize().getHeight(); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java index 57ebfb7040..54fe0fc4c9 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java @@ -36,10 +36,10 @@ public class TableToggleColumnVisibilityTest extends MultiBrowserTest { public void testColumnWidthRestoredAfterTogglingVisibility() { openTestURL(); - ButtonElement toggleVisibilityButton = $(ButtonElement.class).id( - "visib-toggler"); - ButtonElement changeOrderButton = $(ButtonElement.class).id( - "order-toggler"); + ButtonElement toggleVisibilityButton = $(ButtonElement.class) + .id("visib-toggler"); + ButtonElement changeOrderButton = $(ButtonElement.class) + .id("order-toggler"); checkHeaderAttributes(1); @@ -65,16 +65,16 @@ public class TableToggleColumnVisibilityTest extends MultiBrowserTest { TableHeaderElement headerCell = $(TableElement.class).first() .getHeaderCell(columnNumber); - Assert.assertTrue("Column header text should be custom", headerCell - .getText().equalsIgnoreCase("Hello World")); + Assert.assertTrue("Column header text should be custom", + headerCell.getText().equalsIgnoreCase("Hello World")); - Assert.assertTrue("Column should have an icon", headerCell - .findElements(By.className("v-icon")).size() > 0); + Assert.assertTrue("Column should have an icon", + headerCell.findElements(By.className("v-icon")).size() > 0); - Assert.assertTrue( - "Column should have alignment to the right", - headerCell.findElements( - By.className("v-table-caption-container-align-right")) + Assert.assertTrue("Column should have alignment to the right", + headerCell + .findElements(By.className( + "v-table-caption-container-align-right")) .size() > 0); } }
\ No newline at end of file diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidthTest.java index c89678d846..109b3c1d3a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidthTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidthTest.java @@ -36,7 +36,7 @@ public class TableToggleColumnVisibilityWidthTest extends MultiBrowserTest { int secondColumnWidthInitial = findElements( By.className("v-table-header-cell")).get(1).getSize() - .getWidth(); + .getWidth(); ButtonElement toggleButton = $(ButtonElement.class).id("toggler"); toggleButton.click(); @@ -48,7 +48,7 @@ public class TableToggleColumnVisibilityWidthTest extends MultiBrowserTest { findElements(By.className("v-table-header-cell")).size(), 2); int secondColumnWidthRestored = findElements( By.className("v-table-header-cell")).get(1).getSize() - .getWidth(); + .getWidth(); Assert.assertEquals( "Column width should be the same as it was before hiding", secondColumnWidthInitial, secondColumnWidthRestored); diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableTooManyColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableTooManyColumnsTest.java index 2244365e00..1f299981f4 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableTooManyColumnsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableTooManyColumnsTest.java @@ -30,8 +30,8 @@ public class TableTooManyColumnsTest extends MultiBrowserTest { public void testDropdownTable() throws IOException { openTestURL(); - WebElement element = findElement(By - .className("v-table-column-selector")); + WebElement element = findElement( + By.className("v-table-column-selector")); element.click(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableWidthItemRemoveTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableWidthItemRemoveTest.java index f96641be4c..27eaa56722 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableWidthItemRemoveTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableWidthItemRemoveTest.java @@ -33,14 +33,14 @@ public class TableWidthItemRemoveTest extends MultiBrowserTest { public void testWidthResizeOnItemAdd() { openTestURL(); - WebElement populateButton = driver.findElement(By - .vaadin("//Button[caption=\"Populate\"]")); - WebElement table = driver.findElement(By - .vaadin("//Table[caption=\"My table\"]")); + WebElement populateButton = driver + .findElement(By.vaadin("//Button[caption=\"Populate\"]")); + WebElement table = driver + .findElement(By.vaadin("//Table[caption=\"My table\"]")); int original_width = table.getSize().getWidth(); populateButton.click(); - Assert.assertTrue("Width changed on item add.", original_width == table - .getSize().getWidth()); + Assert.assertTrue("Width changed on item add.", + original_width == table.getSize().getWidth()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java index 1eb5cad821..9f24eface3 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java @@ -31,8 +31,8 @@ import com.vaadin.tests.tb3.MultiBrowserTest; * * @author Vaadin Ltd */ -public class TableWithContainerRequiringEqualsForItemIdTest extends - MultiBrowserTest { +public class TableWithContainerRequiringEqualsForItemIdTest + extends MultiBrowserTest { @Test public void testSorting() { @@ -68,8 +68,8 @@ public class TableWithContainerRequiringEqualsForItemIdTest extends } private void checkFirstCell(TableElement table, String expected) { - assertEquals("unexpected contents", expected, table.getCell(0, 0) - .getText()); + assertEquals("unexpected contents", expected, + table.getCell(0, 0).getText()); } private void clickTableHeaderToSort(TableElement table) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java index 14994f8b02..b987a58871 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java @@ -62,8 +62,8 @@ public class TableWithPollingTest extends MultiBrowserTest { } private WebElement getColumnResizer(int column) { - return getHeaderCell(column).findElement( - By.className("v-table-resizer")); + return getHeaderCell(column) + .findElement(By.className("v-table-resizer")); } private void resizeColumn(int column, int by) throws InterruptedException { diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZoomingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZoomingTest.java index f0325ed77b..58b13bfbfa 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZoomingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZoomingTest.java @@ -56,9 +56,9 @@ public class UnnecessaryScrollbarWhenZoomingTest extends MultiBrowserTest { zoomSetter.resetZoom(); openTestURL(); // IE sometimes has trouble waiting long enough. - new WebDriverWait(getDriver(), 30).until(ExpectedConditions - .presenceOfElementLocated(By - .cssSelector(".v-table-body-wrapper"))); + new WebDriverWait(getDriver(), 30) + .until(ExpectedConditions.presenceOfElementLocated( + By.cssSelector(".v-table-body-wrapper"))); } @Test @@ -94,8 +94,8 @@ public class UnnecessaryScrollbarWhenZoomingTest extends MultiBrowserTest { } catch (InterruptedException e) { Assert.fail(); } - WebElement element = findElement(By - .cssSelector(".v-table-body-wrapper")); + WebElement element = findElement( + By.cssSelector(".v-table-body-wrapper")); assertNotNull("There must be a table", element); String overflow = element.getCssValue("overflow"); // As long as the overflow is hidden, there will not be scroll bars. @@ -110,7 +110,8 @@ public class UnnecessaryScrollbarWhenZoomingTest extends MultiBrowserTest { String detectVerticalScroll = "return arguments[0].scrollHeight > arguments[0].clientHeight"; Boolean vertical = (Boolean) ((TestBenchCommandExecutor) getDriver()) .executeScript(detectVerticalScroll, element); - assertEquals("there must be no vertical scrollbar", false, vertical); + assertEquals("there must be no vertical scrollbar", false, + vertical); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/EmptyTabSheetTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/EmptyTabSheetTest.java index 6d0b78debd..a86f468184 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/EmptyTabSheetTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/EmptyTabSheetTest.java @@ -34,8 +34,8 @@ public class EmptyTabSheetTest extends MultiBrowserTest { public void emptyTabSheetValo() { openTestURL("theme=valo"); - WebElement deco = getDriver().findElement( - By.className("v-tabsheet-deco")); + WebElement deco = getDriver() + .findElement(By.className("v-tabsheet-deco")); Assert.assertEquals("none", deco.getCssValue("display")); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheetTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheetTest.java index 99c47b1703..a96806bf37 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheetTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheetTest.java @@ -16,8 +16,8 @@ public class FirstTabNotVisibleInTabsheetTest extends MultiBrowserTest { TabSheetElement tabSheet = $(TabSheetElement.class).first(); - Assert.assertTrue("TabSheet should have first tab visible", tabSheet - .getTabCaptions().contains("first visible tab")); + Assert.assertTrue("TabSheet should have first tab visible", + tabSheet.getTabCaptions().contains("first visible tab")); } private void toggleFirstTabVisibility() { diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClippedTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClippedTest.java index 4d72f3e6fb..139b9e0821 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClippedTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClippedTest.java @@ -8,27 +8,27 @@ import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.WebElement; -public class FirstTabNotVisibleWhenTabsheetNotClippedTest extends - MultiBrowserTest { +public class FirstTabNotVisibleWhenTabsheetNotClippedTest + extends MultiBrowserTest { @Test public void testNotClippedTabIsVisible() throws InterruptedException { openTestURL(); - ButtonElement toggleNotClipped = $(ButtonElement.class).caption( - "Toggle first not clipped tab").first(); + ButtonElement toggleNotClipped = $(ButtonElement.class) + .caption("Toggle first not clipped tab").first(); toggleNotClipped.click(); TabSheetElement notClippedTabSheet = $(TabSheetElement.class).get(0); - WebElement firstTab = notClippedTabSheet.findElement(By - .className("v-tabsheet-tabitemcell-first")); + WebElement firstTab = notClippedTabSheet + .findElement(By.className("v-tabsheet-tabitemcell-first")); String caption = firstTab.findElement(By.className("v-captiontext")) .getText(); Assert.assertEquals("Tab with -first style should be Tab 1", "Tab 1", caption); toggleNotClipped.click(); - firstTab = notClippedTabSheet.findElement(By - .className("v-tabsheet-tabitemcell-first")); + firstTab = notClippedTabSheet + .findElement(By.className("v-tabsheet-tabitemcell-first")); caption = firstTab.findElement(By.className("v-captiontext")).getText(); Assert.assertEquals("Tab with -first style should be Tab 0", "Tab 0", caption); @@ -41,20 +41,20 @@ public class FirstTabNotVisibleWhenTabsheetNotClippedTest extends $(ButtonElement.class).caption("show tab D").get(0).click(); $(ButtonElement.class).caption("show tab C").get(0).click(); - WebElement firstTab = $(TabSheetElement.class).get(2).findElement( - By.className("v-tabsheet-tabitemcell-first")); - String firstCaption = firstTab.findElement( - By.className("v-captiontext")).getText(); + WebElement firstTab = $(TabSheetElement.class).get(2) + .findElement(By.className("v-tabsheet-tabitemcell-first")); + String firstCaption = firstTab + .findElement(By.className("v-captiontext")).getText(); org.junit.Assert.assertEquals("tab C", firstCaption); $(ButtonElement.class).caption("show tab D").get(1).click(); $(ButtonElement.class).caption("show tab C").get(1).click(); - WebElement secondTab = $(TabSheetElement.class).get(3).findElement( - By.className("v-tabsheet-tabitemcell-first")); - String secondCaption = secondTab.findElement( - By.className("v-captiontext")).getText(); + WebElement secondTab = $(TabSheetElement.class).get(3) + .findElement(By.className("v-tabsheet-tabitemcell-first")); + String secondCaption = secondTab + .findElement(By.className("v-captiontext")).getText(); org.junit.Assert.assertEquals("tab C", secondCaption); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemoveTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemoveTest.java index bffbc3ecdf..d7691afa41 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemoveTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemoveTest.java @@ -69,18 +69,18 @@ public class NewSelectionAfterTabRemoveTest extends MultiBrowserTest { * Gets the selected state of the specified tab. */ private boolean isTabSelected(TestBenchElement tab) { - return tab.getAttribute("class").contains( - "v-tabsheet-tabitemcell-selected") - && tab.getAttribute("class").contains( - "v-tabsheet-tabitemcell-focus"); + return tab.getAttribute("class") + .contains("v-tabsheet-tabitemcell-selected") + && tab.getAttribute("class") + .contains("v-tabsheet-tabitemcell-focus"); } /* * Scroll the tabsheet bar to the right. */ private boolean scrollRight() { - List<WebElement> scrollElements = getDriver().findElements( - By.className("v-tabsheet-scrollerNext")); + List<WebElement> scrollElements = getDriver() + .findElements(By.className("v-tabsheet-scrollerNext")); if (!scrollElements.isEmpty()) { TestBenchElement rightScrollElement = (TestBenchElement) scrollElements .get(0); @@ -95,8 +95,8 @@ public class NewSelectionAfterTabRemoveTest extends MultiBrowserTest { * Provide the tab close button for the specified tab. */ private TestBenchElement tabClose(TestBenchElement tab) { - return (TestBenchElement) tab.findElement(By - .className("v-tabsheet-caption-close")); + return (TestBenchElement) tab + .findElement(By.className("v-tabsheet-caption-close")); } /* diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/PreventTabChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/PreventTabChangeTest.java index dd0d8fb44f..abee6cb39a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/PreventTabChangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/PreventTabChangeTest.java @@ -32,11 +32,13 @@ public class PreventTabChangeTest extends MultiBrowserTest { clickTab(2); Thread.sleep(2000); assertTabSelected(2); - Assert.assertEquals("Tab 3 contents", getSelectedTabContent().getText()); + Assert.assertEquals("Tab 3 contents", + getSelectedTabContent().getText()); clickTab(0); clickTab(2); assertTabSelected(0); - Assert.assertEquals("Tab 1 contents", getSelectedTabContent().getText()); + Assert.assertEquals("Tab 1 contents", + getSelectedTabContent().getText()); } private void assertTabSelected(int i) throws NoSuchElementException { @@ -50,13 +52,13 @@ public class PreventTabChangeTest extends MultiBrowserTest { } private WebElement findTab(int i) { - return driver.findElement(com.vaadin.testbench.By - .vaadin("//TabSheet#tab[" + i + "]")); + return driver.findElement( + com.vaadin.testbench.By.vaadin("//TabSheet#tab[" + i + "]")); } private WebElement getSelectedTabContent() { - return driver.findElement(com.vaadin.testbench.By - .vaadin("//TabSheet#tabpanel")); + return driver.findElement( + com.vaadin.testbench.By.vaadin("//TabSheet#tabpanel")); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationTest.java index 65307f9492..33cb148228 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationTest.java @@ -175,8 +175,8 @@ public class TabKeyboardNavigationTest extends MultiBrowserTest { private TestBenchElement tab(int index) { By by = By.className("v-tabsheet-tabitemcell"); - TestBenchElement element = (TestBenchElement) getDriver().findElements( - by).get(index - 1); + TestBenchElement element = (TestBenchElement) getDriver() + .findElements(by).get(index - 1); String expected = "Tab " + index; Assert.assertEquals(expected, diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServerTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServerTest.java index 64aee8768b..946a50b24a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServerTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServerTest.java @@ -64,8 +64,8 @@ public class TabSelectionRevertedByServerTest extends MultiBrowserTest { TestBenchElement tabWrong = tab(wrongIndex); String attributeClassWrong = tabWrong.getAttribute("class"); - Assert.assertTrue("Tab " + wrongIndex - + " should be selected when click on Tab 4", + Assert.assertTrue( + "Tab " + wrongIndex + " should be selected when click on Tab 4", !attributeClassWrong .contains("v-tabsheet-tabitemcell-selected")); } @@ -99,8 +99,8 @@ public class TabSelectionRevertedByServerTest extends MultiBrowserTest { private TestBenchElement tab(int index) { By by = By.className("v-tabsheet-tabitemcell"); - TestBenchElement element = (TestBenchElement) getDriver().findElements( - by).get(index - 1); + TestBenchElement element = (TestBenchElement) getDriver() + .findElements(by).get(index - 1); String expected = "Tab " + index; Assert.assertEquals(expected, diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltipTest.java index 5462ed2532..eec64bbe1b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltipTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltipTest.java @@ -73,18 +73,19 @@ public class TabSheetErrorTooltipTest extends MultiBrowserTest { } private WebElement getTab(int index) { - return vaadinElement("/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[" - + index + "]/domChild[0]"); + return vaadinElement( + "/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[" + + index + "]/domChild[0]"); } private WebElement getCurrentTooltip() { - return getDriver().findElement( - By.xpath("//div[@class='v-tooltip-text']")); + return getDriver() + .findElement(By.xpath("//div[@class='v-tooltip-text']")); } private WebElement getCurrentErrorMessage() { - return getDriver().findElement( - By.xpath("//div[@class='v-errormessage']")); + return getDriver() + .findElement(By.xpath("//div[@class='v-errormessage']")); } private void assertTooltip(String tooltip) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusedTabTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusedTabTest.java index 52003bbac9..b78f893363 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusedTabTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusedTabTest.java @@ -68,10 +68,9 @@ public class TabSheetFocusedTabTest extends MultiBrowserTest { } private WebElement getTab(int index) { - return getDriver() - .findElement( - By.xpath("(//table[contains(@class, 'v-tabsheet-tabs')])[1]/tbody/tr/td[" - + (index + 1) + "]/div")); + return getDriver().findElement(By + .xpath("(//table[contains(@class, 'v-tabsheet-tabs')])[1]/tbody/tr/td[" + + (index + 1) + "]/div")); } private boolean isFocused(WebElement tab) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusingTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusingTest.java index 62948bed06..608628659c 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusingTest.java @@ -37,8 +37,7 @@ public class TabSheetFocusingTest extends MultiBrowserTest { } private WebElement getButton(String caption) { - return driver.findElement(By - .xpath("//span[@class='v-button-caption'][text()='" + caption - + "']")); + return driver.findElement(By.xpath( + "//span[@class='v-button-caption'][text()='" + caption + "']")); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParentTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParentTest.java index 5070fd069c..5b35ff3cbd 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParentTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParentTest.java @@ -39,8 +39,8 @@ public class TabSheetInDisabledParentTest extends MultiBrowserTest { // disable parent button.click(); - List<WebElement> tabHeaders = getDriver().findElements( - By.className("v-tabsheet-tabitemcell")); + List<WebElement> tabHeaders = getDriver() + .findElements(By.className("v-tabsheet-tabitemcell")); tabHeaders.get(1).findElement(By.className("v-captiontext")).click(); Assert.assertFalse( @@ -52,8 +52,8 @@ public class TabSheetInDisabledParentTest extends MultiBrowserTest { button.click(); // selected tab is still the same - tabHeaders = getDriver().findElements( - By.className("v-tabsheet-tabitemcell")); + tabHeaders = getDriver() + .findElements(By.className("v-tabsheet-tabitemcell")); Assert.assertTrue( "Tabsheet has wrong selected tab after enabling its parent", tabHeaders.get(0).getAttribute("class") diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanelTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanelTest.java index 8070133bde..8686003a03 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanelTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanelTest.java @@ -30,8 +30,8 @@ public class TabSheetInSplitPanelTest extends MultiBrowserTest { public void ensureNoScrollbars() { openTestURL(); TabSheetElement ts = $(TabSheetElement.class).first(); - List<WebElement> scrollables = ts.findElements(By - .xpath("//*[contains(@class,'v-scrollable')]")); + List<WebElement> scrollables = ts + .findElements(By.xpath("//*[contains(@class,'v-scrollable')]")); for (WebElement scrollable : scrollables) { assertNoHorizontalScrollbar(scrollable, "Element should not have a horizontal scrollbar"); diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabCloseTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabCloseTest.java index 8247b436d0..0f81c2a454 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabCloseTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabCloseTest.java @@ -42,8 +42,8 @@ public class TabSheetScrollOnTabCloseTest extends MultiBrowserTest { public void testScrollPositionAfterClosing() throws Exception { openTestURL(); TabSheetElement ts = $(TabSheetElement.class).first(); - WebElement tabSheetScroller = ts.findElement(By - .className("v-tabsheet-scrollerNext")); + WebElement tabSheetScroller = ts + .findElement(By.className("v-tabsheet-scrollerNext")); // scroll to the right for (int i = 0; i < 4; i++) { tabSheetScroller.click(); @@ -152,8 +152,8 @@ public class TabSheetScrollOnTabCloseTest extends MultiBrowserTest { @Override public Boolean apply(WebDriver driver) { try { - WebElement leftElement = tabSheet.findElement(By - .cssSelector(".v-tabsheet-tabitemcell")); + WebElement leftElement = tabSheet.findElement( + By.cssSelector(".v-tabsheet-tabitemcell")); String leftId = leftElement.getAttribute("id"); return leftId.equals(tabId); } catch (NoSuchElementException e) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSpaceNotScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSpaceNotScrollTest.java index c35248c1f4..4741350a8b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSpaceNotScrollTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSpaceNotScrollTest.java @@ -38,8 +38,8 @@ public class TabSpaceNotScrollTest extends MultiBrowserTest { public void testScroll() throws InterruptedException, IOException { openTestURL(); - TestBenchElement tab = (TestBenchElement) getDriver().findElement( - By.className("v-tabsheet-tabitemcell")); + TestBenchElement tab = (TestBenchElement) getDriver() + .findElement(By.className("v-tabsheet-tabitemcell")); tab.click(10, 10); Point oldLocation = tab.getLocation(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabsheetScrollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabsheetScrollingTest.java index 42c384dd78..afaa5e3a86 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabsheetScrollingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabsheetScrollingTest.java @@ -41,7 +41,8 @@ public class TabsheetScrollingTest extends MultiBrowserTest { } private WebElement getTab(int index) { - return getDriver().findElement(By.vaadin("//TabSheet#tab["+index+"]")); + return getDriver() + .findElement(By.vaadin("//TabSheet#tab[" + index + "]")); } private String getHideButtonText() { @@ -55,7 +56,9 @@ public class TabsheetScrollingTest extends MultiBrowserTest { private WebElement getTabByCaption(TabSheetElement ts, String caption) { WebElement tabBar = ts.findElement(By.className("v-tabsheet-tabs")); - return tabBar.findElement(By.xpath("./tbody/tr/td[./div/div/div[contains(., normalize-space('"+caption+"'))]]")); + return tabBar.findElement(By + .xpath("./tbody/tr/td[./div/div/div[contains(., normalize-space('" + + caption + "'))]]")); } private boolean isTabVisible(TabSheetElement ts, String tabCaption) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/textarea/TextAreaSizeResettedTest.java b/uitest/src/test/java/com/vaadin/tests/components/textarea/TextAreaSizeResettedTest.java index 6365d00735..2850b3cf26 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/textarea/TextAreaSizeResettedTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/textarea/TextAreaSizeResettedTest.java @@ -75,8 +75,9 @@ public class TextAreaSizeResettedTest extends MultiBrowserTest { new Actions(getDriver()) .moveToElement(getTextArea(), TEXTAREAWIDTH - resizeHandlerOffset, - TEXTAREAHEIGHT - resizeHandlerOffset).clickAndHold() - .moveByOffset(offset, offset).release().build().perform(); + TEXTAREAHEIGHT - resizeHandlerOffset) + .clickAndHold().moveByOffset(offset, offset).release().build() + .perform(); } @Test diff --git a/uitest/src/test/java/com/vaadin/tests/components/textfield/InputPromptGetTextTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/InputPromptGetTextTest.java index 3128ae3917..cc715afca7 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/textfield/InputPromptGetTextTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/InputPromptGetTextTest.java @@ -30,11 +30,11 @@ public class InputPromptGetTextTest extends MultiBrowserTest { public void test() { openTestURL(); - WebElement field = getDriver().findElement( - By.id(InputPromptGetText.FIELD)); + WebElement field = getDriver() + .findElement(By.id(InputPromptGetText.FIELD)); - WebElement button = getDriver().findElement( - By.id(InputPromptGetText.BUTTON)); + WebElement button = getDriver() + .findElement(By.id(InputPromptGetText.BUTTON)); String string = getRandomString(); field.sendKeys(string + "\n"); @@ -45,8 +45,8 @@ public class InputPromptGetTextTest extends MultiBrowserTest { button.click(); - WebElement label = getDriver().findElement( - By.id(InputPromptGetText.LABEL2)); + WebElement label = getDriver() + .findElement(By.id(InputPromptGetText.LABEL2)); Assert.assertEquals("Your input was:", label.getText().trim()); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogsTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogsTest.java index 66b0df5ff4..39da91b071 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogsTest.java @@ -4,8 +4,8 @@ import org.junit.Test; import com.vaadin.tests.tb3.MultiBrowserTest; -public class TextFieldTruncatesUnderscoresInModalDialogsTest extends - MultiBrowserTest { +public class TextFieldTruncatesUnderscoresInModalDialogsTest + extends MultiBrowserTest { @Test public void testWindowRepositioning() throws Exception { diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeContextMenuAndIconsTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeContextMenuAndIconsTest.java index 81d906bec3..1b3e4b435e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeContextMenuAndIconsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeContextMenuAndIconsTest.java @@ -123,8 +123,8 @@ public class TreeContextMenuAndIconsTest extends MultiBrowserTest { } private WebElement getTreeNodeByCaption(String caption) { - return getDriver().findElement( - By.xpath("//span[text() = '" + caption + "']")); + return getDriver() + .findElement(By.xpath("//span[text() = '" + caption + "']")); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java index 351eda6c90..065f1f65a3 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java @@ -54,8 +54,8 @@ public class TreeHtmlContentAllowedTest extends SingleBrowserTest { private void assertTreeCaptionTexts(String... captions) { TreeElement tree = $(TreeElement.class).first(); - List<WebElement> nodes = tree.findElements(By - .className("v-tree-node-caption")); + List<WebElement> nodes = tree + .findElements(By.className("v-tree-node-caption")); Assert.assertEquals(captions.length, nodes.size()); for (int i = 0; i < captions.length; i++) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemClickListeningTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemClickListeningTest.java index 2567fdb16d..307c2fe6d2 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemClickListeningTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemClickListeningTest.java @@ -27,8 +27,8 @@ import com.vaadin.tests.tb3.MultiBrowserTest; public class TreeItemClickListeningTest extends MultiBrowserTest { private WebElement getTreeNode(String caption) { - return getDriver().findElement( - By.xpath("//span[text() = '" + caption + "']")); + return getDriver() + .findElement(By.xpath("//span[text() = '" + caption + "']")); } @Test @@ -43,8 +43,7 @@ public class TreeItemClickListeningTest extends MultiBrowserTest { } private void assertEventFired(String text) { - assertThat( - String.format("Couldn't find text '%s' from the log.", text), + assertThat(String.format("Couldn't find text '%s' from the log.", text), logContainsText(text)); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemDoubleClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemDoubleClickTest.java index 95a3f02d60..6684c7e1e0 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemDoubleClickTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemDoubleClickTest.java @@ -47,8 +47,8 @@ public class TreeItemDoubleClickTest extends MultiBrowserTest { } private WebElement getTreeNodeByCaption(String caption) { - return getDriver().findElement( - By.xpath("//span[text() = '" + caption + "']")); + return getDriver() + .findElement(By.xpath("//span[text() = '" + caption + "']")); } private void doubleClick(WebElement element) { @@ -57,8 +57,7 @@ public class TreeItemDoubleClickTest extends MultiBrowserTest { } private void assertLogText(String text) { - assertThat( - String.format("Couldn't find text '%s' from the log.", text), + assertThat(String.format("Couldn't find text '%s' from the log.", text), logContainsText(text)); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediateTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediateTest.java index 2fb35b1680..69baf8c6d5 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediateTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediateTest.java @@ -43,19 +43,20 @@ public class TreeItemSelectionWithoutImmediateTest extends MultiBrowserTest { new Actions(getDriver()).moveToElement(treeItem).click().perform(); Thread.sleep(100); - WebElement selectedElement = driver.findElement(By - .className("v-tree-node-selected")); + WebElement selectedElement = driver + .findElement(By.className("v-tree-node-selected")); treeItem = getTreeNode(String.format( TreeItemSelectionWithoutImmediate.MENU_ITEM_TEMPLATE, i)); - assertThat("Clicked element should be selected", selectedElement - .getText().equals(treeItem.getText()), is(true)); + assertThat("Clicked element should be selected", + selectedElement.getText().equals(treeItem.getText()), + is(true)); } } private WebElement getTreeNode(String caption) { - return getDriver().findElement( - By.xpath("//span[text() = '" + caption + "']")); + return getDriver() + .findElement(By.xpath("//span[text() = '" + caption + "']")); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClickTest.java index b8715ed505..c64b0572eb 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClickTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClickTest.java @@ -38,8 +38,8 @@ public class TreeScrollingOnRightClickTest extends MultiBrowserTest { openTestURL(); // Focus tree - WebElement tree = getDriver().findElement( - By.id(TreeScrollingOnRightClick.TREE_ID)); + WebElement tree = getDriver() + .findElement(By.id(TreeScrollingOnRightClick.TREE_ID)); tree.click(); // Move selection down 50 items @@ -63,7 +63,7 @@ public class TreeScrollingOnRightClickTest extends MultiBrowserTest { } private WebElement getTreeNode(String caption) { - return getDriver().findElement( - By.xpath("//span[text() = '" + caption + "']")); + return getDriver() + .findElement(By.xpath("//span[text() = '" + caption + "']")); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java index e4d97b9de1..4eeaa997f8 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java @@ -40,8 +40,8 @@ public class DisappearingComponentsTest extends MultiBrowserTest { .findElement(By.className("v-treetable-treespacer")).click(); sleep(100); - WebElement link = treeTable.getCell(2, 1).findElement( - By.className("v-link")); + WebElement link = treeTable.getCell(2, 1) + .findElement(By.className("v-link")); assertEquals("3", link.getText()); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java index f767e5fd52..efd76f6e97 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java @@ -31,20 +31,21 @@ import com.vaadin.tests.tb3.MultiBrowserTest; * * @author Vaadin Ltd */ -public class TreeTableContainerHierarchicalWrapperTest extends MultiBrowserTest { +public class TreeTableContainerHierarchicalWrapperTest + extends MultiBrowserTest { @Test public void testStructure() throws InterruptedException { openTestURL(); TreeTableElement treeTable = $(TreeTableElement.class).first(); - WebElement findElement = treeTable.getCell(0, 0).findElement( - By.className("v-treetable-treespacer")); + WebElement findElement = treeTable.getCell(0, 0) + .findElement(By.className("v-treetable-treespacer")); findElement.click(); TestBenchElement cell = treeTable.getCell(5, 0); - WebElement findElement2 = cell.findElement(By - .className("v-treetable-treespacer")); + WebElement findElement2 = cell + .findElement(By.className("v-treetable-treespacer")); assertEquals("Item 0-5", cell.getText()); findElement2.click(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java index 0831232df7..9cfef66e9f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java @@ -39,11 +39,12 @@ public class TreeTableOutOfSyncTest extends MultiBrowserTest { openTestURL(); TreeTableElement treeTable = $(TreeTableElement.class).first(); - List<WebElement> rows = treeTable.findElement( - By.className("v-table-body")).findElements(By.tagName("tr")); + List<WebElement> rows = treeTable + .findElement(By.className("v-table-body")) + .findElements(By.tagName("tr")); - WebElement treeSpacer = rows.get(0).findElement( - By.className("v-treetable-treespacer")); + WebElement treeSpacer = rows.get(0) + .findElement(By.className("v-treetable-treespacer")); treeSpacer.click(); sleep(100); @@ -53,8 +54,8 @@ public class TreeTableOutOfSyncTest extends MultiBrowserTest { WebElement button = rows.get(2).findElement(By.className("v-button")); button.click(); - List<WebElement> notifications = findElements(By - .className("v-Notification-system")); + List<WebElement> notifications = findElements( + By.className("v-Notification-system")); assertTrue(notifications.isEmpty()); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java index d88c6ba7ca..a7934d95c4 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java +++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java @@ -39,17 +39,18 @@ public class TreeTablePartialUpdatesPageLength0Test extends MultiBrowserTest { openTestURL(); TreeTableElement treeTable = $(TreeTableElement.class).first(); - List<WebElement> rows = treeTable.findElement( - By.className("v-table-body")).findElements(By.tagName("tr")); + List<WebElement> rows = treeTable + .findElement(By.className("v-table-body")) + .findElements(By.tagName("tr")); assertEquals("unexpected row count", 4, rows.size()); - assertEquals("unexpected contents", "root1", treeTable.getCell(0, 0) - .getText()); - assertEquals("unexpected contents", "root2", treeTable.getCell(1, 0) - .getText()); - assertEquals("unexpected contents", "root3", treeTable.getCell(2, 0) - .getText()); - assertEquals("unexpected contents", "END", treeTable.getCell(3, 0) - .getText()); + assertEquals("unexpected contents", "root1", + treeTable.getCell(0, 0).getText()); + assertEquals("unexpected contents", "root2", + treeTable.getCell(1, 0).getText()); + assertEquals("unexpected contents", "root3", + treeTable.getCell(2, 0).getText()); + assertEquals("unexpected contents", "END", + treeTable.getCell(3, 0).getText()); // expand first row, should have 10 children treeTable.getCell(0, 0) @@ -61,14 +62,14 @@ public class TreeTablePartialUpdatesPageLength0Test extends MultiBrowserTest { assertEquals("unexpected row count", 14, rows.size()); // expand root3, should have 200 children - assertEquals("unexpected contents", "root3", treeTable.getCell(12, 0) - .getText()); + assertEquals("unexpected contents", "root3", + treeTable.getCell(12, 0).getText()); treeTable.getCell(12, 0) .findElement(By.className("v-treetable-treespacer")).click(); // expand root2, should have 200 children - assertEquals("unexpected contents", "root2", treeTable.getCell(11, 0) - .getText()); + assertEquals("unexpected contents", "root2", + treeTable.getCell(11, 0).getText()); treeTable.getCell(11, 0) .findElement(By.className("v-treetable-treespacer")).click(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java index 5a55df581c..48d84f080e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java @@ -42,8 +42,9 @@ public class TreeTablePartialUpdatesTest extends MultiBrowserTest { openTestURL(); TreeTableElement treeTable = $(TreeTableElement.class).first(); - List<WebElement> rows = treeTable.findElement( - By.className("v-table-body")).findElements(By.tagName("tr")); + List<WebElement> rows = treeTable + .findElement(By.className("v-table-body")) + .findElements(By.tagName("tr")); assertEquals("unexpected row count", 4, rows.size()); // expand the first root element @@ -52,8 +53,8 @@ public class TreeTablePartialUpdatesTest extends MultiBrowserTest { treeTable = $(TreeTableElement.class).first(); // wait for the scrollposition element to disappear - waitUntilNot(ExpectedConditions.visibilityOfElementLocated(By - .className("v-table-scrollposition"))); + waitUntilNot(ExpectedConditions.visibilityOfElementLocated( + By.className("v-table-scrollposition"))); rows = treeTable.findElement(By.className("v-table-body")) .findElements(By.tagName("tr")); @@ -61,28 +62,28 @@ public class TreeTablePartialUpdatesTest extends MultiBrowserTest { // TODO: replace these with just treeTable.scroll(int) when #13826 has // been fixed - TestBenchElementCommands scrollable = testBenchElement(treeTable - .findElement(By.className("v-scrollable"))); + TestBenchElementCommands scrollable = testBenchElement( + treeTable.findElement(By.className("v-scrollable"))); // scroll far enough down to drop the first row from the cache // but not far enough to reach the last row scrollable.scroll(1692); // wait for the scrollposition element to disappear - waitUntilNot(ExpectedConditions.visibilityOfElementLocated(By - .className("v-table-scrollposition"))); + waitUntilNot(ExpectedConditions.visibilityOfElementLocated( + By.className("v-table-scrollposition"))); - assertEquals("elements found where there should be none", 0, treeTable - .findElements(By.vaadin("#row[0]/col[0]")).size()); - assertEquals("elements found where there should be none", 0, treeTable - .findElements(By.vaadin("#row[203]/col[0]")).size()); + assertEquals("elements found where there should be none", 0, + treeTable.findElements(By.vaadin("#row[0]/col[0]")).size()); + assertEquals("elements found where there should be none", 0, + treeTable.findElements(By.vaadin("#row[203]/col[0]")).size()); // scroll 6000 to make sure to actually hit bottom scrollable.scroll(6000); // wait for the scrollposition element to disappear - waitUntilNot(ExpectedConditions.visibilityOfElementLocated(By - .className("v-table-scrollposition"))); + waitUntilNot(ExpectedConditions.visibilityOfElementLocated( + By.className("v-table-scrollposition"))); // check the contents treeTable = $(TreeTableElement.class).first(); @@ -96,23 +97,24 @@ public class TreeTablePartialUpdatesTest extends MultiBrowserTest { assertEquals("unexpected cell contents (first cached row expected)", "158", treeTable.getCell(159, 0).getText()); - assertEquals("elements found where there should be none", 0, treeTable - .findElements(By.vaadin("#row[158]/col[0]")).size()); - assertEquals("elements found where there should be none", 0, treeTable - .findElements(By.vaadin("#row[204]/col[0]")).size()); + assertEquals("elements found where there should be none", 0, + treeTable.findElements(By.vaadin("#row[158]/col[0]")).size()); + assertEquals("elements found where there should be none", 0, + treeTable.findElements(By.vaadin("#row[204]/col[0]")).size()); // check the actual visibility compareScreen("bottom"); } @Test - public void testNegativeArraySize() throws IOException, - InterruptedException { + public void testNegativeArraySize() + throws IOException, InterruptedException { openTestURL(); TreeTableElement treeTable = $(TreeTableElement.class).first(); - List<WebElement> rows = treeTable.findElement( - By.className("v-table-body")).findElements(By.tagName("tr")); + List<WebElement> rows = treeTable + .findElement(By.className("v-table-body")) + .findElements(By.tagName("tr")); assertEquals("unexpected row count", 4, rows.size()); // expand the first root element @@ -120,8 +122,8 @@ public class TreeTablePartialUpdatesTest extends MultiBrowserTest { .findElement(By.className("v-treetable-treespacer")).click(); // wait for the scrollposition element to disappear - waitUntilNot(ExpectedConditions.visibilityOfElementLocated(By - .className("v-table-scrollposition"))); + waitUntilNot(ExpectedConditions.visibilityOfElementLocated( + By.className("v-table-scrollposition"))); treeTable = $(TreeTableElement.class).first(); rows = treeTable.findElement(By.className("v-table-body")) @@ -130,18 +132,18 @@ public class TreeTablePartialUpdatesTest extends MultiBrowserTest { // TODO: replace these with just treeTable.scroll(int) when #13826 has // been fixed - TestBenchElementCommands scrollable = testBenchElement(treeTable - .findElement(By.className("v-scrollable"))); + TestBenchElementCommands scrollable = testBenchElement( + treeTable.findElement(By.className("v-scrollable"))); // scroll far enough down to reach the second root item again scrollable.scroll(3969); // wait for the scrollposition element to disappear - waitUntilNot(ExpectedConditions.visibilityOfElementLocated(By - .className("v-table-scrollposition"))); + waitUntilNot(ExpectedConditions.visibilityOfElementLocated( + By.className("v-table-scrollposition"))); - assertEquals("elements found where there should be none", 0, treeTable - .findElements(By.vaadin("#row[0]/col[0]")).size()); + assertEquals("elements found where there should be none", 0, + treeTable.findElements(By.vaadin("#row[0]/col[0]")).size()); assertEquals("unexpected cell contents", "root2", treeTable.getCell(201, 0).getText()); assertEquals("unexpected cell contents", "END", @@ -152,8 +154,8 @@ public class TreeTablePartialUpdatesTest extends MultiBrowserTest { .findElement(By.className("v-treetable-treespacer")).click(); // wait for the scrollposition element to disappear - waitUntilNot(ExpectedConditions.visibilityOfElementLocated(By - .className("v-table-scrollposition"))); + waitUntilNot(ExpectedConditions.visibilityOfElementLocated( + By.className("v-table-scrollposition"))); // ensure the last cached row isn't the final row treeTable = $(TreeTableElement.class).first(); @@ -169,8 +171,8 @@ public class TreeTablePartialUpdatesTest extends MultiBrowserTest { .findElement(By.className("v-treetable-treespacer")).click(); // wait for the scrollposition element to disappear - waitUntilNot(ExpectedConditions.visibilityOfElementLocated(By - .className("v-table-scrollposition"))); + waitUntilNot(ExpectedConditions.visibilityOfElementLocated( + By.className("v-table-scrollposition"))); // check the contents treeTable = $(TreeTableElement.class).first(); @@ -184,10 +186,10 @@ public class TreeTablePartialUpdatesTest extends MultiBrowserTest { assertEquals("unexpected cell contents (first cached row expected)", "158", treeTable.getCell(159, 0).getText()); - assertEquals("elements found where there should be none", 0, treeTable - .findElements(By.vaadin("#row[158]/col[0]")).size()); - assertEquals("elements found where there should be none", 0, treeTable - .findElements(By.vaadin("#row[204]/col[0]")).size()); + assertEquals("elements found where there should be none", 0, + treeTable.findElements(By.vaadin("#row[158]/col[0]")).size()); + assertEquals("elements found where there should be none", 0, + treeTable.findElements(By.vaadin("#row[204]/col[0]")).size()); // check the actual visibility compareScreen("bottom"); diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderModeTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderModeTest.java index 0215c14aef..751299a945 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderModeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderModeTest.java @@ -34,6 +34,7 @@ public class TreeTableRowHeaderModeTest extends MultiBrowserTest { Assert.assertFalse( "Unexpected row header for icons is found in TreeTable", - isElementPresent(By.className("v-table-header-cell-rowheader"))); + isElementPresent( + By.className("v-table-header-cell-rowheader"))); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java index a17559cc81..a7a43e7493 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java @@ -39,8 +39,8 @@ public class TreeTableScrollOnExpandTest extends MultiBrowserTest { // Need to wait a bit to avoid accepting the case where the TreeTable is // in the desired state only for a short while. sleep(1000); - WebElement focusedRow = getDriver().findElement( - By.className("v-table-focus")); + WebElement focusedRow = getDriver() + .findElement(By.className("v-table-focus")); assertEquals("Item 21", focusedRow.getText()); } }
\ No newline at end of file diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java index 760d2f39ea..e503db0d3e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java @@ -66,17 +66,20 @@ public class ComboboxSelectedItemTextTest extends MultiBrowserTest { String screenshotIdentifier) throws IOException { openTestURL(); - WebElement comboBox = vaadinElement("/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[" - + indexToTest + "]/VFilterSelect[0]"); - WebElement comboBoxFocus = vaadinElement("/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[" - + indexToFocus + "]/VFilterSelect[0]"); + WebElement comboBox = vaadinElement( + "/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[" + + indexToTest + "]/VFilterSelect[0]"); + WebElement comboBoxFocus = vaadinElement( + "/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[" + + indexToFocus + "]/VFilterSelect[0]"); // Select an element from the first (to test) combobox. comboBox.findElement(By.className("v-filterselect-button")).click(); waitForPopup(comboBox); - WebElement comboBoxPopup = vaadinElement("/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[" - + indexToTest + "]/VFilterSelect[0]#popup"); + WebElement comboBoxPopup = vaadinElement( + "/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[" + + indexToTest + "]/VFilterSelect[0]#popup"); comboBoxPopup.findElements(By.tagName("td")).get(2).click(); // Select an element from the second (to focus) combobox to remove @@ -85,8 +88,9 @@ public class ComboboxSelectedItemTextTest extends MultiBrowserTest { comboBoxFocus.findElement(By.className("v-filterselect-button")) .click(); waitForPopup(comboBoxFocus); - comboBoxPopup = vaadinElement("/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[" - + indexToFocus + "]/VFilterSelect[0]#popup"); + comboBoxPopup = vaadinElement( + "/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[" + + indexToFocus + "]/VFilterSelect[0]#popup"); comboBoxPopup.findElements(By.tagName("td")).get(2).click(); // click the button of the first combobox. This would reveal the diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetsetTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetsetTest.java index 429bcc0afc..d100a305df 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetsetTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetsetTest.java @@ -33,10 +33,8 @@ public class ComponentMissingFromDefaultWidgetsetTest extends MultiBrowserTest { public void testComponentInTestingWidgetset() { openTestURL(); WebElement component = vaadinElementById("missing-component"); - assertTrue(component - .getText() - .startsWith( - "Widgetset 'com.vaadin.DefaultWidgetSet' does not contain implementation for com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent.")); + assertTrue(component.getText().startsWith( + "Widgetset 'com.vaadin.DefaultWidgetSet' does not contain implementation for com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent.")); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/DynamicViewportEmptyTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/DynamicViewportEmptyTest.java index 55466130ad..e720d6eb99 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/ui/DynamicViewportEmptyTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/ui/DynamicViewportEmptyTest.java @@ -42,8 +42,8 @@ public class DynamicViewportEmptyTest extends MultiBrowserTest { public void testGeneratedEmptyViewport() { openTestURL(); - List<WebElement> viewportElements = findElements(By - .cssSelector("meta[name=viewport]")); + List<WebElement> viewportElements = findElements( + By.cssSelector("meta[name=viewport]")); Assert.assertTrue("There should be no viewport tags", viewportElements.isEmpty()); diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/DynamicViewportTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/DynamicViewportTest.java index f1d9efdbd1..42e56b8e10 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/ui/DynamicViewportTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/ui/DynamicViewportTest.java @@ -28,10 +28,10 @@ public class DynamicViewportTest extends SingleBrowserTest { public void testGeneratedViewport() { openTestURL(); - WebElement viewportElement = findElement(By - .cssSelector("meta[name=viewport]")); + WebElement viewportElement = findElement( + By.cssSelector("meta[name=viewport]")); - Assert.assertTrue(viewportElement.getAttribute("content").contains( - "PhantomJS")); + Assert.assertTrue( + viewportElement.getAttribute("content").contains("PhantomJS")); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/RpcInvocationHandlerToStringTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/RpcInvocationHandlerToStringTest.java index 10a297d47b..5470a8c229 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/ui/RpcInvocationHandlerToStringTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/ui/RpcInvocationHandlerToStringTest.java @@ -20,8 +20,8 @@ public class RpcInvocationHandlerToStringTest extends MultiBrowserTest { $(ButtonElement.class) .caption("Exec " + method + " for an invocation proxy").first() .click(); - Assert.assertFalse(method - + " for invocation proxy caused a notification", + Assert.assertFalse( + method + " for invocation proxy caused a notification", $(NotificationElement.class).exists()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/StaticViewportTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/StaticViewportTest.java index 61b3c944c9..f45fd94911 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/ui/StaticViewportTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/ui/StaticViewportTest.java @@ -28,8 +28,8 @@ public class StaticViewportTest extends SingleBrowserTest { public void testStaticViewport() { openTestURL(); - WebElement viewportElement = findElement(By - .cssSelector("meta[name=viewport]")); + WebElement viewportElement = findElement( + By.cssSelector("meta[name=viewport]")); Assert.assertEquals("myViewport", viewportElement.getAttribute("content")); diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java index 43422feb58..454eddc6c9 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java @@ -49,7 +49,8 @@ public class TextAreaEventPropagationModifierKeysTest extends MultiBrowserTest { } @Test - public void textAreaCtrlEnterEventPropagation() throws InterruptedException { + public void textAreaCtrlEnterEventPropagation() + throws InterruptedException { openTestURL(); WebElement textArea = $(TextAreaElement.class).first(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java index b5440b8f76..e1aad80871 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java @@ -60,8 +60,8 @@ public class TimeoutRedirectResetsOnActivityTest extends MultiBrowserTest { assertThat(driver.getCurrentUrl(), is(getTestUrl())); testBench().disableWaitForVaadin(); - Thread.sleep(actualExpireTime - originalExpireTime - + communicationOverhead); + Thread.sleep( + actualExpireTime - originalExpireTime + communicationOverhead); assertThat(driver.getCurrentUrl(), is(not(getTestUrl()))); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UIAccessTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIAccessTest.java index 0e37aa36fb..07dc6df5ee 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/ui/UIAccessTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIAccessTest.java @@ -40,17 +40,21 @@ public class UIAccessTest extends MultiBrowserTest { $(ButtonElement.class).get(7).click(); - waitForLogToContainText("0. Current UI matches in beforeResponse? true"); - waitForLogToContainText("1. Current session matches in beforeResponse? true"); + waitForLogToContainText( + "0. Current UI matches in beforeResponse? true"); + waitForLogToContainText( + "1. Current session matches in beforeResponse? true"); } @Test public void canBeAccessedFromUIThread() { $(ButtonElement.class).first().click(); - assertTrue(logContainsText("0. Access from UI thread future is done? false")); + assertTrue(logContainsText( + "0. Access from UI thread future is done? false")); assertTrue(logContainsText("1. Access from UI thread is run")); - assertTrue(logContainsText("2. beforeClientResponse future is done? true")); + assertTrue(logContainsText( + "2. beforeClientResponse future is done? true")); } @Test @@ -78,14 +82,16 @@ public class UIAccessTest extends MultiBrowserTest { assertTrue(logContainsText("0. Throwing exception in access")); assertTrue(logContainsText("1. firstFuture is done? true")); - assertTrue(logContainsText("2. Got exception from firstFuture: java.lang.RuntimeException: Catch me if you can")); + assertTrue(logContainsText( + "2. Got exception from firstFuture: java.lang.RuntimeException: Catch me if you can")); } @Test public void futureIsCancelledBeforeStarted() { $(ButtonElement.class).get(3).click(); - assertTrue(logContainsText("0. future was cancelled, should not start")); + assertTrue( + logContainsText("0. future was cancelled, should not start")); } @Test @@ -102,9 +108,12 @@ public class UIAccessTest extends MultiBrowserTest { $(ButtonElement.class).get(5).click(); assertTrue(logContainsText("0. accessSynchronously has request? true")); - assertTrue(logContainsText("1. Test value in accessSynchronously: Set before accessSynchronosly")); - assertTrue(logContainsText("2. has request after accessSynchronously? true")); - assertTrue(logContainsText("3. Test value after accessSynchornously: Set in accessSynchronosly")); + assertTrue(logContainsText( + "1. Test value in accessSynchronously: Set before accessSynchronosly")); + assertTrue(logContainsText( + "2. has request after accessSynchronously? true")); + assertTrue(logContainsText( + "3. Test value after accessSynchornously: Set in accessSynchronosly")); } @Test @@ -112,9 +121,11 @@ public class UIAccessTest extends MultiBrowserTest { $(ButtonElement.class).get(6).click(); assertTrue(logContainsText("0. access has request? false")); - assertTrue(logContainsText("1. Test value in access: Set before access")); + assertTrue( + logContainsText("1. Test value in access: Set before access")); assertTrue(logContainsText("2. has request after access? true")); - assertTrue(logContainsText("3. Test value after access: Set before run pending")); + assertTrue(logContainsText( + "3. Test value after access: Set before run pending")); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitBrowserDetailsTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitBrowserDetailsTest.java index 1e69662935..641ac6d82a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitBrowserDetailsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitBrowserDetailsTest.java @@ -37,8 +37,9 @@ public class UIInitBrowserDetailsTest extends MultiBrowserTest { private void compareRequestAndBrowserValue(String paramName, String browserName, String errorValue) { assertTextNotEquals(browserName, errorValue); - Assert.assertEquals(String.format( - "Browser and request values differ in '%s',", browserName), + Assert.assertEquals( + String.format("Browser and request values differ in '%s',", + browserName), getLabelText(paramName), getLabelText(browserName)); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitExceptionTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitExceptionTest.java index d002642a74..c1d6aaa55b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitExceptionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitExceptionTest.java @@ -9,7 +9,7 @@ public class UIInitExceptionTest extends MultiBrowserTest { @Test public void testExceptionOnUIInit() throws Exception { openTestURL(); - Assert.assertTrue("Page does not contain the given text", driver - .getPageSource().contains("Catch me if you can")); + Assert.assertTrue("Page does not contain the given text", + driver.getPageSource().contains("Catch me if you can")); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UISerializationTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UISerializationTest.java index 649f48c9ce..d4eb11aff5 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/ui/UISerializationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UISerializationTest.java @@ -21,10 +21,8 @@ public class UISerializationTest extends SingleBrowserTest { assertThat(getLogRow(0), startsWith("3. Diff states match, size: ")); assertThat(getLogRow(1), startsWith("2. Deserialized UI in ")); - assertThat( - getLogRow(2), - allOf(startsWith("1. Serialized UI in"), - containsString(" into "), endsWith(" bytes"))); + assertThat(getLogRow(2), allOf(startsWith("1. Serialized UI in"), + containsString(" into "), endsWith(" bytes"))); } private void serialize() { diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java index 661db179e7..f7c012f17e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java @@ -38,8 +38,8 @@ public class UnnecessaryPaddingInResponsiveUITest extends SingleBrowserTest { String paddingTop = ui.getCssValue("padding-top"); - Integer paddingHeight = Integer.parseInt(paddingTop.substring(0, - paddingTop.length() - 2)); + Integer paddingHeight = Integer + .parseInt(paddingTop.substring(0, paddingTop.length() - 2)); assertThat(paddingHeight, equalTo(0)); diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/WindowAndUIShortcutsTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/WindowAndUIShortcutsTest.java index 93324f0792..fe4a0e8077 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/ui/WindowAndUIShortcutsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/ui/WindowAndUIShortcutsTest.java @@ -38,6 +38,7 @@ public class WindowAndUIShortcutsTest extends SingleBrowserTest { // Window should have been closed Assert.assertTrue($(WindowElement.class).all().isEmpty()); // "Close page" should not have been clicked - Assert.assertTrue($(ButtonElement.class).caption("Close page").exists()); + Assert.assertTrue( + $(ButtonElement.class).caption("Close page").exists()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/TestFileUploadTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/TestFileUploadTest.java index f1d5432344..37c270d78f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/upload/TestFileUploadTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/upload/TestFileUploadTest.java @@ -64,8 +64,8 @@ public class TestFileUploadTest extends MultiBrowserTest { } private String md5(String string) throws NoSuchAlgorithmException { - byte[] digest = MessageDigest.getInstance("MD5").digest( - string.getBytes()); + byte[] digest = MessageDigest.getInstance("MD5") + .digest(string.getBytes()); BigInteger bigInt = new BigInteger(1, digest); String hashtext = bigInt.toString(16); return hashtext; diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java index a0d6d471fb..6d99560a13 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java @@ -21,8 +21,8 @@ import static org.hamcrest.Matchers.closeTo; import com.vaadin.ui.themes.*; import org.junit.Test; -public class UploadImmediateButtonWidthChameleonTest extends - UploadImmediateButtonWidthTest { +public class UploadImmediateButtonWidthChameleonTest + extends UploadImmediateButtonWidthTest { @Override protected String getTheme() { diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java index c22e416a25..91dddb789f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java @@ -21,8 +21,8 @@ import static org.hamcrest.Matchers.closeTo; import com.vaadin.ui.themes.*; import org.junit.Test; -public class UploadImmediateButtonWidthReindeerTest extends - UploadImmediateButtonWidthTest { +public class UploadImmediateButtonWidthReindeerTest + extends UploadImmediateButtonWidthTest { @Override protected String getTheme() { diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java index 0ab4fbbc7e..1a02d24590 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java @@ -21,8 +21,8 @@ import static org.hamcrest.Matchers.closeTo; import com.vaadin.ui.themes.*; import org.junit.Test; -public class UploadImmediateButtonWidthRunoTest extends - UploadImmediateButtonWidthTest { +public class UploadImmediateButtonWidthRunoTest + extends UploadImmediateButtonWidthTest { @Override protected String getTheme() { diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthValoTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthValoTest.java index 9d8fe6ba9e..4fdf6c27a7 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthValoTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthValoTest.java @@ -21,8 +21,8 @@ import static org.hamcrest.Matchers.closeTo; import com.vaadin.ui.themes.*; import org.junit.Test; -public class UploadImmediateButtonWidthValoTest extends - UploadImmediateButtonWidthTest { +public class UploadImmediateButtonWidthValoTest + extends UploadImmediateButtonWidthTest { @Override protected String getTheme() { diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadNoSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadNoSelectionTest.java index 30dbefc06b..448c7ba130 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadNoSelectionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadNoSelectionTest.java @@ -42,8 +42,8 @@ public class UploadNoSelectionTest extends MultiBrowserTest { } private WebElement getSubmitButton() { - WebElement element = getDriver().findElement( - By.id(UploadNoSelection.UPLOAD_ID)); + WebElement element = getDriver() + .findElement(By.id(UploadNoSelection.UPLOAD_ID)); WebElement submitButton = element.findElement(By.className("v-button")); return submitButton; } diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpenedTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpenedTest.java index e18b5b043a..70fb1c31dc 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpenedTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpenedTest.java @@ -85,8 +85,8 @@ public class BackspaceKeyWithModalOpenedTest extends MultiBrowserTest { WebElement nextButton = driver.findElement(By.id(BTN_NEXT_ID)); nextButton.click(); - WebElement openModalButton = driver.findElement(By - .id(BTN_OPEN_MODAL_ID)); + WebElement openModalButton = driver + .findElement(By.id(BTN_OPEN_MODAL_ID)); openModalButton.click(); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/BottomComponentScrollsUpTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/BottomComponentScrollsUpTest.java index 3d0da2677b..9560fe8eff 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/BottomComponentScrollsUpTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/BottomComponentScrollsUpTest.java @@ -49,8 +49,8 @@ public class BottomComponentScrollsUpTest extends MultiBrowserTest { .findElement(By.className("v-panel-content")); Dimension panelScrollableSize = panelScrollable.getSize(); - WebElement verticalLayout = panelScrollable.findElement(By - .className("v-verticallayout")); + WebElement verticalLayout = panelScrollable + .findElement(By.className("v-verticallayout")); Dimension verticalLayoutSize = verticalLayout.getSize(); panelScrollable.scroll(verticalLayoutSize.height); @@ -63,8 +63,8 @@ public class BottomComponentScrollsUpTest extends MultiBrowserTest { // Loose the focus from the button. new Actions(getDriver()) .moveToElement(panelScrollable, panelScrollableSize.width / 2, - panelScrollableSize.height / 2).click().build() - .perform(); + panelScrollableSize.height / 2) + .click().build().perform(); compareScreen("window"); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/CloseModalSubWindowTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/CloseModalSubWindowTest.java index aec0a7c9df..7dc0231150 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/CloseModalSubWindowTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/CloseModalSubWindowTest.java @@ -32,44 +32,44 @@ public class CloseModalSubWindowTest extends MultiBrowserTest { openTestURL(); // assert that there's a button with a 'del-btn0' id - List<WebElement> buttons = getDriver().findElements( - By.id(CloseModalSubWindow.DELETE_BUTTON + "0")); + List<WebElement> buttons = getDriver() + .findElements(By.id(CloseModalSubWindow.DELETE_BUTTON + "0")); int deleteButtonCount = buttons.size(); Assert.assertEquals(1, deleteButtonCount); // assert that there's no sub-windows open - List<WebElement> subWindows = getDriver().findElements( - By.id(CloseModalSubWindow.SUB_WINDOW)); + List<WebElement> subWindows = getDriver() + .findElements(By.id(CloseModalSubWindow.SUB_WINDOW)); Assert.assertEquals(0, subWindows.size()); // click the first delete button getFirstDeteleButton(0).click(); // assert that there's ONE sub-window open - subWindows = getDriver().findElements( - By.id(CloseModalSubWindow.SUB_WINDOW)); + subWindows = getDriver() + .findElements(By.id(CloseModalSubWindow.SUB_WINDOW)); Assert.assertEquals(1, subWindows.size()); - WebElement confirm = getDriver().findElement( - By.id(CloseModalSubWindow.CONFIRM_BUTTON)); + WebElement confirm = getDriver() + .findElement(By.id(CloseModalSubWindow.CONFIRM_BUTTON)); // click the confirm button in the sub-window confirm.click(); // assert that there's no sub-windows open - subWindows = getDriver().findElements( - By.id(CloseModalSubWindow.SUB_WINDOW)); + subWindows = getDriver() + .findElements(By.id(CloseModalSubWindow.SUB_WINDOW)); Assert.assertEquals(0, subWindows.size()); // assert that there's no button with 'del-btn0' id anymore - buttons = getDriver().findElements( - By.id(CloseModalSubWindow.DELETE_BUTTON + "0")); + buttons = getDriver() + .findElements(By.id(CloseModalSubWindow.DELETE_BUTTON + "0")); Assert.assertEquals(0, buttons.size()); } private WebElement getFirstDeteleButton(int index) { - WebElement button = getDriver().findElement( - By.id(CloseModalSubWindow.DELETE_BUTTON + index)); + WebElement button = getDriver() + .findElement(By.id(CloseModalSubWindow.DELETE_BUTTON + index)); return button; } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java index a80938ba32..20bbae94b4 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java @@ -39,9 +39,10 @@ public class ComboboxScrollableWindowTest extends MultiBrowserTest { openTestURL(); WindowElement window = $(WindowElement.class).id(WINDOW_ID); - WebElement scrollableElement = window.findElement(By - .className("v-scrollable")); - TestBenchElementCommands scrollable = testBenchElement(scrollableElement); + WebElement scrollableElement = window + .findElement(By.className("v-scrollable")); + TestBenchElementCommands scrollable = testBenchElement( + scrollableElement); scrollable.scroll(1000); ComboBoxElement comboBox = $(ComboBoxElement.class).id(COMBOBOX_ID); comboBox.openPopup(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/ExtraWindowShownWaiAriaTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/ExtraWindowShownWaiAriaTest.java index 4ec1dc5c98..bbba1c0a0c 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/ExtraWindowShownWaiAriaTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/ExtraWindowShownWaiAriaTest.java @@ -65,8 +65,8 @@ public class ExtraWindowShownWaiAriaTest extends MultiBrowserTest { assertEquals(label.getAttribute("id"), window.getAttribute("aria-describedby")); - List<WebElement> wButtons = window.findElements(By - .className("v-button")); + List<WebElement> wButtons = window + .findElements(By.className("v-button")); assertEquals("button", wButtons.get(0).getAttribute("role")); assertEquals("button", wButtons.get(1).getAttribute("role")); @@ -95,8 +95,9 @@ public class ExtraWindowShownWaiAriaTest extends MultiBrowserTest { // ensure correct attributes window = $(WindowElement.class).first(); List<WebElement> labels = window.findElements(By.className("v-label")); - assertEquals(labels.get(0).getAttribute("id") + " " - + labels.get(1).getAttribute("id"), + assertEquals( + labels.get(0).getAttribute("id") + " " + + labels.get(1).getAttribute("id"), window.getAttribute("aria-describedby")); // close dialog @@ -121,8 +122,8 @@ public class ExtraWindowShownWaiAriaTest extends MultiBrowserTest { // ensure the assistive spans have been added to the header window = $(WindowElement.class).first(); header = window.findElement(By.className("v-window-header")); - List<WebElement> assistiveElements = header.findElements(By - .className("v-assistive-device-only")); + List<WebElement> assistiveElements = header + .findElements(By.className("v-assistive-device-only")); assertEquals("Important", assistiveElements.get(0).getAttribute("innerHTML")); assertEquals(" - do ASAP", diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayoutTest.java index 17d4cf80e7..446f3fe62a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayoutTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayoutTest.java @@ -23,8 +23,8 @@ import com.vaadin.testbench.elements.TextFieldElement; import com.vaadin.tests.tb3.MultiBrowserTest; import com.vaadin.tests.tb3.newelements.WindowElement; -public class MaximizeRestoreWindowWithManagedLayoutTest extends - MultiBrowserTest { +public class MaximizeRestoreWindowWithManagedLayoutTest + extends MultiBrowserTest { // This tests a timing issue so if this test fails randomly, it is // likely that something is broken diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/MoveToTopTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/MoveToTopTest.java index 1700100ae7..14d1d25046 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/MoveToTopTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/MoveToTopTest.java @@ -33,18 +33,18 @@ public class MoveToTopTest extends MultiBrowserTest { public void testBringToFrontViaHeader() throws IOException { openTestURL(); - WebElement firstWindow = driver.findElement(By - .className("first-window")); + WebElement firstWindow = driver + .findElement(By.className("first-window")); - WebElement secondWindow = driver.findElement(By - .className("second-window")); + WebElement secondWindow = driver + .findElement(By.className("second-window")); secondWindow.click(); compareScreen("second-window-over-first"); - WebElement headerFirst = firstWindow.findElement(By - .className("v-window-outerheader")); + WebElement headerFirst = firstWindow + .findElement(By.className("v-window-outerheader")); headerFirst.click(); compareScreen("first-window-over-second"); diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java index 5dba1c3285..186ad738c2 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java @@ -39,8 +39,8 @@ public class OpenModalWindowAndFocusFieldTest extends MultiBrowserTest { openTestURL(); $(ButtonElement.class).id("open").click(); // WindowElement window = $(WindowElement.class).first(); - WebElement windowFocusElement = findElement(By - .xpath("//div[@class='v-window-contents']/div[@class='v-scrollable']")); + WebElement windowFocusElement = findElement(By.xpath( + "//div[@class='v-window-contents']/div[@class='v-scrollable']")); assertElementsEquals(windowFocusElement, getActiveElement()); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpenedTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpenedTest.java index 9a3ccb3b31..aa9740e400 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpenedTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpenedTest.java @@ -33,8 +33,8 @@ public class ScrollingBodyElementWithModalOpenedTest extends MultiBrowserTest { public void testWindowScrollbars() throws Exception { openTestURL(); - WebElement bodyElement = driver.findElement(By - .className("v-modal-window-open")); + WebElement bodyElement = driver + .findElement(By.className("v-modal-window-open")); TestBenchElementCommands scrollable = testBenchElement(bodyElement); scrollable.scroll(1000); diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/SubWindowsTextSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/SubWindowsTextSelectionTest.java index e0cc240d6d..acfec8e018 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/SubWindowsTextSelectionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/SubWindowsTextSelectionTest.java @@ -58,8 +58,8 @@ public class SubWindowsTextSelectionTest extends MultiBrowserTest { openTestURL(); - WebElement element = driver.findElement(By - .className("v-window-outerheader")); + WebElement element = driver + .findElement(By.className("v-window-outerheader")); Point location = element.getLocation(); @@ -72,8 +72,9 @@ public class SubWindowsTextSelectionTest extends MultiBrowserTest { .moveByOffset(10, 2).moveByOffset(10, 0).moveByOffset(10, 0) .moveByOffset(10, 0).release().perform(); - String selection = ((JavascriptExecutor) getDriver()).executeScript( - "return document.getSelection().toString();").toString(); + String selection = ((JavascriptExecutor) getDriver()) + .executeScript("return document.getSelection().toString();") + .toString(); Assert.assertTrue("Text selection was not empty:" + selection, selection.isEmpty()); diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/ToolTipInWindowTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/ToolTipInWindowTest.java index abe2bcbe36..975e0d42bc 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/ToolTipInWindowTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/ToolTipInWindowTest.java @@ -35,10 +35,11 @@ public class ToolTipInWindowTest extends MultiBrowserTest { openTestURL(); - WebElement header = driver.findElement(By - .className("v-window-outerheader")); - new Actions(driver).moveToElement( - driver.findElement(By.className("v-ui")), 0, 0).perform(); + WebElement header = driver + .findElement(By.className("v-window-outerheader")); + new Actions(driver) + .moveToElement(driver.findElement(By.className("v-ui")), 0, 0) + .perform(); sleep(500); new Actions(driver).moveToElement(header).perform(); sleep(1100); @@ -54,10 +55,11 @@ public class ToolTipInWindowTest extends MultiBrowserTest { openTestURL(); - WebElement header = driver.findElement(By - .className("v-window-contents")); - new Actions(driver).moveToElement( - driver.findElement(By.className("v-ui")), 0, 300).perform(); + WebElement header = driver + .findElement(By.className("v-window-contents")); + new Actions(driver) + .moveToElement(driver.findElement(By.className("v-ui")), 0, 300) + .perform(); sleep(500); new Actions(driver).moveToElement(header).perform(); sleep(1000); diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/WindowMoveListenerTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowMoveListenerTest.java index 8d74e3a259..713d4e6ca3 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/WindowMoveListenerTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowMoveListenerTest.java @@ -23,8 +23,8 @@ public class WindowMoveListenerTest extends MultiBrowserTest { // I'd loved to use the header, but that doesn't work. Footer works // fine, though :) - WebElement windowFooter = getDriver().findElement( - By.className("v-window-footer")); + WebElement windowFooter = getDriver() + .findElement(By.className("v-window-footer")); final Point winPos = window.getLocation(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/WindowShadowTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowShadowTest.java index 3cc310eeb4..f0dcf9a50b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/WindowShadowTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowShadowTest.java @@ -34,8 +34,8 @@ import com.vaadin.tests.tb3.MultiBrowserTest; public class WindowShadowTest extends MultiBrowserTest { @Test - public void dragBackgroundWindow() throws AWTException, IOException, - InterruptedException { + public void dragBackgroundWindow() + throws AWTException, IOException, InterruptedException { openTestURL(); WebElement wnd = getDriver().findElement(By.id("topwindow")); // There is some bug in Selenium. Can't move window using header diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandlerTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandlerTest.java index 755a4242ed..179e904d0e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandlerTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandlerTest.java @@ -23,7 +23,8 @@ public class WindowShouldRemoveActionHandlerTest extends MultiBrowserTest { removeActionHandler(); removeActionHandler(); - assertState("An UI with 3 action handlers - Removed handler - Removed handler"); + assertState( + "An UI with 3 action handlers - Removed handler - Removed handler"); addActionHandler(); assertState("An UI with 2 action handlers"); diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/WindowZIndexTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowZIndexTest.java index dc2dfca4f0..c4cce2ea80 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/WindowZIndexTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowZIndexTest.java @@ -30,10 +30,10 @@ public class WindowZIndexTest extends MultiBrowserTest { public void removingUpdatesZIndices() throws IOException { openTestURL(); - WebElement addButton = driver.findElement(By - .xpath("//span[contains(text(),'Add window')]")); - WebElement closeButton = driver.findElement(By - .xpath("//span[contains(text(),'Close window')]")); + WebElement addButton = driver + .findElement(By.xpath("//span[contains(text(),'Add window')]")); + WebElement closeButton = driver.findElement( + By.xpath("//span[contains(text(),'Close window')]")); addButton.click(); addButton.click(); @@ -52,8 +52,8 @@ public class WindowZIndexTest extends MultiBrowserTest { compareScreen("stacked"); - WebElement window4 = driver.findElement(By - .xpath("//*[contains(text(), 'Window 4')]")); + WebElement window4 = driver + .findElement(By.xpath("//*[contains(text(), 'Window 4')]")); new Actions(driver).moveToElement(window4, 1, 9).click().perform(); compareScreen("win4-on-top"); diff --git a/uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java b/uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java index 172d83e645..c6f1409f9b 100644 --- a/uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java +++ b/uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java @@ -12,8 +12,8 @@ import com.vaadin.testbench.By; import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.tests.tb3.MultiBrowserTest; -public class TableQueryWithNonUniqueFirstPrimaryKeyTest extends - MultiBrowserTest { +public class TableQueryWithNonUniqueFirstPrimaryKeyTest + extends MultiBrowserTest { private static final String[] DATA = { "TARUSCIO GIOVANNI", "RUSSO GAETANO AUTORICAMBI", "AMORUSO LUIGI SRL", "CARUSO ROCCO", @@ -29,8 +29,8 @@ public class TableQueryWithNonUniqueFirstPrimaryKeyTest extends List<String> result = new ArrayList<String>(); // pick list items that are shown in suggestion popup - List<WebElement> elems = findElements(By - .cssSelector("td[role=\"listitem\"]")); + List<WebElement> elems = findElements( + By.cssSelector("td[role=\"listitem\"]")); Assert.assertEquals("not enough suggestions shown", DATA.length, elems.size()); diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/AbstractContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/AbstractContextClickTest.java index 7544caaf0a..db84b55b78 100644 --- a/uitest/src/test/java/com/vaadin/tests/contextclick/AbstractContextClickTest.java +++ b/uitest/src/test/java/com/vaadin/tests/contextclick/AbstractContextClickTest.java @@ -88,7 +88,8 @@ public abstract class AbstractContextClickTest extends MultiBrowserTest { Matcher matcher = defaultLog.matcher(getLogRow(0)); Assert.assertTrue( "Log row content did not match default listener output: " - + getLogRow(0), matcher.find()); + + getLogRow(0), + matcher.find()); int xCoord = Integer.parseInt(matcher.group(1)); int yCoord = Integer.parseInt(matcher.group(2)); @@ -141,8 +142,8 @@ public abstract class AbstractContextClickTest extends MultiBrowserTest { * y coordinate */ protected void contextClick(WebElement e, int xCoord, int yCoord) { - new Actions(getDriver()).moveToElement(e, xCoord, yCoord) - .contextClick().moveByOffset(-5, -5).click().perform(); + new Actions(getDriver()).moveToElement(e, xCoord, yCoord).contextClick() + .moveByOffset(-5, -5).click().perform(); } } diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java b/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java index e3f4647c33..590553ef87 100644 --- a/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java +++ b/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java @@ -19,8 +19,8 @@ import static org.junit.Assert.assertEquals; import com.vaadin.testbench.elements.TableElement; -public abstract class TableContextClickTestBase extends - AbstractContextClickTest { +public abstract class TableContextClickTestBase + extends AbstractContextClickTest { @Override protected Class<?> getUIClass() { diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java index 180349af63..3f9f7672f0 100644 --- a/uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java +++ b/uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java @@ -34,8 +34,8 @@ public class TreeContextClickTest extends AbstractContextClickTest { addOrRemoveTypedListener(); - List<WebElement> nodes = $(TreeElement.class).first().findElements( - By.className("v-tree-node")); + List<WebElement> nodes = $(TreeElement.class).first() + .findElements(By.className("v-tree-node")); contextClick(nodes.get(1)); @@ -52,14 +52,14 @@ public class TreeContextClickTest extends AbstractContextClickTest { addOrRemoveTypedListener(); - List<WebElement> nodes = $(TreeElement.class).first().findElements( - By.className("v-tree-node")); + List<WebElement> nodes = $(TreeElement.class).first() + .findElements(By.className("v-tree-node")); new Actions(getDriver()).moveToElement(nodes.get(1), 10, 10).click() .perform(); - nodes = $(TreeElement.class).first().findElements( - By.className("v-tree-node")); + nodes = $(TreeElement.class).first() + .findElements(By.className("v-tree-node")); contextClick(nodes.get(2)); assertEquals("1. ContextClickEvent: Baz", getLogRow(0)); diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/TreeTableContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/TreeTableContextClickTest.java index f91750ce91..b5b6660226 100644 --- a/uitest/src/test/java/com/vaadin/tests/contextclick/TreeTableContextClickTest.java +++ b/uitest/src/test/java/com/vaadin/tests/contextclick/TreeTableContextClickTest.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.contextclick; - public class TreeTableContextClickTest extends TableContextClickTest { @Override diff --git a/uitest/src/test/java/com/vaadin/tests/customelements/CustomProgressBarElement.java b/uitest/src/test/java/com/vaadin/tests/customelements/CustomProgressBarElement.java index a669d32f2e..575c079b8d 100644 --- a/uitest/src/test/java/com/vaadin/tests/customelements/CustomProgressBarElement.java +++ b/uitest/src/test/java/com/vaadin/tests/customelements/CustomProgressBarElement.java @@ -25,8 +25,8 @@ import com.vaadin.testbench.elementsbase.ServerClass; public class CustomProgressBarElement extends ProgressBarElement { public double getValue() { - WebElement indicator = findElement(By - .className("v-progressbar-indicator")); + WebElement indicator = findElement( + By.className("v-progressbar-indicator")); String width = getStyleAttribute(indicator, "width"); if (!width.endsWith("%")) { return 0; diff --git a/uitest/src/test/java/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayoutsTest.java b/uitest/src/test/java/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayoutsTest.java index d4f027a2c8..e3c17aa2c2 100644 --- a/uitest/src/test/java/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayoutsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayoutsTest.java @@ -37,13 +37,16 @@ public class HierarchyAfterAnalyzeLayoutsTest extends MultiBrowserTest { openTestURL(); // select tab - pressDebugWindowButton(findByXpath("//button[@title = 'Examine component hierarchy']")); + pressDebugWindowButton(findByXpath( + "//button[@title = 'Examine component hierarchy']")); // click "analyze layouts" - pressDebugWindowButton(findByXpath("//button[@title = 'Check layouts for potential problems']")); + pressDebugWindowButton(findByXpath( + "//button[@title = 'Check layouts for potential problems']")); // check that no problems found - findByXpath("//div[text() = 'Layouts analyzed, no top level problems']"); + findByXpath( + "//div[text() = 'Layouts analyzed, no top level problems']"); // check that original label still there findByXpath("//div[text() = 'This is a label']"); diff --git a/uitest/src/test/java/com/vaadin/tests/debug/PreserveCustomDebugSectionOpenTest.java b/uitest/src/test/java/com/vaadin/tests/debug/PreserveCustomDebugSectionOpenTest.java index 01b73ded92..b5b7845c43 100644 --- a/uitest/src/test/java/com/vaadin/tests/debug/PreserveCustomDebugSectionOpenTest.java +++ b/uitest/src/test/java/com/vaadin/tests/debug/PreserveCustomDebugSectionOpenTest.java @@ -28,12 +28,12 @@ public class PreserveCustomDebugSectionOpenTest extends SingleBrowserTest { setDebug(true); openTestURL(); - findElement( - By.cssSelector(".v-debugwindow-tabs button[title=\"Dummy debug window section\"]")) - .click(); + findElement(By.cssSelector( + ".v-debugwindow-tabs button[title=\"Dummy debug window section\"]")) + .click(); - WebElement content = findElement(By - .cssSelector(".v-debugwindow-content")); + WebElement content = findElement( + By.cssSelector(".v-debugwindow-content")); // Sanity check Assert.assertEquals("Dummy debug window section", content.getText()); diff --git a/uitest/src/test/java/com/vaadin/tests/debug/ProfilerZeroOverheadTest.java b/uitest/src/test/java/com/vaadin/tests/debug/ProfilerZeroOverheadTest.java index 659823e49a..ba3e611e25 100644 --- a/uitest/src/test/java/com/vaadin/tests/debug/ProfilerZeroOverheadTest.java +++ b/uitest/src/test/java/com/vaadin/tests/debug/ProfilerZeroOverheadTest.java @@ -40,8 +40,8 @@ public class ProfilerZeroOverheadTest extends SingleBrowserTest { int bodyStart = canaryMethodString.indexOf('{'); int bodyEnd = canaryMethodString.lastIndexOf('}'); - String methodBody = canaryMethodString - .substring(bodyStart + 1, bodyEnd); + String methodBody = canaryMethodString.substring(bodyStart + 1, + bodyEnd); // Method body shouldn't contain anything else than whitespace if (!methodBody.replaceAll("\\s", "").isEmpty()) { diff --git a/uitest/src/test/java/com/vaadin/tests/debug/PushVersionInfoTest.java b/uitest/src/test/java/com/vaadin/tests/debug/PushVersionInfoTest.java index 5fcda733ae..a232d718c7 100644 --- a/uitest/src/test/java/com/vaadin/tests/debug/PushVersionInfoTest.java +++ b/uitest/src/test/java/com/vaadin/tests/debug/PushVersionInfoTest.java @@ -59,8 +59,7 @@ public class PushVersionInfoTest extends SingleBrowserTest { Assert.assertTrue("Push row doesn't contain Atmosphere version", pushRow.getText().contains(atmVersion)); String jsString = getPushRowValue("Push client version").getText(); - Assert.assertTrue( - "Push client version doesn't contain 'vaadin' string", + Assert.assertTrue("Push client version doesn't contain 'vaadin' string", jsString.contains("vaadin")); Assert.assertTrue( "Push client version doesn't contain 'javascript' string", @@ -72,8 +71,8 @@ public class PushVersionInfoTest extends SingleBrowserTest { int size = findElements(By.className("v-debugwindow-tab")).size(); for (int i = 0; i < size; i++) { - WebElement tab = findElement(By - .className("v-debugwindow-tab-selected")); + WebElement tab = findElement( + By.className("v-debugwindow-tab-selected")); String title = tab.getAttribute("title"); if (title != null && title.startsWith("General information")) { break; diff --git a/uitest/src/test/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOSTest.java b/uitest/src/test/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOSTest.java index e5614b60a4..046e304506 100644 --- a/uitest/src/test/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOSTest.java +++ b/uitest/src/test/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOSTest.java @@ -21,9 +21,8 @@ public class IframeIsOpenedInNonIOSTest extends MultiBrowserTest { List<WebElement> iframes = driver.findElements(By.tagName("iframe")); boolean containsFileIframe = false; for (WebElement iframe : iframes) { - containsFileIframe = containsFileIframe - | iframe.getAttribute("src").contains( - IframeIsOpenedInNonIOS.FILE_NAME); + containsFileIframe = containsFileIframe | iframe.getAttribute("src") + .contains(IframeIsOpenedInNonIOS.FILE_NAME); } Assert.assertTrue("page doesn't contain iframe with the file", diff --git a/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveUITest.java b/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveUITest.java index f7cbd9477c..d070c89b23 100644 --- a/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveUITest.java @@ -47,9 +47,9 @@ public class ResponsiveUITest extends MultiBrowserTest { openTestURL(); // IE sometimes has trouble waiting long enough. - new WebDriverWait(getDriver(), 30).until(ExpectedConditions - .presenceOfElementLocated(By - .cssSelector(".v-csslayout-grid.first"))); + new WebDriverWait(getDriver(), 30) + .until(ExpectedConditions.presenceOfElementLocated( + By.cssSelector(".v-csslayout-grid.first"))); assertEquals("401px-600px", $(".v-csslayout-grid.first").getAttribute("width-range")); diff --git a/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveWidthAndHeightTest.java b/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveWidthAndHeightTest.java index 8086457c24..1d80a5ecd4 100644 --- a/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveWidthAndHeightTest.java +++ b/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveWidthAndHeightTest.java @@ -41,9 +41,9 @@ public class ResponsiveWidthAndHeightTest extends MultiBrowserTest { openTestURL(); // IE sometimes has trouble waiting long enough. - new WebDriverWait(getDriver(), 30).until(ExpectedConditions - .presenceOfElementLocated(By - .cssSelector(".v-csslayout-width-and-height"))); + new WebDriverWait(getDriver(), 30) + .until(ExpectedConditions.presenceOfElementLocated( + By.cssSelector(".v-csslayout-width-and-height"))); // Verify both width-range and height-range. assertEquals("600px-", diff --git a/uitest/src/test/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayoutTest.java index 0d0b388541..7749f5af01 100644 --- a/uitest/src/test/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayoutTest.java +++ b/uitest/src/test/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayoutTest.java @@ -50,9 +50,9 @@ public class SetThemeAndResponsiveLayoutTest extends MultiBrowserTest { public void testWidthAndHeightRanges() throws Exception { openTestURL(); // IE sometimes has trouble waiting long enough. - new WebDriverWait(getDriver(), 30).until(ExpectedConditions - .presenceOfElementLocated(By - .cssSelector(".v-csslayout-width-and-height"))); + new WebDriverWait(getDriver(), 30) + .until(ExpectedConditions.presenceOfElementLocated( + By.cssSelector(".v-csslayout-width-and-height"))); // set the theme programmatically $(ButtonElement.class).caption("Set theme").first().click(); new WebDriverWait(getDriver(), 30).until(ExpectedConditions diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java index 12bccdd065..b6c99c96d0 100644 --- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java +++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java @@ -31,8 +31,8 @@ public class BasicCrudGridTest extends SingleBrowserTestPhantomJS2 { @Test public void fieldsInitiallyEmpty() { openTestURL(); - List<TextFieldElement> textFields = getFieldsLayout().$( - TextFieldElement.class).all(); + List<TextFieldElement> textFields = getFieldsLayout() + .$(TextFieldElement.class).all(); for (TextFieldElement e : textFields) { Assert.assertEquals("TextField should be empty", "", e.getValue()); @@ -50,8 +50,8 @@ public class BasicCrudGridTest extends SingleBrowserTestPhantomJS2 { // Select row $(GridElement.class).first().getCell(2, 2).click(); - List<TextFieldElement> textFields = getFieldsLayout().$( - TextFieldElement.class).all(); + List<TextFieldElement> textFields = getFieldsLayout() + .$(TextFieldElement.class).all(); for (TextFieldElement e : textFields) { Assert.assertNotEquals("TextField should not be empty", "", diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java index 86441b09f9..6501c1f1ba 100644 --- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java +++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java @@ -31,8 +31,8 @@ public class BasicCrudTableTest extends SingleBrowserTest { @Test public void fieldsInitiallyEmpty() { openTestURL(); - List<TextFieldElement> textFields = getFieldsLayout().$( - TextFieldElement.class).all(); + List<TextFieldElement> textFields = getFieldsLayout() + .$(TextFieldElement.class).all(); for (TextFieldElement e : textFields) { Assert.assertEquals("TextField should be empty", "", e.getValue()); @@ -50,8 +50,8 @@ public class BasicCrudTableTest extends SingleBrowserTest { // Select row $(TableElement.class).first().getCell(2, 2).click(); - List<TextFieldElement> textFields = getFieldsLayout().$( - TextFieldElement.class).all(); + List<TextFieldElement> textFields = getFieldsLayout() + .$(TextFieldElement.class).all(); for (TextFieldElement e : textFields) { Assert.assertNotEquals("TextField should not be empty", "", diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionErrorTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionErrorTest.java index f5c751cd49..ed930f3a6c 100644 --- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionErrorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionErrorTest.java @@ -2,8 +2,8 @@ package com.vaadin.tests.fieldgroup; import org.junit.Test; -public class CommitWithValidationOrConversionErrorTest extends - BasicPersonFormTest { +public class CommitWithValidationOrConversionErrorTest + extends BasicPersonFormTest { private static final String UPDATED_BEAN_VALUES = "Person [firstName=John, lastName=Doever, email=john@doe.com, age=123, sex=Male, address=Address [streetAddress=John street, postalCode=11223, city=John's town, country=USA], deceased=false, salary=null, salaryDouble=null, rent=null]"; private static final String UPDATED_NAME_BEAN_VALUES = "Person [firstName=John, lastName=Doever, email=john@doe.com, age=64, sex=Male, address=Address [streetAddress=John street, postalCode=11223, city=John's town, country=USA], deceased=false, salary=null, salaryDouble=null, rent=null]"; diff --git a/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java b/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java index efac8477ff..6c435a984d 100644 --- a/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java @@ -34,8 +34,8 @@ import com.vaadin.tests.tb3.ParameterizedTB3Runner; * @author Vaadin Ltd */ @RunWith(ParameterizedTB3Runner.class) -public abstract class AbstractServletIntegrationTest extends - AbstractIntegrationTest { +public abstract class AbstractServletIntegrationTest + extends AbstractIntegrationTest { private String contextPath = "/demo"; diff --git a/uitest/src/test/java/com/vaadin/tests/integration/JSPIntegrationTest.java b/uitest/src/test/java/com/vaadin/tests/integration/JSPIntegrationTest.java index 13503966ec..d50ec1041e 100644 --- a/uitest/src/test/java/com/vaadin/tests/integration/JSPIntegrationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/integration/JSPIntegrationTest.java @@ -79,8 +79,8 @@ public class JSPIntegrationTest extends PrivateTB3Configuration { List<UIData> uis = new ArrayList<UIData>(); getDriver().get(jspUrl); - List<WebElement> rows = getDriver().findElements( - By.xpath("//tr[@class='uirow']")); + List<WebElement> rows = getDriver() + .findElements(By.xpath("//tr[@class='uirow']")); for (WebElement row : rows) { UIData data = new UIData(); List<WebElement> tds = row.findElements(By.xpath("./td")); diff --git a/uitest/src/test/java/com/vaadin/tests/integration/LongPollingProxyServerTest.java b/uitest/src/test/java/com/vaadin/tests/integration/LongPollingProxyServerTest.java index 16c599641b..0f8ee12918 100644 --- a/uitest/src/test/java/com/vaadin/tests/integration/LongPollingProxyServerTest.java +++ b/uitest/src/test/java/com/vaadin/tests/integration/LongPollingProxyServerTest.java @@ -101,7 +101,7 @@ public class LongPollingProxyServerTest extends AbstractIntegrationTest { @Override public List<DesiredCapabilities> getBrowsersToTest() { - return Collections.singletonList(Browser.PHANTOMJS - .getDesiredCapabilities()); + return Collections + .singletonList(Browser.PHANTOMJS.getDesiredCapabilities()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUITest.java index 2afc33cf82..c2c7342fad 100644 --- a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUITest.java @@ -15,7 +15,7 @@ */ package com.vaadin.tests.integration; -public class ServletIntegrationDefaultPushUITest extends - AbstractServletIntegrationTest { +public class ServletIntegrationDefaultPushUITest + extends AbstractServletIntegrationTest { // Uses the test method declared in the super class } diff --git a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationJSR356WebsocketUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationJSR356WebsocketUITest.java index f118d38158..7c376fc995 100644 --- a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationJSR356WebsocketUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationJSR356WebsocketUITest.java @@ -15,14 +15,14 @@ */ package com.vaadin.tests.integration; -public class ServletIntegrationJSR356WebsocketUITest extends - AbstractServletIntegrationTest { +public class ServletIntegrationJSR356WebsocketUITest + extends AbstractServletIntegrationTest { // Uses the test method declared in the super class @Override protected String getDeploymentPath(Class<?> uiClass) { - return super.getDeploymentPath(uiClass) - .replace("/run/", "/run-jsr356/"); + return super.getDeploymentPath(uiClass).replace("/run/", + "/run-jsr356/"); } @Override diff --git a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUITest.java index 92307dbbaf..77ae3cf41a 100644 --- a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUITest.java @@ -15,7 +15,7 @@ */ package com.vaadin.tests.integration; -public class ServletIntegrationLongPollingUITest extends - AbstractServletIntegrationTest { +public class ServletIntegrationLongPollingUITest + extends AbstractServletIntegrationTest { // Uses the test method declared in the super class } diff --git a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java index 1f42b10e66..4693bbddbc 100644 --- a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java @@ -15,7 +15,7 @@ */ package com.vaadin.tests.integration; -public class ServletIntegrationStreamingUITest extends - AbstractServletIntegrationTest { +public class ServletIntegrationStreamingUITest + extends AbstractServletIntegrationTest { // Uses the test method declared in the super class } diff --git a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java index d4fc3aef17..2fc4f71539 100644 --- a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java @@ -15,7 +15,7 @@ */ package com.vaadin.tests.integration; -public class ServletIntegrationWebsocketUITest extends - AbstractServletIntegrationTest { +public class ServletIntegrationWebsocketUITest + extends AbstractServletIntegrationTest { // Uses the test method declared in the super class } diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayoutTest.java index 340c627dd4..003b8c4929 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayoutTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayoutTest.java @@ -22,8 +22,8 @@ import com.vaadin.testbench.elements.FormLayoutElement; import com.vaadin.testbench.elements.TextFieldElement; import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2; -public class RelativeSizeInUndefinedCssLayoutTest extends - SingleBrowserTestPhantomJS2 { +public class RelativeSizeInUndefinedCssLayoutTest + extends SingleBrowserTestPhantomJS2 { @Test public void relativeSizeInUndefinedCssLayout() { diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java index ba3d0f06f1..6f09923dff 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java @@ -17,8 +17,8 @@ public class GridLayoutWidthChangeTest extends MultiBrowserTest { compareScreen("initial"); - $(ButtonElement.class).caption("Reduce GridLayout parent width") - .first().click(); + $(ButtonElement.class).caption("Reduce GridLayout parent width").first() + .click(); compareScreen("buttonMoved"); } diff --git a/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java b/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java index 59f71f3724..546d79e322 100644 --- a/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java @@ -24,8 +24,8 @@ public class NavigationTest extends SingleBrowserTest { public void testNavigateToSameViewWithDifferentParameters() { openTestURL(); - ButtonElement listButton = $(ButtonElement.class).caption( - "Navigate to list").first(); + ButtonElement listButton = $(ButtonElement.class) + .caption("Navigate to list").first(); listButton.click(); TableElement table = $(TableElement.class).first(); diff --git a/uitest/src/test/java/com/vaadin/tests/navigator/NavigatorListenerModifiesListenersTest.java b/uitest/src/test/java/com/vaadin/tests/navigator/NavigatorListenerModifiesListenersTest.java index d11ab790a8..3ef6358668 100644 --- a/uitest/src/test/java/com/vaadin/tests/navigator/NavigatorListenerModifiesListenersTest.java +++ b/uitest/src/test/java/com/vaadin/tests/navigator/NavigatorListenerModifiesListenersTest.java @@ -40,15 +40,13 @@ public class NavigatorListenerModifiesListenersTest extends SingleBrowserTest { button.click(); // verify we are in another view and url is correct - waitForElementPresent(By - .id(NavigatorListenerModifiesListeners.LABEL_ANOTHERVIEW_ID)); + waitForElementPresent(By.id( + NavigatorListenerModifiesListeners.LABEL_ANOTHERVIEW_ID)); String currentUrl = driver.getCurrentUrl(); - assertEquals( - "Current URL should be equal to another view URL", - initialUrl - .replace( - NavigatorListenerModifiesListeners.MainView.NAME, - NavigatorListenerModifiesListeners.AnotherView.NAME), + assertEquals("Current URL should be equal to another view URL", + initialUrl.replace( + NavigatorListenerModifiesListeners.MainView.NAME, + NavigatorListenerModifiesListeners.AnotherView.NAME), currentUrl); // click back button diff --git a/uitest/src/test/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonActionTest.java b/uitest/src/test/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonActionTest.java index 84abdca24b..a6fc6aba44 100644 --- a/uitest/src/test/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonActionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonActionTest.java @@ -50,8 +50,7 @@ public class NavigatorViewBlocksBackButtonActionTest extends MultiBrowserTest { waitForElementPresent(By .id(NavigatorViewBlocksBackButtonAction.LABEL_MAINVIEW_ID)); String currentUrl = driver.getCurrentUrl(); - assertEquals( - "Current URL should be equal to initial main view URL", + assertEquals("Current URL should be equal to initial main view URL", initialUrl, currentUrl); } } @@ -74,12 +73,11 @@ public class NavigatorViewBlocksBackButtonActionTest extends MultiBrowserTest { waitForElementPresent(By .id(NavigatorViewBlocksBackButtonAction.LABEL_PROMPTEDVIEW_ID)); String currentUrl = driver.getCurrentUrl(); - assertEquals( - "Current URL should be equal to initial prompted view URL", + assertEquals("Current URL should be equal to initial prompted view URL", initialPromptedUrl, currentUrl); - WebElement cancelButton = driver.findElement(By - .className("v-window-closebox")); + WebElement cancelButton = driver + .findElement(By.className("v-window-closebox")); // click cancel button cancelButton.click(); @@ -88,8 +86,7 @@ public class NavigatorViewBlocksBackButtonActionTest extends MultiBrowserTest { waitForElementPresent(By .id(NavigatorViewBlocksBackButtonAction.LABEL_PROMPTEDVIEW_ID)); currentUrl = driver.getCurrentUrl(); - assertEquals( - "Current URL should be equal to initial prompted view URL", + assertEquals("Current URL should be equal to initial prompted view URL", initialPromptedUrl, currentUrl); } } diff --git a/uitest/src/test/java/com/vaadin/tests/push/BarInUIDLTest.java b/uitest/src/test/java/com/vaadin/tests/push/BarInUIDLTest.java index 7bd1de5803..1794a7c659 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/BarInUIDLTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/BarInUIDLTest.java @@ -28,20 +28,19 @@ public class BarInUIDLTest extends MultiBrowserTest { public void sendBarInUIDL() { openTestURL(); getButton().click(); - Assert.assertEquals( - "Thank you for clicking | bar", + Assert.assertEquals("Thank you for clicking | bar", vaadinElement( "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]") - .getText()); + .getText()); getButton().click(); - Assert.assertEquals( - "Thank you for clicking | bar", + Assert.assertEquals("Thank you for clicking | bar", vaadinElement( "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VLabel[0]") - .getText()); + .getText()); } private WebElement getButton() { - return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]"); + return vaadinElement( + "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]"); } } diff --git a/uitest/src/test/java/com/vaadin/tests/push/BasicPushLongPollingTest.java b/uitest/src/test/java/com/vaadin/tests/push/BasicPushLongPollingTest.java index a060d5a57a..3989a614bc 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/BasicPushLongPollingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/BasicPushLongPollingTest.java @@ -21,9 +21,8 @@ public class BasicPushLongPollingTest extends BasicPushTest { @Test public void pushAfterServerTimeout() throws InterruptedException { - getDriver().get( - getTestUrl().replace("/run/", "/run-push-timeout/") - + "?debug=push"); + getDriver().get(getTestUrl().replace("/run/", "/run-push-timeout/") + + "?debug=push"); sleep(11000); // Wait for server timeout (10s) getServerCounterStartButton().click(); diff --git a/uitest/src/test/java/com/vaadin/tests/push/BasicPushTest.java b/uitest/src/test/java/com/vaadin/tests/push/BasicPushTest.java index 157e3f74ae..82f715527b 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/BasicPushTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/BasicPushTest.java @@ -53,8 +53,8 @@ public abstract class BasicPushTest extends MultiBrowserTest { } public static int getClientCounter(AbstractTB3Test t) { - WebElement clientCounterElem = t.findElement(By - .id(BasicPush.CLIENT_COUNTER_ID)); + WebElement clientCounterElem = t + .findElement(By.id(BasicPush.CLIENT_COUNTER_ID)); return Integer.parseInt(clientCounterElem.getText()); } @@ -67,8 +67,8 @@ public abstract class BasicPushTest extends MultiBrowserTest { } public static int getServerCounter(AbstractTB3Test t) { - WebElement serverCounterElem = t.findElement(By - .id(BasicPush.SERVER_COUNTER_ID)); + WebElement serverCounterElem = t + .findElement(By.id(BasicPush.SERVER_COUNTER_ID)); return Integer.parseInt(serverCounterElem.getText()); } @@ -89,7 +89,8 @@ public abstract class BasicPushTest extends MultiBrowserTest { @Override public Boolean apply(WebDriver input) { - return BasicPushTest.getClientCounter(BasicPushTest.this) == expectedValue; + return BasicPushTest + .getClientCounter(BasicPushTest.this) == expectedValue; } }, 10); } @@ -100,7 +101,8 @@ public abstract class BasicPushTest extends MultiBrowserTest { @Override public Boolean apply(WebDriver input) { - return BasicPushTest.getServerCounter(BasicPushTest.this) > counter; + return BasicPushTest + .getServerCounter(BasicPushTest.this) > counter; } }, 10); } diff --git a/uitest/src/test/java/com/vaadin/tests/push/EnableDisablePushTest.java b/uitest/src/test/java/com/vaadin/tests/push/EnableDisablePushTest.java index 654108f8f9..9522b9feda 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/EnableDisablePushTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/EnableDisablePushTest.java @@ -52,23 +52,28 @@ public class EnableDisablePushTest extends MultiBrowserTest { } private WebElement getDisablePushButton() { - return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]"); + return vaadinElement( + "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]"); } private WebElement getEnablePushButton() { - return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VButton[0]"); + return vaadinElement( + "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VButton[0]"); } private WebElement getDisablePollButton() { - return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]"); + return vaadinElement( + "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]"); } private WebElement getEnablePollButton() { - return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]"); + return vaadinElement( + "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]"); } private WebElement getDisablePushButtonAndReenableFromBackground() { - return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VButton[0]"); + return vaadinElement( + "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VButton[0]"); } } diff --git a/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeLongPollingTest.java b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeLongPollingTest.java index 13f601da7a..07b1b81f51 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeLongPollingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeLongPollingTest.java @@ -15,7 +15,7 @@ */ package com.vaadin.tests.push; -public class ExtremelyLongPushTimeLongPollingTest extends - ExtremelyLongPushTimeTest { +public class ExtremelyLongPushTimeLongPollingTest + extends ExtremelyLongPushTimeTest { } diff --git a/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeStreamingTest.java b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeStreamingTest.java index 4af6179e81..bfb1865f05 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeStreamingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeStreamingTest.java @@ -15,7 +15,7 @@ */ package com.vaadin.tests.push; -public class ExtremelyLongPushTimeStreamingTest extends - ExtremelyLongPushTimeTest { +public class ExtremelyLongPushTimeStreamingTest + extends ExtremelyLongPushTimeTest { } diff --git a/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java index 54775d572d..c87d61526e 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java @@ -21,8 +21,8 @@ import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.tests.tb3.WebsocketTest; -public class ExtremelyLongPushTimeWebsocketTest extends - ExtremelyLongPushTimeTest { +public class ExtremelyLongPushTimeWebsocketTest + extends ExtremelyLongPushTimeTest { @Override public List<DesiredCapabilities> getBrowsersToTest() { diff --git a/uitest/src/test/java/com/vaadin/tests/push/ManualLongPollingPushUITest.java b/uitest/src/test/java/com/vaadin/tests/push/ManualLongPollingPushUITest.java index 096204ff75..8ddf66cee9 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/ManualLongPollingPushUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/ManualLongPollingPushUITest.java @@ -29,7 +29,8 @@ public class ManualLongPollingPushUITest extends SingleBrowserTest { openTestURL(); $(ButtonElement.class).caption("Double manual push after 1s").first() .click(); - waitUntilLogText("2. Second message logged after 1s, followed by manual push"); + waitUntilLogText( + "2. Second message logged after 1s, followed by manual push"); $(ButtonElement.class).caption("Manual push after 1s").first().click(); waitUntilLogText("3. Logged after 1s, followed by manual push"); } diff --git a/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java index 14ef9e1144..ec9bcd86c4 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java @@ -70,7 +70,8 @@ abstract class PushConfigurationTest extends MultiBrowserTest { } protected WebElement getServerCounterElement() { - return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VLabel[0]"); + return vaadinElement( + "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VLabel[0]"); } protected void waitForServerCounterToUpdate() { diff --git a/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationWebSocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationWebSocketTest.java index 501d946fcc..6b1d6d3915 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationWebSocketTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationWebSocketTest.java @@ -45,8 +45,7 @@ public class PushConfigurationWebSocketTest extends PushConfigurationTest { // Use debug console to verify we used the correct transport type assertThat(driver.getPageSource(), containsString("Push connection established using websocket")); - assertThat( - driver.getPageSource(), - not(containsString("Push connection established using streaming"))); + assertThat(driver.getPageSource(), not( + containsString("Push connection established using streaming"))); } } diff --git a/uitest/src/test/java/com/vaadin/tests/push/PushErrorHandlingTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushErrorHandlingTest.java index 2683868db5..f3c64b7c21 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/PushErrorHandlingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/PushErrorHandlingTest.java @@ -44,8 +44,8 @@ public class PushErrorHandlingTest extends MultiBrowserTest { $(LabelElement.class).get(idx).getText()); WebElement table = vaadinElementById("testtable"); - WebElement row = table.findElement(By - .xpath("//div[text()='Click for NPE']")); + WebElement row = table + .findElement(By.xpath("//div[text()='Click for NPE']")); row.click(); Assert.assertEquals("Internal error", diff --git a/uitest/src/test/java/com/vaadin/tests/push/PushRemoveConnectorsTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushRemoveConnectorsTest.java index bcf93b0aa9..3070d1efee 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/PushRemoveConnectorsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/PushRemoveConnectorsTest.java @@ -18,7 +18,7 @@ public class PushRemoveConnectorsTest extends SingleBrowserTest { while (i++ < 10) { Thread.sleep(5000); int now = getMemoryUsage(); - System.out.println("Memory usage: "+now); + System.out.println("Memory usage: " + now); if (last == now) break; @@ -30,7 +30,7 @@ public class PushRemoveConnectorsTest extends SingleBrowserTest { } private int getMemoryUsage() { - return Integer.parseInt(getLogRow(0).replaceFirst( - ".*Serialized session size: ", "")); + return Integer.parseInt( + getLogRow(0).replaceFirst(".*Serialized session size: ", "")); } } diff --git a/uitest/src/test/java/com/vaadin/tests/push/ReconnectTest.java b/uitest/src/test/java/com/vaadin/tests/push/ReconnectTest.java index 6a632f2667..e29f741273 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/ReconnectTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/ReconnectTest.java @@ -98,7 +98,8 @@ public abstract class ReconnectTest extends MultiBrowserTestWithProxy { @Override public Boolean apply(WebDriver input) { - return BasicPushTest.getServerCounter(ReconnectTest.this) > counter; + return BasicPushTest + .getServerCounter(ReconnectTest.this) > counter; } }, 30); } @@ -108,7 +109,8 @@ public abstract class ReconnectTest extends MultiBrowserTestWithProxy { @Override public Boolean apply(WebDriver input) { - return BasicPushTest.getClientCounter(ReconnectTest.this) == expectedValue; + return BasicPushTest + .getClientCounter(ReconnectTest.this) == expectedValue; } }, 5); } diff --git a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersLongPollingTest.java b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersLongPollingTest.java index c00f95a950..907378684f 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersLongPollingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersLongPollingTest.java @@ -1,7 +1,7 @@ package com.vaadin.tests.push; -public class SendMultibyteCharactersLongPollingTest extends - SendMultibyteCharactersTest { +public class SendMultibyteCharactersLongPollingTest + extends SendMultibyteCharactersTest { @Override protected String getTransport() { diff --git a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersStreamingTest.java b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersStreamingTest.java index bc1debb9da..495791ff53 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersStreamingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersStreamingTest.java @@ -1,7 +1,7 @@ package com.vaadin.tests.push; -public class SendMultibyteCharactersStreamingTest extends - SendMultibyteCharactersTest { +public class SendMultibyteCharactersStreamingTest + extends SendMultibyteCharactersTest { @Override protected String getTransport() { diff --git a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersWebSocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersWebSocketTest.java index f9ae472b99..5cc2395e71 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersWebSocketTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersWebSocketTest.java @@ -4,8 +4,8 @@ import org.openqa.selenium.remote.DesiredCapabilities; import java.util.List; -public class SendMultibyteCharactersWebSocketTest extends - SendMultibyteCharactersTest { +public class SendMultibyteCharactersWebSocketTest + extends SendMultibyteCharactersTest { @Override public List<DesiredCapabilities> getBrowsersToTest() { diff --git a/uitest/src/test/java/com/vaadin/tests/push/TogglePushTest.java b/uitest/src/test/java/com/vaadin/tests/push/TogglePushTest.java index d93802125c..3afb002f21 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/TogglePushTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/TogglePushTest.java @@ -94,21 +94,24 @@ public class TogglePushTest extends MultiBrowserTest { } private WebElement getDirectCounterUpdateButton() { - return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]"); + return vaadinElement( + "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]"); } private WebElement getPushToggle() { - return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]"); + return vaadinElement( + "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]"); } private WebElement getDelayedCounterUpdateButton() { - return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]"); + return vaadinElement( + "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]"); } private String getCounterText() { return vaadinElement( "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VLabel[0]") - .getText(); + .getText(); } } diff --git a/uitest/src/test/java/com/vaadin/tests/push/TrackMessageSizeUITest.java b/uitest/src/test/java/com/vaadin/tests/push/TrackMessageSizeUITest.java index 35d0f0ad5f..2e22d2a2d2 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/TrackMessageSizeUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/TrackMessageSizeUITest.java @@ -26,7 +26,7 @@ public class TrackMessageSizeUITest extends MultiBrowserTest { @Test public void runTests() { openTestURL(); - Assert.assertEquals("1. All tests run", vaadinElementById("Log_row_0") - .getText()); + Assert.assertEquals("1. All tests run", + vaadinElementById("Log_row_0").getText()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/requesthandlers/AppResource404Test.java b/uitest/src/test/java/com/vaadin/tests/requesthandlers/AppResource404Test.java index f762573a09..1b8d002236 100644 --- a/uitest/src/test/java/com/vaadin/tests/requesthandlers/AppResource404Test.java +++ b/uitest/src/test/java/com/vaadin/tests/requesthandlers/AppResource404Test.java @@ -12,8 +12,8 @@ public class AppResource404Test extends MultiBrowserTest { openTestURL(); $(LinkElement.class).first().click(5, 5); disableWaitingAndWait(); - Assert.assertFalse("Page contains the given text", driver - .getPageSource().contains("404")); + Assert.assertFalse("Page contains the given text", + driver.getPageSource().contains("404")); } @Test @@ -21,8 +21,7 @@ public class AppResource404Test extends MultiBrowserTest { openTestURL(); $(LinkElement.class).get(1).click(5, 5); disableWaitingAndWait(); - Assert.assertTrue( - "Page does not contain the given text", + Assert.assertTrue("Page does not contain the given text", driver.getPageSource().contains( "/APP/connector/0/4/asdfasdf can not be found")); } @@ -32,10 +31,10 @@ public class AppResource404Test extends MultiBrowserTest { openTestURL(); $(LinkElement.class).get(2).click(5, 5); disableWaitingAndWait(); - Assert.assertTrue("Page does not contain the given text", driver - .getPageSource().contains("HTTP ERROR 404")); - Assert.assertTrue("Page does not contain the given text", driver - .getPageSource().contains("Problem accessing /run/APP/")); + Assert.assertTrue("Page does not contain the given text", + driver.getPageSource().contains("HTTP ERROR 404")); + Assert.assertTrue("Page does not contain the given text", + driver.getPageSource().contains("Problem accessing /run/APP/")); } @Test @@ -43,8 +42,8 @@ public class AppResource404Test extends MultiBrowserTest { openTestURL(); $(LinkElement.class).get(3).click(5, 5); disableWaitingAndWait(); - Assert.assertFalse("Page contains the given text", driver - .getPageSource().contains("can not be found")); + Assert.assertFalse("Page contains the given text", + driver.getPageSource().contains("can not be found")); } protected void disableWaitingAndWait() { diff --git a/uitest/src/test/java/com/vaadin/tests/requesthandlers/UnsupportedBrowserHandlerUserAgents.java b/uitest/src/test/java/com/vaadin/tests/requesthandlers/UnsupportedBrowserHandlerUserAgents.java index 1f2c4d37f2..9e0df6f9fa 100644 --- a/uitest/src/test/java/com/vaadin/tests/requesthandlers/UnsupportedBrowserHandlerUserAgents.java +++ b/uitest/src/test/java/com/vaadin/tests/requesthandlers/UnsupportedBrowserHandlerUserAgents.java @@ -32,21 +32,24 @@ public class UnsupportedBrowserHandlerUserAgents { @Test public void ie7NotSupported() { - String response = requestWithUserAgent("Mozilla/5.0 (compatible; MSIE 7.0; Windows NT 5.2; WOW64; .NET CLR 2.0.50727)"); + String response = requestWithUserAgent( + "Mozilla/5.0 (compatible; MSIE 7.0; Windows NT 5.2; WOW64; .NET CLR 2.0.50727)"); Assert.assertTrue("IE7 should not be supported", response.contains("your browser is not supported")); } @Test public void ie9Supported() { - String response = requestWithUserAgent("Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 7.1; Trident/5.0)"); + String response = requestWithUserAgent( + "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 7.1; Trident/5.0)"); Assert.assertFalse("IE9 should be supported", response.contains("your browser is not supported")); } @Test public void unknownSupported() { - String response = requestWithUserAgent("Very strange user agent, like wat"); + String response = requestWithUserAgent( + "Very strange user agent, like wat"); Assert.assertFalse("Unkonwn user agent should be supported", response.contains("your browser is not supported")); } diff --git a/uitest/src/test/java/com/vaadin/tests/resources/SpecialCharsInThemeResources.java b/uitest/src/test/java/com/vaadin/tests/resources/SpecialCharsInThemeResources.java index e584ec73cc..d5a054aec2 100644 --- a/uitest/src/test/java/com/vaadin/tests/resources/SpecialCharsInThemeResources.java +++ b/uitest/src/test/java/com/vaadin/tests/resources/SpecialCharsInThemeResources.java @@ -36,7 +36,8 @@ public class SpecialCharsInThemeResources extends SingleBrowserTest { @Test public void loadThemeResourceWithSpecialChars() { - loadResource("/VAADIN/themes/tests-tickets/folder%20with%20space/resource%20with%20special%20$chars@.txt"); + loadResource( + "/VAADIN/themes/tests-tickets/folder%20with%20space/resource%20with%20special%20$chars@.txt"); checkSource(); } diff --git a/uitest/src/test/java/com/vaadin/tests/serialization/SerializerTestTest.java b/uitest/src/test/java/com/vaadin/tests/serialization/SerializerTestTest.java index b2eb0e6b01..3a7aeceacc 100644 --- a/uitest/src/test/java/com/vaadin/tests/serialization/SerializerTestTest.java +++ b/uitest/src/test/java/com/vaadin/tests/serialization/SerializerTestTest.java @@ -70,14 +70,14 @@ public class SerializerTestTest extends MultiBrowserTest { Assert.assertEquals( "sendDouble: 0.423310825130748, 5.859874482048838, [2.0, 1.7976931348623157E308, 4.9E-324]", getLogRow(logRow++)); - Assert.assertEquals( - "sendFloat: 1.0000001, 3.14159, [-12.0, 0.0, 57.0]", + Assert.assertEquals("sendFloat: 1.0000001, 3.14159, [-12.0, 0.0, 57.0]", getLogRow(logRow++)); Assert.assertEquals("sendLong: -57841235865, 577431841358, [57, 0]", getLogRow(logRow++)); Assert.assertEquals("sendInt: 2, 5, [2147483647, 0]", getLogRow(logRow++)); - Assert.assertEquals("sendChar: Å, ∫, [a, b, c, d]", getLogRow(logRow++)); + Assert.assertEquals("sendChar: Å, ∫, [a, b, c, d]", + getLogRow(logRow++)); Assert.assertEquals("sendByte: 5, -12, [3, 1, 2]", getLogRow(logRow++)); Assert.assertEquals( "sendBoolean: false, false, [false, false, true, false, true, true]", @@ -93,7 +93,8 @@ public class SerializerTestTest extends MultiBrowserTest { Assert.assertEquals("state.jsonBoolean: false", getLogRow(logRow++)); Assert.assertEquals("state.jsonString: a string", getLogRow(logRow++)); Assert.assertEquals("state.jsonNull: NULL", getLogRow(logRow++)); - Assert.assertEquals("state.stringArray: [null, ‡]", getLogRow(logRow++)); + Assert.assertEquals("state.stringArray: [null, ‡]", + getLogRow(logRow++)); Assert.assertEquals("state.string: This is a tesing string ‡", getLogRow(logRow++)); Assert.assertEquals( @@ -105,10 +106,10 @@ public class SerializerTestTest extends MultiBrowserTest { getLogRow(logRow++)); Assert.assertEquals("state.floatArray: [57, 0, -12]", getLogRow(logRow++)); - Assert.assertTrue(getLogRow(logRow++).startsWith( - "state.floatObjectValue: 1.0000001")); - Assert.assertTrue(getLogRow(logRow++).startsWith( - "state.floatValue: 3.14159")); + Assert.assertTrue(getLogRow(logRow++) + .startsWith("state.floatObjectValue: 1.0000001")); + Assert.assertTrue( + getLogRow(logRow++).startsWith("state.floatValue: 3.14159")); Assert.assertEquals("state.longArray: [-57841235865, 57]", getLogRow(logRow++)); Assert.assertEquals("state.longObjectValue: 577431841360", diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/AffectedTB3Tests.java b/uitest/src/test/java/com/vaadin/tests/tb3/AffectedTB3Tests.java index 128214de1e..c4b64110f4 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/AffectedTB3Tests.java +++ b/uitest/src/test/java/com/vaadin/tests/tb3/AffectedTB3Tests.java @@ -20,8 +20,8 @@ public class AffectedTB3Tests { public static class AffectedTB3TestSuite extends TB3TestSuite { - public AffectedTB3TestSuite(Class<?> klass) throws InitializationError, - IOException { + public AffectedTB3TestSuite(Class<?> klass) + throws InitializationError, IOException { super(klass, AbstractTB3Test.class, "com.vaadin.tests", new String[] { "com.vaadin.tests.integration" }, new AffectedTB3TestLocator()); diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/AllTB3Tests.java b/uitest/src/test/java/com/vaadin/tests/tb3/AllTB3Tests.java index 338855ba1c..b2e4f17c03 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/AllTB3Tests.java +++ b/uitest/src/test/java/com/vaadin/tests/tb3/AllTB3Tests.java @@ -34,8 +34,8 @@ public class AllTB3Tests { public static class AllTB3TestsSuite extends TB3TestSuite { - public AllTB3TestsSuite(Class<?> klass) throws InitializationError, - IOException { + public AllTB3TestsSuite(Class<?> klass) + throws InitializationError, IOException { super(klass, AbstractTB3Test.class, "com.vaadin.tests", new String[] { "com.vaadin.tests.integration" }); } diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/ChangedTB3TestLocator.java b/uitest/src/test/java/com/vaadin/tests/tb3/ChangedTB3TestLocator.java index a6f2e5191a..f4dcea0325 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/ChangedTB3TestLocator.java +++ b/uitest/src/test/java/com/vaadin/tests/tb3/ChangedTB3TestLocator.java @@ -74,7 +74,8 @@ public class ChangedTB3TestLocator extends TB3TestLocator { .findGitDir() // scan up the file system tree .build(); - List<DiffEntry> diffsInWorkingTree = getDiffsInWorkingTree(repository); + List<DiffEntry> diffsInWorkingTree = getDiffsInWorkingTree( + repository); if (diffsInWorkingTree.isEmpty()) { return getDiffsInHead(repository); diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/ChangedTB3Tests.java b/uitest/src/test/java/com/vaadin/tests/tb3/ChangedTB3Tests.java index 3c7030b1e9..5f577cf2b6 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/ChangedTB3Tests.java +++ b/uitest/src/test/java/com/vaadin/tests/tb3/ChangedTB3Tests.java @@ -33,8 +33,8 @@ import com.vaadin.tests.tb3.ChangedTB3Tests.ChangedTB3TestsSuite; @RunWith(ChangedTB3TestsSuite.class) public class ChangedTB3Tests { public static class ChangedTB3TestsSuite extends TB3TestSuite { - public ChangedTB3TestsSuite(Class<?> klass) throws InitializationError, - IOException { + public ChangedTB3TestsSuite(Class<?> klass) + throws InitializationError, IOException { super(klass, AbstractTB3Test.class, "com.vaadin.tests", new String[] { "com.vaadin.tests.integration" }, new ChangedTB3TestLocator()); diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTestWithProxy.java b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTestWithProxy.java index a64a70022e..9e3106ee74 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTestWithProxy.java +++ b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTestWithProxy.java @@ -26,8 +26,8 @@ import org.junit.runners.Parameterized.Parameters; import org.openqa.selenium.remote.DesiredCapabilities; @RunWith(ParameterizedTB3Runner.class) -public abstract class MultiBrowserThemeTestWithProxy extends - MultiBrowserTestWithProxy { +public abstract class MultiBrowserThemeTestWithProxy + extends MultiBrowserTestWithProxy { private String theme; diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/TooltipTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/TooltipTest.java index e455abc9f0..36c8322035 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/TooltipTest.java +++ b/uitest/src/test/java/com/vaadin/tests/tb3/TooltipTest.java @@ -63,16 +63,18 @@ public abstract class TooltipTest extends MultiBrowserTest { WebElement body = findElement(By.cssSelector("body")); WebElement tooltip = getTooltip(); Assert.assertEquals(value, tooltip.getText()); - Assert.assertTrue("Tooltip overflowed to the left", tooltip - .getLocation().getX() >= 0); + Assert.assertTrue("Tooltip overflowed to the left", + tooltip.getLocation().getX() >= 0); Assert.assertTrue("Tooltip overflowed up", tooltip.getLocation().getY() >= 0); - Assert.assertTrue("Tooltip overflowed to the right", tooltip - .getLocation().getX() + tooltip.getSize().getWidth() < body - .getSize().getWidth()); - Assert.assertTrue("Tooltip overflowed down", tooltip.getLocation() - .getY() + tooltip.getSize().getHeight() < body.getSize() - .getHeight()); + Assert.assertTrue("Tooltip overflowed to the right", + tooltip.getLocation().getX() + + tooltip.getSize().getWidth() < body.getSize() + .getWidth()); + Assert.assertTrue("Tooltip overflowed down", + tooltip.getLocation().getY() + + tooltip.getSize().getHeight() < body.getSize() + .getHeight()); } @@ -95,7 +97,8 @@ public abstract class TooltipTest extends MultiBrowserTest { + tooltip.getText() + " at " + tooltip.getLocation()); } } catch (NoSuchElementException e) { - Assert.fail("Tooltip element was removed completely, causing extra events to accessibility tools"); + Assert.fail( + "Tooltip element was removed completely, causing extra events to accessibility tools"); } } diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/CalendarElement.java b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/CalendarElement.java index 40475afd3c..8e07b61e26 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/CalendarElement.java +++ b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/CalendarElement.java @@ -8,8 +8,8 @@ import com.vaadin.testbench.By; import com.vaadin.testbench.elementsbase.ServerClass; @ServerClass("com.vaadin.ui.Calendar") -public class CalendarElement extends - com.vaadin.testbench.elements.CalendarElement { +public class CalendarElement + extends com.vaadin.testbench.elements.CalendarElement { public List<WebElement> getWeekNumbers() { return findElements(By.className("v-calendar-week-number")); } diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/ComboBoxElement.java b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/ComboBoxElement.java index 4a84c2bbc1..890db87f18 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/ComboBoxElement.java +++ b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/ComboBoxElement.java @@ -7,8 +7,8 @@ import com.vaadin.testbench.By; import com.vaadin.testbench.elementsbase.ServerClass; @ServerClass("com.vaadin.ui.ComboBox") -public class ComboBoxElement extends - com.vaadin.testbench.elements.ComboBoxElement { +public class ComboBoxElement + extends com.vaadin.testbench.elements.ComboBoxElement { private static org.openqa.selenium.By bySuggestionPopup = By .vaadin("#popup"); diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java index 8f8dd82d9f..b10ea2bed8 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java +++ b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java @@ -21,7 +21,8 @@ public class FixedNotificationElement extends NotificationElement { public void close() { click(5, 5); WebDriverWait wait = new WebDriverWait(getDriver(), 10); - wait.until(ExpectedConditions.not(ExpectedConditions - .presenceOfAllElementsLocatedBy(By.className("v-Notification")))); + wait.until(ExpectedConditions + .not(ExpectedConditions.presenceOfAllElementsLocatedBy( + By.className("v-Notification")))); } } diff --git a/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java index 1814aa99df..b10c51573f 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java @@ -78,8 +78,8 @@ public class LegacyComponentThemeChangeTest extends MultiBrowserTest { return; } EmbeddedElement e = $(EmbeddedElement.class).first(); - WebElement movieParam = e.findElement(By - .xpath(".//param[@name='movie']")); + WebElement movieParam = e + .findElement(By.xpath(".//param[@name='movie']")); WebElement embed = e.findElement(By.xpath(".//embed")); assertAttributePrefix(movieParam, "value", theme); assertAttributePrefix(embed, "src", theme); @@ -101,16 +101,16 @@ public class LegacyComponentThemeChangeTest extends MultiBrowserTest { assertAttributePrefix(selectedImage, "src", theme); cb.openPopup(); - WebElement popup = findElement(By - .className("v-filterselect-suggestpopup")); + WebElement popup = findElement( + By.className("v-filterselect-suggestpopup")); WebElement itemImage = popup.findElement(By.xpath(".//img")); assertAttributePrefix(itemImage, "src", theme); } private void assertMenubarTheme(String theme) { // The runoImage must always come from Runo - WebElement runoImage = $(MenuBarElement.class).first().findElement( - By.xpath(".//span[text()='runo']/img")); + WebElement runoImage = $(MenuBarElement.class).first() + .findElement(By.xpath(".//span[text()='runo']/img")); String runoImageSrc = runoImage.getAttribute("src"); // Something in Selenium normalizes the image so it becomes @@ -120,22 +120,22 @@ public class LegacyComponentThemeChangeTest extends MultiBrowserTest { runoImageSrc); // The other image should change with the theme - WebElement themeImage = $(MenuBarElement.class).first().findElement( - By.xpath(".//span[text()='selectedtheme']/img")); + WebElement themeImage = $(MenuBarElement.class).first() + .findElement(By.xpath(".//span[text()='selectedtheme']/img")); assertAttributePrefix(themeImage, "src", theme); - WebElement subMenuItem = $(MenuBarElement.class).first().findElement( - By.xpath(".//span[text()='sub menu']")); + WebElement subMenuItem = $(MenuBarElement.class).first() + .findElement(By.xpath(".//span[text()='sub menu']")); subMenuItem.click(); WebElement subMenu = findElement(By.className("v-menubar-popup")); - WebElement subMenuRuno = subMenu.findElement(By - .xpath(".//span[text()='runo']/img")); + WebElement subMenuRuno = subMenu + .findElement(By.xpath(".//span[text()='runo']/img")); String subMenuRunoImageSrc = subMenuRuno.getAttribute("src"); Assert.assertEquals(getThemeURL("runo") + "icons/16/ok.png", subMenuRunoImageSrc); - WebElement subMenuThemeImage = subMenu.findElement(By - .xpath(".//span[text()='selectedtheme']/img")); + WebElement subMenuThemeImage = subMenu + .findElement(By.xpath(".//span[text()='selectedtheme']/img")); assertAttributePrefix(subMenuThemeImage, "src", theme); } @@ -143,8 +143,9 @@ public class LegacyComponentThemeChangeTest extends MultiBrowserTest { String theme) { String value = element.getAttribute(attribute); String expectedPrefix = getThemeURL(theme); - Assert.assertTrue("Attribute " + attribute + "='" + value - + "' does not start with " + expectedPrefix, + Assert.assertTrue( + "Attribute " + attribute + "='" + value + + "' does not start with " + expectedPrefix, value.startsWith(expectedPrefix)); } diff --git a/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeFaviconTest.java b/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeFaviconTest.java index cb5e9d07c7..bc4432654e 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeFaviconTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeFaviconTest.java @@ -34,8 +34,8 @@ public class ThemeChangeFaviconTest extends SingleBrowserTest { public List<DesiredCapabilities> getBrowsersToTest() { // Seems like stylesheet onload is not fired on PhantomJS // https://github.com/ariya/phantomjs/issues/12332 - return Collections.singletonList(Browser.FIREFOX - .getDesiredCapabilities()); + return Collections + .singletonList(Browser.FIREFOX.getDesiredCapabilities()); } @Test @@ -59,14 +59,15 @@ public class ThemeChangeFaviconTest extends SingleBrowserTest { private void assertFavicon(String theme) { String faviconUrl = "/VAADIN/themes/" + theme + "/favicon.ico"; - List<WebElement> elements = findElements(By - .cssSelector("link[rel~=\"icon\"]")); + List<WebElement> elements = findElements( + By.cssSelector("link[rel~=\"icon\"]")); Assert.assertEquals(2, elements.size()); for (WebElement element : elements) { - Assert.assertTrue(element.getAttribute("href") - + " does not end with " + faviconUrl, + Assert.assertTrue( + element.getAttribute("href") + " does not end with " + + faviconUrl, element.getAttribute("href").endsWith(faviconUrl)); } } diff --git a/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeOnTheFlyTest.java b/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeOnTheFlyTest.java index caf264abf1..ba2fd41778 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeOnTheFlyTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeOnTheFlyTest.java @@ -90,8 +90,8 @@ public class ThemeChangeOnTheFlyTest extends MultiBrowserTest { } private void assertOverlayTheme(String theme) { - final WebElement overlayContainerDiv = findElement(By - .xpath("//div[contains(@class,'v-overlay-container')]")); + final WebElement overlayContainerDiv = findElement( + By.xpath("//div[contains(@class,'v-overlay-container')]")); String overlayClass = overlayContainerDiv.getAttribute("class").trim(); assertThat(overlayClass, containsString(theme)); diff --git a/uitest/src/test/java/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java b/uitest/src/test/java/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java index 3a5ddf5f3b..f261730930 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java @@ -18,14 +18,14 @@ public class DisabledMenuBarItemTest extends MultiBrowserTest { public void disabledMenuItemShouldHaveOpacity() throws IOException { openTestURL(); - WebElement element = driver.findElement(By - .className("v-menubar-menuitem-disabled")); + WebElement element = driver + .findElement(By.className("v-menubar-menuitem-disabled")); - if (Browser.IE9.getDesiredCapabilities().equals( - getDesiredCapabilities())) { + if (Browser.IE9.getDesiredCapabilities() + .equals(getDesiredCapabilities())) { assertThat(element.getCssValue("filter"), is("alpha(opacity=50)")); - } else if (Browser.IE8.getDesiredCapabilities().equals( - getDesiredCapabilities())) { + } else if (Browser.IE8.getDesiredCapabilities() + .equals(getDesiredCapabilities())) { WebElement icon = element.findElement(By.tagName("img")); assertThat(icon.getCssValue("filter"), is("alpha(opacity=50)")); } else { diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java index 6e01e01996..f5153d8cb5 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java @@ -48,8 +48,9 @@ public class CollapsibleTableColumnTest extends MultiBrowserTest { String nonCollapsibleColumnOpacity = items.get(1) .getCssValue("opacity"); - Assert.assertNotEquals("Opacity value is the same for collapsible " - + "and non-collapsible column item", collapsibleColumnOpacity, - nonCollapsibleColumnOpacity); + Assert.assertNotEquals( + "Opacity value is the same for collapsible " + + "and non-collapsible column item", + collapsibleColumnOpacity, nonCollapsibleColumnOpacity); } } diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ContrastFontColorTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ContrastFontColorTest.java index 38d93ab633..671ef455ea 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ContrastFontColorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ContrastFontColorTest.java @@ -35,6 +35,7 @@ public class ContrastFontColorTest extends MultiBrowserTest { String color = $(TextFieldElement.class).first().getCssValue("color"); Assert.assertEquals( "Unexpected text color value using 0.1 as defualt contrast value :" - + color, "rgba(230, 230, 230, 1)", color); + + color, + "rgba(230, 230, 230, 1)", color); } } diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/FormLayoutInsideTableTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/FormLayoutInsideTableTest.java index 2a1664fbcf..a129550298 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/FormLayoutInsideTableTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/FormLayoutInsideTableTest.java @@ -16,7 +16,8 @@ public class FormLayoutInsideTableTest extends MultiBrowserTest { public void nestedItemHasBorderTop() { openTestURL(); - List<WebElement> formLayoutRows = findElements(By.cssSelector("tr.v-formlayout-row")); + List<WebElement> formLayoutRows = findElements( + By.cssSelector("tr.v-formlayout-row")); WebElement secondNestedRow = formLayoutRows.get(1); WebElement td = secondNestedRow.findElement(By.tagName("td")); diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ModalWindowTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ModalWindowTest.java index 0b21d4f34c..11b98174ba 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ModalWindowTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ModalWindowTest.java @@ -23,8 +23,8 @@ public class ModalWindowTest extends SingleBrowserTest { openModalWindow(); - WebElement modalityCurtain = findElement(By - .className("v-window-modalitycurtain")); + WebElement modalityCurtain = findElement( + By.className("v-window-modalitycurtain")); assertThat(modalityCurtain.getCssValue("-webkit-animation-name"), is("none")); diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/NotificationStyleTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/NotificationStyleTest.java index 5f9542b6f3..12e974fd59 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/NotificationStyleTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/NotificationStyleTest.java @@ -46,13 +46,14 @@ public class NotificationStyleTest extends MultiBrowserTest { waitUntil(notificationPresentCondition(), 2); WebElement notification = findElement(By.className("v-Notification")); - List<WebElement> headers = notification.findElements(By - .tagName(ValoTheme.LABEL_H1)); + List<WebElement> headers = notification + .findElements(By.tagName(ValoTheme.LABEL_H1)); String textAlign = headers.get(0).getCssValue("text-align"); String textAlignInnerHeader = headers.get(1).getCssValue("text-align"); - Assert.assertNotEquals("Styles for notification defined h1 tag " - + "and custom HTML tag are the same", textAlign, - textAlignInnerHeader); + Assert.assertNotEquals( + "Styles for notification defined h1 tag " + + "and custom HTML tag are the same", + textAlign, textAlignInnerHeader); } @Test @@ -65,13 +66,15 @@ public class NotificationStyleTest extends MultiBrowserTest { waitUntil(notificationPresentCondition(), 2); WebElement notification = findElement(By.className("v-Notification")); - WebElement description = notification.findElement(By - .className("v-Notification-description")); + WebElement description = notification + .findElement(By.className("v-Notification-description")); String display = description.getCssValue("display"); String displayP2 = notification.findElement(By.className("tested-p")) .getCssValue("display"); - Assert.assertNotEquals("Styles for notification defined 'p' tag " - + "and custom HTML tag are the same", display, displayP2); + Assert.assertNotEquals( + "Styles for notification defined 'p' tag " + + "and custom HTML tag are the same", + display, displayP2); } private ExpectedCondition<Boolean> notificationPresentCondition() { diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ResponsiveStylesTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ResponsiveStylesTest.java index 8f01de350e..1bcb471d7c 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ResponsiveStylesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ResponsiveStylesTest.java @@ -46,8 +46,8 @@ public class ResponsiveStylesTest extends MultiBrowserTest { public void testValoMenuResponsiveParentSize() throws Exception { openTestURL(); - List<WebElement> menus = findElements(com.vaadin.testbench.By - .className(MENU_STYLENAME)); + List<WebElement> menus = findElements( + com.vaadin.testbench.By.className(MENU_STYLENAME)); WebElement narrowMenu = menus.get(NARROW_ELEMENT_INDEX); int narrowWidth = narrowMenu.getSize().width; diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/TableWithEmptyCaptionTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/TableWithEmptyCaptionTest.java index 04de8b498c..a35025c594 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/TableWithEmptyCaptionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/TableWithEmptyCaptionTest.java @@ -30,8 +30,8 @@ public class TableWithEmptyCaptionTest extends MultiBrowserTest { // Wait for the loading bar to disappear before taking the screenshot. try { - waitUntil(ExpectedConditions.invisibilityOfElementLocated(By - .className("v-loading-indicator")), 5); + waitUntil(ExpectedConditions.invisibilityOfElementLocated( + By.className("v-loading-indicator")), 5); } catch (TimeoutException e) { // Just take the screenshot, PhantomJS always times out. } diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/TextFieldBevelTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/TextFieldBevelTest.java index efe194d28a..a2d647c809 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/TextFieldBevelTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/TextFieldBevelTest.java @@ -51,11 +51,9 @@ public class TextFieldBevelTest extends MultiBrowserTest { } private void openTestUrlWithoutBevel() { - getDriver().get( - getTestUrl() - + "$" - + TextFieldBevel.ValoDefaultTextFieldBevel.class - .getSimpleName() + "?restartApplication"); + getDriver().get(getTestUrl() + "$" + + TextFieldBevel.ValoDefaultTextFieldBevel.class.getSimpleName() + + "?restartApplication"); } private String getBoxShadow() { diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java index 7651b641de..ace24d7546 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java @@ -50,7 +50,9 @@ public class ValoDefaultCaptionWidthTest extends DefaultCaptionWidthTest { int width = $(ColorPickerElement.class).first().getSize().getWidth(); // Width should be 150px but let's just check that it's not which is // used when default caption is used and at least >= 150-1 - assertThat("Width of color picker is overriden by " - + "default caption feature", width, is(greaterThan(149))); + assertThat( + "Width of color picker is overriden by " + + "default caption feature", + width, is(greaterThan(149))); } } diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java index 3c28b1f9eb..c5e0f446a1 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java @@ -285,9 +285,8 @@ public class ValoThemeUITest extends MultiBrowserTest { LabelElement captionElem = content.$(LabelElement.class).first(); if (!captionElem.getText().equals(caption)) { // IE ... why you fail clicks - System.err.println("Extra click needed on '" + link - + "' on remote " + getDesiredCapabilities() + " " - + getRemoteControlName()); + System.err.println("Extra click needed on '" + link + "' on remote " + + getDesiredCapabilities() + " " + getRemoteControlName()); open(link, caption, tries - 1); } else { diff --git a/uitest/src/test/java/com/vaadin/tests/tooltip/MenuBarTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/MenuBarTooltipTest.java index 9b2f7d13d6..8ae3b53f11 100644 --- a/uitest/src/test/java/com/vaadin/tests/tooltip/MenuBarTooltipTest.java +++ b/uitest/src/test/java/com/vaadin/tests/tooltip/MenuBarTooltipTest.java @@ -17,15 +17,12 @@ public class MenuBarTooltipTest extends MultiBrowserTest { @Test public void toolTipShouldBeOnTopOfMenuItem() { - String[] themes = new String[] { - ValoTheme.THEME_NAME, - Reindeer.THEME_NAME, - Runo.THEME_NAME, - ChameleonTheme.THEME_NAME - }; - - for(String theme : themes) { - assertZIndices(theme); + String[] themes = new String[] { ValoTheme.THEME_NAME, + Reindeer.THEME_NAME, Runo.THEME_NAME, + ChameleonTheme.THEME_NAME }; + + for (String theme : themes) { + assertZIndices(theme); } } @@ -35,7 +32,8 @@ public class MenuBarTooltipTest extends MultiBrowserTest { $(MenuBarElement.class).first().clickItem("Menu item"); assertThat(String.format("Invalid z-index for theme %s.", theme), - getZIndex("v-tooltip"), greaterThan(getZIndex("v-menubar-popup"))); + getZIndex("v-tooltip"), + greaterThan(getZIndex("v-menubar-popup"))); } private int getZIndex(String className) { diff --git a/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipAndJavascriptTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipAndJavascriptTest.java index cc9309ac2c..4cd06f16b0 100644 --- a/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipAndJavascriptTest.java +++ b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipAndJavascriptTest.java @@ -30,8 +30,8 @@ public class TooltipAndJavascriptTest extends MultiBrowserTest { public void ensureTooltipInOverlay() throws InterruptedException { openTestURL(); $(ButtonElement.class).first().showTooltip(); - WebElement tooltip = findElement(By - .cssSelector(".v-overlay-container .v-tooltip")); + WebElement tooltip = findElement( + By.cssSelector(".v-overlay-container .v-tooltip")); WebElement overlayContainer = getParent(tooltip); Assert.assertTrue("v-overlay-container did not receive theme", hasClass(overlayContainer, "reindeer")); @@ -48,7 +48,7 @@ public class TooltipAndJavascriptTest extends MultiBrowserTest { } private WebElement getParent(WebElement element) { - return (WebElement) ((JavascriptExecutor) getDriver()).executeScript( - "return arguments[0].parentNode;", element); + return (WebElement) ((JavascriptExecutor) getDriver()) + .executeScript("return arguments[0].parentNode;", element); } } diff --git a/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipInWindowTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipInWindowTest.java index 1c50bf5486..dd1d5c03db 100644 --- a/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipInWindowTest.java +++ b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipInWindowTest.java @@ -61,6 +61,7 @@ public class TooltipInWindowTest extends TooltipTest { int tooltipX = getTooltipContainerElement().getLocation().getX(); assertLessThanOrEqual( "Tooltip should be positioned outside of viewport (was at " - + tooltipX + ")", tooltipX, -1000); + + tooltipX + ")", + tooltipX, -1000); } } diff --git a/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipWidthUpdatingTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipWidthUpdatingTest.java index 150d0e070e..527fee5cb2 100644 --- a/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipWidthUpdatingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipWidthUpdatingTest.java @@ -40,7 +40,8 @@ public class TooltipWidthUpdatingTest extends TooltipTest { testBenchElement(btnShortTooltip).showTooltip(); assertThat(getDriver().findElement(By.className("popupContent")) - .getSize().getWidth(), lessThan(TooltipWidthUpdating.MAX_WIDTH)); + .getSize().getWidth(), + lessThan(TooltipWidthUpdating.MAX_WIDTH)); } }
\ No newline at end of file diff --git a/uitest/src/test/java/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdateTest.java b/uitest/src/test/java/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdateTest.java index 01ea890cec..d51b831a72 100644 --- a/uitest/src/test/java/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdateTest.java +++ b/uitest/src/test/java/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdateTest.java @@ -45,8 +45,10 @@ public class FragmentHandlingAndAsynchUIUpdateTest extends MultiBrowserTest { for (int i = 0; i < 10; i++) { // here we wait for setting fragment in URI. If not to do it - // history will be "loss" - getDriver().findElement( - By.id(FragmentHandlingAndAsynchUIUpdate.BUTTON_ID)).click(); + getDriver() + .findElement( + By.id(FragmentHandlingAndAsynchUIUpdate.BUTTON_ID)) + .click(); assertFragment(String.format(FRAG_NAME_TPL, START_FRAG_ID + i)); } @@ -97,8 +99,9 @@ public class FragmentHandlingAndAsynchUIUpdateTest extends MultiBrowserTest { @Override public void run() { for (int i = 0; i < 10; i++) { - getDriver().findElement( - By.id(FragmentHandlingAndAsynchUIUpdate.BUTTON_ID)) + getDriver() + .findElement( + By.id(FragmentHandlingAndAsynchUIUpdate.BUTTON_ID)) .click(); } diff --git a/uitest/src/test/java/com/vaadin/tests/util/WidgetUtilTest.java b/uitest/src/test/java/com/vaadin/tests/util/WidgetUtilTest.java index 2af015b406..d1f713ce08 100644 --- a/uitest/src/test/java/com/vaadin/tests/util/WidgetUtilTest.java +++ b/uitest/src/test/java/com/vaadin/tests/util/WidgetUtilTest.java @@ -41,8 +41,8 @@ public class WidgetUtilTest extends MultiBrowserTest { @Test public void testBlockElementRequiredSizeComputedStyle() { openTestURL(); - WebElement testComponent = findElement(By - .className("v-widget-util-test")); + WebElement testComponent = findElement( + By.className("v-widget-util-test")); testComponent.click(); int padding = (int) Math.ceil(2.4 + 3.5); @@ -60,14 +60,14 @@ public class WidgetUtilTest extends MultiBrowserTest { border = 1 * 2; } - assertExpectedSize(testComponent, "noBorderPadding", baseWidth + "x" - + baseHeight); + assertExpectedSize(testComponent, "noBorderPadding", + baseWidth + "x" + baseHeight); - assertExpectedSize(testComponent, "border", (baseWidth + border) + "x" - + (baseHeight + border)); + assertExpectedSize(testComponent, "border", + (baseWidth + border) + "x" + (baseHeight + border)); - assertExpectedSize(testComponent, "padding", (baseWidth + padding) - + "x" + (baseHeight + padding)); + assertExpectedSize(testComponent, "padding", + (baseWidth + padding) + "x" + (baseHeight + padding)); assertExpectedSize(testComponent, "borderPadding", (baseWidth + border + padding) + "x" @@ -86,8 +86,8 @@ public class WidgetUtilTest extends MultiBrowserTest { // Note that this is how the Windows browsers in the test cluster work. // On Mac, Firefox works slightly differently (rounds border to 1.5px). return (BrowserUtil.isChrome(capabilities) - || BrowserUtil.isPhantomJS(capabilities) || BrowserUtil - .isFirefox(capabilities)); + || BrowserUtil.isPhantomJS(capabilities) + || BrowserUtil.isFirefox(capabilities)); } @Override diff --git a/uitest/src/test/java/com/vaadin/tests/widgetset/server/ClientRpcClassTest.java b/uitest/src/test/java/com/vaadin/tests/widgetset/server/ClientRpcClassTest.java index 7ff8291494..14937fee93 100644 --- a/uitest/src/test/java/com/vaadin/tests/widgetset/server/ClientRpcClassTest.java +++ b/uitest/src/test/java/com/vaadin/tests/widgetset/server/ClientRpcClassTest.java @@ -28,8 +28,8 @@ public class ClientRpcClassTest extends MultiBrowserTest { public void pauseDisplayed() { openTestURL(); - WebElement element = getDriver().findElement( - By.id(ClientRpcClass.TEST_COMPONENT_ID)); + WebElement element = getDriver() + .findElement(By.id(ClientRpcClass.TEST_COMPONENT_ID)); Assert.assertEquals("pause", element.getText()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUITest.java b/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUITest.java index 614eaa063e..58753bfc95 100644 --- a/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUITest.java @@ -29,8 +29,8 @@ import com.vaadin.tests.widgetset.client.csrf.CsrfButtonConnector; public abstract class AbstractCsrfTokenUITest extends MultiBrowserTest { - static final Logger LOGGER = Logger.getLogger(AbstractCsrfTokenUITest.class - .getName()); + static final Logger LOGGER = Logger + .getLogger(AbstractCsrfTokenUITest.class.getName()); @Test public void testTokens() { diff --git a/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabledTest.java b/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabledTest.java index 1d51f1c372..d49760c5a8 100644 --- a/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabledTest.java +++ b/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabledTest.java @@ -34,8 +34,7 @@ public class CsrfTokenEnabledTest extends AbstractCsrfTokenUITest { // No token sent yet to the server. && isUndefined(tokenGroup1.tokenSentToServer) // Token is sent to the server. - && tokenGroup2.clientToken - .equals(tokenGroup2.tokenSentToServer) + && tokenGroup2.clientToken.equals(tokenGroup2.tokenSentToServer) // And no more token received from the server. && isUndefined(tokenGroup2.tokenReceivedFromServer); } |