Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcletavernie2011-11-15 16:16:55 +0000
committercletavernie2011-11-15 16:16:55 +0000
commit7713d935c9368c5758460040ab96c1692184b0db (patch)
tree1d7bec105493b447d155cff85d97eea1d59961f8 /tests/debug/plugins
parent601f8358cc41be8f3f9ecbcf567f79e3eaaa3556 (diff)
downloadorg.eclipse.papyrus-7713d935c9368c5758460040ab96c1692184b0db.tar.gz
org.eclipse.papyrus-7713d935c9368c5758460040ab96c1692184b0db.tar.xz
org.eclipse.papyrus-7713d935c9368c5758460040ab96c1692184b0db.zip
362162: [Architecture - Refactoring] The plug-ins should be renamed to match their layer's qualified name
https://bugs.eclipse.org/bugs/show_bug.cgi?id=362162
Diffstat (limited to 'tests/debug/plugins')
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/META-INF/MANIFEST.MF2
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/src-gen/org/eclipse/papyrus/core/queries/configuration/presentation/ConfigurationActionBarContributor.java5
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/src-gen/org/eclipse/papyrus/core/queries/configuration/presentation/ConfigurationEditor.java634
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/src-gen/org/eclipse/papyrus/core/queries/configuration/presentation/ConfigurationEditorPlugin.java5
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/src-gen/org/eclipse/papyrus/core/queries/configuration/presentation/ConfigurationModelWizard.java63
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/META-INF/MANIFEST.MF6
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ActionConfigurationItemProvider.java7
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ExtendedElementTypeConfigurationItemProvider.java10
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ExtendedElementTypeSetItemProvider.java10
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ExtendedTypesEditPlugin.java2
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ExtendedtypesItemProviderAdapterFactory.java4
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/IconEntryItemProvider.java7
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/PostActionConfigurationItemProvider.java4
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/PreActionConfigurationItemProvider.java4
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/META-INF/MANIFEST.MF4
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/src-gen/org/eclipse/papyrus/extendedtypes/presentation/ExtendedTypesEditorPlugin.java8
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/src-gen/org/eclipse/papyrus/extendedtypes/presentation/ExtendedtypesActionBarContributor.java5
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/src-gen/org/eclipse/papyrus/extendedtypes/presentation/ExtendedtypesEditor.java2
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/src-gen/org/eclipse/papyrus/extendedtypes/presentation/ExtendedtypesModelWizard.java63
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/META-INF/MANIFEST.MF10
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ConstantValueItemProvider.java8
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/DynamicValueItemProvider.java1
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/FeatureToSetItemProvider.java10
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/FeatureValueItemProvider.java2
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ListValueItemProvider.java4
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ModifySemanticValuesActionConfigurationEditPlugin.java8
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ModifySemanticValuesActionConfigurationItemProvider.java11
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ModifySemanticValuesActionConfigurationItemProviderAdapterFactory.java4
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/QueryExecutionValueItemProvider.java4
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/META-INF/MANIFEST.MF6
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/presentation/ModifySemanticValuesActionConfigurationActionBarContributor.java5
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/presentation/ModifySemanticValuesActionConfigurationEditor.java2
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/presentation/ModifySemanticValuesActionConfigurationEditorPlugin.java9
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/presentation/ModifySemanticValuesActionConfigurationModelWizard.java63
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/META-INF/MANIFEST.MF4
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/src-gen/org/eclipse/papyrus/paletteconfiguration/presentation/PaletteConfigurationEditorPlugin.java8
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/src-gen/org/eclipse/papyrus/paletteconfiguration/presentation/PaletteconfigurationActionBarContributor.java5
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/src-gen/org/eclipse/papyrus/paletteconfiguration/presentation/PaletteconfigurationEditor.java4
-rw-r--r--tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/src-gen/org/eclipse/papyrus/paletteconfiguration/presentation/PaletteconfigurationModelWizard.java63
-rw-r--r--tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/META-INF/MANIFEST.MF10
-rw-r--r--tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/provider/ApplyStereotypeActionConfigurationEditPlugin.java8
-rw-r--r--tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/provider/ApplyStereotypeActionConfigurationItemProvider.java11
-rw-r--r--tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/provider/ApplyStereotypeActionConfigurationItemProviderAdapterFactory.java4
-rw-r--r--tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/provider/StereotypeToApplyItemProvider.java7
-rw-r--r--tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/META-INF/MANIFEST.MF6
-rw-r--r--tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/presentation/ApplyStereotypeActionConfigurationActionBarContributor.java5
-rw-r--r--tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/presentation/ApplyStereotypeActionConfigurationEditor.java2
-rw-r--r--tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/presentation/ApplyStereotypeActionConfigurationEditorPlugin.java9
-rw-r--r--tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/presentation/ApplyStereotypeActionConfigurationModelWizard.java63
49 files changed, 478 insertions, 723 deletions
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/META-INF/MANIFEST.MF b/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/META-INF/MANIFEST.MF
index cd5dfdbb9b4..f522f9128d4 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/META-INF/MANIFEST.MF
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.papyrus.core.queries.configuration.presentation
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.papyrus.core.queries.configuration.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.queries.core.configuration.edit;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport,
org.eclipse.emf.edit.ui;visibility:=reexport,
org.eclipse.ui.ide;visibility:=reexport,
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/src-gen/org/eclipse/papyrus/core/queries/configuration/presentation/ConfigurationActionBarContributor.java b/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/src-gen/org/eclipse/papyrus/core/queries/configuration/presentation/ConfigurationActionBarContributor.java
index f4799162e4a..7337816f3aa 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/src-gen/org/eclipse/papyrus/core/queries/configuration/presentation/ConfigurationActionBarContributor.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/src-gen/org/eclipse/papyrus/core/queries/configuration/presentation/ConfigurationActionBarContributor.java
@@ -10,17 +10,14 @@ import java.util.ArrayList;
import java.util.Collection;
import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-
import org.eclipse.emf.edit.ui.action.ControlAction;
import org.eclipse.emf.edit.ui.action.CreateChildAction;
import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
import org.eclipse.emf.edit.ui.action.LoadResourceAction;
import org.eclipse.emf.edit.ui.action.ValidateAction;
-
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IAction;
@@ -32,14 +29,12 @@ import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.action.SubContributionItem;
-
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.Viewer;
-
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/src-gen/org/eclipse/papyrus/core/queries/configuration/presentation/ConfigurationEditor.java b/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/src-gen/org/eclipse/papyrus/core/queries/configuration/presentation/ConfigurationEditor.java
index d9ed28157ae..4dce0680568 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/src-gen/org/eclipse/papyrus/core/queries/configuration/presentation/ConfigurationEditor.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/src-gen/org/eclipse/papyrus/core/queries/configuration/presentation/ConfigurationEditor.java
@@ -91,7 +91,7 @@ import org.eclipse.jface.viewers.TableLayout;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.core.queries.configuration.provider.ConfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.queries.core.configuration.provider.ConfigurationItemProviderAdapterFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.dnd.DND;
@@ -134,8 +134,8 @@ import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;
* @generated
*/
public class ConfigurationEditor
- extends MultiPageEditorPart
- implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+extends MultiPageEditorPart
+implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
/**
* This keeps track of the editing domain that is used to track all changes to the model.
* <!-- begin-user-doc -->
@@ -292,37 +292,37 @@ public class ConfigurationEditor
*/
protected IPartListener partListener =
new IPartListener() {
- public void partActivated(IWorkbenchPart p) {
- if (p instanceof ContentOutline) {
- if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
- getActionBarContributor().setActiveEditor(ConfigurationEditor.this);
+ public void partActivated(IWorkbenchPart p) {
+ if (p instanceof ContentOutline) {
+ if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
+ getActionBarContributor().setActiveEditor(ConfigurationEditor.this);
- setCurrentViewer(contentOutlineViewer);
- }
- }
- else if (p instanceof PropertySheet) {
- if (((PropertySheet)p).getCurrentPage() == propertySheetPage) {
- getActionBarContributor().setActiveEditor(ConfigurationEditor.this);
- handleActivate();
- }
+ setCurrentViewer(contentOutlineViewer);
}
- else if (p == ConfigurationEditor.this) {
+ }
+ else if (p instanceof PropertySheet) {
+ if (((PropertySheet)p).getCurrentPage() == propertySheetPage) {
+ getActionBarContributor().setActiveEditor(ConfigurationEditor.this);
handleActivate();
}
}
- public void partBroughtToTop(IWorkbenchPart p) {
- // Ignore.
- }
- public void partClosed(IWorkbenchPart p) {
- // Ignore.
- }
- public void partDeactivated(IWorkbenchPart p) {
- // Ignore.
+ else if (p == ConfigurationEditor.this) {
+ handleActivate();
}
- public void partOpened(IWorkbenchPart p) {
- // Ignore.
- }
- };
+ }
+ public void partBroughtToTop(IWorkbenchPart p) {
+ // Ignore.
+ }
+ public void partClosed(IWorkbenchPart p) {
+ // Ignore.
+ }
+ public void partDeactivated(IWorkbenchPart p) {
+ // Ignore.
+ }
+ public void partOpened(IWorkbenchPart p) {
+ // Ignore.
+ }
+ };
/**
* Resources that have been removed since last activation.
@@ -370,51 +370,51 @@ public class ConfigurationEditor
* <!-- end-user-doc -->
* @generated
*/
- protected EContentAdapter problemIndicationAdapter =
+ protected EContentAdapter problemIndicationAdapter =
new EContentAdapter() {
- @Override
- public void notifyChanged(Notification notification) {
- if (notification.getNotifier() instanceof Resource) {
- switch (notification.getFeatureID(Resource.class)) {
- case Resource.RESOURCE__IS_LOADED:
- case Resource.RESOURCE__ERRORS:
- case Resource.RESOURCE__WARNINGS: {
- Resource resource = (Resource)notification.getNotifier();
- Diagnostic diagnostic = analyzeResourceProblems(resource, null);
- if (diagnostic.getSeverity() != Diagnostic.OK) {
- resourceToDiagnosticMap.put(resource, diagnostic);
- }
- else {
- resourceToDiagnosticMap.remove(resource);
- }
+ @Override
+ public void notifyChanged(Notification notification) {
+ if (notification.getNotifier() instanceof Resource) {
+ switch (notification.getFeatureID(Resource.class)) {
+ case Resource.RESOURCE__IS_LOADED:
+ case Resource.RESOURCE__ERRORS:
+ case Resource.RESOURCE__WARNINGS: {
+ Resource resource = (Resource)notification.getNotifier();
+ Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+ if (diagnostic.getSeverity() != Diagnostic.OK) {
+ resourceToDiagnosticMap.put(resource, diagnostic);
+ }
+ else {
+ resourceToDiagnosticMap.remove(resource);
+ }
- if (updateProblemIndication) {
- getSite().getShell().getDisplay().asyncExec
- (new Runnable() {
- public void run() {
- updateProblemIndication();
- }
- });
+ if (updateProblemIndication) {
+ getSite().getShell().getDisplay().asyncExec
+ (new Runnable() {
+ public void run() {
+ updateProblemIndication();
}
- break;
- }
+ });
}
+ break;
}
- else {
- super.notifyChanged(notification);
}
}
-
- @Override
- protected void setTarget(Resource target) {
- basicSetTarget(target);
+ else {
+ super.notifyChanged(notification);
}
+ }
- @Override
- protected void unsetTarget(Resource target) {
- basicUnsetTarget(target);
- }
- };
+ @Override
+ protected void setTarget(Resource target) {
+ basicSetTarget(target);
+ }
+
+ @Override
+ protected void unsetTarget(Resource target) {
+ basicUnsetTarget(target);
+ }
+ };
/**
* This listens for workspace changes.
@@ -424,74 +424,74 @@ public class ConfigurationEditor
*/
protected IResourceChangeListener resourceChangeListener =
new IResourceChangeListener() {
- public void resourceChanged(IResourceChangeEvent event) {
- IResourceDelta delta = event.getDelta();
- try {
- class ResourceDeltaVisitor implements IResourceDeltaVisitor {
- protected ResourceSet resourceSet = editingDomain.getResourceSet();
- protected Collection<Resource> changedResources = new ArrayList<Resource>();
- protected Collection<Resource> removedResources = new ArrayList<Resource>();
-
- public boolean visit(IResourceDelta delta) {
- if (delta.getResource().getType() == IResource.FILE) {
- if (delta.getKind() == IResourceDelta.REMOVED ||
- delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
- Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
- if (resource != null) {
- if (delta.getKind() == IResourceDelta.REMOVED) {
- removedResources.add(resource);
- }
- else if (!savedResources.remove(resource)) {
- changedResources.add(resource);
- }
+ public void resourceChanged(IResourceChangeEvent event) {
+ IResourceDelta delta = event.getDelta();
+ try {
+ class ResourceDeltaVisitor implements IResourceDeltaVisitor {
+ protected ResourceSet resourceSet = editingDomain.getResourceSet();
+ protected Collection<Resource> changedResources = new ArrayList<Resource>();
+ protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+ public boolean visit(IResourceDelta delta) {
+ if (delta.getResource().getType() == IResource.FILE) {
+ if (delta.getKind() == IResourceDelta.REMOVED ||
+ delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
+ Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+ if (resource != null) {
+ if (delta.getKind() == IResourceDelta.REMOVED) {
+ removedResources.add(resource);
+ }
+ else if (!savedResources.remove(resource)) {
+ changedResources.add(resource);
}
}
}
-
- return true;
- }
-
- public Collection<Resource> getChangedResources() {
- return changedResources;
}
- public Collection<Resource> getRemovedResources() {
- return removedResources;
- }
+ return true;
}
- final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
- delta.accept(visitor);
-
- if (!visitor.getRemovedResources().isEmpty()) {
- getSite().getShell().getDisplay().asyncExec
- (new Runnable() {
- public void run() {
- removedResources.addAll(visitor.getRemovedResources());
- if (!isDirty()) {
- getSite().getPage().closeEditor(ConfigurationEditor.this, false);
- }
- }
- });
+ public Collection<Resource> getChangedResources() {
+ return changedResources;
}
- if (!visitor.getChangedResources().isEmpty()) {
- getSite().getShell().getDisplay().asyncExec
- (new Runnable() {
- public void run() {
- changedResources.addAll(visitor.getChangedResources());
- if (getSite().getPage().getActiveEditor() == ConfigurationEditor.this) {
- handleActivate();
- }
- }
- });
+ public Collection<Resource> getRemovedResources() {
+ return removedResources;
}
}
- catch (CoreException exception) {
- ConfigurationEditorPlugin.INSTANCE.log(exception);
+
+ final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
+ delta.accept(visitor);
+
+ if (!visitor.getRemovedResources().isEmpty()) {
+ getSite().getShell().getDisplay().asyncExec
+ (new Runnable() {
+ public void run() {
+ removedResources.addAll(visitor.getRemovedResources());
+ if (!isDirty()) {
+ getSite().getPage().closeEditor(ConfigurationEditor.this, false);
+ }
+ }
+ });
+ }
+
+ if (!visitor.getChangedResources().isEmpty()) {
+ getSite().getShell().getDisplay().asyncExec
+ (new Runnable() {
+ public void run() {
+ changedResources.addAll(visitor.getChangedResources());
+ if (getSite().getPage().getActiveEditor() == ConfigurationEditor.this) {
+ handleActivate();
+ }
+ }
+ });
}
}
- };
+ catch (CoreException exception) {
+ ConfigurationEditorPlugin.INSTANCE.log(exception);
+ }
+ }
+ };
/**
* Handles activation of the editor or it's associated views.
@@ -503,11 +503,11 @@ public class ConfigurationEditor
// Recompute the read only state.
//
if (editingDomain.getResourceToReadOnlyMap() != null) {
- editingDomain.getResourceToReadOnlyMap().clear();
+ editingDomain.getResourceToReadOnlyMap().clear();
- // Refresh any actions that may become enabled or disabled.
- //
- setSelection(getSelection());
+ // Refresh any actions that may become enabled or disabled.
+ //
+ setSelection(getSelection());
}
if (!removedResources.isEmpty()) {
@@ -564,7 +564,7 @@ public class ConfigurationEditor
updateProblemIndication();
}
}
-
+
/**
* Updates the problems indication with the information described in the specified diagnostic.
* <!-- begin-user-doc -->
@@ -575,11 +575,11 @@ public class ConfigurationEditor
if (updateProblemIndication) {
BasicDiagnostic diagnostic =
new BasicDiagnostic
- (Diagnostic.OK,
- "org.eclipse.papyrus.core.queries.configuration.editor",
- 0,
- null,
- new Object [] { editingDomain.getResourceSet() });
+ (Diagnostic.OK,
+ "org.eclipse.papyrus.core.queries.configuration.editor",
+ 0,
+ null,
+ new Object [] { editingDomain.getResourceSet() });
for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
if (childDiagnostic.getSeverity() != Diagnostic.OK) {
diagnostic.add(childDiagnostic);
@@ -631,9 +631,9 @@ public class ConfigurationEditor
protected boolean handleDirtyConflict() {
return
MessageDialog.openQuestion
- (getSite().getShell(),
- getString("_UI_FileConflict_label"),
- getString("_WARN_FileConflict"));
+ (getSite().getShell(),
+ getString("_UI_FileConflict_label"),
+ getString("_WARN_FileConflict"));
}
/**
@@ -672,26 +672,26 @@ public class ConfigurationEditor
// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
//
commandStack.addCommandStackListener
- (new CommandStackListener() {
- public void commandStackChanged(final EventObject event) {
- getContainer().getDisplay().asyncExec
- (new Runnable() {
- public void run() {
- firePropertyChange(IEditorPart.PROP_DIRTY);
-
- // Try to select the affected objects.
- //
- Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();
- if (mostRecentCommand != null) {
- setSelectionToViewer(mostRecentCommand.getAffectedObjects());
- }
- if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {
- propertySheetPage.refresh();
- }
- }
- });
- }
- });
+ (new CommandStackListener() {
+ public void commandStackChanged(final EventObject event) {
+ getContainer().getDisplay().asyncExec
+ (new Runnable() {
+ public void run() {
+ firePropertyChange(IEditorPart.PROP_DIRTY);
+
+ // Try to select the affected objects.
+ //
+ Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();
+ if (mostRecentCommand != null) {
+ setSelectionToViewer(mostRecentCommand.getAffectedObjects());
+ }
+ if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {
+ propertySheetPage.refresh();
+ }
+ }
+ });
+ }
+ });
// Create the editing domain with a special command stack.
//
@@ -704,7 +704,7 @@ public class ConfigurationEditor
* <!-- end-user-doc -->
* @generated
*/
- @Override
+ @Override
protected void firePropertyChange(int action) {
super.firePropertyChange(action);
}
@@ -722,14 +722,14 @@ public class ConfigurationEditor
if (theSelection != null && !theSelection.isEmpty()) {
Runnable runnable =
new Runnable() {
- public void run() {
- // Try to select the items in the current content viewer of the editor.
- //
- if (currentViewer != null) {
- currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
- }
+ public void run() {
+ // Try to select the items in the current content viewer of the editor.
+ //
+ if (currentViewer != null) {
+ currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
}
- };
+ }
+ };
getSite().getShell().getDisplay().asyncExec(runnable);
}
}
@@ -836,12 +836,12 @@ public class ConfigurationEditor
//
selectionChangedListener =
new ISelectionChangedListener() {
- // This just notifies those things that are affected by the section.
- //
- public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
- setSelection(selectionChangedEvent.getSelection());
- }
- };
+ // This just notifies those things that are affected by the section.
+ //
+ public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
+ setSelection(selectionChangedEvent.getSelection());
+ }
+ };
}
// Stop listening to the old one.
@@ -935,22 +935,22 @@ public class ConfigurationEditor
if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
BasicDiagnostic basicDiagnostic =
new BasicDiagnostic
- (Diagnostic.ERROR,
- "org.eclipse.papyrus.core.queries.configuration.editor",
- 0,
- getString("_UI_CreateModelError_message", resource.getURI()),
- new Object [] { exception == null ? (Object)resource : exception });
+ (Diagnostic.ERROR,
+ "org.eclipse.papyrus.core.queries.configuration.editor",
+ 0,
+ getString("_UI_CreateModelError_message", resource.getURI()),
+ new Object [] { exception == null ? (Object)resource : exception });
basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
return basicDiagnostic;
}
else if (exception != null) {
return
new BasicDiagnostic
- (Diagnostic.ERROR,
- "org.eclipse.papyrus.core.queries.configuration.editor",
- 0,
- getString("_UI_CreateModelError_message", resource.getURI()),
- new Object[] { exception });
+ (Diagnostic.ERROR,
+ "org.eclipse.papyrus.core.queries.configuration.editor",
+ 0,
+ getString("_UI_CreateModelError_message", resource.getURI()),
+ new Object[] { exception });
}
else {
return Diagnostic.OK_INSTANCE;
@@ -977,18 +977,18 @@ public class ConfigurationEditor
{
ViewerPane viewerPane =
new ViewerPane(getSite().getPage(), ConfigurationEditor.this) {
- @Override
- public Viewer createViewer(Composite composite) {
- Tree tree = new Tree(composite, SWT.MULTI);
- TreeViewer newTreeViewer = new TreeViewer(tree);
- return newTreeViewer;
- }
- @Override
- public void requestActivation() {
- super.requestActivation();
- setCurrentViewerPane(this);
- }
- };
+ @Override
+ public Viewer createViewer(Composite composite) {
+ Tree tree = new Tree(composite, SWT.MULTI);
+ TreeViewer newTreeViewer = new TreeViewer(tree);
+ return newTreeViewer;
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
viewerPane.createControl(getContainer());
selectionViewer = (TreeViewer)viewerPane.getViewer();
@@ -1011,18 +1011,18 @@ public class ConfigurationEditor
{
ViewerPane viewerPane =
new ViewerPane(getSite().getPage(), ConfigurationEditor.this) {
- @Override
- public Viewer createViewer(Composite composite) {
- Tree tree = new Tree(composite, SWT.MULTI);
- TreeViewer newTreeViewer = new TreeViewer(tree);
- return newTreeViewer;
- }
- @Override
- public void requestActivation() {
- super.requestActivation();
- setCurrentViewerPane(this);
- }
- };
+ @Override
+ public Viewer createViewer(Composite composite) {
+ Tree tree = new Tree(composite, SWT.MULTI);
+ TreeViewer newTreeViewer = new TreeViewer(tree);
+ return newTreeViewer;
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
viewerPane.createControl(getContainer());
parentViewer = (TreeViewer)viewerPane.getViewer();
@@ -1040,16 +1040,16 @@ public class ConfigurationEditor
{
ViewerPane viewerPane =
new ViewerPane(getSite().getPage(), ConfigurationEditor.this) {
- @Override
- public Viewer createViewer(Composite composite) {
- return new ListViewer(composite);
- }
- @Override
- public void requestActivation() {
- super.requestActivation();
- setCurrentViewerPane(this);
- }
- };
+ @Override
+ public Viewer createViewer(Composite composite) {
+ return new ListViewer(composite);
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
viewerPane.createControl(getContainer());
listViewer = (ListViewer)viewerPane.getViewer();
listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
@@ -1065,16 +1065,16 @@ public class ConfigurationEditor
{
ViewerPane viewerPane =
new ViewerPane(getSite().getPage(), ConfigurationEditor.this) {
- @Override
- public Viewer createViewer(Composite composite) {
- return new TreeViewer(composite);
- }
- @Override
- public void requestActivation() {
- super.requestActivation();
- setCurrentViewerPane(this);
- }
- };
+ @Override
+ public Viewer createViewer(Composite composite) {
+ return new TreeViewer(composite);
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
viewerPane.createControl(getContainer());
treeViewer = (TreeViewer)viewerPane.getViewer();
treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
@@ -1092,16 +1092,16 @@ public class ConfigurationEditor
{
ViewerPane viewerPane =
new ViewerPane(getSite().getPage(), ConfigurationEditor.this) {
- @Override
- public Viewer createViewer(Composite composite) {
- return new TableViewer(composite);
- }
- @Override
- public void requestActivation() {
- super.requestActivation();
- setCurrentViewerPane(this);
- }
- };
+ @Override
+ public Viewer createViewer(Composite composite) {
+ return new TableViewer(composite);
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
viewerPane.createControl(getContainer());
tableViewer = (TableViewer)viewerPane.getViewer();
@@ -1135,16 +1135,16 @@ public class ConfigurationEditor
{
ViewerPane viewerPane =
new ViewerPane(getSite().getPage(), ConfigurationEditor.this) {
- @Override
- public Viewer createViewer(Composite composite) {
- return new TreeViewer(composite);
- }
- @Override
- public void requestActivation() {
- super.requestActivation();
- setCurrentViewerPane(this);
- }
- };
+ @Override
+ public Viewer createViewer(Composite composite) {
+ return new TreeViewer(composite);
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
viewerPane.createControl(getContainer());
treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
@@ -1174,35 +1174,35 @@ public class ConfigurationEditor
}
getSite().getShell().getDisplay().asyncExec
- (new Runnable() {
- public void run() {
- setActivePage(0);
- }
- });
+ (new Runnable() {
+ public void run() {
+ setActivePage(0);
+ }
+ });
}
// Ensures that this editor will only display the page's tab
// area if there are more than one page
//
getContainer().addControlListener
- (new ControlAdapter() {
- boolean guard = false;
- @Override
- public void controlResized(ControlEvent event) {
- if (!guard) {
- guard = true;
- hideTabs();
- guard = false;
- }
+ (new ControlAdapter() {
+ boolean guard = false;
+ @Override
+ public void controlResized(ControlEvent event) {
+ if (!guard) {
+ guard = true;
+ hideTabs();
+ guard = false;
}
- });
+ }
+ });
getSite().getShell().getDisplay().asyncExec
- (new Runnable() {
- public void run() {
- updateProblemIndication();
- }
- });
+ (new Runnable() {
+ public void run() {
+ updateProblemIndication();
+ }
+ });
}
/**
@@ -1307,9 +1307,9 @@ public class ConfigurationEditor
createContextMenuFor(contentOutlineViewer);
if (!editingDomain.getResourceSet().getResources().isEmpty()) {
- // Select the root object in the view.
- //
- contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+ // Select the root object in the view.
+ //
+ contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
}
}
@@ -1331,13 +1331,13 @@ public class ConfigurationEditor
// Listen to selection so that we can handle it is a special way.
//
contentOutlinePage.addSelectionChangedListener
- (new ISelectionChangedListener() {
- // This ensures that we handle selections correctly.
- //
- public void selectionChanged(SelectionChangedEvent event) {
- handleContentOutlineSelection(event.getSelection());
- }
- });
+ (new ISelectionChangedListener() {
+ // This ensures that we handle selections correctly.
+ //
+ public void selectionChanged(SelectionChangedEvent event) {
+ handleContentOutlineSelection(event.getSelection());
+ }
+ });
}
return contentOutlinePage;
@@ -1353,18 +1353,18 @@ public class ConfigurationEditor
if (propertySheetPage == null) {
propertySheetPage =
new ExtendedPropertySheetPage(editingDomain) {
- @Override
- public void setSelectionToViewer(List<?> selection) {
- ConfigurationEditor.this.setSelectionToViewer(selection);
- ConfigurationEditor.this.setFocus();
- }
+ @Override
+ public void setSelectionToViewer(List<?> selection) {
+ ConfigurationEditor.this.setSelectionToViewer(selection);
+ ConfigurationEditor.this.setFocus();
+ }
- @Override
- public void setActionBars(IActionBars actionBars) {
- super.setActionBars(actionBars);
- getActionBarContributor().shareGlobalActions(this, actionBars);
- }
- };
+ @Override
+ public void setActionBars(IActionBars actionBars) {
+ super.setActionBars(actionBars);
+ getActionBarContributor().shareGlobalActions(this, actionBars);
+ }
+ };
propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
}
@@ -1438,30 +1438,30 @@ public class ConfigurationEditor
//
WorkspaceModifyOperation operation =
new WorkspaceModifyOperation() {
- // This is the method that gets invoked when the operation runs.
+ // This is the method that gets invoked when the operation runs.
+ //
+ @Override
+ public void execute(IProgressMonitor monitor) {
+ // Save the resources to the file system.
//
- @Override
- public void execute(IProgressMonitor monitor) {
- // Save the resources to the file system.
- //
- boolean first = true;
- for (Resource resource : editingDomain.getResourceSet().getResources()) {
- if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
- try {
- long timeStamp = resource.getTimeStamp();
- resource.save(saveOptions);
- if (resource.getTimeStamp() != timeStamp) {
- savedResources.add(resource);
- }
+ boolean first = true;
+ for (Resource resource : editingDomain.getResourceSet().getResources()) {
+ if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
+ try {
+ long timeStamp = resource.getTimeStamp();
+ resource.save(saveOptions);
+ if (resource.getTimeStamp() != timeStamp) {
+ savedResources.add(resource);
}
- catch (Exception exception) {
- resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
- }
- first = false;
}
+ catch (Exception exception) {
+ resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+ }
+ first = false;
}
}
- };
+ }
+ };
updateProblemIndication = false;
try {
@@ -1485,7 +1485,7 @@ public class ConfigurationEditor
/**
* This returns whether something has been persisted to the URI of the specified resource.
- * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
+ * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -1547,8 +1547,8 @@ public class ConfigurationEditor
IProgressMonitor progressMonitor =
getActionBars().getStatusLineManager() != null ?
getActionBars().getStatusLineManager().getProgressMonitor() :
- new NullProgressMonitor();
- doSave(progressMonitor);
+ new NullProgressMonitor();
+ doSave(progressMonitor);
}
/**
@@ -1564,7 +1564,7 @@ public class ConfigurationEditor
URI uri = URI.createURI(uriAttribute);
EObject eObject = editingDomain.getResourceSet().getEObject(uri, true);
if (eObject != null) {
- setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));
+ setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));
}
}
}
@@ -1664,19 +1664,19 @@ public class ConfigurationEditor
if (selection instanceof IStructuredSelection) {
Collection<?> collection = ((IStructuredSelection)selection).toList();
switch (collection.size()) {
- case 0: {
- statusLineManager.setMessage(getString("_UI_NoObjectSelected"));
- break;
- }
- case 1: {
- String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
- statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));
- break;
- }
- default: {
- statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));
- break;
- }
+ case 0: {
+ statusLineManager.setMessage(getString("_UI_NoObjectSelected"));
+ break;
+ }
+ case 1: {
+ String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
+ statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));
+ break;
+ }
+ default: {
+ statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));
+ break;
+ }
}
}
else {
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/src-gen/org/eclipse/papyrus/core/queries/configuration/presentation/ConfigurationEditorPlugin.java b/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/src-gen/org/eclipse/papyrus/core/queries/configuration/presentation/ConfigurationEditorPlugin.java
index e871d73496d..17a2fa94532 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/src-gen/org/eclipse/papyrus/core/queries/configuration/presentation/ConfigurationEditorPlugin.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/src-gen/org/eclipse/papyrus/core/queries/configuration/presentation/ConfigurationEditorPlugin.java
@@ -7,15 +7,10 @@
package org.eclipse.papyrus.core.queries.configuration.presentation;
import org.eclipse.emf.common.EMFPlugin;
-
import org.eclipse.emf.common.ui.EclipseUIPlugin;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
import org.eclipse.emf.facet.infra.query.edit.provider.QueryEditPlugin;
-
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
/**
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/src-gen/org/eclipse/papyrus/core/queries/configuration/presentation/ConfigurationModelWizard.java b/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/src-gen/org/eclipse/papyrus/core/queries/configuration/presentation/ConfigurationModelWizard.java
index 4ae7d323902..c1209190139 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/src-gen/org/eclipse/papyrus/core/queries/configuration/presentation/ConfigurationModelWizard.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.core.queries.configuration.editor/src-gen/org/eclipse/papyrus/core/queries/configuration/presentation/ConfigurationModelWizard.java
@@ -17,76 +17,51 @@ import java.util.Map;
import java.util.MissingResourceException;
import java.util.StringTokenizer;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.emf.common.CommonPlugin;
-
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EClassifier;
-
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
-
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
-
import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
import org.eclipse.jface.dialogs.MessageDialog;
-
+import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-
+import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardPage;
-
+import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationFactory;
+import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage;
+import org.eclipse.papyrus.infra.queries.core.configuration.provider.ConfigurationEditPlugin;
import org.eclipse.swt.SWT;
-
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.ModifyEvent;
-
+import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
-
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
-
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-
-import org.eclipse.papyrus.core.queries.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.core.queries.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.core.queries.configuration.provider.ConfigurationEditPlugin;
-
-
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
/**
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/META-INF/MANIFEST.MF b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/META-INF/MANIFEST.MF
index 01bcb8e0ff1..2dc4b55845a 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/META-INF/MANIFEST.MF
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/META-INF/MANIFEST.MF
@@ -10,10 +10,10 @@ Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.papyrus.extendedtypes.provider
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.papyrus.extendedtypes;bundle-version="0.8.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="2.7.0";visibility:=reexport,
- org.eclipse.papyrus.core.queries.configuration;bundle-version="0.8.0";visibility:=reexport,
- org.eclipse.papyrus.core.queries.configuration.edit;bundle-version="0.8.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.queries.core.configuration;bundle-version="0.9.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.queries.core.configuration.edit;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="2.7.0";visibility:=reexport,
org.eclipse.emf.ecore.edit;bundle-version="2.7.0";visibility:=reexport,
org.eclipse.emf.facet.infra.query;bundle-version="0.1.0";visibility:=reexport,
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ActionConfigurationItemProvider.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ActionConfigurationItemProvider.java
index fe84516c13d..cda7f5f2d49 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ActionConfigurationItemProvider.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ActionConfigurationItemProvider.java
@@ -12,9 +12,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -25,9 +23,8 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.papyrus.extendedtypes.ActionConfiguration;
-import org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.extendedtypes.ActionConfiguration} object.
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ExtendedElementTypeConfigurationItemProvider.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ExtendedElementTypeConfigurationItemProvider.java
index 12089d140d7..7b59e78bb5f 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ExtendedElementTypeConfigurationItemProvider.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ExtendedElementTypeConfigurationItemProvider.java
@@ -12,11 +12,8 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -27,10 +24,9 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration;
-import org.eclipse.papyrus.extendedtypes.ExtendedtypesFactory;
-import org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration} object.
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ExtendedElementTypeSetItemProvider.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ExtendedElementTypeSetItemProvider.java
index 19e8deeedce..23f04c9351d 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ExtendedElementTypeSetItemProvider.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ExtendedElementTypeSetItemProvider.java
@@ -12,11 +12,8 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -27,10 +24,9 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.papyrus.extendedtypes.ExtendedElementTypeSet;
-import org.eclipse.papyrus.extendedtypes.ExtendedtypesFactory;
-import org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.extendedtypes.ExtendedElementTypeSet} object.
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ExtendedTypesEditPlugin.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ExtendedTypesEditPlugin.java
index 4843b68d08e..e694533d7db 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ExtendedTypesEditPlugin.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ExtendedTypesEditPlugin.java
@@ -10,7 +10,7 @@ import org.eclipse.emf.common.EMFPlugin;
import org.eclipse.emf.common.util.ResourceLocator;
import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
import org.eclipse.emf.facet.infra.query.edit.provider.QueryEditPlugin;
-import org.eclipse.papyrus.core.queries.configuration.provider.ConfigurationEditPlugin;
+import org.eclipse.papyrus.infra.queries.core.configuration.provider.ConfigurationEditPlugin;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
/**
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ExtendedtypesItemProviderAdapterFactory.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ExtendedtypesItemProviderAdapterFactory.java
index e0700d79e01..cab423c7666 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ExtendedtypesItemProviderAdapterFactory.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/ExtendedtypesItemProviderAdapterFactory.java
@@ -12,7 +12,6 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.edit.provider.ChangeNotifier;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -24,8 +23,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.INotifyChangedListener;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-import org.eclipse.papyrus.extendedtypes.util.ExtendedtypesAdapterFactory;
+import org.eclipse.papyrus.infra.extendedtypes.util.ExtendedtypesAdapterFactory;
/**
* This is the factory that is used to provide the interfaces needed to support Viewers.
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/IconEntryItemProvider.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/IconEntryItemProvider.java
index d73fb1077a2..bc68f5c8abf 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/IconEntryItemProvider.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/IconEntryItemProvider.java
@@ -12,9 +12,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -25,9 +23,8 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.extendedtypes.IconEntry;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.IconEntry;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.extendedtypes.IconEntry} object.
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/PostActionConfigurationItemProvider.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/PostActionConfigurationItemProvider.java
index 2d4660bcfdb..c518533ba38 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/PostActionConfigurationItemProvider.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/PostActionConfigurationItemProvider.java
@@ -12,15 +12,13 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-import org.eclipse.papyrus.extendedtypes.PostActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.PostActionConfiguration;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.extendedtypes.PostActionConfiguration} object.
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/PreActionConfigurationItemProvider.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/PreActionConfigurationItemProvider.java
index 16577ff6e56..dca348531ad 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/PreActionConfigurationItemProvider.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.edit/src-gen/org/eclipse/papyrus/extendedtypes/provider/PreActionConfigurationItemProvider.java
@@ -12,15 +12,13 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-import org.eclipse.papyrus.extendedtypes.PreActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.PreActionConfiguration;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.extendedtypes.PreActionConfiguration} object.
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/META-INF/MANIFEST.MF b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/META-INF/MANIFEST.MF
index 104e8da7005..084abdbf4cc 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/META-INF/MANIFEST.MF
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/META-INF/MANIFEST.MF
@@ -11,11 +11,11 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.papyrus.extendedtypes.presentation
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.core.resources;bundle-version="3.7.0";visibility:=reexport,
- org.eclipse.papyrus.extendedtypes.edit;bundle-version="0.8.0";visibility:=reexport,
+ org.eclipse.papyrus.extendedtypes.edit;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="2.6.0";visibility:=reexport,
org.eclipse.emf.edit.ui;bundle-version="2.7.0";visibility:=reexport,
org.eclipse.ui.ide;bundle-version="3.7.0";visibility:=reexport,
- org.eclipse.papyrus.core.queries.configuration.edit;bundle-version="0.8.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.queries.core.configuration.edit;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.ecore.edit;bundle-version="2.7.0";visibility:=reexport,
org.eclipse.emf.facet.infra.query.edit;bundle-version="0.1.0";visibility:=reexport,
org.eclipse.uml2.uml.edit;bundle-version="3.1.0";visibility:=reexport
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/src-gen/org/eclipse/papyrus/extendedtypes/presentation/ExtendedTypesEditorPlugin.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/src-gen/org/eclipse/papyrus/extendedtypes/presentation/ExtendedTypesEditorPlugin.java
index 15bb83f7885..7ae8fc139ac 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/src-gen/org/eclipse/papyrus/extendedtypes/presentation/ExtendedTypesEditorPlugin.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/src-gen/org/eclipse/papyrus/extendedtypes/presentation/ExtendedTypesEditorPlugin.java
@@ -7,18 +7,12 @@
package org.eclipse.papyrus.extendedtypes.presentation;
import org.eclipse.emf.common.EMFPlugin;
-
import org.eclipse.emf.common.ui.EclipseUIPlugin;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
import org.eclipse.emf.facet.infra.query.edit.provider.QueryEditPlugin;
-
-import org.eclipse.papyrus.core.queries.configuration.provider.ConfigurationEditPlugin;
-
import org.eclipse.papyrus.extendedtypes.provider.ExtendedTypesEditPlugin;
+import org.eclipse.papyrus.infra.queries.core.configuration.provider.ConfigurationEditPlugin;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
/**
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/src-gen/org/eclipse/papyrus/extendedtypes/presentation/ExtendedtypesActionBarContributor.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/src-gen/org/eclipse/papyrus/extendedtypes/presentation/ExtendedtypesActionBarContributor.java
index 62ab5892a54..981a8c6986a 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/src-gen/org/eclipse/papyrus/extendedtypes/presentation/ExtendedtypesActionBarContributor.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/src-gen/org/eclipse/papyrus/extendedtypes/presentation/ExtendedtypesActionBarContributor.java
@@ -10,17 +10,14 @@ import java.util.ArrayList;
import java.util.Collection;
import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-
import org.eclipse.emf.edit.ui.action.ControlAction;
import org.eclipse.emf.edit.ui.action.CreateChildAction;
import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
import org.eclipse.emf.edit.ui.action.LoadResourceAction;
import org.eclipse.emf.edit.ui.action.ValidateAction;
-
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IAction;
@@ -32,14 +29,12 @@ import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.action.SubContributionItem;
-
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.Viewer;
-
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/src-gen/org/eclipse/papyrus/extendedtypes/presentation/ExtendedtypesEditor.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/src-gen/org/eclipse/papyrus/extendedtypes/presentation/ExtendedtypesEditor.java
index 8ff51a046b3..5e359903a31 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/src-gen/org/eclipse/papyrus/extendedtypes/presentation/ExtendedtypesEditor.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/src-gen/org/eclipse/papyrus/extendedtypes/presentation/ExtendedtypesEditor.java
@@ -91,8 +91,8 @@ import org.eclipse.jface.viewers.TableLayout;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.core.queries.configuration.provider.ConfigurationItemProviderAdapterFactory;
import org.eclipse.papyrus.extendedtypes.provider.ExtendedtypesItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.queries.core.configuration.provider.ConfigurationItemProviderAdapterFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.dnd.DND;
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/src-gen/org/eclipse/papyrus/extendedtypes/presentation/ExtendedtypesModelWizard.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/src-gen/org/eclipse/papyrus/extendedtypes/presentation/ExtendedtypesModelWizard.java
index 8c7b913465d..31271d9fb8d 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/src-gen/org/eclipse/papyrus/extendedtypes/presentation/ExtendedtypesModelWizard.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.editor/src-gen/org/eclipse/papyrus/extendedtypes/presentation/ExtendedtypesModelWizard.java
@@ -17,76 +17,51 @@ import java.util.Map;
import java.util.MissingResourceException;
import java.util.StringTokenizer;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.emf.common.CommonPlugin;
-
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EClassifier;
-
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
-
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
-
import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
import org.eclipse.jface.dialogs.MessageDialog;
-
+import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-
+import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardPage;
-
+import org.eclipse.papyrus.extendedtypes.provider.ExtendedTypesEditPlugin;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
import org.eclipse.swt.SWT;
-
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.ModifyEvent;
-
+import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
-
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
-
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-
-import org.eclipse.papyrus.extendedtypes.ExtendedtypesFactory;
-import org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.extendedtypes.provider.ExtendedTypesEditPlugin;
-
-
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
/**
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/META-INF/MANIFEST.MF b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/META-INF/MANIFEST.MF
index 64e4d153c39..23e96bfefe6 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/META-INF/MANIFEST.MF
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/META-INF/MANIFEST.MF
@@ -10,14 +10,14 @@ Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.provider
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.extendedtypes.emf;visibility:=reexport,
+ org.eclipse.papyrus.infra.extendedtypes.emf;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.papyrus.core.queries.configuration;visibility:=reexport,
- org.eclipse.papyrus.core.queries.configuration.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.queries.core.configuration;bundle-version="0.9.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.queries.core.configuration.edit;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.papyrus.extendedtypes;visibility:=reexport,
- org.eclipse.papyrus.extendedtypes.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="0.9.0";visibility:=reexport,
+ org.eclipse.papyrus.extendedtypes.edit;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.facet.infra.query;visibility:=reexport,
org.eclipse.emf.facet.infra.query.edit;visibility:=reexport,
org.eclipse.uml2.uml;visibility:=reexport,
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ConstantValueItemProvider.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ConstantValueItemProvider.java
index 6aa727c1196..27cb3c06e8b 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ConstantValueItemProvider.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ConstantValueItemProvider.java
@@ -12,9 +12,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -22,10 +20,8 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue;
-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;
-
+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ConstantValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;
import org.eclipse.uml2.uml.UMLFactory;
/**
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/DynamicValueItemProvider.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/DynamicValueItemProvider.java
index 030278b3aa0..0605257dc21 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/DynamicValueItemProvider.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/DynamicValueItemProvider.java
@@ -12,7 +12,6 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/FeatureToSetItemProvider.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/FeatureToSetItemProvider.java
index 57a91c67592..f95d44481df 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/FeatureToSetItemProvider.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/FeatureToSetItemProvider.java
@@ -12,11 +12,8 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -27,10 +24,9 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet;
-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationFactory;
-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;
+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet;
+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationFactory;
+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.FeatureToSet} object.
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/FeatureValueItemProvider.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/FeatureValueItemProvider.java
index c0699ba4b9b..0520fad7e30 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/FeatureValueItemProvider.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/FeatureValueItemProvider.java
@@ -12,9 +12,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ListValueItemProvider.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ListValueItemProvider.java
index c70cc6d76a9..7c84e606a65 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ListValueItemProvider.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ListValueItemProvider.java
@@ -12,7 +12,6 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -20,8 +19,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;
+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ListValue} object.
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ModifySemanticValuesActionConfigurationEditPlugin.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ModifySemanticValuesActionConfigurationEditPlugin.java
index fa24e8684f2..669adc2e3b6 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ModifySemanticValuesActionConfigurationEditPlugin.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ModifySemanticValuesActionConfigurationEditPlugin.java
@@ -7,17 +7,11 @@
package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.provider;
import org.eclipse.emf.common.EMFPlugin;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
import org.eclipse.emf.facet.infra.query.edit.provider.QueryEditPlugin;
-
-import org.eclipse.papyrus.core.queries.configuration.provider.ConfigurationEditPlugin;
-
import org.eclipse.papyrus.extendedtypes.provider.ExtendedTypesEditPlugin;
-
+import org.eclipse.papyrus.infra.queries.core.configuration.provider.ConfigurationEditPlugin;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
/**
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ModifySemanticValuesActionConfigurationItemProvider.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ModifySemanticValuesActionConfigurationItemProvider.java
index 4eca3df08e3..362f29f0e4f 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ModifySemanticValuesActionConfigurationItemProvider.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ModifySemanticValuesActionConfigurationItemProvider.java
@@ -12,11 +12,8 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -24,12 +21,10 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration;
-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationFactory;
-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;
-
import org.eclipse.papyrus.extendedtypes.provider.PostActionConfigurationItemProvider;
+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationFactory;
+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfiguration} object.
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ModifySemanticValuesActionConfigurationItemProviderAdapterFactory.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ModifySemanticValuesActionConfigurationItemProviderAdapterFactory.java
index 6d001bda02e..2ced8708b6d 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ModifySemanticValuesActionConfigurationItemProviderAdapterFactory.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/ModifySemanticValuesActionConfigurationItemProviderAdapterFactory.java
@@ -12,7 +12,6 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.edit.provider.ChangeNotifier;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -24,8 +23,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.INotifyChangedListener;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.util.ModifySemanticValuesActionConfigurationAdapterFactory;
+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.util.ModifySemanticValuesActionConfigurationAdapterFactory;
/**
* This is the factory that is used to provide the interfaces needed to support Viewers.
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/QueryExecutionValueItemProvider.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/QueryExecutionValueItemProvider.java
index a8b8f6ad91e..35160e095c5 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/QueryExecutionValueItemProvider.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.edit/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/provider/QueryExecutionValueItemProvider.java
@@ -12,7 +12,6 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -20,8 +19,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;
+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.QueryExecutionValue} object.
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/META-INF/MANIFEST.MF b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/META-INF/MANIFEST.MF
index d75e7d11da1..fe0ae348e30 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/META-INF/MANIFEST.MF
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/META-INF/MANIFEST.MF
@@ -11,13 +11,13 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.presentation
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.papyrus.extendedtypes.emf.edit;visibility:=reexport,
+ org.eclipse.papyrus.extendedtypes.emf.edit;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport,
org.eclipse.emf.edit.ui;visibility:=reexport,
org.eclipse.ui.ide;visibility:=reexport,
- org.eclipse.papyrus.core.queries.configuration.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.queries.core.configuration.edit;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.papyrus.extendedtypes.edit;visibility:=reexport,
+ org.eclipse.papyrus.extendedtypes.edit;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.facet.infra.query.edit;visibility:=reexport,
org.eclipse.uml2.uml.edit;visibility:=reexport
Bundle-ActivationPolicy: lazy
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/presentation/ModifySemanticValuesActionConfigurationActionBarContributor.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/presentation/ModifySemanticValuesActionConfigurationActionBarContributor.java
index 737a3b78400..0facd42584a 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/presentation/ModifySemanticValuesActionConfigurationActionBarContributor.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/presentation/ModifySemanticValuesActionConfigurationActionBarContributor.java
@@ -10,17 +10,14 @@ import java.util.ArrayList;
import java.util.Collection;
import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-
import org.eclipse.emf.edit.ui.action.ControlAction;
import org.eclipse.emf.edit.ui.action.CreateChildAction;
import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
import org.eclipse.emf.edit.ui.action.LoadResourceAction;
import org.eclipse.emf.edit.ui.action.ValidateAction;
-
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IAction;
@@ -32,14 +29,12 @@ import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.action.SubContributionItem;
-
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.Viewer;
-
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/presentation/ModifySemanticValuesActionConfigurationEditor.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/presentation/ModifySemanticValuesActionConfigurationEditor.java
index 9d41b691cd6..c45a53242f7 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/presentation/ModifySemanticValuesActionConfigurationEditor.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/presentation/ModifySemanticValuesActionConfigurationEditor.java
@@ -91,9 +91,9 @@ import org.eclipse.jface.viewers.TableLayout;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.core.queries.configuration.provider.ConfigurationItemProviderAdapterFactory;
import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.provider.ModifySemanticValuesActionConfigurationItemProviderAdapterFactory;
import org.eclipse.papyrus.extendedtypes.provider.ExtendedtypesItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.queries.core.configuration.provider.ConfigurationItemProviderAdapterFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.dnd.DND;
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/presentation/ModifySemanticValuesActionConfigurationEditorPlugin.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/presentation/ModifySemanticValuesActionConfigurationEditorPlugin.java
index ce9e076a67d..934f56e9cb4 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/presentation/ModifySemanticValuesActionConfigurationEditorPlugin.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/presentation/ModifySemanticValuesActionConfigurationEditorPlugin.java
@@ -7,19 +7,12 @@
package org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.presentation;
import org.eclipse.emf.common.EMFPlugin;
-
import org.eclipse.emf.common.ui.EclipseUIPlugin;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
import org.eclipse.emf.facet.infra.query.edit.provider.QueryEditPlugin;
-
-import org.eclipse.papyrus.core.queries.configuration.provider.ConfigurationEditPlugin;
-
import org.eclipse.papyrus.extendedtypes.provider.ExtendedTypesEditPlugin;
-
+import org.eclipse.papyrus.infra.queries.core.configuration.provider.ConfigurationEditPlugin;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
/**
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/presentation/ModifySemanticValuesActionConfigurationModelWizard.java b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/presentation/ModifySemanticValuesActionConfigurationModelWizard.java
index 523db078ee0..23c4687aac9 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/presentation/ModifySemanticValuesActionConfigurationModelWizard.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.extendedtypes.emf.editor/src-gen/org/eclipse/papyrus/extendedtypes/emf/modifysemanticvaluesactionconfiguration/presentation/ModifySemanticValuesActionConfigurationModelWizard.java
@@ -17,76 +17,51 @@ import java.util.Map;
import java.util.MissingResourceException;
import java.util.StringTokenizer;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.emf.common.CommonPlugin;
-
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EClassifier;
-
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
-
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
-
import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
import org.eclipse.jface.dialogs.MessageDialog;
-
+import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-
+import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardPage;
-
+import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.provider.ModifySemanticValuesActionConfigurationEditPlugin;
+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationFactory;
+import org.eclipse.papyrus.infra.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;
import org.eclipse.swt.SWT;
-
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.ModifyEvent;
-
+import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
-
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
-
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-
-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationFactory;
-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.ModifySemanticValuesActionConfigurationPackage;
-import org.eclipse.papyrus.extendedtypes.emf.modifysemanticvaluesactionconfiguration.provider.ModifySemanticValuesActionConfigurationEditPlugin;
-
-
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
/**
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/META-INF/MANIFEST.MF b/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/META-INF/MANIFEST.MF
index 283f61c5d9c..ecb994263cc 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/META-INF/MANIFEST.MF
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/META-INF/MANIFEST.MF
@@ -11,11 +11,11 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.papyrus.paletteconfiguration.presentation
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.papyrus.paletteconfiguration.edit;visibility:=reexport,
+ org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport,
org.eclipse.emf.edit.ui;visibility:=reexport,
org.eclipse.ui.ide;visibility:=reexport,
- org.eclipse.papyrus.core.queries.configuration.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.queries.core.configuration.edit;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.ecore.edit;visibility:=reexport,
org.eclipse.emf.facet.infra.query.edit;visibility:=reexport,
org.eclipse.uml2.uml.edit;visibility:=reexport
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/src-gen/org/eclipse/papyrus/paletteconfiguration/presentation/PaletteConfigurationEditorPlugin.java b/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/src-gen/org/eclipse/papyrus/paletteconfiguration/presentation/PaletteConfigurationEditorPlugin.java
index d373bfd0e5c..21ea18ca0a2 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/src-gen/org/eclipse/papyrus/paletteconfiguration/presentation/PaletteConfigurationEditorPlugin.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/src-gen/org/eclipse/papyrus/paletteconfiguration/presentation/PaletteConfigurationEditorPlugin.java
@@ -7,17 +7,11 @@
package org.eclipse.papyrus.paletteconfiguration.presentation;
import org.eclipse.emf.common.EMFPlugin;
-
import org.eclipse.emf.common.ui.EclipseUIPlugin;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
import org.eclipse.emf.facet.infra.query.edit.provider.QueryEditPlugin;
-
-import org.eclipse.papyrus.core.queries.configuration.provider.ConfigurationEditPlugin;
-
+import org.eclipse.papyrus.infra.queries.core.configuration.provider.ConfigurationEditPlugin;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
/**
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/src-gen/org/eclipse/papyrus/paletteconfiguration/presentation/PaletteconfigurationActionBarContributor.java b/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/src-gen/org/eclipse/papyrus/paletteconfiguration/presentation/PaletteconfigurationActionBarContributor.java
index ed547e21f51..bdfe4897caa 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/src-gen/org/eclipse/papyrus/paletteconfiguration/presentation/PaletteconfigurationActionBarContributor.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/src-gen/org/eclipse/papyrus/paletteconfiguration/presentation/PaletteconfigurationActionBarContributor.java
@@ -10,17 +10,14 @@ import java.util.ArrayList;
import java.util.Collection;
import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-
import org.eclipse.emf.edit.ui.action.ControlAction;
import org.eclipse.emf.edit.ui.action.CreateChildAction;
import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
import org.eclipse.emf.edit.ui.action.LoadResourceAction;
import org.eclipse.emf.edit.ui.action.ValidateAction;
-
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IAction;
@@ -32,14 +29,12 @@ import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.action.SubContributionItem;
-
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.Viewer;
-
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/src-gen/org/eclipse/papyrus/paletteconfiguration/presentation/PaletteconfigurationEditor.java b/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/src-gen/org/eclipse/papyrus/paletteconfiguration/presentation/PaletteconfigurationEditor.java
index 395134bad04..4385fb93c67 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/src-gen/org/eclipse/papyrus/paletteconfiguration/presentation/PaletteconfigurationEditor.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/src-gen/org/eclipse/papyrus/paletteconfiguration/presentation/PaletteconfigurationEditor.java
@@ -91,8 +91,8 @@ import org.eclipse.jface.viewers.TableLayout;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.core.queries.configuration.provider.ConfigurationItemProviderAdapterFactory;
-import org.eclipse.papyrus.paletteconfiguration.provider.PaletteconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.queries.core.configuration.provider.ConfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit.provider.PaletteconfigurationItemProviderAdapterFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.dnd.DND;
diff --git a/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/src-gen/org/eclipse/papyrus/paletteconfiguration/presentation/PaletteconfigurationModelWizard.java b/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/src-gen/org/eclipse/papyrus/paletteconfiguration/presentation/PaletteconfigurationModelWizard.java
index 4c856ed39bc..70190b87c8e 100644
--- a/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/src-gen/org/eclipse/papyrus/paletteconfiguration/presentation/PaletteconfigurationModelWizard.java
+++ b/tests/debug/plugins/core/org.eclipse.papyrus.paletteconfiguration.editor/src-gen/org/eclipse/papyrus/paletteconfiguration/presentation/PaletteconfigurationModelWizard.java
@@ -17,76 +17,51 @@ import java.util.Map;
import java.util.MissingResourceException;
import java.util.StringTokenizer;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.emf.common.CommonPlugin;
-
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EClassifier;
-
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
-
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
-
import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
import org.eclipse.jface.dialogs.MessageDialog;
-
+import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-
+import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardPage;
-
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationFactory;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit.provider.PaletteConfigurationEditPlugin;
import org.eclipse.swt.SWT;
-
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.ModifyEvent;
-
+import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
-
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
-
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-
-import org.eclipse.papyrus.paletteconfiguration.PaletteconfigurationFactory;
-import org.eclipse.papyrus.paletteconfiguration.PaletteconfigurationPackage;
-import org.eclipse.papyrus.paletteconfiguration.provider.PaletteConfigurationEditPlugin;
-
-
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
/**
diff --git a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/META-INF/MANIFEST.MF b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/META-INF/MANIFEST.MF
index e351edd303b..0fb37f9c25c 100644
--- a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/META-INF/MANIFEST.MF
+++ b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/META-INF/MANIFEST.MF
@@ -10,14 +10,14 @@ Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.papyrus.extendedtypes.uml.applystereotypeactionconfiguration.provider
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.extendedtypes.uml;visibility:=reexport,
+ org.eclipse.papyrus.uml.tools.extendedtypes;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.papyrus.core.queries.configuration;visibility:=reexport,
- org.eclipse.papyrus.core.queries.configuration.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.queries.core.configuration;bundle-version="0.9.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.queries.core.configuration.edit;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.papyrus.extendedtypes;visibility:=reexport,
- org.eclipse.papyrus.extendedtypes.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="0.9.0";visibility:=reexport,
+ org.eclipse.papyrus.extendedtypes.edit;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.facet.infra.query;visibility:=reexport,
org.eclipse.emf.facet.infra.query.edit;visibility:=reexport,
org.eclipse.uml2.uml;visibility:=reexport,
diff --git a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/provider/ApplyStereotypeActionConfigurationEditPlugin.java b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/provider/ApplyStereotypeActionConfigurationEditPlugin.java
index beb55eab91d..799259bcac9 100644
--- a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/provider/ApplyStereotypeActionConfigurationEditPlugin.java
+++ b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/provider/ApplyStereotypeActionConfigurationEditPlugin.java
@@ -7,17 +7,11 @@
package org.eclipse.papyrus.extendedtypes.uml.applystereotypeactionconfiguration.provider;
import org.eclipse.emf.common.EMFPlugin;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
import org.eclipse.emf.facet.infra.query.edit.provider.QueryEditPlugin;
-
-import org.eclipse.papyrus.core.queries.configuration.provider.ConfigurationEditPlugin;
-
import org.eclipse.papyrus.extendedtypes.provider.ExtendedTypesEditPlugin;
-
+import org.eclipse.papyrus.infra.queries.core.configuration.provider.ConfigurationEditPlugin;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
/**
diff --git a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/provider/ApplyStereotypeActionConfigurationItemProvider.java b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/provider/ApplyStereotypeActionConfigurationItemProvider.java
index d75ab1e08cb..06db51a3470 100644
--- a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/provider/ApplyStereotypeActionConfigurationItemProvider.java
+++ b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/provider/ApplyStereotypeActionConfigurationItemProvider.java
@@ -12,11 +12,8 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -24,12 +21,10 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ViewerNotification;
-
import org.eclipse.papyrus.extendedtypes.provider.PostActionConfigurationItemProvider;
-
-import org.eclipse.papyrus.extendedtypes.uml.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration;
-import org.eclipse.papyrus.extendedtypes.uml.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationFactory;
-import org.eclipse.papyrus.extendedtypes.uml.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationFactory;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.extendedtypes.uml.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration} object.
diff --git a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/provider/ApplyStereotypeActionConfigurationItemProviderAdapterFactory.java b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/provider/ApplyStereotypeActionConfigurationItemProviderAdapterFactory.java
index e169d2e533f..39245d6b8b7 100644
--- a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/provider/ApplyStereotypeActionConfigurationItemProviderAdapterFactory.java
+++ b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/provider/ApplyStereotypeActionConfigurationItemProviderAdapterFactory.java
@@ -12,7 +12,6 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.edit.provider.ChangeNotifier;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -24,8 +23,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.INotifyChangedListener;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-import org.eclipse.papyrus.extendedtypes.uml.applystereotypeactionconfiguration.util.ApplyStereotypeActionConfigurationAdapterFactory;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.util.ApplyStereotypeActionConfigurationAdapterFactory;
/**
* This is the factory that is used to provide the interfaces needed to support Viewers.
diff --git a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/provider/StereotypeToApplyItemProvider.java b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/provider/StereotypeToApplyItemProvider.java
index 82fa1b3bdb5..babf4968b6c 100644
--- a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/provider/StereotypeToApplyItemProvider.java
+++ b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.edit/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/provider/StereotypeToApplyItemProvider.java
@@ -12,9 +12,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -25,9 +23,8 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.papyrus.extendedtypes.uml.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;
-import org.eclipse.papyrus.extendedtypes.uml.applystereotypeactionconfiguration.StereotypeToApply;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.extendedtypes.uml.applystereotypeactionconfiguration.StereotypeToApply} object.
diff --git a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/META-INF/MANIFEST.MF b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/META-INF/MANIFEST.MF
index d7f19f25d10..27b8ec3168b 100644
--- a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/META-INF/MANIFEST.MF
+++ b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/META-INF/MANIFEST.MF
@@ -11,13 +11,13 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.papyrus.extendedtypes.uml.applystereotypeactionconfiguration.presentation
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.papyrus.extendedtypes.uml.edit;visibility:=reexport,
+ org.eclipse.papyrus.extendedtypes.uml.edit;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport,
org.eclipse.emf.edit.ui;visibility:=reexport,
org.eclipse.ui.ide;visibility:=reexport,
- org.eclipse.papyrus.core.queries.configuration.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.queries.core.configuration.edit;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.papyrus.extendedtypes.edit;visibility:=reexport,
+ org.eclipse.papyrus.extendedtypes.edit;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.facet.infra.query.edit;visibility:=reexport,
org.eclipse.uml2.uml.edit;visibility:=reexport
Bundle-ActivationPolicy: lazy
diff --git a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/presentation/ApplyStereotypeActionConfigurationActionBarContributor.java b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/presentation/ApplyStereotypeActionConfigurationActionBarContributor.java
index e02b5b6d409..b79e876cc15 100644
--- a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/presentation/ApplyStereotypeActionConfigurationActionBarContributor.java
+++ b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/presentation/ApplyStereotypeActionConfigurationActionBarContributor.java
@@ -10,17 +10,14 @@ import java.util.ArrayList;
import java.util.Collection;
import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-
import org.eclipse.emf.edit.ui.action.ControlAction;
import org.eclipse.emf.edit.ui.action.CreateChildAction;
import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
import org.eclipse.emf.edit.ui.action.LoadResourceAction;
import org.eclipse.emf.edit.ui.action.ValidateAction;
-
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IAction;
@@ -32,14 +29,12 @@ import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.action.SubContributionItem;
-
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.Viewer;
-
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
diff --git a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/presentation/ApplyStereotypeActionConfigurationEditor.java b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/presentation/ApplyStereotypeActionConfigurationEditor.java
index 9dabbb17b24..6a7f5b64435 100644
--- a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/presentation/ApplyStereotypeActionConfigurationEditor.java
+++ b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/presentation/ApplyStereotypeActionConfigurationEditor.java
@@ -91,9 +91,9 @@ import org.eclipse.jface.viewers.TableLayout;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.core.queries.configuration.provider.ConfigurationItemProviderAdapterFactory;
import org.eclipse.papyrus.extendedtypes.provider.ExtendedtypesItemProviderAdapterFactory;
import org.eclipse.papyrus.extendedtypes.uml.applystereotypeactionconfiguration.provider.ApplyStereotypeActionConfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.queries.core.configuration.provider.ConfigurationItemProviderAdapterFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.dnd.DND;
diff --git a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/presentation/ApplyStereotypeActionConfigurationEditorPlugin.java b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/presentation/ApplyStereotypeActionConfigurationEditorPlugin.java
index 5bfa8887f67..02ea6c5a552 100644
--- a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/presentation/ApplyStereotypeActionConfigurationEditorPlugin.java
+++ b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/presentation/ApplyStereotypeActionConfigurationEditorPlugin.java
@@ -7,19 +7,12 @@
package org.eclipse.papyrus.extendedtypes.uml.applystereotypeactionconfiguration.presentation;
import org.eclipse.emf.common.EMFPlugin;
-
import org.eclipse.emf.common.ui.EclipseUIPlugin;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
import org.eclipse.emf.facet.infra.query.edit.provider.QueryEditPlugin;
-
-import org.eclipse.papyrus.core.queries.configuration.provider.ConfigurationEditPlugin;
-
import org.eclipse.papyrus.extendedtypes.provider.ExtendedTypesEditPlugin;
-
+import org.eclipse.papyrus.infra.queries.core.configuration.provider.ConfigurationEditPlugin;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
/**
diff --git a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/presentation/ApplyStereotypeActionConfigurationModelWizard.java b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/presentation/ApplyStereotypeActionConfigurationModelWizard.java
index 32d059eeb0f..dc9ce01bb88 100644
--- a/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/presentation/ApplyStereotypeActionConfigurationModelWizard.java
+++ b/tests/debug/plugins/uml/org.eclipse.papyrus.extendedtypes.uml.editor/src-gen/org/eclipse/papyrus/extendedtypes/uml/applystereotypeactionconfiguration/presentation/ApplyStereotypeActionConfigurationModelWizard.java
@@ -17,76 +17,51 @@ import java.util.Map;
import java.util.MissingResourceException;
import java.util.StringTokenizer;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.emf.common.CommonPlugin;
-
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EClassifier;
-
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
-
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
-
import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
import org.eclipse.jface.dialogs.MessageDialog;
-
+import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-
+import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardPage;
-
+import org.eclipse.papyrus.extendedtypes.uml.applystereotypeactionconfiguration.provider.ApplyStereotypeActionConfigurationEditPlugin;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationFactory;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;
import org.eclipse.swt.SWT;
-
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.ModifyEvent;
-
+import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
-
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
-
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-
-import org.eclipse.papyrus.extendedtypes.uml.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationFactory;
-import org.eclipse.papyrus.extendedtypes.uml.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;
-import org.eclipse.papyrus.extendedtypes.uml.applystereotypeactionconfiguration.provider.ApplyStereotypeActionConfigurationEditPlugin;
-
-
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
/**

Back to the top