Changed the order of the pages in new sketch wizard; changed default

Author: jantje

it.baeyens.arduino.common/src/it/baeyens/arduino/common/ArduinoInstancePreferences.java

@@ -67,8 +67,12 @@ public static String getGlobalValue(String key) {
     }
 
     protected static boolean getGlobalBoolean(String key) {
+	return getGlobalBoolean(key, false);
+    }
+
+    protected static boolean getGlobalBoolean(String key, boolean def) {
 	IEclipsePreferences myScope = InstanceScope.INSTANCE.getNode(NODE_ARDUINO);
-	return myScope.getBoolean(key, false);
+	return myScope.getBoolean(key, def);
     }
 
     protected static int getGlobalInt(String key) {
@@ -224,22 +228,25 @@ public static void setLastUsedScopeFilter(boolean newFilter) {
 	setGlobalBoolean(KEY_LAST_USED_SCOPE_FILTER_MENU_OPTION, newFilter);
 
     }
+
     //
     // get/set last used "use default sketch location"
     //
-    public static boolean getLastUsedDefaultSketchSelection(){
-	return getGlobalBoolean(ENV_KEY_SKETCH_TEMPLATE_USE_DEFAULT);
+    public static boolean getLastUsedDefaultSketchSelection() {
+	return getGlobalBoolean(ENV_KEY_SKETCH_TEMPLATE_USE_DEFAULT, true);
     }
 
     public static void setLastUsedDefaultSketchSelection(boolean newFilter) {
 	setGlobalBoolean(ENV_KEY_SKETCH_TEMPLATE_USE_DEFAULT, newFilter);
     }
+
     //
     // get/set last used sketch template folder parameters
     //
     public static String getLastTemplateFolderName() {
 	return getGlobalValue(ENV_KEY_SKETCH_TEMPLATE_FOLDER);
     }
+
     public static void setLastTemplateFolderName(String folderName) {
 	setGlobalValue(ENV_KEY_SKETCH_TEMPLATE_FOLDER, folderName);
 

it.baeyens.arduino.core/src/it/baeyens/arduino/tools/DiskStream.java

@@ -5,6 +5,7 @@
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -23,16 +24,21 @@ public class Stream {
     /**
      * Initialize the file contents to contents of the given resource.
      */
-    public static InputStream openContentStream(String title, String Include, String Resource) throws CoreException {
+    public static InputStream openContentStream(String title, String Include, String Resource, boolean isFile) throws CoreException {
 
 	/* We want to be truly OS-agnostic */
 	final String newline = System.getProperty("line.separator");
 
 	String line;
 	StringBuffer stringBuffer = new StringBuffer();
-
+	InputStream input = null;
 	try {
-	    InputStream input = NewArduinoSketchWizard.class.getResourceAsStream(Resource);
+
+	    if (isFile) {
+		input = new FileInputStream(Resource);
+	    } else {
+		input = NewArduinoSketchWizard.class.getResourceAsStream(Resource);
+	    }
 	    // "templates/index-xhtml-template.resource");
 	    BufferedReader reader = new BufferedReader(new InputStreamReader(input));
 	    try {
@@ -48,9 +54,27 @@ public static InputStream openContentStream(String title, String Include, String
 	    }
 
 	} catch (IOException ioe) {
+	    if (input != null) {
+		try {
+		    input.close();
+		} catch (IOException e) {
+		    // TODO Auto-generated catch block
+		    e.printStackTrace();
+		}
+	    }
+	    input = null;
 	    IStatus status = new Status(IStatus.ERROR, "NewFileWizard", IStatus.OK, ioe.getLocalizedMessage(), null);
 	    Common.log(status);
 	    throw new CoreException(status);
+	} finally {
+	    if (input != null) {
+		try {
+		    input.close();
+		} catch (IOException e) {
+		    // TODO Auto-generated catch block
+		    e.printStackTrace();
+		}
+	    }
 	}
 
 	return new ByteArrayInputStream(stringBuffer.toString().getBytes());

it.baeyens.arduino.core/src/it/baeyens/arduino/tools/Stream.java

@@ -6,11 +6,9 @@
 import it.baeyens.arduino.tools.ArduinoHelpers;
 import it.baeyens.arduino.tools.ShouldHaveBeenInCDT;
 import it.baeyens.arduino.tools.Stream;
-import it.baeyens.arduino.tools.DiskStream;
 import it.baeyens.arduino.ui.BuildConfigurationsPage.ConfigurationDescriptor;
 
 import java.io.File;
-import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
 import java.util.ArrayList;
@@ -59,10 +57,10 @@
  */
 public class NewArduinoSketchWizard extends Wizard implements INewWizard, IExecutableExtension {
 
-    private WizardNewProjectCreationPage mWizardPage;	// first page of the dialog
-    private SketchTemplatePage mSketchTemplatePage;	// add the folder for the templates	
-    private ArduinoSettingsPage mArduinoPage;		// add Arduino board and comp port
-    private BuildConfigurationsPage mBuildCfgPage;	// build the configuration
+    private WizardNewProjectCreationPage mWizardPage; // first page of the dialog
+    private SketchTemplatePage mSketchTemplatePage; // add the folder for the templates
+    private ArduinoSettingsPage mArduinoPage; // add Arduino board and comp port
+    private BuildConfigurationsPage mBuildCfgPage; // build the configuration
     private IConfigurationElement mConfig;
     private IProject mProject;
 
@@ -84,31 +82,32 @@ public void addPages() {
 	mWizardPage.setDescription("Create a new Arduino sketch.");
 	mWizardPage.setTitle("New Arduino sketch");
 	//
-	// settings for template file location
-	//
-	mSketchTemplatePage = new SketchTemplatePage("Sketch Template location");
-	mSketchTemplatePage.setTitle("Provide the sketch template folder");
-	mSketchTemplatePage.setDescription("The folder must contain a sketch.cpp and sketch.h");
-	//
 	// settings for Arduino board etc
 	//
 	mArduinoPage = new ArduinoSettingsPage("Arduino information");
 	mArduinoPage.setTitle("Provide the Arduino information.");
 	mArduinoPage.setDescription("These settings can be changed later.");
 	//
+	// settings for template file location
+	//
+	mSketchTemplatePage = new SketchTemplatePage("Sketch Template location");
+	mSketchTemplatePage.setTitle("Provide the sketch template folder");
+	mSketchTemplatePage.setDescription("The folder must contain a sketch.cpp and sketch.h");
+	//
 	// configuration page but I haven't seen it
 	//
 	mBuildCfgPage = new BuildConfigurationsPage("Build configurations");
 	mBuildCfgPage.setTitle("Select additional build configurations for this project.");
 	mBuildCfgPage.setDescription("If you are using additional tools you may want one or more of these extra configurations.");
 	//
 	// actually add the pages to the wizard
-	///
+	// /
 	addPage(mWizardPage);
-	addPage(mSketchTemplatePage);
 	addPage(mArduinoPage);
+	addPage(mSketchTemplatePage);
 	addPage(mBuildCfgPage);
     }
+
     /**
      * this method is required by IWizard otherwise nothing will actually happen
      */
@@ -171,7 +170,7 @@ protected void execute(IProgressMonitor monitor) throws CoreException {
 	    return false;
 	}
 	//
-	// so the project is created we can start 
+	// so the project is created we can start
 	//
 	mProject = projectHandle;
 
@@ -259,48 +258,35 @@ void createProject(IProjectDescription description, IProject project, IProgressM
 	    //
 	    // Create the source files (sketch.cpp and sketch.h)
 	    //
-	    InputStream cppTemplateFile = null;
-	    InputStream hTemplateFile   = null;
-	    
+	    String cppTemplateFile;
+	    String hTemplateFile;
+	    boolean isfile = true;
+
 	    if (ArduinoInstancePreferences.getLastUsedDefaultSketchSelection() == true) {
 		//
 		// we will use the default sketch.cpp and sketch.h
 		//
-		cppTemplateFile = Stream.openContentStream(project.getName(), "", "templates/sketch.cpp");
-		hTemplateFile	= Stream.openContentStream(project.getName(), Include, "templates/sketch.h");
+		cppTemplateFile = "templates/sketch.cpp";
+		hTemplateFile = "templates/sketch.h";
+		isfile = false;
 	    } else {
 		//
 		// we are using our own created sketch.cpp and sketch.h. We use a different streaming mechanism
 		// here. Standard used relative paths (Stream class). I created a different Class (DiskStream) to
 		// handle absolute paths
 		//
-		String folderName = ArduinoInstancePreferences.getLastTemplateFolderName();		
-		cppTemplateFile	= DiskStream.openContentStream(project.getName(), "", folderName + "\\sketch.cpp");
-		hTemplateFile	= DiskStream.openContentStream(project.getName(), Include, folderName + "\\sketch.h");
+		String folderName = ArduinoInstancePreferences.getLastTemplateFolderName();
+		cppTemplateFile = folderName + "\\sketch.cpp";
+		hTemplateFile = folderName + "\\sketch.h";
+		isfile = true;
 	    }
 	    //
 	    // add both files to the project
 	    //
-	    ArduinoHelpers.addFileToProject(container, new Path(project.getName() + ".cpp"), cppTemplateFile, monitor);
-	    ArduinoHelpers.addFileToProject(container, new Path(project.getName() + ".h"), hTemplateFile, monitor);
-	    
-	    // exclude "Librarie/*/?xample from the build
-	    // ICSourceEntry[] folder;
-	    // folder = configurationDescription.getSourceEntries();
-	    // char[][] exclusions = entry.fullExclusionPatternChars();
-	    // CoreModelUtil.isExcluded(project.getFullPath(), exclusions);
-	    // folder[0].
-	    // getResourceDescription(new Path(""), true);
-	    // folder[0].createFilter(IResourceFilterDescription.EXCLUDE_ALL |
-	    // IResourceFilterDescription.FOLDERS, new
-	    // FileInfoMatcherDescription("org.eclipse.core.resources.regexFilterMatcher",
-	    // "Librarie/*/?xample"), IResource.BACKGROUND_REFRESH, monitor);
-
-	    // IFile file = project.getFile("Librarie/*/?xample");
-	    // Object activeConfig;
-	    // IResourceConfiguration ResConfig = configurationDescription.
-	    // .createResourceConfiguration(file);
-	    // ResConfig.setExclude(true);
+	    ArduinoHelpers.addFileToProject(container, new Path(project.getName() + ".cpp"),
+		    Stream.openContentStream(project.getName(), Include, cppTemplateFile, isfile), monitor);
+	    ArduinoHelpers.addFileToProject(container, new Path(project.getName() + ".h"),
+		    Stream.openContentStream(project.getName(), Include, hTemplateFile, isfile), monitor);
 
 	    ICResourceDescription cfgd = defaultConfigDescription.getResourceDescription(new Path(""), true);
 	    ICExclusionPatternPathEntry[] entries = cfgd.getConfiguration().getSourceEntries();
@@ -322,22 +308,6 @@ void createProject(IProjectDescription description, IProject project, IProgressM
 		// this should not happen
 	    }
 
-	    // private void saveData() {
-	    // ICExclusionPatternPathEntry[] p = new
-	    // ICExclusionPatternPathEntry[src.size()];
-	    // Iterator<_Entry> it = src.iterator();
-	    // int i=0;
-	    // while(it.hasNext()) { p[i++] = (it.next()).ent; }
-	    // setEntries(cfgd, p);
-	    // tree.setInput(cfgd);
-	    // updateData(cfgd);
-	    // if (page instanceof AbstractPage) {
-	    // ICConfigurationDescription cfgDescription =
-	    // cfgd.getConfiguration();
-	    // ((AbstractPage)page).cfgChanged(cfgDescription);
-	    // }
-	    // }
-
 	    prjDesc.setActiveConfiguration(defaultConfigDescription);
 	    prjDesc.setCdtProjectCreated();
 	    CoreModel.getDefault().getProjectDescriptionManager().setProjectDescription(project, prjDesc, true, null);