From d269a0fd331a5b84570feb175843fe0f490e22aa Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Fri, 15 Sep 2017 02:09:59 +0200 Subject: [PATCH] tracecompass' java.* EEAs (2/2) These are the ones I had to indivdually review and in many cases had to manually resolve merges; that's a PITA (and lead me to open https://github.com/lastnpe/eclipse-null-eea-augments/issues/16), thus I skipped merged java.lang.String, java.util.Collections and java.util.Map and kept my original ones, and did not merge with tracecompass' from https://github.com/tracecompass/tracecompass/tree/master/common/org.eclipse.tracecompass.common.core/annotations/java for https://github.com/lastnpe/eclipse-null-eea-augments/issues/10 --- libraries/java/java/io/File.eea | 3 +++ libraries/java/java/lang/Class.eea | 9 +++++++ libraries/java/java/lang/Integer.eea | 9 +++++++ libraries/java/java/util/Arrays.eea | 24 +++++++++++++++++++ libraries/java/java/util/Collection.eea | 6 +++++ libraries/java/java/util/Iterator.eea | 3 +++ libraries/java/java/util/List.eea | 3 +++ libraries/java/java/util/Optional.eea | 3 +++ libraries/java/java/util/TreeMap.eea | 3 +++ .../java/java/util/stream/Collectors.eea | 6 +++++ 10 files changed, 69 insertions(+) diff --git a/libraries/java/java/io/File.eea b/libraries/java/java/io/File.eea index 2dd482a4..29240942 100644 --- a/libraries/java/java/io/File.eea +++ b/libraries/java/java/io/File.eea @@ -2,3 +2,6 @@ class java/io/File getAbsolutePath ()Ljava/lang/String; ()L1java/lang/String; +getName + ()Ljava/lang/String; + ()L1java/lang/String; diff --git a/libraries/java/java/lang/Class.eea b/libraries/java/java/lang/Class.eea index 1d432187..29faa70b 100644 --- a/libraries/java/java/lang/Class.eea +++ b/libraries/java/java/lang/Class.eea @@ -2,3 +2,12 @@ class java/lang/Class getAnnotation (Ljava/lang/Class;)TA; (Ljava/lang/Class;)T0A; +getCanonicalName + ()Ljava/lang/String; + ()L0java/lang/String; +getName + ()Ljava/lang/String; + ()L1java/lang/String; +getSimpleName + ()Ljava/lang/String; + ()L1java/lang/String; diff --git a/libraries/java/java/lang/Integer.eea b/libraries/java/java/lang/Integer.eea index c7a1b69d..78e60fca 100644 --- a/libraries/java/java/lang/Integer.eea +++ b/libraries/java/java/lang/Integer.eea @@ -1,4 +1,13 @@ class java/lang/Integer +toString + ()Ljava/lang/String; + ()L1java/lang/String; toString (I)Ljava/lang/String; (I)L1java/lang/String; +toString + (II)Ljava/lang/String; + (II)L1java/lang/String; +valueOf + (I)Ljava/lang/Integer; + (I)L1java/lang/Integer; diff --git a/libraries/java/java/util/Arrays.eea b/libraries/java/java/util/Arrays.eea index 673e0d46..b93bc8ef 100644 --- a/libraries/java/java/util/Arrays.eea +++ b/libraries/java/java/util/Arrays.eea @@ -2,3 +2,27 @@ class java/util/Arrays asList ([TT;)Ljava/util/List; ([TT;)L1java/util/List; +stream + ([D)Ljava/util/stream/DoubleStream; + ([D)L1java/util/stream/DoubleStream; +stream + ([DII)Ljava/util/stream/DoubleStream; + ([DII)L1java/util/stream/DoubleStream; +stream + ([I)Ljava/util/stream/IntStream; + ([I)L1java/util/stream/IntStream; +stream + ([III)Ljava/util/stream/IntStream; + ([III)L1java/util/stream/IntStream; +stream + ([J)Ljava/util/stream/LongStream; + ([J)L1java/util/stream/LongStream; +stream + ([JII)Ljava/util/stream/LongStream; + ([JII)L1java/util/stream/LongStream; +stream + ([TT;)Ljava/util/stream/Stream; + ([TT;)L1java/util/stream/Stream; +stream + ([TT;II)Ljava/util/stream/Stream; + ([TT;II)L1java/util/stream/Stream; diff --git a/libraries/java/java/util/Collection.eea b/libraries/java/java/util/Collection.eea index c129149e..5703b57a 100644 --- a/libraries/java/java/util/Collection.eea +++ b/libraries/java/java/util/Collection.eea @@ -5,3 +5,9 @@ parallelStream stream ()Ljava/util/stream/Stream; ()Ljava/util/stream/Stream; +toArray + ()[Ljava/lang/Object; + ()[1Ljava/lang/Object; +toArray + ([TT;)[TT; + ([1TT;)[1TT; diff --git a/libraries/java/java/util/Iterator.eea b/libraries/java/java/util/Iterator.eea index 9dec3151..e86a1a6c 100644 --- a/libraries/java/java/util/Iterator.eea +++ b/libraries/java/java/util/Iterator.eea @@ -1,4 +1,7 @@ class java/util/Iterator +forEachRemaining + (Ljava/util/function/Consumer<-TE;>;)V + (L1java/util/function/Consumer<-TE;>;)V next ()TE; ()T+E; diff --git a/libraries/java/java/util/List.eea b/libraries/java/java/util/List.eea index b0e24aba..cb426576 100644 --- a/libraries/java/java/util/List.eea +++ b/libraries/java/java/util/List.eea @@ -2,3 +2,6 @@ class java/util/List get (I)TE; (I)T+E; +subList + (II)Ljava/util/List; + (II)L1java/util/List; diff --git a/libraries/java/java/util/Optional.eea b/libraries/java/java/util/Optional.eea index a11505f2..40afaba3 100644 --- a/libraries/java/java/util/Optional.eea +++ b/libraries/java/java/util/Optional.eea @@ -2,6 +2,9 @@ class java/util/Optional empty ()Ljava/util/Optional; ()L1java/util/Optional; +get + ()TT; + ()T1T; of (TT;)Ljava/util/Optional; (T1T;)L1java/util/Optional; diff --git a/libraries/java/java/util/TreeMap.eea b/libraries/java/java/util/TreeMap.eea index 7094b13e..70684704 100644 --- a/libraries/java/java/util/TreeMap.eea +++ b/libraries/java/java/util/TreeMap.eea @@ -1,4 +1,7 @@ class java/util/TreeMap +get + (Ljava/lang/Object;)TV; + (Ljava/lang/Object;)T0V; put (TK;TV;)TV; (TK;TV;)T0V; diff --git a/libraries/java/java/util/stream/Collectors.eea b/libraries/java/java/util/stream/Collectors.eea index b4578721..b4323049 100644 --- a/libraries/java/java/util/stream/Collectors.eea +++ b/libraries/java/java/util/stream/Collectors.eea @@ -1,4 +1,10 @@ class java/util/stream/Collectors +toCollection + ;>(Ljava/util/function/Supplier;)Ljava/util/stream/Collector; + ;>(Ljava/util/function/Supplier;)Ljava/util/stream/Collector; toList ()Ljava/util/stream/Collector;>; ()Ljava/util/stream/Collector;>; +toSet + ()Ljava/util/stream/Collector;>; + ()Ljava/util/stream/Collector;>;