Added module type column to the FPD module table, and also removed AUTO_RESIZE_OFF, so that the columns fill the pane - only the Path column can be re-sized to any great extent, the other columns can be resized just enough to show the data.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1286 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lhauch 2006-08-15 23:59:55 +00:00
parent f4c4325bb4
commit 4cd31580d8
1 changed files with 19 additions and 8 deletions

View File

@ -106,9 +106,11 @@ public class FpdFrameworkModules extends IInternalFrame {
private final int archColForFpdModTable = 3; private final int archColForFpdModTable = 3;
private final int pkgVerColForFpdModTable = 5; private final int pkgVerColForFpdModTable = 6;
private final int modVerColForFpdModTable = 4; private final int modVerColForFpdModTable = 5;
private final int typeColForFpdModTable = 4;
/** /**
* FpdFileContents structure * FpdFileContents structure
@ -277,7 +279,7 @@ public class FpdFrameworkModules extends IInternalFrame {
column.setMinWidth(pathMinWidth); column.setMinWidth(pathMinWidth);
jTableAllModules.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); jTableAllModules.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
jTableAllModules.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);
} }
return jTableAllModules; return jTableAllModules;
} }
@ -339,6 +341,7 @@ public class FpdFrameworkModules extends IInternalFrame {
String mv = mi.getVersion(); String mv = mi.getVersion();
String pg = mi.getPackage().getGuid(); String pg = mi.getPackage().getGuid();
String pv = mi.getPackage().getVersion(); String pv = mi.getPackage().getVersion();
String mType = mi.getModuleType();
ArrayList<String> al = fpdMsa.get(mg + mv + pg + pv); ArrayList<String> al = fpdMsa.get(mg + mv + pg + pv);
if (al == null) { if (al == null) {
@ -361,7 +364,7 @@ public class FpdFrameworkModules extends IInternalFrame {
String arch = vArchs.get(i); String arch = vArchs.get(i);
al.add(arch); al.add(arch);
archsAdded += arch + " "; archsAdded += arch + " ";
String[] row = { "", "", "", "", "", "" }; String[] row = { "", "", "", "", "", "", "" };
if (mi != null) { if (mi != null) {
row[modNameColForFpdModTable] = mi.getName(); row[modNameColForFpdModTable] = mi.getName();
@ -370,6 +373,7 @@ public class FpdFrameworkModules extends IInternalFrame {
row[archColForFpdModTable] = arch; row[archColForFpdModTable] = arch;
row[pkgVerColForFpdModTable] = pv; row[pkgVerColForFpdModTable] = pv;
row[modVerColForFpdModTable] = mv; row[modVerColForFpdModTable] = mv;
row[typeColForFpdModTable] = mType;
} }
modelFpdModules.addRow(row); modelFpdModules.addRow(row);
@ -379,7 +383,7 @@ public class FpdFrameworkModules extends IInternalFrame {
//ToDo : specify archs need to add. //ToDo : specify archs need to add.
ffc.addFrameworkModulesPcdBuildDefs(mi, arch, null); ffc.addFrameworkModulesPcdBuildDefs(mi, arch, null);
} catch (Exception exception) { } catch (Exception exception) {
JOptionPane.showMessageDialog(frame, "Adding " + row[modNameColForFpdModTable] + " with SupArch " + arch JOptionPane.showMessageDialog(frame, "Adding " + row[modNameColForFpdModTable] + " with Supporting Architectures: " + arch
+ ": " + exception.getMessage()); + ": " + exception.getMessage());
errorOccurred = true; errorOccurred = true;
} }
@ -448,8 +452,10 @@ public class FpdFrameworkModules extends IInternalFrame {
modelFpdModules.addColumn("<html>Package<br>Name</html>"); modelFpdModules.addColumn("<html>Package<br>Name</html>");
modelFpdModules.addColumn("Path"); modelFpdModules.addColumn("Path");
modelFpdModules.addColumn("<html>Supported<br>Architectures</html>"); modelFpdModules.addColumn("<html>Supported<br>Architectures</html>");
modelFpdModules.addColumn("<html>Module<br>Type</html>");
modelFpdModules.addColumn("<html>Module<br>Version</html>"); modelFpdModules.addColumn("<html>Module<br>Version</html>");
modelFpdModules.addColumn("<html>Package<br>Version</html>"); modelFpdModules.addColumn("<html>Package<br>Version</html>");
javax.swing.table.TableColumn column = null; javax.swing.table.TableColumn column = null;
column = jTableFpdModules.getColumnModel().getColumn(modNameColForFpdModTable); column = jTableFpdModules.getColumnModel().getColumn(modNameColForFpdModTable);
@ -475,9 +481,13 @@ public class FpdFrameworkModules extends IInternalFrame {
column = jTableFpdModules.getColumnModel().getColumn(pathColForFpdModTable); column = jTableFpdModules.getColumnModel().getColumn(pathColForFpdModTable);
column.setPreferredWidth(pathPrefWidth); column.setPreferredWidth(pathPrefWidth);
column.setMinWidth(pathMinWidth); column.setMinWidth(pathMinWidth);
column = jTableFpdModules.getColumnModel().getColumn(typeColForFpdModTable);
column.setPreferredWidth(typePrefWidth);
column.setMaxWidth(typeMaxWidth);
column.setMinWidth(typeMinWidth);
jTableFpdModules.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); jTableFpdModules.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
jTableFpdModules.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);
} }
return jTableFpdModules; return jTableFpdModules;
} }
@ -585,7 +595,7 @@ public class FpdFrameworkModules extends IInternalFrame {
* @param args * @param args
*/ */
public static void main(String[] args) { public static void main(String[] args) {
// TODO Auto-generated method stub // Set the pane visable
new FpdFrameworkModules().setVisible(true); new FpdFrameworkModules().setVisible(true);
} }
@ -631,10 +641,11 @@ public class FpdFrameworkModules extends IInternalFrame {
for (int i = 0; i < saa.length; ++i) { for (int i = 0; i < saa.length; ++i) {
ModuleIdentification mi = GlobalData.getModuleId(saa[i][ffcModGuid] + " " + saa[i][ffcModVer] + " " ModuleIdentification mi = GlobalData.getModuleId(saa[i][ffcModGuid] + " " + saa[i][ffcModVer] + " "
+ saa[i][ffcPkgGuid] + " " + saa[i][ffcPkgVer]); + saa[i][ffcPkgGuid] + " " + saa[i][ffcPkgVer]);
String[] row = { "", "", "", "", "", "" }; String[] row = { "", "", "", "", "", "", "" };
if (mi != null) { if (mi != null) {
row[modNameColForFpdModTable] = mi.getName(); row[modNameColForFpdModTable] = mi.getName();
row[modVerColForFpdModTable] = mi.getVersion(); row[modVerColForFpdModTable] = mi.getVersion();
row[typeColForFpdModTable] = mi.getModuleType();
row[pkgNameColForFpdModTable] = mi.getPackage().getName(); row[pkgNameColForFpdModTable] = mi.getPackage().getName();
row[pkgVerColForFpdModTable] = mi.getPackage().getVersion(); row[pkgVerColForFpdModTable] = mi.getPackage().getVersion();
row[archColForFpdModTable] = saa[i][4]; row[archColForFpdModTable] = saa[i][4];