if (bool[5]) {\r
s += "PPC ";\r
}\r
- if (s == " ") {\r
+ if (s.equals(" ")) {\r
s += "IA32";\r
}\r
return s.trim();\r
\r
private void setBuildOptionsOpt(Vector<Object> buildTargets, String toolChain, String tagName, String toolCmd, Vector<Object> archList, String contents, OptionDocument.Option opt){\r
opt.setStringValue(contents);\r
+ if (buildTargets != null) {\r
+ opt.setBuildTargets(buildTargets);\r
+ }\r
+ else {\r
+ if (opt.isSetBuildTargets()) {\r
+ opt.unsetBuildTargets();\r
+ }\r
+ }\r
+ \r
+ if (toolChain != null && toolChain.length() > 0) {\r
+ opt.setToolChainFamily(toolChain);\r
+ }\r
+ else {\r
+ if (opt.isSetToolChainFamily()) {\r
+ opt.unsetToolChainFamily();\r
+ }\r
+ }\r
+ \r
+ if (tagName != null && tagName.length() > 0) {\r
+ opt.setTagName(tagName);\r
+ }\r
+ else {\r
+ if (opt.isSetTagName()) {\r
+ opt.unsetTagName();\r
+ }\r
+ }\r
+ \r
+ if (toolCmd != null && toolCmd.length() > 0) {\r
+ opt.setToolCode(toolCmd);\r
+ }\r
+ else {\r
+ if (opt.isSetToolCode()) {\r
+ opt.unsetToolCode();\r
+ }\r
+ }\r
\r
- opt.setBuildTargets(buildTargets);\r
- opt.setToolChainFamily(toolChain);\r
- opt.setTagName(tagName);\r
- opt.setToolCode(toolCmd);\r
\r
if (archList != null) {\r
opt.setSupArchList(archList);\r
*/\r
private static final long serialVersionUID = 1L;\r
\r
- private static final int timeToWait = 3000;\r
+ private static final int timeToWait = 2000;\r
\r
private long savedMs = 0;\r
\r
searchField = "" + e.getKeyChar(); \r
}\r
\r
- int viewIndex = gotoFoundRow (searchField, (TableSorter) jTableAllModules.getModel());\r
+ int viewIndex = gotoFoundRow (searchField, jTableAllModules);\r
if (viewIndex >= 0){\r
jTableAllModules.changeSelection(viewIndex, 0, false, false);\r
}\r
return jTableAllModules;\r
}\r
\r
- private int gotoFoundRow (String s, TableSorter model) {\r
+ private int gotoFoundRow (String s, JTable model) {\r
for (int i = 0; i < model.getRowCount(); ++i) {\r
if (model.getValueAt(i, 0) != null && model.getValueAt(i, 0).toString().regionMatches(true, 0, s, 0, s.length())) {\r
- return model.getViewIndexArray()[i];\r
+ return i;\r
}\r
}\r
return -1;\r
searchField = "" + e.getKeyChar(); \r
}\r
\r
- int viewIndex = gotoFoundRow (searchField, (TableSorter) jTableFpdModules.getModel());\r
+ int viewIndex = gotoFoundRow (searchField, jTableFpdModules);\r
if (viewIndex >= 0){\r
jTableFpdModules.changeSelection(viewIndex, 0, false, false);\r
}\r
if (jTextFieldFvBinding == null) {\r
jTextFieldFvBinding = new JTextField();\r
jTextFieldFvBinding.setPreferredSize(new java.awt.Dimension(400,20));\r
- jTextFieldFvBinding.setEditable(false);\r
+ jTextFieldFvBinding.setEditable(true);\r
jTextFieldFvBinding.addFocusListener(new java.awt.event.FocusAdapter() {\r
public void focusLost(java.awt.event.FocusEvent e) {\r
String originalFvBinding = ffc.getFvBinding(moduleKey);\r