Include paths and files and lib paths now work #1126

Also persistency works
The libs are not yet added to the command line

Author: jantje

io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/ui/tabs/FileListControlFieldEditor.java

@@ -39,14 +39,11 @@
 public class FileListControlFieldEditor extends FieldEditor {
 
     // file list control
-    private FileListControl list;
+    private FileListControl myListControl;
     private int browseType;
     private Composite topLayout;
     private static final String DEFAULT_SEPARATOR = ";"; //$NON-NLS-1$
 
-    //values
-    //	private String[] values = null;
-
     /**
      * Creates a file list control field editor.
      * 
@@ -60,10 +57,10 @@ public class FileListControlFieldEditor extends FieldEditor {
      *            the browseType of the file list control
      */
     public FileListControlFieldEditor(String name, String labelText, Composite parent, int type) {
-        super(name, labelText, parent);
+        super();
         browseType = type;
-        // Set the browse strategy for the list editor
-        list.setType(type);
+        init(name, labelText);
+        createControl(parent);
     }
 
     /**
@@ -82,13 +79,33 @@ public FileListControlFieldEditor(String name, String labelText, Composite paren
      *            the browseType of the file list control
      */
     public FileListControlFieldEditor(String name, String labelText, String tooltip, String contextId, Composite parent,
-            int type) {
+            String value, int type) {
         this(name, labelText, parent, type);
         // can't use setToolTip(tooltip) as label not created yet
         getLabelControl(parent).setToolTipText(tooltip);
         if (!contextId.isEmpty())
-            PlatformUI.getWorkbench().getHelpSystem().setHelp(list.getListControl(), contextId);
+            PlatformUI.getWorkbench().getHelpSystem().setHelp(myListControl.getListControl(), contextId);
+        myListControl.setList(parseString(value));
     }
+    /**
+     * Creates a file list control field editor.
+     * 
+     * @param name
+     *            the name of the preference this field editor works on
+     * @param labelText
+     *            the label text of the field editor
+     * @param parent
+     *            the parent of the field editor's control
+     * @param value
+     *            the field editor's value
+     * @param type
+     *            the browseType of the file list control
+     */
+    //    public FileListControlFieldEditor(String name, String labelText, Composite parent, String value, int type) {
+    //        this(name, labelText, parent, type);
+    //        browseType = type;
+    //        //        this.values = parseString(value);
+    //    }
 
     /**
      * Sets the field editor's tool tip text to the argument, which
@@ -128,26 +145,6 @@ public String getToolTipText() {
         return getLabelControl().getToolTipText();
     }
 
-    /**
-     * Creates a file list control field editor.
-     * 
-     * @param name
-     *            the name of the preference this field editor works on
-     * @param labelText
-     *            the label text of the field editor
-     * @param parent
-     *            the parent of the field editor's control
-     * @param value
-     *            the field editor's value
-     * @param type
-     *            the browseType of the file list control
-     */
-    public FileListControlFieldEditor(String name, String labelText, Composite parent, String value, int type) {
-        this(name, labelText, parent, type);
-        browseType = type;
-        //		this.values = parseString(value);
-    }
-
     /**
      * Sets the filter-path for the underlying Browse dialog. Only applies when
      * browseType is 'file' or 'dir'.
@@ -157,7 +154,7 @@ public FileListControlFieldEditor(String name, String labelText, Composite paren
      * @since 7.0
      */
     public void setFilterPath(String filterPath) {
-        list.setFilterPath(filterPath);
+        myListControl.setFilterPath(filterPath);
     }
 
     /**
@@ -169,7 +166,7 @@ public void setFilterPath(String filterPath) {
      * @since 7.0
      */
     public void setFilterExtensions(String[] filterExtensions) {
-        list.setFilterExtensions(filterExtensions);
+        myListControl.setFilterExtensions(filterExtensions);
     }
 
     /**
@@ -188,8 +185,8 @@ protected void doFillIntoGrid(Composite parent, int numColumns) {
         gddata.horizontalSpan = 2;
         topLayout.setLayoutData(gddata);
         // file list control
-        list = new FileListControl(topLayout, getLabelText(), getType(), false);
-        list.addChangeListener(new IFileListChangeListener() {
+        myListControl = new FileListControl(topLayout, getLabelText(), browseType, false);
+        myListControl.addChangeListener(new IFileListChangeListener() {
 
             @Override
             public void fileListChanged(FileListControl fileList, String oldValue[], String newValue[]) {
@@ -205,41 +202,32 @@ private void handleFileListChange(FileListControl fileList, String oldValue[], S
         fireValueChanged(VALUE, createList(oldValue), createList(newValue));
     }
 
-    /**
-     * Returns the browseType of this field editor's file list control
-     * 
-     * @return
-     */
-    private int getType() {
-        return browseType;
-    }
-
     /**
      * @return the file list control
      */
     protected List getListControl() {
-        return list.getListControl();
+        return myListControl.getListControl();
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.jface.preference.FieldEditor#doLoad()
      */
     @Override
     protected void doLoad() {
-        list.selectionChanged();
+        myListControl.selectionChanged();
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.jface.preference.FieldEditor#doLoadDefault()
      */
     @Override
     protected void doLoadDefault() {
-        if (list != null) {
-            list.removeAll();
+        if (myListControl != null) {
+            myListControl.removeAll();
             String s = getPreferenceStore().getDefaultString(getPreferenceName());
             String[] array = parseString(s);
-            list.setList(array);
-            list.selectionChanged();
+            myListControl.setList(array);
+            myListControl.selectionChanged();
         }
     }
 
@@ -248,13 +236,13 @@ protected void doLoadDefault() {
      */
     @Override
     protected void doStore() {
-        String s = createList(list.getItems());
+        String s = createList(myListControl.getItems());
         if (s != null)
             getPreferenceStore().setValue(getPreferenceName(), s);
     }
 
     public String[] getStringListValue() {
-        return list.getItems();
+        return myListControl.getItems();
     }
 
     /**
@@ -319,12 +307,12 @@ protected void adjustForNumColumns(int numColumns) {
 
     @Override
     public Label getLabelControl(Composite parent) {
-        return list.getLabelControl();
+        return myListControl.getLabelControl();
     }
 
     @Override
     public void setEnabled(boolean enabled, Composite parent) {
-        list.setEnabled(enabled);
+        myListControl.setEnabled(enabled);
     }
 
 }

io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/ui/tabs/ToolSettingsTab.java

@@ -21,7 +21,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import java.util.Vector;
 
 import org.eclipse.cdt.core.settings.model.ICResourceDescription;
 import org.eclipse.cdt.ui.newui.AbstractCPropertyTab;
@@ -107,20 +106,11 @@ public class ToolSettingsTab extends AbstractAutoBuildPropertyTab {
     private Composite mySettingsPageContainer;
     private ScrolledComposite containerSC;
 
-    /*
-     * Bookeeping variables
-     */
-    //	private Map<String, List<AbstractToolSettingUI>> configToPageListMap;
-    //	private IPreferenceStore settingsStore;
-    //	private AbstractToolSettingUI currentSettingsPage;
     private ToolListContentProvider listprovider;
     private IResource mySelectedResource;
 
-    //	private IResourceInfo fInfo;
-
     private boolean displayFixedTip = CDTPrefUtil.getBool(CDTPrefUtil.KEY_TIPBOX);
     private int[] defaultWeights = new int[] { 4, 1 };
-    private int[] hideTipBoxWeights = new int[] { 1, 0 };
 
     private boolean isIndexerAffected;
     private static String COMMAND_LINE_PATTERN = "command Line Pattern"; //$NON-NLS-1$
@@ -503,7 +493,7 @@ public void modifyText(ModifyEvent e) {
                         // if (displayFixedTip==false), tooltip was already set in FileListControlFieldEditor constructor.
                         String tooltipHoverStr = displayFixedTip ? null : tipStr;
                         fieldEditor = new FileListControlFieldEditor(optId, nameStr, tooltipHoverStr, contextId,
-                                mySettingsPageContainer, curOption.getBrowseType());
+                                mySettingsPageContainer, optionValue, curOption.getBrowseType());
                         if (curOption.getBrowseFilterPath() != null) {
                             String filterPath = AutoBuildCommon.resolve(curOption.getBrowseFilterPath(),
                                     myAutoConfDesc);