kernel refactoring: extract ui components

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

@@ -16,4 +16,6 @@ Export-Package: org.fortiss.tooling.kernel.base.ui,
  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,
+ org.fortiss.tooling.kernel.base.ui.layout.constants,
  org.fortiss.tooling.kernel.base.ui.layout.util

org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/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.interfaces.IModelElementHandler;
-import org.fortiss.tooling.kernel.services.IModelElementService;
+import org.fortiss.tooling.kernel.ui.interfaces.IModelElementHandler;
+import org.fortiss.tooling.kernel.ui.services.IModelElementService;
 
 /**
  * Base class for graphical connection edit parts.

org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/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.interfaces.IModelElementHandler;
-import org.fortiss.tooling.kernel.services.IModelElementService;
+import org.fortiss.tooling.kernel.ui.interfaces.IModelElementHandler;
+import org.fortiss.tooling.kernel.ui.services.IModelElementService;
 
 /**
  * The base class for all graphical edit parts.

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

@@ -28,11 +28,11 @@ import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.gef.Request;
 import org.eclipse.gef.RequestConstants;
 import org.eclipse.swt.graphics.Color;
-import org.fortiss.tooling.base.layout.constants.RecommendedLayoutConstants;
-import org.fortiss.tooling.base.layout.util.LayoutDataUtils;
 import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;
+import org.fortiss.tooling.kernel.base.ui.layout.constants.RecommendedLayoutConstants;
+import org.fortiss.tooling.kernel.base.ui.layout.util.LayoutDataUtils;
 import org.fortiss.tooling.kernel.model.INamedCommentedElement;
-import org.fortiss.tooling.kernel.services.IModelElementService;
+import org.fortiss.tooling.kernel.ui.services.IModelElementService;
 
 /**
  * The base class for graphical edit parts which encapsulate nodes (i.e. the

org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/internal/command/EMF2GEFCommand.java → org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/internal/command/EMF2GEFCommand.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.internal.command;
+package org.fortiss.tooling.kernel.base.ui.internal.command;
 
 import org.eclipse.gef.commands.Command;
 

org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/internal/command/GEF2EMFCommand.java → org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/internal/command/GEF2EMFCommand.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.internal.command;
+package org.fortiss.tooling.kernel.base.ui.internal.command;
 
 import java.util.Collection;
 import java.util.Collections;

org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/internal/command/GEF2EMFCommandStack.java → org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/internal/command/GEF2EMFCommandStack.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.internal.command;
+package org.fortiss.tooling.kernel.base.ui.internal.command;
 
 import java.util.EventObject;
 

org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/layout/IPointLayouter.java → org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/IPointLayouter.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;
+package org.fortiss.tooling.kernel.base.ui.layout;
 
 import org.fortiss.tooling.base.model.layout.Point;
 

org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/layout/constants/LayoutKeyConstants.java → org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/constants/LayoutKeyConstants.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.constants;
+package org.fortiss.tooling.kernel.base.ui.layout.constants;
 
 /**
  * Layout constants defining keys for the commonly used layout objects, like

org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/layout/constants/RecommendedLayoutConstants.java → org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/constants/RecommendedLayoutConstants.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.constants;
+package org.fortiss.tooling.kernel.base.ui.layout.constants;
 
 import org.conqat.ide.commons.ui.swt.FontUtils;
 import org.eclipse.draw2d.geometry.Dimension;

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

@@ -23,14 +23,12 @@ 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.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;
+import org.fortiss.tooling.kernel.base.ui.layout.constants.LayoutKeyConstants;
+import org.fortiss.tooling.kernel.base.ui.layout.constants.RecommendedLayoutConstants;
 
 /**
  * Utility class collecting EditPart layout methods.

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

@@ -15,12 +15,10 @@ $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 org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.emf.ecore.EObject;
-import org.fortiss.tooling.base.layout.constants.LayoutKeyConstants;
-import org.fortiss.tooling.base.layout.constants.RecommendedLayoutConstants;
 import org.fortiss.tooling.base.model.layout.Angle;
 import org.fortiss.tooling.base.model.layout.Dimension;
 import org.fortiss.tooling.base.model.layout.EOrientation;
@@ -31,6 +29,8 @@ import org.fortiss.tooling.base.model.layout.Offset;
 import org.fortiss.tooling.base.model.layout.Orientation;
 import org.fortiss.tooling.base.model.layout.Point;
 import org.fortiss.tooling.base.model.layout.Points;
+import org.fortiss.tooling.kernel.base.ui.layout.constants.LayoutKeyConstants;
+import org.fortiss.tooling.kernel.base.ui.layout.constants.RecommendedLayoutConstants;
 
 /**
  * Utility methods for {@link ILayoutedModelElement} and {@link ILayoutData}.

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

@@ -15,16 +15,16 @@ $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 org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Point;
-import org.fortiss.tooling.base.layout.constants.RecommendedLayoutConstants;
 import org.fortiss.tooling.base.model.layout.EOrientation;
 import org.fortiss.tooling.base.model.layout.LayoutFactory;
 import org.fortiss.tooling.base.model.layout.Offset;
 import org.fortiss.tooling.base.model.layout.OffsetOrientation;
 import org.fortiss.tooling.base.model.layout.Orientation;
+import org.fortiss.tooling.kernel.base.ui.layout.constants.RecommendedLayoutConstants;
 
 /**
  * Class for handling orientation relative coordinates.

org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/layout/util/ZoomUtils.java → org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/kernel/base/ui/layout/util/ZoomUtils.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 org.eclipse.gef.RootEditPart;
 import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;

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

@@ -10,9 +10,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 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/trunk/src/org/fortiss/tooling/base/ToolingBaseActivator.java

@@ -17,7 +17,7 @@ $Id$
 +--------------------------------------------------------------------------*/
 package org.fortiss.tooling.base;
 
-import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.BundleContext;
 
 /**
@@ -28,7 +28,7 @@ import org.osgi.framework.BundleContext;
  * @version $Rev$
  * @ConQAT.Rating RED Hash: D6B33EFB704B0CA151E1C945B5BC48C6
  */
-public class ToolingBaseActivator extends AbstractUIPlugin {
+public class ToolingBaseActivator extends Plugin {
 
 	/** The plug-in ID. */
 	public static final String PLUGIN_ID = "org.fortiss.tooling.base"; //$NON-NLS-1$

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

@@ -7,12 +7,18 @@ 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.eclipse.core.resources;bundle-version="3.6.1"
+ org.eclipse.core.resources;bundle-version="3.6.1";visibility:=reexport,
+ org.eclipse.gef;bundle-version="3.6.2";visibility:=reexport,
+ org.conqat.ide.commons.gef;bundle-version="2.7.0";visibility:=reexport,
+ org.conqat.ide.commons.ui;bundle-version="2.7.0";visibility:=reexport,
+ org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100";visibility:=reexport,
+ org.eclipse.jface.databinding;bundle-version="1.4.0";visibility:=reexport
 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.databinding,
  org.fortiss.tooling.kernel.ui.interfaces,
  org.fortiss.tooling.kernel.ui.services,
  org.fortiss.tooling.kernel.ui.util

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

@@ -24,9 +24,9 @@ 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.interfaces.IModelElementHandler;
 import org.fortiss.tooling.kernel.services.ICommandStackService;
 import org.fortiss.tooling.kernel.ui.interfaces.IEditorBinding;
+import org.fortiss.tooling.kernel.ui.interfaces.IModelElementHandler;
 import org.fortiss.tooling.kernel.ui.internal.editor.ModelElementEditorInput;
 
 /**

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

@@ -15,7 +15,7 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base;
+package org.fortiss.tooling.kernel.ui.base;
 
 import java.util.Collections;
 import java.util.List;
@@ -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.interfaces.IModelElementHandler;
+import org.fortiss.tooling.kernel.ui.interfaces.IModelElementHandler;
 
 /**
  * Base implementation for {@link IModelElementHandler}s.

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

@@ -15,10 +15,10 @@ $Id$
 | See the License for the specific language governing permissions and      |
 | limitations under the License.                                           |
 +--------------------------------------------------------------------------*/
-package org.fortiss.tooling.kernel.base;
+package org.fortiss.tooling.kernel.ui.base;
 
-import org.fortiss.tooling.kernel.interfaces.IModelElementHandler;
 import org.fortiss.tooling.kernel.model.INamedCommentedElement;
+import org.fortiss.tooling.kernel.ui.interfaces.IModelElementHandler;
 
 /**
  * {@link IModelElementHandler} base implementation for