Bug 559584 - Replace logging via ToolsServicesActivator with other means

+add missing header

Change-Id: I215a02c76ed26cdb9cdbf9291610ed73910b7284
Signed-off-by: Christoph Läubrich <laeubi@laeubi-soft.de>

4 files changed, 22 insertions, 55 deletions

diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 628c5eb5..69f41a83 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -16,5 +16,4 @@ Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.x
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation;version="1.2.0",
  javax.inject;version="1.0.0"
-Bundle-Activator: org.eclipse.e4.tools.services.ToolsServicesActivator
 Automatic-Module-Name: org.eclipse.e4.tools.services
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java
deleted file mode 100644
index 706d15d7..00000000
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesActivator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.e4.tools.services;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.log.LogService;
-import org.osgi.util.tracker.ServiceTracker;
-
-public class ToolsServicesActivator implements BundleActivator {
-
-	static private ToolsServicesActivator defaultInstance;
-	private BundleContext bundleContext;
-	private ServiceTracker<LogService, LogService> logTracker;
-	public static final String PLUGIN_ID = "org.eclipse.e4.tools.services"; //$NON-NLS-1$
-
-	public ToolsServicesActivator() {
-		defaultInstance = this;
-	}
-
-	public static ToolsServicesActivator getDefault() {
-		return defaultInstance;
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		bundleContext = context;
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		if (logTracker != null) {
-			logTracker.close();
-			logTracker = null;
-		}
-		bundleContext = null;
-	}
-
-
-	public LogService getLogService() {
-		if (logTracker == null) {
-			if (bundleContext == null) {
-				return null;
-			}
-			logTracker = new ServiceTracker<>(bundleContext,
-				LogService.class, null);
-			logTracker.open();
-		}
-		return logTracker.getService();
-	}
-
-}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesConstants.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesConstants.java
new file mode 100644
index 00000000..14ee671d
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/ToolsServicesConstants.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2020 Dirk Fauth and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Dirk Fauth <dirk.fauth@gmail.com> - initial API and implementation
+ *     Christoph Läubrich - remove unused code
+ ******************************************************************************/
+package org.eclipse.e4.tools.services;
+
+public interface ToolsServicesConstants {
+
+	public static final String PLUGIN_ID = "org.eclipse.e4.tools.services"; //$NON-NLS-1$
+
+}
diff --git a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
index b5dc3e49..81f9f777 100644
--- a/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
+++ b/bundles/org.eclipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceService.java
@@ -28,7 +28,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.tools.services.IResourcePool;
 import org.eclipse.e4.tools.services.IResourceProviderService;
 import org.eclipse.e4.tools.services.IResourceService;
-import org.eclipse.e4.tools.services.ToolsServicesActivator;
+import org.eclipse.e4.tools.services.ToolsServicesConstants;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
@@ -107,7 +107,7 @@ public class ResourceService implements IResourceService {
 			if (resourceService == null) {
 				throw new CoreException(
 						new Status(IStatus.ERROR,
-								ToolsServicesActivator.PLUGIN_ID,
+								ToolsServicesConstants.PLUGIN_ID,
 								Messages.ResourceService_PoolDisposed));
 			}
 			IPooledResource<Image> image = null;
@@ -130,7 +130,7 @@ public class ResourceService implements IResourceService {
 			if (resourceService == null) {
 				throw new CoreException(
 						new Status(IStatus.ERROR,
-								ToolsServicesActivator.PLUGIN_ID,
+								ToolsServicesConstants.PLUGIN_ID,
 								Messages.ResourceService_PoolDisposed));
 			}
 
@@ -152,7 +152,7 @@ public class ResourceService implements IResourceService {
 			if (resourceService == null) {
 				throw new CoreException(
 						new Status(IStatus.ERROR,
-								ToolsServicesActivator.PLUGIN_ID,
+								ToolsServicesConstants.PLUGIN_ID,
 								Messages.ResourceService_PoolDisposed));
 			}
 			IPooledResource<Color> color = null;