From 138699e20304399a08b1d1b9a1364f981f7c3497 Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Sun, 4 Dec 2016 21:23:54 -0700 Subject: [PATCH] fix build regression and add copyright headers --- classpath/java/lang/invoke/CallSite.java | 10 ++++ .../invoke/LambdaConversionException.java | 10 ++++ .../java/lang/invoke/LambdaMetafactory.java | 10 ++++ classpath/java/lang/invoke/MethodHandle.java | 16 +++++-- classpath/java/lang/invoke/MethodHandles.java | 10 ++++ classpath/java/lang/invoke/MethodType.java | 10 ++++ .../java/lang/invoke/SerializedLambda.java | 48 +++++++++++++++++++ 7 files changed, 111 insertions(+), 3 deletions(-) create mode 100644 classpath/java/lang/invoke/SerializedLambda.java diff --git a/classpath/java/lang/invoke/CallSite.java b/classpath/java/lang/invoke/CallSite.java index a78ed5dcd2..806ac6e5ee 100644 --- a/classpath/java/lang/invoke/CallSite.java +++ b/classpath/java/lang/invoke/CallSite.java @@ -1,3 +1,13 @@ +/* Copyright (c) 2008-2016, Avian Contributors + + Permission to use, copy, modify, and/or distribute this software + for any purpose with or without fee is hereby granted, provided + that the above copyright notice and this permission notice appear + in all copies. + + There is NO WARRANTY for this software. See license.txt for + details. */ + package java.lang.invoke; public class CallSite { diff --git a/classpath/java/lang/invoke/LambdaConversionException.java b/classpath/java/lang/invoke/LambdaConversionException.java index 4502b1c7d8..bbc4aa131c 100644 --- a/classpath/java/lang/invoke/LambdaConversionException.java +++ b/classpath/java/lang/invoke/LambdaConversionException.java @@ -1,3 +1,13 @@ +/* Copyright (c) 2008-2016, Avian Contributors + + Permission to use, copy, modify, and/or distribute this software + for any purpose with or without fee is hereby granted, provided + that the above copyright notice and this permission notice appear + in all copies. + + There is NO WARRANTY for this software. See license.txt for + details. */ + package java.lang.invoke; public class LambdaConversionException extends java.lang.Exception { diff --git a/classpath/java/lang/invoke/LambdaMetafactory.java b/classpath/java/lang/invoke/LambdaMetafactory.java index 4752b35d68..a4d0b0e003 100644 --- a/classpath/java/lang/invoke/LambdaMetafactory.java +++ b/classpath/java/lang/invoke/LambdaMetafactory.java @@ -1,3 +1,13 @@ +/* Copyright (c) 2008-2016, Avian Contributors + + Permission to use, copy, modify, and/or distribute this software + for any purpose with or without fee is hereby granted, provided + that the above copyright notice and this permission notice appear + in all copies. + + There is NO WARRANTY for this software. See license.txt for + details. */ + package java.lang.invoke; import static avian.Stream.write1; diff --git a/classpath/java/lang/invoke/MethodHandle.java b/classpath/java/lang/invoke/MethodHandle.java index c676cadeed..bbb5cabdec 100644 --- a/classpath/java/lang/invoke/MethodHandle.java +++ b/classpath/java/lang/invoke/MethodHandle.java @@ -1,3 +1,13 @@ +/* Copyright (c) 2008-2016, Avian Contributors + + Permission to use, copy, modify, and/or distribute this software + for any purpose with or without fee is hereby granted, provided + that the above copyright notice and this permission notice appear + in all copies. + + There is NO WARRANTY for this software. See license.txt for + details. */ + package java.lang.invoke; import avian.Classes; @@ -6,12 +16,12 @@ import avian.SystemClassLoader; public class MethodHandle { static final int REF_invokeStatic = 6; static final int REF_invokeSpecial = 7; - + final int kind; private final ClassLoader loader; final avian.VMMethod method; private volatile MethodType type; - + MethodHandle(int kind, ClassLoader loader, avian.VMMethod method) { this.kind = kind; this.loader = loader; @@ -44,7 +54,7 @@ public class MethodHandle { sb.append(Classes.makeString(method.spec, 0, method.spec.length - 1)); return sb.toString(); - } + } public MethodType type() { if (type == null) { diff --git a/classpath/java/lang/invoke/MethodHandles.java b/classpath/java/lang/invoke/MethodHandles.java index f17c05daab..b4af275a5c 100644 --- a/classpath/java/lang/invoke/MethodHandles.java +++ b/classpath/java/lang/invoke/MethodHandles.java @@ -1,3 +1,13 @@ +/* Copyright (c) 2008-2016, Avian Contributors + + Permission to use, copy, modify, and/or distribute this software + for any purpose with or without fee is hereby granted, provided + that the above copyright notice and this permission notice appear + in all copies. + + There is NO WARRANTY for this software. See license.txt for + details. */ + package java.lang.invoke; public class MethodHandles { diff --git a/classpath/java/lang/invoke/MethodType.java b/classpath/java/lang/invoke/MethodType.java index 9c866e574f..4ac62810f5 100644 --- a/classpath/java/lang/invoke/MethodType.java +++ b/classpath/java/lang/invoke/MethodType.java @@ -1,3 +1,13 @@ +/* Copyright (c) 2008-2016, Avian Contributors + + Permission to use, copy, modify, and/or distribute this software + for any purpose with or without fee is hereby granted, provided + that the above copyright notice and this permission notice appear + in all copies. + + There is NO WARRANTY for this software. See license.txt for + details. */ + package java.lang.invoke; import static avian.Assembler.*; diff --git a/classpath/java/lang/invoke/SerializedLambda.java b/classpath/java/lang/invoke/SerializedLambda.java new file mode 100644 index 0000000000..4f7bb32c7c --- /dev/null +++ b/classpath/java/lang/invoke/SerializedLambda.java @@ -0,0 +1,48 @@ +/* Copyright (c) 2008-2016, Avian Contributors + + Permission to use, copy, modify, and/or distribute this software + for any purpose with or without fee is hereby granted, provided + that the above copyright notice and this permission notice appear + in all copies. + + There is NO WARRANTY for this software. See license.txt for + details. */ + +package java.lang.invoke; + +public class SerializedLambda implements java.io.Serializable { + public int getImplMethodKind() { + // todo + return 0; + } + + public String getImplClass() { + // todo + return null; + } + + public String getImplMethodName() { + // todo + return null; + } + + public String getImplMethodSignature() { + // todo + return null; + } + + public String getFunctionalInterfaceClass() { + // todo + return null; + } + + public String getFunctionalInterfaceMethodName() { + // todo + return null; + } + + public String getFunctionalInterfaceMethodSignature() { + // todo + return null; + } +}