Skip to content

Commit

Permalink
Issue checkstyle#454: enforces header on all files and upgrades year
Browse files Browse the repository at this point in the history
  • Loading branch information
rnveach committed Feb 4, 2023
1 parent 596c951 commit 19ffff3
Show file tree
Hide file tree
Showing 235 changed files with 652 additions and 247 deletions.
2 changes: 1 addition & 1 deletion config/checkstyle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
checkstyle.suppressions.file=config/suppressions.xml
checkstyle.suppressions-xpath.file=config/suppressions.xml
checkstyle.header.file=config/java.header
checkstyle.regexp.header.file=config/java_regexp.header
checkstyle.regexp.old.header.file=config/java_regexp_old.header
checkstyle.importcontrol.file=config/import-control.xml
checkstyle.importcontroltest.file=config/import-control-test.xml
12 changes: 12 additions & 0 deletions config/checkstyle_checks.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,18 @@
<property name="onCommentFormat" value="CSON\: .*"/>
</module>

<!-- Headers -->
<module name="RegexpHeader">
<property name="id" value="regexpHeader"/>
<property name="headerFile" value="${checkstyle.regexp.header.file}"/>
<property name="fileExtensions" value="java, g4"/>
</module>
<module name="RegexpHeader">
<property name="id" value="oldRegexpHeader"/>
<property name="headerFile" value="${checkstyle.regexp.old.header.file}"/>
<property name="fileExtensions" value="java, g4"/>
</module>

<!-- Miscellaneous -->
<module name="NewlineAtEndOfFile"/>
<module name="Translation"/>
Expand Down
19 changes: 0 additions & 19 deletions config/java.header

This file was deleted.

6 changes: 3 additions & 3 deletions config/java_regexp.header
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
^/{2}={76}$
^/{2}$
^/{2} Copyright \(C\) \d\d\d\d-\d\d\d\d David Schneider, Lars Ködderitzsch$
^/{2} Copyright \(C\) 2003-2023 the original author or authors\.$
^/{2}$
^/{2} This library is free software; you can redistribute it and/or$
^/{2} modify it under the terms of the GNU Lesser General Public$
^/{2} License as published by the Free Software Foundation; either$
^/{2} version \d.\d of the License, or \(at your option\) any later version.$
^/{2} version 2\.1 of the License, or \(at your option\) any later version.$
^/{2}$
^/{2} This library is distributed in the hope that it will be useful,$
^/{2} but WITHOUT ANY WARRANTY; without even the implied warranty of$
Expand All @@ -14,6 +14,6 @@
^/{2}$
^/{2} You should have received a copy of the GNU Lesser General Public$
^/{2} License along with this library; if not, write to the Free Software$
^/{2} Foundation, Inc., \d\d Temple Place, Suite \d\d\d, Boston, MA \d\d\d\d\d-\d\d\d\d USA$
^/{2} Foundation, Inc\., 59 Temple Place, Suite 330, Boston, MA 02111\-1307 USA$
^/{2}$
^/{2}={76}$
19 changes: 19 additions & 0 deletions config/java_regexp_old.header
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
^/{2}={76}$
^/{2}$
^/{2} Copyright \(C\) 2003-2023 .*$
^/{2}$
^/{2} This library is free software; you can redistribute it and/or$
^/{2} modify it under the terms of the GNU Lesser General Public$
^/{2} License as published by the Free Software Foundation; either$
^/{2} version 2\.1 of the License, or \(at your option\) any later version.$
^/{2}$
^/{2} This library is distributed in the hope that it will be useful,$
^/{2} but WITHOUT ANY WARRANTY; without even the implied warranty of$
^/{2} MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU$
^/{2} Lesser General Public License for more details.$
^/{2}$
^/{2} You should have received a copy of the GNU Lesser General Public$
^/{2} License along with this library; if not, write to the Free Software$
^/{2} Foundation, Inc\., 59 Temple Place, Suite 330, Boston, MA 02111\-1307 USA$
^/{2}$
^/{2}={76}$
222 changes: 218 additions & 4 deletions config/suppressions.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion net.sf.eclipsecs-updatesite/.checkstyle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<local-check-config name="Eclipse CS configuration" location="/eclipse-cs/config/checkstyle_checks.xml" type="project" description="Shared configuration for all Eclipse CS plugins.">
<property name="checkstyle.cache.file" value="target/checkstyle-cache"/>
<property name="checkstyle.suppressions.file" value="${config_loc}/suppressions.xml"/>
<property name="checkstyle.header.file" value="${config_loc}/java.header"/>
<property name="checkstyle.regexp.header.file" value="${config_loc}/java_regexp.header"/>
<property name="checkstyle.regexp.old.header.file" value="${config_loc}/java_regexp_old.header"/>
<property name="checkstyle.suppressions-xpath.file" value="${config_loc}/suppressions.xml"/>
<property name="checkstyle.importcontrol.file" value="${config_loc}/import-control.xml"/>
<property name="checkstyle.importcontroltest.file" value="${config_loc}/import-control-test.xml"/>
Expand Down
2 changes: 1 addition & 1 deletion net.sf.eclipsecs.branding/.checkstyle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<local-check-config name="Eclipse CS configuration" location="/eclipse-cs/config/checkstyle_checks.xml" type="project" description="Shared configuration for all Eclipse CS plugins.">
<property name="checkstyle.cache.file" value="target/checkstyle-cache"/>
<property name="checkstyle.suppressions.file" value="${config_loc}/suppressions.xml"/>
<property name="checkstyle.header.file" value="${config_loc}/java.header"/>
<property name="checkstyle.regexp.header.file" value="${config_loc}/java_regexp.header"/>
<property name="checkstyle.regexp.old.header.file" value="${config_loc}/java_regexp_old.header"/>
<property name="checkstyle.suppressions-xpath.file" value="${config_loc}/suppressions.xml"/>
<property name="checkstyle.importcontrol.file" value="${config_loc}/import-control.xml"/>
<property name="checkstyle.importcontroltest.file" value="${config_loc}/import-control-test.xml"/>
Expand Down
2 changes: 1 addition & 1 deletion net.sf.eclipsecs.checkstyle/.checkstyle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<local-check-config name="Eclipse CS configuration" location="/eclipse-cs/config/checkstyle_checks.xml" type="project" description="Shared configuration for all Eclipse CS plugins.">
<property name="checkstyle.cache.file" value="target/checkstyle-cache"/>
<property name="checkstyle.suppressions.file" value="${config_loc}/suppressions.xml"/>
<property name="checkstyle.header.file" value="${config_loc}/java.header"/>
<property name="checkstyle.regexp.header.file" value="${config_loc}/java_regexp.header"/>
<property name="checkstyle.regexp.old.header.file" value="${config_loc}/java_regexp_old.header"/>
<property name="checkstyle.suppressions-xpath.file" value="${config_loc}/suppressions.xml"/>
<property name="checkstyle.importcontrol.file" value="${config_loc}/import-control.xml"/>
<property name="checkstyle.importcontroltest.file" value="${config_loc}/import-control-test.xml"/>
Expand Down
2 changes: 1 addition & 1 deletion net.sf.eclipsecs.core/.checkstyle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<local-check-config name="Eclipse CS configuration" location="/eclipse-cs/config/checkstyle_checks.xml" type="project" description="Shared configuration for all Eclipse CS plugins.">
<property name="checkstyle.cache.file" value="target/checkstyle-cache"/>
<property name="checkstyle.suppressions.file" value="${config_loc}/suppressions.xml"/>
<property name="checkstyle.header.file" value="${config_loc}/java.header"/>
<property name="checkstyle.regexp.header.file" value="${config_loc}/java_regexp.header"/>
<property name="checkstyle.regexp.old.header.file" value="${config_loc}/java_regexp_old.header"/>
<property name="checkstyle.suppressions-xpath.file" value="${config_loc}/suppressions.xml"/>
<property name="checkstyle.importcontrol.file" value="${config_loc}/import-control.xml"/>
<property name="checkstyle.importcontroltest.file" value="${config_loc}/import-control-test.xml"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//============================================================================
//
// Copyright (C) 2002-2016 David Schneider, Lars Ködderitzsch
// Copyright (C) 2003-2023 David Schneider, Lars Ködderitzsch
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Expand Down

0 comments on commit 19ffff3

Please sign in to comment.