Refactor rename/move to get some controll over the code

Author: jan

io.sloeber.autoBuild/build.properties

@@ -10,6 +10,5 @@ bin.includes = .,\
                icons/
 jars.compile.order = .
 src.includes = schema/,\
-               src/,\
                template/,\
                icons/

io.sloeber.autoBuild/plugin.xml

@@ -2072,7 +2072,7 @@
       <extension
             point="org.eclipse.cdt.core.LanguageSettingsProvider">
          <provider
-               class="io.sloeber.autoBuild.internal.AutoBuildLanguageSettingsProvider"
+               class="io.sloeber.autoBuild.extensionPoint.providers.AutoBuildLanguageSettingsProvider"
                id="io.sloeber.autoBuild.AutoBuildLanguageSettingsProvider"
                name="%autoBuildLanguageStingsProvider"
                prefer-non-shared="false">

io.sloeber.autoBuild/src/io/sloeber/autoBuild/internal/AutoBuildLanguageSettingsProvider.java renamed to io.sloeber.autoBuild/src/io/sloeber/autoBuild/extensionPoint/providers/AutoBuildLanguageSettingsProvider.java

@@ -12,7 +12,7 @@
  *     Andrew Gvozdev - initial API and implementation
  *******************************************************************************/
 
-package io.sloeber.autoBuild.internal;
+package io.sloeber.autoBuild.extensionPoint.providers;
 
 import static io.sloeber.autoBuild.helpers.api.AutoBuildConstants.*;
 
@@ -67,14 +67,15 @@
 import io.sloeber.autoBuild.api.IAutoBuildConfigurationDescription;
 import io.sloeber.autoBuild.core.Activator;
 import io.sloeber.autoBuild.core.Messages;
-import io.sloeber.autoBuild.extensionPoint.providers.InternalBuildRunner;
+import io.sloeber.autoBuild.internal.AutoBuildRunnerHelper;
 import io.sloeber.autoBuild.schema.api.IOption;
 
 /**
  * Implementation of language settings provider for autoBuild.
  */
 public class AutoBuildLanguageSettingsProvider extends AbstractExecutableExtensionBase
 		implements ILanguageSettingsBroadcastingProvider {
+	private static final boolean LOG_TO_STD_OUT =false;
 
 	private static final String SCANNER_DISCOVERY_CONSOLE = "io.Sloeber.autoBuild.ScannerDiscoveryConsole"; //$NON-NLS-1$
 	private static final String SCANNER_DISCOVERY_GLOBAL_CONSOLE = "io.Sloeber.autoBuild.ScannerDiscoveryGlobalConsole"; //$NON-NLS-1$
@@ -332,8 +333,9 @@ private List<ICLanguageSettingEntry> runForLanguage(String currentLanguageId, St
 				buildRunnerHelper.greeting(MessageFormat.format(
 						Messages.RunningScannerDiscovery , getName())
 				);
-
-				System.out.println(currentCommandResolved);
+				if(LOG_TO_STD_OUT) {
+					System.out.println(currentCommandResolved);
+				}
 				InternalBuildRunner.launchCommand(currentCommandResolved, autoConf,
 						 monitor,  buildRunnerHelper);
 
@@ -410,7 +412,9 @@ public void startup(ICConfigurationDescription cfgDescription, IWorkingDirectory
 
 		@Override
 		public boolean processLine(String line) {
-			System.out.println(line);
+			if(LOG_TO_STD_OUT) {
+				System.out.println(line);
+			}
 
 			for (Entry<Pattern, outputTypes> curMatcher : outputMatchers.entrySet()) {
 				Pattern pat = curMatcher.getKey();

io.sloeber.core/META-INF/MANIFEST.MF

@@ -32,12 +32,7 @@ Require-Bundle:
 Export-Package: cc.arduino.packages;x-internal:=true,
  cc.arduino.packages.discoverers;x-internal:=true,
  cc.arduino.packages.ssh;x-internal:=true,
- com.jcraft.jsch,
- com.jcraft.jsch.jce;uses:="com.jcraft.jsch",
- com.jcraft.jsch.jcraft;uses:="com.jcraft.jsch",
- com.jcraft.jsch.jgss;uses:="com.jcraft.jsch",
- io.sloeber.core;x-friends:="io.sloeber.tests",
- io.sloeber.core.Gson;uses:="com.google.gson,io.sloeber.core.api",
+ io.sloeber.arduinoFramework.api,
  io.sloeber.core.api;
   uses:="io.sloeber.core.common,
    org.eclipse.debug.core.model,
@@ -48,20 +43,12 @@ Export-Package: cc.arduino.packages;x-internal:=true,
    org.eclipse.cdt.core.settings.model,
    org.eclipse.core.resources,
    io.sloeber.core.api.Json",
- io.sloeber.core.api.Json;uses:="org.eclipse.core.runtime,com.google.gson,io.sloeber.core.api",
- io.sloeber.core.builder;x-internal:=true,
  io.sloeber.core.common;x-friends:="io.sloeber.tests",
  io.sloeber.core.communication;x-internal:=true,
  io.sloeber.core.core;x-internal:=true,
- io.sloeber.core.eclipseIntegrations;uses:="org.eclipse.core.variables",
- io.sloeber.core.internal;x-friends:="io.sloeber.tests",
- io.sloeber.core.listeners;x-internal:=true,
- io.sloeber.core.managers;x-internal:=true,
+ io.sloeber.core.internal,
  io.sloeber.core.natures;x-internal:=true,
  io.sloeber.core.templates;x-internal:=true,
- io.sloeber.core.toolchain;x-internal:=true,
- io.sloeber.core.tools;x-friends:="io.sloeber.tests",
- io.sloeber.core.tools.uploaders;x-internal:=true,
  io.sloeber.core.txt;x-friends:="io.sloeber.tests"
 Import-Package: io.sloeber.autoBuild.schema.api,
  org.apache.commons.io;version="2.13.0",

io.sloeber.core/src/io/sloeber/core/api/Json/ArduinoInstallable.java renamed to io.sloeber.core/src/io/sloeber/arduinoFramework/api/ArduinoInstallable.java

@@ -1,4 +1,4 @@
-package io.sloeber.core.api.Json;
+package io.sloeber.arduinoFramework.api;
 
 import org.eclipse.core.runtime.IPath;
 

io.sloeber.core/src/io/sloeber/core/api/BoardDescription.java renamed to io.sloeber.core/src/io/sloeber/arduinoFramework/api/BoardDescription.java

@@ -1,4 +1,4 @@
-package io.sloeber.core.api;
+package io.sloeber.arduinoFramework.api;
 
 import static io.sloeber.core.Messages.*;
 import static io.sloeber.core.api.Common.*;
@@ -26,11 +26,14 @@
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 
+import io.sloeber.arduinoFramework.internal.ArduinoPlatformTooldDependency;
 import io.sloeber.autoBuild.api.IAutoBuildConfigurationDescription;
 import io.sloeber.autoBuild.helpers.api.KeyValueTree;
-import io.sloeber.core.api.Json.ArduinoPlatform;
-import io.sloeber.core.api.Json.ArduinoPlatformTooldDependency;
-import io.sloeber.core.api.Json.ArduinoPlatformVersion;
+import io.sloeber.core.api.Common;
+import io.sloeber.core.api.ConfigurationPreferences;
+import io.sloeber.core.api.Const;
+import io.sloeber.core.api.Preferences;
+import io.sloeber.core.api.VersionNumber;
 import io.sloeber.core.tools.KeyValue;
 import io.sloeber.core.txt.BoardTxtFile;
 import io.sloeber.core.txt.PlatformTxtFile;
@@ -54,9 +57,9 @@ public class BoardDescription {
     private String myBoardsVariant = null;
     private String myUploadTool = null;
 
-    private ArduinoPlatformVersion myReferencedPlatformVariant = null;
-    private ArduinoPlatformVersion myReferencedPlatformCore = null;
-    private ArduinoPlatformVersion myReferencedPlatformUpload = null;
+    private IArduinoPlatformVersion myReferencedPlatformVariant = null;
+    private IArduinoPlatformVersion myReferencedPlatformCore = null;
+    private IArduinoPlatformVersion myReferencedPlatformUpload = null;
 
     private boolean isDirty = true;
 
@@ -281,7 +284,7 @@ public static List<BoardDescription> makeBoardDescriptors(File boardFile) {
      * @param options
      *            if null default options are taken
      */
-    BoardDescription(File boardsFile, String boardID, Map<String, String> options) {
+    public BoardDescription(File boardsFile, String boardID, Map<String, String> options) {
         myBoardID = boardID;
         myUserSelectedBoardsTxtFile = boardsFile;
         mySloeberBoardTxtFile = new BoardTxtFile(resolvePathEnvironmentString(myUserSelectedBoardsTxtFile));
@@ -295,9 +298,9 @@ public BoardDescription() {
         myUserSelectedBoardsTxtFile = new File(myStorageNode.get(KEY_LAST_USED_BOARDS_FILE, EMPTY));
         if (!myUserSelectedBoardsTxtFile.exists()) {
 
-            ArduinoPlatformVersion platform = BoardsManager.getNewestInstalledPlatform(VENDOR_ARDUINO, AVR);
+            IArduinoPlatformVersion platform = BoardsManager.getNewestInstalledPlatform(VENDOR_ARDUINO, AVR);
             if (platform == null) {
-                List<ArduinoPlatformVersion> platforms = BoardsManager.getInstalledPlatforms();
+                List<IArduinoPlatformVersion> platforms = BoardsManager.getInstalledPlatforms();
                 //If you crash on the next line no platform have been installed
                 platform = platforms.get(0);
             }
@@ -644,11 +647,11 @@ public IPath getreferencedCoreHardwarePath() {
      */
     public IPath getArduinoPlatformPath() {
         updateWhenDirty();
-        ArduinoPlatform platform = BoardsManager.getPlatform(VENDOR_ARDUINO, getArchitecture());
+        IArduinoPlatform platform = BoardsManager.getPlatform(VENDOR_ARDUINO, getArchitecture());
         if (platform == null) {
             return null;
         }
-        ArduinoPlatformVersion platformVersion = platform.getNewestInstalled();
+        IArduinoPlatformVersion platformVersion = platform.getNewestInstalled();
         if (platformVersion == null) {
             return null;
         }
@@ -938,14 +941,14 @@ private Map<String, String> getEnVarPlatformInfo() {
         }
 
         IPath referencingPlatformPath = getreferencingPlatformPath();
-        ArduinoPlatformVersion referencingPlatform = BoardsManager.getPlatform(referencingPlatformPath);
+        IArduinoPlatformVersion referencingPlatform = BoardsManager.getPlatform(referencingPlatformPath);
 
         if (referencingPlatform == null) {
             // This is the case for private hardware
             //there is no need to specify tool path as they do not use them
             return ret;
         }
-        ArduinoPlatformVersion latestArduinoPlatform = BoardsManager.getNewestInstalledPlatform(Const.VENDOR_ARDUINO,
+        IArduinoPlatformVersion latestArduinoPlatform = BoardsManager.getNewestInstalledPlatform(Const.VENDOR_ARDUINO,
                 referencingPlatform.getArchitecture());
         if (latestArduinoPlatform != null) {
             ret.putAll(getEnvVarPlatformFileTools(latestArduinoPlatform));
@@ -978,7 +981,7 @@ private Map<String, String> getEnVarPlatformInfo() {
      * @param platformVersion
      * @return environment variables pointing to the tools used by the platform
      */
-    private static Map<String, String> getEnvVarPlatformFileTools(ArduinoPlatformVersion platformVersion) {
+    private static Map<String, String> getEnvVarPlatformFileTools(IArduinoPlatformVersion platformVersion) {
         HashMap<String, String> vars = new HashMap<>();
         for (ArduinoPlatformTooldDependency tool : platformVersion.getToolsDependencies()) {
             IPath installPath = tool.getInstallPath();