X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2FJava%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2Fplatform%2Fui%2FFpdFrameworkModules.java;fp=Tools%2FJava%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2Fplatform%2Fui%2FFpdFrameworkModules.java;h=2e5bbd756859f541bdfcb229390375ebe9c6952f;hb=bc9b370686eb138d013672e4a617113eeaf47afb;hp=214c56b1e62f8474587804a9642f7abb3da270b8;hpb=2193b507f0fbd0d4542d9923b2602e31b2dfde4f;p=mirror_edk2.git

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 214c56b1e6..2e5bbd7568 100644
--- 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) {
                         return;
                     }
-                    
+                    int nextSelection = selectedRow;
 
                     TableSorter sorter = (TableSorter) jTableFpdModules.getModel();
                     selectedRow = sorter.getModelRowIndex(selectedRow);
@@ -761,7 +761,7 @@ public class FpdFrameworkModules extends IInternalFrame {
                         ffc.removeModuleSA(selectedRow);    
                     }
                     catch (Exception exp) {
-                        JOptionPane.showMessageDialog(frame, exp.getCause() + exp.getMessage());
+                        JOptionPane.showMessageDialog(frame, exp.getMessage());
                         return;
                     }
                     
@@ -780,6 +780,10 @@ public class FpdFrameworkModules extends IInternalFrame {
                     }
                     
                     modelFpdModules.removeRow(selectedRow);
+                    if (nextSelection >= jTableFpdModules.getRowCount()) {
+                        nextSelection = jTableFpdModules.getRowCount() - 1;
+                    }
+                    jTableFpdModules.changeSelection(nextSelection, 0, false, false);
                     docConsole.setSaved(false);
                 }
             });