Extra fix

masesdevelopers · Sep 2, 2024 · a7871a3 · a7871a3
1 parent 315c5b1
commit a7871a3
Show file tree

Hide file tree

Showing 4 changed files with 115 additions and 26 deletions.
diff --git a/src/net/JNet.sln b/src/net/JNet.sln
@@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JNetPS", "JNetPS\JNetPS.csp
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JNetPSCore", "JNetPSCore\JNetPSCore.csproj", "{071F6CA5-0159-44B3-9670-9404A5B75D65}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JNetCore", "JNet\JNetCore.csproj", "{CA9A182E-F0A5-4A48-AB00-C5E70BA243F9}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -47,10 +45,6 @@ Global
 		{071F6CA5-0159-44B3-9670-9404A5B75D65}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{071F6CA5-0159-44B3-9670-9404A5B75D65}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{071F6CA5-0159-44B3-9670-9404A5B75D65}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CA9A182E-F0A5-4A48-AB00-C5E70BA243F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CA9A182E-F0A5-4A48-AB00-C5E70BA243F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CA9A182E-F0A5-4A48-AB00-C5E70BA243F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CA9A182E-F0A5-4A48-AB00-C5E70BA243F9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/net/JNet/JNet.csproj b/src/net/JNet/JNet.csproj
@@ -51,15 +51,11 @@
 		<None Remove="Developed\Java\Lang\*Exception.cs" />
 	</ItemGroup>
 	<ItemGroup>
-	  <Compile Remove="JNetCoreBase.cs" />
-	  <Compile Remove="Specific\**" />
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="JNetCore.csproj">
+		<PackageReference Include="MASES.CLIParser" Version="3.2.1" />
+		<PackageReference Include="MASES.JCOBridge" Version="2.5.17">
 			<IncludeAssets>All</IncludeAssets>
 			<PrivateAssets>None</PrivateAssets>
-		</ProjectReference>
-		<PackageReference Include="MASES.CLIParser" Version="3.2.1" />
+		</PackageReference>
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
 	</ItemGroup>
 </Project>
diff --git a/src/net/JNet/JNetCore.csproj b/src/net/JNet/JNetCore.csproj
@@ -54,26 +54,125 @@
 		<Compile Remove="Generated\Org\**" />
 		<Compile Remove="JNetCore.cs" />
 		<Compile Include="Developed\Java\Lang\*.cs" />
-		<Compile Include="Developed\Java\Lang\Annotation\**" />
-		<Compile Include="Developed\Java\Lang\Reflect\**" />
 		<Compile Remove="Developed\Java\Lang\*Error.cs" />
 		<Compile Remove="Developed\Java\Lang\*Exception.cs" />
 		<Compile Include="Developed\Java\Nio\*.cs" />
 		<Compile Include="Developed\Java\Util\Function\**" />
 		<Compile Include="Developed\Java\Util\Comparator.cs" />
 		<Compile Include="Developed\Java\Util\EventListener.cs" />
 		<Compile Include="Developed\Java\Util\Iterator.cs" />
-		<Compile Include="Generated\Java\Lang\*.cs" />
-		<Compile Include="Generated\Java\Lang\Annotation\**" />
-		<Compile Include="Generated\Java\Lang\Reflect\**" />
-		<Compile Include="Generated\Java\Nio\*.cs" />
+		<Compile Include="Generated\Java\Io\Closeable.cs" />
+		<Compile Include="Generated\Java\Io\Flushable.cs" />
+		<Compile Include="Generated\Java\Io\InputStream.cs" />
+		<Compile Include="Generated\Java\Io\IOException.cs" />
+		<Compile Include="Generated\Java\Io\OutputStream.cs" />
+		<Compile Include="Generated\Java\Io\Serializable.cs" />
+		<Compile Include="Generated\Java\Lang\Appendable.cs" />	
+		<Compile Include="Generated\Java\Lang\AutoCloseable.cs" />			
+		<Compile Include="Generated\Java\Lang\Boolean.cs" />
+		<Compile Include="Generated\Java\Lang\Byte.cs" />
+		<Compile Include="Generated\Java\Lang\Character.cs" />
+		<Compile Include="Generated\Java\Lang\CharSequence.cs" />
+		<Compile Include="Generated\Java\Lang\Class.cs" />
+		<Compile Include="Generated\Java\Lang\ClassLoader.cs" />
+		<Compile Include="Generated\Java\Lang\Comparable.cs" />
+		<Compile Include="Generated\Java\Lang\Double.cs" />
+		<Compile Include="Generated\Java\Lang\Enum.cs" />
+		<Compile Include="Generated\Java\Lang\Exception.cs" />
+		<Compile Include="Generated\Java\Lang\Float.cs" />
+		<Compile Include="Generated\Java\Lang\Integer.cs" />
+		<Compile Include="Generated\Java\Lang\Long.cs" />
+		<Compile Include="Generated\Java\Lang\Module.cs" />
+		<Compile Include="Generated\Java\Lang\ModuleLayer.cs" />
+		<Compile Include="Generated\Java\Lang\Number.cs" />
+		<Compile Include="Generated\Java\Lang\Package.cs" />
+		<Compile Include="Generated\Java\Lang\Readable.cs" />
+		<Compile Include="Generated\Java\Lang\Runnable.cs" />
+		<Compile Include="Generated\Java\Lang\Short.cs" />
+		<Compile Include="Generated\Java\Lang\StackTraceElement.cs" />
+		<Compile Include="Generated\Java\Lang\String.cs" />
+		<Compile Include="Generated\Java\Lang\StringBuffer.cs" />
+		<Compile Include="Generated\Java\Lang\StringBuilder.cs" />
+		<Compile Include="Generated\Java\Lang\Thread.cs" />
+		<Compile Include="Generated\Java\Lang\ThreadGroup.cs" />
+		<Compile Include="Generated\Java\Lang\Annotation\Annotation.cs" />
+		<Compile Include="Generated\Java\Lang\ModuleNs\Configuration.cs" />
+		<Compile Include="Generated\Java\Lang\ModuleNs\ModuleDescriptor.cs" />
+		<Compile Include="Generated\Java\Lang\ModuleNs\ModuleFinder.cs" />
+		<Compile Include="Generated\Java\Lang\ModuleNs\ModuleReader.cs" />		
+		<Compile Include="Generated\Java\Lang\ModuleNs\ModuleReference.cs" />
+		<Compile Include="Generated\Java\Lang\ModuleNs\ResolvedModule.cs" />		
+		<Compile Include="Generated\Java\Lang\Reflect\AccessibleObject.cs" />
+		<Compile Include="Generated\Java\Lang\Reflect\AnnotatedElement.cs" />
+		<Compile Include="Generated\Java\Lang\Reflect\AnnotatedType.cs" />
+		<Compile Include="Generated\Java\Lang\Reflect\Constructor.cs" />
+		<Compile Include="Generated\Java\Lang\Reflect\Executable.cs" />
+		<Compile Include="Generated\Java\Lang\Reflect\Field.cs" />
+		<Compile Include="Generated\Java\Lang\Reflect\GenericDeclaration.cs" />
+		<Compile Include="Generated\Java\Lang\Reflect\Member.cs" />
+		<Compile Include="Generated\Java\Lang\Reflect\Method.cs" />
+		<Compile Include="Generated\Java\Lang\Reflect\Parameter.cs" />
+		<Compile Include="Generated\Java\Lang\Reflect\Type.cs" />
+		<Compile Include="Generated\Java\Lang\Reflect\TypeVariable.cs" />
+		<Compile Include="Generated\Java\Net\ContentHandler.cs" />
+		<Compile Include="Generated\Java\Net\ContentHandlerFactory.cs" />
+		<Compile Include="Generated\Java\Net\FileNameMap.cs" />
+		<Compile Include="Generated\Java\Net\Proxy.cs" />
+		<Compile Include="Generated\Java\Net\SocketAddress.cs" />
+		<Compile Include="Generated\Java\Net\URI.cs" />
+		<Compile Include="Generated\Java\Net\URL.cs" />
+		<Compile Include="Generated\Java\Net\URLConnection.cs" />
+		<Compile Include="Generated\Java\Net\URLStreamHandler.cs" />
+		<Compile Include="Generated\Java\Net\URLStreamHandlerFactory.cs" />
+		<Compile Include="Generated\Java\Nio\*Buffer.cs" />
+		<Compile Include="Generated\Java\Nio\ByteOrder.cs" />
+		<Compile Include="Generated\Java\Nio\Charset\Charset.cs" />
+		<Compile Include="Generated\Java\Nio\Charset\CharsetDecoder.cs" />
+		<Compile Include="Generated\Java\Nio\Charset\CharsetEncoder.cs" />
+		<Compile Include="Generated\Java\Nio\Charset\CoderResult.cs" />
+		<Compile Include="Generated\Java\Nio\Charset\CodingErrorAction.cs" />
+		<Compile Include="Generated\Java\Nio\File\CopyOption.cs" />
+		<Compile Include="Generated\Java\Nio\File\FileStore.cs" />
+		<Compile Include="Generated\Java\Nio\File\FileSystem.cs" />
+		<Compile Include="Generated\Java\Nio\File\LinkOption.cs" />
+		<Compile Include="Generated\Java\Nio\File\OpenOption.cs" />
+		<Compile Include="Generated\Java\Nio\File\Path.cs" />
+		<Compile Include="Generated\Java\Nio\File\PathMatcher.cs" />
+		<Compile Include="Generated\Java\Nio\File\Watchable.cs" />
+		<Compile Include="Generated\Java\Nio\File\WatchEvent.cs" />
+		<Compile Include="Generated\Java\Nio\File\WatchKey.cs" />
+		<Compile Include="Generated\Java\Nio\File\WatchService.cs" />
+		<Compile Include="Generated\Java\Nio\File\Attribute\AttributeView.cs" />
+		<Compile Include="Generated\Java\Nio\File\Attribute\FileStoreAttributeView.cs" />
+		<Compile Include="Generated\Java\Nio\File\Attribute\GroupPrincipal.cs" />
+		<Compile Include="Generated\Java\Nio\File\Attribute\UserPrincipal.cs" />
+		<Compile Include="Generated\Java\Nio\File\Attribute\UserPrincipalLookupService.cs" />
+		<Compile Include="Generated\Java\Security\Permission.cs" />
+		<Compile Include="Generated\Java\Security\Principal.cs" />
+		<Compile Include="Generated\Java\Security\ProtectionDomain.cs" />
+		<Compile Include="Generated\Java\Util\Collection.cs" />
+		<Compile Include="Generated\Java\Util\Enumeration.cs" />
+		<Compile Include="Generated\Java\Util\List.cs" />
+		<Compile Include="Generated\Java\Util\Locale.cs" />
+		<Compile Include="Generated\Java\Util\Map.cs" />
+		<Compile Include="Generated\Java\Util\Optional.cs" />
+		<Compile Include="Generated\Java\Util\OptionalDouble.cs" />
+		<Compile Include="Generated\Java\Util\OptionalInt.cs" />
+		<Compile Include="Generated\Java\Util\Set.cs" />
+		<Compile Include="Generated\Java\Util\SortedMap.cs" />
+		<Compile Include="Generated\Java\Util\Spliterator.cs" />
+		<Compile Include="Generated\Java\Util\Stream\BaseStream.cs" />
+		<Compile Include="Generated\Java\Util\Stream\IntStream.cs" />
+		<Compile Include="Generated\Java\Util\Stream\Stream.cs" />
+		<Compile Include="Generated\Javax\Security\Auth\Subject.cs" />
 	</ItemGroup>
 	<ItemGroup>
-	  <Compile Remove="Developed\Java\Lang\Compiler.cs" />
-	  <Compile Remove="Developed\Java\Lang\Module.cs" />
-	  <Compile Remove="Developed\Java\Lang\Object.cs" />
-	  <Compile Remove="Developed\Java\Lang\Package.cs" />
-	  <Compile Remove="Developed\Java\Lang\SecurityManager.cs" />
+		<Compile Remove="Developed\Java\Lang\ClassLoader.cs" />
+		<Compile Remove="Developed\Java\Lang\Compiler.cs" />
+		<Compile Remove="Developed\Java\Lang\Module.cs" />
+		<Compile Remove="Developed\Java\Lang\Object.cs" />
+		<Compile Remove="Developed\Java\Lang\Package.cs" />
+		<Compile Remove="Developed\Java\Lang\SecurityManager.cs" />
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="MASES.CLIParser" Version="3.2.1" />

diff --git a/src/net/JNetReflector/Templates/Templates.cs b/src/net/JNetReflector/Templates/Templates.cs
@@ -157,8 +157,8 @@ public class ClassStub
             public const string LISTENER_CLASS_WARNING = "#warning Remember to build the Java class for event listener";
 
             public static string LISTENER_CLASS_BLOCK = "    const string _bridgeClassName = \"ALLPACKAGE_CLASSES_STUB_JAVACLASS_PLACEHOLDER\";" + Environment.NewLine
-                                                      + "    private static readonly IJavaType _LocalBridgeClazz = ClazzOf(_bridgeClassName);" + Environment.NewLine
-                                                      + "    private static IJavaType LocalBridgeClazz => _LocalBridgeClazz ?? throw new InvalidOperationException($\"Class {_bridgeClassName} was not found.\");" + Environment.NewLine
+                                                      + "    private static readonly MASES.JCOBridge.C2JBridge.JVMInterop.IJavaType _LocalBridgeClazz = ClazzOf(_bridgeClassName);" + Environment.NewLine
+                                                      + "    private static MASES.JCOBridge.C2JBridge.JVMInterop.IJavaType LocalBridgeClazz => _LocalBridgeClazz ?? throw new global::System.InvalidOperationException($\"Class {_bridgeClassName} was not found.\");" + Environment.NewLine
                                                       + "    " + Environment.NewLine
                                                       + "    /// <summary>" + Environment.NewLine
                                                       + "    /// <see href=\"https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm\"/>" + Environment.NewLine