From 78e6ce4e937945e4c5e39d193942c2b45ac0835f Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Mon, 4 May 2015 13:58:10 +1000 Subject: [PATCH 1/2] Add omitted copyright headers, update to 2015 --- .../java8/wrappers/IteratorPrimitiveDoubleWrapper.java | 3 +++ .../compat/java8/wrappers/IteratorPrimitiveIntWrapper.java | 3 +++ .../compat/java8/wrappers/IteratorPrimitiveLongWrapper.java | 3 +++ src/main/scala/scala/compat/java8/FutureConverters.scala | 3 +++ src/main/scala/scala/compat/java8/OptionConverters.scala | 3 +++ .../scala/compat/java8/PrimitiveIteratorConversions.scala | 5 +++-- .../scala/scala/concurrent/java8/FutureConvertersImpl.scala | 3 +++ src/test/java/scala/compat/java8/BoxingTest.java | 2 +- src/test/java/scala/compat/java8/FutureConvertersTest.java | 3 +++ src/test/java/scala/compat/java8/LambdaTest.java | 2 +- src/test/java/scala/compat/java8/OptionConvertersTest.scala | 3 +++ src/test/java/scala/compat/java8/SpecializedFactoryTest.java | 3 +++ src/test/java/scala/compat/java8/SpecializedTest.scala | 3 +++ src/test/java/scala/compat/java8/SpecializedTestSupport.java | 3 +++ 14 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveDoubleWrapper.java b/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveDoubleWrapper.java index 36f9fa9..7c27293 100644 --- a/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveDoubleWrapper.java +++ b/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveDoubleWrapper.java @@ -1,3 +1,6 @@ +/* + * Copyright (C) 2012-2015 Typesafe Inc. + */ package scala.compat.java8.wrappers; public class IteratorPrimitiveDoubleWrapper implements java.util.PrimitiveIterator.OfDouble { diff --git a/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveIntWrapper.java b/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveIntWrapper.java index 91753ae..330a41c 100644 --- a/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveIntWrapper.java +++ b/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveIntWrapper.java @@ -1,3 +1,6 @@ +/* + * Copyright (C) 2012-2015 Typesafe Inc. + */ package scala.compat.java8.wrappers; public class IteratorPrimitiveIntWrapper implements java.util.PrimitiveIterator.OfInt { diff --git a/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveLongWrapper.java b/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveLongWrapper.java index c332358..9adff5f 100644 --- a/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveLongWrapper.java +++ b/src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveLongWrapper.java @@ -1,3 +1,6 @@ +/* + * Copyright (C) 2012-2015 Typesafe Inc. + */ package scala.compat.java8.wrappers; public class IteratorPrimitiveLongWrapper implements java.util.PrimitiveIterator.OfLong { diff --git a/src/main/scala/scala/compat/java8/FutureConverters.scala b/src/main/scala/scala/compat/java8/FutureConverters.scala index e4dbe90..86fdddf 100644 --- a/src/main/scala/scala/compat/java8/FutureConverters.scala +++ b/src/main/scala/scala/compat/java8/FutureConverters.scala @@ -1,3 +1,6 @@ +/* + * Copyright (C) 2012-2015 Typesafe Inc. + */ package scala.compat.java8 import scala.concurrent.java8.FuturesConvertersImpl._ diff --git a/src/main/scala/scala/compat/java8/OptionConverters.scala b/src/main/scala/scala/compat/java8/OptionConverters.scala index 5161d4e..b99529a 100644 --- a/src/main/scala/scala/compat/java8/OptionConverters.scala +++ b/src/main/scala/scala/compat/java8/OptionConverters.scala @@ -1,3 +1,6 @@ +/* + * Copyright (C) 2012-2015 Typesafe Inc. + */ package scala.compat.java8 import language.implicitConversions diff --git a/src/main/scala/scala/compat/java8/PrimitiveIteratorConversions.scala b/src/main/scala/scala/compat/java8/PrimitiveIteratorConversions.scala index 61ca1a4..68d4394 100644 --- a/src/main/scala/scala/compat/java8/PrimitiveIteratorConversions.scala +++ b/src/main/scala/scala/compat/java8/PrimitiveIteratorConversions.scala @@ -1,3 +1,6 @@ +/* + * Copyright (C) 2012-2015 Typesafe Inc. + */ package scala.compat.java8 import language.implicitConversions @@ -104,5 +107,3 @@ object PrimitiveIteratorConverters { def asPrimitive[That](implicit specOp: SpecializerOfIterators[A, That]): That = specOp.fromScala(underlying) } } - - diff --git a/src/main/scala/scala/concurrent/java8/FutureConvertersImpl.scala b/src/main/scala/scala/concurrent/java8/FutureConvertersImpl.scala index ce9c316..14a917f 100644 --- a/src/main/scala/scala/concurrent/java8/FutureConvertersImpl.scala +++ b/src/main/scala/scala/concurrent/java8/FutureConvertersImpl.scala @@ -1,3 +1,6 @@ +/* + * Copyright (C) 2012-2015 Typesafe Inc. + */ package scala.concurrent.java8 // Located in this package to access private[concurrent] members diff --git a/src/test/java/scala/compat/java8/BoxingTest.java b/src/test/java/scala/compat/java8/BoxingTest.java index 7558c43..7074882 100644 --- a/src/test/java/scala/compat/java8/BoxingTest.java +++ b/src/test/java/scala/compat/java8/BoxingTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 Typesafe Inc. + * Copyright (C) 2012-2015 Typesafe Inc. */ package scala.compat.java8; diff --git a/src/test/java/scala/compat/java8/FutureConvertersTest.java b/src/test/java/scala/compat/java8/FutureConvertersTest.java index ae64bed..d7fc1f2 100644 --- a/src/test/java/scala/compat/java8/FutureConvertersTest.java +++ b/src/test/java/scala/compat/java8/FutureConvertersTest.java @@ -1,3 +1,6 @@ +/* + * Copyright (C) 2012-2015 Typesafe Inc. + */ package scala.compat.java8; import java.util.concurrent.CompletableFuture; diff --git a/src/test/java/scala/compat/java8/LambdaTest.java b/src/test/java/scala/compat/java8/LambdaTest.java index adf9971..c626083 100644 --- a/src/test/java/scala/compat/java8/LambdaTest.java +++ b/src/test/java/scala/compat/java8/LambdaTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 Typesafe Inc. + * Copyright (C) 2012-2015 Typesafe Inc. */ package scala.compat.java8; diff --git a/src/test/java/scala/compat/java8/OptionConvertersTest.scala b/src/test/java/scala/compat/java8/OptionConvertersTest.scala index e284cfc..0b857c3 100644 --- a/src/test/java/scala/compat/java8/OptionConvertersTest.scala +++ b/src/test/java/scala/compat/java8/OptionConvertersTest.scala @@ -1,3 +1,6 @@ +/* + * Copyright (C) 2012-2015 Typesafe Inc. + */ package scala.compat.java8 import org.junit.Test diff --git a/src/test/java/scala/compat/java8/SpecializedFactoryTest.java b/src/test/java/scala/compat/java8/SpecializedFactoryTest.java index 192ef82..2e83412 100644 --- a/src/test/java/scala/compat/java8/SpecializedFactoryTest.java +++ b/src/test/java/scala/compat/java8/SpecializedFactoryTest.java @@ -1,3 +1,6 @@ +/* + * Copyright (C) 2012-2015 Typesafe Inc. + */ package scala.compat.java8; import org.junit.Test; diff --git a/src/test/java/scala/compat/java8/SpecializedTest.scala b/src/test/java/scala/compat/java8/SpecializedTest.scala index 38998d3..564ef76 100644 --- a/src/test/java/scala/compat/java8/SpecializedTest.scala +++ b/src/test/java/scala/compat/java8/SpecializedTest.scala @@ -1,3 +1,6 @@ +/* + * Copyright (C) 2012-2015 Typesafe Inc. + */ package scala.compat.java8 import org.junit.Test diff --git a/src/test/java/scala/compat/java8/SpecializedTestSupport.java b/src/test/java/scala/compat/java8/SpecializedTestSupport.java index 201e632..8309f26 100644 --- a/src/test/java/scala/compat/java8/SpecializedTestSupport.java +++ b/src/test/java/scala/compat/java8/SpecializedTestSupport.java @@ -1,3 +1,6 @@ +/* + * Copyright (C) 2012-2015 Typesafe Inc. + */ package scala.compat.java8; import java.util.Arrays; From 9eda2f057658c3a2b77643d6a4ba3092f9b592be Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Mon, 4 May 2015 14:03:46 +1000 Subject: [PATCH 2/2] Update year in generated copyright header --- project/CodeGen.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/CodeGen.scala b/project/CodeGen.scala index 47e21b2..0e0234c 100644 --- a/project/CodeGen.scala +++ b/project/CodeGen.scala @@ -288,7 +288,7 @@ object CodeGen { private val copyright = """ |/* - | * Copyright (C) 2012-2014 Typesafe Inc. + | * Copyright (C) 2012-2015 Typesafe Inc. | */""".stripMargin.trim private def function0SpecMethods = {