Skip to content

Commit 8cfb552

Browse files
matthiasblaesingmatthiasblaesing
committed
Fix license headers (Followup #711)
Changeset was reviewed by @twall via preparation PR, commit 093e349
1 parent 6bb00e1 commit 8cfb552

File tree

108 files changed

+1918
-642
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+1918
-642
lines changed

‎checkstyle.xml

+8
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
"https://checkstyle.org/dtds/configuration_1_3.dtd">
55

66
<module name="Checker">
7+
<module name="SuppressionFilter">
8+
<property name="file" value="checkstyle_suppressions.xml"/>
9+
</module>
710
<module name="FileTabCharacter"/>
811
<module name="RegexpSingleline">
912
<property name="format" value="\s+$"/>
@@ -16,4 +19,9 @@
1619
<module name="TreeWalker">
1720
<module name="Indentation"/>
1821
</module>
22+
<module name="RegexpHeader">
23+
<property name="id" value="header-check" />
24+
<property name="headerFile" value="checkstyle_header.txt"/>
25+
<property name="multiLines" value="2"/>
26+
</module>
1927
</module>

‎checkstyle_header.txt

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
^/\*( Copyright.*$|$)
2+
^ \*( Copyright.*$|$)
3+
^ \* The contents of this file is dual-licensed under 2$
4+
^ \* alternative Open Source/Free licenses: LGPL 2\.1 or later and$
5+
^ \* Apache License 2\.0\.( \(starting with JNA version 4\.0\.0\)\.$|$)
6+
^ \*$
7+
^ \* You can freely decide which license you want to apply to$
8+
^ \* the project\.$
9+
^ \*$
10+
^ \* You may obtain a copy of the LGPL License at:$
11+
^ \*$
12+
^ \* http://www\.gnu\.org/licenses/licenses\.html$
13+
^ \*$
14+
^ \* A copy is also included in the downloadable source code package$
15+
^ \* containing JNA, in file "LGPL2\.1"\.$
16+
^ \*$
17+
^ \* You may obtain a copy of the Apache License at:$
18+
^ \*$
19+
^ \* http://www\.apache\.org/licenses/$
20+
^ \*$
21+
^ \* A copy is also included in the downloadable source code package$
22+
^ \* containing JNA, in file "AL2\.0"\.$
23+
^ \*/$

‎checkstyle_suppressions.xml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0"?>
2+
3+
<!DOCTYPE suppressions PUBLIC
4+
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
5+
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
6+
7+
<suppressions>
8+
<suppress files="contrib/x11/src/jnacontrib/x11/api/X11KeySymDef.java"
9+
id="header-check" />
10+
</suppressions>

‎contrib/platform/src/com/sun/jna/platform/WindowUtils.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
/*
2-
* Copyright (c) 2007-2008 Timothy Wall, All Rights Reserved
3-
* Parts Copyright (c) 2007 Olivier Chafik
1+
/* Copyright (c) 2007-2008 Timothy Wall, All Rights Reserved
2+
* Copyright (c) 2007 Olivier Chafik
43
*
54
* The contents of this file is dual-licensed under 2
65
* alternative Open Source/Free licenses: LGPL 2.1 or later and

‎contrib/platform/src/com/sun/jna/platform/win32/GDI32.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* copyright (c) 2007 Timothy Wall, All Rights Reserved
1+
/* Copyright (c) 2007 Timothy Wall, All Rights Reserved
22
*
33
* The contents of this file is dual-licensed under 2
44
* alternative Open Source/Free licenses: LGPL 2.1 or later and

‎contrib/platform/src/com/sun/jna/platform/win32/ObjBase.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
/*
2-
* Copyright 2010 Digital Rapids Corp.
3-
*/
41
/* Copyright (c) 2010 Timothy Wall, All Rights Reserved
2+
* Copyright 2010 Digital Rapids Corp.
3+
*
54
* The contents of this file is dual-licensed under 2
65
* alternative Open Source/Free licenses: LGPL 2.1 or later and
76
* Apache License 2.0. (starting with JNA version 4.0.0).

‎contrib/platform/src/com/sun/jna/platform/win32/WTypes.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
/*
2-
* Copyright 2010 Digital Rapids Corp.
3-
*/
4-
51
/* Copyright (c) 2010 Timothy Wall, All Rights Reserved
2+
* Copyright 2010 Digital Rapids Corp.
3+
*
64
* The contents of this file is dual-licensed under 2
75
* alternative Open Source/Free licenses: LGPL 2.1 or later and
86
* Apache License 2.0. (starting with JNA version 4.0.0).

‎contrib/platform/test/com/sun/jna/platform/AbstractPlatformTestSupport.java

+20-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
11
/* Copyright (c) 2007 Timothy Wall, All Rights Reserved
22
*
3-
* This library is free software; you can redistribute it and/or
4-
* modify it under the terms of the GNU Lesser General Public
5-
* License as published by the Free Software Foundation; either
6-
* version 2.1 of the License, or (at your option) any later version.
7-
*
8-
* This library is distributed in the hope that it will be useful,
9-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
10-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11-
* Lesser General Public License for more details.
3+
* The contents of this file is dual-licensed under 2
4+
* alternative Open Source/Free licenses: LGPL 2.1 or later and
5+
* Apache License 2.0. (starting with JNA version 4.0.0).
6+
*
7+
* You can freely decide which license you want to apply to
8+
* the project.
9+
*
10+
* You may obtain a copy of the LGPL License at:
11+
*
12+
* http://www.gnu.org/licenses/licenses.html
13+
*
14+
* A copy is also included in the downloadable source code package
15+
* containing JNA, in file "LGPL2.1".
16+
*
17+
* You may obtain a copy of the Apache License at:
18+
*
19+
* http://www.apache.org/licenses/
20+
*
21+
* A copy is also included in the downloadable source code package
22+
* containing JNA, in file "AL2.0".
1223
*/
1324
package com.sun.jna.platform;
1425

‎contrib/platform/test/com/sun/jna/platform/FileUtilsTest.java

+20-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
11
/* Copyright (c) 2007-2013 Timothy Wall, All Rights Reserved
22
*
3-
* This library is free software; you can redistribute it and/or
4-
* modify it under the terms of the GNU Lesser General Public
5-
* License as published by the Free Software Foundation; either
6-
* version 2.1 of the License, or (at your option) any later version.
7-
* <p/>
8-
* This library is distributed in the hope that it will be useful,
9-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
10-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11-
* Lesser General Public License for more details.
3+
* The contents of this file is dual-licensed under 2
4+
* alternative Open Source/Free licenses: LGPL 2.1 or later and
5+
* Apache License 2.0. (starting with JNA version 4.0.0).
6+
*
7+
* You can freely decide which license you want to apply to
8+
* the project.
9+
*
10+
* You may obtain a copy of the LGPL License at:
11+
*
12+
* http://www.gnu.org/licenses/licenses.html
13+
*
14+
* A copy is also included in the downloadable source code package
15+
* containing JNA, in file "LGPL2.1".
16+
*
17+
* You may obtain a copy of the Apache License at:
18+
*
19+
* http://www.apache.org/licenses/
20+
*
21+
* A copy is also included in the downloadable source code package
22+
* containing JNA, in file "AL2.0".
1223
*/
1324
package com.sun.jna.platform;
1425

‎contrib/platform/test/com/sun/jna/platform/KeyboardUtilsTest.java

+19-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
11
/* Copyright (c) 2007 Timothy Wall, All Rights Reserved
22
*
3-
* This library is free software; you can redistribute it and/or
4-
* modify it under the terms of the GNU Lesser General Public
5-
* License as published by the Free Software Foundation; either
6-
* version 2.1 of the License, or (at your option) any later version.
3+
* The contents of this file is dual-licensed under 2
4+
* alternative Open Source/Free licenses: LGPL 2.1 or later and
5+
* Apache License 2.0. (starting with JNA version 4.0.0).
76
*
8-
* This library is distributed in the hope that it will be useful,
9-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
10-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11-
* Lesser General Public License for more details.
7+
* You can freely decide which license you want to apply to
8+
* the project.
9+
*
10+
* You may obtain a copy of the LGPL License at:
11+
*
12+
* http://www.gnu.org/licenses/licenses.html
13+
*
14+
* A copy is also included in the downloadable source code package
15+
* containing JNA, in file "LGPL2.1".
16+
*
17+
* You may obtain a copy of the Apache License at:
18+
*
19+
* http://www.apache.org/licenses/
20+
*
21+
* A copy is also included in the downloadable source code package
22+
* containing JNA, in file "AL2.0".
1223
*/
1324
package com.sun.jna.platform;
1425

‎contrib/platform/test/com/sun/jna/platform/RasterRangesUtilsTest.java

+19-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
11
/* Copyright (c) 2008 Timothy Wall, All Rights Reserved
22
*
3-
* This library is free software; you can redistribute it and/or
4-
* modify it under the terms of the GNU Lesser General Public
5-
* License as published by the Free Software Foundation; either
6-
* version 2.1 of the License, or (at your option) any later version.
3+
* The contents of this file is dual-licensed under 2
4+
* alternative Open Source/Free licenses: LGPL 2.1 or later and
5+
* Apache License 2.0. (starting with JNA version 4.0.0).
76
*
8-
* This library is distributed in the hope that it will be useful,
9-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
10-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11-
* Lesser General Public License for more details.
7+
* You can freely decide which license you want to apply to
8+
* the project.
9+
*
10+
* You may obtain a copy of the LGPL License at:
11+
*
12+
* http://www.gnu.org/licenses/licenses.html
13+
*
14+
* A copy is also included in the downloadable source code package
15+
* containing JNA, in file "LGPL2.1".
16+
*
17+
* You may obtain a copy of the Apache License at:
18+
*
19+
* http://www.apache.org/licenses/
20+
*
21+
* A copy is also included in the downloadable source code package
22+
* containing JNA, in file "AL2.0".
1223
*/
1324
package com.sun.jna.platform;
1425
import java.awt.Graphics2D;

‎contrib/platform/test/com/sun/jna/platform/TestNativeLoad.java

-12
This file was deleted.

‎contrib/platform/test/com/sun/jna/platform/WindowUtilsTest.java

+19-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
11
/* Copyright (c) 2007-2008 Timothy Wall, All Rights Reserved
22
*
3-
* This library is free software; you can redistribute it and/or
4-
* modify it under the terms of the GNU Lesser General Public
5-
* License as published by the Free Software Foundation; either
6-
* version 2.1 of the License, or (at your option) any later version.
3+
* The contents of this file is dual-licensed under 2
4+
* alternative Open Source/Free licenses: LGPL 2.1 or later and
5+
* Apache License 2.0. (starting with JNA version 4.0.0).
76
*
8-
* This library is distributed in the hope that it will be useful,
9-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
10-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11-
* Lesser General Public License for more details.
7+
* You can freely decide which license you want to apply to
8+
* the project.
9+
*
10+
* You may obtain a copy of the LGPL License at:
11+
*
12+
* http://www.gnu.org/licenses/licenses.html
13+
*
14+
* A copy is also included in the downloadable source code package
15+
* containing JNA, in file "LGPL2.1".
16+
*
17+
* You may obtain a copy of the Apache License at:
18+
*
19+
* http://www.apache.org/licenses/
20+
*
21+
* A copy is also included in the downloadable source code package
22+
* containing JNA, in file "AL2.0".
1223
*/
1324
package com.sun.jna.platform;
1425

‎contrib/platform/test/com/sun/jna/platform/mac/SystemBTest.java

+19-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
1-
/*
2-
* Copyright (c) 2015 Daniel Widdis
1+
/* Copyright (c) 2015 Daniel Widdis
32
*
4-
* This program is free software: you can redistribute it and/or modify
5-
* it under the terms of the GNU Lesser General Public License as published by
6-
* the Free Software Foundation, either version 3 of the License, or
7-
* (at your option) any later version.
3+
* The contents of this file is dual-licensed under 2
4+
* alternative Open Source/Free licenses: LGPL 2.1 or later and
5+
* Apache License 2.0. (starting with JNA version 4.0.0).
86
*
9-
* This program is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
* GNU Lesser General Public License for more details.
7+
* You can freely decide which license you want to apply to
8+
* the project.
139
*
14-
* You should have received a copy of the GNU Lesser General Public License
15-
* version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
10+
* You may obtain a copy of the LGPL License at:
11+
*
12+
* http://www.gnu.org/licenses/licenses.html
13+
*
14+
* A copy is also included in the downloadable source code package
15+
* containing JNA, in file "LGPL2.1".
16+
*
17+
* You may obtain a copy of the Apache License at:
18+
*
19+
* http://www.apache.org/licenses/
20+
*
21+
* A copy is also included in the downloadable source code package
22+
* containing JNA, in file "AL2.0".
1623
*/
1724
package com.sun.jna.platform.mac;
1825

‎contrib/platform/test/com/sun/jna/platform/mac/XAttrUtilTest.java

+19-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
11
/* Copyright (c) 2014 Reinhard Pointner, All Rights Reserved
22
*
3-
* This library is free software; you can redistribute it and/or
4-
* modify it under the terms of the GNU Lesser General Public
5-
* License as published by the Free Software Foundation; either
6-
* version 2.1 of the License, or (at your option) any later version.
3+
* The contents of this file is dual-licensed under 2
4+
* alternative Open Source/Free licenses: LGPL 2.1 or later and
5+
* Apache License 2.0. (starting with JNA version 4.0.0).
76
*
8-
* This library is distributed in the hope that it will be useful,
9-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
10-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11-
* Lesser General Public License for more details.
7+
* You can freely decide which license you want to apply to
8+
* the project.
9+
*
10+
* You may obtain a copy of the LGPL License at:
11+
*
12+
* http://www.gnu.org/licenses/licenses.html
13+
*
14+
* A copy is also included in the downloadable source code package
15+
* containing JNA, in file "LGPL2.1".
16+
*
17+
* You may obtain a copy of the Apache License at:
18+
*
19+
* http://www.apache.org/licenses/
20+
*
21+
* A copy is also included in the downloadable source code package
22+
* containing JNA, in file "AL2.0".
1223
*/
1324
package com.sun.jna.platform.mac;
1425

‎contrib/platform/test/com/sun/jna/platform/unix/AbstractUnixTestSupport.java

+20-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
11
/* Copyright (c) 2015 Goldstein Lyor, All Rights Reserved
22
*
3-
* This library is free software; you can redistribute it and/or
4-
* modify it under the terms of the GNU Lesser General Public
5-
* License as published by the Free Software Foundation; either
6-
* version 2.1 of the License, or (at your option) any later version.
7-
*
8-
* This library is distributed in the hope that it will be useful,
9-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
10-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11-
* Lesser General Public License for more details.
3+
* The contents of this file is dual-licensed under 2
4+
* alternative Open Source/Free licenses: LGPL 2.1 or later and
5+
* Apache License 2.0. (starting with JNA version 4.0.0).
6+
*
7+
* You can freely decide which license you want to apply to
8+
* the project.
9+
*
10+
* You may obtain a copy of the LGPL License at:
11+
*
12+
* http://www.gnu.org/licenses/licenses.html
13+
*
14+
* A copy is also included in the downloadable source code package
15+
* containing JNA, in file "LGPL2.1".
16+
*
17+
* You may obtain a copy of the Apache License at:
18+
*
19+
* http://www.apache.org/licenses/
20+
*
21+
* A copy is also included in the downloadable source code package
22+
* containing JNA, in file "AL2.0".
1223
*/
1324
package com.sun.jna.platform.unix;
1425

0 commit comments

Comments
 (0)