Rewrote the error message output when module cannnot be found in any packages.

[mirror_edk2.git] / Tools / Java / Source / GenBuild / org / tianocore / build / id / ModuleIdentification.java

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/id/ModuleIdentification.java b/Tools/Java/Source/GenBuild/org/tianocore/build/id/ModuleIdentification.java
index 87024d13a099422121060164fc33ce7f7c9472c1..c2d9acc0a830387fda80cc32a8679da9ae680a6c 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/id/ModuleIdentification.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/id/ModuleIdentification.java
@@ -129,12 +129,33 @@ public class ModuleIdentification extends Identification {
     }\r
     \r
     public String toString() {\r
-        if (version == null || version.trim().equalsIgnoreCase("")) {\r
-            return "Module [" + name + "] in " + packageId;\r
+        String nameString;\r
+        String versionString;\r
+        String packageString;\r
+\r
+        if (name != null && name != "") {\r
+            nameString = name;\r
+        } else {\r
+            if (guid != null && guid != "") {\r
+                nameString = guid;\r
+            } else {\r
+                nameString = "UNKNOWN";\r
+            }\r
         }\r
-        else {\r
-            return "Module [" + name + " " + version + "] in " + packageId; \r
+\r
+        if (version != null) {\r
+            versionString = version;\r
+        } else {\r
+            versionString = ""; \r
         }\r
+\r
+        if (packageId != null) {\r
+            packageString = packageId.toString();\r
+        } else {\r
+            packageString = "Package [UNKNOWN]";\r
+        }\r
+\r
+        return "Module [" + nameString + versionString + "] in " + packageString; \r
     }\r
 \r
     /**\r