[EDKT169]Add feature of sorting modules in FPD file.

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
index 954d992e1d648c21efd159d939c122cbeaeb481c..d260bf5a7a70e165b2e2736857d215fa3324adc5 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
@@ -135,7 +135,9 @@ public class FpdFrameworkModules extends IInternalFrame {
     private JTable getJTableAllModules() {\r
         if (jTableAllModules == null) {\r
             modelAllModules = new NonEditableTableModel();\r
-            jTableAllModules = new JTable(modelAllModules);\r
+            TableSorter sorter = new TableSorter(modelAllModules);\r
+            jTableAllModules = new JTable(sorter);\r
+            sorter.setTableHeader(jTableAllModules.getTableHeader());\r
             jTableAllModules.setRowHeight(20);\r
             modelAllModules.addColumn("ModuleName");\r
             modelAllModules.addColumn("ModuleVersion");\r
@@ -181,6 +183,8 @@ public class FpdFrameworkModules extends IInternalFrame {
                         return;\r
                     }\r
                     \r
+                    TableSorter sorter = (TableSorter)jTableAllModules.getModel();\r
+                    selectedRow = sorter.modelIndex(selectedRow);\r
                     String path = modelAllModules.getValueAt(selectedRow, 4)+"";\r
                     ModuleIdentification mi = miList.get(selectedRow);\r
                     Vector<String> vArchs = null;\r
@@ -297,7 +301,9 @@ public class FpdFrameworkModules extends IInternalFrame {
     private JTable getJTableFpdModules() {\r
         if (jTableFpdModules == null) {\r
             modelFpdModules = new NonEditableTableModel();\r
-            jTableFpdModules = new JTable(modelFpdModules);\r
+            TableSorter sorter = new TableSorter(modelFpdModules);\r
+            jTableFpdModules = new JTable(sorter);\r
+            sorter.setTableHeader(jTableFpdModules.getTableHeader());\r
             jTableFpdModules.setRowHeight(20);\r
             modelFpdModules.addColumn("ModuleName");\r
             modelFpdModules.addColumn("ModuleVersion");            \r
@@ -327,6 +333,10 @@ public class FpdFrameworkModules extends IInternalFrame {
                     if (selectedRow < 0){\r
                         return;\r
                     }\r
+                    \r
+                    TableSorter sorter = (TableSorter)jTableFpdModules.getModel();\r
+                    selectedRow = sorter.modelIndex(selectedRow);\r
+                    \r
                     if (settingDlg == null) {\r
                         settingDlg = new FpdModuleSA(ffc);\r
                     }\r
@@ -362,6 +372,10 @@ public class FpdFrameworkModules extends IInternalFrame {
                     if (selectedRow < 0){\r
                         return;\r
                     }\r
+                    \r
+                    TableSorter sorter = (TableSorter)jTableFpdModules.getModel();\r
+                    selectedRow = sorter.modelIndex(selectedRow);\r
+                    \r
                     String[] sa = new String[5];\r
                     ffc.getFrameworkModuleInfo(selectedRow, sa);\r
                     String mg = sa[0];\r