Added check on OriginRootPath to avoid unintelligible error (#434)

* Added check on OriginRootPath to avoid unintelligible error * Fix new() replacement
masesgroup · Jun 3, 2024 · e28f217 · e28f217
1 parent d7a1b75
commit e28f217
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/net/JNetReflector/InternalExtensions.cs b/src/net/JNetReflector/InternalExtensions.cs
@@ -1214,8 +1214,8 @@ public static string WhereClauses(this Class entry, bool usedInGenerics, bool ca
                 var bounds = sbBounds.ToString();
                 if (!string.IsNullOrEmpty(bounds))
                 {
-                    if (hasNew) bounds += AllPackageClasses.WHERE_CLAUSE_NEW;
                     bounds = bounds.Substring(0, bounds.LastIndexOf(", "));
+                    if (hasNew) bounds += AllPackageClasses.WHERE_CLAUSE_NEW;
                     sbWhere.AppendFormat(AllPackageClasses.WHERE_CLAUSE, typeParameter.Name, bounds);
                 }
             }

diff --git a/src/net/JNetReflector/InternalMethods.cs b/src/net/JNetReflector/InternalMethods.cs
@@ -103,7 +103,7 @@ public static void Reflect()
             {
                 AnalyzeNamespaces();
             }
-            else throw new ArgumentException("At least one of ClassesToAnaylyze, NamespacesToParse or OriginRootPath must be set");
+            else throw new ArgumentException("At least one of ClassesToAnaylyze, JarsToAnalyze or ModulesToParse must be set");
             w.Stop();
 
             if (JNetReflectorCore.JarsToAnalyze != null)
@@ -123,6 +123,8 @@ public static void Reflect()
 
         public static void AnalyzeJars()
         {
+            if (string.IsNullOrWhiteSpace(JNetReflectorCore.OriginRootPath)) throw new ArgumentException($"OriginRootPath shall be set when the tool shall manage JAR reflection");
+
             List<string> jarNames = new List<string>(JNetReflectorCore.JarsToAnalyze.Select((o) => Path.Combine(JNetReflectorCore.OriginRootPath, o)));
             for (int i = 0; i < jarNames.Count; i++)
             {