From fcbaa982c94a195b03abeb456531711ef760e6ff Mon Sep 17 00:00:00 2001
From: Adam Welc <adam.welc@oracle.com>
Date: Wed, 21 Sep 2016 14:53:35 +0200
Subject: [PATCH] Fixed copyright and checkstyle problems.
---
.../src/com/oracle/truffle/r/library/stats/Pf.java | 3 +--
.../src/com/oracle/truffle/r/runtime/RChannel.java | 2 +-
mx.fastr/copyrights/gnu_r_ihaka_core.copyright.star | 11 +++++++++++
.../copyrights/gnu_r_ihaka_core.copyright.star.regex | 1 +
mx.fastr/copyrights/overrides | 1 +
5 files changed, 15 insertions(+), 3 deletions(-)
create mode 100644 mx.fastr/copyrights/gnu_r_ihaka_core.copyright.star
create mode 100644 mx.fastr/copyrights/gnu_r_ihaka_core.copyright.star.regex
diff --git a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/Pf.java b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/Pf.java
index e3cb4fd160..51cf4f7e06 100644
--- a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/Pf.java
+++ b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/Pf.java
@@ -4,8 +4,7 @@
* http://www.gnu.org/licenses/gpl-2.0.html
*
* Copyright (C) 1998 Ross Ihaka
- * Copyright (c) 2000--2014, The R Core Team
- * Copyright (c) 2007, The R Foundation
+ * Copyright (c) 1998--2008, The R Core Team
* Copyright (c) 2016, 2016, Oracle and/or its affiliates
*
* All rights reserved.
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RChannel.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RChannel.java
index e4b656fee5..e73a6cd2d8 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RChannel.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RChannel.java
@@ -232,7 +232,7 @@ public class RChannel {
private String[] names;
private Object[] values;
- public Bindings(String[] names, Object[] values) {
+ Bindings(String[] names, Object[] values) {
this.names = names;
this.values = values;
}
diff --git a/mx.fastr/copyrights/gnu_r_ihaka_core.copyright.star b/mx.fastr/copyrights/gnu_r_ihaka_core.copyright.star
new file mode 100644
index 0000000000..a3fa05c1df
--- /dev/null
+++ b/mx.fastr/copyrights/gnu_r_ihaka_core.copyright.star
@@ -0,0 +1,11 @@
+/*
+ * This material is distributed under the GNU General Public License
+ * Version 2. You may review the terms of this license at
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * Copyright (C) 1998 Ross Ihaka
+ * Copyright (c) 1998--2012, The R Core Team
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates
+ *
+ * All rights reserved.
+ */
diff --git a/mx.fastr/copyrights/gnu_r_ihaka_core.copyright.star.regex b/mx.fastr/copyrights/gnu_r_ihaka_core.copyright.star.regex
new file mode 100644
index 0000000000..f6aa3d2ffe
--- /dev/null
+++ b/mx.fastr/copyrights/gnu_r_ihaka_core.copyright.star.regex
@@ -0,0 +1 @@
+/\*\n \* This material is distributed under the GNU General Public License\n \* Version 2. You may review the terms of this license at\n \* http://www.gnu.org/licenses/gpl-2.0.html\n \*\n \* Copyright \(C\) 1998 Ross Ihaka\n \* Copyright \(c\) (?:[1-2][09][0-9][0-9]--)?[1-2][09][0-9][0-9], The R Core Team\n \* Copyright \(c\) (?:(20[0-9][0-9]), )?(20[0-9][0-9]), Oracle and/or its affiliates\n \*\n \* All rights reserved.\n \*/\n.*
diff --git a/mx.fastr/copyrights/overrides b/mx.fastr/copyrights/overrides
index fd1295fb43..64b8ada44c 100644
--- a/mx.fastr/copyrights/overrides
+++ b/mx.fastr/copyrights/overrides
@@ -37,6 +37,7 @@ com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/MathConstant
com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/MathInit.java,gnu_r.core.copyright
com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/Pbeta.java,gnu_r.core.copyright
com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/Pbinom.java,gnu_r_ihaka.copyright
+com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/Pf.java,gnu_r_ihaka_core.copyright
com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/Pnorm.java,gnu_r_ihaka.copyright
com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/Qbinom.java,gnu_r_ihaka.copyright
com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/Qnorm.java,gnu_r_ihaka.copyright
--
GitLab