+ * -I"path\with a\couple of spaces" -O2 -g -fPIC + *
+ * would yeild + *
-I"path\with | a\couple | of | spaces" | -O2 | -g | -fPIC+ *
+ * As you can see, simply splitting at the whitespaces will yeild a result
+ * containing garbage, so the logic of this method must consider whether a
+ * token contains the " character. If so, then add it and all of the
+ * subsequent tokens until the enclosing " is found.
+ *
+ * @param rawOptionString
+ * @return Vector containing all options
+ */
+ private Vector getOptionVector(String rawOptionString){
+ Vector tokens = new Vector(Arrays.asList(rawOptionString.split("\\s"))); //$NON-NLS-1$
+ Vector output = new Vector(tokens.size());
+
+ Iterator iter = tokens.iterator();
+ while(iter.hasNext()){
+ String token = (String)iter.next();
+ int firstIndex = token.indexOf("\""); //$NON-NLS-1$
+ int lastIndex = token.lastIndexOf("\""); //$NON-NLS-1$
+ if (firstIndex != -1 && firstIndex == lastIndex) {
+ // Keep looking
+ while (iter.hasNext()) {
+ String nextToken = (String) iter.next();
+ token += WHITESPACE + nextToken;
+ if (nextToken.indexOf("\"") != -1) break; //$NON-NLS-1$
+ }
+ }
+ output.add(token);
+ }
+
+ return output;
}
/**
@@ -181,60 +232,17 @@ public class BuildToolSettingsPage extends BuildSettingsPage {
}
/**
- * Creates single string from the string array with a separator
+ * Answers true if the receiver manages settings for the
+ * argument
*
- * @param items
+ * @param tool
* @return
*/
- private String createList(String[] items) {
- StringBuffer path = new StringBuffer(""); //$NON-NLS-1$
- for (int i = 0; i < items.length; i++) {
- path.append(items[i]);
- if (i < (items.length - 1)) {
- path.append(DEFAULT_SEPERATOR);
- }
+ public boolean isForTool(ITool tool) {
+ if (tool != null) {
+ return tool.equals(this.tool);
}
- return path.toString();
- }
-
- /* (non-Javadoc)
- * The raw option string can contain path information that has spaces
- * in them. For example,
- *
- * -I"path\with a\couple of spaces" -O2 -g -fPIC - *
- * would yeild - *
-I"path\with | a\couple | of | spaces" | -O2 | -g | -fPIC- *
- * As you can see, simply splitting at the whitespaces will yeild a result
- * containing garbage, so the logic of this method must consider whether a
- * token contains the " character. If so, then add it and all of the
- * subsequent tokens until the enclosing " is found.
- *
- * @param rawOptionString
- * @return Vector containing all options
- */
- private Vector getOptionVector(String rawOptionString){
- Vector tokens = new Vector(Arrays.asList(rawOptionString.split("\\s"))); //$NON-NLS-1$
- Vector output = new Vector(tokens.size());
-
- Iterator iter = tokens.iterator();
- while(iter.hasNext()){
- String token = (String)iter.next();
- int firstIndex = token.indexOf("\""); //$NON-NLS-1$
- int lastIndex = token.lastIndexOf("\""); //$NON-NLS-1$
- if (firstIndex != -1 && firstIndex == lastIndex) {
- // Keep looking
- while (iter.hasNext()) {
- String nextToken = (String) iter.next();
- token += WHITESPACE + nextToken;
- if (nextToken.indexOf("\"") != -1) break; //$NON-NLS-1$
- }
- }
- output.add(token);
- }
-
- return output;
+ return false;
}
/**
@@ -382,16 +390,14 @@ public class BuildToolSettingsPage extends BuildSettingsPage {
String[] listVal = null;
switch (opt.getValueType()) {
case IOption.BOOLEAN :
- ArrayList optsList = new ArrayList(/*Arrays.asList(*/optionsArr)/*)*/;
+ ArrayList optsList = new ArrayList(optionsArr);
if (opt.getCommand() != null
&& !optsList.contains(opt.getCommand()))
getPreferenceStore().setValue(opt.getId(), false);
break;
case IOption.STRING :
- // put the additional options in the compiler flag or
- // linker flag field
- if (opt.getName().equals(COMPILER_FLAGS)
- || opt.getName().equals(LINKER_FLAGS)) {
+ // TODO create a lst of valid default string options for the tool
+ if (getDefaultOptionNames().contains(opt.getName())) {
String newOptions = getPreferenceStore().getString(
opt.getId());
if (addnOptions.length() > 0) {
@@ -426,20 +432,6 @@ public class BuildToolSettingsPage extends BuildSettingsPage {
}
}
- /**
- * Answers true if the receiver manages settings for the
- * argument
- *
- * @param tool
- * @return
- */
- public boolean isForTool(ITool tool) {
- if (tool != null) {
- return tool.equals(this.tool);
- }
- return false;
- }
-
/* (non-Javadoc)
* @see org.eclipse.jface.preference.FieldEditorPreferencePage#performOk()
*/
@@ -506,4 +498,24 @@ public class BuildToolSettingsPage extends BuildSettingsPage {
return result;
}
+
+ /**
+ * saves all field editors
+ */
+ public void storeSettings() {
+ super.performOk();
+ }
+
+ /**
+ * Update the field editor that displays all the build options
+ */
+ public void updateAllOptionField() {
+ try {
+ if (getToolFlags() != null) {
+ getPreferenceStore().setValue(allOptionsId, getToolFlags());
+ allOptionFieldEditor.load();
+ }
+ } catch (BuildException e) {
+ }
+ }
}