Rename io.sloeber subpackages #635

wimjongman · wimjongman · commit d05886809775 · 2017-01-18T23:22:53.000+01:00
io.sloeber.core
diff --git a/io.sloeber.core/.project b/io.sloeber.core/.project
@@ -3,7 +3,7 @@
 	<name>io.sloeber.core</name>
 	<comment></comment>
 	<projects>
-		<project>io.sloeber.common</project>
+		<project>io.sloeber.core.common</project>
 		<project>io.sloeber.avreclipse.core</project>
 		<project>io.sloeber.avreclipse.core.managedbuildsystem</project>
 		<project>io.sloeber.avreclipse.ui</project>
diff --git a/io.sloeber.core/META-INF/MANIFEST.MF b/io.sloeber.core/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 4.0.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Jan Baeyens
 Bundle-ActivationPolicy: lazy
-Import-Package: io.sloeber.common,
+Import-Package: io.sloeber.core.common,
  org.eclipse.cdt.core,
  org.eclipse.cdt.core.envvar,
  org.eclipse.cdt.core.language.settings.providers,
@@ -36,5 +36,5 @@ Require-Bundle: org.eclipse.cdt.managedbuilder.core,
  org.junit,
  org.eclipse.ui.console,
  org.eclipse.ui.workbench
-Export-Package: io.sloeber.common,
- io.sloeber.core.api
+Export-Package: io.sloeber.core.api,
+ io.sloeber.core.common
diff --git a/io.sloeber.core/src/cc/arduino/packages/discoverers/NetworkDiscovery.java b/io.sloeber.core/src/cc/arduino/packages/discoverers/NetworkDiscovery.java
@@ -44,7 +44,7 @@
 import javax.jmdns.ServiceListener;
 import javax.jmdns.impl.DNSTaskStarter;
 
-import io.sloeber.common.Const;
+import io.sloeber.core.common.Const;
 
 public class NetworkDiscovery implements ServiceListener {
 
diff --git a/io.sloeber.core/src/io/sloeber/core/Activator.java b/io.sloeber.core/src/io/sloeber/core/Activator.java
@@ -30,10 +30,10 @@
 import org.osgi.service.prefs.BackingStoreException;
 
 import cc.arduino.packages.discoverers.NetworkDiscovery;
-import io.sloeber.common.Common;
-import io.sloeber.common.ConfigurationPreferences;
-import io.sloeber.common.Const;
-import io.sloeber.common.InstancePreferences;
+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;
 import io.sloeber.core.managers.Manager;
diff --git a/io.sloeber.core/src/io/sloeber/core/api/BoardDescriptor.java b/io.sloeber.core/src/io/sloeber/core/api/BoardDescriptor.java
@@ -38,10 +38,10 @@
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 
-import io.sloeber.common.Common;
-import io.sloeber.common.Const;
 import io.sloeber.core.Activator;
 import io.sloeber.core.InternalBoardDescriptor;
+import io.sloeber.core.common.Common;
+import io.sloeber.core.common.Const;
 import io.sloeber.core.tools.Helpers;
 import io.sloeber.core.tools.Programmers;
 import io.sloeber.core.tools.ShouldHaveBeenInCDT;
diff --git a/io.sloeber.core/src/io/sloeber/core/api/BoardsManager.java b/io.sloeber.core/src/io/sloeber/core/api/BoardsManager.java
@@ -20,13 +20,13 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 
-import io.sloeber.common.Common;
-import io.sloeber.common.ConfigurationPreferences;
-import io.sloeber.common.Const;
-import io.sloeber.common.InstancePreferences;
 import io.sloeber.core.api.BoardsManager.PlatformTree.IndexFile;
 import io.sloeber.core.api.BoardsManager.PlatformTree.InstallableVersion;
 import io.sloeber.core.api.BoardsManager.PlatformTree.Platform;
+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.managers.ArduinoPlatform;
 import io.sloeber.core.managers.Board;
 import io.sloeber.core.managers.Manager;
diff --git a/io.sloeber.core/src/io/sloeber/core/api/CodeDescriptor.java b/io.sloeber.core/src/io/sloeber/core/api/CodeDescriptor.java
@@ -14,9 +14,9 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 
-import io.sloeber.common.Common;
-import io.sloeber.common.Const;
-import io.sloeber.common.InstancePreferences;
+import io.sloeber.core.common.Common;
+import io.sloeber.core.common.Const;
+import io.sloeber.core.common.InstancePreferences;
 import io.sloeber.core.tools.Helpers;
 import io.sloeber.core.tools.Stream;
 
diff --git a/io.sloeber.core/src/io/sloeber/core/api/CompileOptions.java b/io.sloeber.core/src/io/sloeber/core/api/CompileOptions.java
@@ -7,8 +7,8 @@
 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;
+import io.sloeber.core.common.Common;
+import io.sloeber.core.common.Const;
 
 public class CompileOptions {
 
diff --git a/io.sloeber.core/src/io/sloeber/core/api/Defaults.java b/io.sloeber.core/src/io/sloeber/core/api/Defaults.java
@@ -3,7 +3,7 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 
-import io.sloeber.common.Const;
+import io.sloeber.core.common.Const;
 
 @SuppressWarnings("nls")
 public class Defaults {
diff --git a/io.sloeber.core/src/io/sloeber/core/api/LibraryManager.java b/io.sloeber.core/src/io/sloeber/core/api/LibraryManager.java
@@ -9,7 +9,7 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;
 
-import io.sloeber.common.InstancePreferences;
+import io.sloeber.core.common.InstancePreferences;
 import io.sloeber.core.managers.LibraryIndex;
 import io.sloeber.core.managers.Manager;
 
diff --git a/io.sloeber.core/src/io/sloeber/core/api/Other.java b/io.sloeber.core/src/io/sloeber/core/api/Other.java
@@ -1,6 +1,6 @@
 package io.sloeber.core.api;
 
-import io.sloeber.common.ConfigurationPreferences;
+import io.sloeber.core.common.ConfigurationPreferences;
 
 public class Other {
     public static String getSystemHash() {
diff --git a/io.sloeber.core/src/io/sloeber/core/api/PasswordManager.java b/io.sloeber.core/src/io/sloeber/core/api/PasswordManager.java
@@ -6,8 +6,8 @@
 import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
 import org.eclipse.equinox.security.storage.StorageException;
 
-import io.sloeber.common.Common;
-import io.sloeber.common.Const;
+import io.sloeber.core.common.Common;
+import io.sloeber.core.common.Const;
 import io.sloeber.core.tools.Messages;
 
 public class PasswordManager {
diff --git a/io.sloeber.core/src/io/sloeber/core/api/Serial.java b/io.sloeber.core/src/io/sloeber/core/api/Serial.java
@@ -38,8 +38,8 @@
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceRegistration;
 
-import io.sloeber.common.Common;
-import io.sloeber.common.Const;
+import io.sloeber.core.common.Common;
+import io.sloeber.core.common.Const;
 import jssc.SerialPort;
 import jssc.SerialPortEvent;
 import jssc.SerialPortEventListener;
diff --git a/io.sloeber.core/src/io/sloeber/core/api/Sketch.java b/io.sloeber.core/src/io/sloeber/core/api/Sketch.java
@@ -25,10 +25,10 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.console.MessageConsole;
 
-import io.sloeber.common.Common;
-import io.sloeber.common.Const;
-import io.sloeber.common.IndexHelper;
 import io.sloeber.core.Activator;
+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;
diff --git a/io.sloeber.core/src/io/sloeber/core/common/Common.java b/io.sloeber.core/src/io/sloeber/core/common/Common.java
@@ -1,4 +1,4 @@
-package io.sloeber.common;
+package io.sloeber.core.common;
 
 import java.io.File;
 
diff --git a/io.sloeber.core/src/io/sloeber/core/common/ConfigurationPreferences.java b/io.sloeber.core/src/io/sloeber/core/common/ConfigurationPreferences.java
@@ -1,4 +1,4 @@
-package io.sloeber.common;
+package io.sloeber.core.common;
 
 import java.io.File;
 import java.net.NetworkInterface;
diff --git a/io.sloeber.core/src/io/sloeber/core/common/Const.java b/io.sloeber.core/src/io/sloeber/core/common/Const.java
@@ -1,4 +1,4 @@
-package io.sloeber.common;
+package io.sloeber.core.common;
 
 /**
  * ArduinoConst only contains global strings used in the eclipse plugin.
diff --git a/io.sloeber.core/src/io/sloeber/core/common/Const.java.orig b/io.sloeber.core/src/io/sloeber/core/common/Const.java.orig
@@ -1,4 +1,4 @@
-package io.sloeber.common;
+package io.sloeber.core.common;
 
 /**
  * ArduinoConst only contains global strings used in the eclipse plugin.
diff --git a/io.sloeber.core/src/io/sloeber/core/common/IndexHelper.java b/io.sloeber.core/src/io/sloeber/core/common/IndexHelper.java
@@ -1,4 +1,4 @@
-package io.sloeber.common;
+package io.sloeber.core.common;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/io.sloeber.core/src/io/sloeber/core/common/InstancePreferences.java b/io.sloeber.core/src/io/sloeber/core/common/InstancePreferences.java
@@ -1,4 +1,4 @@
-package io.sloeber.common;
+package io.sloeber.core.common;
 
 import java.io.File;
 
diff --git a/io.sloeber.core/src/io/sloeber/core/common/InstancePreferences.java.orig b/io.sloeber.core/src/io/sloeber/core/common/InstancePreferences.java.orig
@@ -1,4 +1,4 @@
-package io.sloeber.common;
+package io.sloeber.core.common;
 
 import java.io.File;
 import java.util.HashMap;
diff --git a/io.sloeber.core/src/io/sloeber/core/communication/ArduinoSerial.java b/io.sloeber.core/src/io/sloeber/core/communication/ArduinoSerial.java
@@ -8,9 +8,9 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.ui.console.MessageConsoleStream;
 
-import io.sloeber.common.Common;
-import io.sloeber.common.Const;
 import io.sloeber.core.api.Serial;
+import io.sloeber.core.common.Common;
+import io.sloeber.core.common.Const;
 
 public class ArduinoSerial {
 
diff --git a/io.sloeber.core/src/io/sloeber/core/listeners/ConfigurationChangeListener.java b/io.sloeber.core/src/io/sloeber/core/listeners/ConfigurationChangeListener.java
@@ -22,10 +22,10 @@
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.widgets.Display;
 
-import io.sloeber.common.Common;
-import io.sloeber.common.Const;
 import io.sloeber.core.InternalBoardDescriptor;
 import io.sloeber.core.api.BoardDescriptor;
+import io.sloeber.core.common.Common;
+import io.sloeber.core.common.Const;
 import io.sloeber.core.tools.Helpers;
 import io.sloeber.core.tools.Libraries;
 
diff --git a/io.sloeber.core/src/io/sloeber/core/listeners/IndexerListener.java b/io.sloeber.core/src/io/sloeber/core/listeners/IndexerListener.java
@@ -18,8 +18,8 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 
-import io.sloeber.common.Const;
-import io.sloeber.common.InstancePreferences;
+import io.sloeber.core.common.Const;
+import io.sloeber.core.common.InstancePreferences;
 import io.sloeber.core.tools.Libraries;
 
 public class IndexerListener implements IIndexChangeListener, IIndexerStateListener {
diff --git a/io.sloeber.core/src/io/sloeber/core/managers/ArduinoPlatform.java b/io.sloeber.core/src/io/sloeber/core/managers/ArduinoPlatform.java
@@ -27,9 +27,9 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 
-import io.sloeber.common.ConfigurationPreferences;
-import io.sloeber.common.Const;
 import io.sloeber.core.Activator;
+import io.sloeber.core.common.ConfigurationPreferences;
+import io.sloeber.core.common.Const;
 
 public class ArduinoPlatform {
 
diff --git a/io.sloeber.core/src/io/sloeber/core/managers/Library.java b/io.sloeber.core/src/io/sloeber/core/managers/Library.java
@@ -16,8 +16,8 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 
-import io.sloeber.common.ConfigurationPreferences;
 import io.sloeber.core.Activator;
+import io.sloeber.core.common.ConfigurationPreferences;
 
 public class Library implements Comparable<Library> {
 
diff --git a/io.sloeber.core/src/io/sloeber/core/managers/Manager.java b/io.sloeber.core/src/io/sloeber/core/managers/Manager.java
@@ -53,10 +53,10 @@
 
 import com.google.gson.Gson;
 
-import io.sloeber.common.Common;
-import io.sloeber.common.ConfigurationPreferences;
 import io.sloeber.core.Activator;
 import io.sloeber.core.api.Defaults;
+import io.sloeber.core.common.Common;
+import io.sloeber.core.common.ConfigurationPreferences;
 import io.sloeber.core.tools.MyMultiStatus;
 
 public class Manager {
diff --git a/io.sloeber.core/src/io/sloeber/core/managers/Tool.java b/io.sloeber.core/src/io/sloeber/core/managers/Tool.java
@@ -15,9 +15,9 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 
-import io.sloeber.common.ConfigurationPreferences;
-import io.sloeber.common.Const;
 import io.sloeber.core.Activator;
+import io.sloeber.core.common.ConfigurationPreferences;
+import io.sloeber.core.common.Const;
 
 public class Tool {
 
diff --git a/io.sloeber.core/src/io/sloeber/core/natures/ArduinoNature.java b/io.sloeber.core/src/io/sloeber/core/natures/ArduinoNature.java
@@ -7,7 +7,7 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 
-import io.sloeber.common.Const;
+import io.sloeber.core.common.Const;
 
 public class ArduinoNature implements IProjectNature {
     public static final String NATURE_ID = Const.ARDUINO_NATURE_ID;
diff --git a/io.sloeber.core/src/io/sloeber/core/toolchain/ArchiveNameProvider.java b/io.sloeber.core/src/io/sloeber/core/toolchain/ArchiveNameProvider.java
@@ -7,8 +7,8 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 
-import io.sloeber.common.Common;
-import io.sloeber.common.Const;
+import io.sloeber.core.common.Common;
+import io.sloeber.core.common.Const;
 import io.sloeber.core.tools.Helpers;
 
 public class ArchiveNameProvider implements IManagedOutputNameProviderJaba {
diff --git a/io.sloeber.core/src/io/sloeber/core/toolchain/ArduinoDependencyCalculatorCommands.java b/io.sloeber.core/src/io/sloeber/core/toolchain/ArduinoDependencyCalculatorCommands.java
@@ -10,8 +10,8 @@
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IPath;
 
-import io.sloeber.common.Common;
-import io.sloeber.common.Const;
+import io.sloeber.core.common.Common;
+import io.sloeber.core.common.Const;
 import io.sloeber.core.tools.Helpers;
 
 public class ArduinoDependencyCalculatorCommands extends DefaultGCCDependencyCalculator2Commands {
diff --git a/io.sloeber.core/src/io/sloeber/core/toolchain/ArduinoGnuMakefileGenerator.java b/io.sloeber.core/src/io/sloeber/core/toolchain/ArduinoGnuMakefileGenerator.java
@@ -84,8 +84,8 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.SubProgressMonitor;
 
-import io.sloeber.common.Common;
-import io.sloeber.common.Const;
+import io.sloeber.core.common.Common;
+import io.sloeber.core.common.Const;
 
 /**
  * This is a specialized makefile generator that takes advantage of the
diff --git a/io.sloeber.core/src/io/sloeber/core/toolchain/ArduinoLanguageProvider.java b/io.sloeber.core/src/io/sloeber/core/toolchain/ArduinoLanguageProvider.java
@@ -19,8 +19,8 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 
-import io.sloeber.common.Common;
-import io.sloeber.common.Const;
+import io.sloeber.core.common.Common;
+import io.sloeber.core.common.Const;
 
 @SuppressWarnings("nls")
 public class ArduinoLanguageProvider extends ToolchainBuiltinSpecsDetector
diff --git a/io.sloeber.core/src/io/sloeber/core/toolchain/ArduinoManagedBuildGnuToolInfo.java b/io.sloeber.core/src/io/sloeber/core/toolchain/ArduinoManagedBuildGnuToolInfo.java
@@ -38,8 +38,8 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 
-import io.sloeber.common.Common;
-import io.sloeber.common.Const;
+import io.sloeber.core.common.Common;
+import io.sloeber.core.common.Const;
 import io.sloeber.core.toolchain.ArduinoGnuMakefileGenerator.ToolInfoHolder;
 
 /**
diff --git a/io.sloeber.core/src/io/sloeber/core/toolchain/LinkNameProvider.java b/io.sloeber.core/src/io/sloeber/core/toolchain/LinkNameProvider.java
@@ -7,8 +7,8 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 
-import io.sloeber.common.Common;
-import io.sloeber.common.Const;
+import io.sloeber.core.common.Common;
+import io.sloeber.core.common.Const;
 import io.sloeber.core.tools.Helpers;
 
 public class LinkNameProvider implements IManagedOutputNameProviderJaba {
diff --git a/io.sloeber.core/src/io/sloeber/core/toolchain/hexNameProvider.java b/io.sloeber.core/src/io/sloeber/core/toolchain/hexNameProvider.java
@@ -8,8 +8,8 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 
-import io.sloeber.common.Common;
-import io.sloeber.common.Const;
+import io.sloeber.core.common.Common;
+import io.sloeber.core.common.Const;
 
 public class hexNameProvider implements IManagedOutputNameProviderJaba {
 
diff --git a/io.sloeber.core/src/io/sloeber/core/tools/ExternalCommandLauncher.java b/io.sloeber.core/src/io/sloeber/core/tools/ExternalCommandLauncher.java
@@ -35,8 +35,8 @@
 import org.eclipse.ui.console.MessageConsole;
 import org.eclipse.ui.console.MessageConsoleStream;
 
-import io.sloeber.common.Common;
-import io.sloeber.common.Const;
+import io.sloeber.core.common.Common;
+import io.sloeber.core.common.Const;
 
 /**
  * Launch external programs.
diff --git a/io.sloeber.core/src/io/sloeber/core/tools/Helpers.java b/io.sloeber.core/src/io/sloeber/core/tools/Helpers.java
diff --git a/io.sloeber.core/src/io/sloeber/core/tools/Libraries.java b/io.sloeber.core/src/io/sloeber/core/tools/Libraries.java
diff --git a/io.sloeber.core/src/io/sloeber/core/tools/Stream.java b/io.sloeber.core/src/io/sloeber/core/tools/Stream.java
diff --git a/io.sloeber.core/src/io/sloeber/core/tools/TxtFile.java b/io.sloeber.core/src/io/sloeber/core/tools/TxtFile.java
diff --git a/io.sloeber.core/src/io/sloeber/core/tools/uploaders/GenericLocalUploader.java b/io.sloeber.core/src/io/sloeber/core/tools/uploaders/GenericLocalUploader.java
diff --git a/io.sloeber.core/src/io/sloeber/core/tools/uploaders/SSHUpload.java b/io.sloeber.core/src/io/sloeber/core/tools/uploaders/SSHUpload.java
diff --git a/io.sloeber.core/src/io/sloeber/core/tools/uploaders/UploadSketchWrapper.java b/io.sloeber.core/src/io/sloeber/core/tools/uploaders/UploadSketchWrapper.java
diff --git a/io.sloeber.core/src/io/sloeber/core/tools/uploaders/arduinoUploader.java b/io.sloeber.core/src/io/sloeber/core/tools/uploaders/arduinoUploader.java
diff --git a/io.sloeber.feature/.project b/io.sloeber.feature/.project
diff --git a/io.sloeber.updatesite/.project b/io.sloeber.updatesite/.project
