kernel refactoring: extract ui components

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

@@ -9,3 +9,11 @@ Require-Bundle: org.fortiss.tooling.base;bundle-version="1.0.0";visibility:=reex
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: fortiss
+Export-Package: org.fortiss.tooling.kernel.base.ui,
+ org.fortiss.tooling.kernel.base.ui.command,
+ org.fortiss.tooling.kernel.base.ui.dnd,
+ org.fortiss.tooling.kernel.base.ui.editor,
+ org.fortiss.tooling.kernel.base.ui.editpart,
+ org.fortiss.tooling.kernel.base.ui.editpart.anchor,
+ org.fortiss.tooling.kernel.base.ui.editpart.policy,
+ org.fortiss.tooling.kernel.base.ui.layout.util

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

@@ -15,14 +15,14 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.command;
+package org.fortiss.tooling.kernel.base.ui.command;
 
 import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.commands.Command;
-import org.fortiss.tooling.base.connect.DragContext;
-import org.fortiss.tooling.base.editpart.policy.ConnectionGraphicalNodeEditPolicy;
+import org.fortiss.tooling.kernel.base.ui.dnd.DragContext;
+import org.fortiss.tooling.kernel.base.ui.editpart.policy.ConnectionGraphicalNodeEditPolicy;
 import org.fortiss.tooling.kernel.services.IConnectorService;
 
 /**

org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/connect/DragContext.java → org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/dnd/DragContext.java

@@ -15,11 +15,10 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.connect;
+package org.fortiss.tooling.kernel.base.ui.dnd;
 
 import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.gef.EditPart;
-import org.fortiss.tooling.base.compose.DropContext;
 import org.fortiss.tooling.kernel.interfaces.IConnectionContext;
 
 /**

org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/DropContext.java → org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/dnd/DropContext.java

@@ -15,11 +15,11 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.compose;
+package org.fortiss.tooling.kernel.base.ui.dnd;
 
 import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.gef.EditPart;
-import org.fortiss.tooling.base.editpart.RootEditPartBase;
+import org.fortiss.tooling.kernel.base.ui.editpart.RootEditPartBase;
 import org.fortiss.tooling.kernel.interfaces.ICompositionContext;
 
 /**

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

@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.editor;
+package org.fortiss.tooling.kernel.base.ui.editor;
 
 import java.util.Collection;
 import java.util.List;
@@ -37,10 +37,10 @@ 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.base.EditorBase;
 import org.fortiss.tooling.kernel.services.ICompositorService;
-import org.fortiss.tooling.kernel.util.DragAndDropUtils;
-import org.fortiss.tooling.kernel.util.EObjectSelectionUtils;
+import org.fortiss.tooling.kernel.ui.base.EditorBase;
+import org.fortiss.tooling.kernel.ui.util.DragAndDropUtils;
+import org.fortiss.tooling.kernel.ui.util.EObjectSelectionUtils;
 
 /**
  * An editor which only consists of a tree viewer. It uses {@link TreeViewer},

org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/editpart/ConnectorEditPartBase.java → org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/ConnectorEditPartBase.java

@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.editpart;
+package org.fortiss.tooling.kernel.base.ui.editpart;
 
 import org.fortiss.tooling.base.model.element.IConnector;
 import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;

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

@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.editpart;
+package org.fortiss.tooling.kernel.base.ui.editpart;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;

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

@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.editpart;
+package org.fortiss.tooling.kernel.base.ui.editpart;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;

org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/editpart/LayoutedConnectionEditPartBase.java → org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/LayoutedConnectionEditPartBase.java

@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.editpart;
+package org.fortiss.tooling.kernel.base.ui.editpart;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;

org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/editpart/LayoutedEditPartBase.java → org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/LayoutedEditPartBase.java

@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.editpart;
+package org.fortiss.tooling.kernel.base.ui.editpart;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;

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

@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.editpart;
+package org.fortiss.tooling.kernel.base.ui.editpart;
 
 import java.util.List;
 

org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/editpart/PositionedEditPartBase.java → org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/PositionedEditPartBase.java

@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.editpart;
+package org.fortiss.tooling.kernel.base.ui.editpart;
 
 import org.eclipse.draw2d.ConnectionAnchor;
 import org.eclipse.draw2d.geometry.Rectangle;

org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/editpart/RootEditPartBase.java → org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/RootEditPartBase.java

@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.editpart;
+package org.fortiss.tooling.kernel.base.ui.editpart;
 
 import java.util.ArrayList;
 import java.util.List;

org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/editpart/anchor/InsetChopBoxConnectionAnchor.java → org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/anchor/InsetChopBoxConnectionAnchor.java

@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.editpart.anchor;
+package org.fortiss.tooling.kernel.base.ui.editpart.anchor;
 
 import org.eclipse.draw2d.ChopboxAnchor;
 import org.eclipse.draw2d.IFigure;

org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/editpart/policy/ConnectionGraphicalNodeEditPolicy.java → org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/editpart/policy/ConnectionGraphicalNodeEditPolicy.java

@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.editpart.policy;
+package org.fortiss.tooling.kernel.base.ui.editpart.policy;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.NodeEditPart;
@@ -24,8 +24,8 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy;
 import org.eclipse.gef.requests.CreateConnectionRequest;
 import org.eclipse.gef.requests.ReconnectRequest;
-import org.fortiss.tooling.base.command.ConnectionCommand;
-import org.fortiss.tooling.base.connect.DragContext;
+import org.fortiss.tooling.kernel.base.ui.command.ConnectionCommand;
+import org.fortiss.tooling.kernel.base.ui.dnd.DragContext;
 
 /**
  * This is the edit policy to be installed on edit parts that allow creation of

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

@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.editpart.policy;
+package org.fortiss.tooling.kernel.base.ui.editpart.policy;
 
 import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.emf.ecore.EObject;
@@ -23,10 +23,10 @@ import org.eclipse.gef.GraphicalEditPart;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.editpolicies.LayoutEditPolicy;
 import org.eclipse.gef.requests.CreateRequest;
-import org.fortiss.tooling.base.compose.DropContext;
+import org.fortiss.tooling.kernel.base.ui.dnd.DropContext;
 import org.fortiss.tooling.kernel.interfaces.ICompositionContext;
 import org.fortiss.tooling.kernel.services.ICompositorService;
-import org.fortiss.tooling.kernel.util.DragAndDropUtils;
+import org.fortiss.tooling.kernel.ui.util.DragAndDropUtils;
 
 /**
  * Base class for layout edit policies relaying create commands to the

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

@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.editpart.policy;
+package org.fortiss.tooling.kernel.base.ui.editpart.policy;
 
 import java.util.List;
 

org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/layout/util/EditPartLayoutUtils.java → org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/util/EditPartLayoutUtils.java

@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.layout.util;
+package org.fortiss.tooling.kernel.base.ui.layout.util;
 
 import java.awt.Polygon;
 
@@ -23,12 +23,14 @@ import org.eclipse.draw2d.PositionConstants;
 import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.draw2d.geometry.Rectangle;
-import org.fortiss.tooling.base.compose.DropContext;
 import org.fortiss.tooling.base.layout.constants.LayoutKeyConstants;
 import org.fortiss.tooling.base.layout.constants.RecommendedLayoutConstants;
+import org.fortiss.tooling.base.layout.util.LayoutDataUtils;
+import org.fortiss.tooling.base.layout.util.OrientationUtils;
 import org.fortiss.tooling.base.model.layout.EOrientation;
 import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;
 import org.fortiss.tooling.base.model.layout.OffsetOrientation;
+import org.fortiss.tooling.kernel.base.ui.dnd.DropContext;
 
 /**
  * Utility class collecting EditPart layout methods.

org.fortiss.tooling.base/trunk/META-INF/MANIFEST.MF

@@ -7,9 +7,15 @@ Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.fortiss.tooling.base.editor,
- org.fortiss.tooling.base.model.element,
- org.fortiss.tooling.base.model.element.impl,
- org.fortiss.tooling.base.model.element.util
 Require-Bundle: org.fortiss.tooling.kernel;bundle-version="0.0.1";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Export-Package: org.fortiss.tooling.base,
+ org.fortiss.tooling.base.layout,
+ org.fortiss.tooling.base.layout.constants,
+ org.fortiss.tooling.base.layout.util,
+ org.fortiss.tooling.base.model.element,
+ org.fortiss.tooling.base.model.element.impl,
+ org.fortiss.tooling.base.model.element.util,
+ org.fortiss.tooling.base.model.layout,
+ org.fortiss.tooling.base.model.layout.impl,
+ org.fortiss.tooling.base.model.layout.util

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

 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Fortiss Tooling Kernel User Interface
-Bundle-SymbolicName: org.fortiss.tooling.kernel.ui
+Bundle-SymbolicName: org.fortiss.tooling.kernel.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.fortiss.tooling.kernel.ui.ToolingKernelUIActivator
 Require-Bundle: org.eclipse.ui;visibility:=reexport,
  org.eclipse.core.runtime;visibility:=reexport,
- org.fortiss.tooling.kernel;bundle-version="0.0.1";visibility:=reexport
+ org.fortiss.tooling.kernel;bundle-version="0.0.1";visibility:=reexport,
+ org.eclipse.core.resources;bundle-version="3.6.1"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: fortiss
+Export-Package: org.fortiss.tooling.kernel.ui,
+ org.fortiss.tooling.kernel.ui.base,
+ org.fortiss.tooling.kernel.ui.interfaces,
+ org.fortiss.tooling.kernel.ui.services,
+ org.fortiss.tooling.kernel.ui.util