1. adjust contents layout of SPD header editor, FPD header editor.

2. modify globla data to reflect new added module information.

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java
index 7781a3d7c82e8f9649758690b77d2684ebbe822a..7aff45aba38c396a72b30ddde6fe42002e05a2b6 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java
@@ -277,7 +277,7 @@ public class SpdHeader extends IInternalFrame {
     private JTextField getJTextFieldSpecification() {\r
         if (jTextFieldSpecification == null) {\r
             jTextFieldSpecification = new JTextField();\r
-            jTextFieldSpecification.setBounds(new java.awt.Rectangle(160, 305, 320, 20));\r
+            jTextFieldSpecification.setBounds(new java.awt.Rectangle(161,330,320,20));\r
             jTextFieldSpecification.setEditable(false);\r
             jTextFieldSpecification.setPreferredSize(new java.awt.Dimension(320,20));\r
             jTextFieldSpecification.addFocusListener(new FocusAdapter(){\r
@@ -332,7 +332,7 @@ public class SpdHeader extends IInternalFrame {
     private JScrollPane getJScrollPaneLicense() {\r
         if (jScrollPaneLicense == null) {\r
             jScrollPaneLicense = new JScrollPane();\r
-            jScrollPaneLicense.setBounds(new java.awt.Rectangle(160, 85, 320, 80));\r
+            jScrollPaneLicense.setBounds(new java.awt.Rectangle(161,108,320,80));\r
             jScrollPaneLicense.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r
             jScrollPaneLicense.setPreferredSize(new java.awt.Dimension(320,80));\r
             jScrollPaneLicense.setViewportView(getJTextAreaLicense());\r
@@ -349,7 +349,7 @@ public class SpdHeader extends IInternalFrame {
     private JScrollPane getJScrollPaneDescription() {\r
         if (jScrollPaneDescription == null) {\r
             jScrollPaneDescription = new JScrollPane();\r
-            jScrollPaneDescription.setBounds(new java.awt.Rectangle(160, 220, 320, 80));\r
+            jScrollPaneDescription.setBounds(new java.awt.Rectangle(160,244,320,80));\r
             jScrollPaneDescription.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r
             jScrollPaneDescription.setViewportView(getJTextAreaDescription());\r
         }\r
@@ -365,7 +365,7 @@ public class SpdHeader extends IInternalFrame {
     private JTextField getJTextFieldAbstract() {\r
         if (jTextFieldAbstract == null) {\r
             jTextFieldAbstract = new JTextField();\r
-            jTextFieldAbstract.setBounds(new java.awt.Rectangle(160,195,320,20));\r
+            jTextFieldAbstract.setBounds(new java.awt.Rectangle(161,220,320,20));\r
             jTextFieldAbstract.setPreferredSize(new java.awt.Dimension(320, 20));\r
             jTextFieldAbstract.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e){\r
@@ -390,7 +390,7 @@ public class SpdHeader extends IInternalFrame {
     private JTextField getJTextFieldCopyright() {\r
         if (jTextFieldCopyright == null) {\r
             jTextFieldCopyright = new JTextField();\r
-            jTextFieldCopyright.setBounds(new java.awt.Rectangle(160,330,320, 20));\r
+            jTextFieldCopyright.setBounds(new java.awt.Rectangle(160,86,320,20));\r
             jTextFieldCopyright.setPreferredSize(new java.awt.Dimension(320,20));\r
             jTextFieldCopyright.addFocusListener(new FocusAdapter(){\r
                public void focusLost(FocusEvent e){\r
@@ -414,7 +414,7 @@ public class SpdHeader extends IInternalFrame {
     private JTextField getJTextField() {\r
         if (jTextField == null) {\r
             jTextField = new JTextField();\r
-            jTextField.setBounds(new java.awt.Rectangle(160,170,320,20));\r
+            jTextField.setBounds(new java.awt.Rectangle(161,195,320,20));\r
             jTextField.setPreferredSize(new java.awt.Dimension(320, 20));\r
             jTextField.addFocusListener(new FocusAdapter(){\r
                public void focusLost(FocusEvent e){\r
@@ -514,27 +514,27 @@ public class SpdHeader extends IInternalFrame {
     private JPanel getJContentPane() {\r
         if (jContentPane == null) {\r
                jLabel = new JLabel();\r
-               jLabel.setBounds(new java.awt.Rectangle(15,170,140,20));\r
+               jLabel.setBounds(new java.awt.Rectangle(16,195,140,20));\r
                jLabel.setText("URL");\r
                jContentPane = new JPanel();\r
             jContentPane.setLayout(null);\r
             jContentPane.setLocation(new java.awt.Point(0, 0));\r
             jContentPane.setPreferredSize(new java.awt.Dimension(500, 524));\r
             jLabelAbstract = new JLabel();\r
-            jLabelAbstract.setBounds(new java.awt.Rectangle(15, 220, 140, 20));\r
+            jLabelAbstract.setBounds(new java.awt.Rectangle(16,245,140,20));\r
             jLabelAbstract.setText("Description");\r
             jLabelSpecification = new JLabel();\r
             jLabelSpecification.setText("Specification");\r
-            jLabelSpecification.setBounds(new java.awt.Rectangle(15, 305, 140, 20));\r
+            jLabelSpecification.setBounds(new java.awt.Rectangle(16,330,140,20));\r
             jLabelDescription = new JLabel();\r
             jLabelDescription.setText("Abstract");\r
-            jLabelDescription.setBounds(new java.awt.Rectangle(15, 195, 140, 20));\r
+            jLabelDescription.setBounds(new java.awt.Rectangle(16,220,140,20));\r
             jLabelCopyright = new JLabel();\r
             jLabelCopyright.setText("Copyright");\r
-            jLabelCopyright.setBounds(new java.awt.Rectangle(15, 330, 140, 20));\r
+            jLabelCopyright.setBounds(new java.awt.Rectangle(15,86,140,20));\r
             jLabelLicense = new JLabel();\r
             jLabelLicense.setText("License");\r
-            jLabelLicense.setBounds(new java.awt.Rectangle(15, 85, 140, 20));\r
+            jLabelLicense.setBounds(new java.awt.Rectangle(16,110,140,20));\r
             jLabelVersion = new JLabel();\r
             jLabelVersion.setText("Version");\r
             jLabelVersion.setBounds(new java.awt.Rectangle(15, 60, 140, 20));\r
@@ -570,16 +570,16 @@ public class SpdHeader extends IInternalFrame {
             jStarLabel3 = new StarLabel();\r
             jStarLabel3.setLocation(new java.awt.Point(0, 60));\r
             jStarLabel4 = new StarLabel();\r
-            jStarLabel4.setLocation(new java.awt.Point(0, 85));\r
+            jStarLabel4.setLocation(new java.awt.Point(1,110));\r
             jStarLabel5 = new StarLabel();\r
-            jStarLabel5.setLocation(new java.awt.Point(0, 330));\r
+            jStarLabel5.setLocation(new java.awt.Point(0,86));\r
             jStarLabel6 = new StarLabel();\r
-            jStarLabel6.setLocation(new java.awt.Point(0, 195));\r
+            jStarLabel6.setLocation(new java.awt.Point(1,220));\r
             jStarLabel7 = new StarLabel();\r
-            jStarLabel7.setLocation(new java.awt.Point(0, 305));\r
+            jStarLabel7.setLocation(new java.awt.Point(1,330));\r
             jStarLabel7.setEnabled(false);\r
             jStarLabel9 = new StarLabel();\r
-            jStarLabel9.setLocation(new java.awt.Point(0, 220));\r
+            jStarLabel9.setLocation(new java.awt.Point(1,245));\r
             jContentPane.add(jStarLabel1, null);\r
             jContentPane.add(jStarLabel2, null);\r
             jContentPane.add(jStarLabel3, null);\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
index c2d9985c3460457ae4ffe0ceb62eb9e5fc9845cd..c6af4976382ebc07c9899da0f369ca6fe4bad781 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
@@ -362,7 +362,7 @@ public class FpdFrameworkModules extends IInternalFrame {
             GlobalData.initInfo("Tools" + File.separator + "Conf" + File.separator + "FrameworkDatabase.db", System.getenv("WORKSPACE"));\r
         }\r
         catch(Exception e){\r
-            JOptionPane.showMessageDialog(frame, "FrameworkDatabase Corrupted.");\r
+            JOptionPane.showMessageDialog(frame, "Error occurred when getting module data.");\r
         }\r
         \r
         if (ffc == null){\r
@@ -447,8 +447,8 @@ public class FpdFrameworkModules extends IInternalFrame {
             }\r
             if (keyPart[3] != null && keyPart[3].length() > 0 && !keyPart[3].equals("null")){\r
                 if(!pi.getVersion().equals(keyPart[3])){\r
-                continue;\r
-            }\r
+                    continue;\r
+                }\r
             }\r
             Set<ModuleIdentification> smi = GlobalData.getModules(pi);\r
             Iterator ismi = smi.iterator();\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java
index 73791fe691019320dba2d549b1593f6dc2f688bb..53fb6e4e94514149d3c8a0e684037cdbd70d09ab 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java
@@ -278,7 +278,7 @@ public class FpdHeader extends IInternalFrame {
     private JTextField getJTextFieldSpecification() {\r
         if (jTextFieldSpecification == null) {\r
             jTextFieldSpecification = new JTextField();\r
-            jTextFieldSpecification.setBounds(new java.awt.Rectangle(160, 305, 320, 20));\r
+            jTextFieldSpecification.setBounds(new java.awt.Rectangle(160,328,320,20));\r
             jTextFieldSpecification.setEditable(false);\r
             jTextFieldSpecification.setPreferredSize(new java.awt.Dimension(320,20));\r
             jTextFieldSpecification.addFocusListener(new FocusAdapter(){\r
@@ -333,7 +333,7 @@ public class FpdHeader extends IInternalFrame {
     private JScrollPane getJScrollPaneLicense() {\r
         if (jScrollPaneLicense == null) {\r
             jScrollPaneLicense = new JScrollPane();\r
-            jScrollPaneLicense.setBounds(new java.awt.Rectangle(160, 85, 320, 80));\r
+            jScrollPaneLicense.setBounds(new java.awt.Rectangle(160,107,320,80));\r
             jScrollPaneLicense.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r
             jScrollPaneLicense.setPreferredSize(new java.awt.Dimension(320,80));\r
             jScrollPaneLicense.setViewportView(getJTextAreaLicense());\r
@@ -350,7 +350,7 @@ public class FpdHeader extends IInternalFrame {
     private JScrollPane getJScrollPaneDescription() {\r
         if (jScrollPaneDescription == null) {\r
             jScrollPaneDescription = new JScrollPane();\r
-            jScrollPaneDescription.setBounds(new java.awt.Rectangle(160, 220, 320, 80));\r
+            jScrollPaneDescription.setBounds(new java.awt.Rectangle(160,243,320,80));\r
             jScrollPaneDescription.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r
             jScrollPaneDescription.setViewportView(getJTextAreaDescription());\r
         }\r
@@ -366,7 +366,7 @@ public class FpdHeader extends IInternalFrame {
     private JTextField getJTextFieldAbstract() {\r
         if (jTextFieldAbstract == null) {\r
             jTextFieldAbstract = new JTextField();\r
-            jTextFieldAbstract.setBounds(new java.awt.Rectangle(160,195,320,20));\r
+            jTextFieldAbstract.setBounds(new java.awt.Rectangle(160,218,320,20));\r
             jTextFieldAbstract.setPreferredSize(new java.awt.Dimension(320, 20));\r
             jTextFieldAbstract.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
@@ -391,7 +391,7 @@ public class FpdHeader extends IInternalFrame {
     private JTextField getJTextFieldCopyright() {\r
         if (jTextFieldCopyright == null) {\r
             jTextFieldCopyright = new JTextField();\r
-            jTextFieldCopyright.setBounds(new java.awt.Rectangle(160,330,320, 20));\r
+            jTextFieldCopyright.setBounds(new java.awt.Rectangle(160,85,320,20));\r
             jTextFieldCopyright.setPreferredSize(new java.awt.Dimension(320,20));\r
             jTextFieldCopyright.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
@@ -415,7 +415,7 @@ public class FpdHeader extends IInternalFrame {
     private JTextField getJTextField() {\r
         if (jTextField == null) {\r
             jTextField = new JTextField();\r
-            jTextField.setBounds(new java.awt.Rectangle(160,170,320,20));\r
+            jTextField.setBounds(new java.awt.Rectangle(160,193,320,20));\r
             jTextField.setPreferredSize(new Dimension(320, 20));\r
             jTextField.addFocusListener(new FocusAdapter(){\r
                public void focusLost(FocusEvent e){\r
@@ -520,27 +520,27 @@ public class FpdHeader extends IInternalFrame {
     private JPanel getJContentPane() {\r
         if (jContentPane == null) {\r
                jLabel = new JLabel();\r
-               jLabel.setBounds(new java.awt.Rectangle(15,170,140,20));\r
+               jLabel.setBounds(new java.awt.Rectangle(15,193,140,20));\r
                jLabel.setText("URL");\r
                jContentPane = new JPanel();\r
             jContentPane.setLayout(null);\r
             jContentPane.setLocation(new java.awt.Point(0, 0));\r
             jContentPane.setSize(new java.awt.Dimension(500,423));\r
             jLabelAbstract = new JLabel();\r
-            jLabelAbstract.setBounds(new java.awt.Rectangle(15, 195, 140, 20));\r
+            jLabelAbstract.setBounds(new java.awt.Rectangle(15,218,140,20));\r
             jLabelAbstract.setText("Abstract");\r
             jLabelSpecification = new JLabel();\r
             jLabelSpecification.setText("Specification");\r
-            jLabelSpecification.setBounds(new java.awt.Rectangle(15, 305, 140, 20));\r
+            jLabelSpecification.setBounds(new java.awt.Rectangle(15,328,140,20));\r
             jLabelDescription = new JLabel();\r
             jLabelDescription.setText("Description");\r
-            jLabelDescription.setBounds(new java.awt.Rectangle(15, 220, 140, 20));\r
+            jLabelDescription.setBounds(new java.awt.Rectangle(15,243,140,20));\r
             jLabelCopyright = new JLabel();\r
             jLabelCopyright.setText("Copyright");\r
-            jLabelCopyright.setBounds(new java.awt.Rectangle(15, 330, 140, 20));\r
+            jLabelCopyright.setBounds(new java.awt.Rectangle(15,85,140,20));\r
             jLabelLicense = new JLabel();\r
             jLabelLicense.setText("License");\r
-            jLabelLicense.setBounds(new java.awt.Rectangle(15, 85, 140, 20));\r
+            jLabelLicense.setBounds(new java.awt.Rectangle(15,108,140,20));\r
             jLabelVersion = new JLabel();\r
             jLabelVersion.setText("Version");\r
             jLabelVersion.setBounds(new java.awt.Rectangle(15, 60, 140, 20));\r
@@ -576,18 +576,18 @@ public class FpdHeader extends IInternalFrame {
             jStarLabel3 = new StarLabel();\r
             jStarLabel3.setLocation(new java.awt.Point(0, 60));\r
             jStarLabel4 = new StarLabel();\r
-            jStarLabel4.setLocation(new java.awt.Point(0, 85));\r
+            jStarLabel4.setLocation(new java.awt.Point(0,108));\r
             jStarLabel5 = new StarLabel();\r
-            jStarLabel5.setLocation(new java.awt.Point(0, 330));\r
+            jStarLabel5.setLocation(new java.awt.Point(0,85));\r
             jStarLabel6 = new StarLabel();\r
-            jStarLabel6.setLocation(new java.awt.Point(0, 195));\r
+            jStarLabel6.setLocation(new java.awt.Point(0,218));\r
             jStarLabel7 = new StarLabel();\r
-            jStarLabel7.setLocation(new java.awt.Point(0, 305));\r
+            jStarLabel7.setLocation(new java.awt.Point(0,328));\r
             jStarLabel7.setEnabled(false);\r
             jStarLabel8 = new StarLabel();\r
-            jStarLabel8.setLocation(new java.awt.Point(0, 220));\r
+            jStarLabel8.setLocation(new java.awt.Point(0,243));\r
             jStarLabel9 = new StarLabel();\r
-            jStarLabel9.setLocation(new java.awt.Point(0, 280));\r
+            jStarLabel9.setLocation(new java.awt.Point(0,303));\r
             jStarLabel9.setVisible(false);\r
             jContentPane.add(jStarLabel1, null);\r
             jContentPane.add(jStarLabel2, null);\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/GlobalData.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/GlobalData.java
index bdb278c5708bbfce716922bea0b9c13bf5228779..21e706bb43c48f8bc8238a5927433d800b413e69 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/GlobalData.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/GlobalData.java
@@ -59,7 +59,7 @@ public class GlobalData {
     ///\r
     /// Be used to ensure Global data will be initialized only once.\r
     ///\r
-    private static boolean globalFlag = false;\r
+//    private static boolean globalFlag = false;\r
     \r
     ///\r
     /// Framework Database information: package list and platform list\r
@@ -146,13 +146,6 @@ public class GlobalData {
             Framework Dababase or SPD or MSA file is not valid\r
     **/\r
     public synchronized static void initInfo(String workspaceDatabaseFile, String workspaceDir) throws Exception {\r
-        //\r
-        // ensure this method will be revoked only once\r
-        //\r
-        if (globalFlag) {\r
-            return;\r
-        }\r
-        globalFlag = true;\r
         \r
         //\r
         // Backup workspace directory. It will be used by other method\r
@@ -177,7 +170,9 @@ public class GlobalData {
                 DbPathAndFilename dbPath = (DbPathAndFilename)iter.next();\r
                 String fileName = dbPath.getStringValue();\r
                 Spd spd = new Spd(new File(workspaceDir + File.separatorChar + fileName));\r
-                packageList.add(spd.getPackageId());\r
+                if (!packageList.contains(spd.getPackageId())) {\r
+                    packageList.add(spd.getPackageId());\r
+                }\r
                 spdTable.put(spd.getPackageId(), spd);\r
             }\r
 \r
@@ -342,9 +337,7 @@ public class GlobalData {
     }\r
     \r
     public synchronized static Map<String, XmlObject> getNativeMsa(File msaFile) throws Exception {\r
-        if (! msaFile.exists()) {\r
-            throw new Exception("Surface Area file [" + msaFile.getPath() + "] can't found.");\r
-        }\r
+        \r
         try {\r
             ModuleSurfaceAreaDocument doc = (ModuleSurfaceAreaDocument)XmlObject.Factory.parse(msaFile);\r
             //\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/SurfaceAreaQuery.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/SurfaceAreaQuery.java
index 8ecc71bcece7cb580dcbdafd0490f85fa02d4a7b..1f6ea98f51797bdca3b047a2812787faa5c30fe6 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/SurfaceAreaQuery.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/SurfaceAreaQuery.java
@@ -976,7 +976,11 @@ public class SurfaceAreaQuery {
                // which in MsaHeader.\r
                //\r
                String name = msaHeader.getModuleName();\r
-               String moduleType = msaHeader.getModuleType().toString();\r
+        String moduleType = "";\r
+        if (msaHeader.getModuleType() != null) {\r
+            moduleType = msaHeader.getModuleType().toString();\r
+        }\r
+        \r
                String guid = msaHeader.getGuidValue();\r
                String version = msaHeader.getVersion();\r
 \r