Add Fv option value edit support;

[mirror_edk2.git] / Tools / Java / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / platform / ui / FpdFileContents.java

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
index bc472480732078223a42f3fe1018ab6e41be5d93..a59b2d4f792b5f6078ab37ac623fafade111942a 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
@@ -1531,7 +1531,10 @@ public class FpdFileContents {
                 if (pcdBuildData.getCName().equals(cName) && pcdBuildData.getTokenSpaceGuidCName().equals(tsGuid)) {\r
                     \r
                     if (getDynamicPcdBuildDataCount() == 1) {\r
-                        cursor.toParent();\r
+                        cursor.dispose();\r
+                        removeElement(o);\r
+                        fpdDynPcdBuildDefs = null;\r
+                        return;\r
                     }\r
                     cursor.removeXml();\r
                     cursor.dispose();\r
@@ -1548,6 +1551,8 @@ public class FpdFileContents {
     public int getDynamicPcdSkuInfoCount(int i){\r
         if (fpdRoot.getDynamicPcdBuildDefinitions() == null || fpdRoot.getDynamicPcdBuildDefinitions().getPcdBuildDataList() == null \r
                         || fpdRoot.getDynamicPcdBuildDefinitions().getPcdBuildDataList().size() == 0) {\r
+            removeElement(getfpdDynPcdBuildDefs());\r
+            fpdDynPcdBuildDefs = null;\r
             return 0;\r
         }\r
         \r
@@ -1716,9 +1721,11 @@ public class FpdFileContents {
     \r
     public void updateDynamicPcdBuildDataSkuInfo(String id, String varName, String varGuid, String varOffset, \r
                                                  String hiiDefault, String vpdOffset, String value, int i){\r
-//        if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
-//            return;\r
-//        }\r
+        if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
+            removeElement(getfpdDynPcdBuildDefs());\r
+            fpdDynPcdBuildDefs = null;\r
+            return;\r
+        }\r
         \r
         XmlCursor cursor = getfpdDynPcdBuildDefs().newCursor();\r
         if (cursor.toFirstChild()) {\r
@@ -3278,32 +3285,31 @@ public class FpdFileContents {
      * @param name\r
      * @param value\r
      */\r
-    public void setTypedNamedFvImageNameValue (String fvName, String type, String name, String value) {\r
+    public void setTypedNamedFvImageNameValue (String fvName, String type, String name, String value, String newName) {\r
         boolean fvImageExists = false;\r
-        if (getfpdFlash().getFvImages() == null) {\r
-            return;\r
-        }\r
-        List<FvImagesDocument.FvImages.FvImage> l = getfpdFlash().getFvImages().getFvImageList();\r
-        if (l == null) {\r
-            return;\r
-        }\r
-        ListIterator li = l.listIterator();\r
-        while(li.hasNext()) {\r
-            FvImagesDocument.FvImages.FvImage fi = (FvImagesDocument.FvImages.FvImage)li.next();\r
-            if (!fi.getType().toString().equals(type) && !type.equals("ALL")) {\r
-                continue;\r
-            }\r
-            if (!fi.getFvImageNamesList().contains(fvName)) {\r
-                continue;\r
+        if (getfpdFlash().getFvImages() != null) {\r
+\r
+            List<FvImagesDocument.FvImages.FvImage> l = getfpdFlash().getFvImages().getFvImageList();\r
+            if (l != null) {\r
+                ListIterator li = l.listIterator();\r
+                while (li.hasNext()) {\r
+                    FvImagesDocument.FvImages.FvImage fi = (FvImagesDocument.FvImages.FvImage) li.next();\r
+                    if (!fi.getType().toString().equals(type) && !type.equals("ALL")) {\r
+                        continue;\r
+                    }\r
+                    if (!fi.getFvImageNamesList().contains(fvName)) {\r
+                        continue;\r
+                    }\r
+                    fvImageExists = true;\r
+                    setFvImagesFvImageNameValue(fi, name, value, newName);\r
+                }\r
             }\r
-            fvImageExists = true;\r
-            setFvImagesFvImageNameValue (fi, name, value, null);\r
         }\r
-        \r
+\r
         if (!fvImageExists) {\r
             HashMap<String, String> map = new HashMap<String, String>();\r
             map.put(name, value);\r
-            genFvImagesFvImage(new String[]{fvName}, type, map);\r
+            genFvImagesFvImage(new String[] { fvName }, type, map);\r
         }\r
     }\r
     \r
@@ -3359,7 +3365,7 @@ public class FpdFileContents {
             FvImagesDocument.FvImages.FvImage.FvImageOptions.NameValue nv = fi.addNewFvImageOptions().addNewNameValue();\r
             nv.setName(name);\r
             nv.setValue(value);\r
-            if (newName != null) {\r
+            if (newName != null && !newName.equals(name)) {\r
                 nv.setName(newName);\r
             }\r
             return;\r
@@ -3371,7 +3377,7 @@ public class FpdFileContents {
                 FvImagesDocument.FvImages.FvImage.FvImageOptions.NameValue nv = (FvImagesDocument.FvImages.FvImage.FvImageOptions.NameValue)cursor.getObject();\r
                 if (nv.getName().equals(name)) {\r
                     nv.setValue(value);\r
-                    if (newName != null) {\r
+                    if (newName != null && !newName.equals(name)) {\r
                         nv.setName(newName);\r
                     }\r
                     cursor.dispose();\r
@@ -3383,7 +3389,7 @@ public class FpdFileContents {
         FvImagesDocument.FvImages.FvImage.FvImageOptions.NameValue nv = fi.getFvImageOptions().addNewNameValue();\r
         nv.setName(name);\r
         nv.setValue(value);\r
-        if (newName != null) {\r
+        if (newName != null && !newName.equals(name)) {\r
             nv.setName(newName);\r
         }\r
         cursor.dispose();\r