diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-05-20 13:26:57 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-05-20 14:53:22 +0300 |
| commit | 1ac972f2bb7d92604a89abf5e08e4343726fbd01 (patch) | |
| tree | 8f213bb97eb2f2abd0d02c0eec1e16871d5bb823 /checkstyle | |
| parent | 335eb7937d29c4b540b9bd2e02651e11ff46a6ba (diff) | |
| parent | 13ddd2b03c99b563b131c115982ac09453ca749f (diff) | |
| download | vaadin-framework-1ac972f2bb7d92604a89abf5e08e4343726fbd01.tar.gz vaadin-framework-1ac972f2bb7d92604a89abf5e08e4343726fbd01.zip | |
Merge branch 'master' into grid
Conflicts:
WebContent/release-notes.html
Change-Id: Icccb2e30199f99a7b0b00f05b1a12d5f7297402f
Diffstat (limited to 'checkstyle')
| -rw-r--r-- | checkstyle/header | 4 | ||||
| -rw-r--r-- | checkstyle/vaadin-checkstyle.xml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/checkstyle/header b/checkstyle/header index 511f77e5ba..a1063268ac 100644 --- a/checkstyle/header +++ b/checkstyle/header @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 Vaadin Ltd. + * Copyright 2000-2014 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of @@ -12,4 +12,4 @@ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the * License for the specific language governing permissions and limitations under * the License. - */
\ No newline at end of file + */ diff --git a/checkstyle/vaadin-checkstyle.xml b/checkstyle/vaadin-checkstyle.xml index 1caf480582..9dfe1c9156 100644 --- a/checkstyle/vaadin-checkstyle.xml +++ b/checkstyle/vaadin-checkstyle.xml @@ -90,6 +90,8 @@ <module name="Header"> <property name="headerFile" value="${checkstyle.header.file}" /> <property name="fileExtensions" value="java" /> + <!-- ignore empty lines that may or may not have trailing white-space --> + <property name="ignoreLines" value="3, 7, 9"/> </module> <module name="TreeWalker"> |