Adjust module order list after specifying FvBinding for ModuleSA.

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
index dae2aed050218f2895551708dbcb5c8873f01572..8af4bea28ac27255ec4ba0866b6bd3cb834d99d0 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
@@ -306,6 +306,13 @@ public class FpdBuildOptions extends IInternalFrame {
     private JPanel jPanelTableOptionsContainer = null;\r
 \r
     private JLabel jLabelTableOptionsTitle = null;\r
     private JPanel jPanelTableOptionsContainer = null;\r
 \r
     private JLabel jLabelTableOptionsTitle = null;\r

+    \r
+    private final int buildTargetWidth = 150;\r
+    private final int toolChainFamilyWidth = 150;\r
+    private final int supportArchWidth = 150;\r
+    private final int toolCmdCodeWidth = 200;\r
+    private final int tagNameWidth = 150;\r
+    private final int argWidth = 400;\r

 \r
     /**\r
      * This method initializes jPanel  \r
 \r
     /**\r
      * This method initializes jPanel  \r


@@ -1764,6 +1771,13 @@ public class FpdBuildOptions extends IInternalFrame {
             optionsTableModel.addColumn("Tool Command Code");\r
             optionsTableModel.addColumn("TagName");\r
             optionsTableModel.addColumn("Arguments");\r
             optionsTableModel.addColumn("Tool Command Code");\r
             optionsTableModel.addColumn("TagName");\r
             optionsTableModel.addColumn("Arguments");\r

+            \r
+            jTableOptions.getColumnModel().getColumn(0).setMinWidth(buildTargetWidth);\r
+            jTableOptions.getColumnModel().getColumn(1).setMinWidth(toolChainFamilyWidth);\r
+            jTableOptions.getColumnModel().getColumn(2).setMinWidth(supportArchWidth);\r
+            jTableOptions.getColumnModel().getColumn(3).setMinWidth(toolCmdCodeWidth);\r
+            jTableOptions.getColumnModel().getColumn(4).setMinWidth(tagNameWidth);\r
+            jTableOptions.getColumnModel().getColumn(5).setMinWidth(argWidth);\r

 \r
 //            javax.swing.table.TableColumn toolFamilyCol = jTableOptions.getColumnModel().getColumn(1);\r
 //            JComboBox cb = new JComboBox();\r
 \r
 //            javax.swing.table.TableColumn toolFamilyCol = jTableOptions.getColumnModel().getColumn(1);\r
 //            JComboBox cb = new JComboBox();\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 5f4e0b522eeb17e69ae43a7175400f97f80abcd4..3903f97de03b7df718ba024a9640397f4d94c693 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
@@ -2039,6 +2039,45 @@ public class FpdFileContents {
         }\r
     }\r
     \r
         }\r
     }\r
     \r

+    public void addModuleIntoBuildOptionsUserExtensions (String fvName, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r
+        if (moduleInBuildOptionsUserExtensions (fvName, moduleGuid, moduleVersion, packageGuid, packageVersion, arch)) {\r
+            return;\r
+        }\r
+        ListIterator<UserExtensionsDocument.UserExtensions> li = getfpdBuildOpts().getUserExtensionsList().listIterator();\r
+        QName elementIncludeModules = new QName(xmlNs, "IncludeModules");\r
+        QName elementModule = new QName(xmlNs, "Module");\r
+        while (li.hasNext()) {\r
+            UserExtensionsDocument.UserExtensions ues = li.next();\r
+            if (!ues.getUserID().equals("IMAGES")) {\r
+                continue;\r
+            }\r
+            XmlCursor cursor = ues.newCursor();\r
+            cursor.toFirstChild();\r
+            String elementName = cursor.getTextValue();\r
+            if (elementName.equals(fvName)) {\r
+                cursor.toNextSibling(elementIncludeModules);\r
+                cursor.toLastChild();\r
+                cursor.toEndToken();\r
+                cursor.toNextToken();\r
+                cursor.beginElement(elementModule);\r
+                cursor.insertAttributeWithValue("ModuleGuid", moduleGuid);\r
+                if (!moduleVersion.equals("null") && moduleVersion.length() != 0) {\r
+                    cursor.insertAttributeWithValue("ModuleVersion", moduleVersion);\r
+                }\r
+                cursor.insertAttributeWithValue("PackageGuid", packageGuid);\r
+                if (!packageVersion.equals("null") && packageVersion.length() != 0) {\r
+                    cursor.insertAttributeWithValue("PackageVersion", packageVersion);\r
+                }\r
+                \r
+                cursor.insertAttributeWithValue("Arch", arch);\r
+                cursor.dispose();\r
+                return;\r
+            }\r
+            cursor.dispose();\r
+        }\r
+        \r
+    }\r
+    \r

     public void genBuildOptionsUserDefAntTask (String id, String fileName, String execOrder) {\r
         UserDefinedAntTasksDocument.UserDefinedAntTasks udats = getfpdBuildOpts().getUserDefinedAntTasks();\r
         if (udats == null) {\r
     public void genBuildOptionsUserDefAntTask (String id, String fileName, String execOrder) {\r
         UserDefinedAntTasksDocument.UserDefinedAntTasks udats = getfpdBuildOpts().getUserDefinedAntTasks();\r
         if (udats == null) {\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 2e5bbd756859f541bdfcb229390375ebe9c6952f..2d1142301caaa7f6df4fd184a2a4374650b5f303 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
@@ -668,7 +668,7 @@ public class FpdFrameworkModules extends IInternalFrame {
         }\r
         catch (Exception exp) {\r
             JOptionPane.showMessageDialog(frame, exp.getMessage());\r
         }\r
         catch (Exception exp) {\r
             JOptionPane.showMessageDialog(frame, exp.getMessage());\r

-            return;\r
+//            return;\r

         }\r
         \r
         if (settingDlg == null) {\r
         }\r
         \r
         if (settingDlg == null) {\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 4d23bec664352e10a53205b2cf7a0de167733bdc..b358652e03a398dfe2189db7b23c12f5d25ce5fe 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
@@ -124,6 +124,14 @@ public class FpdModuleSA extends JDialog implements ActionListener {
     private JPanel jPanelToolchainS = null;\r
     private JPanel jPanelLibraryCenterN = null;\r
     private JPanel jPanelLibraryCenterC = null;  //  @jve:decl-index=0:visual-constraint="20,224"\r
     private JPanel jPanelToolchainS = null;\r
     private JPanel jPanelLibraryCenterN = null;\r
     private JPanel jPanelLibraryCenterC = null;  //  @jve:decl-index=0:visual-constraint="20,224"\r

+    \r
+    private final int buildTargetWidth = 150;\r
+    private final int toolChainFamilyWidth = 150;\r
+    private final int supportArchWidth = 150;\r
+    private final int toolCmdCodeWidth = 200;\r
+    private final int tagNameWidth = 150;\r
+    private final int argWidth = 400;\r
+    \r

     /**\r
      * This is the default constructor\r
      */\r
     /**\r
      * This is the default constructor\r
      */\r


@@ -1147,8 +1155,14 @@ public class FpdModuleSA extends JDialog implements ActionListener {
                     if (newFvBinding.length() == 0 && originalFvBinding == null) {\r
                         return;\r
                     }\r
                     if (newFvBinding.length() == 0 && originalFvBinding == null) {\r
                         return;\r
                     }\r

-                    docConsole.setSaved(false);\r
+                    \r

                     ffc.setFvBinding(moduleKey, newFvBinding);\r
                     ffc.setFvBinding(moduleKey, newFvBinding);\r

+                    String moduleInfo[] = moduleKey.split(" ");\r
+                    String fvNames[] = newFvBinding.split(" ");\r
+                    for (int i = 0; i < fvNames.length; ++i) {\r
+                        ffc.addModuleIntoBuildOptionsUserExtensions(fvNames[i], moduleInfo[0], moduleInfo[1], moduleInfo[2], moduleInfo[3], moduleInfo[4]);\r
+                    }\r
+                    docConsole.setSaved(false);\r

                 }\r
             });\r
             \r
                 }\r
             });\r
             \r


@@ -1250,6 +1264,12 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             jTableModuleSaOptions = new JTable(optionsTableModel);\r
             jTableModuleSaOptions.setRowHeight(20);\r
             \r
             jTableModuleSaOptions = new JTable(optionsTableModel);\r
             jTableModuleSaOptions.setRowHeight(20);\r
             \r

+            jTableModuleSaOptions.getColumnModel().getColumn(0).setMinWidth(buildTargetWidth);\r
+            jTableModuleSaOptions.getColumnModel().getColumn(1).setMinWidth(toolChainFamilyWidth);\r
+            jTableModuleSaOptions.getColumnModel().getColumn(2).setMinWidth(tagNameWidth);\r
+            jTableModuleSaOptions.getColumnModel().getColumn(3).setMinWidth(toolCmdCodeWidth);\r
+            jTableModuleSaOptions.getColumnModel().getColumn(4).setMinWidth(supportArchWidth);\r
+            jTableModuleSaOptions.getColumnModel().getColumn(5).setMinWidth(argWidth);\r

 //            javax.swing.table.TableColumn toolFamilyCol = jTableModuleSaOptions.getColumnModel().getColumn(1);\r
 //            JComboBox cb = new JComboBox();\r
 //            cb.addItem("MSFT");\r
 //            javax.swing.table.TableColumn toolFamilyCol = jTableModuleSaOptions.getColumnModel().getColumn(1);\r
 //            JComboBox cb = new JComboBox();\r
 //            cb.addItem("MSFT");\r