From: jlin16 <jlin16@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 10 Oct 2006 04:28:15 +0000 (+0000)
Subject: Change FrameworkModules selection to next module in platform after remove one module.
X-Git-Tag: edk2-stable201903~24174
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=bc9b370686eb138d013672e4a617113eeaf47afb;ds=sidebyside

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

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

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 b15e5d28d8..1acb42e991 100644
--- 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
@@ -358,6 +358,9 @@ public class FpdFileContents {
                 if (!cursor.isText()) {
                     break;
                 }
+                if (cursor.getObject() == null) {
+                    break;
+                }
                 String s = cursor.getTextValue();
                 if (s.matches(regExpNewLineAndSpaces)) {
                     continue;
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);
                 }
             });
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 6ddf7ccd17..fcb78f3648 100644
--- 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
@@ -4,7 +4,6 @@ import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.Toolkit;
 
-import javax.swing.DefaultCellEditor;
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;