Improvement for #367

Added the number of included examples
Checked the parents so the preselected are easier to find
Tried to open the selected but that does not work when at the 3th level

Author: jantje

it.baeyens.arduino.core/src/it/baeyens/arduino/ui/NewSketchWizard.java

@@ -88,8 +88,7 @@ public NewSketchWizard() {
 
     @Override
     /**
-     * adds pages to the wizard. We are using the standard project wizard of
-     * Eclipse
+     * adds pages to the wizard. We are using the standard project wizard of Eclipse
      */
     public void addPages() {
 	//
@@ -109,11 +108,9 @@ public void addPages() {
 	//
 	// settings for template file location
 	//
-	this.mNewArduinoSketchWizardCodeSelectionPage = new NewSketchWizardCodeSelectionPage(
-		Messages.ui_new_sketch_sketch_template_location);
+	this.mNewArduinoSketchWizardCodeSelectionPage = new NewSketchWizardCodeSelectionPage(Messages.ui_new_sketch_sketch_template_location);
 	this.mNewArduinoSketchWizardCodeSelectionPage.setTitle(Messages.ui_new_sketch_sketch_template_folder);
-	this.mNewArduinoSketchWizardCodeSelectionPage
-		.setDescription(Messages.ui_new_sketch_error_folder_must_contain_sketch_cpp);
+	this.mNewArduinoSketchWizardCodeSelectionPage.setDescription(Messages.ui_new_sketch_error_folder_must_contain_sketch_cpp);
 	//
 	// configuration page but I haven't seen it
 	//
@@ -170,8 +167,7 @@ public boolean performFinish() {
 	    desc.setLocationURI(projectURI);
 
 	    /*
-	     * Just like the ExampleWizard, but this time with an operation
-	     * object that modifies workspaces.
+	     * Just like the ExampleWizard, but this time with an operation object that modifies workspaces.
 	     */
 	    WorkspaceModifyOperation op = new WorkspaceModifyOperation() {
 		@Override
@@ -184,9 +180,7 @@ protected void execute(IProgressMonitor monitor) throws CoreException {
 	    };
 
 	    /*
-	     * This isn't as robust as the code in the
-	     * BasicNewProjectResourceWizard class. Consider beefing this up to
-	     * improve error handling.
+	     * This isn't as robust as the code in the BasicNewProjectResourceWizard class. Consider beefing this up to improve error handling.
 	     */
 	    getContainer().run(false, true, op);
 	} catch (InterruptedException e) {
@@ -224,8 +218,7 @@ protected void execute(IProgressMonitor monitor) throws CoreException {
      * @param monitor
      * @throws OperationCanceledException
      */
-    void createProject(IProjectDescription description, IProject project, IProgressMonitor monitor)
-	    throws OperationCanceledException {
+    void createProject(IProjectDescription description, IProject project, IProgressMonitor monitor) throws OperationCanceledException {
 
 	monitor.beginTask(Const.EMPTY_STRING, 2000);
 	try {
@@ -242,8 +235,7 @@ void createProject(IProjectDescription description, IProject project, IProgressM
 	    ArrayList<ConfigurationDescriptor> cfgNamesAndTCIds = this.mBuildCfgPage.getBuildConfigurationDescriptors();
 
 	    // Creates the .cproject file with the configurations
-	    ICProjectDescription prjCDesc = ShouldHaveBeenInCDT.setCProjectDescription(project, cfgNamesAndTCIds, true,
-		    monitor);
+	    ICProjectDescription prjCDesc = ShouldHaveBeenInCDT.setCProjectDescription(project, cfgNamesAndTCIds, true, monitor);
 
 	    // Add the C C++ AVR and other needed Natures to the project
 	    Helpers.addTheNatures(description);
@@ -252,11 +244,9 @@ void createProject(IProjectDescription description, IProject project, IProgressM
 	    Helpers.createNewFolder(project, Const.ARDUINO_CODE_FOLDER_NAME, null);
 
 	    for (int i = 0; i < cfgNamesAndTCIds.size(); i++) {
-		ICConfigurationDescription configurationDescription = prjCDesc
-			.getConfigurationByName(cfgNamesAndTCIds.get(i).Name);
+		ICConfigurationDescription configurationDescription = prjCDesc.getConfigurationByName(cfgNamesAndTCIds.get(i).Name);
 		this.mArduinoPage.saveAllSelections(configurationDescription);
-		Helpers.setTheEnvironmentVariables(project, configurationDescription,
-			cfgNamesAndTCIds.get(i).DebugCompilerSettings);
+		Helpers.setTheEnvironmentVariables(project, configurationDescription, cfgNamesAndTCIds.get(i).DebugCompilerSettings);
 	    }
 
 	    // Set the path variables
@@ -265,8 +255,7 @@ void createProject(IProjectDescription description, IProject project, IProgressM
 	    // Intermediately save or the adding code will fail
 	    // Release is the active config (as that is the "IDE" Arduino
 	    // type....)
-	    ICConfigurationDescription defaultConfigDescription = prjCDesc
-		    .getConfigurationByName(cfgNamesAndTCIds.get(0).Name);
+	    ICConfigurationDescription defaultConfigDescription = prjCDesc.getConfigurationByName(cfgNamesAndTCIds.get(0).Name);
 	    prjCDesc.setActiveConfiguration(defaultConfigDescription);
 
 	    // Insert The Arduino Code
@@ -278,13 +267,8 @@ void createProject(IProjectDescription description, IProject project, IProgressM
 	    // add the correct files to the project
 	    //
 	    this.mNewArduinoSketchWizardCodeSelectionPage.createFiles(project, monitor);
-	    //
-	    // add the libraries to the project if needed
-	    //
-	    this.mNewArduinoSketchWizardCodeSelectionPage.importLibraries(project, prjCDesc.getActiveConfiguration());
 
-	    ICResourceDescription cfgd = defaultConfigDescription.getResourceDescription(new Path(Const.EMPTY_STRING),
-		    true);
+	    ICResourceDescription cfgd = defaultConfigDescription.getResourceDescription(new Path(Const.EMPTY_STRING), true);
 	    ICExclusionPatternPathEntry[] entries = cfgd.getConfiguration().getSourceEntries();
 	    if (entries.length == 1) {
 		Path exclusionPath[] = new Path[5];
@@ -312,8 +296,7 @@ void createProject(IProjectDescription description, IProject project, IProgressM
 	    // set warning levels default on
 	    IEnvironmentVariableManager envManager = CCorePlugin.getDefault().getBuildEnvironmentManager();
 	    IContributedEnvironment contribEnv = envManager.getContributedEnvironment();
-	    IEnvironmentVariable var = new EnvironmentVariable(Const.ENV_KEY_JANTJE_WARNING_LEVEL,
-		    Const.ENV_KEY_WARNING_LEVEL_ON);
+	    IEnvironmentVariable var = new EnvironmentVariable(Const.ENV_KEY_JANTJE_WARNING_LEVEL, Const.ENV_KEY_WARNING_LEVEL_ON);
 	    contribEnv.addVariable(var, cfgd.getConfiguration());
 
 	    prjCDesc.setActiveConfiguration(defaultConfigDescription);
@@ -323,8 +306,7 @@ void createProject(IProjectDescription description, IProject project, IProgressM
 	    monitor.done();
 
 	} catch (CoreException e) {
-	    Common.log(new Status(IStatus.ERROR, Const.CORE_PLUGIN_ID,
-		    Messages.ui_new_sketch_error_failed_to_create_project + project.getName(), e));
+	    Common.log(new Status(IStatus.ERROR, Const.CORE_PLUGIN_ID, Messages.ui_new_sketch_error_failed_to_create_project + project.getName(), e));
 	    throw new OperationCanceledException();
 	}
 
@@ -336,8 +318,7 @@ public void init(IWorkbench workbench, IStructuredSelection selection) {
     }
 
     @Override
-    public void setInitializationData(IConfigurationElement config, String propertyName, Object data)
-	    throws CoreException {
+    public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
 	// snipped...
 	this.mConfig = config;
 

it.baeyens.arduino.core/src/it/baeyens/arduino/ui/NewSketchWizardCodeSelectionPage.java

@@ -3,7 +3,6 @@
 import java.io.File;
 import java.io.IOException;
 
-import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
@@ -13,7 +12,6 @@
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
@@ -29,9 +27,8 @@
 public class NewSketchWizardCodeSelectionPage extends WizardPage {
 
     final Shell shell = new Shell();
-    private final int ncol = 4;
-    String[] codeOptions = { Messages.ui_new_sketch_default_ino, Messages.ui_new_sketch_default_cpp,
-	    Messages.ui_new_sketch_custom_template, Messages.ui_new_sketch_sample_sketch };
+    String[] codeOptions = { Messages.ui_new_sketch_default_ino, Messages.ui_new_sketch_default_cpp, Messages.ui_new_sketch_custom_template,
+	    Messages.ui_new_sketch_sample_sketch };
     private static final int defaultIno = 0;
     private static final int defaultCPP = 1;
     private static final int CustomTemplate = 2;
@@ -70,18 +67,11 @@ public void createControl(Composite parent) {
 
 	Composite composite = new Composite(parent, SWT.NULL);
 	this.mParentComposite = composite;
-	GridLayout theGridLayout; // references the layout
-	GridData theGriddata; // references a grid
 
-	//
-	// create the grid layout and add it to the composite
-	//
-	theGridLayout = new GridLayout();
-	theGridLayout.numColumns = this.ncol; // 4 columns
+	GridLayout theGridLayout = new GridLayout();
+	theGridLayout.numColumns = 4;
 	composite.setLayout(theGridLayout);
-	//
-	// check box Use default
-	//
+
 	Listener comboListener = new Listener() {
 
 	    @Override
@@ -91,19 +81,20 @@ public void handleEvent(Event event) {
 
 	    }
 	};
-	this.mCodeSourceOptionsCombo = new LabelCombo(composite, Messages.ui_new_sketch_selecy_code, this.ncol,
-		Const.EMPTY_STRING, true);
+	this.mCodeSourceOptionsCombo = new LabelCombo(composite, Messages.ui_new_sketch_selecy_code, 4, Const.EMPTY_STRING, true);
 	this.mCodeSourceOptionsCombo.addListener(comboListener);
 
 	this.mCodeSourceOptionsCombo.setItems(this.codeOptions);
 
 	this.mTemplateFolderEditor = new DirectoryFieldEditor("temp1", Messages.ui_new_sketch_custom_template_location, //$NON-NLS-1$
 		composite);
-	this.mExampleEditor = new SampleSelector(composite, SWT.NONE,
-		Messages.ui_new_sketch_select_example_code);
-	// GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-	// gd.horizontalSpan = ncol;
-	// mExampleEditor.setLayoutData(gd);
+
+	this.mExampleEditor = new SampleSelector(composite, SWT.FILL, Messages.ui_new_sketch_select_example_code, 4);
+	// GridData theGriddata = new GridData();
+	// theGriddata.horizontalSpan = 4;// (ncol - 1);
+	// theGriddata.horizontalAlignment = SWT.FILL;
+	// this.mExampleEditor.setLayoutData(theGriddata);
+
 	this.mExampleEditor.addchangeListener(new Listener() {
 
 	    @Override
@@ -118,12 +109,6 @@ public void handleEvent(Event event) {
 
 	this.mCheckBoxUseCurrentLinkSample = new Button(composite, SWT.CHECK);
 	this.mCheckBoxUseCurrentLinkSample.setText(Messages.ui_new_sketch_link_to_sample_code);
-	theGriddata = new GridData();
-	theGriddata.horizontalSpan = this.ncol;
-	theGriddata.horizontalAlignment = SWT.LEAD;
-	theGriddata.grabExcessHorizontalSpace = false;
-	this.mCheckBoxUseCurrentLinkSample.setLayoutData(theGriddata);
-	//
 
 	//
 	// End of special controls
@@ -139,8 +124,7 @@ public void handleEvent(Event event) {
     }
 
     /**
-     * @name SetControls() Enables or disables the controls based on the
-     *       Checkbox settings
+     * @name SetControls() Enables or disables the controls based on the Checkbox settings
      */
     protected void SetControls() {
 	switch (this.mCodeSourceOptionsCombo.mCombo.getSelectionIndex()) {
@@ -170,8 +154,7 @@ protected void SetControls() {
     }
 
     /**
-     * @name validatePage() Check if the user has provided all the info to
-     *       create the project. If so enable the finish button.
+     * @name validatePage() Check if the user has provided all the info to create the project. If so enable the finish button.
      */
     protected void validatePage() {
 	switch (this.mCodeSourceOptionsCombo.mCombo.getSelectionIndex()) {
@@ -197,8 +180,7 @@ protected void validatePage() {
     }
 
     /**
-     * @name restoreAllSelections() Restore all necessary variables into the
-     *       respective controls
+     * @name restoreAllSelections() Restore all necessary variables into the respective controls
      */
     private void restoreAllSelections() {
 	//
@@ -209,14 +191,12 @@ private void restoreAllSelections() {
 	//
 	this.mTemplateFolderEditor.setStringValue(InstancePreferences.getLastTemplateFolderName());
 	this.mCodeSourceOptionsCombo.mCombo.select(InstancePreferences.getLastUsedDefaultSketchSelection());
-	this.mExampleEditor.setLastUsedExamples();
     }
 
     public void createFiles(IProject project, IProgressMonitor monitor) throws CoreException {
 
 	InstancePreferences.setLastTemplateFolderName(this.mTemplateFolderEditor.getStringValue());
-	InstancePreferences
-		.setLastUsedDefaultSketchSelection(this.mCodeSourceOptionsCombo.mCombo.getSelectionIndex());
+	InstancePreferences.setLastUsedDefaultSketchSelection(this.mCodeSourceOptionsCombo.mCombo.getSelectionIndex());
 	this.mExampleEditor.saveLastUsedExamples();
 
 	String Include = "Arduino.h"; //$NON-NLS-1$
@@ -245,8 +225,7 @@ public void createFiles(IProject project, IProgressMonitor monitor) throws CoreE
 			Stream.openContentStream(project.getName(), Include, inoFile.toString(), true), monitor);
 	    } else {
 		Helpers.addFileToProject(project, new Path(project.getName() + ".cpp"), //$NON-NLS-1$
-			Stream.openContentStream(project.getName(), Include, cppTemplateFile.toString(), true),
-			monitor);
+			Stream.openContentStream(project.getName(), Include, cppTemplateFile.toString(), true), monitor);
 		Helpers.addFileToProject(project, new Path(project.getName() + ".h"), //$NON-NLS-1$
 			Stream.openContentStream(project.getName(), Include, hTemplateFile.toString(), true), monitor);
 	    }
@@ -272,21 +251,4 @@ public void AddAllExamples() {
 
     }
 
-    public void importLibraries(IProject project, ICConfigurationDescription configurationDescription) {
-	switch (this.mCodeSourceOptionsCombo.mCombo.getSelectionIndex()) {
-	case defaultIno:
-	case defaultCPP:
-	case CustomTemplate:
-	    // no need to attach libraries here
-	    break;
-	case sample:
-	    this.mExampleEditor.importSelectedLibraries(project, configurationDescription);
-	    break;
-	default:
-
-	    break;
-	}
-
-    }
-
 }