Change FrameworkModules selection to next module in platform after remove one module.

[mirror_edk2.git] / Tools / Java / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / platform / ui / FpdFrameworkModules.java

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
index 214c56b1e62f8474587804a9642f7abb3da270b8..2e5bbd756859f541bdfcb229390375ebe9c6952f 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
@@ -727,7 +727,7 @@ public class FpdFrameworkModules extends IInternalFrame {
                     if (selectedRow < 0) {\r
                         return;\r
                     }\r
-                    \r
+                    int nextSelection = selectedRow;\r
 \r
                     TableSorter sorter = (TableSorter) jTableFpdModules.getModel();\r
                     selectedRow = sorter.getModelRowIndex(selectedRow);\r
@@ -761,7 +761,7 @@ public class FpdFrameworkModules extends IInternalFrame {
                         ffc.removeModuleSA(selectedRow);    \r
                     }\r
                     catch (Exception exp) {\r
-                        JOptionPane.showMessageDialog(frame, exp.getCause() + exp.getMessage());\r
+                        JOptionPane.showMessageDialog(frame, exp.getMessage());\r
                         return;\r
                     }\r
                     \r
@@ -780,6 +780,10 @@ public class FpdFrameworkModules extends IInternalFrame {
                     }\r
                     \r
                     modelFpdModules.removeRow(selectedRow);\r
+                    if (nextSelection >= jTableFpdModules.getRowCount()) {\r
+                        nextSelection = jTableFpdModules.getRowCount() - 1;\r
+                    }\r
+                    jTableFpdModules.changeSelection(nextSelection, 0, false, false);\r
                     docConsole.setSaved(false);\r
                 }\r
             });\r