mirror of https://github.com/acidanthera/audk.git
java variable should have its first char in low case.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1280 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
609384c5c5
commit
d208e1e260
|
@ -80,53 +80,63 @@ public class FpdFrameworkModules extends IInternalFrame {
|
||||||
|
|
||||||
private ArrayList<ModuleIdentification> miList = null;
|
private ArrayList<ModuleIdentification> miList = null;
|
||||||
|
|
||||||
private final int ModNameColForAllModTable = 0;
|
private final int modNameColForAllModTable = 0;
|
||||||
|
|
||||||
private final int PkgNameColForAllModTable = 1;
|
private final int pkgNameColForAllModTable = 1;
|
||||||
|
|
||||||
private final int PathColForAllModTable = 2;
|
private final int pathColForAllModTable = 2;
|
||||||
|
|
||||||
private final int PkgVerColForAllModTable = 3;
|
private final int pkgVerColForAllModTable = 3;
|
||||||
|
|
||||||
private final int ModVerColForAllModTable = 4;
|
private final int modVerColForAllModTable = 4;
|
||||||
|
|
||||||
private final int ModNameColForFpdModTable = 0;
|
private final int modNameColForFpdModTable = 0;
|
||||||
|
|
||||||
private final int PkgNameColForFpdModTable = 1;
|
private final int pkgNameColForFpdModTable = 1;
|
||||||
|
|
||||||
private final int PathColForFpdModTable = 2;
|
private final int pathColForFpdModTable = 2;
|
||||||
|
|
||||||
private final int ArchColForFpdModTable = 3;
|
private final int archColForFpdModTable = 3;
|
||||||
|
|
||||||
private final int PkgVerColForFpdModTable = 4;
|
private final int pkgVerColForFpdModTable = 4;
|
||||||
|
|
||||||
private final int ModVerColForFpdModTable = 5;
|
private final int modVerColForFpdModTable = 5;
|
||||||
|
|
||||||
|
private final int ffcModGuid = 0;
|
||||||
|
|
||||||
|
private final int ffcModVer = 1;
|
||||||
|
|
||||||
|
private final int ffcPkgGuid = 2;
|
||||||
|
|
||||||
|
private final int ffcPkgVer = 3;
|
||||||
|
|
||||||
|
private final int ffcModArch = 4;
|
||||||
|
|
||||||
private final int ModNameMinWidth = 168;
|
private final int modNameMinWidth = 168;
|
||||||
|
|
||||||
private final int ModNamePrefWidth = 200;
|
private final int modNamePrefWidth = 200;
|
||||||
|
|
||||||
private final int PkgNameMinWidth = 100;
|
private final int pkgNameMinWidth = 100;
|
||||||
|
|
||||||
private final int PkgNamePrefWidth = 110;
|
private final int pkgNamePrefWidth = 110;
|
||||||
|
|
||||||
private final int PkgNameMaxWidth = 150;
|
private final int pkgNameMaxWidth = 150;
|
||||||
|
|
||||||
private final int VerMinWidth = 50;
|
private final int verMinWidth = 50;
|
||||||
|
|
||||||
private final int VerMaxWidth = 80;
|
private final int verMaxWidth = 80;
|
||||||
|
|
||||||
private final int VerPrefWidth = 60;
|
private final int verPrefWidth = 60;
|
||||||
|
|
||||||
private final int PathPrefWidth = 320;
|
private final int pathPrefWidth = 320;
|
||||||
|
|
||||||
private final int PathMinWidth = 280;
|
private final int pathMinWidth = 280;
|
||||||
|
|
||||||
private final int ArchPrefWidth = 80;
|
private final int archPrefWidth = 80;
|
||||||
|
|
||||||
private final int ArchMinWidth = 60;
|
private final int archMinWidth = 60;
|
||||||
|
|
||||||
private final int ArchMaxWidth = 100;
|
private final int archMaxWidth = 100;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This method initializes jSplitPane
|
* This method initializes jSplitPane
|
||||||
|
@ -213,24 +223,24 @@ public class FpdFrameworkModules extends IInternalFrame {
|
||||||
modelAllModules.addColumn("<html>Module<br>Version</html>");
|
modelAllModules.addColumn("<html>Module<br>Version</html>");
|
||||||
|
|
||||||
javax.swing.table.TableColumn column = null;
|
javax.swing.table.TableColumn column = null;
|
||||||
column = jTableAllModules.getColumnModel().getColumn(ModNameColForAllModTable);
|
column = jTableAllModules.getColumnModel().getColumn(modNameColForAllModTable);
|
||||||
column.setPreferredWidth(ModNamePrefWidth);
|
column.setPreferredWidth(modNamePrefWidth);
|
||||||
column.setMinWidth(ModNameMinWidth);
|
column.setMinWidth(modNameMinWidth);
|
||||||
column = jTableAllModules.getColumnModel().getColumn(ModVerColForAllModTable);
|
column = jTableAllModules.getColumnModel().getColumn(modVerColForAllModTable);
|
||||||
column.setPreferredWidth(VerPrefWidth);
|
column.setPreferredWidth(verPrefWidth);
|
||||||
column.setMaxWidth(VerMaxWidth);
|
column.setMaxWidth(verMaxWidth);
|
||||||
column.setMinWidth(VerMinWidth);
|
column.setMinWidth(verMinWidth);
|
||||||
column = jTableAllModules.getColumnModel().getColumn(PkgNameColForAllModTable);
|
column = jTableAllModules.getColumnModel().getColumn(pkgNameColForAllModTable);
|
||||||
column.setPreferredWidth(PkgNamePrefWidth);
|
column.setPreferredWidth(pkgNamePrefWidth);
|
||||||
column.setMinWidth(PkgNameMinWidth);
|
column.setMinWidth(pkgNameMinWidth);
|
||||||
column.setMaxWidth(PkgNameMaxWidth);
|
column.setMaxWidth(pkgNameMaxWidth);
|
||||||
column = jTableAllModules.getColumnModel().getColumn(PkgVerColForAllModTable);
|
column = jTableAllModules.getColumnModel().getColumn(pkgVerColForAllModTable);
|
||||||
column.setPreferredWidth(VerPrefWidth);
|
column.setPreferredWidth(verPrefWidth);
|
||||||
column.setMaxWidth(VerMaxWidth);
|
column.setMaxWidth(verMaxWidth);
|
||||||
column.setMinWidth(VerMinWidth);
|
column.setMinWidth(verMinWidth);
|
||||||
column = jTableAllModules.getColumnModel().getColumn(PathColForAllModTable);
|
column = jTableAllModules.getColumnModel().getColumn(pathColForAllModTable);
|
||||||
column.setPreferredWidth(PathPrefWidth);
|
column.setPreferredWidth(pathPrefWidth);
|
||||||
column.setMinWidth(PathMinWidth);
|
column.setMinWidth(pathMinWidth);
|
||||||
|
|
||||||
jTableAllModules.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
|
jTableAllModules.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
|
||||||
jTableAllModules.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);
|
jTableAllModules.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);
|
||||||
|
@ -273,7 +283,7 @@ public class FpdFrameworkModules extends IInternalFrame {
|
||||||
|
|
||||||
TableSorter sorter = (TableSorter) jTableAllModules.getModel();
|
TableSorter sorter = (TableSorter) jTableAllModules.getModel();
|
||||||
selectedRow = sorter.modelIndex(selectedRow);
|
selectedRow = sorter.modelIndex(selectedRow);
|
||||||
String path = modelAllModules.getValueAt(selectedRow, PathColForAllModTable) + "";
|
String path = modelAllModules.getValueAt(selectedRow, pathColForAllModTable) + "";
|
||||||
ModuleIdentification mi = miList.get(selectedRow);
|
ModuleIdentification mi = miList.get(selectedRow);
|
||||||
Vector<String> vArchs = null;
|
Vector<String> vArchs = null;
|
||||||
try {
|
try {
|
||||||
|
@ -318,12 +328,12 @@ public class FpdFrameworkModules extends IInternalFrame {
|
||||||
String[] row = { "", "", "", "", "", "" };
|
String[] row = { "", "", "", "", "", "" };
|
||||||
|
|
||||||
if (mi != null) {
|
if (mi != null) {
|
||||||
row[ModNameColForFpdModTable] = mi.getName();
|
row[modNameColForFpdModTable] = mi.getName();
|
||||||
row[PkgNameColForFpdModTable] = mi.getPackage().getName();
|
row[pkgNameColForFpdModTable] = mi.getPackage().getName();
|
||||||
row[PathColForFpdModTable] = path;
|
row[pathColForFpdModTable] = path;
|
||||||
row[ArchColForFpdModTable] = arch;
|
row[archColForFpdModTable] = arch;
|
||||||
row[PkgVerColForFpdModTable] = pv;
|
row[pkgVerColForFpdModTable] = pv;
|
||||||
row[ModVerColForFpdModTable] = mv;
|
row[modVerColForFpdModTable] = mv;
|
||||||
|
|
||||||
}
|
}
|
||||||
modelFpdModules.addRow(row);
|
modelFpdModules.addRow(row);
|
||||||
|
@ -333,7 +343,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 SupArch " + arch
|
||||||
+ ": " + exception.getMessage());
|
+ ": " + exception.getMessage());
|
||||||
errorOccurred = true;
|
errorOccurred = true;
|
||||||
}
|
}
|
||||||
|
@ -404,28 +414,28 @@ public class FpdFrameworkModules extends IInternalFrame {
|
||||||
modelFpdModules.addColumn("<html>Module<br>Version</html>");
|
modelFpdModules.addColumn("<html>Module<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);
|
||||||
column.setPreferredWidth(ModNamePrefWidth);
|
column.setPreferredWidth(modNamePrefWidth);
|
||||||
column.setMinWidth(ModNameMinWidth);
|
column.setMinWidth(modNameMinWidth);
|
||||||
column = jTableFpdModules.getColumnModel().getColumn(ModVerColForFpdModTable);
|
column = jTableFpdModules.getColumnModel().getColumn(modVerColForFpdModTable);
|
||||||
column.setPreferredWidth(VerPrefWidth);
|
column.setPreferredWidth(verPrefWidth);
|
||||||
column.setMaxWidth(VerMaxWidth);
|
column.setMaxWidth(verMaxWidth);
|
||||||
column.setMinWidth(VerMinWidth);
|
column.setMinWidth(verMinWidth);
|
||||||
column = jTableFpdModules.getColumnModel().getColumn(PkgNameColForFpdModTable);
|
column = jTableFpdModules.getColumnModel().getColumn(pkgNameColForFpdModTable);
|
||||||
column.setPreferredWidth(PkgNamePrefWidth);
|
column.setPreferredWidth(pkgNamePrefWidth);
|
||||||
column.setMinWidth(PkgNameMinWidth);
|
column.setMinWidth(pkgNameMinWidth);
|
||||||
column.setMaxWidth(PkgNameMaxWidth);
|
column.setMaxWidth(pkgNameMaxWidth);
|
||||||
column = jTableFpdModules.getColumnModel().getColumn(PkgVerColForFpdModTable);
|
column = jTableFpdModules.getColumnModel().getColumn(pkgVerColForFpdModTable);
|
||||||
column.setPreferredWidth(VerPrefWidth);
|
column.setPreferredWidth(verPrefWidth);
|
||||||
column.setMaxWidth(VerMaxWidth);
|
column.setMaxWidth(verMaxWidth);
|
||||||
column.setMinWidth(VerMinWidth);
|
column.setMinWidth(verMinWidth);
|
||||||
column = jTableFpdModules.getColumnModel().getColumn(ArchColForFpdModTable);
|
column = jTableFpdModules.getColumnModel().getColumn(archColForFpdModTable);
|
||||||
column.setPreferredWidth(ArchPrefWidth);
|
column.setPreferredWidth(archPrefWidth);
|
||||||
column.setMaxWidth(ArchMaxWidth);
|
column.setMaxWidth(archMaxWidth);
|
||||||
column.setMinWidth(ArchMinWidth);
|
column.setMinWidth(archMinWidth);
|
||||||
column = jTableFpdModules.getColumnModel().getColumn(PathColForFpdModTable);
|
column = jTableFpdModules.getColumnModel().getColumn(pathColForFpdModTable);
|
||||||
column.setPreferredWidth(PathPrefWidth);
|
column.setPreferredWidth(pathPrefWidth);
|
||||||
column.setMinWidth(PathMinWidth);
|
column.setMinWidth(pathMinWidth);
|
||||||
|
|
||||||
jTableFpdModules.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
|
jTableFpdModules.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
|
||||||
jTableFpdModules.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);
|
jTableFpdModules.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);
|
||||||
|
@ -468,11 +478,11 @@ public class FpdFrameworkModules extends IInternalFrame {
|
||||||
|
|
||||||
String[] sa = new String[5];
|
String[] sa = new String[5];
|
||||||
ffc.getFrameworkModuleInfo(selectedRow, sa);
|
ffc.getFrameworkModuleInfo(selectedRow, sa);
|
||||||
String mg = sa[0];
|
String mg = sa[ffcModGuid];
|
||||||
String mv = sa[1];
|
String mv = sa[ffcModVer];
|
||||||
String pg = sa[2];
|
String pg = sa[ffcPkgGuid];
|
||||||
String pv = sa[3];
|
String pv = sa[ffcPkgVer];
|
||||||
String arch = sa[4];
|
String arch = sa[ffcModArch];
|
||||||
settingDlg.setKey(mg + " " + mv + " " + pg + " " + pv + " " + arch, selectedRow, docConsole);
|
settingDlg.setKey(mg + " " + mv + " " + pg + " " + pv + " " + arch, selectedRow, docConsole);
|
||||||
settingDlg.setVisible(true);
|
settingDlg.setVisible(true);
|
||||||
}
|
}
|
||||||
|
@ -503,14 +513,12 @@ public class FpdFrameworkModules extends IInternalFrame {
|
||||||
|
|
||||||
String[] sa = new String[5];
|
String[] sa = new String[5];
|
||||||
ffc.getFrameworkModuleInfo(selectedRow, sa);
|
ffc.getFrameworkModuleInfo(selectedRow, sa);
|
||||||
String mg = sa[0];
|
String mg = sa[ffcModGuid];
|
||||||
String mv = sa[1];
|
String mv = sa[ffcModVer];
|
||||||
String pg = sa[2];
|
String pg = sa[ffcPkgGuid];
|
||||||
String pv = sa[3];
|
String pv = sa[ffcPkgVer];
|
||||||
String arch = sa[4];
|
String arch = sa[ffcModArch];
|
||||||
ModuleIdentification mi = GlobalData.getModuleId(sa[0] + " " + sa[1] + " "
|
ModuleIdentification mi = GlobalData.getModuleId(mg + " " + mv + " " + pg + " " + pv + " " + arch);
|
||||||
+ sa[2] + " " + sa[3] + " "
|
|
||||||
+ sa[4]);
|
|
||||||
mv = mi.getVersion();
|
mv = mi.getVersion();
|
||||||
pv = mi.getPackage().getVersion();
|
pv = mi.getPackage().getVersion();
|
||||||
modelFpdModules.removeRow(selectedRow);
|
modelFpdModules.removeRow(selectedRow);
|
||||||
|
@ -581,17 +589,17 @@ public class FpdFrameworkModules extends IInternalFrame {
|
||||||
String[][] saa = new String[ffc.getFrameworkModulesCount()][5];
|
String[][] saa = new String[ffc.getFrameworkModulesCount()][5];
|
||||||
ffc.getFrameworkModulesInfo(saa);
|
ffc.getFrameworkModulesInfo(saa);
|
||||||
for (int i = 0; i < saa.length; ++i) {
|
for (int i = 0; i < saa.length; ++i) {
|
||||||
ModuleIdentification mi = GlobalData.getModuleId(saa[i][0] + " " + saa[i][1] + " "
|
ModuleIdentification mi = GlobalData.getModuleId(saa[i][ffcModGuid] + " " + saa[i][ffcModVer] + " "
|
||||||
+ saa[i][2] + " " + saa[i][3]);
|
+ 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[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];
|
||||||
try {
|
try {
|
||||||
row[PathColForFpdModTable] = GlobalData.getMsaFile(mi).getPath().substring(
|
row[pathColForFpdModTable] = GlobalData.getMsaFile(mi).getPath().substring(
|
||||||
System.getenv("WORKSPACE")
|
System.getenv("WORKSPACE")
|
||||||
.length() + 1);
|
.length() + 1);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
@ -599,13 +607,13 @@ public class FpdFrameworkModules extends IInternalFrame {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
modelFpdModules.addRow(row);
|
modelFpdModules.addRow(row);
|
||||||
ArrayList<String> al = fpdMsa.get(saa[i][0] + saa[i][1]
|
ArrayList<String> al = fpdMsa.get(saa[i][ffcModGuid] + saa[i][ffcModVer]
|
||||||
+ saa[i][2] + saa[i][3]);
|
+ saa[i][ffcPkgGuid] + saa[i][ffcPkgVer]);
|
||||||
if (al == null) {
|
if (al == null) {
|
||||||
al = new ArrayList<String>();
|
al = new ArrayList<String>();
|
||||||
fpdMsa.put(saa[i][0] + saa[i][1] + saa[i][2] + saa[i][3], al);
|
fpdMsa.put(saa[i][ffcModGuid] + saa[i][ffcModVer] + saa[i][ffcPkgGuid] + saa[i][ffcPkgVer], al);
|
||||||
}
|
}
|
||||||
al.add(saa[i][4]);
|
al.add(saa[i][ffcModArch]);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -630,12 +638,12 @@ public class FpdFrameworkModules extends IInternalFrame {
|
||||||
Iterator ismi = smi.iterator();
|
Iterator ismi = smi.iterator();
|
||||||
while (ismi.hasNext()) {
|
while (ismi.hasNext()) {
|
||||||
ModuleIdentification mi = (ModuleIdentification) ismi.next();
|
ModuleIdentification mi = (ModuleIdentification) ismi.next();
|
||||||
s[ModNameColForAllModTable] = mi.getName();
|
s[modNameColForAllModTable] = mi.getName();
|
||||||
s[ModVerColForAllModTable] = mi.getVersion();
|
s[modVerColForAllModTable] = mi.getVersion();
|
||||||
s[PkgNameColForAllModTable] = pi.getName();
|
s[pkgNameColForAllModTable] = pi.getName();
|
||||||
s[PkgVerColForAllModTable] = pi.getVersion();
|
s[pkgVerColForAllModTable] = pi.getVersion();
|
||||||
try {
|
try {
|
||||||
s[PathColForAllModTable] = GlobalData.getMsaFile(mi).getPath()
|
s[pathColForAllModTable] = GlobalData.getMsaFile(mi).getPath()
|
||||||
.substring(System.getenv("WORKSPACE").length() + 1);
|
.substring(System.getenv("WORKSPACE").length() + 1);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
JOptionPane.showMessageDialog(frame, "Show All Modules:" + e.getMessage());
|
JOptionPane.showMessageDialog(frame, "Show All Modules:" + e.getMessage());
|
||||||
|
|
Loading…
Reference in New Issue