X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2Fplatform%2Fui%2FFpdFileContents.java;h=b8c80b48cc2f5264d6b8f354beedc5040bc4dc29;hb=1faac7b69fbddc4b1af451f51465988d8e1988c7;hp=ce9682e2d456ca5fee36c0820e559edfd986c82d;hpb=57d0e52a7180d3f3416388023f0edae9bb97f6ce;p=mirror_edk2.git

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
index ce9682e2d4..b8c80b48cc 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
@@ -776,7 +776,7 @@ public class FpdFileContents {
                     //
                     // ToDo Error 
                     //
-                    throw new PcdDeclNotFound(mi.getName() + " " + msaPcd.getCName());
+                    throw new PcdDeclNotFound("No Declaration for PCD Entry " + msaPcd.getCName() + " in Module " + mi.getName());
                 }
                 //
                 // AddItem to ModuleSA PcdBuildDefinitions
@@ -788,7 +788,7 @@ public class FpdFileContents {
             
         }
         catch (Exception e){
-            e.printStackTrace();
+            
             throw e; 
         }
         
@@ -873,16 +873,17 @@ public class FpdFileContents {
         //
         // Special dynamic type, if this pcd already exists in other ModuleSA
         //
+        /* Comment out Item type checking temporarily.
         if (itemType.equals("DYNAMIC")) {
             
             ListIterator li = pcdConsumer.listIterator();
             while(li.hasNext()) {
                 String value = li.next().toString();
                 String[] valuePart= value.split(" ");
-                if (!valuePart[4].equals("DYNAMIC")) {
+                if (!valuePart[5].equals("DYNAMIC")) {
                     //ToDo error for same pcd, other type than dynamic
                     pcdConsumer.remove(listValue);
-                    throw new PcdItemTypeConflictException(value);
+                    throw new PcdItemTypeConflictException(cName, value);
                 }
             }
         }
@@ -891,14 +892,14 @@ public class FpdFileContents {
             while(li.hasNext()) {
                 String value = li.next().toString();
                 String[] valuePart= value.split(" ");
-                if (valuePart[4].equals("DYNAMIC")) {
+                if (valuePart[5].equals("DYNAMIC")) {
                     //ToDo error for same pcd, other type than non-dynamic
                     pcdConsumer.remove(listValue);
-                    throw new PcdItemTypeConflictException(value);
+                    throw new PcdItemTypeConflictException(cName, value);
                 }
             }
         }
-        
+        */
         PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData fpdPcd = moduleSa.getPcdBuildDefinition().addNewPcdData();
         fpdPcd.setCName(cName);
         fpdPcd.setToken(token);
@@ -1030,7 +1031,7 @@ public class FpdFileContents {
     
     private ArrayList<String> LookupPlatformPcdData(String pcdKey) {
         
-        return dynPcdMap.get("pcdKey");
+        return dynPcdMap.get(pcdKey);
     }
     
     public int getDynamicPcdBuildDataCount() {
@@ -2320,7 +2321,7 @@ public class FpdFileContents {
         if (fpdHdr == null) {
             fpdHdr = fpdRoot.addNewPlatformHeader();
         }
-        genPlatformDefsSkuInfo("0", "DEFAULT");
+        
         return fpdHdr;
     }
     
@@ -2464,8 +2465,9 @@ class PcdItemTypeConflictException extends Exception {
     private static final long serialVersionUID = 1L;
     private String details = null;
     
-    PcdItemTypeConflictException(String info){
-        details = info;
+    PcdItemTypeConflictException(String pcdName, String info){
+        ModuleIdentification mi = GlobalData.getModuleId(info);
+        details = pcdName + " ItemType Conflicts with " + mi.getName() + " in Pkg " + mi.getPackage().getName();
     }
     
     public String getMessage() {
@@ -2482,7 +2484,7 @@ class PcdDeclNotFound extends Exception {
     private String details = null;
     
     PcdDeclNotFound(String info) {
-        details = info;
+        details = "PcdDeclNotFound: " + info;
     }
     
     public String getMessage() {
@@ -2499,7 +2501,7 @@ class PcdValueMalFormed extends Exception {
     private String details = null;
     
     PcdValueMalFormed(String info) {
-        details = info;
+        details = "PcdValueMalFormed: " + info;
     }
     
     public String getMessage() {