tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-29 08:34:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove empty attributes for build option.

Browse Source 
Fix keyboard tying search wrong-focus in FrameworkModules table.
Make FvBinding text field editable.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1640 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jlin16 2006-09-29 06:21:27 +00:00
parent 72a4deab42
commit 9babb67e68
4 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
View File

@ -1864,7 +1864,7 @@ public class FpdBuildOptions extends IInternalFrame {
if (bool[5]) { if (bool[5]) {
s += "PPC "; s += "PPC ";
} }
if (s == " ") { if (s.equals(" ")) {
s += "IA32"; s += "IA32";
} }
return s.trim(); return s.trim();

39
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
View File

@ -2135,11 +2135,42 @@ public class FpdFileContents {
private void setBuildOptionsOpt(Vector<Object> buildTargets, String toolChain, String tagName, String toolCmd, Vector<Object> archList, String contents, OptionDocument.Option opt){ private void setBuildOptionsOpt(Vector<Object> buildTargets, String toolChain, String tagName, String toolCmd, Vector<Object> archList, String contents, OptionDocument.Option opt){
opt.setStringValue(contents); opt.setStringValue(contents);
if (buildTargets != null) {
opt.setBuildTargets(buildTargets);
}
else {
if (opt.isSetBuildTargets()) {
opt.unsetBuildTargets();
}
}
if (toolChain != null && toolChain.length() > 0) {
opt.setToolChainFamily(toolChain);
}
else {
if (opt.isSetToolChainFamily()) {
opt.unsetToolChainFamily();
}
}
if (tagName != null && tagName.length() > 0) {
opt.setTagName(tagName);
}
else {
if (opt.isSetTagName()) {
opt.unsetTagName();
}
}
if (toolCmd != null && toolCmd.length() > 0) {
opt.setToolCode(toolCmd);
}
else {
if (opt.isSetToolCode()) {
opt.unsetToolCode();
}
}
opt.setBuildTargets(buildTargets);
opt.setToolChainFamily(toolChain);
opt.setTagName(tagName);
opt.setToolCode(toolCmd);
if (archList != null) { if (archList != null) {
opt.setSupArchList(archList); opt.setSupArchList(archList);

10
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
View File

@ -53,7 +53,7 @@ public class FpdFrameworkModules extends IInternalFrame {
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final int timeToWait = 3000; private static final int timeToWait = 2000;
private long savedMs = 0; private long savedMs = 0;
@ -340,7 +340,7 @@ public class FpdFrameworkModules extends IInternalFrame {
searchField = "" + e.getKeyChar(); searchField = "" + e.getKeyChar();
} }
int viewIndex = gotoFoundRow (searchField, (TableSorter) jTableAllModules.getModel()); int viewIndex = gotoFoundRow (searchField, jTableAllModules);
if (viewIndex >= 0){ if (viewIndex >= 0){
jTableAllModules.changeSelection(viewIndex, 0, false, false); jTableAllModules.changeSelection(viewIndex, 0, false, false);
} }
@ -353,10 +353,10 @@ public class FpdFrameworkModules extends IInternalFrame {
return jTableAllModules; return jTableAllModules;
} }
private int gotoFoundRow (String s, TableSorter model) { private int gotoFoundRow (String s, JTable model) {
for (int i = 0; i < model.getRowCount(); ++i) { for (int i = 0; i < model.getRowCount(); ++i) {
if (model.getValueAt(i, 0) != null && model.getValueAt(i, 0).toString().regionMatches(true, 0, s, 0, s.length())) { if (model.getValueAt(i, 0) != null && model.getValueAt(i, 0).toString().regionMatches(true, 0, s, 0, s.length())) {
return model.getViewIndexArray()[i]; return i;
} }
} }
return -1; return -1;
@ -631,7 +631,7 @@ public class FpdFrameworkModules extends IInternalFrame {
searchField = "" + e.getKeyChar(); searchField = "" + e.getKeyChar();
} }
int viewIndex = gotoFoundRow (searchField, (TableSorter) jTableFpdModules.getModel()); int viewIndex = gotoFoundRow (searchField, jTableFpdModules);
if (viewIndex >= 0){ if (viewIndex >= 0){
jTableFpdModules.changeSelection(viewIndex, 0, false, false); jTableFpdModules.changeSelection(viewIndex, 0, false, false);
} }

2
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
View File

@ -1126,7 +1126,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
if (jTextFieldFvBinding == null) { if (jTextFieldFvBinding == null) {
jTextFieldFvBinding = new JTextField(); jTextFieldFvBinding = new JTextField();
jTextFieldFvBinding.setPreferredSize(new java.awt.Dimension(400,20)); jTextFieldFvBinding.setPreferredSize(new java.awt.Dimension(400,20));
jTextFieldFvBinding.setEditable(false); jTextFieldFvBinding.setEditable(true);
jTextFieldFvBinding.addFocusListener(new java.awt.event.FocusAdapter() { jTextFieldFvBinding.addFocusListener(new java.awt.event.FocusAdapter() {
public void focusLost(java.awt.event.FocusEvent e) { public void focusLost(java.awt.event.FocusEvent e) {
String originalFvBinding = ffc.getFvBinding(moduleKey); String originalFvBinding = ffc.getFvBinding(moduleKey);