Merge pull request #674 from Sloeber/#668

 fix the issue #668

Author: jantje

io.sloeber.core/src/io/sloeber/core/api/CodeDescriptor.java

@@ -32,6 +32,11 @@ public enum CodeTypes {
 		defaultIno, defaultCPP, CustomTemplate, sample
 	}
 
+	static public final String DEFAULT_SKETCH_BASE = "sketch"; //$NON-NLS-1$
+	static public final String DEFAULT_SKETCH_INO = DEFAULT_SKETCH_BASE + ".ino"; //$NON-NLS-1$
+	static public final String DEFAULT_SKETCH_CPP = DEFAULT_SKETCH_BASE + ".cpp"; //$NON-NLS-1$
+	static public final String DEFAULT_SKETCH_H = DEFAULT_SKETCH_BASE + ".h"; //$NON-NLS-1$
+
 	private CodeTypes codeType;
 	private IPath myTemPlateFoldername;
 	private boolean myMakeLinks = false;
@@ -112,14 +117,19 @@ public void createFiles(IProject project, IProgressMonitor monitor) throws CoreE
 
 		switch (this.codeType) {
 		case defaultIno:
-			Helpers.addFileToProject(project, new Path(project.getName() + ".ino"), Stream.openContentStream(
-					project.getName(), Include, "/io/sloeber/core/templates/sketch.ino", false), monitor, false);
+			Helpers.addFileToProject(project, new Path(project.getName() + ".ino"),
+					Stream.openContentStream(project.getName(), Include,
+							"/io/sloeber/core/templates/" + DEFAULT_SKETCH_INO, false),
+					monitor, false);
 			break;
 		case defaultCPP:
-			Helpers.addFileToProject(project, new Path(project.getName() + ".cpp"), Stream.openContentStream(
-					project.getName(), Include, "/io/sloeber/core/templates/sketch.cpp", false), monitor, false);
+			Helpers.addFileToProject(project, new Path(project.getName() + ".cpp"),
+					Stream.openContentStream(project.getName(), Include,
+							"/io/sloeber/core/templates/" + DEFAULT_SKETCH_CPP, false),
+					monitor, false);
 			Helpers.addFileToProject(project, new Path(project.getName() + ".h"),
-					Stream.openContentStream(project.getName(), Include, "/io/sloeber/core/templates/sketch.h", false),
+					Stream.openContentStream(project.getName(), Include,
+							"/io/sloeber/core/templates/" + DEFAULT_SKETCH_H, false),
 					monitor, false);
 			break;
 		case CustomTemplate:
@@ -132,7 +142,11 @@ public void createFiles(IProject project, IProgressMonitor monitor) throws CoreE
 				for (String file : files) {
 					if (!(file.equals(".") || file.equals(".."))) {
 						File sourceFile = folderName.append(file).toFile();
-						Helpers.addFileToProject(project, new Path(file),
+						String renamedFile = file;
+						if (DEFAULT_SKETCH_INO.equalsIgnoreCase(file)) {
+							renamedFile = project.getName() + ".ino";
+						}
+						Helpers.addFileToProject(project, new Path(renamedFile),
 								Stream.openContentStream(project.getName(), Include, sourceFile.toString(), true),
 								monitor, false);
 					}

io.sloeber.core/src/io/sloeber/core/managers/Manager.java

@@ -264,10 +264,11 @@ static public List<PackageIndex> getPackageIndices() {
 	}
 
 	private static void loadLibraryIndex(boolean download) {
+		File librariesFile = null;
 		try {
 			URL librariesUrl = new URL(Defaults.LIBRARIES_URL);
 			String localFileName = Paths.get(librariesUrl.getPath()).getFileName().toString();
-			File librariesFile = ConfigurationPreferences.getInstallationPath().append(localFileName).toFile();
+			librariesFile = ConfigurationPreferences.getInstallationPath().append(localFileName).toFile();
 			if (!librariesFile.exists() || download) {
 				librariesFile.getParentFile().mkdirs();
 				myCopy(librariesUrl, librariesFile);
@@ -280,7 +281,8 @@ private static void loadLibraryIndex(boolean download) {
 				}
 			}
 		} catch (IOException e) {
-			Common.log(new Status(IStatus.WARNING, Activator.getId(), "Failed to load library index", e)); //$NON-NLS-1$
+			Common.log(
+					new Status(IStatus.ERROR, Activator.getId(), "Failed to load library index: " + librariesFile, e)); //$NON-NLS-1$
 		}
 
 	}

io.sloeber.ui/src/io/sloeber/ui/wizard/newsketch/NewSketchWizardCodeSelectionPage.java

@@ -136,7 +136,7 @@ public void handleEvent(Event event) {
 	 *       Checkbox settings
 	 */
 	protected void SetControls() {
-		switch (CodeTypes.values()[Math.max(0,this.mCodeSourceOptionsCombo.mCombo.getSelectionIndex())]) {
+		switch (CodeTypes.values()[Math.max(0, this.mCodeSourceOptionsCombo.mCombo.getSelectionIndex())]) {
 		case defaultIno:
 			this.mTemplateFolderEditor.setEnabled(false, this.mParentComposite);
 			this.mExampleEditor.setEnabled(false);
@@ -177,9 +177,9 @@ protected void validatePage() {
 			break;
 		case CustomTemplate:
 			IPath templateFolder = new Path(this.mTemplateFolderEditor.getStringValue());
-			File cppFile = templateFolder.append("sketch.cpp").toFile(); //$NON-NLS-1$
-			File headerFile = templateFolder.append("sketch.h").toFile(); //$NON-NLS-1$
-			File inoFile = templateFolder.append("sketch.ino").toFile(); //$NON-NLS-1$
+			File cppFile = templateFolder.append(CodeDescriptor.DEFAULT_SKETCH_CPP).toFile();
+			File headerFile = templateFolder.append(CodeDescriptor.DEFAULT_SKETCH_H).toFile();
+			File inoFile = templateFolder.append(CodeDescriptor.DEFAULT_SKETCH_INO).toFile();
 			boolean existFile = inoFile.isFile() || (cppFile.isFile() && headerFile.isFile());
 			setPageComplete(existFile);
 			break;