From d4b7a0f614b01504f58e4be17011534bb6424461 Mon Sep 17 00:00:00 2001 From: Florian Hoelzl <hoelzl@fortiss.org> Date: Tue, 5 Apr 2011 07:37:02 +0000 Subject: [PATCH] moved from org.unicase to org.eclipse.emf.emfstore, org.eclipse.emf.ecp --- .../tooling/kernel/internal/CommandStackService.java | 10 +++++----- .../navigator/NavigatorTreeContentProvider.java | 4 ++-- .../kernel/internal/navigator/NavigatorViewPart.java | 12 ++++++------ .../tooling/kernel/util/ProjectRootElementUtils.java | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/CommandStackService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/CommandStackService.java index ab9df18d0..2b7ba0c96 100644 --- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/CommandStackService.java +++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/CommandStackService.java @@ -26,11 +26,11 @@ import org.eclipse.emf.common.command.BasicCommandStack; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.impl.AdapterImpl; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecp.model.ECPWorkspaceManager; -import org.eclipse.emf.ecp.model.NoWorkspaceException; -import org.eclipse.emf.ecp.model.workSpaceModel.ECPProject; -import org.eclipse.emf.ecp.model.workSpaceModel.ECPWorkspace; -import org.eclipse.emf.ecp.model.workSpaceModel.WorkSpaceModelPackage; +import org.eclipse.emf.ecp.common.model.ECPWorkspaceManager; +import org.eclipse.emf.ecp.common.model.NoWorkspaceException; +import org.eclipse.emf.ecp.common.model.workSpaceModel.ECPProject; +import org.eclipse.emf.ecp.common.model.workSpaceModel.ECPWorkspace; +import org.eclipse.emf.ecp.common.model.workSpaceModel.WorkSpaceModelPackage; import org.eclipse.emf.edit.command.ChangeCommand; import org.fortiss.tooling.kernel.ToolingKernelActivator; import org.fortiss.tooling.kernel.services.ICommandStackService; diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorTreeContentProvider.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorTreeContentProvider.java index 8444d992d..043fabd16 100644 --- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorTreeContentProvider.java +++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorTreeContentProvider.java @@ -21,8 +21,8 @@ import java.util.ArrayList; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecp.model.workSpaceModel.ECPProject; -import org.eclipse.emf.ecp.model.workSpaceModel.ECPWorkspace; +import org.eclipse.emf.ecp.common.model.workSpaceModel.ECPProject; +import org.eclipse.emf.ecp.common.model.workSpaceModel.ECPWorkspace; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; import org.fortiss.tooling.kernel.interfaces.IHandler; diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorViewPart.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorViewPart.java index 1a1a75353..96aecf614 100644 --- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorViewPart.java +++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorViewPart.java @@ -27,12 +27,12 @@ import org.eclipse.core.runtime.Status; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.impl.AdapterImpl; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecp.model.ECPWorkspaceManager; -import org.eclipse.emf.ecp.model.NoWorkspaceException; -import org.eclipse.emf.ecp.model.workSpaceModel.ECPProject; -import org.eclipse.emf.ecp.model.workSpaceModel.ECPProjectListener; -import org.eclipse.emf.ecp.model.workSpaceModel.ECPWorkspace; -import org.eclipse.emf.ecp.model.workSpaceModel.WorkSpaceModelPackage; +import org.eclipse.emf.ecp.common.model.ECPWorkspaceManager; +import org.eclipse.emf.ecp.common.model.NoWorkspaceException; +import org.eclipse.emf.ecp.common.model.workSpaceModel.ECPProject; +import org.eclipse.emf.ecp.common.model.workSpaceModel.ECPProjectListener; +import org.eclipse.emf.ecp.common.model.workSpaceModel.ECPWorkspace; +import org.eclipse.emf.ecp.common.model.workSpaceModel.WorkSpaceModelPackage; import org.eclipse.jface.action.IContributionItem; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.viewers.DecoratingLabelProvider; diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/ProjectRootElementUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/ProjectRootElementUtils.java index 8e77272ef..24647b02a 100644 --- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/ProjectRootElementUtils.java +++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/ProjectRootElementUtils.java @@ -20,8 +20,8 @@ package org.fortiss.tooling.kernel.util; import org.conqat.ide.commons.ui.logging.LoggingUtils; import org.conqat.lib.commons.reflect.ReflectionUtils; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecp.model.ECPWorkspaceManager; -import org.eclipse.emf.ecp.model.workSpaceModel.ECPProject; +import org.eclipse.emf.ecp.common.model.ECPWorkspaceManager; +import org.eclipse.emf.ecp.common.model.workSpaceModel.ECPProject; import org.eclipse.emf.emfstore.client.model.ProjectSpace; import org.fortiss.tooling.kernel.ToolingKernelActivator; import org.fortiss.tooling.kernel.model.IProjectRootElement; -- GitLab