Update code to fix #520 and #527 when tool is used with Jars (#529)

masesgroup · Sep 19, 2024 · 5ab9f91 · 5ab9f91
1 parent a9fc64e
commit 5ab9f91
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/net/JNetReflector/InternalMethods.cs b/src/net/JNetReflector/InternalMethods.cs
@@ -75,7 +75,11 @@ static void ReportTrace(ReflectionTraceLevel level, string format, params object
 
         static void WriteFile(string path, string content)
         {
-            if (path.EndsWith(FileNameAndDirectory.AllPackageClassesFileName)) Interlocked.Increment(ref namespaces);
+            if (path.EndsWith(FileNameAndDirectory.AllPackageClassesFileName))
+            {
+                Interlocked.Increment(ref namespaces);
+                return; // do not write anymore AllPackageClasses.cs
+            }
             else Interlocked.Increment(ref classes);
 
             if (!JNetReflectorCore.DryRun)
@@ -336,17 +340,14 @@ static void AnalyzeSubItems(string package, IDictionary<string, IDictionary<stri
                                                            .Replace(AllPackageClasses.NAMESPACE, package)
                                                            .Replace(AllPackageClasses.CLASSES, sb.ToString());
 
-                        if (path.EndsWith(FileNameAndDirectory.AllPackageClassesFileName)) Interlocked.Increment(ref namespaces);
-                        //WriteFile(path, itemPackage);
+                        WriteFile(path, itemPackage);
                         _allPackages.Add(path, itemPackage);
                     }
                     else
                     {
-                        var packageContent = File.ReadAllText(path);
-                        var itemPackage = packageContent.Replace(AllPackageClasses.CLASSES, sb.ToString());
+                        var itemPackage = _allPackages[path].Replace(AllPackageClasses.CLASSES, sb.ToString());
 
-                        if (path.EndsWith(FileNameAndDirectory.AllPackageClassesFileName)) Interlocked.Increment(ref namespaces);
-                        //WriteFile(path, itemPackage);
+                        WriteFile(path, itemPackage);
                         _allPackages[path] = itemPackage;
                     }
                 }
@@ -359,8 +360,7 @@ static void AnalyzeSubItems(string package, IDictionary<string, IDictionary<stri
                                                    .Replace(AllPackageClasses.NAMESPACE, package)
                                                    .Replace(AllPackageClasses.CLASSES, sb.ToString());
 
-                if (path.EndsWith(FileNameAndDirectory.AllPackageClassesFileName)) Interlocked.Increment(ref namespaces);
-                //WriteFile(path, itemPackage);
+                WriteFile(path, itemPackage);
             }
         }