Skip to content

Commit 445ee6c

Browse files
authored
Rename com.xamarin.java_interop package to net.dot.jni (#1166)
The eventual plan is to move the xamarin/Java.Interop repo to dotnet/jni (timeline: unspecified), and existing Java code within dotnet/runtime (for use with .NET Android) already uses a `net.dot` package-name prefix. As "xamarin" is increasingly "persona-non-grata", *and* these types aren't actually used publicly -- .NET Android née Xamarin.Android has it's own set of `mono.android` types -- we can safely rename the `com.xamarin.java_interop` and related packages to instead use a `net.dot.jni` prefix.
1 parent 25850ba commit 445ee6c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+128
-110
lines changed

src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ void GenerateHeader (TextWriter sw)
722722
sw.Write ("\t\t");
723723
switch (CodeGenerationTarget) {
724724
case JavaPeerStyle.JavaInterop1:
725-
sw.Write ("com.xamarin.java_interop.GCUserPeerable");
725+
sw.Write ("net.dot.jni.GCUserPeerable");
726726
break;
727727
default:
728728
sw.Write ("mono.android.IGCUserPeer");
@@ -823,7 +823,7 @@ void GenerateRegisterType (TextWriter sw, JavaCallableWrapperGenerator self, str
823823
sw.Write ("\t\t");
824824
switch (CodeGenerationTarget) {
825825
case JavaPeerStyle.JavaInterop1:
826-
sw.Write ("com.xamarin.java_interop.ManagedPeer.registerNativeMembers (");
826+
sw.Write ("net.dot.jni.ManagedPeer.registerNativeMembers (");
827827
sw.Write (self.name);
828828
sw.Write (".class, \"");
829829
sw.Write (managedTypeName);
@@ -1024,7 +1024,7 @@ void GenerateConstructor (Signature ctor, TextWriter sw)
10241024
sw.Write ("\t\t\t");
10251025
switch (CodeGenerationTarget) {
10261026
case JavaPeerStyle.JavaInterop1:
1027-
sw.Write ("com.xamarin.java_interop.ManagedPeer.construct (this, \"");
1027+
sw.Write ("net.dot.jni.ManagedPeer.construct (this, \"");
10281028
sw.Write (type.GetPartialAssemblyQualifiedName (cache));
10291029
sw.Write ("\", \"");
10301030
sw.Write (ctor.ManagedParameters);

src/Java.Interop/Java.Interop.targets

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<ItemGroup>
4-
<CompileJavaInteropJar Include="java\com\xamarin\java_interop\internal\JavaProxyObject.java" />
5-
<CompileJavaInteropJar Include="java\com\xamarin\java_interop\internal\JavaProxyThrowable.java" />
6-
<CompileJavaInteropJar Include="java\com\xamarin\java_interop\GCUserPeerable.java" />
7-
<CompileJavaInteropJar Include="java\com\xamarin\java_interop\ManagedPeer.java" />
4+
<CompileJavaInteropJar Include="java\net\dot\jni\internal\JavaProxyObject.java" />
5+
<CompileJavaInteropJar Include="java\net\dot\jni\internal\JavaProxyThrowable.java" />
6+
<CompileJavaInteropJar Include="java\net\dot\jni\GCUserPeerable.java" />
7+
<CompileJavaInteropJar Include="java\net\dot\jni\ManagedPeer.java" />
88
</ItemGroup>
99
<ItemGroup>
1010
<Content Include="$(OutputPath)java-interop.jar">

src/Java.Interop/Java.Interop/JavaProxyObject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Java.Interop {
99
[JniTypeSignature (JniTypeName)]
1010
sealed class JavaProxyObject : JavaObject, IEquatable<JavaProxyObject>
1111
{
12-
internal const string JniTypeName = "com/xamarin/java_interop/internal/JavaProxyObject";
12+
internal const string JniTypeName = "net/dot/jni/internal/JavaProxyObject";
1313

1414
static readonly JniPeerMembers _members = new JniPeerMembers (JniTypeName, typeof (JavaProxyObject));
1515
static readonly ConditionalWeakTable<object, JavaProxyObject> CachedValues = new ConditionalWeakTable<object, JavaProxyObject> ();

src/Java.Interop/Java.Interop/JavaProxyThrowable.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Java.Interop {
77
[JniTypeSignature (JniTypeName)]
88
sealed class JavaProxyThrowable : JavaException
99
{
10-
new internal const string JniTypeName = "com/xamarin/java_interop/internal/JavaProxyThrowable";
10+
new internal const string JniTypeName = "net/dot/jni/internal/JavaProxyThrowable";
1111

1212
public Exception Exception {get; private set;}
1313

src/Java.Interop/Java.Interop/ManagedPeer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace Java.Interop {
1414
[JniTypeSignature (JniTypeName)]
1515
/* static */ sealed class ManagedPeer : JavaObject {
1616

17-
internal const string JniTypeName = "com/xamarin/java_interop/ManagedPeer";
17+
internal const string JniTypeName = "net/dot/jni/ManagedPeer";
1818

1919

2020
static readonly JniPeerMembers _members = new JniPeerMembers (JniTypeName, typeof (ManagedPeer));

src/Java.Interop/java/com/xamarin/java_interop/GCUserPeerable.java renamed to src/Java.Interop/java/net/dot/jni/GCUserPeerable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.xamarin.java_interop;
1+
package net.dot.jni;
22

33
public interface GCUserPeerable {
44

src/Java.Interop/java/com/xamarin/java_interop/ManagedPeer.java renamed to src/Java.Interop/java/net/dot/jni/ManagedPeer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.xamarin.java_interop;
1+
package net.dot.jni;
22

33
public /* static */ final class ManagedPeer {
44
private ManagedPeer () {

src/Java.Interop/java/com/xamarin/java_interop/internal/JavaProxyObject.java renamed to src/Java.Interop/java/net/dot/jni/internal/JavaProxyObject.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
package com.xamarin.java_interop.internal;
1+
package net.dot.jni.internal;
22

33
import java.util.ArrayList;
44

5-
import com.xamarin.java_interop.GCUserPeerable;
5+
import net.dot.jni.GCUserPeerable;
66

77
/* package */ final class JavaProxyObject
88
extends java.lang.Object
99
implements GCUserPeerable
1010
{
1111
static final String assemblyQualifiedName = "Java.Interop.JavaProxyObject, Java.Interop";
1212
static {
13-
com.xamarin.java_interop.ManagedPeer.registerNativeMembers (
13+
net.dot.jni.ManagedPeer.registerNativeMembers (
1414
JavaProxyObject.class,
1515
assemblyQualifiedName,
1616
"");

src/Java.Interop/java/com/xamarin/java_interop/internal/JavaProxyThrowable.java renamed to src/Java.Interop/java/net/dot/jni/internal/JavaProxyThrowable.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
package com.xamarin.java_interop.internal;
1+
package net.dot.jni.internal;
22

33
import java.util.ArrayList;
44

5-
import com.xamarin.java_interop.GCUserPeerable;
5+
import net.dot.jni.GCUserPeerable;
66

77
/* package */ final class JavaProxyThrowable
88
extends java.lang.Error
99
implements GCUserPeerable
1010
{
1111
static final String assemblyQualifiedName = "Java.Interop.JavaProxyThrowable, Java.Interop";
1212
static {
13-
com.xamarin.java_interop.ManagedPeer.registerNativeMembers (
13+
net.dot.jni.ManagedPeer.registerNativeMembers (
1414
JavaProxyThrowable.class,
1515
assemblyQualifiedName,
1616
"");

src/java-interop/java-interop-gc-bridge-mono.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ java_interop_gc_bridge_new (JavaVM *jvm)
284284
bridge.WeakReference_class = static_cast<jclass>(lref_to_gref (env, WeakReference_class));
285285
}
286286

287-
jclass GCUserPeerable_class = env->FindClass ("com/xamarin/java_interop/GCUserPeerable");
287+
jclass GCUserPeerable_class = env->FindClass ("net/dot/jni/GCUserPeerable");
288288
if (GCUserPeerable_class) {
289289
bridge.GCUserPeerable_add = env->GetMethodID (GCUserPeerable_class, "jiAddManagedReference", "(Ljava/lang/Object;)V");
290290
bridge.GCUserPeerable_clear = env->GetMethodID (GCUserPeerable_class, "jiClearManagedReferences", "()V");

0 commit comments

Comments
 (0)