Skip to content

Commit 1032a95

Browse files
stelfrichstelfrich
committed
Fix license headers
1 parent 3e5687c commit 1032a95

4 files changed

Lines changed: 48 additions & 32 deletions

File tree

‎src/main/java/net/imagej/table/CommonsCSVTableIOPlugin.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
/*
22
* #%L
3-
* SciJava Common shared library for SciJava software.
3+
* ImageJ software for multidimensional image processing and analysis.
44
* %%
5-
* Copyright (C) 2009 - 2016 Board of Regents of the University of
6-
* Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
7-
* Institute of Molecular Cell Biology and Genetics.
5+
* Copyright (C) 2017 Board of Regents of the University of
6+
* Wisconsin-Madison and University of Konstanz.
87
* %%
98
* Redistribution and use in source and binary forms, with or without
109
* modification, are permitted provided that the following conditions are met:

‎src/main/java/net/imagej/table/DefaultTableIOPlugin.java‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
11
/*
22
* #%L
3-
* ImageJ server for RESTful access to ImageJ.
3+
* ImageJ software for multidimensional image processing and analysis.
44
* %%
5-
* Copyright (C) 2013 - 2016 Board of Regents of the University of
6-
* Wisconsin-Madison.
5+
* Copyright (C) 2017 Board of Regents of the University of
6+
* Wisconsin-Madison and University of Konstanz.
77
* %%
8-
* Licensed under the Apache License, Version 2.0 (the "License");
9-
* you may not use this file except in compliance with the License.
10-
* You may obtain a copy of the License at
8+
* Redistribution and use in source and binary forms, with or without
9+
* modification, are permitted provided that the following conditions are met:
1110
*
12-
* http://www.apache.org/licenses/LICENSE-2.0
11+
* 1. Redistributions of source code must retain the above copyright notice,
12+
* this list of conditions and the following disclaimer.
13+
* 2. Redistributions in binary form must reproduce the above copyright notice,
14+
* this list of conditions and the following disclaimer in the documentation
15+
* and/or other materials provided with the distribution.
1316
*
14-
* Unless required by applicable law or agreed to in writing, software
15-
* distributed under the License is distributed on an "AS IS" BASIS,
16-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
* See the License for the specific language governing permissions and
18-
* limitations under the License.
17+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
18+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
19+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
20+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
21+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
22+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
23+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
25+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27+
* POSSIBILITY OF SUCH DAMAGE.
1928
* #L%
2029
*/
2130

‎src/test/java/net/imagej/table/CommonsCSVTableIOPluginTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
/*
22
* #%L
3-
* SciJava Common shared library for SciJava software.
3+
* ImageJ software for multidimensional image processing and analysis.
44
* %%
5-
* Copyright (C) 2009 - 2016 Board of Regents of the University of
6-
* Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
7-
* Institute of Molecular Cell Biology and Genetics.
5+
* Copyright (C) 2017 Board of Regents of the University of
6+
* Wisconsin-Madison and University of Konstanz.
87
* %%
98
* Redistribution and use in source and binary forms, with or without
109
* modification, are permitted provided that the following conditions are met:

‎src/test/java/net/imagej/table/DefaultTableIOPluginTest.java‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
11
/*
22
* #%L
3-
* ImageJ server for RESTful access to ImageJ.
3+
* ImageJ software for multidimensional image processing and analysis.
44
* %%
5-
* Copyright (C) 2013 - 2016 Board of Regents of the University of
6-
* Wisconsin-Madison.
5+
* Copyright (C) 2017 Board of Regents of the University of
6+
* Wisconsin-Madison and University of Konstanz.
77
* %%
8-
* Licensed under the Apache License, Version 2.0 (the "License");
9-
* you may not use this file except in compliance with the License.
10-
* You may obtain a copy of the License at
8+
* Redistribution and use in source and binary forms, with or without
9+
* modification, are permitted provided that the following conditions are met:
1110
*
12-
* http://www.apache.org/licenses/LICENSE-2.0
11+
* 1. Redistributions of source code must retain the above copyright notice,
12+
* this list of conditions and the following disclaimer.
13+
* 2. Redistributions in binary form must reproduce the above copyright notice,
14+
* this list of conditions and the following disclaimer in the documentation
15+
* and/or other materials provided with the distribution.
1316
*
14-
* Unless required by applicable law or agreed to in writing, software
15-
* distributed under the License is distributed on an "AS IS" BASIS,
16-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
* See the License for the specific language governing permissions and
18-
* limitations under the License.
17+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
18+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
19+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
20+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
21+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
22+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
23+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
25+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27+
* POSSIBILITY OF SUCH DAMAGE.
1928
* #L%
2029
*/
2130

0 commit comments

Comments
 (0)