For encapsulated sections in FFS layout in FpdBuildOptions, if no longer exists secti...

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
index ecaf8587a69635074611b066ec05b921da48774d..bc9a8c23a8dcc1579169d617d1b5ca40e5c7be42 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
@@ -457,27 +457,35 @@ public class FpdBuildOptions extends IInternalFrame {
         initFfsTable();\r
         this.addInternalFrameListener(new InternalFrameAdapter() {\r
             public void internalFrameDeactivated(InternalFrameEvent e) {\r
         initFfsTable();\r
         this.addInternalFrameListener(new InternalFrameAdapter() {\r
             public void internalFrameDeactivated(InternalFrameEvent e) {\r

-                if (jTableFfs.isEditing()) {\r
-                    jTableFfs.getCellEditor().stopCellEditing();\r
-                }\r
-                if (jTableFfsSection.isEditing()) {\r
-                    jTableFfsSection.getCellEditor().stopCellEditing();\r
-                }\r
+                \r

                 if (jTableAntTasks.isEditing()) {\r
                     jTableAntTasks.getCellEditor().stopCellEditing();\r
                 }\r
                 if (jTableAntTasks.isEditing()) {\r
                     jTableAntTasks.getCellEditor().stopCellEditing();\r
                 }\r

-                if (jTableFfsSubSection.isEditing()) {\r
-                    jTableFfsSubSection.getCellEditor().stopCellEditing();\r
-                }\r
-                if (jTableFfsAttribs.isEditing()) {\r
-                    jTableFfsAttribs.getCellEditor().stopCellEditing();\r
-                }\r

                 if (jTableOptions.isEditing()) {\r
                     jTableOptions.getCellEditor().stopCellEditing();\r
                 }\r
                 if (jTableOptions.isEditing()) {\r
                     jTableOptions.getCellEditor().stopCellEditing();\r
                 }\r

+                stopEditingInTables ();\r

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

+    \r
+    private void stopEditingInTables () {\r
+        if (jTableFfs.isEditing()) {\r
+            jTableFfs.getCellEditor().stopCellEditing();\r
+        }\r
+        if (jTableFfsSection.isEditing()) {\r
+            jTableFfsSection.getCellEditor().stopCellEditing();\r
+        }\r
+        if (jTableFfsSections.isEditing()) {\r
+            jTableFfsSections.getCellEditor().stopCellEditing();\r
+        }\r
+        if (jTableFfsSubSection.isEditing()) {\r
+            jTableFfsSubSection.getCellEditor().stopCellEditing();\r
+        }\r
+        if (jTableFfsAttribs.isEditing()) {\r
+            jTableFfsAttribs.getCellEditor().stopCellEditing();\r
+        }\r
+    }\r

 \r
     /**\r
      * This method initializes jPanel13        \r
 \r
     /**\r
      * This method initializes jPanel13        \r


@@ -629,6 +637,7 @@ public class FpdBuildOptions extends IInternalFrame {
                     if (jTableFfs.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
                     if (jTableFfs.getSelectedRow() < 0) {\r
                         return;\r
                     }\r

+                    stopEditingInTables();\r

                     docConsole.setSaved(false);\r
                     ffc.removeBuildOptionsFfs(jTableFfs.getSelectedRow());\r
                     ffsTableModel.removeRow(jTableFfs.getSelectedRow());\r
                     docConsole.setSaved(false);\r
                     ffc.removeBuildOptionsFfs(jTableFfs.getSelectedRow());\r
                     ffsTableModel.removeRow(jTableFfs.getSelectedRow());\r


@@ -758,6 +767,7 @@ public class FpdBuildOptions extends IInternalFrame {
                     if (jTableFfs.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
                     if (jTableFfs.getSelectedRow() < 0) {\r
                         return;\r
                     }\r

+                    stopEditingInTables();\r

                     if (jTableFfsAttribs.getSelectedRow() >= 0) {\r
                         docConsole.setSaved(false);\r
                         ffsAttributesTableModel.removeRow(jTableFfsAttribs.getSelectedRow());\r
                     if (jTableFfsAttribs.getSelectedRow() >= 0) {\r
                         docConsole.setSaved(false);\r
                         ffsAttributesTableModel.removeRow(jTableFfsAttribs.getSelectedRow());\r


@@ -1067,6 +1077,7 @@ public class FpdBuildOptions extends IInternalFrame {
                     if (jTableFfs.getSelectedRow() < 0 || jTableFfsSection.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
                     if (jTableFfs.getSelectedRow() < 0 || jTableFfsSection.getSelectedRow() < 0) {\r
                         return;\r
                     }\r

+                    stopEditingInTables();\r

                     docConsole.setSaved(false);\r
                     sectionTableModel.removeRow(jTableFfsSection.getSelectedRow());\r
                     ffc.removeBuildOptionsFfsSectionsSection(jTableFfs.getSelectedRow(),\r
                     docConsole.setSaved(false);\r
                     sectionTableModel.removeRow(jTableFfsSection.getSelectedRow());\r
                     ffc.removeBuildOptionsFfsSectionsSection(jTableFfs.getSelectedRow(),\r


@@ -1116,15 +1127,22 @@ public class FpdBuildOptions extends IInternalFrame {
             jButtonFfsSubSectionRemove.setText("Remove");\r
             jButtonFfsSubSectionRemove.addActionListener(new java.awt.event.ActionListener() {\r
                 public void actionPerformed(java.awt.event.ActionEvent e) {\r
             jButtonFfsSubSectionRemove.setText("Remove");\r
             jButtonFfsSubSectionRemove.addActionListener(new java.awt.event.ActionListener() {\r
                 public void actionPerformed(java.awt.event.ActionEvent e) {\r

-                    if (jTableFfs.getSelectedRow() < 0 || jTableFfsSections.getSelectedRow() < 0\r
-                        || jTableFfsSubSection.getSelectedRow() < 0) {\r
+                    int selectedFfsRow = jTableFfs.getSelectedRow();\r
+                    int selectedSectionsRow = jTableFfsSections.getSelectedRow();\r
+                    int selectedSubSectionRow = jTableFfsSubSection.getSelectedRow();\r
+                    if (selectedFfsRow < 0 || selectedSectionsRow < 0\r
+                        || selectedSubSectionRow < 0) {\r

                         return;\r
                     }\r
                         return;\r
                     }\r

+                    stopEditingInTables();\r

                     docConsole.setSaved(false);\r
                     docConsole.setSaved(false);\r

-                    subsectionsTableModel.removeRow(jTableFfsSubSection.getSelectedRow());\r
-                    ffc.removeBuildOptionsFfsSectionsSectionsSection(jTableFfs.getSelectedRow(),\r
-                                                                     jTableFfsSections.getSelectedRow(),\r
-                                                                     jTableFfsSubSection.getSelectedRow());\r
+                    subsectionsTableModel.removeRow(selectedSubSectionRow);\r
+                    ffc.removeBuildOptionsFfsSectionsSectionsSection(selectedFfsRow,\r
+                                                                     selectedSectionsRow,\r
+                                                                     selectedSubSectionRow);\r
+                    if (subsectionsTableModel.getRowCount() == 0) {\r
+                        sectionsTableModel.removeRow(selectedSectionsRow);\r
+                    }\r

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


@@ -1172,6 +1190,7 @@ public class FpdBuildOptions extends IInternalFrame {
                     if (jTableFfs.getSelectedRow() < 0 || jTableFfsSections.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
                     if (jTableFfs.getSelectedRow() < 0 || jTableFfsSections.getSelectedRow() < 0) {\r
                         return;\r
                     }\r

+                    stopEditingInTables();\r

                     docConsole.setSaved(false);\r
                     sectionsTableModel.removeRow(jTableFfsSections.getSelectedRow());\r
                     ffc.removeBuildOptionsFfsSectionsSections(jTableFfs.getSelectedRow(),\r
                     docConsole.setSaved(false);\r
                     sectionsTableModel.removeRow(jTableFfsSections.getSelectedRow());\r
                     ffc.removeBuildOptionsFfsSectionsSections(jTableFfs.getSelectedRow(),\r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
index fdf5fb55e77f2dff6f78ae3638588040ad104541..130b625e753a22606fc21ee5a8ac67395be600d6 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
@@ -402,6 +402,9 @@ public class FpdFileContents {
         String[][] saaLib = new String[libCount][5];\r
         getLibraryInstances(moduleKey, saaLib);\r
         ModuleIdentification mi = WorkspaceProfile.getModuleId(moduleKey);\r
         String[][] saaLib = new String[libCount][5];\r
         getLibraryInstances(moduleKey, saaLib);\r
         ModuleIdentification mi = WorkspaceProfile.getModuleId(moduleKey);\r

+        if (mi == null) {\r
+            throw new Exception ("Module does NOT exist in workspace.");\r
+        }\r

         Vector<ModuleIdentification> vMi = new Vector<ModuleIdentification>();\r
         //\r
         // create vector for module & library instance MIs.\r
         Vector<ModuleIdentification> vMi = new Vector<ModuleIdentification>();\r
         //\r
         // create vector for module & library instance MIs.\r


@@ -417,6 +420,9 @@ public class FpdFileContents {
 \r
                 for (int j = 0; j < vMi.size(); ++j) {\r
                     ModuleIdentification nextMi = vMi.get(j);\r
 \r
                 for (int j = 0; j < vMi.size(); ++j) {\r
                     ModuleIdentification nextMi = vMi.get(j);\r

+                    if (nextMi == null) {\r
+                        continue;\r
+                    }\r

                     if (WorkspaceProfile.pcdInMsa(saaModuleSaPcd[i][0], saaModuleSaPcd[i][1], nextMi)) {\r
                         continue nextPcd;\r
                     }\r
                     if (WorkspaceProfile.pcdInMsa(saaModuleSaPcd[i][0], saaModuleSaPcd[i][1], nextMi)) {\r
                         continue nextPcd;\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 db54307c4343afeb04c2d3d119a0bbca8085b93b..96d2ccf3b2f16ed4fd70188f872c87e75b2debc5 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
@@ -160,6 +160,9 @@ public class FpdModuleSA extends JDialog implements ActionListener {
         jTabbedPane.setSelectedIndex(0);\r
         initPcdBuildDefinition(i);\r
         ModuleIdentification mi = WorkspaceProfile.getModuleId(moduleKey);\r
         jTabbedPane.setSelectedIndex(0);\r
         initPcdBuildDefinition(i);\r
         ModuleIdentification mi = WorkspaceProfile.getModuleId(moduleKey);\r

+        if (mi == null) {\r
+            return;\r
+        }\r

         int tabIndex = jTabbedPane.indexOfTab("Libraries");\r
         if (mi.isLibrary()) {\r
             jTabbedPane.setEnabledAt(tabIndex, false);\r
         int tabIndex = jTabbedPane.indexOfTab("Libraries");\r
         if (mi.isLibrary()) {\r
             jTabbedPane.setEnabledAt(tabIndex, false);\r