X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2Fautogen%2FAutogenLibOrder.java;h=bddea90aab2dee3f612bb7a7d91e3660415a46f4;hp=28e2a296f156bd91fedfa705aee12aec2f8fc5c8;hb=61528a1be326a5a7ddd7cbcac16f91c4e62060b3;hpb=607ef9948b4a6be7eb16c1df25c954ed0102a6e6 diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java index 28e2a296f1..bddea90aab 100644 --- a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java +++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java @@ -22,9 +22,11 @@ import java.util.List; import java.util.Map; import org.apache.xmlbeans.XmlObject; +import org.tianocore.build.exception.AutoGenException; import org.tianocore.build.global.GlobalData; import org.tianocore.build.global.SurfaceAreaQuery; import org.tianocore.build.id.ModuleIdentification; +import org.tianocore.common.exception.EdkException; /** This class This class is to reorder library instance sequence according to @@ -55,7 +57,7 @@ public class AutogenLibOrder { @param libraryList List of the library instance. @throws Exception **/ - AutogenLibOrder(ModuleIdentification[] libraryList, String arch) throws Exception { + AutogenLibOrder(ModuleIdentification[] libraryList, String arch) throws EdkException { LibraryInstanceNode libInstanceNode; String[] libClassDeclList = null; String[] libClassConsmList = null; @@ -80,9 +82,9 @@ public class AutogenLibOrder { classStr[k] = libClassConsmList[k]; } if (this.libInstanceMap.containsKey(libraryList[i])) { - throw new Exception( + throw new AutoGenException( libraryList[i].getName() - + "this library instance already exists, please check the library instance list!"); + + "-- this library instance already exists, please check the library instance list!"); } else { this.libInstanceMap.put(libraryList[i], classStr); } @@ -98,7 +100,7 @@ public class AutogenLibOrder { System.out.println(libClassDeclList[j] + " class is already implement by " + this.libClassMap.get(libClassDeclList[j])); - throw new Exception("Library Class: " + libClassDeclList + throw new AutoGenException("Library Class: " + libClassDeclList + " already has a library instance!"); } else { this.libClassMap.put(libClassDeclList[j], libraryList[i]);