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 b15e5d28d8ddebdba0920722c9d3cc5670fa5459..1acb42e991a7b240ff9d1ac7db282a80eee54a67 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
@@ -358,6 +358,9 @@ public class FpdFileContents {
                 if (!cursor.isText()) {\r
                     break;\r
                 }\r
                 if (!cursor.isText()) {\r
                     break;\r
                 }\r

+                if (cursor.getObject() == null) {\r
+                    break;\r
+                }\r

                 String s = cursor.getTextValue();\r
                 if (s.matches(regExpNewLineAndSpaces)) {\r
                     continue;\r
                 String s = cursor.getTextValue();\r
                 if (s.matches(regExpNewLineAndSpaces)) {\r
                     continue;\r

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
                     if (selectedRow < 0) {\r
                         return;\r
                     }\r

-                    \r
+                    int nextSelection = selectedRow;\r

 \r
                     TableSorter sorter = (TableSorter) jTableFpdModules.getModel();\r
                     selectedRow = sorter.getModelRowIndex(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
                         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
                         return;\r
                     }\r
                     \r


@@ -780,6 +780,10 @@ public class FpdFrameworkModules extends IInternalFrame {
                     }\r
                     \r
                     modelFpdModules.removeRow(selectedRow);\r
                     }\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
                     docConsole.setSaved(false);\r
                 }\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 6ddf7ccd17d05d44b5d051fe9b19cb90025db721..fcb78f3648bb0da1317c702360f1a1acfb9b1d79 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
@@ -4,7 +4,6 @@ import java.awt.BorderLayout;
 import java.awt.Dimension;\r
 import java.awt.Toolkit;\r
 \r
 import java.awt.Dimension;\r
 import java.awt.Toolkit;\r
 \r

-import javax.swing.DefaultCellEditor;\r

 import javax.swing.JFrame;\r
 import javax.swing.JOptionPane;\r
 import javax.swing.JPanel;\r
 import javax.swing.JFrame;\r
 import javax.swing.JOptionPane;\r
 import javax.swing.JPanel;\r