Make generic type parameters internal

dart-lang · Sep 23, 2024 · 1aba180 · 1aba180
1 parent 6dc1586
commit 1aba180
Show file tree

Hide file tree

Showing 17 changed files with 389 additions and 10 deletions.
diff --git a/pkgs/jni/lib/src/jarray.dart b/pkgs/jni/lib/src/jarray.dart
@@ -7,6 +7,7 @@
 part of 'types.dart';
 
 final class JArrayType<E> extends JObjType<JArray<E>> {
+  @internal
   final JArrayElementType<E> elementType;
 
   @internal
@@ -42,6 +43,7 @@ final class JArrayType<E> extends JObjType<JArray<E>> {
 }
 
 class JArray<E> extends JObject {
+  @internal
   final JArrayElementType<E> elementType;
 
   @internal

diff --git a/pkgs/jni/lib/src/util/jiterator.dart b/pkgs/jni/lib/src/util/jiterator.dart
@@ -9,6 +9,7 @@ import '../jreference.dart';
 import '../types.dart';
 
 final class JIteratorType<$E extends JObject> extends JObjType<JIterator<$E>> {
+  @internal
   final JObjType<$E> E;
 
   @internal
@@ -50,6 +51,7 @@ class JIterator<$E extends JObject> extends JObject implements Iterator<$E> {
   // ignore: overridden_fields
   final JObjType<JIterator<$E>> $type;
 
+  @internal
   final JObjType<$E> E;
 
   JIterator.fromReference(

diff --git a/pkgs/jni/lib/src/util/jlist.dart b/pkgs/jni/lib/src/util/jlist.dart
@@ -15,6 +15,7 @@ import 'jiterator.dart';
 import 'jset.dart';
 
 final class JListType<$E extends JObject> extends JObjType<JList<$E>> {
+  @internal
   final JObjType<$E> E;
 
   @internal
@@ -52,8 +53,9 @@ class JList<$E extends JObject> extends JObject with ListMixin<$E> {
   @internal
   @override
   // ignore: overridden_fields
-  final JObjType<JList> $type;
+  final JObjType<JList<$E>> $type;
 
+  @internal
   final JObjType<$E> E;
 
   JList.fromReference(

diff --git a/pkgs/jni/lib/src/util/jmap.dart b/pkgs/jni/lib/src/util/jmap.dart
@@ -13,7 +13,10 @@ import 'jset.dart';
 
 final class JMapType<$K extends JObject, $V extends JObject>
     extends JObjType<JMap<$K, $V>> {
+  @internal
   final JObjType<$K> K;
+
+  @internal
   final JObjType<$V> V;
 
   @internal
@@ -56,9 +59,12 @@ class JMap<$K extends JObject, $V extends JObject> extends JObject
   @internal
   @override
   // ignore: overridden_fields
-  final JObjType<JMap> $type;
+  final JObjType<JMap<$K, $V>> $type;
 
+  @internal
   final JObjType<$K> K;
+
+  @internal
   final JObjType<$V> V;
 
   JMap.fromReference(

diff --git a/pkgs/jni/lib/src/util/jset.dart b/pkgs/jni/lib/src/util/jset.dart
@@ -13,6 +13,7 @@ import '../types.dart';
 import 'jiterator.dart';
 
 final class JSetType<$E extends JObject> extends JObjType<JSet<$E>> {
+  @internal
   final JObjType<$E> E;
 
   @internal
@@ -52,8 +53,9 @@ class JSet<$E extends JObject> extends JObject with SetMixin<$E> {
   @internal
   @override
   // ignore: overridden_fields
-  final JObjType<JSet> $type;
+  final JObjType<JSet<$E>> $type;
 
+  @internal
   final JObjType<$E> E;
 
   JSet.fromReference(