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

2. Add GuidType UI support to protocol and ppi declarations according to latest schema.

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java
index a71421a82ea8b40d4caff3a66ee7e4873be78157..a66861c30ca9b3170cf185a7f206f89d06c2d43c 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java
@@ -436,7 +436,7 @@ public class SpdFileContents {
     }\r
     \r
     public void updateSpdPpiDecl(int i, String name, String cName, String guid, String hlp, String archList, \r
-                                 String modTypeList){\r
+                                 String modTypeList, String guidTypeList){\r
         XmlObject o = psaRoot.getPpiDeclarations();\r
         if (o == null){\r
             return;\r
@@ -452,6 +452,14 @@ public class SpdFileContents {
             e.setCName(cName);\r
             e.setGuidValue(guid);\r
             e.setHelpText(hlp);\r
+            if (stringToList(guidTypeList) != null) {\r
+                e.setGuidTypeList(stringToList(guidTypeList));\r
+            }\r
+            else{\r
+                if (e.isSetGuidTypeList()) {\r
+                  e.unsetGuidTypeList();\r
+                }\r
+            }\r
             if (stringToList(archList) != null){\r
                 e.setSupArchList(stringToList(archList));\r
             }\r
@@ -473,7 +481,7 @@ public class SpdFileContents {
     }\r
     \r
     public void updateSpdProtocolDecl(int i, String name, String cName, String guid, String hlp, String archList, \r
-                                      String modTypeList){\r
+                                      String modTypeList, String guidTypeList){\r
         XmlObject o = psaRoot.getProtocolDeclarations();\r
         if (o == null){\r
             return;\r
@@ -489,6 +497,14 @@ public class SpdFileContents {
             e.setCName(cName);\r
             e.setGuidValue(guid);\r
             e.setHelpText(hlp);\r
+            if (stringToList(guidTypeList) != null) {\r
+                e.setGuidTypeList(stringToList(guidTypeList));\r
+              }\r
+            else{\r
+                if (e.isSetGuidTypeList()) {\r
+                  e.unsetGuidTypeList();\r
+                }\r
+            }\r
             if (stringToList(archList) != null){\r
                 e.setSupArchList(stringToList(archList));\r
             }\r
@@ -792,6 +808,7 @@ public class SpdFileContents {
             protocol[i][3] = e.getHelpText();\r
             protocol[i][4] = listToString(e.getSupArchList());\r
             protocol[i][5] = listToString(e.getSupModuleList());\r
+            protocol[i][6] = listToString(e.getGuidTypeList());\r
             i++;\r
         }\r
     }\r
@@ -831,7 +848,7 @@ public class SpdFileContents {
             ppi[i][3] = e.getHelpText();\r
             ppi[i][4] = listToString(e.getSupArchList());\r
             ppi[i][5] = listToString(e.getSupModuleList());\r
-\r
+            ppi[i][6] = listToString(e.getGuidTypeList());\r
             i++;\r
         }\r
     }\r
@@ -1171,13 +1188,13 @@ public class SpdFileContents {
    **/\r
     public void genSpdProtocolDeclarations(String protocolDeclEntryName, String protocolDeclCName,\r
                                            String protocolDeclGuid, String protocolDeclFeatureFlag,\r
-                                           Vector<String> archList, Vector<String> modTypeList) {\r
+                                           Vector<String> archList, Vector<String> modTypeList, Vector<String> guidTypeList) {\r
         if (getSpdProtocolDeclarations() == null) {\r
             spdProtocolDeclarations = psaRoot.addNewProtocolDeclarations();\r
         }\r
 \r
         setSpdEntry(protocolDeclEntryName, protocolDeclCName, protocolDeclGuid, protocolDeclFeatureFlag,\r
-                    archList, modTypeList, null, spdProtocolDeclarations);\r
+                    archList, modTypeList, guidTypeList, spdProtocolDeclarations);\r
     }\r
 \r
     /**\r
@@ -1189,12 +1206,12 @@ public class SpdFileContents {
     @param ppiDeclFeatureFlag Reserved\r
    **/\r
     public void genSpdPpiDeclarations(String ppiDeclEntryName, String ppiDeclCName, String ppiDeclGuid,\r
-                                      String ppiDeclFeatureFlag, Vector<String> archList, Vector<String> modTypeList) {\r
+                                      String ppiDeclFeatureFlag, Vector<String> archList, Vector<String> modTypeList, Vector<String> guidTypeList) {\r
         if (getSpdPpiDeclarations() == null) {\r
             spdPpiDeclarations = psaRoot.addNewPpiDeclarations();\r
         }\r
 \r
-        setSpdEntry(ppiDeclEntryName, ppiDeclCName, ppiDeclGuid, ppiDeclFeatureFlag, archList, modTypeList, null, spdPpiDeclarations);\r
+        setSpdEntry(ppiDeclEntryName, ppiDeclCName, ppiDeclGuid, ppiDeclFeatureFlag, archList, modTypeList, guidTypeList, spdPpiDeclarations);\r
     }\r
 \r
     /**\r
@@ -1250,6 +1267,14 @@ public class SpdFileContents {
             pe.setCName(cName);\r
             pe.setGuidValue(guid);\r
             pe.setHelpText(help);\r
+            if (guidTypeList != null) {\r
+                pe.setGuidTypeList(guidTypeList);\r
+            }\r
+            else{\r
+                if (pe.isSetGuidTypeList()) {\r
+                    pe.unsetGuidTypeList();\r
+                }\r
+            }\r
             if (archList != null) {\r
                 pe.setSupArchList(archList);\r
             }\r
@@ -1276,6 +1301,14 @@ public class SpdFileContents {
             ppe.setCName(cName);\r
             ppe.setGuidValue(guid);\r
             ppe.setHelpText(help);\r
+            if (guidTypeList != null) {\r
+                ppe.setGuidTypeList(guidTypeList);\r
+            }\r
+            else{\r
+                if (ppe.isSetGuidTypeList()) {\r
+                    ppe.unsetGuidTypeList();\r
+                }\r
+            }\r
             if (archList != null) {\r
                 ppe.setSupArchList(archList);\r
             }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
index 51c8ee9a757398352a42e1f803c719f316a282dd..04a62ce166072fa0164884665969bf3e5a9e572a 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
@@ -201,7 +201,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
         if (jScrollPane == null) {\r
             jScrollPane = new JScrollPane();\r
             jScrollPane.setBounds(new java.awt.Rectangle(12,351,608,253));\r
-            jScrollPane.setPreferredSize(new java.awt.Dimension(390,150));\r
+            jScrollPane.setPreferredSize(new java.awt.Dimension(500,419));\r
             jScrollPane.setViewportView(getJTable());\r
         }\r
         return jScrollPane;\r
@@ -316,7 +316,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             jButtonAdd = new JButton();\r
             jButtonAdd.setText("Add");\r
             jButtonAdd.setSize(new java.awt.Dimension(99,20));\r
-            jButtonAdd.setLocation(new java.awt.Point(321,326));\r
+            jButtonAdd.setBounds(new java.awt.Rectangle(321,326,99,20));\r
             jButtonAdd.addActionListener(this);\r
         }\r
         return jButtonAdd;\r
@@ -332,7 +332,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             jButtonRemove = new JButton();\r
             jButtonRemove.setText("Remove");\r
             jButtonRemove.setSize(new java.awt.Dimension(99,20));\r
-            jButtonRemove.setLocation(new java.awt.Point(424,326));\r
+            jButtonRemove.setBounds(new java.awt.Rectangle(424,326,99,20));\r
             jButtonRemove.addActionListener(this);\r
         }\r
         return jButtonRemove;\r
@@ -348,7 +348,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             jButtonRemoveAll = new JButton();\r
             jButtonRemoveAll.setText("Remove All");\r
             jButtonRemoveAll.setSize(new java.awt.Dimension(99,20));\r
-            jButtonRemoveAll.setLocation(new java.awt.Point(527,326));\r
+            jButtonRemoveAll.setBounds(new java.awt.Rectangle(527,326,99,20));\r
             jButtonRemoveAll.addActionListener(this);\r
         }\r
         return jButtonRemoveAll;\r
@@ -418,7 +418,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
     private JScrollPane getJContentPane(){\r
         if (topScrollPane == null){\r
           topScrollPane = new JScrollPane();\r
-          topScrollPane.setSize(new java.awt.Dimension(634,590));\r
+//          topScrollPane.setSize(new java.awt.Dimension(634,590));\r
           topScrollPane.setViewportView(getJContentPane1());\r
         }\r
         return topScrollPane;\r
@@ -470,7 +470,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             jLabel3RecInstName.setText("Recommended Instance Name");\r
             \r
             jContentPane = new JPanel();\r
-            jContentPane.setPreferredSize(new Dimension(480, 400));\r
+            jContentPane.setPreferredSize(new Dimension(680, 600));\r
             jContentPane.setLayout(null);\r
             jContentPane.add(jLabelHdr, null);\r
             jContentPane.add(jStarLabel1, null);\r

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdProtocolDecls.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdProtocolDecls.java
index d58fcef00ad21ced3f0ca848a77bd961f8b0a331..21cebb5cb9319387304ab69c36a2fe0fb0c6e57e 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdProtocolDecls.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdProtocolDecls.java
@@ -51,12 +51,7 @@ public class SpdProtocolDecls extends SpdGuidDecls {
     protected void initFrame() {\r
         \r
         this.setTitle("Protocol 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 SpdProtocolDecls extends SpdGuidDecls {
         if (sfc.getSpdProtocolDeclarationCount() == 0) {\r
             return ;\r
         }\r
-        String[][] saa = new String[sfc.getSpdProtocolDeclarationCount()][6];\r
+        String[][] saa = new String[sfc.getSpdProtocolDeclarationCount()][7];\r
         sfc.getSpdProtocolDeclarations(saa);\r
         int i = 0;\r
         while (i < saa.length) {\r
@@ -90,12 +85,16 @@ public class SpdProtocolDecls 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.updateSpdProtocolDecl(row, name, cName, guid, help, archList, modTypeList);\r
+        sfc.updateSpdProtocolDecl(row, name, cName, guid, help, archList, modTypeList, guidTypeList);\r
     }\r
     \r
     protected void addRow(String[] row) {\r
@@ -103,7 +102,7 @@ public class SpdProtocolDecls extends SpdGuidDecls {
             return;\r
         }\r
         docConsole.setSaved(false);\r
-        sfc.genSpdProtocolDeclarations(row[0], row[1], row[2], row[3], stringToVector(row[4]), stringToVector(row[5]));\r
+        sfc.genSpdProtocolDeclarations(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