Fix EDKT352: Scroll bar should be displayed when the table is out of screen scope

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java
index 482188dcba0821476a557b7b6e9059e7067dd955..5eefacbdc3d3742a9f2d925d2d6f7aeefd7a3e4a 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java
@@ -2461,6 +2461,7 @@ public class FpdFlash extends IInternalFrame {
                     if (mi != null) {\r
                         name = mi.getName();\r
                     }\r
+                    \r
                     String[] row = { name, saa[i][0] , saa[i][1], saa[i][2] , saa[i][3], saa[i][4] };\r
                     modInFvTableModel.addRow(row);\r
                 }\r
@@ -2660,7 +2661,7 @@ public class FpdFlash extends IInternalFrame {
                 \r
                 jTableModInFv.setRowHeight(20);\r
                 jTableModInFv.setShowGrid(false);\r
-//                jTableModInFv.setAutoCreateColumnsFromModel(false);\r
+                jTableModInFv.setAutoCreateColumnsFromModel(false);\r
                 jTableModInFv.addMouseListener(new MouseAdapter() {\r
 \r
                     /* (non-Javadoc)\r
@@ -2778,7 +2779,7 @@ public class FpdFlash extends IInternalFrame {
                 }\r
                 jTableFpdModules.setRowHeight(20);\r
                 jTableFpdModules.setShowGrid(false);\r
-//                jTableFpdModules.setAutoCreateColumnsFromModel(false);\r
+                jTableFpdModules.setAutoCreateColumnsFromModel(false);\r
                 jTableFpdModules.addMouseListener(new MouseAdapter() {\r
 \r
                     /* (non-Javadoc)\r
@@ -2842,7 +2843,7 @@ public class FpdFlash extends IInternalFrame {
         private JButton getJButtonInsert() {\r
             if (jButtonInsert == null) {\r
                 jButtonInsert = new JButton();\r
-                jButtonInsert.setText("<<");\r
+                jButtonInsert.setText("<");\r
                 jButtonInsert.setPreferredSize(new java.awt.Dimension(60,20));\r
                 jButtonInsert.addActionListener(new java.awt.event.ActionListener() {\r
                     public void actionPerformed(java.awt.event.ActionEvent e) {\r
@@ -2852,12 +2853,12 @@ public class FpdFlash extends IInternalFrame {
                         }\r
                         \r
                         int rowInModel = ((TableSorter)jTableFpdModules.getModel()).getModelRowIndex(selectedRowRight);\r
-                        String name = fpdModTableModel.getValueAt(selectedRowRight, 0)+"";\r
-                        String mg = fpdModTableModel.getValueAt(selectedRowRight, 1)+"";\r
-                        String mv = fpdModTableModel.getValueAt(selectedRowRight, 2)+"";\r
-                        String pg = fpdModTableModel.getValueAt(selectedRowRight, 3)+"";\r
-                        String pv = fpdModTableModel.getValueAt(selectedRowRight, 4)+"";\r
-                        String arch = fpdModTableModel.getValueAt(selectedRowRight, 5)+"";\r
+                        String name = fpdModTableModel.getValueAt(rowInModel, 0)+"";\r
+                        String mg = fpdModTableModel.getValueAt(rowInModel, 1)+"";\r
+                        String mv = fpdModTableModel.getValueAt(rowInModel, 2)+"";\r
+                        String pg = fpdModTableModel.getValueAt(rowInModel, 3)+"";\r
+                        String pv = fpdModTableModel.getValueAt(rowInModel, 4)+"";\r
+                        String arch = fpdModTableModel.getValueAt(rowInModel, 5)+"";\r
                         String[] row = {name, mg, mv, pg, pv, arch};\r
                         if (name.length() == 0 || name.equals("N/A")) {\r
                             return;\r
@@ -2888,7 +2889,7 @@ public class FpdFlash extends IInternalFrame {
             if (jButtonRemove == null) {\r
                 jButtonRemove = new JButton();\r
                 jButtonRemove.setPreferredSize(new java.awt.Dimension(60,20));\r
-                jButtonRemove.setText(">>");\r
+                jButtonRemove.setText(">");\r
                 jButtonRemove.addActionListener(new java.awt.event.ActionListener() {\r
                     public void actionPerformed(java.awt.event.ActionEvent e) {\r
                         int selectedRowLeft = jTableModInFv.getSelectedRow();\r
@@ -2903,10 +2904,13 @@ public class FpdFlash extends IInternalFrame {
                         String pv = modInFvTableModel.getValueAt(selectedRowLeft, 4)+"";\r
                         String arch = modInFvTableModel.getValueAt(selectedRowLeft, 5)+"";\r
                         String[] row = {name, mg, mv, pg, pv, arch};\r
-                        if (name.length() == 0 || name.equals("N/A")) {\r
+                        String moduleKey = mg + " " + mv + " " + pg + " " + pv + " " + arch; \r
+                        if (name.length() == 0 || name.equals("N/A") || ffc.getModuleSA(moduleKey) == null) {\r
+                            JOptionPane.showMessageDialog(frame, "Module " + name + " not exists in platform. If you want to add back this module, please first add it into current platform. " + moduleKey );\r
+                            modInFvTableModel.removeRow(selectedRowLeft);\r
                             return;\r
                         }\r
-                        \r
+                       \r
                         fpdModTableModel.addRow(row);\r
                         int viewIndex = ((TableSorter) jTableFpdModules.getModel()).getViewIndexArray()[jTableFpdModules\r
                                                                                                                         .getRowCount() - 1];\r