Change parameter id in UserExtension element from Integer to String according to...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2309 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
index c3452d7b4c86741226cc0ce4dc464dd3c2205e57..7ffb84b42e5325f7c044ffce93ba194c321af6f9 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
@@ -1824,8 +1824,8 @@ public class FrameworkWizardUI extends IFrame implements KeyListener, MouseListe
         //\r
         // Show splash screen\r
         //\r
         //\r
         // Show splash screen\r
         //\r

-        SplashScreen ss = new SplashScreen();\r
-        ss.setVisible(true);\r
+        //SplashScreen ss = new SplashScreen();\r
+        //ss.setVisible(true);\r

 \r
         //\r
         // Init Global Data\r
 \r
         //\r
         // Init Global Data\r


@@ -1835,7 +1835,7 @@ public class FrameworkWizardUI extends IFrame implements KeyListener, MouseListe
         //\r
         // Close splash screen\r
         //\r
         //\r
         // Close splash screen\r
         //\r

-        ss.dispose();\r
+        //ss.dispose();\r

                 \r
         //\r
         // Init the frame\r
                 \r
         //\r
         // Init the frame\r


@@ -2655,7 +2655,7 @@ public class FrameworkWizardUI extends IFrame implements KeyListener, MouseListe
         String path = null;\r
         IDefaultMutableTreeNode belongNode = null;\r
 \r
         String path = null;\r
         IDefaultMutableTreeNode belongNode = null;\r
 \r

-        try {\r
+//        try {\r

             //\r
             // Get selected tree node\r
             //\r
             //\r
             // Get selected tree node\r
             //\r


@@ -2720,12 +2720,12 @@ public class FrameworkWizardUI extends IFrame implements KeyListener, MouseListe
                                                                                  .findIndexOfListById(new PlatformIdentification(\r
                                                                                                                                  id));\r
             }\r
                                                                                  .findIndexOfListById(new PlatformIdentification(\r
                                                                                                                                  id));\r
             }\r

-        } catch (Exception e) {\r
-            Log.err("double click category: " + intCategory);\r
-            Log.err("double click belong node: " + belongNode.toString());\r
-            Log.err("double click id path: " + id);\r
-            Log.err("double click exception: " + e.getMessage());\r
-        }\r
+//        } catch (Exception e) {\r
+//            Log.err("double click category: " + intCategory);\r
+//            Log.err("double click belong node: " + belongNode.toString());\r
+//            Log.err("double click id path: " + id);\r
+//            Log.err("double click exception: " + e.getMessage());\r
+//        }\r

     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

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 d8dfb279ba59f2228a4fce57ceb13b79fb57ad91..366e2e30223315506d31fe038b474e840cf3a9cd 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
@@ -1867,7 +1867,7 @@ public class FpdFileContents {
         cursor.dispose();\r
     }\r
     \r
         cursor.dispose();\r
     }\r
     \r

-    public int getUserExtsIncModCount (String fvName, String userId, int id) {\r
+    public int getUserExtsIncModCount (String fvName, String userId, String id) {\r

         if (getfpdBuildOpts().getUserExtensionsList() == null) {\r
             return -1;\r
         }\r
         if (getfpdBuildOpts().getUserExtensionsList() == null) {\r
             return -1;\r
         }\r


@@ -1879,7 +1879,7 @@ public class FpdFileContents {
             if (!ues.getUserID().equals(userId)) {\r
                 continue;\r
             }\r
             if (!ues.getUserID().equals(userId)) {\r
                 continue;\r
             }\r

-            if (ues.getIdentifier() == null || ues.getIdentifier() != new Integer(id).toString()) {\r
+            if (ues.getIdentifier() == null || !ues.getIdentifier().equals(id)) {\r

                 continue;\r
             }\r
             XmlCursor cursor = ues.newCursor();\r
                 continue;\r
             }\r
             XmlCursor cursor = ues.newCursor();\r


@@ -1901,7 +1901,7 @@ public class FpdFileContents {
         return -1;\r
     }\r
     \r
         return -1;\r
     }\r
     \r

-    public void getUserExtsIncMods(String fvName, String userId, int id, String[][] saa) {\r
+    public void getUserExtsIncMods(String fvName, String userId, String id, String[][] saa) {\r

         if (getfpdBuildOpts().getUserExtensionsList() == null) {\r
             return;\r
         }\r
         if (getfpdBuildOpts().getUserExtensionsList() == null) {\r
             return;\r
         }\r


@@ -1921,7 +1921,7 @@ public class FpdFileContents {
         if (cursor.toChild(elementUserExts)) {\r
             do {\r
                 cursor.push();\r
         if (cursor.toChild(elementUserExts)) {\r
             do {\r
                 cursor.push();\r

-                if (cursor.getAttributeText(attribUserId).equals(userId) && cursor.getAttributeText(attribId).equals(id+"")) {\r
+                if (cursor.getAttributeText(attribUserId).equals(userId) && cursor.getAttributeText(attribId).equals(id)) {\r

                     cursor.toChild(elementFvName);\r
                     String elementName = cursor.getTextValue();\r
                     if (elementName.equals(fvName)) {\r
                     cursor.toChild(elementFvName);\r
                     String elementName = cursor.getTextValue();\r
                     if (elementName.equals(fvName)) {\r


@@ -1968,7 +1968,7 @@ public class FpdFileContents {
         \r
     }\r
     \r
         \r
     }\r
     \r

-    public void removeBuildOptionsUserExtensions (String fvName, String userId, int id) {\r
+    public void removeBuildOptionsUserExtensions (String fvName, String userId, String id) {\r

         if (getfpdBuildOpts().getUserExtensionsList() == null) {\r
             return;\r
         }\r
         if (getfpdBuildOpts().getUserExtensionsList() == null) {\r
             return;\r
         }\r


@@ -1979,7 +1979,7 @@ public class FpdFileContents {
             if (!ues.getUserID().equals(userId)) {\r
                 continue;\r
             }\r
             if (!ues.getUserID().equals(userId)) {\r
                 continue;\r
             }\r

-            if (ues.getIdentifier()== null || ues.getIdentifier() != new Integer(id).toString()) {\r
+            if (ues.getIdentifier()== null || !ues.getIdentifier().equals(id)) {\r

                 continue;\r
             }\r
             XmlCursor cursor = ues.newCursor();\r
                 continue;\r
             }\r
             XmlCursor cursor = ues.newCursor();\r


@@ -2010,7 +2010,7 @@ public class FpdFileContents {
         return false;\r
     }\r
     \r
         return false;\r
     }\r
     \r

-    public boolean moduleInBuildOptionsUserExtensions (String fvName, String userId, int id, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r
+    public boolean moduleInBuildOptionsUserExtensions (String fvName, String userId, String id, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r

         boolean inList = false;\r
         if (getUserExtsIncModCount(fvName, userId, id) > 0) {\r
             XmlCursor cursor = getfpdBuildOpts().newCursor();\r
         boolean inList = false;\r
         if (getUserExtsIncModCount(fvName, userId, id) > 0) {\r
             XmlCursor cursor = getfpdBuildOpts().newCursor();\r


@@ -2028,7 +2028,7 @@ public class FpdFileContents {
             if (cursor.toChild(elementUserExts)) {\r
                 do {\r
                     cursor.push();\r
             if (cursor.toChild(elementUserExts)) {\r
                 do {\r
                     cursor.push();\r

-                    if (cursor.getAttributeText(attribUserId).equals(userId) && cursor.getAttributeText(attribId).equals(id+"")) {\r
+                    if (cursor.getAttributeText(attribUserId).equals(userId) && cursor.getAttributeText(attribId).equals(id)) {\r

                         cursor.toChild(elementFvName);\r
                         String elementName = cursor.getTextValue();\r
                         if (elementName.equals(fvName)) {\r
                         cursor.toChild(elementFvName);\r
                         String elementName = cursor.getTextValue();\r
                         if (elementName.equals(fvName)) {\r


@@ -2071,7 +2071,7 @@ public class FpdFileContents {
         return inList;\r
     }\r
     \r
         return inList;\r
     }\r
     \r

-    public void removeModuleInBuildOptionsUserExtensions (String fvName, String userId, int id, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r
+    public void removeModuleInBuildOptionsUserExtensions (String fvName, String userId, String id, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r

         //\r
         // if there is only one module before remove operation, the whole user extension should be removed.\r
         //\r
         //\r
         // if there is only one module before remove operation, the whole user extension should be removed.\r
         //\r


@@ -2097,7 +2097,7 @@ public class FpdFileContents {
             if (cursor.toChild(elementUserExts)) {\r
                 do {\r
                     cursor.push();\r
             if (cursor.toChild(elementUserExts)) {\r
                 do {\r
                     cursor.push();\r

-                    if (cursor.getAttributeText(attribUserId).equals(userId) && cursor.getAttributeText(attribId).equals(id+"")) {\r
+                    if (cursor.getAttributeText(attribUserId).equals(userId) && cursor.getAttributeText(attribId).equals(id)) {\r

                         cursor.toChild(elementFvName);\r
                         String elementName = cursor.getTextValue();\r
                         if (elementName.equals(fvName)) {\r
                         cursor.toChild(elementFvName);\r
                         String elementName = cursor.getTextValue();\r
                         if (elementName.equals(fvName)) {\r


@@ -2138,7 +2138,7 @@ public class FpdFileContents {
         }\r
     }\r
     \r
         }\r
     }\r
     \r

-    public void addModuleIntoBuildOptionsUserExtensions (String fvName, String userId, int id, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r
+    public void addModuleIntoBuildOptionsUserExtensions (String fvName, String userId, String id, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r

         if (moduleInBuildOptionsUserExtensions (fvName, userId, id, moduleGuid, moduleVersion, packageGuid, packageVersion, arch)) {\r
             return;\r
         }\r
         if (moduleInBuildOptionsUserExtensions (fvName, userId, id, moduleGuid, moduleVersion, packageGuid, packageVersion, arch)) {\r
             return;\r
         }\r


@@ -2151,7 +2151,7 @@ public class FpdFileContents {
             if (!ues.getUserID().equals(userId)) {\r
                 continue;\r
             }\r
             if (!ues.getUserID().equals(userId)) {\r
                 continue;\r
             }\r

-            if (ues.getIdentifier() == null || ues.getIdentifier() != new Integer(id).toString()) {\r
+            if (ues.getIdentifier() == null || !ues.getIdentifier().equals(id)) {\r

                 continue;\r
             }\r
             XmlCursor cursor = ues.newCursor();\r
                 continue;\r
             }\r
             XmlCursor cursor = ues.newCursor();\r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java
index 05617288485512b22c8b5f682eaffc484154f93c..29a6219e519fced50854a9bc0fa1b91b34d3ba31 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java
@@ -2546,11 +2546,11 @@ class ModuleOrderPane extends JPanel implements ActionListener{
         if (modInFvTableModel == null) {\r
             return;\r
         }\r
         if (modInFvTableModel == null) {\r
             return;\r
         }\r

-        int size = ffc.getUserExtsIncModCount(fvName, "IMAGES", 1);\r
+        int size = ffc.getUserExtsIncModCount(fvName, "IMAGES", "1");\r

         \r
         if (size != -1) {\r
             String[][] saa = new String[size][5];\r
         \r
         if (size != -1) {\r
             String[][] saa = new String[size][5];\r

-            ffc.getUserExtsIncMods(fvName, "IMAGES", 1, saa);\r
+            ffc.getUserExtsIncMods(fvName, "IMAGES", "1", saa);\r

 \r
             for (int i = 0; i < size; ++i) {\r
                 String moduleKey = saa[i][0] + " " + saa[i][1] + " " + saa[i][2] + " " + saa[i][3];\r
 \r
             for (int i = 0; i < size; ++i) {\r
                 String moduleKey = saa[i][0] + " " + saa[i][1] + " " + saa[i][2] + " " + saa[i][3];\r


@@ -3110,7 +3110,7 @@ class ModuleOrderPane extends JPanel implements ActionListener{
                 ffc.updateFvBindingInModuleSA(moduleInfo, title);\r
                 \r
             }\r
                 ffc.updateFvBindingInModuleSA(moduleInfo, title);\r
                 \r
             }\r

-            ffc.removeBuildOptionsUserExtensions(title, "IMAGES", 1);\r
+            ffc.removeBuildOptionsUserExtensions(title, "IMAGES", "1");\r

             ffc.genBuildOptionsUserExtensions(title, "IMAGES", "1", outputFileName, vModInFv);\r
             \r
         }\r
             ffc.genBuildOptionsUserExtensions(title, "IMAGES", "1", outputFileName, vModInFv);\r
             \r
         }\r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
index 9e2aa0cb1280d07651381bead7a211c68a370b47..7e3faa969b62fce46390816b5c7d12f3c8fde2c9 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
@@ -760,7 +760,7 @@ public class FpdFrameworkModules extends IInternalFrame {
                     if (fvBindings != null) {\r
                         String[] fvArray = fvBindings.split(" ");\r
                         for (int i = 0; i < fvArray.length; ++i) {\r
                     if (fvBindings != null) {\r
                         String[] fvArray = fvBindings.split(" ");\r
                         for (int i = 0; i < fvArray.length; ++i) {\r

-                            ffc.removeModuleInBuildOptionsUserExtensions(fvArray[i].trim(), "IMAGES", 1, mg, mv, pg, pv, arch);\r
+                            ffc.removeModuleInBuildOptionsUserExtensions(fvArray[i].trim(), "IMAGES", "1", mg, mv, pg, pv, arch);\r

                         }\r
                     }\r
                     \r
                         }\r
                     }\r
                     \r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
index 9b5ec73b6565684e9d5f4a31a141d1191bc36438..92519f656d82d582835f0724271137fe6652a8fa 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
@@ -1401,7 +1401,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
                     //\r
                     oldFvList.removeAll(newFvList);\r
                     for (int j = 0; j < oldFvList.size(); ++j) {\r
                     //\r
                     oldFvList.removeAll(newFvList);\r
                     for (int j = 0; j < oldFvList.size(); ++j) {\r

-                        ffc.removeModuleInBuildOptionsUserExtensions(oldFvList.get(j), "IMAGES", 1, moduleInfo[0], moduleInfo[1], moduleInfo[2], moduleInfo[3], moduleInfo[4]);    \r
+                        ffc.removeModuleInBuildOptionsUserExtensions(oldFvList.get(j), "IMAGES", "1", moduleInfo[0], moduleInfo[1], moduleInfo[2], moduleInfo[3], moduleInfo[4]);    \r

                     }\r
                     //\r
                     // add module to Fvs that were not in oldFvList.\r
                     }\r
                     //\r
                     // add module to Fvs that were not in oldFvList.\r


@@ -1409,7 +1409,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
                     oldFvList = getVectorFromString (originalFvBinding);\r
                     newFvList.removeAll(oldFvList);\r
                     for (int i = 0; i < newFvList.size(); ++i) {\r
                     oldFvList = getVectorFromString (originalFvBinding);\r
                     newFvList.removeAll(oldFvList);\r
                     for (int i = 0; i < newFvList.size(); ++i) {\r

-                        ffc.addModuleIntoBuildOptionsUserExtensions(newFvList.get(i), "IMAGES", 1, moduleInfo[0], moduleInfo[1], moduleInfo[2], moduleInfo[3], moduleInfo[4]);\r
+                        ffc.addModuleIntoBuildOptionsUserExtensions(newFvList.get(i), "IMAGES", "1", moduleInfo[0], moduleInfo[1], moduleInfo[2], moduleInfo[3], moduleInfo[4]);\r

                     }\r
                     docConsole.setSaved(false);\r
                 }\r
                     }\r
                     docConsole.setSaved(false);\r
                 }\r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/GenAprioriFileDialog.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/GenAprioriFileDialog.java
index 3ec3572411c7fe9794b4ee3ca36c9d8606b433c9..401772f28ac81fb73bb5f6664329754df7c91dc7 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/GenAprioriFileDialog.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/GenAprioriFileDialog.java
@@ -207,9 +207,9 @@ private class AprioriModuleOrderPane extends ModuleOrderPane {
     }\r
     \r
     public void showModulesInFv (String fvName) {\r
     }\r
     \r
     public void showModulesInFv (String fvName) {\r

-        int id = 1;\r
+        String id = "1";\r

         if (forPEI) {\r
         if (forPEI) {\r

-            id = 0;\r
+            id = "0";\r

         }\r
         int size = ffc.getUserExtsIncModCount(fvName, "APRIORI", id);\r
         \r
         }\r
         int size = ffc.getUserExtsIncModCount(fvName, "APRIORI", id);\r
         \r


@@ -233,9 +233,9 @@ private class AprioriModuleOrderPane extends ModuleOrderPane {
     \r
     public void actionPerformed(ActionEvent arg0) {\r
         if (arg0.getActionCommand().equals("ModuleOrderPaneOk")) {\r
     \r
     public void actionPerformed(ActionEvent arg0) {\r
         if (arg0.getActionCommand().equals("ModuleOrderPaneOk")) {\r

-            int id = 1;\r
+            String id = "1";\r

             if (forPEI) {\r
             if (forPEI) {\r

-                id = 0;\r
+                id = "0";\r

             }\r
             \r
             Vector<String[]> vModInFv = new Vector<String[]>();\r
             }\r
             \r
             Vector<String[]> vModInFv = new Vector<String[]>();\r


@@ -257,7 +257,7 @@ private class AprioriModuleOrderPane extends ModuleOrderPane {
             }\r
             \r
             ffc.removeBuildOptionsUserExtensions(fvName, "APRIORI", id);\r
             }\r
             \r
             ffc.removeBuildOptionsUserExtensions(fvName, "APRIORI", id);\r

-            ffc.genBuildOptionsUserExtensions(fvName, "APRIORI", id+"", "", vModInFv);\r
+            ffc.genBuildOptionsUserExtensions(fvName, "APRIORI", id, "", vModInFv);\r

             \r
         }\r
     }\r
             \r
         }\r
     }\r