1. Add scroll bars to Package Library Class Declarations editor.

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / packaging / ui / SpdPpiDecls.java

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPpiDecls.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPpiDecls.java
index f03b5cb3df3e9d5b03c7ae260d4aa3969b95d248..dcf608537b480be35d7db3bc331886b2cb430928 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPpiDecls.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPpiDecls.java
@@ -51,12 +51,7 @@ public class SpdPpiDecls extends SpdGuidDecls {
     protected void initFrame() {\r
         \r
         this.setTitle("PPI Declarations");\r
-        getJScrollPaneGuid().setVisible(false);\r
-        getJLabel3().setVisible(false);\r
         \r
-        getJTable().getColumn("GuidTypes").setPreferredWidth(0);\r
-        getJTable().getColumn("GuidTypes").setWidth(0);\r
-        getJTable().getColumn("GuidTypes").setHeaderValue(" ");\r
     }\r
     \r
     protected void init(SpdFileContents sfc){\r
@@ -67,7 +62,7 @@ public class SpdPpiDecls extends SpdGuidDecls {
         if (sfc.getSpdPpiDeclarationCount() == 0) {\r
             return ;\r
         }\r
-        String[][] saa = new String[sfc.getSpdPpiDeclarationCount()][6];\r
+        String[][] saa = new String[sfc.getSpdPpiDeclarationCount()][7];\r
         sfc.getSpdPpiDeclarations(saa);\r
         int i = 0;\r
         while (i < saa.length) {\r
@@ -89,12 +84,16 @@ public class SpdPpiDecls extends SpdGuidDecls {
         if (m.getValueAt(row, 5) != null) {\r
             modTypeList = m.getValueAt(row, 5).toString();\r
         }\r
+        String guidTypeList = null;\r
+        if (m.getValueAt(row, 6) != null) {\r
+            guidTypeList = m.getValueAt(row, 6).toString();\r
+        }\r
         String[] rowData = {name, cName, guid, help};\r
         if (!dataValidation(rowData)){\r
             return;\r
         }\r
         docConsole.setSaved(false);\r
-        sfc.updateSpdPpiDecl(row, name, cName, guid, help, archList, modTypeList);\r
+        sfc.updateSpdPpiDecl(row, name, cName, guid, help, archList, modTypeList, guidTypeList);\r
     }\r
     \r
     protected void addRow(String[] row) {\r
@@ -103,7 +102,7 @@ public class SpdPpiDecls extends SpdGuidDecls {
             return;\r
         }\r
         docConsole.setSaved(false);\r
-        sfc.genSpdPpiDeclarations(row[0], row[1], row[2], row[3], stringToVector(row[4]), stringToVector(row[5]));\r
+        sfc.genSpdPpiDeclarations(row[0], row[1], row[2], row[3], stringToVector(row[4]), stringToVector(row[5]), stringToVector(row[6]));\r
     }\r
     \r
     protected void removeRow(int i){\r