From 89da7ebac51e9adfe0c419b0d4a68a5672c2fb87 Mon Sep 17 00:00:00 2001
From: jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 22 Dec 2006 09:59:49 +0000
Subject: Rewrote the error message output when module cannnot be found in any
 packages.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2133 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../org/tianocore/build/global/GlobalData.java     | 10 ++++----
 .../tianocore/build/id/ModuleIdentification.java   | 29 +++++++++++++++++++---
 2 files changed, 30 insertions(+), 9 deletions(-)

(limited to 'Tools')

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java b/Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java
index d339043842..77beb85bae 100644
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java
@@ -302,19 +302,19 @@ public class GlobalData {
         PackageIdentification packageId = null;
         Iterator iter = packageList.iterator();
         while (iter.hasNext()) {
-            packageId = (PackageIdentification)iter.next();
-            moduleId.setPackage(packageId);
-            Spd spd = spdTable.get(packageId);
+            PackageIdentification pid = (PackageIdentification)iter.next();
+            Spd spd = spdTable.get(pid);
             File tempMsaFile = null;
             if ((tempMsaFile = spd.getModuleFile(moduleId)) != null ) {
                 if (tempMsaFile.getParent().equalsIgnoreCase(moduleId.getMsaFile().getParent())) {
+                    packageId = pid;
                     break ;
                 }
                 tempMsaFile = null;
             }
         }
         if (packageId == null){
-            throw new EdkException("Can't find Module [" + moduleId.getName() + "] in any SPD package!");
+            throw new EdkException("Can't find Module [" + moduleId.getName() + "] in any package!");
         } else {
             return packageId;
         }
@@ -648,7 +648,7 @@ public class GlobalData {
                 return moduleId;
             }
         }
-        throw new EdkException("Can't find module GUID value " + moduleId.toGuidString() + " in " + packageId + " under the current workspace!");
+        throw new EdkException("Can't find " + moduleId + " under the current workspace!");
     }
 
     public synchronized static Set<PackageIdentification> getPackageList(){
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 87024d13a0..c2d9acc0a8 100644
--- 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 {
     }
     
     public String toString() {
-        if (version == null || version.trim().equalsIgnoreCase("")) {
-            return "Module [" + name + "] in " + packageId;
+        String nameString;
+        String versionString;
+        String packageString;
+
+        if (name != null && name != "") {
+            nameString = name;
+        } else {
+            if (guid != null && guid != "") {
+                nameString = guid;
+            } else {
+                nameString = "UNKNOWN";
+            }
         }
-        else {
-            return "Module [" + name + " " + version + "] in " + packageId; 
+
+        if (version != null) {
+            versionString = version;
+        } else {
+            versionString = ""; 
         }
+
+        if (packageId != null) {
+            packageString = packageId.toString();
+        } else {
+            packageString = "Package [UNKNOWN]";
+        }
+
+        return "Module [" + nameString + versionString + "] in " + packageString; 
     }
 
     /**
-- 
cgit v1.2.3