refactoring of kernel classes

org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/action/CopyPasteUtils.java

@@ -35,7 +35,7 @@ import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.TextTransfer;
 import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.widgets.Display;
-import org.fortiss.tooling.kernel.services.IElementCompositorService;
+import org.fortiss.tooling.kernel.service.IElementCompositorService;
 import org.fortiss.tooling.kernel.util.EMFResourceUtils;
 
 /**

org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/action/CutModelElementsAction.java

@@ -27,7 +27,7 @@ import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.actions.ActionFactory;
 import org.fortiss.tooling.base.ui.ToolingBaseUIActivator;
-import org.fortiss.tooling.kernel.services.IElementCompositorService;
+import org.fortiss.tooling.kernel.service.IElementCompositorService;
 import org.fortiss.tooling.kernel.util.LoggingUtils;
 
 /**

org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/action/ModelElementsActionBase.java

@@ -26,7 +26,7 @@ import org.eclipse.gef.commands.CommandStack;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.fortiss.tooling.kernel.extension.data.ITopLevelElement;
-import org.fortiss.tooling.kernel.services.IPersistencyService;
+import org.fortiss.tooling.kernel.service.IPersistencyService;
 import org.fortiss.tooling.kernel.ui.util.EObjectSelectionUtils;
 
 /**

org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/command/ConnectionCommand.java

@@ -23,7 +23,7 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gef.commands.Command;
 import org.fortiss.tooling.base.ui.dnd.DragContext;
 import org.fortiss.tooling.base.ui.editpart.policy.ConnectionGraphicalNodeEditPolicy;
-import org.fortiss.tooling.kernel.services.IConnectionCompositorService;
+import org.fortiss.tooling.kernel.service.IConnectionCompositorService;
 
 /**
  * This command is used by {@link ConnectionGraphicalNodeEditPolicy} to

org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/ConnectorConnectionCompositorBase.java

@@ -30,7 +30,7 @@ import org.fortiss.tooling.base.ui.editpart.interfaces.IFreeConnectorEditPart;
 import org.fortiss.tooling.kernel.extension.IConnectionCompositor;
 import org.fortiss.tooling.kernel.extension.data.IConnectionCompositionContext;
 import org.fortiss.tooling.kernel.extension.data.ITopLevelElement;
-import org.fortiss.tooling.kernel.services.IPersistencyService;
+import org.fortiss.tooling.kernel.service.IPersistencyService;
 
 /**
  * Base compositor for connections supporting entry and exit connectors.

org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/HierarchicElementConnectionCompositorBase.java

@@ -27,7 +27,7 @@ import org.fortiss.tooling.base.ui.dnd.DropContext;
 import org.fortiss.tooling.base.ui.editpart.RootEditPartBase;
 import org.fortiss.tooling.kernel.extension.IConnectionCompositor;
 import org.fortiss.tooling.kernel.extension.data.IConnectionCompositionContext;
-import org.fortiss.tooling.kernel.services.IElementCompositorService;
+import org.fortiss.tooling.kernel.service.IElementCompositorService;
 
 /**
  * Base implementation for supporting direct connection of two

org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/TreeViewerEditorBase.java

@@ -37,7 +37,7 @@ import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.dnd.TransferData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Menu;
-import org.fortiss.tooling.kernel.services.IElementCompositorService;
+import org.fortiss.tooling.kernel.service.IElementCompositorService;
 import org.fortiss.tooling.kernel.ui.base.EditorBase;
 import org.fortiss.tooling.kernel.ui.util.DragAndDropUtils;
 import org.fortiss.tooling.kernel.ui.util.EObjectSelectionUtils;

org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/EditorBase.java

@@ -28,7 +28,7 @@ import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
 import org.fortiss.tooling.base.ui.internal.command.GEF2ToolingKernelCommandStack;
-import org.fortiss.tooling.kernel.services.IPersistencyService;
+import org.fortiss.tooling.kernel.service.IPersistencyService;
 
 /**
  * GEF editor base implementation.

org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/gef/GraphicalViewerEditorBase.java

@@ -65,7 +65,7 @@ import org.fortiss.tooling.base.ui.action.ModelElementsActionBase;
 import org.fortiss.tooling.base.ui.action.PasteModelElementAction;
 import org.fortiss.tooling.base.ui.dnd.DropTargetListener;
 import org.fortiss.tooling.base.ui.editpart.figure.EVisualStyle;
-import org.fortiss.tooling.kernel.ui.services.IEditPartFactoryService;
+import org.fortiss.tooling.kernel.ui.service.IEditPartFactoryService;
 
 /**
  * GEF editor base implementation for graphical viewer editors.

org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/GraphicalConnectionEditPartBase.java

@@ -23,8 +23,8 @@ import org.eclipse.emf.common.notify.impl.AdapterImpl;
 import org.eclipse.gef.editparts.AbstractConnectionEditPart;
 import org.fortiss.tooling.base.model.element.IConnection;
 import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;
-import org.fortiss.tooling.kernel.ui.interfaces.IModelElementHandler;
-import org.fortiss.tooling.kernel.ui.services.IModelElementService;
+import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
+import org.fortiss.tooling.kernel.ui.service.IModelElementService;
 
 /**
  * Base class for graphical connection edit parts.

org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/GraphicalEditPartBase.java

@@ -22,8 +22,8 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.impl.AdapterImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.fortiss.tooling.kernel.ui.interfaces.IModelElementHandler;
-import org.fortiss.tooling.kernel.ui.services.IModelElementService;
+import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
+import org.fortiss.tooling.kernel.ui.service.IModelElementService;
 
 /**
  * The base class for all graphical edit parts.

org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/NodeEditPartBase.java

@@ -34,8 +34,8 @@ import org.fortiss.tooling.base.ui.editpart.policy.RemoveEditPolicy;
 import org.fortiss.tooling.base.ui.layout.constants.RecommendedLayoutConstants;
 import org.fortiss.tooling.base.ui.layout.util.LayoutDataUtils;
 import org.fortiss.tooling.kernel.model.INamedCommentedElement;
-import org.fortiss.tooling.kernel.ui.services.IEditorService;
-import org.fortiss.tooling.kernel.ui.services.IModelElementService;
+import org.fortiss.tooling.kernel.ui.service.IEditorService;
+import org.fortiss.tooling.kernel.ui.service.IModelElementService;
 
 /**
  * The base class for graphical edit parts which encapsulate nodes (i.e. the

org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/LayoutEditPolicyBase.java

@@ -25,7 +25,7 @@ import org.eclipse.gef.editpolicies.LayoutEditPolicy;
 import org.eclipse.gef.requests.CreateRequest;
 import org.fortiss.tooling.base.ui.dnd.DropContext;
 import org.fortiss.tooling.kernel.extension.data.IElementCompositionContext;
-import org.fortiss.tooling.kernel.services.IElementCompositorService;
+import org.fortiss.tooling.kernel.service.IElementCompositorService;
 import org.fortiss.tooling.kernel.ui.util.DragAndDropUtils;
 
 /**

org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/RemoveEditPolicy.java

@@ -26,7 +26,7 @@ import org.eclipse.gef.commands.CompoundCommand;
 import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gef.editpolicies.ComponentEditPolicy;
 import org.eclipse.gef.requests.GroupRequest;
-import org.fortiss.tooling.kernel.services.IElementCompositorService;
+import org.fortiss.tooling.kernel.service.IElementCompositorService;
 
 /**
  * An edit policy for removing model elements. Delete commands are redirected to

org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/internal/command/GEF2ToolingKernelCommandStack.java

@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.commands.CommandStack;
 import org.fortiss.tooling.kernel.extension.data.ITopLevelElement;
-import org.fortiss.tooling.kernel.services.IPersistencyService;
+import org.fortiss.tooling.kernel.service.IPersistencyService;
 
 /**
  * This command stack wraps the tooling kernel command stack. Execute, isDirty,

org.fortiss.tooling.kernel.ui/trunk/META-INF/MANIFEST.MF

@@ -19,6 +19,7 @@ Bundle-Vendor: fortiss
 Export-Package: org.fortiss.tooling.kernel.ui,
  org.fortiss.tooling.kernel.ui.base,
  org.fortiss.tooling.kernel.ui.databinding,
- org.fortiss.tooling.kernel.ui.interfaces,
- org.fortiss.tooling.kernel.ui.services,
+ org.fortiss.tooling.kernel.ui.extension,
+ org.fortiss.tooling.kernel.ui.listener,
+ org.fortiss.tooling.kernel.ui.service,
  org.fortiss.tooling.kernel.ui.util

org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/base/EditorBase.java

@@ -25,10 +25,10 @@ import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.part.EditorPart;
-import org.fortiss.tooling.kernel.services.ICommandStackService;
-import org.fortiss.tooling.kernel.ui.interfaces.IActionContributingEditor;
-import org.fortiss.tooling.kernel.ui.interfaces.IEditorBinding;
-import org.fortiss.tooling.kernel.ui.interfaces.IModelElementHandler;
+import org.fortiss.tooling.kernel.service.ICommandStackService;
+import org.fortiss.tooling.kernel.ui.extension.IActionContributingEditor;
+import org.fortiss.tooling.kernel.ui.extension.IEditorBinding;
+import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
 import org.fortiss.tooling.kernel.ui.internal.editor.ModelElementEditorInput;
 
 /**

org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/base/ModelElementHandlerBase.java

@@ -23,7 +23,7 @@ import java.util.List;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
-import org.fortiss.tooling.kernel.ui.interfaces.IModelElementHandler;
+import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
 
 /**
  * Base implementation for {@link IModelElementHandler}s.

org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/base/NamedCommentedModelElementHandlerBase.java

@@ -18,7 +18,7 @@ $Id$
 package org.fortiss.tooling.kernel.ui.base;
 
 import org.fortiss.tooling.kernel.model.INamedCommentedElement;
-import org.fortiss.tooling.kernel.ui.interfaces.IModelElementHandler;
+import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
 
 /**
  * {@link IModelElementHandler} base implementation for

org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/databinding/EObjectObservableValue.java

@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.swt.widgets.Display;
-import org.fortiss.tooling.kernel.services.ICommandStackService;
+import org.fortiss.tooling.kernel.service.ICommandStackService;
 
 /**
  * Implementation of {@link IObservableValue} for {@link EObject}s.