Bug 304239 - move each core application service to its own package

4 files changed, 8 insertions, 4 deletions

diff --git a/bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF
index 7d76f974ebc..bda0e05fe84 100644
--- a/bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF
@@ -12,7 +12,8 @@ Import-Package: javax.inject;version="1.0.0",
  org.eclipse.core.commands.common,
  org.eclipse.e4.core.contexts,
  org.eclipse.e4.core.di,
- org.eclipse.e4.core.services,
+ org.eclipse.e4.core.services.log,
+ org.eclipse.e4.core.services.util,
  org.osgi.framework;version="1.5.0"
 Export-Package: org.eclipse.e4.core.commands,
  org.eclipse.e4.core.commands.internal
diff --git a/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/CommandServiceCreationFunction.java b/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/CommandServiceCreationFunction.java
index b2fc66e5dfa..3e91241265f 100644
--- a/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/CommandServiceCreationFunction.java
+++ b/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/CommandServiceCreationFunction.java
@@ -11,6 +11,8 @@
 
 package org.eclipse.e4.core.commands.internal;
 
+import org.eclipse.e4.core.services.log.Logger;
+
 import org.eclipse.e4.core.contexts.ContextFunction;
 import org.eclipse.e4.core.contexts.IContextConstants;
 
@@ -19,7 +21,6 @@ import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import java.lang.reflect.InvocationTargetException;
 import org.eclipse.core.commands.CommandManager;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.services.Logger;
 
 /**
  *
diff --git a/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/HandlerServiceCreationFunction.java b/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/HandlerServiceCreationFunction.java
index d56acaca15c..754f7ada6d4 100644
--- a/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/HandlerServiceCreationFunction.java
+++ b/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/HandlerServiceCreationFunction.java
@@ -11,13 +11,14 @@
 
 package org.eclipse.e4.core.commands.internal;
 
+import org.eclipse.e4.core.services.log.Logger;
+
 import org.eclipse.e4.core.contexts.ContextFunction;
 
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 
 import java.lang.reflect.InvocationTargetException;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.services.Logger;
 
 public class HandlerServiceCreationFunction extends ContextFunction {
 
diff --git a/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/HandlerServiceImpl.java b/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/HandlerServiceImpl.java
index 92355362c59..d1d6c613767 100644
--- a/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/HandlerServiceImpl.java
+++ b/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/HandlerServiceImpl.java
@@ -11,6 +11,8 @@
 
 package org.eclipse.e4.core.commands.internal;
 
+import org.eclipse.e4.core.services.log.Logger;
+
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 
 import java.lang.reflect.InvocationTargetException;
@@ -20,7 +22,6 @@ import javax.inject.Inject;
 import org.eclipse.core.commands.ParameterizedCommand;
 import org.eclipse.e4.core.commands.EHandlerService;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.services.Logger;
 
 /**
  *