fix EDKT189.

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
index 56bebc577002f47a75c40161b677b7c7a39c0bb3..27533b41376a31eef5076bf9d2685ece72accef0 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
@@ -259,15 +259,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
                     this.classProduced.add(classProduced[i]);\r
                 }\r
             }\r
-            //\r
-            // Get classes unresolved\r
-            //\r
-//            Iterator<String> lip = this.classProduced.listIterator();\r
-//            while(lip.hasNext()){\r
-//                String clsProduced = lip.next();\r
-//                this.classConsumed.remove(clsProduced);\r
-//\r
-//            }\r
+            \r
             //\r
             // find potential instances in all dependency pkgs for classes still in classConsumed.\r
             //\r
@@ -551,8 +543,9 @@ public class FpdModuleSA extends JDialog implements ActionListener {
                     else{\r
                         int selectedRow = lsm.getMinSelectionIndex();\r
                         String cName = jTablePcd.getValueAt(selectedRow, 0)+"";\r
+                        String tsGuid = jTablePcd.getValueAt(selectedRow, 1)+"";\r
                         String[] pcdInfo = {"", ""};\r
-                        getPcdInfo(cName, pcdInfo);\r
+                        getPcdInfo(cName, tsGuid, pcdInfo);\r
                         jTextAreaPcdHelp.setText(pcdInfo[0]);\r
                         initComboBox(pcdInfo[1]);\r
                         jComboBoxItemType.setSelectedItem(pcdInfo[1]);\r
@@ -632,17 +625,17 @@ public class FpdModuleSA extends JDialog implements ActionListener {
         }\r
     }\r
     \r
-    private void getPcdInfo(String cName, String[] sa) {\r
+    private void getPcdInfo(String cName, String tsGuid, String[] sa) {\r
         String[][] saa = new String[ffc.getLibraryInstancesCount(moduleKey)][5];\r
         ffc.getLibraryInstances(moduleKey, saa);\r
         \r
         try{\r
-            if (ffc.getPcdBuildDataInfo(GlobalData.getModuleId(moduleKey), cName, sa)) {\r
+            if (ffc.getPcdBuildDataInfo(GlobalData.getModuleId(moduleKey), cName, tsGuid, sa)) {\r
                 return;\r
             }\r
             for (int j = 0; j < saa.length; ++j) {\r
                 if (ffc.getPcdBuildDataInfo(GlobalData.getModuleId(saa[j][1] + " " + saa[j][2] + " " + saa[j][3] + " " + saa[j][4]),\r
-                                            cName, sa)) {\r
+                                            cName, tsGuid, sa)) {\r
                     return;\r
                 }\r
             }\r
@@ -791,7 +784,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             selectedInstancesTableModel.addColumn("PackageVersion");\r
             jTableSelectedInstances = new JTable(selectedInstancesTableModel);\r
             jTableSelectedInstances.setRowHeight(20);\r
-            jTableSelectedInstances.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
+            jTableSelectedInstances.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_SUBSEQUENT_COLUMNS);\r
             jTableSelectedInstances.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
             \r
         }\r
@@ -896,7 +889,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             libInstanceTableModel.addColumn("PackageVersion");\r
             jTableLibInstances = new JTable(libInstanceTableModel);\r
             jTableLibInstances.setRowHeight(20);\r
-            jTableLibInstances.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
+            jTableLibInstances.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_SUBSEQUENT_COLUMNS);\r
             jTableLibInstances.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
             \r
         }\r
@@ -1093,6 +1086,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             jLabelFfsFileGuid = new JLabel();\r
             jLabelFfsFileGuid.setText("FFS File GUID");\r
             jLabelFfsFileGuid.setPreferredSize(new java.awt.Dimension(90,16));\r
+            jLabelFfsFileGuid.setVisible(false);\r
             jLabelFvBinding = new JLabel();\r
             jLabelFvBinding.setText("FV Binding");\r
             jLabelFvBinding.setPreferredSize(new java.awt.Dimension(90,16));\r
@@ -1152,6 +1146,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
         if (jTextFieldFileGuid == null) {\r
             jTextFieldFileGuid = new JTextField();\r
             jTextFieldFileGuid.setPreferredSize(new java.awt.Dimension(300,20));\r
+            jTextFieldFileGuid.setVisible(false);\r
             jTextFieldFileGuid.addFocusListener(new java.awt.event.FocusAdapter() {\r
                 public void focusLost(java.awt.event.FocusEvent e) {\r
                     String originalFileGuid = ffc.getFfsFileNameGuid(moduleKey);\r