Fix not able to save after change build target.

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java
index 5eefacbdc3d3742a9f2d925d2d6f7aeefd7a3e4a..75824a4967f1d9e44dc33315600ab00e335e046e 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java
@@ -169,6 +169,12 @@ public class FpdFlash extends IInternalFrame {
     private JPanel jPanelBgFvName = null;\r
     private JPanel jPanelBgFvImage = null;\r
     private JPanel jPanelW = null;\r
+    private JPanel jPanelFvImageParaN = null;\r
+    private JPanel jPanelFvImageParaS = null;\r
+    private JPanel jPanelFvImageParaC = null;\r
+    private JPanel jPanelFvImageOptsN = null;\r
+    private JPanel jPanelFvImageOptsS = null;\r
+    private JPanel jPanelFvImageOptsC = null;\r
     \r
     public FpdFlash() {\r
         super();\r
@@ -554,6 +560,8 @@ public class FpdFlash extends IInternalFrame {
      */\r
     private JPanel getJPanelFvImageC() {\r
         if (jPanelFvImageC == null) {\r
+            GridLayout gridLayout = new GridLayout();\r
+            gridLayout.setRows(2);\r
             jLabelFvParaName = new JLabel();\r
             jLabelFvParaName.setPreferredSize(new Dimension(38, 20));\r
             jLabelFvParaName.setText("Name");\r
@@ -563,15 +571,12 @@ public class FpdFlash extends IInternalFrame {
             jLabelFvParaType = new JLabel();\r
             jLabelFvParaType.setText("Type");\r
             jLabelFvParaType.setPreferredSize(new java.awt.Dimension(70,20));\r
-            FlowLayout flowLayout3 = new FlowLayout();\r
-            flowLayout3.setAlignment(java.awt.FlowLayout.LEFT);\r
-            flowLayout3.setHgap(5);\r
             jPanelFvImageC = new JPanel();\r
-            jPanelFvImageC.setLayout(flowLayout3);\r
+            jPanelFvImageC.setLayout(gridLayout);\r
             jPanelFvImageC.add(getJPanelFvImagePara(), null);\r
-            \r
             jPanelFvImageC.add(getJPanelFvImageOpts(), null);\r
             \r
+            \r
         }\r
         return jPanelFvImageC;\r
     }\r
@@ -791,8 +796,6 @@ public class FpdFlash extends IInternalFrame {
 \r
  if (jPanelFvImageOpts == null) {\r
      //ToDo add ButtonGroup for RadioButtons\r
-            FlowLayout flowLayout5 = new FlowLayout();\r
-            flowLayout5.setAlignment(java.awt.FlowLayout.LEFT);\r
             jLabelOptions = new JLabel();\r
             jLabelOptions.setText("Attribute");\r
             jLabelFvImageOptValue = new JLabel();\r
@@ -804,23 +807,16 @@ public class FpdFlash extends IInternalFrame {
             jLabelFvImageOptName.setText("Name");\r
             jLabelFvImageOptName.setPreferredSize(new Dimension(38, 20));\r
             jPanelFvImageOpts = new JPanel();\r
-            jPanelFvImageOpts.setLayout(flowLayout5);\r
+            jPanelFvImageOpts.setLayout(new BorderLayout());\r
             jPanelFvImageOpts.setPreferredSize(new java.awt.Dimension(450,130));\r
             \r
             \r
                        jPanelFvImageOpts.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED));\r
-                       jPanelFvImageOpts.add(jLabelOptions, null);\r
-                       jPanelFvImageOpts.add(jLabelFvImageOptName, null);\r
-                       jPanelFvImageOpts.add(getJTextFieldFvImageOptName(), null);\r
-                       jPanelFvImageOpts.add(jLabelFvImageOptValue, null);\r
-                       jPanelFvImageOpts.add(getJTextFieldFvImageOptValue(), null);\r
-                       jPanelFvImageOpts.add(getJScrollPane(), null);\r
-                       jPanelFvImageOpts.add(getJPanelFvImageOptsButtonGroup(), null);\r
-            \r
-            \r
-                               \r
 \r
-            \r
+                       jPanelFvImageOpts.add(getJPanelFvImageOptsN(), java.awt.BorderLayout.NORTH);\r
+                       jPanelFvImageOpts.add(getJPanelFvImageOptsS(), java.awt.BorderLayout.SOUTH);\r
+                       jPanelFvImageOpts.add(getJPanelFvImageOptsC(), java.awt.BorderLayout.CENTER);\r
+\r
         }\r
         return jPanelFvImageOpts;\r
     }\r
@@ -990,22 +986,20 @@ public class FpdFlash extends IInternalFrame {
      */\r
     private JPanel getJPanelFvImagePara() {\r
         if (jPanelFvImagePara == null) {\r
-            FlowLayout flowLayout6 = new FlowLayout();\r
-            flowLayout6.setAlignment(java.awt.FlowLayout.LEFT);\r
             StarLabel starLabel = new StarLabel();\r
             starLabel.setVisible(false);\r
             jPanelFvImagePara = new JPanel();\r
-            jPanelFvImagePara.setLayout(flowLayout6);\r
+            jPanelFvImagePara.setLayout(new BorderLayout());\r
             jPanelFvImagePara.setPreferredSize(new java.awt.Dimension(450,140));\r
             jPanelFvImagePara.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.RAISED));\r
-            jPanelFvImagePara.add(new StarLabel(), null);\r
-            jPanelFvImagePara.add(jLabelFvImageNames, null);\r
-            jPanelFvImagePara.add(jLabelFvParaName, null);\r
-            jPanelFvImagePara.add(getJTextFieldFvParaName(), null);\r
-            jPanelFvImagePara.add(getJScrollPaneFvImageNames(), null);\r
-            jPanelFvImagePara.add(getJPanelBgFvName(), null);\r
-            jPanelFvImagePara.add(jLabelFvParaType, null);\r
-            jPanelFvImagePara.add(getJComboBoxFvParaType(), null);\r
+\r
+            jPanelFvImagePara.add(getJPanelFvImageParaN(), java.awt.BorderLayout.NORTH);\r
+            jPanelFvImagePara.add(getJPanelFvImageParaS(), java.awt.BorderLayout.SOUTH);\r
+            jPanelFvImagePara.add(getJPanelFvImageParaC(), java.awt.BorderLayout.CENTER);\r
+\r
+//            \r
+//            \r
+//            \r
         }\r
         return jPanelFvImagePara;\r
     }\r
@@ -2072,6 +2066,99 @@ public class FpdFlash extends IInternalFrame {
         return jPanelW;\r
     }\r
 \r
+    /**\r
+     * This method initializes jPanelFvImageParaN      \r
+     *         \r
+     * @return javax.swing.JPanel      \r
+     */\r
+    private JPanel getJPanelFvImageParaN() {\r
+        if (jPanelFvImageParaN == null) {\r
+            FlowLayout flowLayout3 = new FlowLayout();\r
+            flowLayout3.setAlignment(java.awt.FlowLayout.CENTER);\r
+            jPanelFvImageParaN = new JPanel();\r
+            jPanelFvImageParaN.setLayout(flowLayout3);\r
+            jPanelFvImageParaN.add(new StarLabel(), null);\r
+            jPanelFvImageParaN.add(jLabelFvImageNames, null);\r
+            jPanelFvImageParaN.add(jLabelFvParaName, null);\r
+            jPanelFvImageParaN.add(getJTextFieldFvParaName(), null);\r
+        }\r
+        return jPanelFvImageParaN;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jPanelFvImageParaS      \r
+     *         \r
+     * @return javax.swing.JPanel      \r
+     */\r
+    private JPanel getJPanelFvImageParaS() {\r
+        if (jPanelFvImageParaS == null) {\r
+            FlowLayout flowLayout6 = new FlowLayout();\r
+            flowLayout6.setAlignment(java.awt.FlowLayout.CENTER);\r
+            jPanelFvImageParaS = new JPanel();\r
+            jPanelFvImageParaS.setLayout(flowLayout6);\r
+            jPanelFvImageParaS.add(jLabelFvParaType, null);\r
+            jPanelFvImageParaS.add(getJComboBoxFvParaType(), null);\r
+        }\r
+        return jPanelFvImageParaS;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jPanelFvImageParaC      \r
+     *         \r
+     * @return javax.swing.JPanel      \r
+     */\r
+    private JPanel getJPanelFvImageParaC() {\r
+        if (jPanelFvImageParaC == null) {\r
+            jPanelFvImageParaC = new JPanel();\r
+            jPanelFvImageParaC.add(getJScrollPaneFvImageNames(), null);\r
+            jPanelFvImageParaC.add(getJPanelBgFvName(), null);\r
+        }\r
+        return jPanelFvImageParaC;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jPanelFvImageOptsN      \r
+     *         \r
+     * @return javax.swing.JPanel      \r
+     */\r
+    private JPanel getJPanelFvImageOptsN() {\r
+        if (jPanelFvImageOptsN == null) {\r
+            jPanelFvImageOptsN = new JPanel();\r
+            jPanelFvImageOptsN.add(jLabelOptions, null);\r
+            jPanelFvImageOptsN.add(jLabelFvImageOptName, null);\r
+            jPanelFvImageOptsN.add(getJTextFieldFvImageOptName(), null);\r
+            jPanelFvImageOptsN.add(jLabelFvImageOptValue, null);\r
+            jPanelFvImageOptsN.add(getJTextFieldFvImageOptValue(), null);\r
+        }\r
+        return jPanelFvImageOptsN;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jPanelFvImageOptsS      \r
+     *         \r
+     * @return javax.swing.JPanel      \r
+     */\r
+    private JPanel getJPanelFvImageOptsS() {\r
+        if (jPanelFvImageOptsS == null) {\r
+            jPanelFvImageOptsS = new JPanel();\r
+        }\r
+        return jPanelFvImageOptsS;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jPanelFvImageOptsC      \r
+     *         \r
+     * @return javax.swing.JPanel      \r
+     */\r
+    private JPanel getJPanelFvImageOptsC() {\r
+        if (jPanelFvImageOptsC == null) {\r
+            jPanelFvImageOptsC = new JPanel();\r
+            jPanelFvImageOptsC.add(getJScrollPane(), null);\r
+            jPanelFvImageOptsC.add(getJPanelFvImageOptsButtonGroup(), null);\r
+        }\r
+        return jPanelFvImageOptsC;\r
+    }\r
+\r
     /**\r
      * @param args\r
      */\r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
index fcb78f3648bb0da1317c702360f1a1acfb9b1d79..0b190ae2dbaa378bb9e7f46382085ee15ccb0c8b 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
@@ -185,6 +185,9 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             for (int i = 0; i < saa.length; ++i) {\r
                 ModuleIdentification mi = WorkspaceProfile.getModuleId(saa[i][1] + " " + saa[i][2] + " " + saa[i][3] + " " + saa[i][4]);\r
                 if (mi != null) {\r
+                    //\r
+                    // ToDo: verify this instance first.\r
+                    //\r
                     saa[i][0] = mi.getName();\r
                     saa[i][2] = mi.getVersion();\r
                     saa[i][4] = mi.getPackageId().getVersion();\r
@@ -267,7 +270,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             }\r
             \r
             //\r
-            // find potential instances in all dependency pkgs for classes still in classConsumed.\r
+            // find potential instances in all pkgs for classes still in classConsumed.\r
             //\r
             if (classInstanceMap == null){\r
                 classInstanceMap = new HashMap<String, ArrayList<String>>();\r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java
index 454df225e153e6171fdde63bb74b4e915d46bc8f..b76d8b3822ae7ea9a19944b3ead20eeb54453559 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java
@@ -704,6 +704,8 @@ public class FpdPlatformDefs extends IInternalFrame {
                         for (int i = 0; i < jTableBuildTargets.getRowCount(); ++i) {\r
                             v.add(buildTargetTableModel.getValueAt(i, 0));\r
                         }\r
+                        docConsole.setSaved(false);\r
+                        ffc.setPlatformDefsBuildTargets(v);\r
                     }\r
                 }\r
             });\r