#585 gone a bit haywire with refactoring

Author: jantje

io.sloeber.core/src/io/sloeber/core/Activator.java

@@ -45,7 +45,6 @@
 import io.sloeber.core.api.PackageManager;
 import io.sloeber.core.common.Common;
 import io.sloeber.core.common.ConfigurationPreferences;
-import io.sloeber.core.common.Const;
 import io.sloeber.core.common.InstancePreferences;
 import io.sloeber.core.listeners.ConfigurationChangeListener;
 import io.sloeber.core.listeners.IndexerListener;
@@ -60,8 +59,7 @@
  */
 @SuppressWarnings({ "nls" })
 public class Activator extends Plugin {
-    // preference nodes
-    public static final String NODE_ARDUINO = "io.sloeber.arduino";
+
     // TOFIX I think the fix below for unix users is no longer needed and we no
     // longer use the rxtx dll
     private static final String ENV_KEY_GNU_SERIAL_PORTS = "gnu.io.rxtx.SerialPorts";
@@ -124,15 +122,15 @@ private static void testKnownIssues() {
             if (!installFile.canWrite()) {
                 errorString += addString + "The folder " + installPath.toString()
                         + " exists but Sloeber does not have write access to it.\n";
-                errorString += "Alternatively use the environment var " + Const.SLOEBER_HOME + ".";
+                errorString += "Alternatively use the environment var " + SLOEBER_HOME + ".";
                 addString = "\nand\n";
             }
         } else {
             if (!installFile.getParentFile().canWrite()) {
                 errorString += addString + "Sloeber does not have write access to "
                         + installFile.getParentFile().toString() + " and therefore can not create the folder "
                         + installPath.toString();
-                errorString += "\nAlternatively use the environment var " + Const.SLOEBER_HOME + ".";
+                errorString += "\nAlternatively use the environment var " + SLOEBER_HOME + ".";
                 addString = "\nand\n";
             }
         }
@@ -143,7 +141,7 @@ private static void testKnownIssues() {
             errorString += "Your current path: " + installPath.toString();
             errorString += " is too long and the plugin will no longer function correctly for all boards.\n";
             errorString += "Please visit issue #705 for details. https://github.com/Sloeber/arduino-eclipse-plugin/issues/705\n";
-            errorString += "Alternatively use the environment var " + Const.SLOEBER_HOME + ".";
+            errorString += "Alternatively use the environment var " + SLOEBER_HOME + ".";
             addString = "\nand\n";
         }
         if (installPath.toString().contains(" ")) {

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

@@ -22,7 +22,6 @@
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 
-import io.sloeber.core.Activator;
 import io.sloeber.core.common.Common;
 import io.sloeber.core.common.ConfigurationPreferences;
 import io.sloeber.core.managers.ArduinoPlatform;
@@ -61,7 +60,6 @@ public class BoardDescription {
     private static final String ENV_KEY_REFERENCED_UPLOAD_PLATFORM_PATH = REFERENCED + DOT + UPLOAD + PATH;
 
     // preference nodes
-    private static final String NODE_ARDUINO = Activator.NODE_ARDUINO;
     private static final IEclipsePreferences myStorageNode = InstanceScope.INSTANCE.getNode(NODE_ARDUINO);
     private static final TxtFile pluginPreProcessingPlatformTxt = new TxtFile(
             ConfigurationPreferences.getPreProcessingPlatformFile());

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

@@ -9,6 +9,7 @@
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
+
 @SuppressWarnings("unused")
 public class LaunchConfiguration implements ILaunchConfigurationDelegate {
 
@@ -49,29 +50,29 @@ public class LaunchConfiguration implements ILaunchConfigurationDelegate {
 
     @Override
     public void launch(ILaunchConfiguration launchConfig, String launchMode, ILaunch launchHandle,
-	    IProgressMonitor launchMonitor) throws CoreException {
+            IProgressMonitor launchMonitor) throws CoreException {
 
-	this.config = launchConfig;
-	this.mode = launchMode;
-	this.launch = launchHandle;
-	this.monitor = launchMonitor;
+        this.config = launchConfig;
+        this.mode = launchMode;
+        this.launch = launchHandle;
+        this.monitor = launchMonitor;
 
-	// Get data from config
-	loadSettingsFromConfiguration();
+        // Get data from config
+        loadSettingsFromConfiguration();
 
-	if (this.project != null) {
-	    // Delegate launching the project
-	    Sketch.upload(this.project);
-	}
+        if (this.project != null) {
+            // Delegate launching the project
+            Sketch.syncUpload(this.project);
+        }
     }
 
     private void loadSettingsFromConfiguration() {
-	try {
-	    String projectName = this.config.getAttribute(ATTR_PROJECT, ""); //$NON-NLS-1$
-	    this.project = findProject(projectName);
-	} catch (CoreException e) {
-	    // Stupid exception...
-	}
+        try {
+            String projectName = this.config.getAttribute(ATTR_PROJECT, ""); //$NON-NLS-1$
+            this.project = findProject(projectName);
+        } catch (CoreException e) {
+            // Stupid exception...
+        }
     }
 
     /**
@@ -81,12 +82,12 @@ private void loadSettingsFromConfiguration() {
      * @return the project handle if a project was found
      */
     public static IProject findProject(String name) {
-	if (StringUtils.isNotBlank(name) && new Path(name).isValidPath(name)) {
-	    IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-	    if (p.getLocation() != null)
-		return p;
-	}
-	return null;
+        if (StringUtils.isNotBlank(name) && new Path(name).isValidPath(name)) {
+            IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
+            if (p.getLocation() != null)
+                return p;
+        }
+        return null;
     }
 
 }

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

@@ -1,74 +1,40 @@
 package io.sloeber.core.api;
 
-import java.net.URL;
+import static io.sloeber.core.common.Const.*;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeMap;
 
 import org.eclipse.cdt.core.model.CoreModel;
-import org.eclipse.cdt.core.model.ICModelMarker;
 import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
 import org.eclipse.cdt.core.settings.model.ICProjectDescription;
-import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.ui.console.MessageConsole;
-import org.osgi.service.prefs.BackingStoreException;
 
-import io.sloeber.core.Activator;
 import io.sloeber.core.Messages;
-import io.sloeber.core.common.Common;
-import io.sloeber.core.common.Const;
 import io.sloeber.core.common.IndexHelper;
 import io.sloeber.core.tools.Helpers;
 import io.sloeber.core.tools.Libraries;
-import io.sloeber.core.tools.uploaders.UploadSketchWrapper;
 
-@SuppressWarnings("unused")
 public class Sketch {
-    // preference nodes
-    public static final String NODE_ARDUINO = Activator.NODE_ARDUINO;
 
     public static IStatus isUploadableProject(IProject project) {
         try {
-            if (project == null || !project.hasNature(Const.ARDUINO_NATURE_ID)) {
-                return new Status(IStatus.ERROR, Const.CORE_PLUGIN_ID, Messages.Upload_no_arduino_sketch, null);
+            if (project == null || !project.hasNature(ARDUINO_NATURE_ID)) {
+                return new Status(IStatus.ERROR, CORE_PLUGIN_ID, Messages.Upload_no_arduino_sketch, null);
             }
         } catch (CoreException e) {
-            return new Status(IStatus.ERROR, Const.CORE_PLUGIN_ID, Messages.Upload_Project_nature_unaccesible, e);
+            return new Status(IStatus.ERROR, CORE_PLUGIN_ID, Messages.Upload_Project_nature_unaccesible, e);
         }
         return Status.OK_STATUS;
     }
 
-    /**
-     * Asynchronous upload of the sketch. The upload status has to be followed in
-     * the GUI
-     *
-     * @param project
-     *
-     */
-    public static Job asyncUpload(IProject project) {
-        IStatus ret = isUploadableProject(project);
-        if (!ret.isOK()) {
-            Common.log(ret);
-            return null;
-        }
-
-        return UploadSketchWrapper.upload(project,
-                CoreModel.getDefault().getProjectDescription(project).getActiveConfiguration());
 
-    }
 
     /**
      * Synchronous upload of the sketch returning the status.
@@ -77,104 +43,13 @@ public static Job asyncUpload(IProject project) {
      * @return the status of the upload. Status.OK means upload is OK
      */
     public static IStatus syncUpload(IProject project) {
+
         IStatus ret = isUploadableProject(project);
         if (!ret.isOK()) {
             return ret;
         }
-        Job upLoadJob = UploadSketchWrapper.upload(project,
-                CoreModel.getDefault().getProjectDescription(project).getActiveConfiguration());
-
-        if (upLoadJob == null)
-            return new Status(IStatus.ERROR, Const.CORE_PLUGIN_ID, Messages.Upload_failed, null);
-        try {
-            upLoadJob.join();
-            return upLoadJob.getResult();
-        } catch (InterruptedException e) {
-            // not sure if this is needed
-            return new Status(IStatus.ERROR, Const.CORE_PLUGIN_ID, Messages.Upload_failed, e);
-        }
-    }
-
-    /**
-     * Synchronous upload of the sketch with the errors shown in the gui.
-     *
-     * @param project
-     * @return the status of the upload. true means upload is OK
-     */
-    public static boolean upload(IProject project) {
-        IStatus ret = syncUpload(project);
-        if (!ret.isOK()) {
-            Common.log(ret);
-        }
-
-        return ret.isOK();
-    }
-
-    /**
-     * Verifies a project. Builds the active configuration If the build fails
-     * returns false else tru
-     *
-     * @param project
-     * @return
-     */
-    public static boolean verify(IProject project, IProgressMonitor monitor) {
-        MessageConsole theconsole = Helpers.findConsole("CDT Build Console (" + project.getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
-        if (theconsole != null) {
-            theconsole.activate();
-        }
-        try {
-            project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, monitor);
-
-            Job job = new Job("Start build Activator") { //$NON-NLS-1$
-                @Override
-                protected IStatus run(IProgressMonitor _monitor) {
-                    try {
-                        String buildflag = "FbStatus"; //$NON-NLS-1$
-                        char[] uri = { 'h', 't', 't', 'p', ':', '/', '/', 'b', 'a', 'e', 'y', 'e', 'n', 's', '.', 'i',
-                                't', '/', 'e', 'c', 'l', 'i', 'p', 's', 'e', '/', 'd', 'o', 'w', 'n', 'l', 'o', 'a',
-                                'd', '/', 'b', 'u', 'i', 'l', 'd', 'S', 't', 'a', 'r', 't', '.', 'h', 't', 'm', 'l',
-                                '?', 'b', '=' };
-                        IEclipsePreferences myScope = InstanceScope.INSTANCE.getNode(NODE_ARDUINO);
-                        int curFsiStatus = myScope.getInt(buildflag, 0) + 1;
-                        myScope.putInt(buildflag, curFsiStatus);
-                        try {
-                            myScope.flush();
-                        } catch (BackingStoreException e) {
-                            // this should not happen
-                        }
-                        URL pluginStartInitiator = new URL(new String(uri) + Integer.toString(curFsiStatus));
-                        pluginStartInitiator.getContent();
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    return Status.OK_STATUS;
-                }
-            };
-            job.setPriority(Job.DECORATE);
-            job.schedule();
-            return isBuildSuccessFull(project);
-        } catch (CoreException e) {
-            // don't care about the error; the only thing that matters is: the
-            // build failed
-            return true;
-        }
-    }
-
-    /**
-     * Checks if build completed successfully.
-     *
-     * @return true iff project was built successfully last time.
-     * @throws CoreException
-     *             if current project does not exist or is not open.
-     */
-    private static boolean isBuildSuccessFull(IProject project) throws CoreException {
-        IMarker[] markers = project.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE);
-        for (IMarker marker : markers) {
-            if (marker.getAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO) == IMarker.SEVERITY_ERROR) {
-                return false;
-            }
-        }
-        return true;
+        SloeberProject sProject = SloeberProject.getSloeberProject(project, true);
+        return sProject.upload();
     }
 
     /**
@@ -205,7 +80,7 @@ public static void reAttachLibrariesToProject(IProject iProject) {
 
     public static boolean isSketch(IProject proj) {
         try {
-            return proj.hasNature(Const.ARDUINO_NATURE_ID);
+            return proj.hasNature(ARDUINO_NATURE_ID);
         } catch (CoreException e) {
             // ignore
             e.printStackTrace();
@@ -221,19 +96,12 @@ public static boolean removeLibrariesFromProject(IProject project, ICProjectDesc
 
     public static boolean addLibrariesToProject(IProject project, ICConfigurationDescription confDesc,
             Set<String> libraries) {
-        Map<String, List<IPath>> foldersToChange = Libraries.addLibrariesToProject(project, confDesc,
-                libraries);
+        Map<String, List<IPath>> foldersToChange = Libraries.addLibrariesToProject(project, confDesc, libraries);
         return Libraries.adjustProjectDescription(confDesc, foldersToChange);
     }
 
-    public static Map<String, IPath> getAllAvailableLibraries(IProject project) {
-        ICProjectDescription prjDesc = CoreModel.getDefault().getProjectDescription(project);
-        if (prjDesc != null) {
-            return Libraries.getAllInstalledLibraries(prjDesc.getActiveConfiguration());
-        }
-        Common.log(new Status(IStatus.WARNING, Const.CORE_PLUGIN_ID,
-                "Is the selected project a C/Cpp project? " + project.getName(), null)); //$NON-NLS-1$
-        return new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+    public static Map<String, IPath> getAllAvailableLibraries(ICConfigurationDescription confDesc) {
+        return Libraries.getAllInstalledLibraries(confDesc);
     }
 
     public static Set<String> getAllImportedLibraries(IProject project) {
@@ -263,8 +131,7 @@ public static void addCodeFolder(IProject project, Path path) throws CoreExcepti
             }
         }
         if (projDescNeedsSaving) {
-            coreModel.getProjectDescriptionManager().setProjectDescription(project, projectDescription,
-                    true, null);
+            coreModel.getProjectDescriptionManager().setProjectDescription(project, projectDescription, true, null);
         }
     }