]> git.proxmox.com Git - mirror_edk2.git/commitdiff
Adapt to new Main UI interface.
authorjlin16 <jlin16@6f19259b-4bc3-4df7-8a09-765794883524>
Thu, 6 Jul 2006 03:16:57 +0000 (03:16 +0000)
committerjlin16 <jlin16@6f19259b-4bc3-4df7-8a09-765794883524>
Thu, 6 Jul 2006 03:16:57 +0000 (03:16 +0000)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@782 6f19259b-4bc3-4df7-8a09-765794883524

16 files changed:
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdMsaFiles.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageDefinitions.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageHeaders.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPpiDecls.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdProtocolDecls.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java

index e5d59195bc1e07bb60be87f25c1deffa932186a7..0c48798cdcf4aa531c183f9efc92e08ca9bcac90 100644 (file)
@@ -2376,32 +2376,30 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
     **/\r
     private void showPlatformElement(int elementType, OpeningPlatformType fpd) {\r
         this.cleanDesktopPanePlatform();\r
-        fpd.setSaved(false);\r
+        \r
         switch (elementType) {\r
         case IDefaultMutableTreeNode.FPD_PLATFORMDEFINITIONS:\r
-            FpdPlatformDefs frmFpdPlatformDefs = new FpdPlatformDefs(fpd.getXmlFpd());\r
+            FpdPlatformDefs frmFpdPlatformDefs = new FpdPlatformDefs(fpd);\r
             getJDesktopPanePlatform().add(frmFpdPlatformDefs, 1);\r
             break;\r
         case IDefaultMutableTreeNode.FPD_PLATFORMHEADER:\r
-            FpdHeader frmFpdHeader = new FpdHeader(fpd.getXmlFpd());\r
+            FpdHeader frmFpdHeader = new FpdHeader(fpd);\r
             getJDesktopPanePlatform().add(frmFpdHeader, 1);\r
             break;\r
         case IDefaultMutableTreeNode.FPD_FLASH:\r
-            FpdFlash frmFpdFlash = new FpdFlash(fpd.getXmlFpd());\r
+            FpdFlash frmFpdFlash = new FpdFlash(fpd);\r
             getJDesktopPanePlatform().add(frmFpdFlash, 1);\r
             break;\r
         case IDefaultMutableTreeNode.FPD_FRAMEWORKMODULES:\r
-            FpdFrameworkModules frmFpdFrameworkModules = new FpdFrameworkModules(fpd.getXmlFpd());\r
+            FpdFrameworkModules frmFpdFrameworkModules = new FpdFrameworkModules(fpd);\r
             getJDesktopPanePlatform().add(frmFpdFrameworkModules, 1);\r
             break;\r
         case IDefaultMutableTreeNode.FPD_PCDDYNAMICBUILDDECLARATIONS:\r
-            FpdDynamicPcdBuildDefinitions frmFpdDynamicPcdBuildDefinitions = new FpdDynamicPcdBuildDefinitions(\r
-                                                                                                               fpd\r
-                                                                                                                  .getXmlFpd());\r
+            FpdDynamicPcdBuildDefinitions frmFpdDynamicPcdBuildDefinitions = new FpdDynamicPcdBuildDefinitions(fpd);\r
             getJDesktopPanePlatform().add(frmFpdDynamicPcdBuildDefinitions, 1);\r
             break;\r
         case IDefaultMutableTreeNode.FPD_BUILDOPTIONS:\r
-            FpdBuildOptions frmFpdBuildOptions = new FpdBuildOptions(fpd.getXmlFpd());\r
+            FpdBuildOptions frmFpdBuildOptions = new FpdBuildOptions(fpd);\r
             getJDesktopPanePlatform().add(frmFpdBuildOptions, 1);\r
             break;\r
         }\r
@@ -2419,42 +2417,41 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
     private void showPackageElement(int elementType, OpeningPackageType spd) {\r
         this.cleanDesktopPanePackage();\r
         Tools.dirForNewSpd = spd.getId().getPath();\r
-        spd.setSaved(false);\r
         switch (elementType) {\r
         case IDefaultMutableTreeNode.SPD_HEADER:\r
-            SpdHeader frmSpdHeader = new SpdHeader(spd.getXmlSpd());\r
+            SpdHeader frmSpdHeader = new SpdHeader(spd);\r
             getJDesktopPanePackage().add(frmSpdHeader, 1);\r
             break;\r
         case IDefaultMutableTreeNode.SPD_PACKAGEDEFINITIONS:\r
-            SpdPackageDefinitions frmSpdPackageDefinitions = new SpdPackageDefinitions(spd.getXmlSpd());\r
+            SpdPackageDefinitions frmSpdPackageDefinitions = new SpdPackageDefinitions(spd);\r
             getJDesktopPanePackage().add(frmSpdPackageDefinitions, 1);\r
             break;\r
         case IDefaultMutableTreeNode.SPD_LIBRARYCLASSDECLARATIONS:\r
-            SpdLibClassDecls frmSlcd = new SpdLibClassDecls(spd.getXmlSpd());\r
+            SpdLibClassDecls frmSlcd = new SpdLibClassDecls(spd);\r
             getJDesktopPanePackage().add(frmSlcd, 1);\r
             break;\r
         case IDefaultMutableTreeNode.SPD_MSAFILES:\r
-            SpdMsaFiles frmSmf = new SpdMsaFiles(spd.getXmlSpd());\r
+            SpdMsaFiles frmSmf = new SpdMsaFiles(spd);\r
             getJDesktopPanePackage().add(frmSmf, 1);\r
             break;\r
         case IDefaultMutableTreeNode.SPD_PACKAGEHEADERS:\r
-            SpdPackageHeaders frmSph = new SpdPackageHeaders(spd.getXmlSpd());\r
+            SpdPackageHeaders frmSph = new SpdPackageHeaders(spd);\r
             getJDesktopPanePackage().add(frmSph, 1);\r
             break;\r
         case IDefaultMutableTreeNode.SPD_GUIDDECLARATIONS:\r
-            SpdGuidDecls frmSgd = new SpdGuidDecls(spd.getXmlSpd());\r
+            SpdGuidDecls frmSgd = new SpdGuidDecls(spd);\r
             getJDesktopPanePackage().add(frmSgd, 1);\r
             break;\r
         case IDefaultMutableTreeNode.SPD_PROTOCOLDECLARATIONS:\r
-            SpdProtocolDecls frmSprod = new SpdProtocolDecls(spd.getXmlSpd());\r
+            SpdProtocolDecls frmSprod = new SpdProtocolDecls(spd);\r
             getJDesktopPanePackage().add(frmSprod, 1);\r
             break;\r
         case IDefaultMutableTreeNode.SPD_PPIDECLARATIONS:\r
-            SpdPpiDecls frmSppid = new SpdPpiDecls(spd.getXmlSpd());\r
+            SpdPpiDecls frmSppid = new SpdPpiDecls(spd);\r
             getJDesktopPanePackage().add(frmSppid, 1);\r
             break;\r
         case IDefaultMutableTreeNode.SPD_PCDDECLARATIONS:\r
-            SpdPcdDefs frmSpcdd = new SpdPcdDefs(spd.getXmlSpd());\r
+            SpdPcdDefs frmSpcdd = new SpdPcdDefs(spd);\r
             getJDesktopPanePackage().add(frmSpcdd, 1);\r
             break;\r
         }\r
index 6fe9d43bb2aced958d1dcba78c790bb755f05d4c..bbb402a5775b0f5b1ffa5a32b1166d71e8d307c3 100644 (file)
@@ -38,6 +38,7 @@ import javax.swing.table.TableModel;
 import org.tianocore.PackageSurfaceAreaDocument;\r
 import org.tianocore.frameworkwizard.common.DataValidation;\r
 import org.tianocore.frameworkwizard.common.Tools;\r
+import org.tianocore.frameworkwizard.common.Identifications.OpeningPackageType;\r
 import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
 import org.tianocore.frameworkwizard.common.ui.StarLabel;\r
 import org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList;\r
@@ -57,6 +58,8 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
     static JFrame frame;\r
     \r
     private SpdFileContents sfc = null;\r
+    \r
+    private OpeningPackageType docConsole = null;\r
 \r
     private JTable jTable = null;\r
 \r
@@ -249,6 +252,7 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
        int row = arg0.getFirstRow();\r
        TableModel m = (TableModel)arg0.getSource();\r
        if (arg0.getType() == TableModelEvent.UPDATE){\r
+           docConsole.setSaved(false);\r
            updateRow(row, m);\r
        }\r
    }\r
@@ -372,6 +376,11 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
         sfc = new SpdFileContents(inPsa);\r
         init(sfc);\r
     }\r
+    \r
+    public SpdGuidDecls(OpeningPackageType opt) {\r
+        this(opt.getXmlSpd());\r
+        docConsole = opt;\r
+    }\r
     /**\r
       This method initializes this\r
       \r
@@ -504,6 +513,9 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
      * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)\r
      */\r
     public void actionPerformed(ActionEvent arg0) {\r
+        \r
+        docConsole.setSaved(false);\r
+        \r
         if (arg0.getSource() == jButtonOk) {\r
             this.save();\r
             this.dispose();\r
index 433c2d3d4cf4dcd57ee4bd15eb78f13206a96c8a..36395bda28399bea8fd072047daa5d525a7c26ba 100644 (file)
@@ -33,6 +33,7 @@ import org.tianocore.PackageSurfaceAreaDocument;
 import org.tianocore.frameworkwizard.common.DataValidation;\r
 import org.tianocore.frameworkwizard.common.Log;\r
 import org.tianocore.frameworkwizard.common.Tools;\r
+import org.tianocore.frameworkwizard.common.Identifications.OpeningPackageType;\r
 import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
 import org.tianocore.frameworkwizard.common.ui.StarLabel;\r
 \r
@@ -114,6 +115,8 @@ public class SpdHeader extends IInternalFrame {
     private StarLabel jStarLabel9 = null;\r
     \r
     private SpdFileContents sfc = null;\r
+    \r
+    private OpeningPackageType docConsole = null;\r
 \r
     private JTextField jTextFieldCopyright = null;\r
     \r
@@ -140,6 +143,7 @@ public class SpdHeader extends IInternalFrame {
                         JOptionPane.showMessageDialog(frame, "Package Name is NOT UiNameType.");\r
                         return;\r
                     }\r
+                    docConsole.setSaved(false);\r
                     sfc.setSpdHdrPkgName(jTextFieldBaseName.getText());\r
                 }\r
             });\r
@@ -164,6 +168,7 @@ public class SpdHeader extends IInternalFrame {
                         JOptionPane.showMessageDialog(frame, "Guid is NOT GuidType.");\r
                         return;\r
                     }\r
+                    docConsole.setSaved(false);\r
                     sfc.setSpdHdrGuidValue(jTextFieldGuid.getText());\r
                 }\r
             });\r
@@ -188,6 +193,7 @@ public class SpdHeader extends IInternalFrame {
                        JOptionPane.showMessageDialog(frame, "Version is NOT version type.");\r
                        return;\r
                    }\r
+                   docConsole.setSaved(false);\r
                    sfc.setSpdHdrVer(jTextFieldVersion.getText());\r
                } \r
             });\r
@@ -221,7 +227,7 @@ public class SpdHeader extends IInternalFrame {
         if (jTextAreaLicense == null) {\r
             jTextAreaLicense = new JTextArea();\r
             jTextAreaLicense.setText("");\r
-            jTextAreaLicense.setPreferredSize(new java.awt.Dimension(317,77));\r
+//            jTextAreaLicense.setPreferredSize(new java.awt.Dimension(317,77));\r
             jTextAreaLicense.setLineWrap(true);\r
             jTextAreaLicense.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e){\r
@@ -229,6 +235,7 @@ public class SpdHeader extends IInternalFrame {
                         JOptionPane.showMessageDialog(frame, "License contents could NOT be empty.");\r
                         return;\r
                     }\r
+                    docConsole.setSaved(false);\r
                     sfc.setSpdHdrLicense(jTextAreaLicense.getText());\r
                 }\r
             });\r
@@ -246,13 +253,14 @@ public class SpdHeader extends IInternalFrame {
         if (jTextAreaDescription == null) {\r
             jTextAreaDescription = new JTextArea();\r
             jTextAreaDescription.setLineWrap(true);\r
-            jTextAreaDescription.setPreferredSize(new java.awt.Dimension(317,77));\r
+//            jTextAreaDescription.setPreferredSize(new java.awt.Dimension(317,77));\r
             jTextAreaDescription.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e){\r
                     if (jTextAreaDescription.getText().length() == 0) {\r
                         JOptionPane.showMessageDialog(frame, "Description contents could NOT be empty.");\r
                         return;\r
                     }\r
+                    docConsole.setSaved(false);\r
                     sfc.setSpdHdrDescription(jTextAreaDescription.getText());\r
                 }\r
             });\r
@@ -365,6 +373,7 @@ public class SpdHeader extends IInternalFrame {
                         JOptionPane.showMessageDialog(frame, "Abstract could NOT be empty.");\r
                         return;\r
                     }\r
+                    docConsole.setSaved(false);\r
                     sfc.setSpdHdrAbs(jTextFieldAbstract.getText());\r
                 }\r
             });\r
@@ -389,6 +398,7 @@ public class SpdHeader extends IInternalFrame {
                        JOptionPane.showMessageDialog(frame, "Copyright contents could not be empty.");\r
                        return;\r
                    }\r
+                   docConsole.setSaved(false);\r
                    sfc.setSpdHdrCopyright(jTextFieldCopyright.getText());\r
                } \r
             });\r
@@ -410,6 +420,7 @@ public class SpdHeader extends IInternalFrame {
                public void focusLost(FocusEvent e){\r
                    sfc.setSpdHdrLicense(jTextAreaLicense.getText());\r
                    sfc.setSpdHdrUrl(jTextField.getText());\r
+                   docConsole.setSaved(false);\r
                } \r
             });\r
         }\r
@@ -441,6 +452,11 @@ public class SpdHeader extends IInternalFrame {
         sfc = new SpdFileContents(inPsa);\r
         init(sfc);\r
     }\r
+    \r
+    public SpdHeader(OpeningPackageType opt){\r
+        this(opt.getXmlSpd());\r
+        docConsole = opt;\r
+    }\r
     /**\r
      This method initializes this\r
      \r
@@ -587,6 +603,7 @@ public class SpdHeader extends IInternalFrame {
      *\r
      */\r
     public void actionPerformed(ActionEvent arg0) {\r
+        docConsole.setSaved(false);\r
         if (arg0.getSource() == jButtonOk) {\r
             this.save();\r
             this.setEdited(true);\r
index 32596fe639091c9ee9142e0a50f8b813a49e2ea5..61d69b191690c452b2cb0a7328d987ddba3c0a0e 100644 (file)
@@ -43,6 +43,7 @@ import javax.swing.table.TableModel;
 import org.tianocore.PackageSurfaceAreaDocument;\r
 import org.tianocore.frameworkwizard.common.DataValidation;\r
 import org.tianocore.frameworkwizard.common.Tools;\r
+import org.tianocore.frameworkwizard.common.Identifications.OpeningPackageType;\r
 import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
 import org.tianocore.frameworkwizard.common.ui.StarLabel;\r
 import org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList;\r
@@ -98,6 +99,8 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
     private StarLabel jStarLabel2 = null;\r
     \r
     private SpdFileContents sfc = null;\r
+    \r
+    private OpeningPackageType docConsole = null;\r
 \r
     private JLabel jLabel1 = null;\r
     \r
@@ -317,6 +320,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             if (!dataValidation(rowData)) {\r
                 return;\r
             }\r
+            docConsole.setSaved(false);\r
             sfc.updateSpdLibClass(row, lib, hdr, hlp, guid, ver, arch, module);\r
         }\r
     }\r
@@ -401,6 +405,11 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
         sfc = new SpdFileContents(inPsa);\r
         init(sfc);\r
     }\r
+    \r
+    public SpdLibClassDecls(OpeningPackageType opt) {\r
+        this(opt.getXmlSpd());\r
+        docConsole = opt;\r
+    }\r
     /**\r
       This method initializes this\r
       \r
@@ -574,6 +583,8 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
      * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)\r
      */\r
     public void actionPerformed(ActionEvent arg0) {\r
+        \r
+        docConsole.setSaved(false);\r
         if (arg0.getSource() == jButtonOk) {\r
             this.save();\r
             this.dispose();\r
@@ -733,7 +744,6 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
                     \r
                     headerDest = theFile.getPath();\r
                     int fileIndex = headerDest.indexOf(System.getProperty("file.separator"), dirPrefix.length());\r
-                    \r
                     jTextField.setText(headerDest.substring(fileIndex + 1).replace('\\', '/'));\r
                \r
                 }\r
index 09cb0f704f994dbe9b33941987c129d8c7d85e01..c53e082e1f68b5a77381587fa8ed10ba6440a190 100644 (file)
@@ -39,6 +39,7 @@ import javax.swing.table.TableModel;
 \r
 import org.tianocore.PackageSurfaceAreaDocument;\r
 import org.tianocore.frameworkwizard.common.Tools;\r
+import org.tianocore.frameworkwizard.common.Identifications.OpeningPackageType;\r
 import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
 import org.tianocore.frameworkwizard.common.ui.StarLabel;\r
 \r
@@ -84,6 +85,8 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{
     private StarLabel jStarLabel2 = null;\r
     \r
     private SpdFileContents sfc = null;\r
+    \r
+    private OpeningPackageType docConsole = null;\r
 \r
     private int selectedRow = -1; \r
 \r
@@ -238,6 +241,11 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{
         sfc = new SpdFileContents(inPsa);\r
         init(sfc);\r
     }\r
+    \r
+    public SpdMsaFiles(OpeningPackageType opt){\r
+        this(opt.getXmlSpd());\r
+        docConsole = opt;\r
+    }\r
     /**\r
       This method initializes this\r
       \r
@@ -324,6 +332,8 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{
      * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)\r
      */\r
     public void actionPerformed(ActionEvent arg0) {\r
+        \r
+        docConsole.setSaved(false);\r
         if (arg0.getSource() == jButtonOk) {\r
             this.save();\r
             this.dispose();\r
@@ -377,6 +387,7 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{
                 JOptionPane.showMessageDialog(this, "Msa File is NOT PathAndFilename type.");\r
                 return;\r
             }\r
+            docConsole.setSaved(false);\r
             sfc.updateSpdMsaFile(row, file, null, null, null);\r
         }\r
     }\r
index e4188930fe0a51fa9b634afcc56d760fac1b6735..6d7c6d705f7f03d34506e72de4d811f07d3cb856 100644 (file)
@@ -20,6 +20,7 @@ import javax.swing.JComboBox;
 import java.awt.Dimension;\r
 \r
 import org.tianocore.PackageSurfaceAreaDocument;\r
+import org.tianocore.frameworkwizard.common.Identifications.OpeningPackageType;\r
 import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
 import org.tianocore.frameworkwizard.common.ui.StarLabel;\r
 \r
@@ -37,6 +38,7 @@ public class SpdPackageDefinitions extends IInternalFrame {
     private StarLabel starLabel = null;\r
     private StarLabel starLabel1 = null;\r
     private SpdFileContents sfc = null;\r
+    private OpeningPackageType docConsole = null;\r
 \r
     /**\r
      * This is the default constructor\r
@@ -51,6 +53,11 @@ public class SpdPackageDefinitions extends IInternalFrame {
         sfc = new SpdFileContents(inPsa);\r
         init(sfc);\r
     }\r
+    \r
+    public SpdPackageDefinitions(OpeningPackageType opt) {\r
+        this(opt.getXmlSpd());\r
+        docConsole = opt;\r
+    }\r
 \r
     private void init(SpdFileContents sfc) {\r
         if (sfc.getSpdPkgDefsRdOnly() != null) {\r
@@ -121,6 +128,7 @@ public class SpdPackageDefinitions extends IInternalFrame {
             jComboBoxReadOnly.setSelectedIndex(1);\r
             jComboBoxReadOnly.addItemListener(new java.awt.event.ItemListener() {\r
                 public void itemStateChanged(java.awt.event.ItemEvent e) {\r
+                    docConsole.setSaved(false);\r
                     sfc.setSpdPkgDefsRdOnly(jComboBoxReadOnly.getSelectedItem()+"");\r
                 }\r
             });\r
@@ -143,6 +151,7 @@ public class SpdPackageDefinitions extends IInternalFrame {
             jComboBoxRePackage.setSelectedIndex(0);\r
             jComboBoxRePackage.addItemListener(new java.awt.event.ItemListener() {\r
                 public void itemStateChanged(java.awt.event.ItemEvent e) {\r
+                    docConsole.setSaved(false);\r
                     sfc.setSpdPkgDefsRePkg(jComboBoxRePackage.getSelectedItem()+"");\r
                 }\r
             });\r
index de9106987251df6543afe1e1848640517b05b094..9f408a43d7ecfbb5f34b6c0fcd9d9d366c272838 100644 (file)
@@ -43,6 +43,7 @@ import javax.swing.table.TableModel;
 import org.tianocore.PackageSurfaceAreaDocument;\r
 import org.tianocore.frameworkwizard.common.DataValidation;\r
 import org.tianocore.frameworkwizard.common.Tools;\r
+import org.tianocore.frameworkwizard.common.Identifications.OpeningPackageType;\r
 import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
 import org.tianocore.frameworkwizard.common.ui.StarLabel;\r
 \r
@@ -60,6 +61,8 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
     static JFrame frame;\r
     \r
     private SpdFileContents sfc = null;\r
+    \r
+    private OpeningPackageType docConsole = null;\r
 \r
     private DefaultTableModel model = null;\r
 \r
@@ -251,6 +254,11 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
         sfc = new SpdFileContents(inPsa);\r
         init(sfc);\r
     }\r
+    \r
+    public SpdPackageHeaders(OpeningPackageType opt) {\r
+        this(opt.getXmlSpd());\r
+        docConsole = opt;\r
+    }\r
     /**\r
       This method initializes this\r
       \r
@@ -352,6 +360,8 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
      * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)\r
      */\r
     public void actionPerformed(ActionEvent arg0) {\r
+        \r
+        docConsole.setSaved(false);\r
         if (arg0.getSource() == jButtonOk) {\r
             this.save();\r
             this.dispose();\r
@@ -561,6 +571,7 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
             if (!dataValidation(rowData)) {\r
                 return;\r
             }\r
+            docConsole.setSaved(false);\r
             sfc.updateSpdPkgHdr(row, pkg, hdr);\r
         }\r
     }\r
index f85e40b988e3e77041e80db936fa94ed9489c4e7..a2cff01201fc6c209722d9cc28d6debcbda2f734 100644 (file)
@@ -39,6 +39,7 @@ import javax.swing.table.TableModel;
 import org.tianocore.PackageSurfaceAreaDocument;\r
 \r
 import org.tianocore.frameworkwizard.common.DataValidation;\r
+import org.tianocore.frameworkwizard.common.Identifications.OpeningPackageType;\r
 import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
 import org.tianocore.frameworkwizard.common.ui.StarLabel;\r
 import javax.swing.JScrollPane;\r
@@ -85,6 +86,8 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
     private JComboBox jComboBoxDataType = null;\r
 \r
     private SpdFileContents sfc = null;\r
+    \r
+    private OpeningPackageType docConsole = null;\r
 \r
     private StarLabel jStarLabel2 = null;\r
 \r
@@ -246,6 +249,11 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
         sfc = new SpdFileContents(inPsa);\r
         init(sfc);\r
     }\r
+    \r
+    public SpdPcdDefs(OpeningPackageType opt) {\r
+        this(opt.getXmlSpd());\r
+        docConsole = opt;\r
+    }\r
     /**\r
      This method initializes this\r
      \r
@@ -435,6 +443,7 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
 \r
     public void actionPerformed(ActionEvent arg0) {\r
         \r
+        docConsole.setSaved(false);\r
             if (arg0.getSource() == jButtonOk) {\r
                 this.save();\r
                 this.dispose();\r
@@ -732,6 +741,7 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
             if (!dataValidation(o)){\r
                 return;\r
             }\r
+            docConsole.setSaved(false);\r
             sfc.updateSpdPcdDefinition(row, cName, token, dataType, usage, ts, defaultVal, help, archList, modTypeList);\r
         }\r
     }\r
index 5730aba2e6912bf3e07c20f15ae06d84e478d81d..23adb116f64d48e56a8ece316be46255b4d22502 100644 (file)
@@ -16,6 +16,7 @@ import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;\r
 \r
 import org.tianocore.PackageSurfaceAreaDocument;\r
+import org.tianocore.frameworkwizard.common.Identifications.OpeningPackageType;\r
 \r
 /**\r
 GUI for create library definition elements of spd file.\r
@@ -29,6 +30,7 @@ public class SpdPpiDecls extends SpdGuidDecls {
      */\r
     private static final long serialVersionUID = 1L;\r
     private SpdFileContents sfc = null;\r
+    private OpeningPackageType docConsole = null; \r
     \r
     public SpdPpiDecls() {\r
         super();\r
@@ -41,6 +43,11 @@ public class SpdPpiDecls extends SpdGuidDecls {
         init(sfc);\r
     }\r
     \r
+    public SpdPpiDecls(OpeningPackageType opt) {\r
+        this(opt.getXmlSpd());\r
+        docConsole = opt;\r
+    }\r
+    \r
     protected void initFrame() {\r
         \r
         this.setTitle("PPI Declarations");\r
@@ -86,6 +93,7 @@ public class SpdPpiDecls extends SpdGuidDecls {
         if (!dataValidation(rowData)){\r
             return;\r
         }\r
+        docConsole.setSaved(false);\r
         sfc.updateSpdPpiDecl(row, name, cName, guid, help, archList, modTypeList);\r
     }\r
     \r
@@ -94,6 +102,7 @@ public class SpdPpiDecls extends SpdGuidDecls {
         if (!dataValidation(row)){\r
             return;\r
         }\r
+        docConsole.setSaved(false);\r
         sfc.genSpdPpiDeclarations(row[0], row[1], row[2], row[3], stringToVector(row[4]), stringToVector(row[5]));\r
     }\r
     \r
index cc0584e340d9aad940a3a384b818787490c29955..51994cf18a94549ce8999c3478ed3d443a00edc6 100644 (file)
@@ -16,6 +16,7 @@ import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;\r
 \r
 import org.tianocore.PackageSurfaceAreaDocument;\r
+import org.tianocore.frameworkwizard.common.Identifications.OpeningPackageType;\r
 \r
 /**\r
 GUI for create library definition elements of spd file.\r
@@ -29,6 +30,7 @@ public class SpdProtocolDecls extends SpdGuidDecls {
      */\r
     private static final long serialVersionUID = 1L;\r
     private SpdFileContents sfc = null;\r
+    private OpeningPackageType docConsole = null;\r
     \r
     public SpdProtocolDecls() {\r
         super();\r
@@ -41,6 +43,11 @@ public class SpdProtocolDecls extends SpdGuidDecls {
         init(sfc);\r
     }\r
     \r
+    public SpdProtocolDecls(OpeningPackageType opt) {\r
+        this(opt.getXmlSpd());\r
+        docConsole = opt;\r
+    }\r
+    \r
     protected void initFrame() {\r
         \r
         this.setTitle("Protocol Declarations");\r
@@ -87,7 +94,7 @@ public class SpdProtocolDecls extends SpdGuidDecls {
         if (!dataValidation(rowData)){\r
             return;\r
         }\r
-        \r
+        docConsole.setSaved(false);\r
         sfc.updateSpdProtocolDecl(row, name, cName, guid, help, archList, modTypeList);\r
     }\r
     \r
index af0c95cadd394ad61e7ccc864925a2f6d07fa130..875ddac7fe7595e4fa11131ad919a2984593c6ad 100644 (file)
@@ -26,6 +26,8 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;\r
 \r
 import javax.swing.DefaultCellEditor;\r
+import javax.swing.JFrame;\r
+import javax.swing.JOptionPane;\r
 import javax.swing.JTextField;\r
 import javax.swing.JButton;\r
 import javax.swing.JScrollPane;\r
@@ -43,6 +45,8 @@ import javax.swing.table.TableColumn;
 import javax.swing.table.TableModel;\r
 \r
 import org.tianocore.PlatformSurfaceAreaDocument;\r
+import org.tianocore.frameworkwizard.common.DataValidation;\r
+import org.tianocore.frameworkwizard.common.Identifications.OpeningPlatformType;\r
 import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
 import java.util.ArrayList;\r
 import java.util.Iterator;\r
@@ -53,6 +57,7 @@ import java.util.Vector;
 public class FpdBuildOptions extends IInternalFrame {\r
 \r
     private static final long serialVersionUID = 1L;\r
+    static JFrame frame;\r
     private JPanel jContentPane = null;\r
     private JPanel jPanel = null;\r
     private JPanel jPanel1 = null;\r
@@ -105,6 +110,7 @@ public class FpdBuildOptions extends IInternalFrame {
     private JButton jButton17 = null;\r
     private JButton jButton18 = null;\r
     private FpdFileContents ffc = null;\r
+    private OpeningPlatformType docConsole = null;\r
     private JButton jButton19 = null;\r
     private JCheckBox jCheckBox9 = null;\r
     private JCheckBox jCheckBox10 = null;\r
@@ -319,12 +325,16 @@ public class FpdBuildOptions extends IInternalFrame {
             jButton4.setText("Add");\r
             jButton4.addActionListener(new ActionListener() {\r
                 public void actionPerformed(ActionEvent e) {\r
+                    if (!DataValidation.isInt(jTextField3.getText())) {\r
+                        JOptionPane.showMessageDialog(frame, "ID must be an integer.");\r
+                        return;\r
+                    }\r
                     Object[] o = {jTextField3.getText(), null, null};\r
                         o[1] = jTextField2.getText();\r
                         o[2] = jTextField4.getText();\r
                         ffc.genBuildOptionsUserDefAntTask(o[0]+"", null, o[2]+"");\r
                     antTaskTableModel.addRow(o);\r
-                    \r
+                    docConsole.setSaved(false);\r
                 }\r
             });\r
         }\r
@@ -344,6 +354,7 @@ public class FpdBuildOptions extends IInternalFrame {
             jButton5.addActionListener(new ActionListener() {\r
                 public void actionPerformed(ActionEvent e) {\r
                     if (selectedRow >= 0) {\r
+                        docConsole.setSaved(false);\r
                         antTaskTableModel.removeRow(selectedRow);\r
                         ffc.removeBuildOptionsUserDefAntTask(selectedRow);\r
                     }\r
@@ -544,7 +555,7 @@ public class FpdBuildOptions extends IInternalFrame {
         if (jTextField6 == null) {\r
             jTextField6 = new JTextField();\r
             jTextField6.setPreferredSize(new java.awt.Dimension(100,20));\r
-            jTextField6.setEditable(false);\r
+            jTextField6.setEditable(true);\r
             jTextField6.addFocusListener(new java.awt.event.FocusAdapter() {\r
                 public void focusLost(java.awt.event.FocusEvent e) {\r
                     if (jTable.getSelectedRow() < 0) {\r
@@ -577,6 +588,7 @@ public class FpdBuildOptions extends IInternalFrame {
                     if (jTextField6.getText().length() > 0) {\r
                         String[] row = {jTextField6.getText()};\r
                         ffsTableModel.addRow(row);\r
+                        docConsole.setSaved(false);\r
                         ffc.genBuildOptionsFfs(jTextField6.getText(), jTextField.getText());\r
                     }\r
                 }\r
@@ -605,6 +617,7 @@ public class FpdBuildOptions extends IInternalFrame {
                     if (jTable.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
+                    docConsole.setSaved(false);\r
                     ffc.removeBuildOptionsFfs(jTable.getSelectedRow());\r
                 }\r
             });\r
@@ -657,6 +670,7 @@ public class FpdBuildOptions extends IInternalFrame {
                         if (value.length() == 0){\r
                             return;\r
                         }\r
+                        docConsole.setSaved(false);\r
                         ffc.updateBuildOptionsFfsAttribute(jTable.getSelectedRow(), row, name, value);\r
                     }\r
                 }\r
@@ -826,7 +840,14 @@ public class FpdBuildOptions extends IInternalFrame {
             cb.addItem("CYGWIN");\r
             cb.addItem("INTEL");\r
             toolFamilyCol.setCellEditor(new DefaultCellEditor(cb));\r
-            \r
+            Vector<String> vArch = new Vector<String>();\r
+            vArch.add("IA32");\r
+            vArch.add("X64");\r
+            vArch.add("IPF");\r
+            vArch.add("EBC");\r
+            vArch.add("ARM");\r
+            vArch.add("PPC");\r
+            jTable5.getColumnModel().getColumn(2).setCellEditor(new ListEditor(vArch));\r
             jTable5.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
             jTable5.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
                 public void valueChanged(ListSelectionEvent e) {\r
@@ -859,17 +880,19 @@ public class FpdBuildOptions extends IInternalFrame {
                         }\r
                         String toolChain = m.getValueAt(row, 1) + "";\r
                         String archs = m.getValueAt(row, 2) + "";\r
-                        Vector<Object> supArch = new Vector<Object>();\r
-                        String[] sArray1 = archs.split("( )+");\r
-                        for (int i = 0; i < sArray1.length; ++i) {\r
-                            supArch.add(sArray1[i]);\r
-                        }\r
-                        if (supArch.size() == 0) {\r
-                            supArch.add("IA32");\r
+                        Vector<Object> supArch = null;\r
+                        if (archs.length() > 0) {\r
+                            supArch = new Vector<Object>();\r
+                            String[] sArray1 = archs.split("( )+");\r
+                            for (int i = 0; i < sArray1.length; ++i) {\r
+                                supArch.add(sArray1[i]);\r
+                            }\r
                         }\r
+                        \r
                         String toolCmd = m.getValueAt(row, 3) + "";\r
                         String tagName = m.getValueAt(row, 4) + "";\r
                         String contents = m.getValueAt(row, 5) + "";\r
+                        docConsole.setSaved(false);\r
                         ffc.updateBuildOptionsOpt(row, targetName, toolChain, tagName, toolCmd, supArch, contents);\r
                     }\r
                 }\r
@@ -901,7 +924,7 @@ public class FpdBuildOptions extends IInternalFrame {
                     Object[] o = {jTextField12.getText(), jComboBox2.getSelectedItem(), s,\r
                                   jTextField8.getText(), jTextField13.getText(), jTextField7.getText()};\r
                     optionsTableModel.addRow(o);\r
-                  \r
+                    docConsole.setSaved(false);\r
                     ffc.genBuildOptionsOpt(stringToVector(jTextField12.getText()), jComboBox2.getSelectedItem()+"", jTextField13.getText(), jTextField8.getText(),  stringToVector(s), jTextField7.getText());\r
                 }\r
             });\r
@@ -911,9 +934,12 @@ public class FpdBuildOptions extends IInternalFrame {
     \r
     private Vector<Object> stringToVector(String s) {\r
         String[] sArray = s.split(" ");\r
-        Vector<Object> v = new Vector<Object>();\r
-        for (int i = 0; i < sArray.length; ++i) {\r
-            v.add(sArray[i]);\r
+        Vector<Object> v = null;\r
+        if (s.length() > 0) {\r
+            v = new Vector<Object>();\r
+            for (int i = 0; i < sArray.length; ++i) {\r
+                v.add(sArray[i]);\r
+            } \r
         }\r
         return v;\r
     }\r
@@ -963,6 +989,7 @@ public class FpdBuildOptions extends IInternalFrame {
                 public void actionPerformed(java.awt.event.ActionEvent e) {\r
                     if (selectedRow >= 0) {\r
                         optionsTableModel.removeRow(selectedRow);\r
+                        docConsole.setSaved(false);\r
                         ffc.removeBuildOptionsOpt(selectedRow);\r
                     }\r
                 }\r
@@ -993,6 +1020,7 @@ public class FpdBuildOptions extends IInternalFrame {
                     }\r
                     Object[] o = {"", ""};\r
                     ffsAttributesTableModel.addRow(o);\r
+                    docConsole.setSaved(false);\r
                     ffc.genBuildOptionsFfsAttribute(jTable.getSelectedRow(), "", "");\r
                 }\r
             });\r
@@ -1021,6 +1049,7 @@ public class FpdBuildOptions extends IInternalFrame {
                         return;\r
                     }\r
                     if (jTable4.getSelectedRow() >= 0){\r
+                        docConsole.setSaved(false);\r
                         ffsAttributesTableModel.removeRow(jTable4.getSelectedRow());\r
                         ffc.removeBuildOptionsFfsAttribute(jTable.getSelectedRow(), jTable4.getSelectedRow());\r
                     }\r
@@ -1240,7 +1269,7 @@ public class FpdBuildOptions extends IInternalFrame {
                         if (id.length() == 0) {\r
                             return;\r
                         }\r
-                       \r
+                        docConsole.setSaved(false);\r
                         ffc.updateBuildOptionsFfsKey(row, id);\r
                     }\r
                 }\r
@@ -1304,7 +1333,7 @@ public class FpdBuildOptions extends IInternalFrame {
                     if (arg0.getType() == TableModelEvent.UPDATE){\r
                         //ToDo Data Validition check.\r
                         String type = m.getValueAt(row, 0) + "";\r
-                        \r
+                        docConsole.setSaved(false);\r
                        ffc.updateBuildOptionsFfsSectionsSection(jTable.getSelectedRow(), row, type);\r
                     }\r
                 }\r
@@ -1366,6 +1395,7 @@ public class FpdBuildOptions extends IInternalFrame {
                     if (arg0.getType() == TableModelEvent.UPDATE){\r
                         //ToDo Data Validition check.\r
                         String type = m.getValueAt(row, 0) + "";\r
+                        docConsole.setSaved(false);\r
                         ffc.updateBuildOptionsFfsSectionsSectionsSection(jTable.getSelectedRow(), jTable6.getSelectedRow(), row, type);\r
                     }\r
                 }\r
@@ -1425,6 +1455,7 @@ public class FpdBuildOptions extends IInternalFrame {
                     if (jTable.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
+                    docConsole.setSaved(false);\r
                     String[] row = {"EFI_SECTION_RAW"};\r
                     sectionTableModel.addRow(row);\r
                     ffc.genBuildOptionsFfsSectionsSection(jTable.getSelectedRow(), row[0]);\r
@@ -1450,6 +1481,7 @@ public class FpdBuildOptions extends IInternalFrame {
                     if (jTable.getSelectedRow() < 0 || jTable1.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
+                    docConsole.setSaved(false);\r
                     sectionTableModel.removeRow(jTable1.getSelectedRow());\r
                     ffc.removeBuildOptionsFfsSectionsSection(jTable.getSelectedRow(), jTable1.getSelectedRow());\r
                 }\r
@@ -1473,6 +1505,7 @@ public class FpdBuildOptions extends IInternalFrame {
                     if (jTable.getSelectedRow() < 0 || jTable6.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
+                    docConsole.setSaved(false);\r
                     String[] row = {"EFI_SECTION_RAW"};\r
                     subsectionsTableModel.addRow(row);\r
                     ffc.genBuildOptionsFfsSectionsSectionsSection(jTable.getSelectedRow(), jTable6.getSelectedRow(), row[0]);\r
@@ -1498,6 +1531,7 @@ public class FpdBuildOptions extends IInternalFrame {
                     if (jTable.getSelectedRow() < 0 || jTable6.getSelectedRow() < 0 || jTable3.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
+                    docConsole.setSaved(false);\r
                     subsectionsTableModel.removeRow(jTable3.getSelectedRow());\r
                     ffc.removeBuildOptionsFfsSectionsSectionsSection(jTable.getSelectedRow(), jTable6.getSelectedRow(), jTable3.getSelectedRow());\r
                 }\r
@@ -1521,6 +1555,7 @@ public class FpdBuildOptions extends IInternalFrame {
                     if (jTable.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
+                    docConsole.setSaved(false);\r
                     String[] row = {""};\r
                     sectionsTableModel.addRow(row);\r
                     ffc.genBuildOptionsFfsSectionsSections(jTable.getSelectedRow(), "");\r
@@ -1545,6 +1580,7 @@ public class FpdBuildOptions extends IInternalFrame {
                     if (jTable.getSelectedRow() < 0 || jTable6.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
+                    docConsole.setSaved(false);\r
                     sectionsTableModel.removeRow(jTable6.getSelectedRow());\r
                     ffc.removeBuildOptionsFfsSectionsSections(jTable.getSelectedRow(), jTable6.getSelectedRow());\r
                 }\r
@@ -1612,6 +1648,7 @@ public class FpdBuildOptions extends IInternalFrame {
                     if (arg0.getType() == TableModelEvent.UPDATE){\r
                         //ToDo Data Validition check.\r
                         String encapType = m.getValueAt(row, 0) + "";\r
+                        docConsole.setSaved(false);\r
                         ffc.updateBuildOptionsFfsSectionsSections(jTable.getSelectedRow(), row, encapType);\r
                     }\r
                 }\r
@@ -1642,6 +1679,11 @@ public class FpdBuildOptions extends IInternalFrame {
         ffc = new FpdFileContents(fpd);\r
         init(ffc);\r
     }\r
+    \r
+    public FpdBuildOptions(OpeningPlatformType opt) {\r
+        this(opt.getXmlFpd());\r
+        docConsole = opt;\r
+    }\r
 \r
     private void init(FpdFileContents ffc) {\r
         initOptionTable();\r
index 58bdeb606d5871c226a71b247a2b4f1d96929a95..0a96224da3fcaaa1811e2486517389f593ecdf61 100644 (file)
@@ -12,6 +12,7 @@ import javax.swing.event.ListSelectionListener;
 import javax.swing.table.DefaultTableModel;\r
 \r
 import org.tianocore.PlatformSurfaceAreaDocument;\r
+import org.tianocore.frameworkwizard.common.Identifications.OpeningPlatformType;\r
 import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
 import javax.swing.JCheckBox;\r
 import java.awt.FlowLayout;\r
@@ -35,6 +36,7 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
     private DynPcdTableModel model = null; \r
     private DynPcdTableModel model1 = null;\r
     private FpdFileContents ffc = null;\r
+    private OpeningPlatformType docConsole = null;\r
     private JPanel jPanel3 = null;\r
     private JCheckBox jCheckBox = null;\r
     private JPanel jPanel4 = null;\r
@@ -71,6 +73,11 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
         init(fpd);\r
     }\r
     \r
+    public FpdDynamicPcdBuildDefinitions(OpeningPlatformType opt) {\r
+        this(opt.getXmlFpd());\r
+        docConsole = opt;\r
+    }\r
+    \r
     public void init(PlatformSurfaceAreaDocument.PlatformSurfaceArea fpd) {\r
         if (ffc == null) {\r
             ffc = new FpdFileContents(fpd);\r
@@ -492,7 +499,7 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
                     if (pcdSelected < 0) {\r
                         return;\r
                     }\r
-                    \r
+                    docConsole.setSaved(false);\r
                     updateSkuInfo(pcdSelected);\r
                     \r
                 }\r
index 40a3473058a0efacd8a443a5dd49e99712e43bca..d20c0b8d565a51c108ddc3737640a35f1c7a4f0a 100644 (file)
@@ -24,6 +24,7 @@ import javax.swing.JButton;
 import javax.swing.ListSelectionModel;\r
 \r
 import org.tianocore.PlatformSurfaceAreaDocument;\r
+import org.tianocore.frameworkwizard.common.Identifications.OpeningPlatformType;\r
 import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
 import org.tianocore.frameworkwizard.common.ui.StarLabel;\r
 \r
@@ -108,7 +109,7 @@ public class FpdFlash extends IInternalFrame {
     private JButton jButton6 = null;\r
     private JCheckBox jCheckBox3 = null;\r
     private JPanel jPanel6 = null;\r
-    \r
+    private OpeningPlatformType docConsole = null;\r
     private FpdFileContents ffc = null;\r
     private JPanel jPanel7 = null;\r
     private JCheckBox jCheckBox = null;\r
@@ -139,6 +140,11 @@ public class FpdFlash extends IInternalFrame {
         init(ffc);\r
     }\r
     \r
+    public FpdFlash(OpeningPlatformType opt) {\r
+        this(opt.getXmlFpd());\r
+        docConsole = opt;\r
+    }\r
+    \r
     /**\r
      * This method initializes jPanel  \r
      *         \r
@@ -391,6 +397,7 @@ public class FpdFlash extends IInternalFrame {
                     if (jTextField.getText().length() > 0 && jTextField1.getText().length() > 0){\r
                         String[] row = {jTextField.getText(), jTextField1.getText()};                        \r
                         fvPropertyTableModel.addRow(row);\r
+                        docConsole.setSaved(false);\r
                         ffc.genFvImagesNameValue(row[0], row[1]);\r
                     }\r
                 }\r
@@ -454,7 +461,7 @@ public class FpdFlash extends IInternalFrame {
                         \r
                         String name = m.getValueAt(row, 0) + "";\r
                         String value = m.getValueAt(row, 1) + "";\r
-\r
+                        docConsole.setSaved(false);\r
                         ffc.updateFvImagesNameValue(row, name, value);\r
                     }\r
                 }\r
@@ -501,6 +508,7 @@ public class FpdFlash extends IInternalFrame {
                 public void actionPerformed(ActionEvent e) {\r
                     if (jTable.getSelectedRow() >= 0){\r
                         fvPropertyTableModel.removeRow(jTable.getSelectedRow());\r
+                        docConsole.setSaved(false);\r
                         ffc.removeFvImagesNameValue(jTable.getSelectedRow());\r
                     }\r
                 }\r
@@ -795,7 +803,7 @@ public class FpdFlash extends IInternalFrame {
                         getOptionNameValue(m);\r
                     }\r
                     ffc.genFvImagesFvImage(imageName.split(" "), jComboBox.getSelectedItem()+"", m);\r
-                    \r
+                    docConsole.setSaved(false);\r
                     Object[] row = {imageName, jComboBox.getSelectedItem()};\r
                     fvImageParaTableModel.addRow(row); \r
                 }\r
@@ -898,8 +906,9 @@ public class FpdFlash extends IInternalFrame {
                 public void actionPerformed(ActionEvent arg0) {\r
                     // TODO Auto-generated method stub\r
                     if (jTable2.getSelectedRow() >= 0 ) {\r
-                        fvImageParaTableModel.removeRow(jTable2.getSelectedRow());\r
                         ffc.removeFvImagesFvImage(jTable2.getSelectedRow());\r
+                        fvImageParaTableModel.removeRow(jTable2.getSelectedRow());\r
+                        docConsole.setSaved(false);\r
                     }\r
                 }\r
                 \r
@@ -1235,7 +1244,7 @@ public class FpdFlash extends IInternalFrame {
                         LinkedHashMap<String, String> lhm = new LinkedHashMap<String, String>();\r
                         getOptionNameValue(lhm);\r
                         \r
-\r
+                        docConsole.setSaved(false);\r
                         ffc.updateFvImagesFvImage(row, name.split(" "), type, lhm);\r
                     \r
                 }\r
index 2ab4d65d2b9521f86f871929289c1b4721e214c7..f9eb19409bb956f9d9c1d07d1b84d4014c0ecfe0 100644 (file)
@@ -14,6 +14,7 @@ import javax.swing.ListSelectionModel;
 import javax.swing.table.DefaultTableModel;\r
 \r
 import org.tianocore.PlatformSurfaceAreaDocument;\r
+import org.tianocore.frameworkwizard.common.Identifications.OpeningPlatformType;\r
 import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
 import org.tianocore.frameworkwizard.platform.ui.global.GlobalData;\r
 import org.tianocore.frameworkwizard.platform.ui.id.ModuleIdentification;\r
@@ -54,7 +55,7 @@ public class FpdFrameworkModules extends IInternalFrame {
     private FpdModuleSA settingDlg = null;\r
     \r
     private FpdFileContents ffc = null;\r
-    \r
+    private OpeningPlatformType docConsole = null;\r
     private Map<String, String> fpdMsa = null;\r
     \r
     private ArrayList<ModuleIdentification> miList = null;\r
@@ -198,6 +199,7 @@ public class FpdFrameworkModules extends IInternalFrame {
                         row[4] = mi.getPackage().getVersion();\r
                     }\r
                     model1.addRow(row);\r
+                    docConsole.setSaved(false);\r
                     ffc.addFrameworkModulesPcdBuildDefs(miList.get(selectedRow), null);\r
                 }\r
             });\r
@@ -277,7 +279,7 @@ public class FpdFrameworkModules extends IInternalFrame {
                     if (settingDlg == null) {\r
                         settingDlg = new FpdModuleSA(ffc);\r
                     }\r
-                    \r
+                    docConsole.setSaved(false);\r
                     String mg = model1.getValueAt(selectedRow, 1)+"";\r
                     String mv = model1.getValueAt(selectedRow, 2)+"";\r
                     String pg = model1.getValueAt(selectedRow, 3)+"";\r
@@ -312,6 +314,7 @@ public class FpdFrameworkModules extends IInternalFrame {
                     String pv = model1.getValueAt(selectedRow, 4).toString();\r
                     model1.removeRow(selectedRow);\r
                     fpdMsa.remove(mg+mv+pg+pv);\r
+                    docConsole.setSaved(false);\r
                     ffc.removeModuleSA(selectedRow);\r
                 }\r
             });\r
@@ -341,6 +344,11 @@ public class FpdFrameworkModules extends IInternalFrame {
         \r
     }\r
     \r
+    public FpdFrameworkModules(OpeningPlatformType opt) {\r
+        this(opt.getXmlFpd());\r
+        docConsole = opt;\r
+    }\r
+    \r
     private void init(PlatformSurfaceAreaDocument.PlatformSurfaceArea fpd) {\r
         try {\r
             GlobalData.initInfo("Tools" + File.separator + "Conf" + File.separator + "FrameworkDatabase.db", System.getenv("WORKSPACE"));\r
index 3f50fb6862a56c33b37f10891b670e235c0d41e6..21eb70cffb5903b489a0253c8f395d09e7827c6e 100644 (file)
@@ -22,7 +22,9 @@ import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;\r
 \r
 import javax.swing.JButton;\r
+import javax.swing.JFrame;\r
 import javax.swing.JLabel;\r
+import javax.swing.JOptionPane;\r
 import javax.swing.JPanel;\r
 import javax.swing.JScrollPane;\r
 import javax.swing.JTextArea;\r
@@ -35,6 +37,7 @@ import org.tianocore.PlatformSurfaceAreaDocument;
 import org.tianocore.frameworkwizard.common.DataValidation;\r
 import org.tianocore.frameworkwizard.common.Log;\r
 import org.tianocore.frameworkwizard.common.Tools;\r
+import org.tianocore.frameworkwizard.common.Identifications.OpeningPlatformType;\r
 import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
 import org.tianocore.frameworkwizard.common.ui.StarLabel;\r
 \r
@@ -52,6 +55,7 @@ public class FpdHeader extends IInternalFrame {
     ///\r
     private static final long serialVersionUID = -8152099582923006900L;\r
 \r
+    static JFrame frame;\r
     //\r
     //Define class members\r
     //\r
@@ -122,6 +126,8 @@ public class FpdHeader extends IInternalFrame {
     private JTextField jTextField = null;\r
     \r
     private FpdFileContents ffc = null;\r
+    \r
+    private OpeningPlatformType docConsole = null;\r
 \r
     /**\r
      This method initializes jTextFieldBaseName \r
@@ -136,6 +142,11 @@ public class FpdHeader extends IInternalFrame {
             jTextFieldBaseName.setPreferredSize(new java.awt.Dimension(320,20));\r
             jTextFieldBaseName.addFocusListener(new FocusAdapter(){\r
                public void focusLost(FocusEvent e) {\r
+                   if (!DataValidation.isUiNameType(jTextFieldBaseName.getText())) {\r
+                       JOptionPane.showMessageDialog(frame, "Package Name is NOT UiNameType.");\r
+                       return;\r
+                   }\r
+                   docConsole.setSaved(false);\r
                    ffc.setFpdHdrPlatformName(jTextFieldBaseName.getText());\r
                } \r
             });\r
@@ -156,6 +167,11 @@ public class FpdHeader extends IInternalFrame {
             jTextFieldGuid.setPreferredSize(new java.awt.Dimension(250,20));\r
             jTextFieldGuid.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
+                    if (!DataValidation.isGuid(jTextFieldGuid.getText())) {\r
+                        JOptionPane.showMessageDialog(frame, "Guid is NOT GuidType.");\r
+                        return;\r
+                    }\r
+                    docConsole.setSaved(false);\r
                     ffc.setFpdHdrGuidValue(jTextFieldGuid.getText());\r
                 } \r
              });\r
@@ -176,6 +192,11 @@ public class FpdHeader extends IInternalFrame {
             jTextFieldVersion.setPreferredSize(new java.awt.Dimension(320,20));\r
             jTextFieldVersion.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
+                    if (!DataValidation.isVersion(jTextFieldVersion.getText())) {\r
+                        JOptionPane.showMessageDialog(frame, "Version is NOT version type.");\r
+                        return;\r
+                    }\r
+                    docConsole.setSaved(false);\r
                     ffc.setFpdHdrVer(jTextFieldVersion.getText());\r
                 } \r
              });\r
@@ -209,10 +230,14 @@ public class FpdHeader extends IInternalFrame {
         if (jTextAreaLicense == null) {\r
             jTextAreaLicense = new JTextArea();\r
             jTextAreaLicense.setText("");\r
-            jTextAreaLicense.setPreferredSize(new java.awt.Dimension(317,77));\r
             jTextAreaLicense.setLineWrap(true);\r
             jTextAreaLicense.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
+                    if (jTextAreaLicense.getText().length() == 0) {\r
+                        JOptionPane.showMessageDialog(frame, "License contents could NOT be empty.");\r
+                        return;\r
+                    }\r
+                    docConsole.setSaved(false);\r
                     ffc.setFpdHdrLicense(jTextAreaLicense.getText());\r
                 } \r
              });\r
@@ -230,9 +255,13 @@ public class FpdHeader extends IInternalFrame {
         if (jTextAreaDescription == null) {\r
             jTextAreaDescription = new JTextArea();\r
             jTextAreaDescription.setLineWrap(true);\r
-            jTextAreaDescription.setPreferredSize(new java.awt.Dimension(317,77));\r
             jTextAreaDescription.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
+                    if (jTextAreaDescription.getText().length() == 0) {\r
+                        JOptionPane.showMessageDialog(frame, "Description contents could NOT be empty.");\r
+                        return;\r
+                    }\r
+                    docConsole.setSaved(false);\r
                     ffc.setFpdHdrDescription(jTextAreaDescription.getText());\r
                 } \r
              });\r
@@ -341,6 +370,11 @@ public class FpdHeader extends IInternalFrame {
             jTextFieldAbstract.setPreferredSize(new java.awt.Dimension(320, 20));\r
             jTextFieldAbstract.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
+                    if (!DataValidation.isAbstract(jTextFieldAbstract.getText())) {\r
+                        JOptionPane.showMessageDialog(frame, "Abstract could NOT be empty.");\r
+                        return;\r
+                    }\r
+                    docConsole.setSaved(false);\r
                     ffc.setFpdHdrAbs(jTextFieldAbstract.getText());\r
                 } \r
              });\r
@@ -361,6 +395,11 @@ public class FpdHeader extends IInternalFrame {
             jTextFieldCopyright.setPreferredSize(new java.awt.Dimension(320,20));\r
             jTextFieldCopyright.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
+                    if (!DataValidation.isCopyright(jTextFieldCopyright.getText())) {\r
+                        JOptionPane.showMessageDialog(frame, "Copyright contents could not be empty.");\r
+                        return;\r
+                    }\r
+                    docConsole.setSaved(false);\r
                     ffc.setFpdHdrCopyright(jTextFieldCopyright.getText());\r
                 } \r
              });\r
@@ -382,6 +421,7 @@ public class FpdHeader extends IInternalFrame {
                public void focusLost(FocusEvent e){\r
                    ffc.setFpdHdrLicense(jTextAreaLicense.getText());\r
                    ffc.setFpdHdrUrl(jTextField.getText());\r
+                   docConsole.setSaved(false);\r
                } \r
             });\r
         }\r
@@ -414,6 +454,11 @@ public class FpdHeader extends IInternalFrame {
         init(ffc);\r
         \r
     }\r
+    \r
+    public FpdHeader(OpeningPlatformType opt) {\r
+        this(opt.getXmlFpd());\r
+        docConsole = opt;\r
+    }\r
 \r
     /**\r
      This method initializes this\r
@@ -576,7 +621,7 @@ public class FpdHeader extends IInternalFrame {
             this.setEdited(false);\r
         }\r
         if (arg0.getSource() == jButtonGenerateGuid) {\r
-            //ToDo: invoke GuidValueEditor\r
+            docConsole.setSaved(false);\r
             jTextFieldGuid.setText(Tools.generateUuidString());\r
             ffc.setFpdHdrGuidValue(jTextFieldGuid.getText());\r
         }\r
index 0f6fb8b69b9bd31c39aae5c4c194246322702fd4..2ee6371c3d6c03e5244340980aac81e327e75125 100644 (file)
@@ -21,6 +21,7 @@ import javax.swing.JButton;
 import javax.swing.ListSelectionModel;\r
 \r
 import org.tianocore.PlatformSurfaceAreaDocument;\r
+import org.tianocore.frameworkwizard.common.Identifications.OpeningPlatformType;\r
 import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
 \r
 \r
@@ -60,7 +61,7 @@ public class FpdPlatformDefs extends IInternalFrame {
     private TargetTableModel imageEntryPointTableModel = null;\r
     \r
     private SkuInfoTableModel skuInfoTableModel = null;\r
-    \r
+    private OpeningPlatformType docConsole = null;\r
     private FpdFileContents ffc = null;\r
     private JPanel jPanel4 = null;\r
     private JPanel jPanel5 = null;\r
@@ -111,6 +112,11 @@ public class FpdPlatformDefs extends IInternalFrame {
         init(ffc);\r
     }\r
     \r
+    public FpdPlatformDefs(OpeningPlatformType opt) {\r
+        this(opt.getXmlFpd());\r
+        docConsole = opt;\r
+    }\r
+    \r
     /**\r
      * This method initializes jPanel  \r
      *         \r
@@ -304,6 +310,9 @@ public class FpdPlatformDefs extends IInternalFrame {
    }\r
    \r
    private void getToolChain(Vector<Object> v) {\r
+       if (docConsole != null){\r
+           docConsole.setSaved(false);\r
+       }\r
        v.removeAllElements();\r
        if (jCheckBox1.isSelected()) {\r
            v.add("IA32");\r
@@ -469,6 +478,7 @@ public class FpdPlatformDefs extends IInternalFrame {
                         for (int i = 0; i < jTable.getRowCount(); ++i) {\r
                             v.add(m.getValueAt(i, 0));\r
                         }\r
+                        docConsole.setSaved(false);\r
                         ffc.setPlatformDefsBuildTargets(v);\r
                     }\r
                 }\r
@@ -522,6 +532,9 @@ public class FpdPlatformDefs extends IInternalFrame {
             jComboBox.setSelectedIndex(0);\r
             jComboBox.addItemListener(new java.awt.event.ItemListener() {\r
                 public void itemStateChanged(java.awt.event.ItemEvent e) {\r
+                    if (docConsole != null){\r
+                        docConsole.setSaved(false);\r
+                    }\r
                     ffc.setPlatformDefsInterDir(jComboBox.getSelectedItem()+"");\r
                 }\r
             });\r
@@ -588,6 +601,7 @@ public class FpdPlatformDefs extends IInternalFrame {
                         for (int i = 0; i < jTable.getRowCount(); ++i) {\r
                             v.add(imageEntryPointTableModel.getValueAt(i, 0));\r
                         }\r
+                        docConsole.setSaved(false);\r
                         ffc.setPlatformDefsBuildTargets(v);\r
                     }\r
                 }\r
@@ -662,6 +676,7 @@ public class FpdPlatformDefs extends IInternalFrame {
                         //ToDo Data Validition check.\r
                         String id = m.getValueAt(row, 0)+"";\r
                         String name = m.getValueAt(row, 1)+"";\r
+                        docConsole.setSaved(false);\r
                         ffc.updatePlatformDefsSkuInfo(row, id, name);\r
                     }\r
                 }\r
@@ -771,6 +786,7 @@ public class FpdPlatformDefs extends IInternalFrame {
             jTextField.setPreferredSize(new java.awt.Dimension(300,20));\r
             jTextField.addFocusListener(new java.awt.event.FocusAdapter() {\r
                 public void focusLost(java.awt.event.FocusEvent e) {\r
+                    docConsole.setSaved(false);\r
                     ffc.setPlatformDefsOutputDir(jTextField.getText());\r
                 }\r
             });\r
@@ -852,6 +868,7 @@ public class FpdPlatformDefs extends IInternalFrame {
                     if (jTextField2.getText().length() > 0) {\r
                         String[] row = {jTextField2.getText(), jTextField3.getText()};\r
                         skuInfoTableModel.addRow(row);\r
+                        docConsole.setSaved(false);\r
                         ffc.genPlatformDefsSkuInfo(row[0], row[1]);\r
                     }\r
                 }\r
@@ -878,6 +895,7 @@ public class FpdPlatformDefs extends IInternalFrame {
                     if (jTable2.getSelectedRow() < 1) {\r
                         return;\r
                     }\r
+                    docConsole.setSaved(false);\r
                     ffc.removePlatformDefsSkuInfo(jTable2.getSelectedRow());\r
                     skuInfoTableModel.removeRow(jTable2.getSelectedRow());\r
                 }\r