[Code style] Apply clean-up profile to Papyrus Main plug-ins

27 files changed, 44 insertions, 44 deletions

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/dialog/CustomizationDialogFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/dialog/CustomizationDialogFactory.java
index c82a21d844a..2df06eeba2f 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/dialog/CustomizationDialogFactory.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/dialog/CustomizationDialogFactory.java
@@ -13,6 +13,9 @@
 package org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.dialog;

 

 import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.EClassCustomization;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.dialog.ICustomizationDialogFactory;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.dialog.command.AddCaseQueryDialog;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.dialog.command.AddCustomizationPropertyDialog;

@@ -22,9 +25,6 @@ import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.dialog.IDialog;
 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.handler.HandlerUtils;

 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.dialog.SynchronizedAbstractDialog;

 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.command.ICommandWidget;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.EClassCustomization;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase;

 import org.eclipse.swt.widgets.Display;

 

 /**

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/command/AddCaseQueryDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/command/AddCaseQueryDialog.java
index 10eea97658e..1d688b2eda9 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/command/AddCaseQueryDialog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/command/AddCaseQueryDialog.java
@@ -13,6 +13,7 @@
 package org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.dialog.command;

 

 import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.Messages;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.dialog.AbstractCustomizationMainDialog;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.widget.command.AddCaseQueryWidget;

@@ -20,7 +21,6 @@ import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.Q
 import org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.exported.IQueryContext;

 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.command.ICommandWidget;

 import org.eclipse.papyrus.emf.facet.util.ui.utils.PropertyElement2;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase;

 

 /**

  * Concrete dialog for the creation of a query in a case.

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/command/AddCustomizationPropertyDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/command/AddCustomizationPropertyDialog.java
index cbf2c3aec5d..35a4c06d8e1 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/command/AddCustomizationPropertyDialog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/command/AddCustomizationPropertyDialog.java
@@ -13,13 +13,13 @@
 package org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.dialog.command;

 

 import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.EClassCustomization;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.Messages;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.dialog.AbstractCustomizationMainDialog;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.widget.command.AddCustomizationPropertyWidget;

 import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation;

 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.command.ICommandWidget;

 import org.eclipse.papyrus.emf.facet.util.ui.utils.PropertyElement2;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.EClassCustomization;

 

 /**

  * Concrete dialog for the creation of a customization property into a

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/command/CreateEClassCustomizationDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/command/CreateEClassCustomizationDialog.java
index c811d3cdc57..9919ed80d74 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/command/CreateEClassCustomizationDialog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/command/CreateEClassCustomizationDialog.java
@@ -14,13 +14,13 @@ package org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.dialog.command
 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.Messages;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.dialog.AbstractCustomizationMainDialog;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.widget.command.CreateEClassCustomizationWidget;

 import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet;

 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.command.ICommandWidget;

 import org.eclipse.papyrus.emf.facet.util.ui.utils.PropertyElement2;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

 

 /**

  * Concrete dialog for the creation of an EClass Customization.

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/command/CreateFacetCustomizationDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/command/CreateFacetCustomizationDialog.java
index 3b52860fa9b..3d042e4f99b 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/command/CreateFacetCustomizationDialog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/command/CreateFacetCustomizationDialog.java
@@ -13,12 +13,12 @@
 package org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.dialog.command;

 

 import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.Messages;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.widget.command.CreateFacetCustomizationWidget;

 import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet;

 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.command.ICommandWidget;

 import org.eclipse.papyrus.emf.facet.util.ui.utils.PropertyElement2;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

 

 /**

  * Concrete dialog for the creation of a Facet Customization.

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/command/QueryContext.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/command/QueryContext.java
index 1f8a421e307..82d78d0854f 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/command/QueryContext.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/command/QueryContext.java
@@ -15,13 +15,13 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase;
 import org.eclipse.papyrus.emf.facet.efacet.core.FacetUtils;
 import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement;
 import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet;
 import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.Query;
 import org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.exported.IQueryContext;
 import org.eclipse.papyrus.emf.facet.util.emf.core.ModelUtils;
-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase;
 
 public class QueryContext implements IQueryContext {
 
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/getorcreate/GetOrCreateCustomizationDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/getorcreate/GetOrCreateCustomizationDialog.java
index 59bfb21358b..9ea7e7cf6fe 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/getorcreate/GetOrCreateCustomizationDialog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/dialog/getorcreate/GetOrCreateCustomizationDialog.java
@@ -13,6 +13,7 @@
 package org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.dialog.getorcreate;

 

 import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.Messages;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.sync.SynchronizedGetOrCreateFilteredElementCommmandWidget;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.dialog.AbstractGetOrCreateCustomizationDialog;

@@ -21,7 +22,6 @@ import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.dialog.IWithResul
 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.command.ICommandWidget;

 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.command.IGetOrCreateFilteredElementCommmandWidget;

 import org.eclipse.papyrus.emf.facet.util.ui.utils.PropertyElement2;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

 

 /**

  * Provide a dialog where the user can select a {@link Customization} in the

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/handler/AddCaseQueryHandler.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/handler/AddCaseQueryHandler.java
index 12889ddf60f..839cd4eec4a 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/handler/AddCaseQueryHandler.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/handler/AddCaseQueryHandler.java
@@ -15,9 +15,9 @@ package org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.handler;
 import org.eclipse.core.commands.ExecutionEvent;

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.dialog.ICustomizationDialogFactory;

 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.handler.AbstractSelectionExpectedTypeHandler;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase;

 import org.eclipse.swt.widgets.Display;

 

 /**

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/handler/AddCustomizationPropertyInEClassHandler.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/handler/AddCustomizationPropertyInEClassHandler.java
index d760d4d4d15..d824b8255cf 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/handler/AddCustomizationPropertyInEClassHandler.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/handler/AddCustomizationPropertyInEClassHandler.java
@@ -15,9 +15,9 @@ package org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.handler;
 import org.eclipse.core.commands.ExecutionEvent;

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.EClassCustomization;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.dialog.ICustomizationDialogFactory;

 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.handler.AbstractSelectionExpectedTypeHandler;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.EClassCustomization;

 import org.eclipse.swt.widgets.Display;

 

 /**

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/handler/AddCustomizationPropertyInFacetHandler.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/handler/AddCustomizationPropertyInFacetHandler.java
index e931e49fa5c..a0a9ea8aac7 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/handler/AddCustomizationPropertyInFacetHandler.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/handler/AddCustomizationPropertyInFacetHandler.java
@@ -15,9 +15,9 @@ package org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.handler;
 import org.eclipse.core.commands.ExecutionEvent;

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.FacetCustomization;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.dialog.ICustomizationDialogFactory;

 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.handler.AbstractSelectionExpectedTypeHandler;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.FacetCustomization;

 import org.eclipse.swt.widgets.Display;

 

 /**

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/handler/CreateEClassCustomizationHandler.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/handler/CreateEClassCustomizationHandler.java
index 0126e811fd8..c8a9473612d 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/handler/CreateEClassCustomizationHandler.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/handler/CreateEClassCustomizationHandler.java
@@ -15,9 +15,9 @@ package org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.handler;
 import org.eclipse.core.commands.ExecutionEvent;

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.dialog.ICustomizationDialogFactory;

 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.handler.AbstractSelectionExpectedTypeHandler;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

 import org.eclipse.swt.widgets.Display;

 

 /**

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/handler/CreateFacetCustomizationHandler.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/handler/CreateFacetCustomizationHandler.java
index 0b711d64433..8b97b2bff48 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/handler/CreateFacetCustomizationHandler.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/handler/CreateFacetCustomizationHandler.java
@@ -15,9 +15,9 @@ package org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.handler;
 import org.eclipse.core.commands.ExecutionEvent;

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.dialog.ICustomizationDialogFactory;

 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.handler.AbstractSelectionExpectedTypeHandler;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

 import org.eclipse.swt.widgets.Display;

 

 /**

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/command/AddCaseQueryWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/command/AddCaseQueryWidget.java
index a4bbe285f25..f27f7d662b1 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/command/AddCaseQueryWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/command/AddCaseQueryWidget.java
@@ -13,6 +13,7 @@
 package org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.widget.command;

 

 import org.eclipse.emf.common.command.Command;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase;

 import org.eclipse.papyrus.emf.facet.custom.sdk.core.ICustomizationCommandFactory;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.widget.property.name.GetCaseQueryNameWidget;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.widget.property.name.GetCaseQueryTypeWidget;

@@ -21,7 +22,6 @@ import org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.exported.IQueryConte
 import org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.query.SelectQueryTypeWidget;

 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.command.AbstractCommandWidget;

 import org.eclipse.papyrus.emf.facet.util.ui.utils.PropertyElement2;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase;

 import org.eclipse.swt.widgets.Composite;

 

 /**

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/command/AddCustomizationPropertyWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/command/AddCustomizationPropertyWidget.java
index b910846ad9b..8c23f2e0f45 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/command/AddCustomizationPropertyWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/command/AddCustomizationPropertyWidget.java
@@ -16,15 +16,15 @@ import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.CustomFactory;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.EClassCustomization;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementSwitchQuery;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.widget.getorcreate.GetOperationFacetWidget;

 import org.eclipse.papyrus.emf.facet.efacet.core.IFacetCommandFactoryFactory;

 import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation;

 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.command.AbstractCommandWidget;

 import org.eclipse.papyrus.emf.facet.util.ui.utils.PropertyElement2;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.CustomFactory;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.EClassCustomization;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementSwitchQuery;

 import org.eclipse.swt.widgets.Composite;

 

 /**

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/command/CreateEClassCustomizationWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/command/CreateEClassCustomizationWidget.java
index 15a314dd89f..97c8e40912a 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/command/CreateEClassCustomizationWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/command/CreateEClassCustomizationWidget.java
@@ -15,6 +15,9 @@ package org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.widget.command
 import org.eclipse.emf.common.command.Command;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.CustomFactory;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.EClassCustomization;

 import org.eclipse.papyrus.emf.facet.custom.sdk.core.ICustomizationCommandFactory;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.widget.getorcreate.GetExtendedFacetWidget;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.widget.getorcreate.GetOrCreateCustomizationWidget;

@@ -23,9 +26,6 @@ import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet;
 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.command.AbstractCommandWidget;

 import org.eclipse.papyrus.emf.facet.util.ui.utils.PropertyElement;

 import org.eclipse.papyrus.emf.facet.util.ui.utils.PropertyElement2;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.CustomFactory;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.EClassCustomization;

 import org.eclipse.swt.widgets.Composite;

 

 /**

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/command/CreateFacetCustomizationWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/command/CreateFacetCustomizationWidget.java
index e2f2ef05e8f..0cb1276931f 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/command/CreateFacetCustomizationWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/command/CreateFacetCustomizationWidget.java
@@ -15,14 +15,14 @@ package org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.widget.command
 import org.eclipse.emf.common.command.Command;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.CustomFactory;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.FacetCustomization;

 import org.eclipse.papyrus.emf.facet.custom.sdk.core.ICustomizationCommandFactory;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.widget.getorcreate.GetCustomizedFacetWidget;

 import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet;

 import org.eclipse.papyrus.emf.facet.util.ui.utils.PropertyElement;

 import org.eclipse.papyrus.emf.facet.util.ui.utils.PropertyElement2;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.CustomFactory;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.FacetCustomization;

 import org.eclipse.swt.widgets.Composite;

 

 /**

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/command/GetOrCreateCustomizationWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/command/GetOrCreateCustomizationWidget.java
index 5c41e006cff..8403dfbfb0d 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/command/GetOrCreateCustomizationWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/command/GetOrCreateCustomizationWidget.java
@@ -17,6 +17,7 @@ import java.util.Map;
 

 import org.eclipse.emf.common.command.Command;

 import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.dialog.command.CreateEClassCustomizationDialog;

 import org.eclipse.papyrus.emf.facet.efacet.core.FacetUtils;

 import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;

@@ -24,7 +25,6 @@ import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.dialog.IDialog;
 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.command.AbstractGetOrCreateFilteredElementCommandWidget;

 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.command.ICommandWidget;

 import org.eclipse.papyrus.emf.facet.util.ui.utils.PropertyElement2;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

 import org.eclipse.swt.widgets.Composite;

 

 /**

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetFiltredExtendedFacetWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetFiltredExtendedFacetWidget.java
index 98915d14aa7..1d75631cd74 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetFiltredExtendedFacetWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetFiltredExtendedFacetWidget.java
@@ -20,14 +20,14 @@ import java.util.Map;
 import org.eclipse.core.runtime.Platform;

 import org.eclipse.emf.common.command.Command;

 import org.eclipse.emf.ecore.EClassifier;

+import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationPropertiesCatalogManager;

+import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationPropertiesCatalogManagerFactory;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.Activator;

 import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet;

 import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;

 import org.eclipse.papyrus.emf.facet.util.emf.ui.util.EditingUtil;

 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.dialog.IDialog;

 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.command.AbstractGetOrCreateFilteredElementCommandWidget;

-import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationPropertiesCatalogManager;

-import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationPropertiesCatalogManagerFactory;

 import org.eclipse.swt.widgets.Composite;

 

 /**

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetOrCreateCustomizationWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetOrCreateCustomizationWidget.java
index a22d56eadc7..8f8b206f9ce 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetOrCreateCustomizationWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetOrCreateCustomizationWidget.java
@@ -13,6 +13,7 @@
 package org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.widget.getorcreate;

 

 import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.Messages;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.dialog.getorcreate.GetOrCreateCustomizationDialog;

 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.dialog.IDialog;

@@ -21,7 +22,6 @@ import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.comma
 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.command.IGetOrCreateFilteredElementCommmandWidget;

 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.component.getorcreate.AbstractGetOrCreateElementWithDialogButtonWidget;

 import org.eclipse.papyrus.emf.facet.util.ui.utils.PropertyElement2;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

 import org.eclipse.swt.widgets.Composite;

 

 /**

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/property/name/GetCaseQueryNameWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/property/name/GetCaseQueryNameWidget.java
index 887371fbcbd..412b97f2aba 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/property/name/GetCaseQueryNameWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/widget/property/name/GetCaseQueryNameWidget.java
@@ -13,10 +13,10 @@
 package org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.widget.property.name;

 

 import org.eclipse.emf.ecore.ETypedElement;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.Messages;

 import org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.component.properties.name.AbstractPrintElementWidget;

 import org.eclipse.papyrus.emf.facet.util.ui.utils.PropertyElement2;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.ETypedElementCase;

 import org.eclipse.swt.widgets.Composite;

 

 /**

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/wizard/CreateCustimizationWizardImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/wizard/CreateCustimizationWizardImpl.java
index 1056325005e..7b89e4cca78 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/wizard/CreateCustimizationWizardImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/wizard/CreateCustimizationWizardImpl.java
@@ -14,14 +14,6 @@ package org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.wizard;
 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.resources.IProject;

 import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.papyrus.emf.facet.custom.sdk.core.ICustomizationActions;

-import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.Activator;

-import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.Messages;

-import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.wizard.page.CreateCustomizationWizardPage;

-import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.wizard.page.CustomPropertyWizardPage;

-import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.wizard.page.ICreateCustomizationWizardPage;

-import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.wizard.page.ICustomizationPropertyWizardPage;

-import org.eclipse.papyrus.emf.facet.util.core.Logger;

 import org.eclipse.jface.dialogs.MessageDialog;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

@@ -32,6 +24,14 @@ import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardDialog;

 import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.CustomPackage;

 import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

+import org.eclipse.papyrus.emf.facet.custom.sdk.core.ICustomizationActions;

+import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.Activator;

+import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.Messages;

+import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.wizard.page.CreateCustomizationWizardPage;

+import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.wizard.page.CustomPropertyWizardPage;

+import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.wizard.page.ICreateCustomizationWizardPage;

+import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.wizard.page.ICustomizationPropertyWizardPage;

+import org.eclipse.papyrus.emf.facet.util.core.Logger;

 import org.eclipse.swt.widgets.Display;

 import org.eclipse.ui.IEditorDescriptor;

 import org.eclipse.ui.IEditorPart;

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/wizard/page/CreateCustomizationWizardPage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/wizard/page/CreateCustomizationWizardPage.java
index 67df941fcab..30375abd8b2 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/wizard/page/CreateCustomizationWizardPage.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/wizard/page/CreateCustomizationWizardPage.java
@@ -19,9 +19,9 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;

 import org.eclipse.core.runtime.IPath;

 import org.eclipse.core.runtime.Path;

+import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.Messages;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.wizard.page.ICreateCustomizationWizardPage;

-import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

 

 /**

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/wizard/page/CustomPropertyWizardPage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/wizard/page/CustomPropertyWizardPage.java
index eb9eb9b86cf..089a608b30a 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/wizard/page/CustomPropertyWizardPage.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/util/wizard/page/CustomPropertyWizardPage.java
@@ -11,9 +11,9 @@
  */

 package org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.wizard.page;

 

+import org.eclipse.jface.wizard.WizardPage;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.Messages;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.wizard.page.ICustomizationPropertyWizardPage;

-import org.eclipse.jface.wizard.WizardPage;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.layout.GridData;

 import org.eclipse.swt.layout.GridLayout;

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/widgets/celleditors/ImageCellEditor.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/widgets/celleditors/ImageCellEditor.java
index 3d72646558e..d604f897904 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/widgets/celleditors/ImageCellEditor.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/widgets/celleditors/ImageCellEditor.java
@@ -12,11 +12,11 @@ package org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.widgets.celleditors
 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IImage;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.widgets.celleditors.composite.ImageComposite;

 import org.eclipse.papyrus.emf.facet.custom.ui.ImageUtils;

 import org.eclipse.papyrus.emf.facet.widgets.celleditors.IModelCellEditHandler;

 import org.eclipse.papyrus.emf.facet.widgets.celleditors.IModelCellEditor;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IImage;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Control;

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/widgets/celleditors/composite/ImageComposite.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/widgets/celleditors/composite/ImageComposite.java
index 5002faa3dc6..458322817c3 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/widgets/celleditors/composite/ImageComposite.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/widgets/celleditors/composite/ImageComposite.java
@@ -10,10 +10,10 @@
  *******************************************************************************/

 package org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.widgets.celleditors.composite;

 

+import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IImage;

 import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.Messages;

 import org.eclipse.papyrus.emf.facet.custom.ui.ImageUtils;

 import org.eclipse.papyrus.emf.facet.widgets.celleditors.AbstractCellEditorComposite;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IImage;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.PaintEvent;

 import org.eclipse.swt.events.PaintListener;

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/widgets/celleditors/composite/ImageCompositeFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/widgets/celleditors/composite/ImageCompositeFactory.java
index 6d9bfc94e26..a5c4169652a 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/widgets/celleditors/composite/ImageCompositeFactory.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/widgets/celleditors/composite/ImageCompositeFactory.java
@@ -10,9 +10,9 @@
  *******************************************************************************/

 package org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.widgets.celleditors.composite;

 

+import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IImage;

 import org.eclipse.papyrus.emf.facet.widgets.celleditors.AbstractCellEditorComposite;

 import org.eclipse.papyrus.emf.facet.widgets.celleditors.ICompositeEditorFactory;

-import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IImage;

 import org.eclipse.swt.widgets.Composite;

 

 /** Factory for {@link ImageComposite} */

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/wizard/page/ICreateCustomizationWizardPage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/wizard/page/ICreateCustomizationWizardPage.java
index af89914be48..1b490d1d46e 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/wizard/page/ICreateCustomizationWizardPage.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/wizard/page/ICreateCustomizationWizardPage.java
@@ -12,8 +12,8 @@
 package org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.wizard.page;

 

 import org.eclipse.core.resources.IFile;

-import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.wizard.page.CreateCustomizationWizardPage;

 import org.eclipse.jface.wizard.IWizardPage;

+import org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.util.wizard.page.CreateCustomizationWizardPage;

 

 /**

  * Interface to expose the services of {@link CreateCustomizationWizardPage}.