From 253fca1de30a5c66f9f171e97151b41f7153f417 Mon Sep 17 00:00:00 2001 From: jlin16 Date: Thu, 25 Jan 2007 03:23:39 +0000 Subject: [PATCH] Change parameter id in UserExtension element from Integer to String according to EDKT510 schema change. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2309 6f19259b-4bc3-4df7-8a09-765794883524 --- .../frameworkwizard/FrameworkWizardUI.java | 20 ++++++++-------- .../platform/ui/FpdFileContents.java | 24 +++++++++---------- .../frameworkwizard/platform/ui/FpdFlash.java | 6 ++--- .../platform/ui/FpdFrameworkModules.java | 2 +- .../platform/ui/FpdModuleSA.java | 4 ++-- .../platform/ui/GenAprioriFileDialog.java | 10 ++++---- 6 files changed, 33 insertions(+), 33 deletions(-) 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 c3452d7b4c..7ffb84b42e 100644 --- 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 // // Show splash screen // - SplashScreen ss = new SplashScreen(); - ss.setVisible(true); + //SplashScreen ss = new SplashScreen(); + //ss.setVisible(true); // // Init Global Data @@ -1835,7 +1835,7 @@ public class FrameworkWizardUI extends IFrame implements KeyListener, MouseListe // // Close splash screen // - ss.dispose(); + //ss.dispose(); // // Init the frame @@ -2655,7 +2655,7 @@ public class FrameworkWizardUI extends IFrame implements KeyListener, MouseListe String path = null; IDefaultMutableTreeNode belongNode = null; - try { +// try { // // Get selected tree node // @@ -2720,12 +2720,12 @@ public class FrameworkWizardUI extends IFrame implements KeyListener, MouseListe .findIndexOfListById(new PlatformIdentification( id)); } - } catch (Exception e) { - Log.err("double click category: " + intCategory); - Log.err("double click belong node: " + belongNode.toString()); - Log.err("double click id path: " + id); - Log.err("double click exception: " + e.getMessage()); - } +// } catch (Exception e) { +// Log.err("double click category: " + intCategory); +// Log.err("double click belong node: " + belongNode.toString()); +// Log.err("double click id path: " + id); +// Log.err("double click exception: " + e.getMessage()); +// } } /** 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 d8dfb279ba..366e2e3022 100644 --- 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(); } - public int getUserExtsIncModCount (String fvName, String userId, int id) { + public int getUserExtsIncModCount (String fvName, String userId, String id) { if (getfpdBuildOpts().getUserExtensionsList() == null) { return -1; } @@ -1879,7 +1879,7 @@ public class FpdFileContents { if (!ues.getUserID().equals(userId)) { continue; } - if (ues.getIdentifier() == null || ues.getIdentifier() != new Integer(id).toString()) { + if (ues.getIdentifier() == null || !ues.getIdentifier().equals(id)) { continue; } XmlCursor cursor = ues.newCursor(); @@ -1901,7 +1901,7 @@ public class FpdFileContents { return -1; } - public void getUserExtsIncMods(String fvName, String userId, int id, String[][] saa) { + public void getUserExtsIncMods(String fvName, String userId, String id, String[][] saa) { if (getfpdBuildOpts().getUserExtensionsList() == null) { return; } @@ -1921,7 +1921,7 @@ public class FpdFileContents { if (cursor.toChild(elementUserExts)) { do { cursor.push(); - if (cursor.getAttributeText(attribUserId).equals(userId) && cursor.getAttributeText(attribId).equals(id+"")) { + if (cursor.getAttributeText(attribUserId).equals(userId) && cursor.getAttributeText(attribId).equals(id)) { cursor.toChild(elementFvName); String elementName = cursor.getTextValue(); if (elementName.equals(fvName)) { @@ -1968,7 +1968,7 @@ public class FpdFileContents { } - public void removeBuildOptionsUserExtensions (String fvName, String userId, int id) { + public void removeBuildOptionsUserExtensions (String fvName, String userId, String id) { if (getfpdBuildOpts().getUserExtensionsList() == null) { return; } @@ -1979,7 +1979,7 @@ public class FpdFileContents { if (!ues.getUserID().equals(userId)) { continue; } - if (ues.getIdentifier()== null || ues.getIdentifier() != new Integer(id).toString()) { + if (ues.getIdentifier()== null || !ues.getIdentifier().equals(id)) { continue; } XmlCursor cursor = ues.newCursor(); @@ -2010,7 +2010,7 @@ public class FpdFileContents { return false; } - public boolean moduleInBuildOptionsUserExtensions (String fvName, String userId, int id, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) { + public boolean moduleInBuildOptionsUserExtensions (String fvName, String userId, String id, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) { boolean inList = false; if (getUserExtsIncModCount(fvName, userId, id) > 0) { XmlCursor cursor = getfpdBuildOpts().newCursor(); @@ -2028,7 +2028,7 @@ public class FpdFileContents { if (cursor.toChild(elementUserExts)) { do { cursor.push(); - if (cursor.getAttributeText(attribUserId).equals(userId) && cursor.getAttributeText(attribId).equals(id+"")) { + if (cursor.getAttributeText(attribUserId).equals(userId) && cursor.getAttributeText(attribId).equals(id)) { cursor.toChild(elementFvName); String elementName = cursor.getTextValue(); if (elementName.equals(fvName)) { @@ -2071,7 +2071,7 @@ public class FpdFileContents { return inList; } - public void removeModuleInBuildOptionsUserExtensions (String fvName, String userId, int id, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) { + public void removeModuleInBuildOptionsUserExtensions (String fvName, String userId, String id, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) { // // if there is only one module before remove operation, the whole user extension should be removed. // @@ -2097,7 +2097,7 @@ public class FpdFileContents { if (cursor.toChild(elementUserExts)) { do { cursor.push(); - if (cursor.getAttributeText(attribUserId).equals(userId) && cursor.getAttributeText(attribId).equals(id+"")) { + if (cursor.getAttributeText(attribUserId).equals(userId) && cursor.getAttributeText(attribId).equals(id)) { cursor.toChild(elementFvName); String elementName = cursor.getTextValue(); if (elementName.equals(fvName)) { @@ -2138,7 +2138,7 @@ public class FpdFileContents { } } - public void addModuleIntoBuildOptionsUserExtensions (String fvName, String userId, int id, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) { + public void addModuleIntoBuildOptionsUserExtensions (String fvName, String userId, String id, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) { if (moduleInBuildOptionsUserExtensions (fvName, userId, id, moduleGuid, moduleVersion, packageGuid, packageVersion, arch)) { return; } @@ -2151,7 +2151,7 @@ public class FpdFileContents { if (!ues.getUserID().equals(userId)) { continue; } - if (ues.getIdentifier() == null || ues.getIdentifier() != new Integer(id).toString()) { + if (ues.getIdentifier() == null || !ues.getIdentifier().equals(id)) { continue; } XmlCursor cursor = ues.newCursor(); 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 0561728848..29a6219e51 100644 --- 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) { return; } - int size = ffc.getUserExtsIncModCount(fvName, "IMAGES", 1); + int size = ffc.getUserExtsIncModCount(fvName, "IMAGES", "1"); if (size != -1) { String[][] saa = new String[size][5]; - ffc.getUserExtsIncMods(fvName, "IMAGES", 1, saa); + ffc.getUserExtsIncMods(fvName, "IMAGES", "1", saa); for (int i = 0; i < size; ++i) { String moduleKey = saa[i][0] + " " + saa[i][1] + " " + saa[i][2] + " " + saa[i][3]; @@ -3110,7 +3110,7 @@ class ModuleOrderPane extends JPanel implements ActionListener{ ffc.updateFvBindingInModuleSA(moduleInfo, title); } - ffc.removeBuildOptionsUserExtensions(title, "IMAGES", 1); + ffc.removeBuildOptionsUserExtensions(title, "IMAGES", "1"); ffc.genBuildOptionsUserExtensions(title, "IMAGES", "1", outputFileName, vModInFv); } 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 9e2aa0cb12..7e3faa969b 100644 --- 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) { String[] fvArray = fvBindings.split(" "); for (int i = 0; i < fvArray.length; ++i) { - ffc.removeModuleInBuildOptionsUserExtensions(fvArray[i].trim(), "IMAGES", 1, mg, mv, pg, pv, arch); + ffc.removeModuleInBuildOptionsUserExtensions(fvArray[i].trim(), "IMAGES", "1", mg, mv, pg, pv, arch); } } 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 9b5ec73b65..92519f656d 100644 --- 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 { // oldFvList.removeAll(newFvList); for (int j = 0; j < oldFvList.size(); ++j) { - ffc.removeModuleInBuildOptionsUserExtensions(oldFvList.get(j), "IMAGES", 1, moduleInfo[0], moduleInfo[1], moduleInfo[2], moduleInfo[3], moduleInfo[4]); + ffc.removeModuleInBuildOptionsUserExtensions(oldFvList.get(j), "IMAGES", "1", moduleInfo[0], moduleInfo[1], moduleInfo[2], moduleInfo[3], moduleInfo[4]); } // // add module to Fvs that were not in oldFvList. @@ -1409,7 +1409,7 @@ public class FpdModuleSA extends JDialog implements ActionListener { oldFvList = getVectorFromString (originalFvBinding); newFvList.removeAll(oldFvList); for (int i = 0; i < newFvList.size(); ++i) { - ffc.addModuleIntoBuildOptionsUserExtensions(newFvList.get(i), "IMAGES", 1, moduleInfo[0], moduleInfo[1], moduleInfo[2], moduleInfo[3], moduleInfo[4]); + ffc.addModuleIntoBuildOptionsUserExtensions(newFvList.get(i), "IMAGES", "1", moduleInfo[0], moduleInfo[1], moduleInfo[2], moduleInfo[3], moduleInfo[4]); } docConsole.setSaved(false); } 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 3ec3572411..401772f28a 100644 --- 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 { } public void showModulesInFv (String fvName) { - int id = 1; + String id = "1"; if (forPEI) { - id = 0; + id = "0"; } int size = ffc.getUserExtsIncModCount(fvName, "APRIORI", id); @@ -233,9 +233,9 @@ private class AprioriModuleOrderPane extends ModuleOrderPane { public void actionPerformed(ActionEvent arg0) { if (arg0.getActionCommand().equals("ModuleOrderPaneOk")) { - int id = 1; + String id = "1"; if (forPEI) { - id = 0; + id = "0"; } Vector vModInFv = new Vector(); @@ -257,7 +257,7 @@ private class AprioriModuleOrderPane extends ModuleOrderPane { } ffc.removeBuildOptionsUserExtensions(fvName, "APRIORI", id); - ffc.genBuildOptionsUserExtensions(fvName, "APRIORI", id+"", "", vModInFv); + ffc.genBuildOptionsUserExtensions(fvName, "APRIORI", id, "", vModInFv); } }