Added module type column to the FPD module table, and also removed AUTO_RESIZE_OFF...

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

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 d64b00329ffb85e921af2a2741e04ae150d72090..0a15d3188a427f2bb83678daf71f4bf24c972abe 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
@@ -106,9 +106,11 @@ public class FpdFrameworkModules extends IInternalFrame {
     \r
     private final int archColForFpdModTable = 3;\r
     \r
     \r
     private final int archColForFpdModTable = 3;\r
     \r

-    private final int pkgVerColForFpdModTable = 5;\r
+    private final int pkgVerColForFpdModTable = 6;\r

 \r
 \r

-    private final int modVerColForFpdModTable = 4;\r
+    private final int modVerColForFpdModTable = 5;\r
+    \r
+    private final int typeColForFpdModTable = 4;\r

     \r
     /**\r
      * FpdFileContents structure\r
     \r
     /**\r
      * FpdFileContents structure\r


@@ -277,7 +279,7 @@ public class FpdFrameworkModules extends IInternalFrame {
             column.setMinWidth(pathMinWidth);\r
 \r
             jTableAllModules.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
             column.setMinWidth(pathMinWidth);\r
 \r
             jTableAllModules.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r

-                       jTableAllModules.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
+\r

         }\r
         return jTableAllModules;\r
     }\r
         }\r
         return jTableAllModules;\r
     }\r


@@ -339,6 +341,7 @@ public class FpdFrameworkModules extends IInternalFrame {
                     String mv = mi.getVersion();\r
                     String pg = mi.getPackage().getGuid();\r
                     String pv = mi.getPackage().getVersion();\r
                     String mv = mi.getVersion();\r
                     String pg = mi.getPackage().getGuid();\r
                     String pv = mi.getPackage().getVersion();\r

+                    String mType = mi.getModuleType();\r

 \r
                     ArrayList<String> al = fpdMsa.get(mg + mv + pg + pv);\r
                     if (al == null) {\r
 \r
                     ArrayList<String> al = fpdMsa.get(mg + mv + pg + pv);\r
                     if (al == null) {\r


@@ -361,7 +364,7 @@ public class FpdFrameworkModules extends IInternalFrame {
                         String arch = vArchs.get(i);\r
                         al.add(arch);\r
                         archsAdded += arch + " ";\r
                         String arch = vArchs.get(i);\r
                         al.add(arch);\r
                         archsAdded += arch + " ";\r

-                        String[] row = { "", "", "", "", "", "" };\r
+                        String[] row = { "", "", "", "", "", "", "" };\r

 \r
                         if (mi != null) {\r
                             row[modNameColForFpdModTable] = mi.getName();\r
 \r
                         if (mi != null) {\r
                             row[modNameColForFpdModTable] = mi.getName();\r


@@ -370,6 +373,7 @@ public class FpdFrameworkModules extends IInternalFrame {
                             row[archColForFpdModTable] = arch;\r
                             row[pkgVerColForFpdModTable] = pv;\r
                             row[modVerColForFpdModTable] = mv;\r
                             row[archColForFpdModTable] = arch;\r
                             row[pkgVerColForFpdModTable] = pv;\r
                             row[modVerColForFpdModTable] = mv;\r

+                            row[typeColForFpdModTable] = mType;\r

 \r
                         }\r
                         modelFpdModules.addRow(row);\r
 \r
                         }\r
                         modelFpdModules.addRow(row);\r


@@ -379,7 +383,7 @@ public class FpdFrameworkModules extends IInternalFrame {
                             //ToDo : specify archs need to add.\r
                             ffc.addFrameworkModulesPcdBuildDefs(mi, arch, null);\r
                         } catch (Exception exception) {\r
                             //ToDo : specify archs need to add.\r
                             ffc.addFrameworkModulesPcdBuildDefs(mi, arch, null);\r
                         } catch (Exception exception) {\r

-                            JOptionPane.showMessageDialog(frame, "Adding " + row[modNameColForFpdModTable] + " with SupArch " + arch\r
+                            JOptionPane.showMessageDialog(frame, "Adding " + row[modNameColForFpdModTable] + " with Supporting Architectures: " + arch\r

                                                                  + ": " + exception.getMessage());\r
                             errorOccurred = true;\r
                         }\r
                                                                  + ": " + exception.getMessage());\r
                             errorOccurred = true;\r
                         }\r


@@ -448,8 +452,10 @@ public class FpdFrameworkModules extends IInternalFrame {
             modelFpdModules.addColumn("<html>Package<br>Name</html>");\r
             modelFpdModules.addColumn("Path");\r
             modelFpdModules.addColumn("<html>Supported<br>Architectures</html>");\r
             modelFpdModules.addColumn("<html>Package<br>Name</html>");\r
             modelFpdModules.addColumn("Path");\r
             modelFpdModules.addColumn("<html>Supported<br>Architectures</html>");\r

+            modelFpdModules.addColumn("<html>Module<br>Type</html>");\r

             modelFpdModules.addColumn("<html>Module<br>Version</html>");\r
             modelFpdModules.addColumn("<html>Package<br>Version</html>");\r
             modelFpdModules.addColumn("<html>Module<br>Version</html>");\r
             modelFpdModules.addColumn("<html>Package<br>Version</html>");\r

+\r

             \r
             javax.swing.table.TableColumn column = null;\r
             column = jTableFpdModules.getColumnModel().getColumn(modNameColForFpdModTable);\r
             \r
             javax.swing.table.TableColumn column = null;\r
             column = jTableFpdModules.getColumnModel().getColumn(modNameColForFpdModTable);\r


@@ -475,9 +481,13 @@ public class FpdFrameworkModules extends IInternalFrame {
             column = jTableFpdModules.getColumnModel().getColumn(pathColForFpdModTable);\r
             column.setPreferredWidth(pathPrefWidth);\r
             column.setMinWidth(pathMinWidth);\r
             column = jTableFpdModules.getColumnModel().getColumn(pathColForFpdModTable);\r
             column.setPreferredWidth(pathPrefWidth);\r
             column.setMinWidth(pathMinWidth);\r

+            column = jTableFpdModules.getColumnModel().getColumn(typeColForFpdModTable);\r
+            column.setPreferredWidth(typePrefWidth);\r
+            column.setMaxWidth(typeMaxWidth);\r
+            column.setMinWidth(typeMinWidth);\r

 \r
             jTableFpdModules.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
 \r
             jTableFpdModules.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r

-                       jTableFpdModules.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
+\r

         }\r
         return jTableFpdModules;\r
     }\r
         }\r
         return jTableFpdModules;\r
     }\r


@@ -585,7 +595,7 @@ public class FpdFrameworkModules extends IInternalFrame {
      * @param args\r
      */\r
     public static void main(String[] args) {\r
      * @param args\r
      */\r
     public static void main(String[] args) {\r

-        // TODO Auto-generated method stub\r
+        // Set the pane visable\r

         new FpdFrameworkModules().setVisible(true);\r
     }\r
 \r
         new FpdFrameworkModules().setVisible(true);\r
     }\r
 \r


@@ -631,10 +641,11 @@ public class FpdFrameworkModules extends IInternalFrame {
             for (int i = 0; i < saa.length; ++i) {\r
                 ModuleIdentification mi = GlobalData.getModuleId(saa[i][ffcModGuid] + " " + saa[i][ffcModVer] + " "\r
                                                                  + saa[i][ffcPkgGuid] + " " + saa[i][ffcPkgVer]);\r
             for (int i = 0; i < saa.length; ++i) {\r
                 ModuleIdentification mi = GlobalData.getModuleId(saa[i][ffcModGuid] + " " + saa[i][ffcModVer] + " "\r
                                                                  + saa[i][ffcPkgGuid] + " " + saa[i][ffcPkgVer]);\r

-                String[] row = { "", "", "", "", "", "" };\r
+                String[] row = { "", "", "", "", "", "", "" };\r

                 if (mi != null) {\r
                     row[modNameColForFpdModTable] = mi.getName();\r
                     row[modVerColForFpdModTable] = mi.getVersion();\r
                 if (mi != null) {\r
                     row[modNameColForFpdModTable] = mi.getName();\r
                     row[modVerColForFpdModTable] = mi.getVersion();\r

+                    row[typeColForFpdModTable] = mi.getModuleType();\r

                     row[pkgNameColForFpdModTable] = mi.getPackage().getName();\r
                     row[pkgVerColForFpdModTable] = mi.getPackage().getVersion();\r
                     row[archColForFpdModTable] = saa[i][4];\r
                     row[pkgNameColForFpdModTable] = mi.getPackage().getName();\r
                     row[pkgVerColForFpdModTable] = mi.getPackage().getVersion();\r
                     row[archColForFpdModTable] = saa[i][4];\r