set MaxDatumSize for PcdData.

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
index b8c80b48cc2f5264d6b8f354beedc5040bc4dc29..e0a0137ef79988474b007c8d2c1525b5aeafa348 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
@@ -906,6 +906,25 @@ public class FpdFileContents {
         fpdPcd.setTokenSpaceGuidCName(tsGuid);\r
         fpdPcd.setDatumType(PcdDataTypes.Enum.forString(dataType));\r
         fpdPcd.setItemType(PcdItemTypes.Enum.forString(itemType));\r
         fpdPcd.setTokenSpaceGuidCName(tsGuid);\r
         fpdPcd.setDatumType(PcdDataTypes.Enum.forString(dataType));\r
         fpdPcd.setItemType(PcdItemTypes.Enum.forString(itemType));\r

+        if (dataType.equals("UINT8")){\r
+            fpdPcd.setMaxDatumSize(1);\r
+        }\r
+        if (dataType.equals("UINT16")) {\r
+            fpdPcd.setMaxDatumSize(2);\r
+        }\r
+        if (dataType.equals("UINT32")) {\r
+            fpdPcd.setMaxDatumSize(4);\r
+        }\r
+        if (dataType.equals("UINT64")){\r
+            fpdPcd.setMaxDatumSize(8);\r
+        }\r
+        if (dataType.equals("BOOLEAN")){\r
+            fpdPcd.setMaxDatumSize(1);\r
+        }\r
+        if (dataType.equals("VOID*")) {\r
+            int maxSize = setMaxSizeForPointer(fpdPcd.getValue());\r
+            fpdPcd.setMaxDatumSize(maxSize);\r
+        }\r

         \r
         if (itemType.equals("DYNAMIC") || itemType.equals("DYNAMIC_EX")) {\r
             ArrayList<String> al = LookupDynamicPcdBuildDefinition(cName + " " + tsGuid);\r
         \r
         if (itemType.equals("DYNAMIC") || itemType.equals("DYNAMIC_EX")) {\r
             ArrayList<String> al = LookupDynamicPcdBuildDefinition(cName + " " + tsGuid);\r


@@ -932,6 +951,7 @@ public class FpdFileContents {
                     fpdPcd.setValue("");\r
                 }\r
             }\r
                     fpdPcd.setValue("");\r
                 }\r
             }\r

+            /*\r

             if (dataType.equals("UINT8")){\r
                 fpdPcd.setMaxDatumSize(1);\r
             }\r
             if (dataType.equals("UINT8")){\r
                 fpdPcd.setMaxDatumSize(1);\r
             }\r


@@ -951,6 +971,7 @@ public class FpdFileContents {
                 int maxSize = setMaxSizeForPointer(fpdPcd.getValue());\r
                 fpdPcd.setMaxDatumSize(maxSize);\r
             }\r
                 int maxSize = setMaxSizeForPointer(fpdPcd.getValue());\r
                 fpdPcd.setMaxDatumSize(maxSize);\r
             }\r

+            */\r

         }\r
     }\r
     \r
         }\r
     }\r
     \r

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 36b22be6a4784f7e2945847ab2986a047ffb7039..56bebc577002f47a75c40161b677b7c7a39c0bb3 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
@@ -93,6 +93,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
     private DefaultTableModel optionsTableModel = null;\r
     private FpdFileContents ffc = null;\r
     private String moduleKey = null;\r
     private DefaultTableModel optionsTableModel = null;\r
     private FpdFileContents ffc = null;\r
     private String moduleKey = null;\r

+    private int moduleSaNum = -1;\r

     private HashMap<String, ArrayList<String>> classInstanceMap = null;\r
     private ArrayList<String> classProduced = null;\r
     private HashMap<String, ArrayList<String>> classConsumed = null;\r
     private HashMap<String, ArrayList<String>> classInstanceMap = null;\r
     private ArrayList<String> classProduced = null;\r
     private HashMap<String, ArrayList<String>> classConsumed = null;\r


@@ -135,6 +136,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
     \r
     public void setKey(String k, int i, OpeningPlatformType dc){\r
         this.moduleKey = k;\r
     \r
     public void setKey(String k, int i, OpeningPlatformType dc){\r
         this.moduleKey = k;\r

+        moduleSaNum = i;\r

         this.docConsole = dc;\r
         classProduced = null;\r
         classConsumed = null;\r
         this.docConsole = dc;\r
         classProduced = null;\r
         classConsumed = null;\r


@@ -196,14 +198,17 @@ public class FpdModuleSA extends JDialog implements ActionListener {
         //\r
         // display module SA options\r
         //\r
         //\r
         // display module SA options\r
         //\r

+        jTextFieldFvBinding.setText("");\r

         String fvBinding = ffc.getFvBinding(key);\r
         if (fvBinding != null) {\r
             jTextFieldFvBinding.setText(fvBinding);\r
         }\r
         String fvBinding = ffc.getFvBinding(key);\r
         if (fvBinding != null) {\r
             jTextFieldFvBinding.setText(fvBinding);\r
         }\r

+        jTextFieldFileGuid.setText("");\r

         String fileGuid = ffc.getFfsFileNameGuid(key);\r
         if (fileGuid != null) {\r
             jTextFieldFileGuid.setText(fileGuid);\r
         }\r
         String fileGuid = ffc.getFfsFileNameGuid(key);\r
         if (fileGuid != null) {\r
             jTextFieldFileGuid.setText(fileGuid);\r
         }\r

+        jTextFieldFfsKey.setText("");\r

         String ffsKey = ffc.getFfsFormatKey(key);\r
         if (ffsKey != null) {\r
             jTextFieldFfsKey.setText(ffsKey);\r
         String ffsKey = ffc.getFfsFormatKey(key);\r
         if (ffsKey != null) {\r
             jTextFieldFfsKey.setText(ffsKey);\r


@@ -471,7 +476,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             jPanelPcd.add(getJPanelPcdSouth(), java.awt.BorderLayout.SOUTH);\r
             jPanelPcd.addComponentListener(new java.awt.event.ComponentAdapter() {\r
                 public void componentShown(java.awt.event.ComponentEvent e) {\r
             jPanelPcd.add(getJPanelPcdSouth(), java.awt.BorderLayout.SOUTH);\r
             jPanelPcd.addComponentListener(new java.awt.event.ComponentAdapter() {\r
                 public void componentShown(java.awt.event.ComponentEvent e) {\r

-//                    initPcdBuildDefinition(moduleKey);\r
+                    initPcdBuildDefinition(moduleSaNum);\r

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


@@ -1183,7 +1188,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
     private JTextField getJTextFieldFfsKey() {\r
         if (jTextFieldFfsKey == null) {\r
             jTextFieldFfsKey = new JTextField();\r
     private JTextField getJTextFieldFfsKey() {\r
         if (jTextFieldFfsKey == null) {\r
             jTextFieldFfsKey = new JTextField();\r

-            jTextFieldFfsKey.setPreferredSize(new java.awt.Dimension(150,20));\r
+            jTextFieldFfsKey.setPreferredSize(new java.awt.Dimension(250,20));\r

             jTextFieldFfsKey.addFocusListener(new java.awt.event.FocusAdapter() {\r
                 public void focusLost(java.awt.event.FocusEvent e) {\r
                     String originalFfsKey = ffc.getFfsFormatKey(moduleKey);\r
             jTextFieldFfsKey.addFocusListener(new java.awt.event.FocusAdapter() {\r
                 public void focusLost(java.awt.event.FocusEvent e) {\r
                     String originalFfsKey = ffc.getFfsFormatKey(moduleKey);\r