Some more refactoring

The previous commits is one blop I split it into commits to have a
functional overview of what changed but you probably need all of it.

Author: jantje

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

@@ -41,6 +41,7 @@
 
 import io.sloeber.common.Common;
 import io.sloeber.common.Const;
+import io.sloeber.core.Activator;
 import io.sloeber.core.InternalBoardDescriptor;
 import io.sloeber.core.tools.Helpers;
 import io.sloeber.core.tools.Programmers;
@@ -49,7 +50,7 @@
 
 public class BoardDescriptor {
 	// preference nodes
-	public static final String NODE_ARDUINO = Const.PLUGIN_START + "arduino"; //$NON-NLS-1$
+	public static final String NODE_ARDUINO = Activator.NODE_ARDUINO;
 	/**
 	 *
 	 */
@@ -101,7 +102,7 @@ protected BoardDescriptor(ICConfigurationDescription confdesc) {
 		} else {
 			this.myUploadPort = Common.getBuildEnvironmentVariable(confdesc, Const.ENV_KEY_JANTJE_UPLOAD_PORT, "");
 			this.myUploadProtocol = Common.getBuildEnvironmentVariable(confdesc,
-					Const.get_Jantje_KEY_PROTOCOL(Const.ACTION_UPLOAD), "");
+					Common.get_Jantje_KEY_PROTOCOL(Const.ACTION_UPLOAD), "");
 			this.myBoardsFile = new File(
 					Common.getBuildEnvironmentVariable(confdesc, Const.ENV_KEY_JANTJE_BOARDS_FILE, ""));
 			this.myBoardID = Common.getBuildEnvironmentVariable(confdesc, Const.ENV_KEY_JANTJE_BOARD_ID, "");
@@ -256,7 +257,7 @@ public void save(ICConfigurationDescription confdesc) throws Exception {
 			Common.setBuildEnvironmentVariable(confdesc, Const.ENV_KEY_JANTJE_ARCITECTURE_ID, getArchitecture());
 			Common.setBuildEnvironmentVariable(confdesc, Const.ENV_KEY_JANTJE_PACKAGE_ID, getPackage());
 			Common.setBuildEnvironmentVariable(confdesc, Const.ENV_KEY_JANTJE_UPLOAD_PORT, this.myUploadPort);
-			Common.setBuildEnvironmentVariable(confdesc, Const.get_Jantje_KEY_PROTOCOL(Const.ACTION_UPLOAD),
+			Common.setBuildEnvironmentVariable(confdesc, Common.get_Jantje_KEY_PROTOCOL(Const.ACTION_UPLOAD),
 					this.myUploadProtocol);
 			if (this.myOptions != null) {
 				for (Map.Entry<String, String> curoption : this.myOptions.entrySet()) {

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

@@ -32,7 +32,7 @@ public enum CodeTypes {
 	private CodeTypes codeType;
 	private IPath myTemPlateFoldername;
 	private boolean myMakeLinks = false;
-	private ArrayList<Path> myLastUsedExamples = new ArrayList<>();
+	private ArrayList<Path> myExamples = new ArrayList<>();
 
 	public IPath getTemPlateFoldername() {
 		return this.myTemPlateFoldername;
@@ -50,10 +50,10 @@ public static CodeDescriptor createDefaultCPP() {
 		return new CodeDescriptor(CodeTypes.defaultCPP);
 	}
 
-	public static CodeDescriptor createSample(boolean link, ArrayList<Path> sampleFolders) {
+	public static CodeDescriptor createExample(boolean link, ArrayList<Path> sampleFolders) {
 		CodeDescriptor codeDescriptor = new CodeDescriptor(CodeTypes.sample);
 		codeDescriptor.myMakeLinks = link;
-		codeDescriptor.myLastUsedExamples = sampleFolders;
+		codeDescriptor.myExamples = sampleFolders;
 		return codeDescriptor;
 	}
 
@@ -134,7 +134,7 @@ public void createFiles(IProject project, IProgressMonitor monitor) throws CoreE
 			break;
 		case sample:
 			try {
-				for (Path curPath : this.myLastUsedExamples) {
+				for (Path curPath : this.myExamples) {
 					if (this.myMakeLinks) {
 						Helpers.linkDirectory(project, curPath, new Path("/"));
 					} else {
@@ -157,17 +157,17 @@ private void loadLastUsedExamples() {
 				.getGlobalString(Const.KEY_LAST_USED_EXAMPLES, Defaults.getPrivateLibraryPath()).split("\n");
 
 		for (String curpath : examplePathNames) {
-			this.myLastUsedExamples.add(new Path(curpath));
+			this.myExamples.add(new Path(curpath));
 		}
 	}
 
-	public ArrayList<Path> getLastUsedExamples() {
-		return this.myLastUsedExamples;
+	public ArrayList<Path> getExamples() {
+		return this.myExamples;
 	}
 
 	private void saveLastUsedExamples() {
-		if (this.myLastUsedExamples != null) {
-			String toStore = StringUtils.join(this.myLastUsedExamples, "\n"); //$NON-NLS-1$
+		if (this.myExamples != null) {
+			String toStore = StringUtils.join(this.myExamples, "\n"); //$NON-NLS-1$
 			InstancePreferences.setGlobalValue(Const.KEY_LAST_USED_EXAMPLES, toStore);
 		} else {
 			InstancePreferences.setGlobalValue(Const.KEY_LAST_USED_EXAMPLES, Const.EMPTY_STRING);

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

@@ -7,6 +7,7 @@
 import org.eclipse.cdt.core.envvar.IEnvironmentVariableManager;
 import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
 
+import io.sloeber.common.Common;
 import io.sloeber.common.Const;
 
 public class CompileOptions {
@@ -115,7 +116,7 @@ public void save(ICConfigurationDescription configuration) {
 			contribEnv.addVariable(var, configuration);
 		} else {
 			var = new EnvironmentVariable(Const.ENV_KEY_JANTJE_SIZE_SWITCH, "${" //$NON-NLS-1$
-					+ Const.get_ENV_KEY_RECIPE(Const.ACTION_SIZE) + "}"); //$NON-NLS-1$
+					+ Common.get_ENV_KEY_RECIPE(Const.ACTION_SIZE) + "}"); //$NON-NLS-1$
 			contribEnv.addVariable(var, configuration);
 		}
 		var = new EnvironmentVariable(Const.ENV_KEY_JANTJE_ADDITIONAL_COMPILE_OPTIONS,

io.sloeber.core/src/io/sloeber/core/tools/Helpers.java

@@ -1371,15 +1371,4 @@ public static void linkDirectory(IProject project, IPath source, IPath target) {
 
 	}
 
-	/**
-	 * given a action and a tool return the environment key that matches it's
-	 * recipe
-	 *
-	 * @param action
-	 * @return he environment variable key to find the recipe
-	 */
-	private static String get_ENV_KEY_RECIPE(String tool, String action) {
-		return ERASE_START + "TOOLS" + DOT + tool.toUpperCase() + DOT + action.toUpperCase() + DOT + ENV_PATTERN; //$NON-NLS-1$
-	}
-
 }