From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Thu, 26 Sep 2019 20:21:06 +0000 (+0200)
Subject: Removed debug sysouts to make the plugin "silent"
X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=fdca28097a0721d6145b244b18cd62545ef5daa6;p=Mograsim.git

Removed debug sysouts to make the plugin "silent"
---

diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java
index 10cf1412..5d665918 100644
--- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java
+++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java
@@ -34,6 +34,5 @@ public class Am2900Loader implements BundleActivator
 		IndirectModelComponentCreator.registerResourceLoader(resourceLoader, "Am2900Loader");
 		IndirectModelComponentCreator.loadStandardComponentIDs(Am2900Loader.class.getResourceAsStream("standardComponentIDMapping.json"));
 		MachineLoader.setup();
-//		System.out.println("SETUP DONE"); // TODO: Debug
 	}
 }
diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/MachineLoader.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/MachineLoader.java
index 9a88575b..e119e7f8 100644
--- a/plugins/net.mograsim.machine/src/net/mograsim/machine/MachineLoader.java
+++ b/plugins/net.mograsim.machine/src/net/mograsim/machine/MachineLoader.java
@@ -31,6 +31,5 @@ public class MachineLoader implements BundleActivator
 		ClassLoaderBasedResourceLoader resourceLoader = ClassLoaderBasedResourceLoader.create(MachineLoader.class.getClassLoader());
 		IndirectModelComponentCreator.registerResourceLoader(resourceLoader, "MachineLoader");
 		IndirectModelComponentCreator.loadStandardComponentIDs(MachineLoader.class.getResourceAsStream("standardComponentIDMapping.json"));
-//		System.out.println("SETUP DONE"); // TODO: Debug
 	}
 }
diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/MachineRegistry.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/MachineRegistry.java
index 089cf31c..d3124123 100644
--- a/plugins/net.mograsim.machine/src/net/mograsim/machine/MachineRegistry.java
+++ b/plugins/net.mograsim.machine/src/net/mograsim/machine/MachineRegistry.java
@@ -1,6 +1,5 @@
 package net.mograsim.machine;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -36,19 +35,15 @@ public class MachineRegistry
 	{
 		installedMachines.clear();
 		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		System.out.println(Arrays.toString(registry.getExtensionPoints("net.mograsim.machine")));
 		IConfigurationElement[] config = registry.getConfigurationElementsFor(MACHINE_EXT_ID);
 		try
 		{
 			for (IConfigurationElement e : config)
 			{
-				System.out.println(e.getNamespaceIdentifier());
-				System.out.println(Arrays.toString(e.getAttributeNames()));
 				final Object o = e.createExecutableExtension("class");
 				final String id = e.getAttribute("unique_id");
 				if (o instanceof MachineDefinition)
 				{
-					System.out.println("Found " + id);
 					MachineDefinition md = (MachineDefinition) o;
 					if (Objects.equals(id, md.getId()))
 						installedMachines.put(id, md);
@@ -62,7 +57,8 @@ public class MachineRegistry
 		}
 		catch (CoreException ex)
 		{
-			System.out.println(ex.getMessage());
+			System.err.println("An error occurred reloading the machines:");
+			ex.printStackTrace();
 		}
 		notifyListeners();
 	}
diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/nature/MachineContext.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/nature/MachineContext.java
index 55316813..3e5c9dea 100644
--- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/nature/MachineContext.java
+++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/nature/MachineContext.java
@@ -1,6 +1,13 @@
 package net.mograsim.plugin.nature;
 
-import static net.mograsim.plugin.nature.MachineContextStatus.*;
+import static net.mograsim.plugin.nature.MachineContextStatus.ACTIVE;
+import static net.mograsim.plugin.nature.MachineContextStatus.ACTIVE_CHANGED;
+import static net.mograsim.plugin.nature.MachineContextStatus.BROKEN;
+import static net.mograsim.plugin.nature.MachineContextStatus.CLOSED;
+import static net.mograsim.plugin.nature.MachineContextStatus.DEAD;
+import static net.mograsim.plugin.nature.MachineContextStatus.INTACT;
+import static net.mograsim.plugin.nature.MachineContextStatus.READY;
+import static net.mograsim.plugin.nature.MachineContextStatus.UNKOWN;
 
 import java.io.IOException;
 import java.util.HashSet;
@@ -147,8 +154,6 @@ public class MachineContext
 		if (status == ACTIVE)
 			return true;
 		machineDefinition.ifPresent(md -> setActiveMachine(md.createNew()));
-		if (activeMachine.isPresent())
-			System.out.format("Created new machine %s for project %s%n", activeMachine.get().getDefinition().getId(), owner.getName());
 		updateStatus();
 		return isActive();
 	}
@@ -172,7 +177,6 @@ public class MachineContext
 		if (oldStatus == newStatus)
 			return;
 		status = newStatus;
-		System.out.format("Project %s context status: %s -> %s%n", owner.getName(), oldStatus, newStatus);
 		doPostStatusChangedAction();
 		notifyMachineContextStatusListeners(oldStatus);
 	}
@@ -204,7 +208,6 @@ public class MachineContext
 	{
 		if ((status == DEAD || status == CLOSED) && activeMachine.isPresent())
 		{
-			System.out.format("Removed machine %s for project %s%n", activeMachine.get().getDefinition().getId(), owner.getName());
 			activeMachine = Optional.empty();
 			notifyActiveMachineListeners();
 		}
diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/nature/ProjectMachineContext.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/nature/ProjectMachineContext.java
index 485f0728..ecce9e81 100644
--- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/nature/ProjectMachineContext.java
+++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/nature/ProjectMachineContext.java
@@ -173,7 +173,6 @@ public class ProjectMachineContext
 
 	private static void resourceChanged(IResourceChangeEvent event)
 	{
-//		System.out.println(((ResourceChangeEvent) event).toDebugString());
 		// We try to do as many cheap tests first as possible, because this listener is not limited to plain project actions.
 		if (event.getResource() == null)
 			return;