Revert back algorithm

masesdevelopers · Sep 26, 2024 · 1cf9b55 · 1cf9b55
1 parent 79d2205
commit 1cf9b55
Showing 1 changed file with 32 additions and 32 deletions.
diff --git a/src/net/JNetReflector/JNetReflectorHelper.cs b/src/net/JNetReflector/JNetReflectorHelper.cs
@@ -108,19 +108,20 @@ public static IDictionary<Class, IReadOnlyDictionary<string, string>> ExtractJav
                     if (exited && process.ExitCode != 0) throw new InvalidOperationException($"javap falied with error {process.ExitCode}");
 
                     Dictionary<string, string> map = new Dictionary<string, string>();
+                    string line;
                     int classCounter = -1;
-                    int endCounter = 0;
                     string methodName = string.Empty;
                     string className = string.Empty;
                     bool nextLineIsDescriptor = false;
-                    bool foundParenthesis = false;
+#if TEST_ALGORITHM
+                    int endCounter = 0;
                     int cycleCounter = 0;
                     do
                     {
-                        string line = process.StandardOutput.ReadLine();
+                        line = process.StandardOutput.ReadLine();
                         if (line == null)
                         {
-                            if (!foundParenthesis)
+                            if (endCounter != toBeAnalyzed.Count)
                             {
                                 // wait a while
                                 cycleCounter++;
@@ -164,34 +165,33 @@ public static IDictionary<Class, IReadOnlyDictionary<string, string>> ExtractJav
                         if (endCounter == toBeAnalyzed.Count) break;
                     }
                     while (cycleCounter < 100);
-
-                    //foreach (var line in lines)
-                    //{
-                    //    if (string.IsNullOrWhiteSpace(line)) continue;
-
-                    //    if (line.Contains("Compiled from"))
-                    //    {
-                    //        if (classCounter != -1) { dict.TryAdd(toBeAnalyzed[classCounter], map); }
-                    //        classCounter++;
-                    //        className = toBeAnalyzed[classCounter].Name;
-                    //        map = new Dictionary<string, string>();
-                    //    }
-                    //    if (nextLineIsDescriptor)
-                    //    {
-                    //        nextLineIsDescriptor = false;
-                    //        string signature = line.TrimStart().TrimEnd();
-                    //        signature = signature.Remove(0, "descriptor: ".Length);
-                    //        map.Add(methodName, signature);
-                    //    }
-                    //    bool isInterfaceOrClassLine = line.Contains("class") || line.Contains("interface");
-                    //    if (line.Contains("public") && !isInterfaceOrClassLine)
-                    //    {
-                    //        nextLineIsDescriptor = true;
-                    //        methodName = line.TrimStart().TrimEnd();
-                    //        methodName = methodName.RemoveThrowsAndCleanupSignature();
-                    //        methodName = methodName.AddClassNameToSignature(className);
-                    //    }
-                    //}
+#else
+                    while ((line = process.StandardOutput.ReadLine()) != null)
+                    {
+                        if (line.Contains("Compiled from"))
+                        {
+                            if (classCounter != -1) { dict.TryAdd(toBeAnalyzed[classCounter], map); }
+                            classCounter++;
+                            className = toBeAnalyzed[classCounter].Name;
+                            map = new Dictionary<string, string>();
+                        }
+                        if (nextLineIsDescriptor)
+                        {
+                            nextLineIsDescriptor = false;
+                            string signature = line.TrimStart().TrimEnd();
+                            signature = signature.Remove(0, "descriptor: ".Length);
+                            map.Add(methodName, signature);
+                        }
+                        bool isInterfaceOrClassLine = line.Contains("class") || line.Contains("interface");
+                        if (line.Contains("public") && !isInterfaceOrClassLine)
+                        {
+                            nextLineIsDescriptor = true;
+                            methodName = line.TrimStart().TrimEnd();
+                            methodName = methodName.RemoveThrowsAndCleanupSignature();
+                            methodName = methodName.AddClassNameToSignature(className);
+                        }
+                    }
+#endif
                     dict.TryAdd(toBeAnalyzed[classCounter], map);
                 }
                 catch { }