Update GlobalData, SPD, SurfaceAreaQuery to using EdkException.

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

diff --git a/Tools/Source/GenBuild/org/tianocore/build/id/ModuleIdentification.java b/Tools/Source/GenBuild/org/tianocore/build/id/ModuleIdentification.java
index d7c6f62d5e8426db98033a3279b31b01dcbeca72..87024d13a099422121060164fc33ce7f7c9472c1 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/id/ModuleIdentification.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/id/ModuleIdentification.java
@@ -15,7 +15,6 @@ package org.tianocore.build.id;
 \r
 import java.io.File;\r
 \r
-import org.tianocore.build.global.GlobalData;\r
 /**\r
   This class is used to identify a module with Module Guid, Module Version, \r
   Package Guid, Package Version. \r
@@ -88,7 +87,6 @@ public class ModuleIdentification extends Identification {
       @return MSA File\r
     **/\r
     public File getMsaFile() {\r
-        prepareMsaFile();\r
         return msaFile;\r
     }\r
     \r
@@ -96,19 +94,12 @@ public class ModuleIdentification extends Identification {
       @return Module relative path to package\r
     **/\r
     public String getModuleRelativePath() {\r
-        prepareMsaFile();\r
         if (msaFile.getParent().length() == packageId.getPackageDir().length()) {\r
             return ".";\r
         }\r
         return msaFile.getParent().substring(packageId.getPackageDir().length() + 1);\r
     }\r
 \r
-    private void prepareMsaFile(){\r
-        if (msaFile == null) {\r
-            GlobalData.refreshModuleIdentification(this);\r
-        }\r
-    }\r
-\r
     /**\r
       @param msaFile Set Msa File\r
     **/\r
@@ -137,10 +128,7 @@ public class ModuleIdentification extends Identification {
         }\r
     }\r
     \r
-    public String toString(){\r
-        if (name == null) {\r
-            GlobalData.refreshModuleIdentification(this);\r
-        }\r
+    public String toString() {\r
         if (version == null || version.trim().equalsIgnoreCase("")) {\r
             return "Module [" + name + "] in " + packageId;\r
         }\r
@@ -167,9 +155,6 @@ public class ModuleIdentification extends Identification {
       @return get module type\r
     **/\r
     public String getModuleType() {\r
-        if (moduleType == null) {\r
-            GlobalData.refreshModuleIdentification(this);\r
-        }\r
         return moduleType;\r
     }\r
 \r
@@ -181,9 +166,6 @@ public class ModuleIdentification extends Identification {
     }\r
     \r
     public String getName() {\r
-        if (name == null) {\r
-            GlobalData.refreshModuleIdentification(this);\r
-        }\r
         return name;\r
     }\r
 }\r