408930: [Table 2] Table must provide a row filter located in the column header

author: Vincent Lorenzo 2015-02-16 15:45:10 +0000
committer: Vincent Lorenzo 2015-02-16 15:48:05 +0000
commit: 2bdec905ed072e56523099a57311c30d7445576a (patch)
tree: 50dd8eec8090de02dc6c735db8e89d84689a6607 /plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor
parent: 4c79b652ac8eb94b5d25ef33db9c796737a85016 (diff)
download: org.eclipse.papyrus-2bdec905ed072e56523099a57311c30d7445576a.tar.gz
org.eclipse.papyrus-2bdec905ed072e56523099a57311c30d7445576a.tar.xz
org.eclipse.papyrus-2bdec905ed072e56523099a57311c30d7445576a.zip
34 files changed, 1319 insertions, 1534 deletions
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties
index 5cf99b8d514..de118b091ff 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties
@@ -14,7 +14,6 @@ bin.includes = .,\
                META-INF/,\
                plugin.xml,\
                plugin.properties,\
-               plugin.pdoc,\
                about.html
 jars.compile.order = .
 source.. = src-gen/,\
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.pdoc b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.pdoc
deleted file mode 100644
index 0f9d81c7a7c..00000000000
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the editor to create table configuration.">
-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
index f508110888f..1355b9c971a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
@@ -9,7 +9,7 @@
 # Contributors:
 # 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus Nattable Model
+pluginName = Nattable Editor
 providerName = Eclipse Modeling Project
 
 _UI_NattableEditor_menu = &Nattable Editor
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisActionBarContributor.java
index 2757571e89e..41214376a76 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisActionBarContributor.java
@@ -49,7 +49,7 @@ import org.eclipse.ui.PartInitException;
  * This is the action bar contributor for the Nattableaxis model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattableaxisActionBarContributor
@@ -59,7 +59,7 @@ public class NattableaxisActionBarContributor
 	 * This keeps track of the active editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IEditorPart activeEditorPart;
@@ -68,7 +68,7 @@ public class NattableaxisActionBarContributor
 	 * This keeps track of the current selection provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelectionProvider selectionProvider;
@@ -77,7 +77,7 @@ public class NattableaxisActionBarContributor
 	 * This action opens the Properties view.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IAction showPropertiesViewAction =
@@ -99,7 +99,7 @@ public class NattableaxisActionBarContributor
 	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IAction refreshViewerAction =
@@ -126,7 +126,7 @@ public class NattableaxisActionBarContributor
 	 * generated for the current selection by the item provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> createChildActions;
@@ -135,7 +135,7 @@ public class NattableaxisActionBarContributor
 	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IMenuManager createChildMenuManager;
@@ -145,7 +145,7 @@ public class NattableaxisActionBarContributor
 	 * generated for the current selection by the item provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> createSiblingActions;
@@ -154,7 +154,7 @@ public class NattableaxisActionBarContributor
 	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IMenuManager createSiblingMenuManager;
@@ -163,7 +163,7 @@ public class NattableaxisActionBarContributor
 	 * This creates an instance of the contributor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NattableaxisActionBarContributor() {
@@ -177,7 +177,7 @@ public class NattableaxisActionBarContributor
 	 * This adds Separators for editor additions to the tool bar.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -191,7 +191,7 @@ public class NattableaxisActionBarContributor
 	 * as well as the sub-menus for object creation items.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -219,7 +219,6 @@ public class NattableaxisActionBarContributor
 		//
 		submenuManager.addMenuListener
 				(new IMenuListener() {
-					@Override
 					public void menuAboutToShow(IMenuManager menuManager) {
 						menuManager.updateAll(true);
 					}
@@ -232,7 +231,7 @@ public class NattableaxisActionBarContributor
 	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -266,7 +265,7 @@ public class NattableaxisActionBarContributor
 	 * that can be added to the selected object and updating the menus accordingly.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -315,7 +314,7 @@ public class NattableaxisActionBarContributor
 	 * and returns the collection of these actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
@@ -333,7 +332,7 @@ public class NattableaxisActionBarContributor
 	 * and returns the collection of these actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
@@ -353,7 +352,7 @@ public class NattableaxisActionBarContributor
 	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
@@ -374,7 +373,7 @@ public class NattableaxisActionBarContributor
 	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
@@ -404,7 +403,7 @@ public class NattableaxisActionBarContributor
 	 * This populates the pop-up menu before it appears.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -425,7 +424,7 @@ public class NattableaxisActionBarContributor
 	 * This inserts global actions before the "additions-end" separator.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -443,7 +442,7 @@ public class NattableaxisActionBarContributor
 	 * This ensures that a delete action will clean up all references to deleted objects.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java
index bd3c0c03c05..033826d6ab3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java
@@ -145,7 +145,7 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
  * This is an example of a Nattableaxis model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattableaxisEditor
@@ -155,7 +155,7 @@ public class NattableaxisEditor
 	 * This keeps track of the editing domain that is used to track all changes to the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected AdapterFactoryEditingDomain editingDomain;
@@ -164,7 +164,7 @@ public class NattableaxisEditor
 	 * This is the one adapter factory used for providing views of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory adapterFactory;
@@ -173,7 +173,7 @@ public class NattableaxisEditor
 	 * This is the content outline page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IContentOutlinePage contentOutlinePage;
@@ -182,7 +182,7 @@ public class NattableaxisEditor
 	 * This is a kludge...
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IStatusLineManager contentOutlineStatusLineManager;
@@ -191,7 +191,7 @@ public class NattableaxisEditor
 	 * This is the content outline page's viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer contentOutlineViewer;
@@ -200,7 +200,7 @@ public class NattableaxisEditor
 	 * This is the property sheet page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
@@ -210,7 +210,7 @@ public class NattableaxisEditor
 	 * The parent relation must be correctly defined for this to work.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer selectionViewer;
@@ -219,7 +219,7 @@ public class NattableaxisEditor
 	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer parentViewer;
@@ -228,7 +228,7 @@ public class NattableaxisEditor
 	 * This shows how a tree view works.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer treeViewer;
@@ -238,7 +238,7 @@ public class NattableaxisEditor
 	 * A list viewer doesn't support icons.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ListViewer listViewer;
@@ -248,7 +248,7 @@ public class NattableaxisEditor
 	 * A table can be used as a list with icons.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TableViewer tableViewer;
@@ -257,7 +257,7 @@ public class NattableaxisEditor
 	 * This shows how a tree view with columns works.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer treeViewerWithColumns;
@@ -266,7 +266,7 @@ public class NattableaxisEditor
 	 * This keeps track of the active viewer pane, in the book.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ViewerPane currentViewerPane;
@@ -275,7 +275,7 @@ public class NattableaxisEditor
 	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Viewer currentViewer;
@@ -284,7 +284,7 @@ public class NattableaxisEditor
 	 * This listens to which ever viewer is active.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelectionChangedListener selectionChangedListener;
@@ -293,7 +293,7 @@ public class NattableaxisEditor
 	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
@@ -302,7 +302,7 @@ public class NattableaxisEditor
 	 * This keeps track of the selection of the editor as a whole.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelection editorSelection = StructuredSelection.EMPTY;
@@ -312,7 +312,7 @@ public class NattableaxisEditor
 	 * in Eclipse's Problems View.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
@@ -321,12 +321,11 @@ public class NattableaxisEditor
 	 * This listens for when the outline becomes active
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IPartListener partListener =
 			new IPartListener() {
-				@Override
 				public void partActivated(IWorkbenchPart p) {
 					if (p instanceof ContentOutline) {
 						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
@@ -346,22 +345,18 @@ public class NattableaxisEditor
 					}
 				}
 
-				@Override
 				public void partBroughtToTop(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partClosed(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partDeactivated(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partOpened(IWorkbenchPart p) {
 					// Ignore.
 				}
@@ -371,7 +366,7 @@ public class NattableaxisEditor
 	 * Resources that have been removed since last activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> removedResources = new ArrayList<Resource>();
@@ -380,7 +375,7 @@ public class NattableaxisEditor
 	 * Resources that have been changed since last activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> changedResources = new ArrayList<Resource>();
@@ -389,7 +384,7 @@ public class NattableaxisEditor
 	 * Resources that have been saved.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> savedResources = new ArrayList<Resource>();
@@ -398,7 +393,7 @@ public class NattableaxisEditor
 	 * Map to store the diagnostic associated with a resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
@@ -407,7 +402,7 @@ public class NattableaxisEditor
 	 * Controls whether the problem indication should be updated.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean updateProblemIndication = true;
@@ -416,7 +411,7 @@ public class NattableaxisEditor
 	 * Adapter used to update the problem indication when resources are demanded loaded.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected EContentAdapter problemIndicationAdapter =
@@ -440,7 +435,6 @@ public class NattableaxisEditor
 							if (updateProblemIndication) {
 								getSite().getShell().getDisplay().asyncExec
 										(new Runnable() {
-											@Override
 											public void run() {
 												updateProblemIndication();
 											}
@@ -467,7 +461,6 @@ public class NattableaxisEditor
 					if (updateProblemIndication) {
 						getSite().getShell().getDisplay().asyncExec
 								(new Runnable() {
-									@Override
 									public void run() {
 										updateProblemIndication();
 									}
@@ -480,12 +473,11 @@ public class NattableaxisEditor
 	 * This listens for workspace changes.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IResourceChangeListener resourceChangeListener =
 			new IResourceChangeListener() {
-				@Override
 				public void resourceChanged(IResourceChangeEvent event) {
 					IResourceDelta delta = event.getDelta();
 					try {
@@ -494,7 +486,6 @@ public class NattableaxisEditor
 							protected Collection<Resource> changedResources = new ArrayList<Resource>();
 							protected Collection<Resource> removedResources = new ArrayList<Resource>();
 
-							@Override
 							public boolean visit(IResourceDelta delta) {
 								if (delta.getResource().getType() == IResource.FILE) {
 									if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -530,7 +521,6 @@ public class NattableaxisEditor
 						if (!visitor.getRemovedResources().isEmpty()) {
 							getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										@Override
 										public void run() {
 											removedResources.addAll(visitor.getRemovedResources());
 											if (!isDirty()) {
@@ -543,7 +533,6 @@ public class NattableaxisEditor
 						if (!visitor.getChangedResources().isEmpty()) {
 							getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										@Override
 										public void run() {
 											changedResources.addAll(visitor.getChangedResources());
 											if (getSite().getPage().getActiveEditor() == NattableaxisEditor.this) {
@@ -563,7 +552,7 @@ public class NattableaxisEditor
 	 * Handles activation of the editor or it's associated views.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void handleActivate() {
@@ -599,7 +588,7 @@ public class NattableaxisEditor
 	 * Handles what to do with changed resources on activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void handleChangedResources() {
@@ -636,7 +625,7 @@ public class NattableaxisEditor
 	 * Updates the problems indication with the information described in the specified diagnostic.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void updateProblemIndication() {
@@ -691,7 +680,7 @@ public class NattableaxisEditor
 	 * Shows a dialog that asks if conflicting changes should be discarded.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean handleDirtyConflict() {
@@ -705,7 +694,7 @@ public class NattableaxisEditor
 	 * This creates a model editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NattableaxisEditor() {
@@ -717,7 +706,7 @@ public class NattableaxisEditor
 	 * This sets up the editing domain for the model editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void initializeEditingDomain() {
@@ -747,11 +736,9 @@ public class NattableaxisEditor
 		//
 		commandStack.addCommandStackListener
 				(new CommandStackListener() {
-					@Override
 					public void commandStackChanged(final EventObject event) {
 						getContainer().getDisplay().asyncExec
 								(new Runnable() {
-									@Override
 									public void run() {
 										firePropertyChange(IEditorPart.PROP_DIRTY);
 
@@ -784,7 +771,7 @@ public class NattableaxisEditor
 	 * This is here for the listener to be able to call it.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -796,7 +783,7 @@ public class NattableaxisEditor
 	 * This sets the selection into whichever viewer is active.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setSelectionToViewer(Collection<?> collection) {
@@ -806,7 +793,6 @@ public class NattableaxisEditor
 		if (theSelection != null && !theSelection.isEmpty()) {
 			Runnable runnable =
 					new Runnable() {
-						@Override
 						public void run() {
 							// Try to select the items in the current content viewer of the editor.
 							//
@@ -824,7 +810,7 @@ public class NattableaxisEditor
 	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -835,14 +821,14 @@ public class NattableaxisEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
@@ -852,7 +838,7 @@ public class NattableaxisEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -864,7 +850,7 @@ public class NattableaxisEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -876,7 +862,7 @@ public class NattableaxisEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -888,7 +874,7 @@ public class NattableaxisEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -900,7 +886,7 @@ public class NattableaxisEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setCurrentViewerPane(ViewerPane viewerPane) {
@@ -918,7 +904,7 @@ public class NattableaxisEditor
 	 * is the current one.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setCurrentViewer(Viewer viewer) {
@@ -932,7 +918,6 @@ public class NattableaxisEditor
 						new ISelectionChangedListener() {
 							// This just notifies those things that are affected by the section.
 							//
-							@Override
 							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
 								setSelection(selectionChangedEvent.getSelection());
 							}
@@ -965,7 +950,7 @@ public class NattableaxisEditor
 	 * This returns the viewer as required by the {@link IViewerProvider} interface.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -977,7 +962,7 @@ public class NattableaxisEditor
 	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void createContextMenuFor(StructuredViewer viewer) {
@@ -999,7 +984,7 @@ public class NattableaxisEditor
 	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void createModel() {
@@ -1027,7 +1012,7 @@ public class NattableaxisEditor
 	 * and the specified exception (if any).
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
@@ -1056,7 +1041,7 @@ public class NattableaxisEditor
 	 * This is the method used by the framework to install your own controls.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1277,7 +1262,6 @@ public class NattableaxisEditor
 
 			getSite().getShell().getDisplay().asyncExec
 					(new Runnable() {
-						@Override
 						public void run() {
 							setActivePage(0);
 						}
@@ -1303,7 +1287,6 @@ public class NattableaxisEditor
 
 		getSite().getShell().getDisplay().asyncExec
 				(new Runnable() {
-					@Override
 					public void run() {
 						updateProblemIndication();
 					}
@@ -1315,7 +1298,7 @@ public class NattableaxisEditor
 	 * this hides the single tab at the bottom.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void hideTabs() {
@@ -1334,7 +1317,7 @@ public class NattableaxisEditor
 	 * this shows the tabs at the bottom.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void showTabs() {
@@ -1352,7 +1335,7 @@ public class NattableaxisEditor
 	 * This is used to track the active viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1368,7 +1351,7 @@ public class NattableaxisEditor
 	 * This is how the framework determines which interfaces we implement.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("rawtypes")
@@ -1392,7 +1375,7 @@ public class NattableaxisEditor
 	 * This accesses a cached version of the content outliner.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IContentOutlinePage getContentOutlinePage() {
@@ -1444,7 +1427,6 @@ public class NattableaxisEditor
 					(new ISelectionChangedListener() {
 						// This ensures that we handle selections correctly.
 						//
-						@Override
 						public void selectionChanged(SelectionChangedEvent event) {
 							handleContentOutlineSelection(event.getSelection());
 						}
@@ -1458,7 +1440,7 @@ public class NattableaxisEditor
 	 * This accesses a cached version of the property sheet.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IPropertySheetPage getPropertySheetPage() {
@@ -1486,7 +1468,7 @@ public class NattableaxisEditor
 	 * This deals with how we want selection in the outliner to affect the other views.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void handleContentOutlineSelection(ISelection selection) {
@@ -1526,7 +1508,7 @@ public class NattableaxisEditor
 	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1538,7 +1520,7 @@ public class NattableaxisEditor
 	 * This is for implementing {@link IEditorPart} and simply saves the model file.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1602,7 +1584,7 @@ public class NattableaxisEditor
 	 * 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
 	 */
 	protected boolean isPersisted(Resource resource) {
@@ -1623,7 +1605,7 @@ public class NattableaxisEditor
 	 * This always returns true because it is not currently supported.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1635,7 +1617,7 @@ public class NattableaxisEditor
 	 * This also changes the editor's input.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1654,7 +1636,7 @@ public class NattableaxisEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void doSaveAs(URI uri, IEditorInput editorInput) {
@@ -1671,7 +1653,7 @@ public class NattableaxisEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1686,7 +1668,7 @@ public class NattableaxisEditor
 	 * This is called during startup.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1702,7 +1684,7 @@ public class NattableaxisEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1719,7 +1701,7 @@ public class NattableaxisEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1731,7 +1713,7 @@ public class NattableaxisEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1743,7 +1725,7 @@ public class NattableaxisEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1756,7 +1738,7 @@ public class NattableaxisEditor
 	 * Calling this result will notify the listeners.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1772,7 +1754,7 @@ public class NattableaxisEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setStatusLineManager(ISelection selection) {
@@ -1808,7 +1790,7 @@ public class NattableaxisEditor
 	 * This looks up a string in the plugin's plugin.properties file.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static String getString(String key) {
@@ -1819,7 +1801,7 @@ public class NattableaxisEditor
 	 * This looks up a string in plugin.properties, making a substitution.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static String getString(String key, Object s1) {
@@ -1830,7 +1812,7 @@ public class NattableaxisEditor
 	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1841,7 +1823,7 @@ public class NattableaxisEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EditingDomainActionBarContributor getActionBarContributor() {
@@ -1851,7 +1833,7 @@ public class NattableaxisEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IActionBars getActionBars() {
@@ -1861,7 +1843,7 @@ public class NattableaxisEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public AdapterFactory getAdapterFactory() {
@@ -1871,7 +1853,7 @@ public class NattableaxisEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1903,7 +1885,7 @@ public class NattableaxisEditor
 	 * Returns whether the outline view should be presented to the user.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean showOutlineView() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisModelWizard.java
index 5b12c4a57ec..7133cfb3ec4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisModelWizard.java
@@ -75,7 +75,7 @@ import org.eclipse.ui.part.ISetSelectionTarget;
  * This is a simple wizard for creating a new model file.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattableaxisModelWizard extends Wizard implements INewWizard {
@@ -83,7 +83,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * The supported extensions for created files.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final List<String> FILE_EXTENSIONS =
@@ -93,7 +93,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * A formatted list of supported file extensions, suitable for display.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final String FORMATTED_FILE_EXTENSIONS =
@@ -103,7 +103,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableaxisPackage nattableaxisPackage = NattableaxisPackage.eINSTANCE;
@@ -112,7 +112,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableaxisFactory nattableaxisFactory = nattableaxisPackage.getNattableaxisFactory();
@@ -121,7 +121,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * This is the file creation page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableaxisModelWizardNewFileCreationPage newFileCreationPage;
@@ -130,7 +130,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * This is the initial object creation page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableaxisModelWizardInitialObjectCreationPage initialObjectCreationPage;
@@ -139,7 +139,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * Remember the selection during initialization for populating the default container.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IStructuredSelection selection;
@@ -148,7 +148,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * Remember the workbench during initialization.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IWorkbench workbench;
@@ -157,7 +157,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * Caches the names of the types that can be created as the root object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected List<String> initialObjectNames;
@@ -166,7 +166,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * This just records the information.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -181,7 +181,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * Returns the names of the types that can be created as the root object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<String> getInitialObjectNames() {
@@ -204,7 +204,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * Create a new model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected EObject createInitialModel() {
@@ -217,7 +217,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * Do the work after everything is specified.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -279,7 +279,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 				final ISelection targetSelection = new StructuredSelection(modelFile);
 				getShell().getDisplay().asyncExec
 						(new Runnable() {
-							@Override
 							public void run() {
 								((ISetSelectionTarget) activePart).selectReveal(targetSelection);
 							}
@@ -308,7 +307,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * This is the one page of the wizard.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class NattableaxisModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
@@ -316,7 +315,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public NattableaxisModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
@@ -327,7 +326,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		 * The framework calls this to see if the file is correct.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -347,7 +346,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public IFile getModelFile() {
@@ -359,14 +358,14 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * This is the page where the type of object to create is selected.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class NattableaxisModelWizardInitialObjectCreationPage extends WizardPage {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Combo initialObjectField;
@@ -381,7 +380,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Combo encodingField;
@@ -390,7 +389,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public NattableaxisModelWizardInitialObjectCreationPage(String pageId) {
@@ -400,7 +399,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -475,12 +474,11 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected ModifyListener validator =
 				new ModifyListener() {
-					@Override
 					public void modifyText(ModifyEvent e) {
 						setPageComplete(validatePage());
 					}
@@ -489,7 +487,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected boolean validatePage() {
@@ -499,7 +497,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -520,7 +518,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public String getInitialObjectName() {
@@ -537,7 +535,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public String getEncoding() {
@@ -548,7 +546,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		 * Returns the label for the specified type name.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected String getLabel(String typeName) {
@@ -563,7 +561,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Collection<String> getEncodings() {
@@ -582,7 +580,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * The framework calls this to create the contents of the wizard.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -638,7 +636,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * Get the file from the page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IFile getModelFile() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationActionBarContributor.java
index 4ab4e823707..fa0324020f3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationActionBarContributor.java
@@ -49,7 +49,7 @@ import org.eclipse.ui.PartInitException;
  * This is the action bar contributor for the Nattableaxisconfiguration model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattableaxisconfigurationActionBarContributor
@@ -59,7 +59,7 @@ public class NattableaxisconfigurationActionBarContributor
 	 * This keeps track of the active editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IEditorPart activeEditorPart;
@@ -68,7 +68,7 @@ public class NattableaxisconfigurationActionBarContributor
 	 * This keeps track of the current selection provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelectionProvider selectionProvider;
@@ -77,7 +77,7 @@ public class NattableaxisconfigurationActionBarContributor
 	 * This action opens the Properties view.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IAction showPropertiesViewAction =
@@ -99,7 +99,7 @@ public class NattableaxisconfigurationActionBarContributor
 	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IAction refreshViewerAction =
@@ -126,7 +126,7 @@ public class NattableaxisconfigurationActionBarContributor
 	 * generated for the current selection by the item provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> createChildActions;
@@ -135,7 +135,7 @@ public class NattableaxisconfigurationActionBarContributor
 	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IMenuManager createChildMenuManager;
@@ -145,7 +145,7 @@ public class NattableaxisconfigurationActionBarContributor
 	 * generated for the current selection by the item provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> createSiblingActions;
@@ -154,7 +154,7 @@ public class NattableaxisconfigurationActionBarContributor
 	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IMenuManager createSiblingMenuManager;
@@ -163,7 +163,7 @@ public class NattableaxisconfigurationActionBarContributor
 	 * This creates an instance of the contributor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NattableaxisconfigurationActionBarContributor() {
@@ -177,7 +177,7 @@ public class NattableaxisconfigurationActionBarContributor
 	 * This adds Separators for editor additions to the tool bar.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -191,7 +191,7 @@ public class NattableaxisconfigurationActionBarContributor
 	 * as well as the sub-menus for object creation items.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -219,7 +219,6 @@ public class NattableaxisconfigurationActionBarContributor
 		//
 		submenuManager.addMenuListener
 				(new IMenuListener() {
-					@Override
 					public void menuAboutToShow(IMenuManager menuManager) {
 						menuManager.updateAll(true);
 					}
@@ -232,7 +231,7 @@ public class NattableaxisconfigurationActionBarContributor
 	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -266,7 +265,7 @@ public class NattableaxisconfigurationActionBarContributor
 	 * that can be added to the selected object and updating the menus accordingly.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -315,7 +314,7 @@ public class NattableaxisconfigurationActionBarContributor
 	 * and returns the collection of these actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
@@ -333,7 +332,7 @@ public class NattableaxisconfigurationActionBarContributor
 	 * and returns the collection of these actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
@@ -353,7 +352,7 @@ public class NattableaxisconfigurationActionBarContributor
 	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
@@ -374,7 +373,7 @@ public class NattableaxisconfigurationActionBarContributor
 	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
@@ -404,7 +403,7 @@ public class NattableaxisconfigurationActionBarContributor
 	 * This populates the pop-up menu before it appears.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -425,7 +424,7 @@ public class NattableaxisconfigurationActionBarContributor
 	 * This inserts global actions before the "additions-end" separator.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -443,7 +442,7 @@ public class NattableaxisconfigurationActionBarContributor
 	 * This ensures that a delete action will clean up all references to deleted objects.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java
index a5ceda31e94..501d6d5e561 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java
@@ -145,7 +145,7 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
  * This is an example of a Nattableaxisconfiguration model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattableaxisconfigurationEditor
@@ -155,7 +155,7 @@ public class NattableaxisconfigurationEditor
 	 * This keeps track of the editing domain that is used to track all changes to the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected AdapterFactoryEditingDomain editingDomain;
@@ -164,7 +164,7 @@ public class NattableaxisconfigurationEditor
 	 * This is the one adapter factory used for providing views of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory adapterFactory;
@@ -173,7 +173,7 @@ public class NattableaxisconfigurationEditor
 	 * This is the content outline page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IContentOutlinePage contentOutlinePage;
@@ -182,7 +182,7 @@ public class NattableaxisconfigurationEditor
 	 * This is a kludge...
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IStatusLineManager contentOutlineStatusLineManager;
@@ -191,7 +191,7 @@ public class NattableaxisconfigurationEditor
 	 * This is the content outline page's viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer contentOutlineViewer;
@@ -200,7 +200,7 @@ public class NattableaxisconfigurationEditor
 	 * This is the property sheet page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
@@ -210,7 +210,7 @@ public class NattableaxisconfigurationEditor
 	 * The parent relation must be correctly defined for this to work.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer selectionViewer;
@@ -219,7 +219,7 @@ public class NattableaxisconfigurationEditor
 	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer parentViewer;
@@ -228,7 +228,7 @@ public class NattableaxisconfigurationEditor
 	 * This shows how a tree view works.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer treeViewer;
@@ -238,7 +238,7 @@ public class NattableaxisconfigurationEditor
 	 * A list viewer doesn't support icons.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ListViewer listViewer;
@@ -248,7 +248,7 @@ public class NattableaxisconfigurationEditor
 	 * A table can be used as a list with icons.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TableViewer tableViewer;
@@ -257,7 +257,7 @@ public class NattableaxisconfigurationEditor
 	 * This shows how a tree view with columns works.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer treeViewerWithColumns;
@@ -266,7 +266,7 @@ public class NattableaxisconfigurationEditor
 	 * This keeps track of the active viewer pane, in the book.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ViewerPane currentViewerPane;
@@ -275,7 +275,7 @@ public class NattableaxisconfigurationEditor
 	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Viewer currentViewer;
@@ -284,7 +284,7 @@ public class NattableaxisconfigurationEditor
 	 * This listens to which ever viewer is active.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelectionChangedListener selectionChangedListener;
@@ -293,7 +293,7 @@ public class NattableaxisconfigurationEditor
 	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
@@ -302,7 +302,7 @@ public class NattableaxisconfigurationEditor
 	 * This keeps track of the selection of the editor as a whole.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelection editorSelection = StructuredSelection.EMPTY;
@@ -312,7 +312,7 @@ public class NattableaxisconfigurationEditor
 	 * in Eclipse's Problems View.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
@@ -321,12 +321,11 @@ public class NattableaxisconfigurationEditor
 	 * This listens for when the outline becomes active
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IPartListener partListener =
 			new IPartListener() {
-				@Override
 				public void partActivated(IWorkbenchPart p) {
 					if (p instanceof ContentOutline) {
 						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
@@ -346,22 +345,18 @@ public class NattableaxisconfigurationEditor
 					}
 				}
 
-				@Override
 				public void partBroughtToTop(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partClosed(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partDeactivated(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partOpened(IWorkbenchPart p) {
 					// Ignore.
 				}
@@ -371,7 +366,7 @@ public class NattableaxisconfigurationEditor
 	 * Resources that have been removed since last activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> removedResources = new ArrayList<Resource>();
@@ -380,7 +375,7 @@ public class NattableaxisconfigurationEditor
 	 * Resources that have been changed since last activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> changedResources = new ArrayList<Resource>();
@@ -389,7 +384,7 @@ public class NattableaxisconfigurationEditor
 	 * Resources that have been saved.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> savedResources = new ArrayList<Resource>();
@@ -398,7 +393,7 @@ public class NattableaxisconfigurationEditor
 	 * Map to store the diagnostic associated with a resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
@@ -407,7 +402,7 @@ public class NattableaxisconfigurationEditor
 	 * Controls whether the problem indication should be updated.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean updateProblemIndication = true;
@@ -416,7 +411,7 @@ public class NattableaxisconfigurationEditor
 	 * Adapter used to update the problem indication when resources are demanded loaded.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected EContentAdapter problemIndicationAdapter =
@@ -440,7 +435,6 @@ public class NattableaxisconfigurationEditor
 							if (updateProblemIndication) {
 								getSite().getShell().getDisplay().asyncExec
 										(new Runnable() {
-											@Override
 											public void run() {
 												updateProblemIndication();
 											}
@@ -467,7 +461,6 @@ public class NattableaxisconfigurationEditor
 					if (updateProblemIndication) {
 						getSite().getShell().getDisplay().asyncExec
 								(new Runnable() {
-									@Override
 									public void run() {
 										updateProblemIndication();
 									}
@@ -480,12 +473,11 @@ public class NattableaxisconfigurationEditor
 	 * This listens for workspace changes.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IResourceChangeListener resourceChangeListener =
 			new IResourceChangeListener() {
-				@Override
 				public void resourceChanged(IResourceChangeEvent event) {
 					IResourceDelta delta = event.getDelta();
 					try {
@@ -494,7 +486,6 @@ public class NattableaxisconfigurationEditor
 							protected Collection<Resource> changedResources = new ArrayList<Resource>();
 							protected Collection<Resource> removedResources = new ArrayList<Resource>();
 
-							@Override
 							public boolean visit(IResourceDelta delta) {
 								if (delta.getResource().getType() == IResource.FILE) {
 									if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -530,7 +521,6 @@ public class NattableaxisconfigurationEditor
 						if (!visitor.getRemovedResources().isEmpty()) {
 							getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										@Override
 										public void run() {
 											removedResources.addAll(visitor.getRemovedResources());
 											if (!isDirty()) {
@@ -543,7 +533,6 @@ public class NattableaxisconfigurationEditor
 						if (!visitor.getChangedResources().isEmpty()) {
 							getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										@Override
 										public void run() {
 											changedResources.addAll(visitor.getChangedResources());
 											if (getSite().getPage().getActiveEditor() == NattableaxisconfigurationEditor.this) {
@@ -563,7 +552,7 @@ public class NattableaxisconfigurationEditor
 	 * Handles activation of the editor or it's associated views.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void handleActivate() {
@@ -599,7 +588,7 @@ public class NattableaxisconfigurationEditor
 	 * Handles what to do with changed resources on activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void handleChangedResources() {
@@ -636,7 +625,7 @@ public class NattableaxisconfigurationEditor
 	 * Updates the problems indication with the information described in the specified diagnostic.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void updateProblemIndication() {
@@ -691,7 +680,7 @@ public class NattableaxisconfigurationEditor
 	 * Shows a dialog that asks if conflicting changes should be discarded.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean handleDirtyConflict() {
@@ -705,7 +694,7 @@ public class NattableaxisconfigurationEditor
 	 * This creates a model editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NattableaxisconfigurationEditor() {
@@ -717,7 +706,7 @@ public class NattableaxisconfigurationEditor
 	 * This sets up the editing domain for the model editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void initializeEditingDomain() {
@@ -747,11 +736,9 @@ public class NattableaxisconfigurationEditor
 		//
 		commandStack.addCommandStackListener
 				(new CommandStackListener() {
-					@Override
 					public void commandStackChanged(final EventObject event) {
 						getContainer().getDisplay().asyncExec
 								(new Runnable() {
-									@Override
 									public void run() {
 										firePropertyChange(IEditorPart.PROP_DIRTY);
 
@@ -784,7 +771,7 @@ public class NattableaxisconfigurationEditor
 	 * This is here for the listener to be able to call it.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -796,7 +783,7 @@ public class NattableaxisconfigurationEditor
 	 * This sets the selection into whichever viewer is active.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setSelectionToViewer(Collection<?> collection) {
@@ -806,7 +793,6 @@ public class NattableaxisconfigurationEditor
 		if (theSelection != null && !theSelection.isEmpty()) {
 			Runnable runnable =
 					new Runnable() {
-						@Override
 						public void run() {
 							// Try to select the items in the current content viewer of the editor.
 							//
@@ -824,7 +810,7 @@ public class NattableaxisconfigurationEditor
 	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -835,14 +821,14 @@ public class NattableaxisconfigurationEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
@@ -852,7 +838,7 @@ public class NattableaxisconfigurationEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -864,7 +850,7 @@ public class NattableaxisconfigurationEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -876,7 +862,7 @@ public class NattableaxisconfigurationEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -888,7 +874,7 @@ public class NattableaxisconfigurationEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -900,7 +886,7 @@ public class NattableaxisconfigurationEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setCurrentViewerPane(ViewerPane viewerPane) {
@@ -918,7 +904,7 @@ public class NattableaxisconfigurationEditor
 	 * is the current one.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setCurrentViewer(Viewer viewer) {
@@ -932,7 +918,6 @@ public class NattableaxisconfigurationEditor
 						new ISelectionChangedListener() {
 							// This just notifies those things that are affected by the section.
 							//
-							@Override
 							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
 								setSelection(selectionChangedEvent.getSelection());
 							}
@@ -965,7 +950,7 @@ public class NattableaxisconfigurationEditor
 	 * This returns the viewer as required by the {@link IViewerProvider} interface.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -977,7 +962,7 @@ public class NattableaxisconfigurationEditor
 	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void createContextMenuFor(StructuredViewer viewer) {
@@ -999,7 +984,7 @@ public class NattableaxisconfigurationEditor
 	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void createModel() {
@@ -1027,7 +1012,7 @@ public class NattableaxisconfigurationEditor
 	 * and the specified exception (if any).
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
@@ -1056,7 +1041,7 @@ public class NattableaxisconfigurationEditor
 	 * This is the method used by the framework to install your own controls.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1277,7 +1262,6 @@ public class NattableaxisconfigurationEditor
 
 			getSite().getShell().getDisplay().asyncExec
 					(new Runnable() {
-						@Override
 						public void run() {
 							setActivePage(0);
 						}
@@ -1303,7 +1287,6 @@ public class NattableaxisconfigurationEditor
 
 		getSite().getShell().getDisplay().asyncExec
 				(new Runnable() {
-					@Override
 					public void run() {
 						updateProblemIndication();
 					}
@@ -1315,7 +1298,7 @@ public class NattableaxisconfigurationEditor
 	 * this hides the single tab at the bottom.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void hideTabs() {
@@ -1334,7 +1317,7 @@ public class NattableaxisconfigurationEditor
 	 * this shows the tabs at the bottom.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void showTabs() {
@@ -1352,7 +1335,7 @@ public class NattableaxisconfigurationEditor
 	 * This is used to track the active viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1368,7 +1351,7 @@ public class NattableaxisconfigurationEditor
 	 * This is how the framework determines which interfaces we implement.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("rawtypes")
@@ -1392,7 +1375,7 @@ public class NattableaxisconfigurationEditor
 	 * This accesses a cached version of the content outliner.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IContentOutlinePage getContentOutlinePage() {
@@ -1444,7 +1427,6 @@ public class NattableaxisconfigurationEditor
 					(new ISelectionChangedListener() {
 						// This ensures that we handle selections correctly.
 						//
-						@Override
 						public void selectionChanged(SelectionChangedEvent event) {
 							handleContentOutlineSelection(event.getSelection());
 						}
@@ -1458,7 +1440,7 @@ public class NattableaxisconfigurationEditor
 	 * This accesses a cached version of the property sheet.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IPropertySheetPage getPropertySheetPage() {
@@ -1486,7 +1468,7 @@ public class NattableaxisconfigurationEditor
 	 * This deals with how we want selection in the outliner to affect the other views.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void handleContentOutlineSelection(ISelection selection) {
@@ -1526,7 +1508,7 @@ public class NattableaxisconfigurationEditor
 	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1538,7 +1520,7 @@ public class NattableaxisconfigurationEditor
 	 * This is for implementing {@link IEditorPart} and simply saves the model file.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1602,7 +1584,7 @@ public class NattableaxisconfigurationEditor
 	 * 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
 	 */
 	protected boolean isPersisted(Resource resource) {
@@ -1623,7 +1605,7 @@ public class NattableaxisconfigurationEditor
 	 * This always returns true because it is not currently supported.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1635,7 +1617,7 @@ public class NattableaxisconfigurationEditor
 	 * This also changes the editor's input.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1654,7 +1636,7 @@ public class NattableaxisconfigurationEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void doSaveAs(URI uri, IEditorInput editorInput) {
@@ -1671,7 +1653,7 @@ public class NattableaxisconfigurationEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1686,7 +1668,7 @@ public class NattableaxisconfigurationEditor
 	 * This is called during startup.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1702,7 +1684,7 @@ public class NattableaxisconfigurationEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1719,7 +1701,7 @@ public class NattableaxisconfigurationEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1731,7 +1713,7 @@ public class NattableaxisconfigurationEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1743,7 +1725,7 @@ public class NattableaxisconfigurationEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1756,7 +1738,7 @@ public class NattableaxisconfigurationEditor
 	 * Calling this result will notify the listeners.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1772,7 +1754,7 @@ public class NattableaxisconfigurationEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setStatusLineManager(ISelection selection) {
@@ -1808,7 +1790,7 @@ public class NattableaxisconfigurationEditor
 	 * This looks up a string in the plugin's plugin.properties file.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static String getString(String key) {
@@ -1819,7 +1801,7 @@ public class NattableaxisconfigurationEditor
 	 * This looks up a string in plugin.properties, making a substitution.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static String getString(String key, Object s1) {
@@ -1830,7 +1812,7 @@ public class NattableaxisconfigurationEditor
 	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1841,7 +1823,7 @@ public class NattableaxisconfigurationEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EditingDomainActionBarContributor getActionBarContributor() {
@@ -1851,7 +1833,7 @@ public class NattableaxisconfigurationEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IActionBars getActionBars() {
@@ -1861,7 +1843,7 @@ public class NattableaxisconfigurationEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public AdapterFactory getAdapterFactory() {
@@ -1871,7 +1853,7 @@ public class NattableaxisconfigurationEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1903,7 +1885,7 @@ public class NattableaxisconfigurationEditor
 	 * Returns whether the outline view should be presented to the user.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean showOutlineView() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationModelWizard.java
index 148e151ec09..d9c52472899 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationModelWizard.java
@@ -75,7 +75,7 @@ import org.eclipse.ui.part.ISetSelectionTarget;
  * This is a simple wizard for creating a new model file.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattableaxisconfigurationModelWizard extends Wizard implements INewWizard {
@@ -83,7 +83,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * The supported extensions for created files.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final List<String> FILE_EXTENSIONS =
@@ -93,7 +93,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * A formatted list of supported file extensions, suitable for display.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final String FORMATTED_FILE_EXTENSIONS =
@@ -103,7 +103,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * This caches an instance of the model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableaxisconfigurationPackage nattableaxisconfigurationPackage = NattableaxisconfigurationPackage.eINSTANCE;
@@ -112,7 +112,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * This caches an instance of the model factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableaxisconfigurationFactory nattableaxisconfigurationFactory = nattableaxisconfigurationPackage.getNattableaxisconfigurationFactory();
@@ -121,7 +121,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * This is the file creation page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableaxisconfigurationModelWizardNewFileCreationPage newFileCreationPage;
@@ -130,7 +130,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * This is the initial object creation page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableaxisconfigurationModelWizardInitialObjectCreationPage initialObjectCreationPage;
@@ -139,7 +139,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * Remember the selection during initialization for populating the default container.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IStructuredSelection selection;
@@ -148,7 +148,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * Remember the workbench during initialization.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IWorkbench workbench;
@@ -157,7 +157,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * Caches the names of the types that can be created as the root object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected List<String> initialObjectNames;
@@ -166,7 +166,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * This just records the information.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -181,7 +181,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * Returns the names of the types that can be created as the root object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<String> getInitialObjectNames() {
@@ -204,7 +204,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * Create a new model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected EObject createInitialModel() {
@@ -217,7 +217,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * Do the work after everything is specified.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -279,7 +279,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 				final ISelection targetSelection = new StructuredSelection(modelFile);
 				getShell().getDisplay().asyncExec
 						(new Runnable() {
-							@Override
 							public void run() {
 								((ISetSelectionTarget) activePart).selectReveal(targetSelection);
 							}
@@ -308,7 +307,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * This is the one page of the wizard.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class NattableaxisconfigurationModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
@@ -316,7 +315,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public NattableaxisconfigurationModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
@@ -327,7 +326,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		 * The framework calls this to see if the file is correct.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -347,7 +346,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public IFile getModelFile() {
@@ -359,14 +358,14 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * This is the page where the type of object to create is selected.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class NattableaxisconfigurationModelWizardInitialObjectCreationPage extends WizardPage {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Combo initialObjectField;
@@ -381,7 +380,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Combo encodingField;
@@ -390,7 +389,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public NattableaxisconfigurationModelWizardInitialObjectCreationPage(String pageId) {
@@ -400,7 +399,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -475,12 +474,11 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected ModifyListener validator =
 				new ModifyListener() {
-					@Override
 					public void modifyText(ModifyEvent e) {
 						setPageComplete(validatePage());
 					}
@@ -489,7 +487,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected boolean validatePage() {
@@ -499,7 +497,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -520,7 +518,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public String getInitialObjectName() {
@@ -537,7 +535,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public String getEncoding() {
@@ -548,7 +546,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		 * Returns the label for the specified type name.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected String getLabel(String typeName) {
@@ -563,7 +561,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Collection<String> getEncodings() {
@@ -582,7 +580,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * The framework calls this to create the contents of the wizard.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -638,7 +636,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * Get the file from the page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IFile getModelFile() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderActionBarContributor.java
index e5046a67636..e42fe9dd204 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderActionBarContributor.java
@@ -49,7 +49,7 @@ import org.eclipse.ui.PartInitException;
  * This is the action bar contributor for the Nattableaxisprovider model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattableaxisproviderActionBarContributor
@@ -59,7 +59,7 @@ public class NattableaxisproviderActionBarContributor
 	 * This keeps track of the active editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IEditorPart activeEditorPart;
@@ -68,7 +68,7 @@ public class NattableaxisproviderActionBarContributor
 	 * This keeps track of the current selection provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelectionProvider selectionProvider;
@@ -77,7 +77,7 @@ public class NattableaxisproviderActionBarContributor
 	 * This action opens the Properties view.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IAction showPropertiesViewAction =
@@ -99,7 +99,7 @@ public class NattableaxisproviderActionBarContributor
 	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IAction refreshViewerAction =
@@ -126,7 +126,7 @@ public class NattableaxisproviderActionBarContributor
 	 * generated for the current selection by the item provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> createChildActions;
@@ -135,7 +135,7 @@ public class NattableaxisproviderActionBarContributor
 	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IMenuManager createChildMenuManager;
@@ -145,7 +145,7 @@ public class NattableaxisproviderActionBarContributor
 	 * generated for the current selection by the item provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> createSiblingActions;
@@ -154,7 +154,7 @@ public class NattableaxisproviderActionBarContributor
 	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IMenuManager createSiblingMenuManager;
@@ -163,7 +163,7 @@ public class NattableaxisproviderActionBarContributor
 	 * This creates an instance of the contributor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NattableaxisproviderActionBarContributor() {
@@ -177,7 +177,7 @@ public class NattableaxisproviderActionBarContributor
 	 * This adds Separators for editor additions to the tool bar.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -191,7 +191,7 @@ public class NattableaxisproviderActionBarContributor
 	 * as well as the sub-menus for object creation items.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -219,7 +219,6 @@ public class NattableaxisproviderActionBarContributor
 		//
 		submenuManager.addMenuListener
 				(new IMenuListener() {
-					@Override
 					public void menuAboutToShow(IMenuManager menuManager) {
 						menuManager.updateAll(true);
 					}
@@ -232,7 +231,7 @@ public class NattableaxisproviderActionBarContributor
 	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -266,7 +265,7 @@ public class NattableaxisproviderActionBarContributor
 	 * that can be added to the selected object and updating the menus accordingly.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -315,7 +314,7 @@ public class NattableaxisproviderActionBarContributor
 	 * and returns the collection of these actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
@@ -333,7 +332,7 @@ public class NattableaxisproviderActionBarContributor
 	 * and returns the collection of these actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
@@ -353,7 +352,7 @@ public class NattableaxisproviderActionBarContributor
 	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
@@ -374,7 +373,7 @@ public class NattableaxisproviderActionBarContributor
 	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
@@ -404,7 +403,7 @@ public class NattableaxisproviderActionBarContributor
 	 * This populates the pop-up menu before it appears.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -425,7 +424,7 @@ public class NattableaxisproviderActionBarContributor
 	 * This inserts global actions before the "additions-end" separator.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -443,7 +442,7 @@ public class NattableaxisproviderActionBarContributor
 	 * This ensures that a delete action will clean up all references to deleted objects.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java
index f4dd647f0fd..b9686e4c796 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java
@@ -145,7 +145,7 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
  * This is an example of a Nattableaxisprovider model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattableaxisproviderEditor
@@ -155,7 +155,7 @@ public class NattableaxisproviderEditor
 	 * This keeps track of the editing domain that is used to track all changes to the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected AdapterFactoryEditingDomain editingDomain;
@@ -164,7 +164,7 @@ public class NattableaxisproviderEditor
 	 * This is the one adapter factory used for providing views of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory adapterFactory;
@@ -173,7 +173,7 @@ public class NattableaxisproviderEditor
 	 * This is the content outline page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IContentOutlinePage contentOutlinePage;
@@ -182,7 +182,7 @@ public class NattableaxisproviderEditor
 	 * This is a kludge...
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IStatusLineManager contentOutlineStatusLineManager;
@@ -191,7 +191,7 @@ public class NattableaxisproviderEditor
 	 * This is the content outline page's viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer contentOutlineViewer;
@@ -200,7 +200,7 @@ public class NattableaxisproviderEditor
 	 * This is the property sheet page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
@@ -210,7 +210,7 @@ public class NattableaxisproviderEditor
 	 * The parent relation must be correctly defined for this to work.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer selectionViewer;
@@ -219,7 +219,7 @@ public class NattableaxisproviderEditor
 	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer parentViewer;
@@ -228,7 +228,7 @@ public class NattableaxisproviderEditor
 	 * This shows how a tree view works.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer treeViewer;
@@ -238,7 +238,7 @@ public class NattableaxisproviderEditor
 	 * A list viewer doesn't support icons.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ListViewer listViewer;
@@ -248,7 +248,7 @@ public class NattableaxisproviderEditor
 	 * A table can be used as a list with icons.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TableViewer tableViewer;
@@ -257,7 +257,7 @@ public class NattableaxisproviderEditor
 	 * This shows how a tree view with columns works.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer treeViewerWithColumns;
@@ -266,7 +266,7 @@ public class NattableaxisproviderEditor
 	 * This keeps track of the active viewer pane, in the book.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ViewerPane currentViewerPane;
@@ -275,7 +275,7 @@ public class NattableaxisproviderEditor
 	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Viewer currentViewer;
@@ -284,7 +284,7 @@ public class NattableaxisproviderEditor
 	 * This listens to which ever viewer is active.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelectionChangedListener selectionChangedListener;
@@ -293,7 +293,7 @@ public class NattableaxisproviderEditor
 	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
@@ -302,7 +302,7 @@ public class NattableaxisproviderEditor
 	 * This keeps track of the selection of the editor as a whole.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelection editorSelection = StructuredSelection.EMPTY;
@@ -312,7 +312,7 @@ public class NattableaxisproviderEditor
 	 * in Eclipse's Problems View.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
@@ -321,12 +321,11 @@ public class NattableaxisproviderEditor
 	 * This listens for when the outline becomes active
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IPartListener partListener =
 			new IPartListener() {
-				@Override
 				public void partActivated(IWorkbenchPart p) {
 					if (p instanceof ContentOutline) {
 						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
@@ -346,22 +345,18 @@ public class NattableaxisproviderEditor
 					}
 				}
 
-				@Override
 				public void partBroughtToTop(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partClosed(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partDeactivated(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partOpened(IWorkbenchPart p) {
 					// Ignore.
 				}
@@ -371,7 +366,7 @@ public class NattableaxisproviderEditor
 	 * Resources that have been removed since last activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> removedResources = new ArrayList<Resource>();
@@ -380,7 +375,7 @@ public class NattableaxisproviderEditor
 	 * Resources that have been changed since last activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> changedResources = new ArrayList<Resource>();
@@ -389,7 +384,7 @@ public class NattableaxisproviderEditor
 	 * Resources that have been saved.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> savedResources = new ArrayList<Resource>();
@@ -398,7 +393,7 @@ public class NattableaxisproviderEditor
 	 * Map to store the diagnostic associated with a resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
@@ -407,7 +402,7 @@ public class NattableaxisproviderEditor
 	 * Controls whether the problem indication should be updated.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean updateProblemIndication = true;
@@ -416,7 +411,7 @@ public class NattableaxisproviderEditor
 	 * Adapter used to update the problem indication when resources are demanded loaded.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected EContentAdapter problemIndicationAdapter =
@@ -440,7 +435,6 @@ public class NattableaxisproviderEditor
 							if (updateProblemIndication) {
 								getSite().getShell().getDisplay().asyncExec
 										(new Runnable() {
-											@Override
 											public void run() {
 												updateProblemIndication();
 											}
@@ -467,7 +461,6 @@ public class NattableaxisproviderEditor
 					if (updateProblemIndication) {
 						getSite().getShell().getDisplay().asyncExec
 								(new Runnable() {
-									@Override
 									public void run() {
 										updateProblemIndication();
 									}
@@ -480,12 +473,11 @@ public class NattableaxisproviderEditor
 	 * This listens for workspace changes.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IResourceChangeListener resourceChangeListener =
 			new IResourceChangeListener() {
-				@Override
 				public void resourceChanged(IResourceChangeEvent event) {
 					IResourceDelta delta = event.getDelta();
 					try {
@@ -494,7 +486,6 @@ public class NattableaxisproviderEditor
 							protected Collection<Resource> changedResources = new ArrayList<Resource>();
 							protected Collection<Resource> removedResources = new ArrayList<Resource>();
 
-							@Override
 							public boolean visit(IResourceDelta delta) {
 								if (delta.getResource().getType() == IResource.FILE) {
 									if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -530,7 +521,6 @@ public class NattableaxisproviderEditor
 						if (!visitor.getRemovedResources().isEmpty()) {
 							getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										@Override
 										public void run() {
 											removedResources.addAll(visitor.getRemovedResources());
 											if (!isDirty()) {
@@ -543,7 +533,6 @@ public class NattableaxisproviderEditor
 						if (!visitor.getChangedResources().isEmpty()) {
 							getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										@Override
 										public void run() {
 											changedResources.addAll(visitor.getChangedResources());
 											if (getSite().getPage().getActiveEditor() == NattableaxisproviderEditor.this) {
@@ -563,7 +552,7 @@ public class NattableaxisproviderEditor
 	 * Handles activation of the editor or it's associated views.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void handleActivate() {
@@ -599,7 +588,7 @@ public class NattableaxisproviderEditor
 	 * Handles what to do with changed resources on activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void handleChangedResources() {
@@ -636,7 +625,7 @@ public class NattableaxisproviderEditor
 	 * Updates the problems indication with the information described in the specified diagnostic.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void updateProblemIndication() {
@@ -691,7 +680,7 @@ public class NattableaxisproviderEditor
 	 * Shows a dialog that asks if conflicting changes should be discarded.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean handleDirtyConflict() {
@@ -705,7 +694,7 @@ public class NattableaxisproviderEditor
 	 * This creates a model editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NattableaxisproviderEditor() {
@@ -717,7 +706,7 @@ public class NattableaxisproviderEditor
 	 * This sets up the editing domain for the model editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void initializeEditingDomain() {
@@ -747,11 +736,9 @@ public class NattableaxisproviderEditor
 		//
 		commandStack.addCommandStackListener
 				(new CommandStackListener() {
-					@Override
 					public void commandStackChanged(final EventObject event) {
 						getContainer().getDisplay().asyncExec
 								(new Runnable() {
-									@Override
 									public void run() {
 										firePropertyChange(IEditorPart.PROP_DIRTY);
 
@@ -784,7 +771,7 @@ public class NattableaxisproviderEditor
 	 * This is here for the listener to be able to call it.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -796,7 +783,7 @@ public class NattableaxisproviderEditor
 	 * This sets the selection into whichever viewer is active.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setSelectionToViewer(Collection<?> collection) {
@@ -806,7 +793,6 @@ public class NattableaxisproviderEditor
 		if (theSelection != null && !theSelection.isEmpty()) {
 			Runnable runnable =
 					new Runnable() {
-						@Override
 						public void run() {
 							// Try to select the items in the current content viewer of the editor.
 							//
@@ -824,7 +810,7 @@ public class NattableaxisproviderEditor
 	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -835,14 +821,14 @@ public class NattableaxisproviderEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
@@ -852,7 +838,7 @@ public class NattableaxisproviderEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -864,7 +850,7 @@ public class NattableaxisproviderEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -876,7 +862,7 @@ public class NattableaxisproviderEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -888,7 +874,7 @@ public class NattableaxisproviderEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -900,7 +886,7 @@ public class NattableaxisproviderEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setCurrentViewerPane(ViewerPane viewerPane) {
@@ -918,7 +904,7 @@ public class NattableaxisproviderEditor
 	 * is the current one.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setCurrentViewer(Viewer viewer) {
@@ -932,7 +918,6 @@ public class NattableaxisproviderEditor
 						new ISelectionChangedListener() {
 							// This just notifies those things that are affected by the section.
 							//
-							@Override
 							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
 								setSelection(selectionChangedEvent.getSelection());
 							}
@@ -965,7 +950,7 @@ public class NattableaxisproviderEditor
 	 * This returns the viewer as required by the {@link IViewerProvider} interface.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -977,7 +962,7 @@ public class NattableaxisproviderEditor
 	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void createContextMenuFor(StructuredViewer viewer) {
@@ -999,7 +984,7 @@ public class NattableaxisproviderEditor
 	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void createModel() {
@@ -1027,7 +1012,7 @@ public class NattableaxisproviderEditor
 	 * and the specified exception (if any).
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
@@ -1056,7 +1041,7 @@ public class NattableaxisproviderEditor
 	 * This is the method used by the framework to install your own controls.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1277,7 +1262,6 @@ public class NattableaxisproviderEditor
 
 			getSite().getShell().getDisplay().asyncExec
 					(new Runnable() {
-						@Override
 						public void run() {
 							setActivePage(0);
 						}
@@ -1303,7 +1287,6 @@ public class NattableaxisproviderEditor
 
 		getSite().getShell().getDisplay().asyncExec
 				(new Runnable() {
-					@Override
 					public void run() {
 						updateProblemIndication();
 					}
@@ -1315,7 +1298,7 @@ public class NattableaxisproviderEditor
 	 * this hides the single tab at the bottom.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void hideTabs() {
@@ -1334,7 +1317,7 @@ public class NattableaxisproviderEditor
 	 * this shows the tabs at the bottom.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void showTabs() {
@@ -1352,7 +1335,7 @@ public class NattableaxisproviderEditor
 	 * This is used to track the active viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1368,7 +1351,7 @@ public class NattableaxisproviderEditor
 	 * This is how the framework determines which interfaces we implement.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("rawtypes")
@@ -1392,7 +1375,7 @@ public class NattableaxisproviderEditor
 	 * This accesses a cached version of the content outliner.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IContentOutlinePage getContentOutlinePage() {
@@ -1444,7 +1427,6 @@ public class NattableaxisproviderEditor
 					(new ISelectionChangedListener() {
 						// This ensures that we handle selections correctly.
 						//
-						@Override
 						public void selectionChanged(SelectionChangedEvent event) {
 							handleContentOutlineSelection(event.getSelection());
 						}
@@ -1458,7 +1440,7 @@ public class NattableaxisproviderEditor
 	 * This accesses a cached version of the property sheet.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IPropertySheetPage getPropertySheetPage() {
@@ -1486,7 +1468,7 @@ public class NattableaxisproviderEditor
 	 * This deals with how we want selection in the outliner to affect the other views.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void handleContentOutlineSelection(ISelection selection) {
@@ -1526,7 +1508,7 @@ public class NattableaxisproviderEditor
 	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1538,7 +1520,7 @@ public class NattableaxisproviderEditor
 	 * This is for implementing {@link IEditorPart} and simply saves the model file.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1602,7 +1584,7 @@ public class NattableaxisproviderEditor
 	 * 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
 	 */
 	protected boolean isPersisted(Resource resource) {
@@ -1623,7 +1605,7 @@ public class NattableaxisproviderEditor
 	 * This always returns true because it is not currently supported.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1635,7 +1617,7 @@ public class NattableaxisproviderEditor
 	 * This also changes the editor's input.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1654,7 +1636,7 @@ public class NattableaxisproviderEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void doSaveAs(URI uri, IEditorInput editorInput) {
@@ -1671,7 +1653,7 @@ public class NattableaxisproviderEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1686,7 +1668,7 @@ public class NattableaxisproviderEditor
 	 * This is called during startup.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1702,7 +1684,7 @@ public class NattableaxisproviderEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1719,7 +1701,7 @@ public class NattableaxisproviderEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1731,7 +1713,7 @@ public class NattableaxisproviderEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1743,7 +1725,7 @@ public class NattableaxisproviderEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1756,7 +1738,7 @@ public class NattableaxisproviderEditor
 	 * Calling this result will notify the listeners.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1772,7 +1754,7 @@ public class NattableaxisproviderEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setStatusLineManager(ISelection selection) {
@@ -1808,7 +1790,7 @@ public class NattableaxisproviderEditor
 	 * This looks up a string in the plugin's plugin.properties file.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static String getString(String key) {
@@ -1819,7 +1801,7 @@ public class NattableaxisproviderEditor
 	 * This looks up a string in plugin.properties, making a substitution.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static String getString(String key, Object s1) {
@@ -1830,7 +1812,7 @@ public class NattableaxisproviderEditor
 	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1841,7 +1823,7 @@ public class NattableaxisproviderEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EditingDomainActionBarContributor getActionBarContributor() {
@@ -1851,7 +1833,7 @@ public class NattableaxisproviderEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IActionBars getActionBars() {
@@ -1861,7 +1843,7 @@ public class NattableaxisproviderEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public AdapterFactory getAdapterFactory() {
@@ -1871,7 +1853,7 @@ public class NattableaxisproviderEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1903,7 +1885,7 @@ public class NattableaxisproviderEditor
 	 * Returns whether the outline view should be presented to the user.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean showOutlineView() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderModelWizard.java
index 56680aac045..83c8bfb67e0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderModelWizard.java
@@ -75,7 +75,7 @@ import org.eclipse.ui.part.ISetSelectionTarget;
  * This is a simple wizard for creating a new model file.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattableaxisproviderModelWizard extends Wizard implements INewWizard {
@@ -83,7 +83,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * The supported extensions for created files.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final List<String> FILE_EXTENSIONS =
@@ -93,7 +93,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * A formatted list of supported file extensions, suitable for display.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final String FORMATTED_FILE_EXTENSIONS =
@@ -103,7 +103,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * This caches an instance of the model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableaxisproviderPackage nattableaxisproviderPackage = NattableaxisproviderPackage.eINSTANCE;
@@ -112,7 +112,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * This caches an instance of the model factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableaxisproviderFactory nattableaxisproviderFactory = nattableaxisproviderPackage.getNattableaxisproviderFactory();
@@ -121,7 +121,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * This is the file creation page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableaxisproviderModelWizardNewFileCreationPage newFileCreationPage;
@@ -130,7 +130,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * This is the initial object creation page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableaxisproviderModelWizardInitialObjectCreationPage initialObjectCreationPage;
@@ -139,7 +139,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * Remember the selection during initialization for populating the default container.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IStructuredSelection selection;
@@ -148,7 +148,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * Remember the workbench during initialization.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IWorkbench workbench;
@@ -157,7 +157,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * Caches the names of the types that can be created as the root object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected List<String> initialObjectNames;
@@ -166,7 +166,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * This just records the information.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -181,7 +181,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * Returns the names of the types that can be created as the root object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<String> getInitialObjectNames() {
@@ -204,7 +204,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * Create a new model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected EObject createInitialModel() {
@@ -217,7 +217,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * Do the work after everything is specified.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -279,7 +279,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 				final ISelection targetSelection = new StructuredSelection(modelFile);
 				getShell().getDisplay().asyncExec
 						(new Runnable() {
-							@Override
 							public void run() {
 								((ISetSelectionTarget) activePart).selectReveal(targetSelection);
 							}
@@ -308,7 +307,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * This is the one page of the wizard.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class NattableaxisproviderModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
@@ -316,7 +315,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public NattableaxisproviderModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
@@ -327,7 +326,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		 * The framework calls this to see if the file is correct.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -347,7 +346,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public IFile getModelFile() {
@@ -359,14 +358,14 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * This is the page where the type of object to create is selected.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class NattableaxisproviderModelWizardInitialObjectCreationPage extends WizardPage {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Combo initialObjectField;
@@ -381,7 +380,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Combo encodingField;
@@ -390,7 +389,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public NattableaxisproviderModelWizardInitialObjectCreationPage(String pageId) {
@@ -400,7 +399,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -475,12 +474,11 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected ModifyListener validator =
 				new ModifyListener() {
-					@Override
 					public void modifyText(ModifyEvent e) {
 						setPageComplete(validatePage());
 					}
@@ -489,7 +487,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected boolean validatePage() {
@@ -499,7 +497,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -520,7 +518,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public String getInitialObjectName() {
@@ -537,7 +535,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public String getEncoding() {
@@ -548,7 +546,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		 * Returns the label for the specified type name.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected String getLabel(String typeName) {
@@ -563,7 +561,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Collection<String> getEncodings() {
@@ -582,7 +580,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * The framework calls this to create the contents of the wizard.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -638,7 +636,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * Get the file from the page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IFile getModelFile() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellActionBarContributor.java
index 517fd5fb037..79962db236f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellActionBarContributor.java
@@ -49,7 +49,7 @@ import org.eclipse.ui.PartInitException;
  * This is the action bar contributor for the Nattablecell model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattablecellActionBarContributor
@@ -59,7 +59,7 @@ public class NattablecellActionBarContributor
 	 * This keeps track of the active editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IEditorPart activeEditorPart;
@@ -68,7 +68,7 @@ public class NattablecellActionBarContributor
 	 * This keeps track of the current selection provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelectionProvider selectionProvider;
@@ -77,7 +77,7 @@ public class NattablecellActionBarContributor
 	 * This action opens the Properties view.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IAction showPropertiesViewAction =
@@ -99,7 +99,7 @@ public class NattablecellActionBarContributor
 	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IAction refreshViewerAction =
@@ -126,7 +126,7 @@ public class NattablecellActionBarContributor
 	 * generated for the current selection by the item provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> createChildActions;
@@ -135,7 +135,7 @@ public class NattablecellActionBarContributor
 	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IMenuManager createChildMenuManager;
@@ -145,7 +145,7 @@ public class NattablecellActionBarContributor
 	 * generated for the current selection by the item provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> createSiblingActions;
@@ -154,7 +154,7 @@ public class NattablecellActionBarContributor
 	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IMenuManager createSiblingMenuManager;
@@ -163,7 +163,7 @@ public class NattablecellActionBarContributor
 	 * This creates an instance of the contributor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NattablecellActionBarContributor() {
@@ -177,7 +177,7 @@ public class NattablecellActionBarContributor
 	 * This adds Separators for editor additions to the tool bar.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -191,7 +191,7 @@ public class NattablecellActionBarContributor
 	 * as well as the sub-menus for object creation items.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -219,7 +219,6 @@ public class NattablecellActionBarContributor
 		//
 		submenuManager.addMenuListener
 				(new IMenuListener() {
-					@Override
 					public void menuAboutToShow(IMenuManager menuManager) {
 						menuManager.updateAll(true);
 					}
@@ -232,7 +231,7 @@ public class NattablecellActionBarContributor
 	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -266,7 +265,7 @@ public class NattablecellActionBarContributor
 	 * that can be added to the selected object and updating the menus accordingly.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -315,7 +314,7 @@ public class NattablecellActionBarContributor
 	 * and returns the collection of these actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
@@ -333,7 +332,7 @@ public class NattablecellActionBarContributor
 	 * and returns the collection of these actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
@@ -353,7 +352,7 @@ public class NattablecellActionBarContributor
 	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
@@ -374,7 +373,7 @@ public class NattablecellActionBarContributor
 	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
@@ -404,7 +403,7 @@ public class NattablecellActionBarContributor
 	 * This populates the pop-up menu before it appears.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -425,7 +424,7 @@ public class NattablecellActionBarContributor
 	 * This inserts global actions before the "additions-end" separator.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -443,7 +442,7 @@ public class NattablecellActionBarContributor
 	 * This ensures that a delete action will clean up all references to deleted objects.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellEditor.java
index f111075f36e..471d8f5412a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellEditor.java
@@ -145,7 +145,7 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
  * This is an example of a Nattablecell model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattablecellEditor
@@ -155,7 +155,7 @@ public class NattablecellEditor
 	 * This keeps track of the editing domain that is used to track all changes to the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected AdapterFactoryEditingDomain editingDomain;
@@ -164,7 +164,7 @@ public class NattablecellEditor
 	 * This is the one adapter factory used for providing views of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory adapterFactory;
@@ -173,7 +173,7 @@ public class NattablecellEditor
 	 * This is the content outline page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IContentOutlinePage contentOutlinePage;
@@ -182,7 +182,7 @@ public class NattablecellEditor
 	 * This is a kludge...
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IStatusLineManager contentOutlineStatusLineManager;
@@ -191,7 +191,7 @@ public class NattablecellEditor
 	 * This is the content outline page's viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer contentOutlineViewer;
@@ -200,7 +200,7 @@ public class NattablecellEditor
 	 * This is the property sheet page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
@@ -210,7 +210,7 @@ public class NattablecellEditor
 	 * The parent relation must be correctly defined for this to work.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer selectionViewer;
@@ -219,7 +219,7 @@ public class NattablecellEditor
 	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer parentViewer;
@@ -228,7 +228,7 @@ public class NattablecellEditor
 	 * This shows how a tree view works.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer treeViewer;
@@ -238,7 +238,7 @@ public class NattablecellEditor
 	 * A list viewer doesn't support icons.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ListViewer listViewer;
@@ -248,7 +248,7 @@ public class NattablecellEditor
 	 * A table can be used as a list with icons.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TableViewer tableViewer;
@@ -257,7 +257,7 @@ public class NattablecellEditor
 	 * This shows how a tree view with columns works.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer treeViewerWithColumns;
@@ -266,7 +266,7 @@ public class NattablecellEditor
 	 * This keeps track of the active viewer pane, in the book.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ViewerPane currentViewerPane;
@@ -275,7 +275,7 @@ public class NattablecellEditor
 	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Viewer currentViewer;
@@ -284,7 +284,7 @@ public class NattablecellEditor
 	 * This listens to which ever viewer is active.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelectionChangedListener selectionChangedListener;
@@ -293,7 +293,7 @@ public class NattablecellEditor
 	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
@@ -302,7 +302,7 @@ public class NattablecellEditor
 	 * This keeps track of the selection of the editor as a whole.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelection editorSelection = StructuredSelection.EMPTY;
@@ -312,7 +312,7 @@ public class NattablecellEditor
 	 * in Eclipse's Problems View.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
@@ -321,12 +321,11 @@ public class NattablecellEditor
 	 * This listens for when the outline becomes active
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IPartListener partListener =
 			new IPartListener() {
-				@Override
 				public void partActivated(IWorkbenchPart p) {
 					if (p instanceof ContentOutline) {
 						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
@@ -346,22 +345,18 @@ public class NattablecellEditor
 					}
 				}
 
-				@Override
 				public void partBroughtToTop(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partClosed(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partDeactivated(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partOpened(IWorkbenchPart p) {
 					// Ignore.
 				}
@@ -371,7 +366,7 @@ public class NattablecellEditor
 	 * Resources that have been removed since last activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> removedResources = new ArrayList<Resource>();
@@ -380,7 +375,7 @@ public class NattablecellEditor
 	 * Resources that have been changed since last activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> changedResources = new ArrayList<Resource>();
@@ -389,7 +384,7 @@ public class NattablecellEditor
 	 * Resources that have been saved.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> savedResources = new ArrayList<Resource>();
@@ -398,7 +393,7 @@ public class NattablecellEditor
 	 * Map to store the diagnostic associated with a resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
@@ -407,7 +402,7 @@ public class NattablecellEditor
 	 * Controls whether the problem indication should be updated.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean updateProblemIndication = true;
@@ -416,7 +411,7 @@ public class NattablecellEditor
 	 * Adapter used to update the problem indication when resources are demanded loaded.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected EContentAdapter problemIndicationAdapter =
@@ -440,7 +435,6 @@ public class NattablecellEditor
 							if (updateProblemIndication) {
 								getSite().getShell().getDisplay().asyncExec
 										(new Runnable() {
-											@Override
 											public void run() {
 												updateProblemIndication();
 											}
@@ -467,7 +461,6 @@ public class NattablecellEditor
 					if (updateProblemIndication) {
 						getSite().getShell().getDisplay().asyncExec
 								(new Runnable() {
-									@Override
 									public void run() {
 										updateProblemIndication();
 									}
@@ -480,12 +473,11 @@ public class NattablecellEditor
 	 * This listens for workspace changes.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IResourceChangeListener resourceChangeListener =
 			new IResourceChangeListener() {
-				@Override
 				public void resourceChanged(IResourceChangeEvent event) {
 					IResourceDelta delta = event.getDelta();
 					try {
@@ -494,7 +486,6 @@ public class NattablecellEditor
 							protected Collection<Resource> changedResources = new ArrayList<Resource>();
 							protected Collection<Resource> removedResources = new ArrayList<Resource>();
 
-							@Override
 							public boolean visit(IResourceDelta delta) {
 								if (delta.getResource().getType() == IResource.FILE) {
 									if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -530,7 +521,6 @@ public class NattablecellEditor
 						if (!visitor.getRemovedResources().isEmpty()) {
 							getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										@Override
 										public void run() {
 											removedResources.addAll(visitor.getRemovedResources());
 											if (!isDirty()) {
@@ -543,7 +533,6 @@ public class NattablecellEditor
 						if (!visitor.getChangedResources().isEmpty()) {
 							getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										@Override
 										public void run() {
 											changedResources.addAll(visitor.getChangedResources());
 											if (getSite().getPage().getActiveEditor() == NattablecellEditor.this) {
@@ -563,7 +552,7 @@ public class NattablecellEditor
 	 * Handles activation of the editor or it's associated views.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void handleActivate() {
@@ -599,7 +588,7 @@ public class NattablecellEditor
 	 * Handles what to do with changed resources on activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void handleChangedResources() {
@@ -636,7 +625,7 @@ public class NattablecellEditor
 	 * Updates the problems indication with the information described in the specified diagnostic.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void updateProblemIndication() {
@@ -691,7 +680,7 @@ public class NattablecellEditor
 	 * Shows a dialog that asks if conflicting changes should be discarded.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean handleDirtyConflict() {
@@ -705,7 +694,7 @@ public class NattablecellEditor
 	 * This creates a model editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NattablecellEditor() {
@@ -717,7 +706,7 @@ public class NattablecellEditor
 	 * This sets up the editing domain for the model editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void initializeEditingDomain() {
@@ -747,11 +736,9 @@ public class NattablecellEditor
 		//
 		commandStack.addCommandStackListener
 				(new CommandStackListener() {
-					@Override
 					public void commandStackChanged(final EventObject event) {
 						getContainer().getDisplay().asyncExec
 								(new Runnable() {
-									@Override
 									public void run() {
 										firePropertyChange(IEditorPart.PROP_DIRTY);
 
@@ -784,7 +771,7 @@ public class NattablecellEditor
 	 * This is here for the listener to be able to call it.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -796,7 +783,7 @@ public class NattablecellEditor
 	 * This sets the selection into whichever viewer is active.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setSelectionToViewer(Collection<?> collection) {
@@ -806,7 +793,6 @@ public class NattablecellEditor
 		if (theSelection != null && !theSelection.isEmpty()) {
 			Runnable runnable =
 					new Runnable() {
-						@Override
 						public void run() {
 							// Try to select the items in the current content viewer of the editor.
 							//
@@ -824,7 +810,7 @@ public class NattablecellEditor
 	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -835,14 +821,14 @@ public class NattablecellEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
@@ -852,7 +838,7 @@ public class NattablecellEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -864,7 +850,7 @@ public class NattablecellEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -876,7 +862,7 @@ public class NattablecellEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -888,7 +874,7 @@ public class NattablecellEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -900,7 +886,7 @@ public class NattablecellEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setCurrentViewerPane(ViewerPane viewerPane) {
@@ -918,7 +904,7 @@ public class NattablecellEditor
 	 * is the current one.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setCurrentViewer(Viewer viewer) {
@@ -932,7 +918,6 @@ public class NattablecellEditor
 						new ISelectionChangedListener() {
 							// This just notifies those things that are affected by the section.
 							//
-							@Override
 							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
 								setSelection(selectionChangedEvent.getSelection());
 							}
@@ -965,7 +950,7 @@ public class NattablecellEditor
 	 * This returns the viewer as required by the {@link IViewerProvider} interface.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -977,7 +962,7 @@ public class NattablecellEditor
 	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void createContextMenuFor(StructuredViewer viewer) {
@@ -999,7 +984,7 @@ public class NattablecellEditor
 	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void createModel() {
@@ -1027,7 +1012,7 @@ public class NattablecellEditor
 	 * and the specified exception (if any).
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
@@ -1056,7 +1041,7 @@ public class NattablecellEditor
 	 * This is the method used by the framework to install your own controls.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1277,7 +1262,6 @@ public class NattablecellEditor
 
 			getSite().getShell().getDisplay().asyncExec
 					(new Runnable() {
-						@Override
 						public void run() {
 							setActivePage(0);
 						}
@@ -1303,7 +1287,6 @@ public class NattablecellEditor
 
 		getSite().getShell().getDisplay().asyncExec
 				(new Runnable() {
-					@Override
 					public void run() {
 						updateProblemIndication();
 					}
@@ -1315,7 +1298,7 @@ public class NattablecellEditor
 	 * this hides the single tab at the bottom.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void hideTabs() {
@@ -1334,7 +1317,7 @@ public class NattablecellEditor
 	 * this shows the tabs at the bottom.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void showTabs() {
@@ -1352,7 +1335,7 @@ public class NattablecellEditor
 	 * This is used to track the active viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1368,7 +1351,7 @@ public class NattablecellEditor
 	 * This is how the framework determines which interfaces we implement.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("rawtypes")
@@ -1392,7 +1375,7 @@ public class NattablecellEditor
 	 * This accesses a cached version of the content outliner.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IContentOutlinePage getContentOutlinePage() {
@@ -1444,7 +1427,6 @@ public class NattablecellEditor
 					(new ISelectionChangedListener() {
 						// This ensures that we handle selections correctly.
 						//
-						@Override
 						public void selectionChanged(SelectionChangedEvent event) {
 							handleContentOutlineSelection(event.getSelection());
 						}
@@ -1458,7 +1440,7 @@ public class NattablecellEditor
 	 * This accesses a cached version of the property sheet.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IPropertySheetPage getPropertySheetPage() {
@@ -1486,7 +1468,7 @@ public class NattablecellEditor
 	 * This deals with how we want selection in the outliner to affect the other views.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void handleContentOutlineSelection(ISelection selection) {
@@ -1526,7 +1508,7 @@ public class NattablecellEditor
 	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1538,7 +1520,7 @@ public class NattablecellEditor
 	 * This is for implementing {@link IEditorPart} and simply saves the model file.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1602,7 +1584,7 @@ public class NattablecellEditor
 	 * 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
 	 */
 	protected boolean isPersisted(Resource resource) {
@@ -1623,7 +1605,7 @@ public class NattablecellEditor
 	 * This always returns true because it is not currently supported.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1635,7 +1617,7 @@ public class NattablecellEditor
 	 * This also changes the editor's input.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1654,7 +1636,7 @@ public class NattablecellEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void doSaveAs(URI uri, IEditorInput editorInput) {
@@ -1671,7 +1653,7 @@ public class NattablecellEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1686,7 +1668,7 @@ public class NattablecellEditor
 	 * This is called during startup.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1702,7 +1684,7 @@ public class NattablecellEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1719,7 +1701,7 @@ public class NattablecellEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1731,7 +1713,7 @@ public class NattablecellEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1743,7 +1725,7 @@ public class NattablecellEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1756,7 +1738,7 @@ public class NattablecellEditor
 	 * Calling this result will notify the listeners.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1772,7 +1754,7 @@ public class NattablecellEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setStatusLineManager(ISelection selection) {
@@ -1808,7 +1790,7 @@ public class NattablecellEditor
 	 * This looks up a string in the plugin's plugin.properties file.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static String getString(String key) {
@@ -1819,7 +1801,7 @@ public class NattablecellEditor
 	 * This looks up a string in plugin.properties, making a substitution.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static String getString(String key, Object s1) {
@@ -1830,7 +1812,7 @@ public class NattablecellEditor
 	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1841,7 +1823,7 @@ public class NattablecellEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EditingDomainActionBarContributor getActionBarContributor() {
@@ -1851,7 +1833,7 @@ public class NattablecellEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IActionBars getActionBars() {
@@ -1861,7 +1843,7 @@ public class NattablecellEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public AdapterFactory getAdapterFactory() {
@@ -1871,7 +1853,7 @@ public class NattablecellEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1903,7 +1885,7 @@ public class NattablecellEditor
 	 * Returns whether the outline view should be presented to the user.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean showOutlineView() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellModelWizard.java
index 61ce331eb74..a6cf0fb8100 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellModelWizard.java
@@ -75,7 +75,7 @@ import org.eclipse.ui.part.ISetSelectionTarget;
  * This is a simple wizard for creating a new model file.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattablecellModelWizard extends Wizard implements INewWizard {
@@ -83,7 +83,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * The supported extensions for created files.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final List<String> FILE_EXTENSIONS =
@@ -93,7 +93,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * A formatted list of supported file extensions, suitable for display.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final String FORMATTED_FILE_EXTENSIONS =
@@ -103,7 +103,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattablecellPackage nattablecellPackage = NattablecellPackage.eINSTANCE;
@@ -112,7 +112,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattablecellFactory nattablecellFactory = nattablecellPackage.getNattablecellFactory();
@@ -121,7 +121,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * This is the file creation page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattablecellModelWizardNewFileCreationPage newFileCreationPage;
@@ -130,7 +130,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * This is the initial object creation page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattablecellModelWizardInitialObjectCreationPage initialObjectCreationPage;
@@ -139,7 +139,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * Remember the selection during initialization for populating the default container.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IStructuredSelection selection;
@@ -148,7 +148,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * Remember the workbench during initialization.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IWorkbench workbench;
@@ -157,7 +157,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * Caches the names of the types that can be created as the root object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected List<String> initialObjectNames;
@@ -166,7 +166,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * This just records the information.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -181,7 +181,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * Returns the names of the types that can be created as the root object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<String> getInitialObjectNames() {
@@ -204,7 +204,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * Create a new model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected EObject createInitialModel() {
@@ -217,7 +217,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * Do the work after everything is specified.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -279,7 +279,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 				final ISelection targetSelection = new StructuredSelection(modelFile);
 				getShell().getDisplay().asyncExec
 						(new Runnable() {
-							@Override
 							public void run() {
 								((ISetSelectionTarget) activePart).selectReveal(targetSelection);
 							}
@@ -308,7 +307,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * This is the one page of the wizard.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class NattablecellModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
@@ -316,7 +315,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public NattablecellModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
@@ -327,7 +326,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		 * The framework calls this to see if the file is correct.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -347,7 +346,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public IFile getModelFile() {
@@ -359,14 +358,14 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * This is the page where the type of object to create is selected.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class NattablecellModelWizardInitialObjectCreationPage extends WizardPage {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Combo initialObjectField;
@@ -381,7 +380,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Combo encodingField;
@@ -390,7 +389,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public NattablecellModelWizardInitialObjectCreationPage(String pageId) {
@@ -400,7 +399,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -475,12 +474,11 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected ModifyListener validator =
 				new ModifyListener() {
-					@Override
 					public void modifyText(ModifyEvent e) {
 						setPageComplete(validatePage());
 					}
@@ -489,7 +487,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected boolean validatePage() {
@@ -499,7 +497,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -520,7 +518,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public String getInitialObjectName() {
@@ -537,7 +535,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public String getEncoding() {
@@ -548,7 +546,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		 * Returns the label for the specified type name.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected String getLabel(String typeName) {
@@ -563,7 +561,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Collection<String> getEncodings() {
@@ -582,7 +580,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * The framework calls this to create the contents of the wizard.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -638,7 +636,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * Get the file from the page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IFile getModelFile() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationActionBarContributor.java
index ac4f577a4cf..4a46a9f69f5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationActionBarContributor.java
@@ -49,7 +49,7 @@ import org.eclipse.ui.PartInitException;
  * This is the action bar contributor for the Nattableconfiguration model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattableconfigurationActionBarContributor
@@ -59,7 +59,7 @@ public class NattableconfigurationActionBarContributor
 	 * This keeps track of the active editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IEditorPart activeEditorPart;
@@ -68,7 +68,7 @@ public class NattableconfigurationActionBarContributor
 	 * This keeps track of the current selection provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelectionProvider selectionProvider;
@@ -77,7 +77,7 @@ public class NattableconfigurationActionBarContributor
 	 * This action opens the Properties view.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IAction showPropertiesViewAction =
@@ -99,7 +99,7 @@ public class NattableconfigurationActionBarContributor
 	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IAction refreshViewerAction =
@@ -126,7 +126,7 @@ public class NattableconfigurationActionBarContributor
 	 * generated for the current selection by the item provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> createChildActions;
@@ -135,7 +135,7 @@ public class NattableconfigurationActionBarContributor
 	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IMenuManager createChildMenuManager;
@@ -145,7 +145,7 @@ public class NattableconfigurationActionBarContributor
 	 * generated for the current selection by the item provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> createSiblingActions;
@@ -154,7 +154,7 @@ public class NattableconfigurationActionBarContributor
 	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IMenuManager createSiblingMenuManager;
@@ -163,7 +163,7 @@ public class NattableconfigurationActionBarContributor
 	 * This creates an instance of the contributor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NattableconfigurationActionBarContributor() {
@@ -177,7 +177,7 @@ public class NattableconfigurationActionBarContributor
 	 * This adds Separators for editor additions to the tool bar.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -191,7 +191,7 @@ public class NattableconfigurationActionBarContributor
 	 * as well as the sub-menus for object creation items.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -219,7 +219,6 @@ public class NattableconfigurationActionBarContributor
 		//
 		submenuManager.addMenuListener
 				(new IMenuListener() {
-					@Override
 					public void menuAboutToShow(IMenuManager menuManager) {
 						menuManager.updateAll(true);
 					}
@@ -232,7 +231,7 @@ public class NattableconfigurationActionBarContributor
 	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -266,7 +265,7 @@ public class NattableconfigurationActionBarContributor
 	 * that can be added to the selected object and updating the menus accordingly.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -315,7 +314,7 @@ public class NattableconfigurationActionBarContributor
 	 * and returns the collection of these actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
@@ -333,7 +332,7 @@ public class NattableconfigurationActionBarContributor
 	 * and returns the collection of these actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
@@ -353,7 +352,7 @@ public class NattableconfigurationActionBarContributor
 	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
@@ -374,7 +373,7 @@ public class NattableconfigurationActionBarContributor
 	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
@@ -404,7 +403,7 @@ public class NattableconfigurationActionBarContributor
 	 * This populates the pop-up menu before it appears.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -425,7 +424,7 @@ public class NattableconfigurationActionBarContributor
 	 * This inserts global actions before the "additions-end" separator.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -443,7 +442,7 @@ public class NattableconfigurationActionBarContributor
 	 * This ensures that a delete action will clean up all references to deleted objects.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java
index f108a6742a2..aec5e90b166 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java
@@ -145,7 +145,7 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
  * This is an example of a Nattableconfiguration model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattableconfigurationEditor
@@ -155,7 +155,7 @@ public class NattableconfigurationEditor
 	 * This keeps track of the editing domain that is used to track all changes to the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected AdapterFactoryEditingDomain editingDomain;
@@ -164,7 +164,7 @@ public class NattableconfigurationEditor
 	 * This is the one adapter factory used for providing views of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory adapterFactory;
@@ -173,7 +173,7 @@ public class NattableconfigurationEditor
 	 * This is the content outline page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IContentOutlinePage contentOutlinePage;
@@ -182,7 +182,7 @@ public class NattableconfigurationEditor
 	 * This is a kludge...
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IStatusLineManager contentOutlineStatusLineManager;
@@ -191,7 +191,7 @@ public class NattableconfigurationEditor
 	 * This is the content outline page's viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer contentOutlineViewer;
@@ -200,7 +200,7 @@ public class NattableconfigurationEditor
 	 * This is the property sheet page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
@@ -210,7 +210,7 @@ public class NattableconfigurationEditor
 	 * The parent relation must be correctly defined for this to work.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer selectionViewer;
@@ -219,7 +219,7 @@ public class NattableconfigurationEditor
 	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer parentViewer;
@@ -228,7 +228,7 @@ public class NattableconfigurationEditor
 	 * This shows how a tree view works.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer treeViewer;
@@ -238,7 +238,7 @@ public class NattableconfigurationEditor
 	 * A list viewer doesn't support icons.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ListViewer listViewer;
@@ -248,7 +248,7 @@ public class NattableconfigurationEditor
 	 * A table can be used as a list with icons.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TableViewer tableViewer;
@@ -257,7 +257,7 @@ public class NattableconfigurationEditor
 	 * This shows how a tree view with columns works.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer treeViewerWithColumns;
@@ -266,7 +266,7 @@ public class NattableconfigurationEditor
 	 * This keeps track of the active viewer pane, in the book.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ViewerPane currentViewerPane;
@@ -275,7 +275,7 @@ public class NattableconfigurationEditor
 	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Viewer currentViewer;
@@ -284,7 +284,7 @@ public class NattableconfigurationEditor
 	 * This listens to which ever viewer is active.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelectionChangedListener selectionChangedListener;
@@ -293,7 +293,7 @@ public class NattableconfigurationEditor
 	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
@@ -302,7 +302,7 @@ public class NattableconfigurationEditor
 	 * This keeps track of the selection of the editor as a whole.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelection editorSelection = StructuredSelection.EMPTY;
@@ -312,7 +312,7 @@ public class NattableconfigurationEditor
 	 * in Eclipse's Problems View.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
@@ -321,12 +321,11 @@ public class NattableconfigurationEditor
 	 * This listens for when the outline becomes active
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IPartListener partListener =
 			new IPartListener() {
-				@Override
 				public void partActivated(IWorkbenchPart p) {
 					if (p instanceof ContentOutline) {
 						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
@@ -346,22 +345,18 @@ public class NattableconfigurationEditor
 					}
 				}
 
-				@Override
 				public void partBroughtToTop(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partClosed(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partDeactivated(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partOpened(IWorkbenchPart p) {
 					// Ignore.
 				}
@@ -371,7 +366,7 @@ public class NattableconfigurationEditor
 	 * Resources that have been removed since last activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> removedResources = new ArrayList<Resource>();
@@ -380,7 +375,7 @@ public class NattableconfigurationEditor
 	 * Resources that have been changed since last activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> changedResources = new ArrayList<Resource>();
@@ -389,7 +384,7 @@ public class NattableconfigurationEditor
 	 * Resources that have been saved.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> savedResources = new ArrayList<Resource>();
@@ -398,7 +393,7 @@ public class NattableconfigurationEditor
 	 * Map to store the diagnostic associated with a resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
@@ -407,7 +402,7 @@ public class NattableconfigurationEditor
 	 * Controls whether the problem indication should be updated.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean updateProblemIndication = true;
@@ -416,7 +411,7 @@ public class NattableconfigurationEditor
 	 * Adapter used to update the problem indication when resources are demanded loaded.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected EContentAdapter problemIndicationAdapter =
@@ -440,7 +435,6 @@ public class NattableconfigurationEditor
 							if (updateProblemIndication) {
 								getSite().getShell().getDisplay().asyncExec
 										(new Runnable() {
-											@Override
 											public void run() {
 												updateProblemIndication();
 											}
@@ -467,7 +461,6 @@ public class NattableconfigurationEditor
 					if (updateProblemIndication) {
 						getSite().getShell().getDisplay().asyncExec
 								(new Runnable() {
-									@Override
 									public void run() {
 										updateProblemIndication();
 									}
@@ -480,12 +473,11 @@ public class NattableconfigurationEditor
 	 * This listens for workspace changes.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IResourceChangeListener resourceChangeListener =
 			new IResourceChangeListener() {
-				@Override
 				public void resourceChanged(IResourceChangeEvent event) {
 					IResourceDelta delta = event.getDelta();
 					try {
@@ -494,7 +486,6 @@ public class NattableconfigurationEditor
 							protected Collection<Resource> changedResources = new ArrayList<Resource>();
 							protected Collection<Resource> removedResources = new ArrayList<Resource>();
 
-							@Override
 							public boolean visit(IResourceDelta delta) {
 								if (delta.getResource().getType() == IResource.FILE) {
 									if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -530,7 +521,6 @@ public class NattableconfigurationEditor
 						if (!visitor.getRemovedResources().isEmpty()) {
 							getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										@Override
 										public void run() {
 											removedResources.addAll(visitor.getRemovedResources());
 											if (!isDirty()) {
@@ -543,7 +533,6 @@ public class NattableconfigurationEditor
 						if (!visitor.getChangedResources().isEmpty()) {
 							getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										@Override
 										public void run() {
 											changedResources.addAll(visitor.getChangedResources());
 											if (getSite().getPage().getActiveEditor() == NattableconfigurationEditor.this) {
@@ -563,7 +552,7 @@ public class NattableconfigurationEditor
 	 * Handles activation of the editor or it's associated views.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void handleActivate() {
@@ -599,7 +588,7 @@ public class NattableconfigurationEditor
 	 * Handles what to do with changed resources on activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void handleChangedResources() {
@@ -636,7 +625,7 @@ public class NattableconfigurationEditor
 	 * Updates the problems indication with the information described in the specified diagnostic.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void updateProblemIndication() {
@@ -691,7 +680,7 @@ public class NattableconfigurationEditor
 	 * Shows a dialog that asks if conflicting changes should be discarded.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean handleDirtyConflict() {
@@ -705,7 +694,7 @@ public class NattableconfigurationEditor
 	 * This creates a model editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NattableconfigurationEditor() {
@@ -717,7 +706,7 @@ public class NattableconfigurationEditor
 	 * This sets up the editing domain for the model editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void initializeEditingDomain() {
@@ -747,11 +736,9 @@ public class NattableconfigurationEditor
 		//
 		commandStack.addCommandStackListener
 				(new CommandStackListener() {
-					@Override
 					public void commandStackChanged(final EventObject event) {
 						getContainer().getDisplay().asyncExec
 								(new Runnable() {
-									@Override
 									public void run() {
 										firePropertyChange(IEditorPart.PROP_DIRTY);
 
@@ -784,7 +771,7 @@ public class NattableconfigurationEditor
 	 * This is here for the listener to be able to call it.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -796,7 +783,7 @@ public class NattableconfigurationEditor
 	 * This sets the selection into whichever viewer is active.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setSelectionToViewer(Collection<?> collection) {
@@ -806,7 +793,6 @@ public class NattableconfigurationEditor
 		if (theSelection != null && !theSelection.isEmpty()) {
 			Runnable runnable =
 					new Runnable() {
-						@Override
 						public void run() {
 							// Try to select the items in the current content viewer of the editor.
 							//
@@ -824,7 +810,7 @@ public class NattableconfigurationEditor
 	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -835,14 +821,14 @@ public class NattableconfigurationEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
@@ -852,7 +838,7 @@ public class NattableconfigurationEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -864,7 +850,7 @@ public class NattableconfigurationEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -876,7 +862,7 @@ public class NattableconfigurationEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -888,7 +874,7 @@ public class NattableconfigurationEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -900,7 +886,7 @@ public class NattableconfigurationEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setCurrentViewerPane(ViewerPane viewerPane) {
@@ -918,7 +904,7 @@ public class NattableconfigurationEditor
 	 * is the current one.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setCurrentViewer(Viewer viewer) {
@@ -932,7 +918,6 @@ public class NattableconfigurationEditor
 						new ISelectionChangedListener() {
 							// This just notifies those things that are affected by the section.
 							//
-							@Override
 							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
 								setSelection(selectionChangedEvent.getSelection());
 							}
@@ -965,7 +950,7 @@ public class NattableconfigurationEditor
 	 * This returns the viewer as required by the {@link IViewerProvider} interface.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -977,7 +962,7 @@ public class NattableconfigurationEditor
 	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void createContextMenuFor(StructuredViewer viewer) {
@@ -999,7 +984,7 @@ public class NattableconfigurationEditor
 	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void createModel() {
@@ -1027,7 +1012,7 @@ public class NattableconfigurationEditor
 	 * and the specified exception (if any).
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
@@ -1056,7 +1041,7 @@ public class NattableconfigurationEditor
 	 * This is the method used by the framework to install your own controls.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1277,7 +1262,6 @@ public class NattableconfigurationEditor
 
 			getSite().getShell().getDisplay().asyncExec
 					(new Runnable() {
-						@Override
 						public void run() {
 							setActivePage(0);
 						}
@@ -1303,7 +1287,6 @@ public class NattableconfigurationEditor
 
 		getSite().getShell().getDisplay().asyncExec
 				(new Runnable() {
-					@Override
 					public void run() {
 						updateProblemIndication();
 					}
@@ -1315,7 +1298,7 @@ public class NattableconfigurationEditor
 	 * this hides the single tab at the bottom.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void hideTabs() {
@@ -1334,7 +1317,7 @@ public class NattableconfigurationEditor
 	 * this shows the tabs at the bottom.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void showTabs() {
@@ -1352,7 +1335,7 @@ public class NattableconfigurationEditor
 	 * This is used to track the active viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1368,7 +1351,7 @@ public class NattableconfigurationEditor
 	 * This is how the framework determines which interfaces we implement.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("rawtypes")
@@ -1392,7 +1375,7 @@ public class NattableconfigurationEditor
 	 * This accesses a cached version of the content outliner.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IContentOutlinePage getContentOutlinePage() {
@@ -1444,7 +1427,6 @@ public class NattableconfigurationEditor
 					(new ISelectionChangedListener() {
 						// This ensures that we handle selections correctly.
 						//
-						@Override
 						public void selectionChanged(SelectionChangedEvent event) {
 							handleContentOutlineSelection(event.getSelection());
 						}
@@ -1458,7 +1440,7 @@ public class NattableconfigurationEditor
 	 * This accesses a cached version of the property sheet.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IPropertySheetPage getPropertySheetPage() {
@@ -1486,7 +1468,7 @@ public class NattableconfigurationEditor
 	 * This deals with how we want selection in the outliner to affect the other views.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void handleContentOutlineSelection(ISelection selection) {
@@ -1526,7 +1508,7 @@ public class NattableconfigurationEditor
 	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1538,7 +1520,7 @@ public class NattableconfigurationEditor
 	 * This is for implementing {@link IEditorPart} and simply saves the model file.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1602,7 +1584,7 @@ public class NattableconfigurationEditor
 	 * 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
 	 */
 	protected boolean isPersisted(Resource resource) {
@@ -1623,7 +1605,7 @@ public class NattableconfigurationEditor
 	 * This always returns true because it is not currently supported.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1635,7 +1617,7 @@ public class NattableconfigurationEditor
 	 * This also changes the editor's input.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1654,7 +1636,7 @@ public class NattableconfigurationEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void doSaveAs(URI uri, IEditorInput editorInput) {
@@ -1671,7 +1653,7 @@ public class NattableconfigurationEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1686,7 +1668,7 @@ public class NattableconfigurationEditor
 	 * This is called during startup.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1702,7 +1684,7 @@ public class NattableconfigurationEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1719,7 +1701,7 @@ public class NattableconfigurationEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1731,7 +1713,7 @@ public class NattableconfigurationEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1743,7 +1725,7 @@ public class NattableconfigurationEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1756,7 +1738,7 @@ public class NattableconfigurationEditor
 	 * Calling this result will notify the listeners.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1772,7 +1754,7 @@ public class NattableconfigurationEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setStatusLineManager(ISelection selection) {
@@ -1808,7 +1790,7 @@ public class NattableconfigurationEditor
 	 * This looks up a string in the plugin's plugin.properties file.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static String getString(String key) {
@@ -1819,7 +1801,7 @@ public class NattableconfigurationEditor
 	 * This looks up a string in plugin.properties, making a substitution.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static String getString(String key, Object s1) {
@@ -1830,7 +1812,7 @@ public class NattableconfigurationEditor
 	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1841,7 +1823,7 @@ public class NattableconfigurationEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EditingDomainActionBarContributor getActionBarContributor() {
@@ -1851,7 +1833,7 @@ public class NattableconfigurationEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IActionBars getActionBars() {
@@ -1861,7 +1843,7 @@ public class NattableconfigurationEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public AdapterFactory getAdapterFactory() {
@@ -1871,7 +1853,7 @@ public class NattableconfigurationEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1903,7 +1885,7 @@ public class NattableconfigurationEditor
 	 * Returns whether the outline view should be presented to the user.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean showOutlineView() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationModelWizard.java
index e77868a188b..06ceab1a094 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationModelWizard.java
@@ -75,7 +75,7 @@ import org.eclipse.ui.part.ISetSelectionTarget;
  * This is a simple wizard for creating a new model file.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattableconfigurationModelWizard extends Wizard implements INewWizard {
@@ -83,7 +83,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * The supported extensions for created files.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final List<String> FILE_EXTENSIONS =
@@ -93,7 +93,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * A formatted list of supported file extensions, suitable for display.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final String FORMATTED_FILE_EXTENSIONS =
@@ -103,7 +103,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * This caches an instance of the model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableconfigurationPackage nattableconfigurationPackage = NattableconfigurationPackage.eINSTANCE;
@@ -112,7 +112,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * This caches an instance of the model factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableconfigurationFactory nattableconfigurationFactory = nattableconfigurationPackage.getNattableconfigurationFactory();
@@ -121,7 +121,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * This is the file creation page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableconfigurationModelWizardNewFileCreationPage newFileCreationPage;
@@ -130,7 +130,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * This is the initial object creation page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableconfigurationModelWizardInitialObjectCreationPage initialObjectCreationPage;
@@ -139,7 +139,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * Remember the selection during initialization for populating the default container.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IStructuredSelection selection;
@@ -148,7 +148,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * Remember the workbench during initialization.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IWorkbench workbench;
@@ -157,7 +157,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * Caches the names of the types that can be created as the root object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected List<String> initialObjectNames;
@@ -166,7 +166,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * This just records the information.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -181,7 +181,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * Returns the names of the types that can be created as the root object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<String> getInitialObjectNames() {
@@ -204,7 +204,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * Create a new model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected EObject createInitialModel() {
@@ -217,7 +217,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * Do the work after everything is specified.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -279,7 +279,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 				final ISelection targetSelection = new StructuredSelection(modelFile);
 				getShell().getDisplay().asyncExec
 						(new Runnable() {
-							@Override
 							public void run() {
 								((ISetSelectionTarget) activePart).selectReveal(targetSelection);
 							}
@@ -308,7 +307,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * This is the one page of the wizard.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class NattableconfigurationModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
@@ -316,7 +315,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public NattableconfigurationModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
@@ -327,7 +326,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		 * The framework calls this to see if the file is correct.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -347,7 +346,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public IFile getModelFile() {
@@ -359,14 +358,14 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * This is the page where the type of object to create is selected.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class NattableconfigurationModelWizardInitialObjectCreationPage extends WizardPage {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Combo initialObjectField;
@@ -381,7 +380,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Combo encodingField;
@@ -390,7 +389,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public NattableconfigurationModelWizardInitialObjectCreationPage(String pageId) {
@@ -400,7 +399,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -475,12 +474,11 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected ModifyListener validator =
 				new ModifyListener() {
-					@Override
 					public void modifyText(ModifyEvent e) {
 						setPageComplete(validatePage());
 					}
@@ -489,7 +487,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected boolean validatePage() {
@@ -499,7 +497,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -520,7 +518,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public String getInitialObjectName() {
@@ -537,7 +535,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public String getEncoding() {
@@ -548,7 +546,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		 * Returns the label for the specified type name.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected String getLabel(String typeName) {
@@ -563,7 +561,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Collection<String> getEncodings() {
@@ -582,7 +580,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * The framework calls this to create the contents of the wizard.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -638,7 +636,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * Get the file from the page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IFile getModelFile() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderActionBarContributor.java
index a37d6bb62e6..3ac8a6f85a2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderActionBarContributor.java
@@ -49,7 +49,7 @@ import org.eclipse.ui.PartInitException;
  * This is the action bar contributor for the Nattablelabelprovider model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattablelabelproviderActionBarContributor
@@ -59,7 +59,7 @@ public class NattablelabelproviderActionBarContributor
 	 * This keeps track of the active editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IEditorPart activeEditorPart;
@@ -68,7 +68,7 @@ public class NattablelabelproviderActionBarContributor
 	 * This keeps track of the current selection provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelectionProvider selectionProvider;
@@ -77,7 +77,7 @@ public class NattablelabelproviderActionBarContributor
 	 * This action opens the Properties view.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IAction showPropertiesViewAction =
@@ -99,7 +99,7 @@ public class NattablelabelproviderActionBarContributor
 	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IAction refreshViewerAction =
@@ -126,7 +126,7 @@ public class NattablelabelproviderActionBarContributor
 	 * generated for the current selection by the item provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> createChildActions;
@@ -135,7 +135,7 @@ public class NattablelabelproviderActionBarContributor
 	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IMenuManager createChildMenuManager;
@@ -145,7 +145,7 @@ public class NattablelabelproviderActionBarContributor
 	 * generated for the current selection by the item provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> createSiblingActions;
@@ -154,7 +154,7 @@ public class NattablelabelproviderActionBarContributor
 	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IMenuManager createSiblingMenuManager;
@@ -163,7 +163,7 @@ public class NattablelabelproviderActionBarContributor
 	 * This creates an instance of the contributor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NattablelabelproviderActionBarContributor() {
@@ -177,7 +177,7 @@ public class NattablelabelproviderActionBarContributor
 	 * This adds Separators for editor additions to the tool bar.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -191,7 +191,7 @@ public class NattablelabelproviderActionBarContributor
 	 * as well as the sub-menus for object creation items.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -219,7 +219,6 @@ public class NattablelabelproviderActionBarContributor
 		//
 		submenuManager.addMenuListener
 				(new IMenuListener() {
-					@Override
 					public void menuAboutToShow(IMenuManager menuManager) {
 						menuManager.updateAll(true);
 					}
@@ -232,7 +231,7 @@ public class NattablelabelproviderActionBarContributor
 	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -266,7 +265,7 @@ public class NattablelabelproviderActionBarContributor
 	 * that can be added to the selected object and updating the menus accordingly.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -315,7 +314,7 @@ public class NattablelabelproviderActionBarContributor
 	 * and returns the collection of these actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
@@ -333,7 +332,7 @@ public class NattablelabelproviderActionBarContributor
 	 * and returns the collection of these actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
@@ -353,7 +352,7 @@ public class NattablelabelproviderActionBarContributor
 	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
@@ -374,7 +373,7 @@ public class NattablelabelproviderActionBarContributor
 	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
@@ -404,7 +403,7 @@ public class NattablelabelproviderActionBarContributor
 	 * This populates the pop-up menu before it appears.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -425,7 +424,7 @@ public class NattablelabelproviderActionBarContributor
 	 * This inserts global actions before the "additions-end" separator.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -443,7 +442,7 @@ public class NattablelabelproviderActionBarContributor
 	 * This ensures that a delete action will clean up all references to deleted objects.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java
index 1952e434c25..75aba22402b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java
@@ -145,7 +145,7 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
  * This is an example of a Nattablelabelprovider model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattablelabelproviderEditor
@@ -155,7 +155,7 @@ public class NattablelabelproviderEditor
 	 * This keeps track of the editing domain that is used to track all changes to the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected AdapterFactoryEditingDomain editingDomain;
@@ -164,7 +164,7 @@ public class NattablelabelproviderEditor
 	 * This is the one adapter factory used for providing views of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory adapterFactory;
@@ -173,7 +173,7 @@ public class NattablelabelproviderEditor
 	 * This is the content outline page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IContentOutlinePage contentOutlinePage;
@@ -182,7 +182,7 @@ public class NattablelabelproviderEditor
 	 * This is a kludge...
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IStatusLineManager contentOutlineStatusLineManager;
@@ -191,7 +191,7 @@ public class NattablelabelproviderEditor
 	 * This is the content outline page's viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer contentOutlineViewer;
@@ -200,7 +200,7 @@ public class NattablelabelproviderEditor
 	 * This is the property sheet page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
@@ -210,7 +210,7 @@ public class NattablelabelproviderEditor
 	 * The parent relation must be correctly defined for this to work.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer selectionViewer;
@@ -219,7 +219,7 @@ public class NattablelabelproviderEditor
 	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer parentViewer;
@@ -228,7 +228,7 @@ public class NattablelabelproviderEditor
 	 * This shows how a tree view works.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer treeViewer;
@@ -238,7 +238,7 @@ public class NattablelabelproviderEditor
 	 * A list viewer doesn't support icons.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ListViewer listViewer;
@@ -248,7 +248,7 @@ public class NattablelabelproviderEditor
 	 * A table can be used as a list with icons.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TableViewer tableViewer;
@@ -257,7 +257,7 @@ public class NattablelabelproviderEditor
 	 * This shows how a tree view with columns works.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer treeViewerWithColumns;
@@ -266,7 +266,7 @@ public class NattablelabelproviderEditor
 	 * This keeps track of the active viewer pane, in the book.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ViewerPane currentViewerPane;
@@ -275,7 +275,7 @@ public class NattablelabelproviderEditor
 	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Viewer currentViewer;
@@ -284,7 +284,7 @@ public class NattablelabelproviderEditor
 	 * This listens to which ever viewer is active.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelectionChangedListener selectionChangedListener;
@@ -293,7 +293,7 @@ public class NattablelabelproviderEditor
 	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
@@ -302,7 +302,7 @@ public class NattablelabelproviderEditor
 	 * This keeps track of the selection of the editor as a whole.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelection editorSelection = StructuredSelection.EMPTY;
@@ -312,7 +312,7 @@ public class NattablelabelproviderEditor
 	 * in Eclipse's Problems View.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
@@ -321,12 +321,11 @@ public class NattablelabelproviderEditor
 	 * This listens for when the outline becomes active
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IPartListener partListener =
 			new IPartListener() {
-				@Override
 				public void partActivated(IWorkbenchPart p) {
 					if (p instanceof ContentOutline) {
 						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
@@ -346,22 +345,18 @@ public class NattablelabelproviderEditor
 					}
 				}
 
-				@Override
 				public void partBroughtToTop(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partClosed(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partDeactivated(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partOpened(IWorkbenchPart p) {
 					// Ignore.
 				}
@@ -371,7 +366,7 @@ public class NattablelabelproviderEditor
 	 * Resources that have been removed since last activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> removedResources = new ArrayList<Resource>();
@@ -380,7 +375,7 @@ public class NattablelabelproviderEditor
 	 * Resources that have been changed since last activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> changedResources = new ArrayList<Resource>();
@@ -389,7 +384,7 @@ public class NattablelabelproviderEditor
 	 * Resources that have been saved.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> savedResources = new ArrayList<Resource>();
@@ -398,7 +393,7 @@ public class NattablelabelproviderEditor
 	 * Map to store the diagnostic associated with a resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
@@ -407,7 +402,7 @@ public class NattablelabelproviderEditor
 	 * Controls whether the problem indication should be updated.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean updateProblemIndication = true;
@@ -416,7 +411,7 @@ public class NattablelabelproviderEditor
 	 * Adapter used to update the problem indication when resources are demanded loaded.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected EContentAdapter problemIndicationAdapter =
@@ -440,7 +435,6 @@ public class NattablelabelproviderEditor
 							if (updateProblemIndication) {
 								getSite().getShell().getDisplay().asyncExec
 										(new Runnable() {
-											@Override
 											public void run() {
 												updateProblemIndication();
 											}
@@ -467,7 +461,6 @@ public class NattablelabelproviderEditor
 					if (updateProblemIndication) {
 						getSite().getShell().getDisplay().asyncExec
 								(new Runnable() {
-									@Override
 									public void run() {
 										updateProblemIndication();
 									}
@@ -480,12 +473,11 @@ public class NattablelabelproviderEditor
 	 * This listens for workspace changes.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IResourceChangeListener resourceChangeListener =
 			new IResourceChangeListener() {
-				@Override
 				public void resourceChanged(IResourceChangeEvent event) {
 					IResourceDelta delta = event.getDelta();
 					try {
@@ -494,7 +486,6 @@ public class NattablelabelproviderEditor
 							protected Collection<Resource> changedResources = new ArrayList<Resource>();
 							protected Collection<Resource> removedResources = new ArrayList<Resource>();
 
-							@Override
 							public boolean visit(IResourceDelta delta) {
 								if (delta.getResource().getType() == IResource.FILE) {
 									if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -530,7 +521,6 @@ public class NattablelabelproviderEditor
 						if (!visitor.getRemovedResources().isEmpty()) {
 							getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										@Override
 										public void run() {
 											removedResources.addAll(visitor.getRemovedResources());
 											if (!isDirty()) {
@@ -543,7 +533,6 @@ public class NattablelabelproviderEditor
 						if (!visitor.getChangedResources().isEmpty()) {
 							getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										@Override
 										public void run() {
 											changedResources.addAll(visitor.getChangedResources());
 											if (getSite().getPage().getActiveEditor() == NattablelabelproviderEditor.this) {
@@ -563,7 +552,7 @@ public class NattablelabelproviderEditor
 	 * Handles activation of the editor or it's associated views.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void handleActivate() {
@@ -599,7 +588,7 @@ public class NattablelabelproviderEditor
 	 * Handles what to do with changed resources on activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void handleChangedResources() {
@@ -636,7 +625,7 @@ public class NattablelabelproviderEditor
 	 * Updates the problems indication with the information described in the specified diagnostic.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void updateProblemIndication() {
@@ -691,7 +680,7 @@ public class NattablelabelproviderEditor
 	 * Shows a dialog that asks if conflicting changes should be discarded.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean handleDirtyConflict() {
@@ -705,7 +694,7 @@ public class NattablelabelproviderEditor
 	 * This creates a model editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NattablelabelproviderEditor() {
@@ -717,7 +706,7 @@ public class NattablelabelproviderEditor
 	 * This sets up the editing domain for the model editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void initializeEditingDomain() {
@@ -747,11 +736,9 @@ public class NattablelabelproviderEditor
 		//
 		commandStack.addCommandStackListener
 				(new CommandStackListener() {
-					@Override
 					public void commandStackChanged(final EventObject event) {
 						getContainer().getDisplay().asyncExec
 								(new Runnable() {
-									@Override
 									public void run() {
 										firePropertyChange(IEditorPart.PROP_DIRTY);
 
@@ -784,7 +771,7 @@ public class NattablelabelproviderEditor
 	 * This is here for the listener to be able to call it.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -796,7 +783,7 @@ public class NattablelabelproviderEditor
 	 * This sets the selection into whichever viewer is active.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setSelectionToViewer(Collection<?> collection) {
@@ -806,7 +793,6 @@ public class NattablelabelproviderEditor
 		if (theSelection != null && !theSelection.isEmpty()) {
 			Runnable runnable =
 					new Runnable() {
-						@Override
 						public void run() {
 							// Try to select the items in the current content viewer of the editor.
 							//
@@ -824,7 +810,7 @@ public class NattablelabelproviderEditor
 	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -835,14 +821,14 @@ public class NattablelabelproviderEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
@@ -852,7 +838,7 @@ public class NattablelabelproviderEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -864,7 +850,7 @@ public class NattablelabelproviderEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -876,7 +862,7 @@ public class NattablelabelproviderEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -888,7 +874,7 @@ public class NattablelabelproviderEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -900,7 +886,7 @@ public class NattablelabelproviderEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setCurrentViewerPane(ViewerPane viewerPane) {
@@ -918,7 +904,7 @@ public class NattablelabelproviderEditor
 	 * is the current one.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setCurrentViewer(Viewer viewer) {
@@ -932,7 +918,6 @@ public class NattablelabelproviderEditor
 						new ISelectionChangedListener() {
 							// This just notifies those things that are affected by the section.
 							//
-							@Override
 							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
 								setSelection(selectionChangedEvent.getSelection());
 							}
@@ -965,7 +950,7 @@ public class NattablelabelproviderEditor
 	 * This returns the viewer as required by the {@link IViewerProvider} interface.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -977,7 +962,7 @@ public class NattablelabelproviderEditor
 	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void createContextMenuFor(StructuredViewer viewer) {
@@ -999,7 +984,7 @@ public class NattablelabelproviderEditor
 	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void createModel() {
@@ -1027,7 +1012,7 @@ public class NattablelabelproviderEditor
 	 * and the specified exception (if any).
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
@@ -1056,7 +1041,7 @@ public class NattablelabelproviderEditor
 	 * This is the method used by the framework to install your own controls.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1277,7 +1262,6 @@ public class NattablelabelproviderEditor
 
 			getSite().getShell().getDisplay().asyncExec
 					(new Runnable() {
-						@Override
 						public void run() {
 							setActivePage(0);
 						}
@@ -1303,7 +1287,6 @@ public class NattablelabelproviderEditor
 
 		getSite().getShell().getDisplay().asyncExec
 				(new Runnable() {
-					@Override
 					public void run() {
 						updateProblemIndication();
 					}
@@ -1315,7 +1298,7 @@ public class NattablelabelproviderEditor
 	 * this hides the single tab at the bottom.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void hideTabs() {
@@ -1334,7 +1317,7 @@ public class NattablelabelproviderEditor
 	 * this shows the tabs at the bottom.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void showTabs() {
@@ -1352,7 +1335,7 @@ public class NattablelabelproviderEditor
 	 * This is used to track the active viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1368,7 +1351,7 @@ public class NattablelabelproviderEditor
 	 * This is how the framework determines which interfaces we implement.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("rawtypes")
@@ -1392,7 +1375,7 @@ public class NattablelabelproviderEditor
 	 * This accesses a cached version of the content outliner.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IContentOutlinePage getContentOutlinePage() {
@@ -1444,7 +1427,6 @@ public class NattablelabelproviderEditor
 					(new ISelectionChangedListener() {
 						// This ensures that we handle selections correctly.
 						//
-						@Override
 						public void selectionChanged(SelectionChangedEvent event) {
 							handleContentOutlineSelection(event.getSelection());
 						}
@@ -1458,7 +1440,7 @@ public class NattablelabelproviderEditor
 	 * This accesses a cached version of the property sheet.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IPropertySheetPage getPropertySheetPage() {
@@ -1486,7 +1468,7 @@ public class NattablelabelproviderEditor
 	 * This deals with how we want selection in the outliner to affect the other views.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void handleContentOutlineSelection(ISelection selection) {
@@ -1526,7 +1508,7 @@ public class NattablelabelproviderEditor
 	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1538,7 +1520,7 @@ public class NattablelabelproviderEditor
 	 * This is for implementing {@link IEditorPart} and simply saves the model file.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1602,7 +1584,7 @@ public class NattablelabelproviderEditor
 	 * 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
 	 */
 	protected boolean isPersisted(Resource resource) {
@@ -1623,7 +1605,7 @@ public class NattablelabelproviderEditor
 	 * This always returns true because it is not currently supported.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1635,7 +1617,7 @@ public class NattablelabelproviderEditor
 	 * This also changes the editor's input.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1654,7 +1636,7 @@ public class NattablelabelproviderEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void doSaveAs(URI uri, IEditorInput editorInput) {
@@ -1671,7 +1653,7 @@ public class NattablelabelproviderEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1686,7 +1668,7 @@ public class NattablelabelproviderEditor
 	 * This is called during startup.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1702,7 +1684,7 @@ public class NattablelabelproviderEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1719,7 +1701,7 @@ public class NattablelabelproviderEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1731,7 +1713,7 @@ public class NattablelabelproviderEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1743,7 +1725,7 @@ public class NattablelabelproviderEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1756,7 +1738,7 @@ public class NattablelabelproviderEditor
 	 * Calling this result will notify the listeners.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1772,7 +1754,7 @@ public class NattablelabelproviderEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setStatusLineManager(ISelection selection) {
@@ -1808,7 +1790,7 @@ public class NattablelabelproviderEditor
 	 * This looks up a string in the plugin's plugin.properties file.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static String getString(String key) {
@@ -1819,7 +1801,7 @@ public class NattablelabelproviderEditor
 	 * This looks up a string in plugin.properties, making a substitution.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static String getString(String key, Object s1) {
@@ -1830,7 +1812,7 @@ public class NattablelabelproviderEditor
 	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1841,7 +1823,7 @@ public class NattablelabelproviderEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EditingDomainActionBarContributor getActionBarContributor() {
@@ -1851,7 +1833,7 @@ public class NattablelabelproviderEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IActionBars getActionBars() {
@@ -1861,7 +1843,7 @@ public class NattablelabelproviderEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public AdapterFactory getAdapterFactory() {
@@ -1871,7 +1853,7 @@ public class NattablelabelproviderEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1903,7 +1885,7 @@ public class NattablelabelproviderEditor
 	 * Returns whether the outline view should be presented to the user.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean showOutlineView() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderModelWizard.java
index 84630cf7b29..f16d42ef359 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderModelWizard.java
@@ -75,7 +75,7 @@ import org.eclipse.ui.part.ISetSelectionTarget;
  * This is a simple wizard for creating a new model file.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattablelabelproviderModelWizard extends Wizard implements INewWizard {
@@ -83,7 +83,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * The supported extensions for created files.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final List<String> FILE_EXTENSIONS =
@@ -93,7 +93,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * A formatted list of supported file extensions, suitable for display.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final String FORMATTED_FILE_EXTENSIONS =
@@ -103,7 +103,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * This caches an instance of the model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattablelabelproviderPackage nattablelabelproviderPackage = NattablelabelproviderPackage.eINSTANCE;
@@ -112,7 +112,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * This caches an instance of the model factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattablelabelproviderFactory nattablelabelproviderFactory = nattablelabelproviderPackage.getNattablelabelproviderFactory();
@@ -121,7 +121,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * This is the file creation page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattablelabelproviderModelWizardNewFileCreationPage newFileCreationPage;
@@ -130,7 +130,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * This is the initial object creation page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattablelabelproviderModelWizardInitialObjectCreationPage initialObjectCreationPage;
@@ -139,7 +139,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * Remember the selection during initialization for populating the default container.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IStructuredSelection selection;
@@ -148,7 +148,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * Remember the workbench during initialization.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IWorkbench workbench;
@@ -157,7 +157,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * Caches the names of the types that can be created as the root object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected List<String> initialObjectNames;
@@ -166,7 +166,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * This just records the information.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -181,7 +181,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * Returns the names of the types that can be created as the root object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<String> getInitialObjectNames() {
@@ -204,7 +204,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * Create a new model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected EObject createInitialModel() {
@@ -217,7 +217,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * Do the work after everything is specified.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -279,7 +279,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 				final ISelection targetSelection = new StructuredSelection(modelFile);
 				getShell().getDisplay().asyncExec
 						(new Runnable() {
-							@Override
 							public void run() {
 								((ISetSelectionTarget) activePart).selectReveal(targetSelection);
 							}
@@ -308,7 +307,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * This is the one page of the wizard.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class NattablelabelproviderModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
@@ -316,7 +315,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public NattablelabelproviderModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
@@ -327,7 +326,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		 * The framework calls this to see if the file is correct.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -347,7 +346,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public IFile getModelFile() {
@@ -359,14 +358,14 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * This is the page where the type of object to create is selected.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class NattablelabelproviderModelWizardInitialObjectCreationPage extends WizardPage {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Combo initialObjectField;
@@ -381,7 +380,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Combo encodingField;
@@ -390,7 +389,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public NattablelabelproviderModelWizardInitialObjectCreationPage(String pageId) {
@@ -400,7 +399,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -475,12 +474,11 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected ModifyListener validator =
 				new ModifyListener() {
-					@Override
 					public void modifyText(ModifyEvent e) {
 						setPageComplete(validatePage());
 					}
@@ -489,7 +487,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected boolean validatePage() {
@@ -499,7 +497,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -520,7 +518,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public String getInitialObjectName() {
@@ -537,7 +535,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public String getEncoding() {
@@ -548,7 +546,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		 * Returns the label for the specified type name.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected String getLabel(String typeName) {
@@ -563,7 +561,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Collection<String> getEncodings() {
@@ -582,7 +580,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * The framework calls this to create the contents of the wizard.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -638,7 +636,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * Get the file from the page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IFile getModelFile() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemActionBarContributor.java
index 3699f46841b..77089fe6bd0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemActionBarContributor.java
@@ -49,7 +49,7 @@ import org.eclipse.ui.PartInitException;
  * This is the action bar contributor for the Nattableproblem model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattableproblemActionBarContributor
@@ -59,7 +59,7 @@ public class NattableproblemActionBarContributor
 	 * This keeps track of the active editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IEditorPart activeEditorPart;
@@ -68,7 +68,7 @@ public class NattableproblemActionBarContributor
 	 * This keeps track of the current selection provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelectionProvider selectionProvider;
@@ -77,7 +77,7 @@ public class NattableproblemActionBarContributor
 	 * This action opens the Properties view.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IAction showPropertiesViewAction =
@@ -99,7 +99,7 @@ public class NattableproblemActionBarContributor
 	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IAction refreshViewerAction =
@@ -126,7 +126,7 @@ public class NattableproblemActionBarContributor
 	 * generated for the current selection by the item provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> createChildActions;
@@ -135,7 +135,7 @@ public class NattableproblemActionBarContributor
 	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IMenuManager createChildMenuManager;
@@ -145,7 +145,7 @@ public class NattableproblemActionBarContributor
 	 * generated for the current selection by the item provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> createSiblingActions;
@@ -154,7 +154,7 @@ public class NattableproblemActionBarContributor
 	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IMenuManager createSiblingMenuManager;
@@ -163,7 +163,7 @@ public class NattableproblemActionBarContributor
 	 * This creates an instance of the contributor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NattableproblemActionBarContributor() {
@@ -177,7 +177,7 @@ public class NattableproblemActionBarContributor
 	 * This adds Separators for editor additions to the tool bar.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -191,7 +191,7 @@ public class NattableproblemActionBarContributor
 	 * as well as the sub-menus for object creation items.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -219,7 +219,6 @@ public class NattableproblemActionBarContributor
 		//
 		submenuManager.addMenuListener
 				(new IMenuListener() {
-					@Override
 					public void menuAboutToShow(IMenuManager menuManager) {
 						menuManager.updateAll(true);
 					}
@@ -232,7 +231,7 @@ public class NattableproblemActionBarContributor
 	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -266,7 +265,7 @@ public class NattableproblemActionBarContributor
 	 * that can be added to the selected object and updating the menus accordingly.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -315,7 +314,7 @@ public class NattableproblemActionBarContributor
 	 * and returns the collection of these actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
@@ -333,7 +332,7 @@ public class NattableproblemActionBarContributor
 	 * and returns the collection of these actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
@@ -353,7 +352,7 @@ public class NattableproblemActionBarContributor
 	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
@@ -374,7 +373,7 @@ public class NattableproblemActionBarContributor
 	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
@@ -404,7 +403,7 @@ public class NattableproblemActionBarContributor
 	 * This populates the pop-up menu before it appears.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -425,7 +424,7 @@ public class NattableproblemActionBarContributor
 	 * This inserts global actions before the "additions-end" separator.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -443,7 +442,7 @@ public class NattableproblemActionBarContributor
 	 * This ensures that a delete action will clean up all references to deleted objects.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemEditor.java
index 3e922c32ce1..1e84859bb1c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemEditor.java
@@ -145,7 +145,7 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
  * This is an example of a Nattableproblem model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattableproblemEditor
@@ -155,7 +155,7 @@ public class NattableproblemEditor
 	 * This keeps track of the editing domain that is used to track all changes to the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected AdapterFactoryEditingDomain editingDomain;
@@ -164,7 +164,7 @@ public class NattableproblemEditor
 	 * This is the one adapter factory used for providing views of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory adapterFactory;
@@ -173,7 +173,7 @@ public class NattableproblemEditor
 	 * This is the content outline page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IContentOutlinePage contentOutlinePage;
@@ -182,7 +182,7 @@ public class NattableproblemEditor
 	 * This is a kludge...
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IStatusLineManager contentOutlineStatusLineManager;
@@ -191,7 +191,7 @@ public class NattableproblemEditor
 	 * This is the content outline page's viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer contentOutlineViewer;
@@ -200,7 +200,7 @@ public class NattableproblemEditor
 	 * This is the property sheet page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
@@ -210,7 +210,7 @@ public class NattableproblemEditor
 	 * The parent relation must be correctly defined for this to work.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer selectionViewer;
@@ -219,7 +219,7 @@ public class NattableproblemEditor
 	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer parentViewer;
@@ -228,7 +228,7 @@ public class NattableproblemEditor
 	 * This shows how a tree view works.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer treeViewer;
@@ -238,7 +238,7 @@ public class NattableproblemEditor
 	 * A list viewer doesn't support icons.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ListViewer listViewer;
@@ -248,7 +248,7 @@ public class NattableproblemEditor
 	 * A table can be used as a list with icons.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TableViewer tableViewer;
@@ -257,7 +257,7 @@ public class NattableproblemEditor
 	 * This shows how a tree view with columns works.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer treeViewerWithColumns;
@@ -266,7 +266,7 @@ public class NattableproblemEditor
 	 * This keeps track of the active viewer pane, in the book.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ViewerPane currentViewerPane;
@@ -275,7 +275,7 @@ public class NattableproblemEditor
 	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Viewer currentViewer;
@@ -284,7 +284,7 @@ public class NattableproblemEditor
 	 * This listens to which ever viewer is active.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelectionChangedListener selectionChangedListener;
@@ -293,7 +293,7 @@ public class NattableproblemEditor
 	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
@@ -302,7 +302,7 @@ public class NattableproblemEditor
 	 * This keeps track of the selection of the editor as a whole.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelection editorSelection = StructuredSelection.EMPTY;
@@ -312,7 +312,7 @@ public class NattableproblemEditor
 	 * in Eclipse's Problems View.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
@@ -321,12 +321,11 @@ public class NattableproblemEditor
 	 * This listens for when the outline becomes active
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IPartListener partListener =
 			new IPartListener() {
-				@Override
 				public void partActivated(IWorkbenchPart p) {
 					if (p instanceof ContentOutline) {
 						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
@@ -346,22 +345,18 @@ public class NattableproblemEditor
 					}
 				}
 
-				@Override
 				public void partBroughtToTop(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partClosed(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partDeactivated(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partOpened(IWorkbenchPart p) {
 					// Ignore.
 				}
@@ -371,7 +366,7 @@ public class NattableproblemEditor
 	 * Resources that have been removed since last activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> removedResources = new ArrayList<Resource>();
@@ -380,7 +375,7 @@ public class NattableproblemEditor
 	 * Resources that have been changed since last activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> changedResources = new ArrayList<Resource>();
@@ -389,7 +384,7 @@ public class NattableproblemEditor
 	 * Resources that have been saved.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> savedResources = new ArrayList<Resource>();
@@ -398,7 +393,7 @@ public class NattableproblemEditor
 	 * Map to store the diagnostic associated with a resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
@@ -407,7 +402,7 @@ public class NattableproblemEditor
 	 * Controls whether the problem indication should be updated.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean updateProblemIndication = true;
@@ -416,7 +411,7 @@ public class NattableproblemEditor
 	 * Adapter used to update the problem indication when resources are demanded loaded.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected EContentAdapter problemIndicationAdapter =
@@ -440,7 +435,6 @@ public class NattableproblemEditor
 							if (updateProblemIndication) {
 								getSite().getShell().getDisplay().asyncExec
 										(new Runnable() {
-											@Override
 											public void run() {
 												updateProblemIndication();
 											}
@@ -467,7 +461,6 @@ public class NattableproblemEditor
 					if (updateProblemIndication) {
 						getSite().getShell().getDisplay().asyncExec
 								(new Runnable() {
-									@Override
 									public void run() {
 										updateProblemIndication();
 									}
@@ -480,12 +473,11 @@ public class NattableproblemEditor
 	 * This listens for workspace changes.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IResourceChangeListener resourceChangeListener =
 			new IResourceChangeListener() {
-				@Override
 				public void resourceChanged(IResourceChangeEvent event) {
 					IResourceDelta delta = event.getDelta();
 					try {
@@ -494,7 +486,6 @@ public class NattableproblemEditor
 							protected Collection<Resource> changedResources = new ArrayList<Resource>();
 							protected Collection<Resource> removedResources = new ArrayList<Resource>();
 
-							@Override
 							public boolean visit(IResourceDelta delta) {
 								if (delta.getResource().getType() == IResource.FILE) {
 									if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -530,7 +521,6 @@ public class NattableproblemEditor
 						if (!visitor.getRemovedResources().isEmpty()) {
 							getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										@Override
 										public void run() {
 											removedResources.addAll(visitor.getRemovedResources());
 											if (!isDirty()) {
@@ -543,7 +533,6 @@ public class NattableproblemEditor
 						if (!visitor.getChangedResources().isEmpty()) {
 							getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										@Override
 										public void run() {
 											changedResources.addAll(visitor.getChangedResources());
 											if (getSite().getPage().getActiveEditor() == NattableproblemEditor.this) {
@@ -563,7 +552,7 @@ public class NattableproblemEditor
 	 * Handles activation of the editor or it's associated views.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void handleActivate() {
@@ -599,7 +588,7 @@ public class NattableproblemEditor
 	 * Handles what to do with changed resources on activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void handleChangedResources() {
@@ -636,7 +625,7 @@ public class NattableproblemEditor
 	 * Updates the problems indication with the information described in the specified diagnostic.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void updateProblemIndication() {
@@ -691,7 +680,7 @@ public class NattableproblemEditor
 	 * Shows a dialog that asks if conflicting changes should be discarded.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean handleDirtyConflict() {
@@ -705,7 +694,7 @@ public class NattableproblemEditor
 	 * This creates a model editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NattableproblemEditor() {
@@ -717,7 +706,7 @@ public class NattableproblemEditor
 	 * This sets up the editing domain for the model editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void initializeEditingDomain() {
@@ -747,11 +736,9 @@ public class NattableproblemEditor
 		//
 		commandStack.addCommandStackListener
 				(new CommandStackListener() {
-					@Override
 					public void commandStackChanged(final EventObject event) {
 						getContainer().getDisplay().asyncExec
 								(new Runnable() {
-									@Override
 									public void run() {
 										firePropertyChange(IEditorPart.PROP_DIRTY);
 
@@ -784,7 +771,7 @@ public class NattableproblemEditor
 	 * This is here for the listener to be able to call it.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -796,7 +783,7 @@ public class NattableproblemEditor
 	 * This sets the selection into whichever viewer is active.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setSelectionToViewer(Collection<?> collection) {
@@ -806,7 +793,6 @@ public class NattableproblemEditor
 		if (theSelection != null && !theSelection.isEmpty()) {
 			Runnable runnable =
 					new Runnable() {
-						@Override
 						public void run() {
 							// Try to select the items in the current content viewer of the editor.
 							//
@@ -824,7 +810,7 @@ public class NattableproblemEditor
 	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -835,14 +821,14 @@ public class NattableproblemEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
@@ -852,7 +838,7 @@ public class NattableproblemEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -864,7 +850,7 @@ public class NattableproblemEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -876,7 +862,7 @@ public class NattableproblemEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -888,7 +874,7 @@ public class NattableproblemEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -900,7 +886,7 @@ public class NattableproblemEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setCurrentViewerPane(ViewerPane viewerPane) {
@@ -918,7 +904,7 @@ public class NattableproblemEditor
 	 * is the current one.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setCurrentViewer(Viewer viewer) {
@@ -932,7 +918,6 @@ public class NattableproblemEditor
 						new ISelectionChangedListener() {
 							// This just notifies those things that are affected by the section.
 							//
-							@Override
 							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
 								setSelection(selectionChangedEvent.getSelection());
 							}
@@ -965,7 +950,7 @@ public class NattableproblemEditor
 	 * This returns the viewer as required by the {@link IViewerProvider} interface.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -977,7 +962,7 @@ public class NattableproblemEditor
 	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void createContextMenuFor(StructuredViewer viewer) {
@@ -999,7 +984,7 @@ public class NattableproblemEditor
 	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void createModel() {
@@ -1027,7 +1012,7 @@ public class NattableproblemEditor
 	 * and the specified exception (if any).
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
@@ -1056,7 +1041,7 @@ public class NattableproblemEditor
 	 * This is the method used by the framework to install your own controls.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1277,7 +1262,6 @@ public class NattableproblemEditor
 
 			getSite().getShell().getDisplay().asyncExec
 					(new Runnable() {
-						@Override
 						public void run() {
 							setActivePage(0);
 						}
@@ -1303,7 +1287,6 @@ public class NattableproblemEditor
 
 		getSite().getShell().getDisplay().asyncExec
 				(new Runnable() {
-					@Override
 					public void run() {
 						updateProblemIndication();
 					}
@@ -1315,7 +1298,7 @@ public class NattableproblemEditor
 	 * this hides the single tab at the bottom.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void hideTabs() {
@@ -1334,7 +1317,7 @@ public class NattableproblemEditor
 	 * this shows the tabs at the bottom.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void showTabs() {
@@ -1352,7 +1335,7 @@ public class NattableproblemEditor
 	 * This is used to track the active viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1368,7 +1351,7 @@ public class NattableproblemEditor
 	 * This is how the framework determines which interfaces we implement.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("rawtypes")
@@ -1392,7 +1375,7 @@ public class NattableproblemEditor
 	 * This accesses a cached version of the content outliner.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IContentOutlinePage getContentOutlinePage() {
@@ -1444,7 +1427,6 @@ public class NattableproblemEditor
 					(new ISelectionChangedListener() {
 						// This ensures that we handle selections correctly.
 						//
-						@Override
 						public void selectionChanged(SelectionChangedEvent event) {
 							handleContentOutlineSelection(event.getSelection());
 						}
@@ -1458,7 +1440,7 @@ public class NattableproblemEditor
 	 * This accesses a cached version of the property sheet.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IPropertySheetPage getPropertySheetPage() {
@@ -1486,7 +1468,7 @@ public class NattableproblemEditor
 	 * This deals with how we want selection in the outliner to affect the other views.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void handleContentOutlineSelection(ISelection selection) {
@@ -1526,7 +1508,7 @@ public class NattableproblemEditor
 	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1538,7 +1520,7 @@ public class NattableproblemEditor
 	 * This is for implementing {@link IEditorPart} and simply saves the model file.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1602,7 +1584,7 @@ public class NattableproblemEditor
 	 * 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
 	 */
 	protected boolean isPersisted(Resource resource) {
@@ -1623,7 +1605,7 @@ public class NattableproblemEditor
 	 * This always returns true because it is not currently supported.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1635,7 +1617,7 @@ public class NattableproblemEditor
 	 * This also changes the editor's input.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1654,7 +1636,7 @@ public class NattableproblemEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void doSaveAs(URI uri, IEditorInput editorInput) {
@@ -1671,7 +1653,7 @@ public class NattableproblemEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1686,7 +1668,7 @@ public class NattableproblemEditor
 	 * This is called during startup.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1702,7 +1684,7 @@ public class NattableproblemEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1719,7 +1701,7 @@ public class NattableproblemEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1731,7 +1713,7 @@ public class NattableproblemEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1743,7 +1725,7 @@ public class NattableproblemEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1756,7 +1738,7 @@ public class NattableproblemEditor
 	 * Calling this result will notify the listeners.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1772,7 +1754,7 @@ public class NattableproblemEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setStatusLineManager(ISelection selection) {
@@ -1808,7 +1790,7 @@ public class NattableproblemEditor
 	 * This looks up a string in the plugin's plugin.properties file.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static String getString(String key) {
@@ -1819,7 +1801,7 @@ public class NattableproblemEditor
 	 * This looks up a string in plugin.properties, making a substitution.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static String getString(String key, Object s1) {
@@ -1830,7 +1812,7 @@ public class NattableproblemEditor
 	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1841,7 +1823,7 @@ public class NattableproblemEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EditingDomainActionBarContributor getActionBarContributor() {
@@ -1851,7 +1833,7 @@ public class NattableproblemEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IActionBars getActionBars() {
@@ -1861,7 +1843,7 @@ public class NattableproblemEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public AdapterFactory getAdapterFactory() {
@@ -1871,7 +1853,7 @@ public class NattableproblemEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1903,7 +1885,7 @@ public class NattableproblemEditor
 	 * Returns whether the outline view should be presented to the user.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean showOutlineView() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemModelWizard.java
index ab7301b6151..209a8c27ea6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemModelWizard.java
@@ -75,7 +75,7 @@ import org.eclipse.ui.part.ISetSelectionTarget;
  * This is a simple wizard for creating a new model file.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattableproblemModelWizard extends Wizard implements INewWizard {
@@ -83,7 +83,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * The supported extensions for created files.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final List<String> FILE_EXTENSIONS =
@@ -93,7 +93,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * A formatted list of supported file extensions, suitable for display.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final String FORMATTED_FILE_EXTENSIONS =
@@ -103,7 +103,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableproblemPackage nattableproblemPackage = NattableproblemPackage.eINSTANCE;
@@ -112,7 +112,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableproblemFactory nattableproblemFactory = nattableproblemPackage.getNattableproblemFactory();
@@ -121,7 +121,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * This is the file creation page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableproblemModelWizardNewFileCreationPage newFileCreationPage;
@@ -130,7 +130,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * This is the initial object creation page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableproblemModelWizardInitialObjectCreationPage initialObjectCreationPage;
@@ -139,7 +139,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * Remember the selection during initialization for populating the default container.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IStructuredSelection selection;
@@ -148,7 +148,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * Remember the workbench during initialization.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IWorkbench workbench;
@@ -157,7 +157,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * Caches the names of the types that can be created as the root object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected List<String> initialObjectNames;
@@ -166,7 +166,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * This just records the information.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -181,7 +181,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * Returns the names of the types that can be created as the root object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<String> getInitialObjectNames() {
@@ -204,7 +204,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * Create a new model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected EObject createInitialModel() {
@@ -217,7 +217,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * Do the work after everything is specified.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -279,7 +279,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 				final ISelection targetSelection = new StructuredSelection(modelFile);
 				getShell().getDisplay().asyncExec
 						(new Runnable() {
-							@Override
 							public void run() {
 								((ISetSelectionTarget) activePart).selectReveal(targetSelection);
 							}
@@ -308,7 +307,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * This is the one page of the wizard.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class NattableproblemModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
@@ -316,7 +315,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public NattableproblemModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
@@ -327,7 +326,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		 * The framework calls this to see if the file is correct.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -347,7 +346,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public IFile getModelFile() {
@@ -359,14 +358,14 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * This is the page where the type of object to create is selected.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class NattableproblemModelWizardInitialObjectCreationPage extends WizardPage {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Combo initialObjectField;
@@ -381,7 +380,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Combo encodingField;
@@ -390,7 +389,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public NattableproblemModelWizardInitialObjectCreationPage(String pageId) {
@@ -400,7 +399,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -475,12 +474,11 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected ModifyListener validator =
 				new ModifyListener() {
-					@Override
 					public void modifyText(ModifyEvent e) {
 						setPageComplete(validatePage());
 					}
@@ -489,7 +487,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected boolean validatePage() {
@@ -499,7 +497,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -520,7 +518,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public String getInitialObjectName() {
@@ -537,7 +535,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public String getEncoding() {
@@ -548,7 +546,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		 * Returns the label for the specified type name.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected String getLabel(String typeName) {
@@ -563,7 +561,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Collection<String> getEncodings() {
@@ -582,7 +580,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * The framework calls this to create the contents of the wizard.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -638,7 +636,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * Get the file from the page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IFile getModelFile() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleActionBarContributor.java
index e9f5766dbac..cd23123f36e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleActionBarContributor.java
@@ -49,7 +49,7 @@ import org.eclipse.ui.PartInitException;
  * This is the action bar contributor for the Nattablestyle model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattablestyleActionBarContributor
@@ -59,7 +59,7 @@ public class NattablestyleActionBarContributor
 	 * This keeps track of the active editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IEditorPart activeEditorPart;
@@ -68,7 +68,7 @@ public class NattablestyleActionBarContributor
 	 * This keeps track of the current selection provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelectionProvider selectionProvider;
@@ -77,7 +77,7 @@ public class NattablestyleActionBarContributor
 	 * This action opens the Properties view.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IAction showPropertiesViewAction =
@@ -99,7 +99,7 @@ public class NattablestyleActionBarContributor
 	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IAction refreshViewerAction =
@@ -126,7 +126,7 @@ public class NattablestyleActionBarContributor
 	 * generated for the current selection by the item provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> createChildActions;
@@ -135,7 +135,7 @@ public class NattablestyleActionBarContributor
 	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IMenuManager createChildMenuManager;
@@ -145,7 +145,7 @@ public class NattablestyleActionBarContributor
 	 * generated for the current selection by the item provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> createSiblingActions;
@@ -154,7 +154,7 @@ public class NattablestyleActionBarContributor
 	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IMenuManager createSiblingMenuManager;
@@ -163,7 +163,7 @@ public class NattablestyleActionBarContributor
 	 * This creates an instance of the contributor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NattablestyleActionBarContributor() {
@@ -177,7 +177,7 @@ public class NattablestyleActionBarContributor
 	 * This adds Separators for editor additions to the tool bar.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -191,7 +191,7 @@ public class NattablestyleActionBarContributor
 	 * as well as the sub-menus for object creation items.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -219,7 +219,6 @@ public class NattablestyleActionBarContributor
 		//
 		submenuManager.addMenuListener
 				(new IMenuListener() {
-					@Override
 					public void menuAboutToShow(IMenuManager menuManager) {
 						menuManager.updateAll(true);
 					}
@@ -232,7 +231,7 @@ public class NattablestyleActionBarContributor
 	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -266,7 +265,7 @@ public class NattablestyleActionBarContributor
 	 * that can be added to the selected object and updating the menus accordingly.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -315,7 +314,7 @@ public class NattablestyleActionBarContributor
 	 * and returns the collection of these actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
@@ -333,7 +332,7 @@ public class NattablestyleActionBarContributor
 	 * and returns the collection of these actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
@@ -353,7 +352,7 @@ public class NattablestyleActionBarContributor
 	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
@@ -374,7 +373,7 @@ public class NattablestyleActionBarContributor
 	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
@@ -404,7 +403,7 @@ public class NattablestyleActionBarContributor
 	 * This populates the pop-up menu before it appears.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -425,7 +424,7 @@ public class NattablestyleActionBarContributor
 	 * This inserts global actions before the "additions-end" separator.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -443,7 +442,7 @@ public class NattablestyleActionBarContributor
 	 * This ensures that a delete action will clean up all references to deleted objects.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleEditor.java
index a7650332624..135a4409fe5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleEditor.java
@@ -145,7 +145,7 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
  * This is an example of a Nattablestyle model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattablestyleEditor
@@ -155,7 +155,7 @@ public class NattablestyleEditor
 	 * This keeps track of the editing domain that is used to track all changes to the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected AdapterFactoryEditingDomain editingDomain;
@@ -164,7 +164,7 @@ public class NattablestyleEditor
 	 * This is the one adapter factory used for providing views of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory adapterFactory;
@@ -173,7 +173,7 @@ public class NattablestyleEditor
 	 * This is the content outline page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IContentOutlinePage contentOutlinePage;
@@ -182,7 +182,7 @@ public class NattablestyleEditor
 	 * This is a kludge...
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IStatusLineManager contentOutlineStatusLineManager;
@@ -191,7 +191,7 @@ public class NattablestyleEditor
 	 * This is the content outline page's viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer contentOutlineViewer;
@@ -200,7 +200,7 @@ public class NattablestyleEditor
 	 * This is the property sheet page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
@@ -210,7 +210,7 @@ public class NattablestyleEditor
 	 * The parent relation must be correctly defined for this to work.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer selectionViewer;
@@ -219,7 +219,7 @@ public class NattablestyleEditor
 	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer parentViewer;
@@ -228,7 +228,7 @@ public class NattablestyleEditor
 	 * This shows how a tree view works.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer treeViewer;
@@ -238,7 +238,7 @@ public class NattablestyleEditor
 	 * A list viewer doesn't support icons.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ListViewer listViewer;
@@ -248,7 +248,7 @@ public class NattablestyleEditor
 	 * A table can be used as a list with icons.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TableViewer tableViewer;
@@ -257,7 +257,7 @@ public class NattablestyleEditor
 	 * This shows how a tree view with columns works.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer treeViewerWithColumns;
@@ -266,7 +266,7 @@ public class NattablestyleEditor
 	 * This keeps track of the active viewer pane, in the book.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ViewerPane currentViewerPane;
@@ -275,7 +275,7 @@ public class NattablestyleEditor
 	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Viewer currentViewer;
@@ -284,7 +284,7 @@ public class NattablestyleEditor
 	 * This listens to which ever viewer is active.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelectionChangedListener selectionChangedListener;
@@ -293,7 +293,7 @@ public class NattablestyleEditor
 	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
@@ -302,7 +302,7 @@ public class NattablestyleEditor
 	 * This keeps track of the selection of the editor as a whole.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelection editorSelection = StructuredSelection.EMPTY;
@@ -312,7 +312,7 @@ public class NattablestyleEditor
 	 * in Eclipse's Problems View.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
@@ -321,12 +321,11 @@ public class NattablestyleEditor
 	 * This listens for when the outline becomes active
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IPartListener partListener =
 			new IPartListener() {
-				@Override
 				public void partActivated(IWorkbenchPart p) {
 					if (p instanceof ContentOutline) {
 						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
@@ -346,22 +345,18 @@ public class NattablestyleEditor
 					}
 				}
 
-				@Override
 				public void partBroughtToTop(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partClosed(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partDeactivated(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partOpened(IWorkbenchPart p) {
 					// Ignore.
 				}
@@ -371,7 +366,7 @@ public class NattablestyleEditor
 	 * Resources that have been removed since last activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> removedResources = new ArrayList<Resource>();
@@ -380,7 +375,7 @@ public class NattablestyleEditor
 	 * Resources that have been changed since last activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> changedResources = new ArrayList<Resource>();
@@ -389,7 +384,7 @@ public class NattablestyleEditor
 	 * Resources that have been saved.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> savedResources = new ArrayList<Resource>();
@@ -398,7 +393,7 @@ public class NattablestyleEditor
 	 * Map to store the diagnostic associated with a resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
@@ -407,7 +402,7 @@ public class NattablestyleEditor
 	 * Controls whether the problem indication should be updated.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean updateProblemIndication = true;
@@ -416,7 +411,7 @@ public class NattablestyleEditor
 	 * Adapter used to update the problem indication when resources are demanded loaded.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected EContentAdapter problemIndicationAdapter =
@@ -440,7 +435,6 @@ public class NattablestyleEditor
 							if (updateProblemIndication) {
 								getSite().getShell().getDisplay().asyncExec
 										(new Runnable() {
-											@Override
 											public void run() {
 												updateProblemIndication();
 											}
@@ -467,7 +461,6 @@ public class NattablestyleEditor
 					if (updateProblemIndication) {
 						getSite().getShell().getDisplay().asyncExec
 								(new Runnable() {
-									@Override
 									public void run() {
 										updateProblemIndication();
 									}
@@ -480,12 +473,11 @@ public class NattablestyleEditor
 	 * This listens for workspace changes.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IResourceChangeListener resourceChangeListener =
 			new IResourceChangeListener() {
-				@Override
 				public void resourceChanged(IResourceChangeEvent event) {
 					IResourceDelta delta = event.getDelta();
 					try {
@@ -494,7 +486,6 @@ public class NattablestyleEditor
 							protected Collection<Resource> changedResources = new ArrayList<Resource>();
 							protected Collection<Resource> removedResources = new ArrayList<Resource>();
 
-							@Override
 							public boolean visit(IResourceDelta delta) {
 								if (delta.getResource().getType() == IResource.FILE) {
 									if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -530,7 +521,6 @@ public class NattablestyleEditor
 						if (!visitor.getRemovedResources().isEmpty()) {
 							getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										@Override
 										public void run() {
 											removedResources.addAll(visitor.getRemovedResources());
 											if (!isDirty()) {
@@ -543,7 +533,6 @@ public class NattablestyleEditor
 						if (!visitor.getChangedResources().isEmpty()) {
 							getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										@Override
 										public void run() {
 											changedResources.addAll(visitor.getChangedResources());
 											if (getSite().getPage().getActiveEditor() == NattablestyleEditor.this) {
@@ -563,7 +552,7 @@ public class NattablestyleEditor
 	 * Handles activation of the editor or it's associated views.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void handleActivate() {
@@ -599,7 +588,7 @@ public class NattablestyleEditor
 	 * Handles what to do with changed resources on activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void handleChangedResources() {
@@ -636,7 +625,7 @@ public class NattablestyleEditor
 	 * Updates the problems indication with the information described in the specified diagnostic.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void updateProblemIndication() {
@@ -691,7 +680,7 @@ public class NattablestyleEditor
 	 * Shows a dialog that asks if conflicting changes should be discarded.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean handleDirtyConflict() {
@@ -705,7 +694,7 @@ public class NattablestyleEditor
 	 * This creates a model editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NattablestyleEditor() {
@@ -717,7 +706,7 @@ public class NattablestyleEditor
 	 * This sets up the editing domain for the model editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void initializeEditingDomain() {
@@ -747,11 +736,9 @@ public class NattablestyleEditor
 		//
 		commandStack.addCommandStackListener
 				(new CommandStackListener() {
-					@Override
 					public void commandStackChanged(final EventObject event) {
 						getContainer().getDisplay().asyncExec
 								(new Runnable() {
-									@Override
 									public void run() {
 										firePropertyChange(IEditorPart.PROP_DIRTY);
 
@@ -784,7 +771,7 @@ public class NattablestyleEditor
 	 * This is here for the listener to be able to call it.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -796,7 +783,7 @@ public class NattablestyleEditor
 	 * This sets the selection into whichever viewer is active.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setSelectionToViewer(Collection<?> collection) {
@@ -806,7 +793,6 @@ public class NattablestyleEditor
 		if (theSelection != null && !theSelection.isEmpty()) {
 			Runnable runnable =
 					new Runnable() {
-						@Override
 						public void run() {
 							// Try to select the items in the current content viewer of the editor.
 							//
@@ -824,7 +810,7 @@ public class NattablestyleEditor
 	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -835,14 +821,14 @@ public class NattablestyleEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
@@ -852,7 +838,7 @@ public class NattablestyleEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -864,7 +850,7 @@ public class NattablestyleEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -876,7 +862,7 @@ public class NattablestyleEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -888,7 +874,7 @@ public class NattablestyleEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -900,7 +886,7 @@ public class NattablestyleEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setCurrentViewerPane(ViewerPane viewerPane) {
@@ -918,7 +904,7 @@ public class NattablestyleEditor
 	 * is the current one.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setCurrentViewer(Viewer viewer) {
@@ -932,7 +918,6 @@ public class NattablestyleEditor
 						new ISelectionChangedListener() {
 							// This just notifies those things that are affected by the section.
 							//
-							@Override
 							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
 								setSelection(selectionChangedEvent.getSelection());
 							}
@@ -965,7 +950,7 @@ public class NattablestyleEditor
 	 * This returns the viewer as required by the {@link IViewerProvider} interface.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -977,7 +962,7 @@ public class NattablestyleEditor
 	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void createContextMenuFor(StructuredViewer viewer) {
@@ -999,7 +984,7 @@ public class NattablestyleEditor
 	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void createModel() {
@@ -1027,7 +1012,7 @@ public class NattablestyleEditor
 	 * and the specified exception (if any).
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
@@ -1056,7 +1041,7 @@ public class NattablestyleEditor
 	 * This is the method used by the framework to install your own controls.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1277,7 +1262,6 @@ public class NattablestyleEditor
 
 			getSite().getShell().getDisplay().asyncExec
 					(new Runnable() {
-						@Override
 						public void run() {
 							setActivePage(0);
 						}
@@ -1303,7 +1287,6 @@ public class NattablestyleEditor
 
 		getSite().getShell().getDisplay().asyncExec
 				(new Runnable() {
-					@Override
 					public void run() {
 						updateProblemIndication();
 					}
@@ -1315,7 +1298,7 @@ public class NattablestyleEditor
 	 * this hides the single tab at the bottom.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void hideTabs() {
@@ -1334,7 +1317,7 @@ public class NattablestyleEditor
 	 * this shows the tabs at the bottom.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void showTabs() {
@@ -1352,7 +1335,7 @@ public class NattablestyleEditor
 	 * This is used to track the active viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1368,7 +1351,7 @@ public class NattablestyleEditor
 	 * This is how the framework determines which interfaces we implement.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("rawtypes")
@@ -1392,7 +1375,7 @@ public class NattablestyleEditor
 	 * This accesses a cached version of the content outliner.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IContentOutlinePage getContentOutlinePage() {
@@ -1444,7 +1427,6 @@ public class NattablestyleEditor
 					(new ISelectionChangedListener() {
 						// This ensures that we handle selections correctly.
 						//
-						@Override
 						public void selectionChanged(SelectionChangedEvent event) {
 							handleContentOutlineSelection(event.getSelection());
 						}
@@ -1458,7 +1440,7 @@ public class NattablestyleEditor
 	 * This accesses a cached version of the property sheet.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IPropertySheetPage getPropertySheetPage() {
@@ -1486,7 +1468,7 @@ public class NattablestyleEditor
 	 * This deals with how we want selection in the outliner to affect the other views.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void handleContentOutlineSelection(ISelection selection) {
@@ -1526,7 +1508,7 @@ public class NattablestyleEditor
 	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1538,7 +1520,7 @@ public class NattablestyleEditor
 	 * This is for implementing {@link IEditorPart} and simply saves the model file.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1602,7 +1584,7 @@ public class NattablestyleEditor
 	 * 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
 	 */
 	protected boolean isPersisted(Resource resource) {
@@ -1623,7 +1605,7 @@ public class NattablestyleEditor
 	 * This always returns true because it is not currently supported.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1635,7 +1617,7 @@ public class NattablestyleEditor
 	 * This also changes the editor's input.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1654,7 +1636,7 @@ public class NattablestyleEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void doSaveAs(URI uri, IEditorInput editorInput) {
@@ -1671,7 +1653,7 @@ public class NattablestyleEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1686,7 +1668,7 @@ public class NattablestyleEditor
 	 * This is called during startup.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1702,7 +1684,7 @@ public class NattablestyleEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1719,7 +1701,7 @@ public class NattablestyleEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1731,7 +1713,7 @@ public class NattablestyleEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1743,7 +1725,7 @@ public class NattablestyleEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1756,7 +1738,7 @@ public class NattablestyleEditor
 	 * Calling this result will notify the listeners.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1772,7 +1754,7 @@ public class NattablestyleEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setStatusLineManager(ISelection selection) {
@@ -1808,7 +1790,7 @@ public class NattablestyleEditor
 	 * This looks up a string in the plugin's plugin.properties file.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static String getString(String key) {
@@ -1819,7 +1801,7 @@ public class NattablestyleEditor
 	 * This looks up a string in plugin.properties, making a substitution.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static String getString(String key, Object s1) {
@@ -1830,7 +1812,7 @@ public class NattablestyleEditor
 	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1841,7 +1823,7 @@ public class NattablestyleEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EditingDomainActionBarContributor getActionBarContributor() {
@@ -1851,7 +1833,7 @@ public class NattablestyleEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IActionBars getActionBars() {
@@ -1861,7 +1843,7 @@ public class NattablestyleEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public AdapterFactory getAdapterFactory() {
@@ -1871,7 +1853,7 @@ public class NattablestyleEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1903,7 +1885,7 @@ public class NattablestyleEditor
 	 * Returns whether the outline view should be presented to the user.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean showOutlineView() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleModelWizard.java
index b536fc6769b..8bf68bce092 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleModelWizard.java
@@ -75,7 +75,7 @@ import org.eclipse.ui.part.ISetSelectionTarget;
  * This is a simple wizard for creating a new model file.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattablestyleModelWizard extends Wizard implements INewWizard {
@@ -83,7 +83,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * The supported extensions for created files.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final List<String> FILE_EXTENSIONS =
@@ -93,7 +93,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * A formatted list of supported file extensions, suitable for display.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final String FORMATTED_FILE_EXTENSIONS =
@@ -103,7 +103,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattablestylePackage nattablestylePackage = NattablestylePackage.eINSTANCE;
@@ -112,7 +112,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattablestyleFactory nattablestyleFactory = nattablestylePackage.getNattablestyleFactory();
@@ -121,7 +121,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * This is the file creation page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattablestyleModelWizardNewFileCreationPage newFileCreationPage;
@@ -130,7 +130,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * This is the initial object creation page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattablestyleModelWizardInitialObjectCreationPage initialObjectCreationPage;
@@ -139,7 +139,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * Remember the selection during initialization for populating the default container.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IStructuredSelection selection;
@@ -148,7 +148,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * Remember the workbench during initialization.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IWorkbench workbench;
@@ -157,7 +157,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * Caches the names of the types that can be created as the root object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected List<String> initialObjectNames;
@@ -166,7 +166,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * This just records the information.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -181,7 +181,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * Returns the names of the types that can be created as the root object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<String> getInitialObjectNames() {
@@ -204,7 +204,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * Create a new model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected EObject createInitialModel() {
@@ -217,7 +217,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * Do the work after everything is specified.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -279,7 +279,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 				final ISelection targetSelection = new StructuredSelection(modelFile);
 				getShell().getDisplay().asyncExec
 						(new Runnable() {
-							@Override
 							public void run() {
 								((ISetSelectionTarget) activePart).selectReveal(targetSelection);
 							}
@@ -308,7 +307,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * This is the one page of the wizard.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class NattablestyleModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
@@ -316,7 +315,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public NattablestyleModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
@@ -327,7 +326,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		 * The framework calls this to see if the file is correct.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -347,7 +346,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public IFile getModelFile() {
@@ -359,14 +358,14 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * This is the page where the type of object to create is selected.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class NattablestyleModelWizardInitialObjectCreationPage extends WizardPage {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Combo initialObjectField;
@@ -381,7 +380,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Combo encodingField;
@@ -390,7 +389,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public NattablestyleModelWizardInitialObjectCreationPage(String pageId) {
@@ -400,7 +399,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -475,12 +474,11 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected ModifyListener validator =
 				new ModifyListener() {
-					@Override
 					public void modifyText(ModifyEvent e) {
 						setPageComplete(validatePage());
 					}
@@ -489,7 +487,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected boolean validatePage() {
@@ -499,7 +497,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -520,7 +518,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public String getInitialObjectName() {
@@ -537,7 +535,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public String getEncoding() {
@@ -548,7 +546,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		 * Returns the label for the specified type name.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected String getLabel(String typeName) {
@@ -563,7 +561,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Collection<String> getEncodings() {
@@ -582,7 +580,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * The framework calls this to create the contents of the wizard.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -638,7 +636,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * Get the file from the page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IFile getModelFile() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterActionBarContributor.java
index 869a9951978..8f07f676a1a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterActionBarContributor.java
@@ -49,7 +49,7 @@ import org.eclipse.ui.PartInitException;
  * This is the action bar contributor for the Nattabletester model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattabletesterActionBarContributor
@@ -59,7 +59,7 @@ public class NattabletesterActionBarContributor
 	 * This keeps track of the active editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IEditorPart activeEditorPart;
@@ -68,7 +68,7 @@ public class NattabletesterActionBarContributor
 	 * This keeps track of the current selection provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelectionProvider selectionProvider;
@@ -77,7 +77,7 @@ public class NattabletesterActionBarContributor
 	 * This action opens the Properties view.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IAction showPropertiesViewAction =
@@ -99,7 +99,7 @@ public class NattabletesterActionBarContributor
 	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IAction refreshViewerAction =
@@ -126,7 +126,7 @@ public class NattabletesterActionBarContributor
 	 * generated for the current selection by the item provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> createChildActions;
@@ -135,7 +135,7 @@ public class NattabletesterActionBarContributor
 	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IMenuManager createChildMenuManager;
@@ -145,7 +145,7 @@ public class NattabletesterActionBarContributor
 	 * generated for the current selection by the item provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> createSiblingActions;
@@ -154,7 +154,7 @@ public class NattabletesterActionBarContributor
 	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IMenuManager createSiblingMenuManager;
@@ -163,7 +163,7 @@ public class NattabletesterActionBarContributor
 	 * This creates an instance of the contributor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NattabletesterActionBarContributor() {
@@ -177,7 +177,7 @@ public class NattabletesterActionBarContributor
 	 * This adds Separators for editor additions to the tool bar.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -191,7 +191,7 @@ public class NattabletesterActionBarContributor
 	 * as well as the sub-menus for object creation items.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -219,7 +219,6 @@ public class NattabletesterActionBarContributor
 		//
 		submenuManager.addMenuListener
 				(new IMenuListener() {
-					@Override
 					public void menuAboutToShow(IMenuManager menuManager) {
 						menuManager.updateAll(true);
 					}
@@ -232,7 +231,7 @@ public class NattabletesterActionBarContributor
 	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -266,7 +265,7 @@ public class NattabletesterActionBarContributor
 	 * that can be added to the selected object and updating the menus accordingly.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -315,7 +314,7 @@ public class NattabletesterActionBarContributor
 	 * and returns the collection of these actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
@@ -333,7 +332,7 @@ public class NattabletesterActionBarContributor
 	 * and returns the collection of these actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
@@ -353,7 +352,7 @@ public class NattabletesterActionBarContributor
 	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
@@ -374,7 +373,7 @@ public class NattabletesterActionBarContributor
 	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
@@ -404,7 +403,7 @@ public class NattabletesterActionBarContributor
 	 * This populates the pop-up menu before it appears.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -425,7 +424,7 @@ public class NattabletesterActionBarContributor
 	 * This inserts global actions before the "additions-end" separator.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -443,7 +442,7 @@ public class NattabletesterActionBarContributor
 	 * This ensures that a delete action will clean up all references to deleted objects.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java
index 6312b8cb66f..fe940a57096 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java
@@ -145,7 +145,7 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
  * This is an example of a Nattabletester model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattabletesterEditor
@@ -155,7 +155,7 @@ public class NattabletesterEditor
 	 * This keeps track of the editing domain that is used to track all changes to the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected AdapterFactoryEditingDomain editingDomain;
@@ -164,7 +164,7 @@ public class NattabletesterEditor
 	 * This is the one adapter factory used for providing views of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory adapterFactory;
@@ -173,7 +173,7 @@ public class NattabletesterEditor
 	 * This is the content outline page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IContentOutlinePage contentOutlinePage;
@@ -182,7 +182,7 @@ public class NattabletesterEditor
 	 * This is a kludge...
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IStatusLineManager contentOutlineStatusLineManager;
@@ -191,7 +191,7 @@ public class NattabletesterEditor
 	 * This is the content outline page's viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer contentOutlineViewer;
@@ -200,7 +200,7 @@ public class NattabletesterEditor
 	 * This is the property sheet page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
@@ -210,7 +210,7 @@ public class NattabletesterEditor
 	 * The parent relation must be correctly defined for this to work.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer selectionViewer;
@@ -219,7 +219,7 @@ public class NattabletesterEditor
 	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer parentViewer;
@@ -228,7 +228,7 @@ public class NattabletesterEditor
 	 * This shows how a tree view works.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer treeViewer;
@@ -238,7 +238,7 @@ public class NattabletesterEditor
 	 * A list viewer doesn't support icons.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ListViewer listViewer;
@@ -248,7 +248,7 @@ public class NattabletesterEditor
 	 * A table can be used as a list with icons.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TableViewer tableViewer;
@@ -257,7 +257,7 @@ public class NattabletesterEditor
 	 * This shows how a tree view with columns works.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer treeViewerWithColumns;
@@ -266,7 +266,7 @@ public class NattabletesterEditor
 	 * This keeps track of the active viewer pane, in the book.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ViewerPane currentViewerPane;
@@ -275,7 +275,7 @@ public class NattabletesterEditor
 	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Viewer currentViewer;
@@ -284,7 +284,7 @@ public class NattabletesterEditor
 	 * This listens to which ever viewer is active.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelectionChangedListener selectionChangedListener;
@@ -293,7 +293,7 @@ public class NattabletesterEditor
 	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
@@ -302,7 +302,7 @@ public class NattabletesterEditor
 	 * This keeps track of the selection of the editor as a whole.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelection editorSelection = StructuredSelection.EMPTY;
@@ -312,7 +312,7 @@ public class NattabletesterEditor
 	 * in Eclipse's Problems View.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
@@ -321,12 +321,11 @@ public class NattabletesterEditor
 	 * This listens for when the outline becomes active
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IPartListener partListener =
 			new IPartListener() {
-				@Override
 				public void partActivated(IWorkbenchPart p) {
 					if (p instanceof ContentOutline) {
 						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
@@ -346,22 +345,18 @@ public class NattabletesterEditor
 					}
 				}
 
-				@Override
 				public void partBroughtToTop(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partClosed(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partDeactivated(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partOpened(IWorkbenchPart p) {
 					// Ignore.
 				}
@@ -371,7 +366,7 @@ public class NattabletesterEditor
 	 * Resources that have been removed since last activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> removedResources = new ArrayList<Resource>();
@@ -380,7 +375,7 @@ public class NattabletesterEditor
 	 * Resources that have been changed since last activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> changedResources = new ArrayList<Resource>();
@@ -389,7 +384,7 @@ public class NattabletesterEditor
 	 * Resources that have been saved.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> savedResources = new ArrayList<Resource>();
@@ -398,7 +393,7 @@ public class NattabletesterEditor
 	 * Map to store the diagnostic associated with a resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
@@ -407,7 +402,7 @@ public class NattabletesterEditor
 	 * Controls whether the problem indication should be updated.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean updateProblemIndication = true;
@@ -416,7 +411,7 @@ public class NattabletesterEditor
 	 * Adapter used to update the problem indication when resources are demanded loaded.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected EContentAdapter problemIndicationAdapter =
@@ -440,7 +435,6 @@ public class NattabletesterEditor
 							if (updateProblemIndication) {
 								getSite().getShell().getDisplay().asyncExec
 										(new Runnable() {
-											@Override
 											public void run() {
 												updateProblemIndication();
 											}
@@ -467,7 +461,6 @@ public class NattabletesterEditor
 					if (updateProblemIndication) {
 						getSite().getShell().getDisplay().asyncExec
 								(new Runnable() {
-									@Override
 									public void run() {
 										updateProblemIndication();
 									}
@@ -480,12 +473,11 @@ public class NattabletesterEditor
 	 * This listens for workspace changes.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IResourceChangeListener resourceChangeListener =
 			new IResourceChangeListener() {
-				@Override
 				public void resourceChanged(IResourceChangeEvent event) {
 					IResourceDelta delta = event.getDelta();
 					try {
@@ -494,7 +486,6 @@ public class NattabletesterEditor
 							protected Collection<Resource> changedResources = new ArrayList<Resource>();
 							protected Collection<Resource> removedResources = new ArrayList<Resource>();
 
-							@Override
 							public boolean visit(IResourceDelta delta) {
 								if (delta.getResource().getType() == IResource.FILE) {
 									if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -530,7 +521,6 @@ public class NattabletesterEditor
 						if (!visitor.getRemovedResources().isEmpty()) {
 							getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										@Override
 										public void run() {
 											removedResources.addAll(visitor.getRemovedResources());
 											if (!isDirty()) {
@@ -543,7 +533,6 @@ public class NattabletesterEditor
 						if (!visitor.getChangedResources().isEmpty()) {
 							getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										@Override
 										public void run() {
 											changedResources.addAll(visitor.getChangedResources());
 											if (getSite().getPage().getActiveEditor() == NattabletesterEditor.this) {
@@ -563,7 +552,7 @@ public class NattabletesterEditor
 	 * Handles activation of the editor or it's associated views.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void handleActivate() {
@@ -599,7 +588,7 @@ public class NattabletesterEditor
 	 * Handles what to do with changed resources on activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void handleChangedResources() {
@@ -636,7 +625,7 @@ public class NattabletesterEditor
 	 * Updates the problems indication with the information described in the specified diagnostic.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void updateProblemIndication() {
@@ -691,7 +680,7 @@ public class NattabletesterEditor
 	 * Shows a dialog that asks if conflicting changes should be discarded.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean handleDirtyConflict() {
@@ -705,7 +694,7 @@ public class NattabletesterEditor
 	 * This creates a model editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NattabletesterEditor() {
@@ -717,7 +706,7 @@ public class NattabletesterEditor
 	 * This sets up the editing domain for the model editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void initializeEditingDomain() {
@@ -747,11 +736,9 @@ public class NattabletesterEditor
 		//
 		commandStack.addCommandStackListener
 				(new CommandStackListener() {
-					@Override
 					public void commandStackChanged(final EventObject event) {
 						getContainer().getDisplay().asyncExec
 								(new Runnable() {
-									@Override
 									public void run() {
 										firePropertyChange(IEditorPart.PROP_DIRTY);
 
@@ -784,7 +771,7 @@ public class NattabletesterEditor
 	 * This is here for the listener to be able to call it.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -796,7 +783,7 @@ public class NattabletesterEditor
 	 * This sets the selection into whichever viewer is active.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setSelectionToViewer(Collection<?> collection) {
@@ -806,7 +793,6 @@ public class NattabletesterEditor
 		if (theSelection != null && !theSelection.isEmpty()) {
 			Runnable runnable =
 					new Runnable() {
-						@Override
 						public void run() {
 							// Try to select the items in the current content viewer of the editor.
 							//
@@ -824,7 +810,7 @@ public class NattabletesterEditor
 	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -835,14 +821,14 @@ public class NattabletesterEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
@@ -852,7 +838,7 @@ public class NattabletesterEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -864,7 +850,7 @@ public class NattabletesterEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -876,7 +862,7 @@ public class NattabletesterEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -888,7 +874,7 @@ public class NattabletesterEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -900,7 +886,7 @@ public class NattabletesterEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setCurrentViewerPane(ViewerPane viewerPane) {
@@ -918,7 +904,7 @@ public class NattabletesterEditor
 	 * is the current one.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setCurrentViewer(Viewer viewer) {
@@ -932,7 +918,6 @@ public class NattabletesterEditor
 						new ISelectionChangedListener() {
 							// This just notifies those things that are affected by the section.
 							//
-							@Override
 							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
 								setSelection(selectionChangedEvent.getSelection());
 							}
@@ -965,7 +950,7 @@ public class NattabletesterEditor
 	 * This returns the viewer as required by the {@link IViewerProvider} interface.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -977,7 +962,7 @@ public class NattabletesterEditor
 	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void createContextMenuFor(StructuredViewer viewer) {
@@ -999,7 +984,7 @@ public class NattabletesterEditor
 	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void createModel() {
@@ -1027,7 +1012,7 @@ public class NattabletesterEditor
 	 * and the specified exception (if any).
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
@@ -1056,7 +1041,7 @@ public class NattabletesterEditor
 	 * This is the method used by the framework to install your own controls.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1277,7 +1262,6 @@ public class NattabletesterEditor
 
 			getSite().getShell().getDisplay().asyncExec
 					(new Runnable() {
-						@Override
 						public void run() {
 							setActivePage(0);
 						}
@@ -1303,7 +1287,6 @@ public class NattabletesterEditor
 
 		getSite().getShell().getDisplay().asyncExec
 				(new Runnable() {
-					@Override
 					public void run() {
 						updateProblemIndication();
 					}
@@ -1315,7 +1298,7 @@ public class NattabletesterEditor
 	 * this hides the single tab at the bottom.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void hideTabs() {
@@ -1334,7 +1317,7 @@ public class NattabletesterEditor
 	 * this shows the tabs at the bottom.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void showTabs() {
@@ -1352,7 +1335,7 @@ public class NattabletesterEditor
 	 * This is used to track the active viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1368,7 +1351,7 @@ public class NattabletesterEditor
 	 * This is how the framework determines which interfaces we implement.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("rawtypes")
@@ -1392,7 +1375,7 @@ public class NattabletesterEditor
 	 * This accesses a cached version of the content outliner.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IContentOutlinePage getContentOutlinePage() {
@@ -1444,7 +1427,6 @@ public class NattabletesterEditor
 					(new ISelectionChangedListener() {
 						// This ensures that we handle selections correctly.
 						//
-						@Override
 						public void selectionChanged(SelectionChangedEvent event) {
 							handleContentOutlineSelection(event.getSelection());
 						}
@@ -1458,7 +1440,7 @@ public class NattabletesterEditor
 	 * This accesses a cached version of the property sheet.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IPropertySheetPage getPropertySheetPage() {
@@ -1486,7 +1468,7 @@ public class NattabletesterEditor
 	 * This deals with how we want selection in the outliner to affect the other views.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void handleContentOutlineSelection(ISelection selection) {
@@ -1526,7 +1508,7 @@ public class NattabletesterEditor
 	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1538,7 +1520,7 @@ public class NattabletesterEditor
 	 * This is for implementing {@link IEditorPart} and simply saves the model file.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1602,7 +1584,7 @@ public class NattabletesterEditor
 	 * 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
 	 */
 	protected boolean isPersisted(Resource resource) {
@@ -1623,7 +1605,7 @@ public class NattabletesterEditor
 	 * This always returns true because it is not currently supported.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1635,7 +1617,7 @@ public class NattabletesterEditor
 	 * This also changes the editor's input.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1654,7 +1636,7 @@ public class NattabletesterEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void doSaveAs(URI uri, IEditorInput editorInput) {
@@ -1671,7 +1653,7 @@ public class NattabletesterEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1686,7 +1668,7 @@ public class NattabletesterEditor
 	 * This is called during startup.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1702,7 +1684,7 @@ public class NattabletesterEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1719,7 +1701,7 @@ public class NattabletesterEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1731,7 +1713,7 @@ public class NattabletesterEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1743,7 +1725,7 @@ public class NattabletesterEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1756,7 +1738,7 @@ public class NattabletesterEditor
 	 * Calling this result will notify the listeners.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1772,7 +1754,7 @@ public class NattabletesterEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setStatusLineManager(ISelection selection) {
@@ -1808,7 +1790,7 @@ public class NattabletesterEditor
 	 * This looks up a string in the plugin's plugin.properties file.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static String getString(String key) {
@@ -1819,7 +1801,7 @@ public class NattabletesterEditor
 	 * This looks up a string in plugin.properties, making a substitution.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static String getString(String key, Object s1) {
@@ -1830,7 +1812,7 @@ public class NattabletesterEditor
 	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1841,7 +1823,7 @@ public class NattabletesterEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EditingDomainActionBarContributor getActionBarContributor() {
@@ -1851,7 +1833,7 @@ public class NattabletesterEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IActionBars getActionBars() {
@@ -1861,7 +1843,7 @@ public class NattabletesterEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public AdapterFactory getAdapterFactory() {
@@ -1871,7 +1853,7 @@ public class NattabletesterEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1903,7 +1885,7 @@ public class NattabletesterEditor
 	 * Returns whether the outline view should be presented to the user.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean showOutlineView() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterModelWizard.java
index 81c81cf3584..a40bae10c74 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterModelWizard.java
@@ -75,7 +75,7 @@ import org.eclipse.ui.part.ISetSelectionTarget;
  * This is a simple wizard for creating a new model file.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattabletesterModelWizard extends Wizard implements INewWizard {
@@ -83,7 +83,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * The supported extensions for created files.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final List<String> FILE_EXTENSIONS =
@@ -93,7 +93,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * A formatted list of supported file extensions, suitable for display.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final String FORMATTED_FILE_EXTENSIONS =
@@ -103,7 +103,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattabletesterPackage nattabletesterPackage = NattabletesterPackage.eINSTANCE;
@@ -112,7 +112,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattabletesterFactory nattabletesterFactory = nattabletesterPackage.getNattabletesterFactory();
@@ -121,7 +121,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * This is the file creation page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattabletesterModelWizardNewFileCreationPage newFileCreationPage;
@@ -130,7 +130,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * This is the initial object creation page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattabletesterModelWizardInitialObjectCreationPage initialObjectCreationPage;
@@ -139,7 +139,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * Remember the selection during initialization for populating the default container.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IStructuredSelection selection;
@@ -148,7 +148,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * Remember the workbench during initialization.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IWorkbench workbench;
@@ -157,7 +157,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * Caches the names of the types that can be created as the root object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected List<String> initialObjectNames;
@@ -166,7 +166,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * This just records the information.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -181,7 +181,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * Returns the names of the types that can be created as the root object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<String> getInitialObjectNames() {
@@ -204,7 +204,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * Create a new model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected EObject createInitialModel() {
@@ -217,7 +217,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * Do the work after everything is specified.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -279,7 +279,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 				final ISelection targetSelection = new StructuredSelection(modelFile);
 				getShell().getDisplay().asyncExec
 						(new Runnable() {
-							@Override
 							public void run() {
 								((ISetSelectionTarget) activePart).selectReveal(targetSelection);
 							}
@@ -308,7 +307,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * This is the one page of the wizard.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class NattabletesterModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
@@ -316,7 +315,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public NattabletesterModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
@@ -327,7 +326,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		 * The framework calls this to see if the file is correct.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -347,7 +346,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public IFile getModelFile() {
@@ -359,14 +358,14 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * This is the page where the type of object to create is selected.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class NattabletesterModelWizardInitialObjectCreationPage extends WizardPage {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Combo initialObjectField;
@@ -381,7 +380,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Combo encodingField;
@@ -390,7 +389,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public NattabletesterModelWizardInitialObjectCreationPage(String pageId) {
@@ -400,7 +399,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -475,12 +474,11 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected ModifyListener validator =
 				new ModifyListener() {
-					@Override
 					public void modifyText(ModifyEvent e) {
 						setPageComplete(validatePage());
 					}
@@ -489,7 +487,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected boolean validatePage() {
@@ -499,7 +497,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -520,7 +518,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public String getInitialObjectName() {
@@ -537,7 +535,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public String getEncoding() {
@@ -548,7 +546,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		 * Returns the label for the specified type name.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected String getLabel(String typeName) {
@@ -563,7 +561,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Collection<String> getEncodings() {
@@ -582,7 +580,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * The framework calls this to create the contents of the wizard.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -638,7 +636,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * Get the file from the page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IFile getModelFile() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java
index d912a392bf0..3a1ea9498ad 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java
@@ -48,7 +48,7 @@ import org.eclipse.ui.PartInitException;
  * This is the action bar contributor for the Nattable model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattableActionBarContributor
@@ -58,7 +58,7 @@ public class NattableActionBarContributor
 	 * This keeps track of the active editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IEditorPart activeEditorPart;
@@ -67,7 +67,7 @@ public class NattableActionBarContributor
 	 * This keeps track of the current selection provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelectionProvider selectionProvider;
@@ -76,7 +76,7 @@ public class NattableActionBarContributor
 	 * This action opens the Properties view.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IAction showPropertiesViewAction =
@@ -98,7 +98,7 @@ public class NattableActionBarContributor
 	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IAction refreshViewerAction =
@@ -125,7 +125,7 @@ public class NattableActionBarContributor
 	 * generated for the current selection by the item provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> createChildActions;
@@ -134,7 +134,7 @@ public class NattableActionBarContributor
 	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IMenuManager createChildMenuManager;
@@ -144,7 +144,7 @@ public class NattableActionBarContributor
 	 * generated for the current selection by the item provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> createSiblingActions;
@@ -153,7 +153,7 @@ public class NattableActionBarContributor
 	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IMenuManager createSiblingMenuManager;
@@ -162,7 +162,7 @@ public class NattableActionBarContributor
 	 * This creates an instance of the contributor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NattableActionBarContributor() {
@@ -176,7 +176,7 @@ public class NattableActionBarContributor
 	 * This adds Separators for editor additions to the tool bar.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -190,7 +190,7 @@ public class NattableActionBarContributor
 	 * as well as the sub-menus for object creation items.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -218,7 +218,6 @@ public class NattableActionBarContributor
 		//
 		submenuManager.addMenuListener
 				(new IMenuListener() {
-					@Override
 					public void menuAboutToShow(IMenuManager menuManager) {
 						menuManager.updateAll(true);
 					}
@@ -231,7 +230,7 @@ public class NattableActionBarContributor
 	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -265,7 +264,7 @@ public class NattableActionBarContributor
 	 * that can be added to the selected object and updating the menus accordingly.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -314,7 +313,7 @@ public class NattableActionBarContributor
 	 * and returns the collection of these actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
@@ -332,7 +331,7 @@ public class NattableActionBarContributor
 	 * and returns the collection of these actions.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
@@ -352,7 +351,7 @@ public class NattableActionBarContributor
 	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
@@ -373,7 +372,7 @@ public class NattableActionBarContributor
 	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
@@ -403,7 +402,7 @@ public class NattableActionBarContributor
 	 * This populates the pop-up menu before it appears.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -424,7 +423,7 @@ public class NattableActionBarContributor
 	 * This inserts global actions before the "additions-end" separator.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -442,7 +441,7 @@ public class NattableActionBarContributor
 	 * This ensures that a delete action will clean up all references to deleted objects.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java
index 8b3c82e74ff..b365238d4e8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java
@@ -144,7 +144,7 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
  * This is an example of a Nattable model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattableEditor
@@ -154,7 +154,7 @@ public class NattableEditor
 	 * This keeps track of the editing domain that is used to track all changes to the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected AdapterFactoryEditingDomain editingDomain;
@@ -163,7 +163,7 @@ public class NattableEditor
 	 * This is the one adapter factory used for providing views of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory adapterFactory;
@@ -172,7 +172,7 @@ public class NattableEditor
 	 * This is the content outline page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IContentOutlinePage contentOutlinePage;
@@ -181,7 +181,7 @@ public class NattableEditor
 	 * This is a kludge...
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IStatusLineManager contentOutlineStatusLineManager;
@@ -190,7 +190,7 @@ public class NattableEditor
 	 * This is the content outline page's viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer contentOutlineViewer;
@@ -199,7 +199,7 @@ public class NattableEditor
 	 * This is the property sheet page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
@@ -209,7 +209,7 @@ public class NattableEditor
 	 * The parent relation must be correctly defined for this to work.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer selectionViewer;
@@ -218,7 +218,7 @@ public class NattableEditor
 	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer parentViewer;
@@ -227,7 +227,7 @@ public class NattableEditor
 	 * This shows how a tree view works.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer treeViewer;
@@ -237,7 +237,7 @@ public class NattableEditor
 	 * A list viewer doesn't support icons.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ListViewer listViewer;
@@ -247,7 +247,7 @@ public class NattableEditor
 	 * A table can be used as a list with icons.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TableViewer tableViewer;
@@ -256,7 +256,7 @@ public class NattableEditor
 	 * This shows how a tree view with columns works.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TreeViewer treeViewerWithColumns;
@@ -265,7 +265,7 @@ public class NattableEditor
 	 * This keeps track of the active viewer pane, in the book.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ViewerPane currentViewerPane;
@@ -274,7 +274,7 @@ public class NattableEditor
 	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Viewer currentViewer;
@@ -283,7 +283,7 @@ public class NattableEditor
 	 * This listens to which ever viewer is active.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelectionChangedListener selectionChangedListener;
@@ -292,7 +292,7 @@ public class NattableEditor
 	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
@@ -301,7 +301,7 @@ public class NattableEditor
 	 * This keeps track of the selection of the editor as a whole.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ISelection editorSelection = StructuredSelection.EMPTY;
@@ -311,7 +311,7 @@ public class NattableEditor
 	 * in Eclipse's Problems View.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
@@ -320,12 +320,11 @@ public class NattableEditor
 	 * This listens for when the outline becomes active
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IPartListener partListener =
 			new IPartListener() {
-				@Override
 				public void partActivated(IWorkbenchPart p) {
 					if (p instanceof ContentOutline) {
 						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
@@ -345,22 +344,18 @@ public class NattableEditor
 					}
 				}
 
-				@Override
 				public void partBroughtToTop(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partClosed(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partDeactivated(IWorkbenchPart p) {
 					// Ignore.
 				}
 
-				@Override
 				public void partOpened(IWorkbenchPart p) {
 					// Ignore.
 				}
@@ -370,7 +365,7 @@ public class NattableEditor
 	 * Resources that have been removed since last activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> removedResources = new ArrayList<Resource>();
@@ -379,7 +374,7 @@ public class NattableEditor
 	 * Resources that have been changed since last activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> changedResources = new ArrayList<Resource>();
@@ -388,7 +383,7 @@ public class NattableEditor
 	 * Resources that have been saved.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Resource> savedResources = new ArrayList<Resource>();
@@ -397,7 +392,7 @@ public class NattableEditor
 	 * Map to store the diagnostic associated with a resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
@@ -406,7 +401,7 @@ public class NattableEditor
 	 * Controls whether the problem indication should be updated.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean updateProblemIndication = true;
@@ -415,7 +410,7 @@ public class NattableEditor
 	 * Adapter used to update the problem indication when resources are demanded loaded.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected EContentAdapter problemIndicationAdapter =
@@ -439,7 +434,6 @@ public class NattableEditor
 							if (updateProblemIndication) {
 								getSite().getShell().getDisplay().asyncExec
 										(new Runnable() {
-											@Override
 											public void run() {
 												updateProblemIndication();
 											}
@@ -466,7 +460,6 @@ public class NattableEditor
 					if (updateProblemIndication) {
 						getSite().getShell().getDisplay().asyncExec
 								(new Runnable() {
-									@Override
 									public void run() {
 										updateProblemIndication();
 									}
@@ -479,12 +472,11 @@ public class NattableEditor
 	 * This listens for workspace changes.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IResourceChangeListener resourceChangeListener =
 			new IResourceChangeListener() {
-				@Override
 				public void resourceChanged(IResourceChangeEvent event) {
 					IResourceDelta delta = event.getDelta();
 					try {
@@ -493,7 +485,6 @@ public class NattableEditor
 							protected Collection<Resource> changedResources = new ArrayList<Resource>();
 							protected Collection<Resource> removedResources = new ArrayList<Resource>();
 
-							@Override
 							public boolean visit(IResourceDelta delta) {
 								if (delta.getResource().getType() == IResource.FILE) {
 									if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -529,7 +520,6 @@ public class NattableEditor
 						if (!visitor.getRemovedResources().isEmpty()) {
 							getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										@Override
 										public void run() {
 											removedResources.addAll(visitor.getRemovedResources());
 											if (!isDirty()) {
@@ -542,7 +532,6 @@ public class NattableEditor
 						if (!visitor.getChangedResources().isEmpty()) {
 							getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										@Override
 										public void run() {
 											changedResources.addAll(visitor.getChangedResources());
 											if (getSite().getPage().getActiveEditor() == NattableEditor.this) {
@@ -562,7 +551,7 @@ public class NattableEditor
 	 * Handles activation of the editor or it's associated views.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void handleActivate() {
@@ -598,7 +587,7 @@ public class NattableEditor
 	 * Handles what to do with changed resources on activation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void handleChangedResources() {
@@ -635,7 +624,7 @@ public class NattableEditor
 	 * Updates the problems indication with the information described in the specified diagnostic.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void updateProblemIndication() {
@@ -690,7 +679,7 @@ public class NattableEditor
 	 * Shows a dialog that asks if conflicting changes should be discarded.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean handleDirtyConflict() {
@@ -704,7 +693,7 @@ public class NattableEditor
 	 * This creates a model editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NattableEditor() {
@@ -716,7 +705,7 @@ public class NattableEditor
 	 * This sets up the editing domain for the model editor.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void initializeEditingDomain() {
@@ -746,11 +735,9 @@ public class NattableEditor
 		//
 		commandStack.addCommandStackListener
 				(new CommandStackListener() {
-					@Override
 					public void commandStackChanged(final EventObject event) {
 						getContainer().getDisplay().asyncExec
 								(new Runnable() {
-									@Override
 									public void run() {
 										firePropertyChange(IEditorPart.PROP_DIRTY);
 
@@ -783,7 +770,7 @@ public class NattableEditor
 	 * This is here for the listener to be able to call it.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -795,7 +782,7 @@ public class NattableEditor
 	 * This sets the selection into whichever viewer is active.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setSelectionToViewer(Collection<?> collection) {
@@ -805,7 +792,6 @@ public class NattableEditor
 		if (theSelection != null && !theSelection.isEmpty()) {
 			Runnable runnable =
 					new Runnable() {
-						@Override
 						public void run() {
 							// Try to select the items in the current content viewer of the editor.
 							//
@@ -823,7 +809,7 @@ public class NattableEditor
 	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -834,14 +820,14 @@ public class NattableEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
@@ -851,7 +837,7 @@ public class NattableEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -863,7 +849,7 @@ public class NattableEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -875,7 +861,7 @@ public class NattableEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -887,7 +873,7 @@ public class NattableEditor
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -899,7 +885,7 @@ public class NattableEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setCurrentViewerPane(ViewerPane viewerPane) {
@@ -917,7 +903,7 @@ public class NattableEditor
 	 * is the current one.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setCurrentViewer(Viewer viewer) {
@@ -931,7 +917,6 @@ public class NattableEditor
 						new ISelectionChangedListener() {
 							// This just notifies those things that are affected by the section.
 							//
-							@Override
 							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
 								setSelection(selectionChangedEvent.getSelection());
 							}
@@ -964,7 +949,7 @@ public class NattableEditor
 	 * This returns the viewer as required by the {@link IViewerProvider} interface.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -976,7 +961,7 @@ public class NattableEditor
 	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void createContextMenuFor(StructuredViewer viewer) {
@@ -998,7 +983,7 @@ public class NattableEditor
 	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void createModel() {
@@ -1026,7 +1011,7 @@ public class NattableEditor
 	 * and the specified exception (if any).
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
@@ -1055,7 +1040,7 @@ public class NattableEditor
 	 * This is the method used by the framework to install your own controls.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1276,7 +1261,6 @@ public class NattableEditor
 
 			getSite().getShell().getDisplay().asyncExec
 					(new Runnable() {
-						@Override
 						public void run() {
 							setActivePage(0);
 						}
@@ -1302,7 +1286,6 @@ public class NattableEditor
 
 		getSite().getShell().getDisplay().asyncExec
 				(new Runnable() {
-					@Override
 					public void run() {
 						updateProblemIndication();
 					}
@@ -1314,7 +1297,7 @@ public class NattableEditor
 	 * this hides the single tab at the bottom.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void hideTabs() {
@@ -1333,7 +1316,7 @@ public class NattableEditor
 	 * this shows the tabs at the bottom.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void showTabs() {
@@ -1351,7 +1334,7 @@ public class NattableEditor
 	 * This is used to track the active viewer.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1367,7 +1350,7 @@ public class NattableEditor
 	 * This is how the framework determines which interfaces we implement.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("rawtypes")
@@ -1391,7 +1374,7 @@ public class NattableEditor
 	 * This accesses a cached version of the content outliner.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IContentOutlinePage getContentOutlinePage() {
@@ -1443,7 +1426,6 @@ public class NattableEditor
 					(new ISelectionChangedListener() {
 						// This ensures that we handle selections correctly.
 						//
-						@Override
 						public void selectionChanged(SelectionChangedEvent event) {
 							handleContentOutlineSelection(event.getSelection());
 						}
@@ -1457,7 +1439,7 @@ public class NattableEditor
 	 * This accesses a cached version of the property sheet.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IPropertySheetPage getPropertySheetPage() {
@@ -1485,7 +1467,7 @@ public class NattableEditor
 	 * This deals with how we want selection in the outliner to affect the other views.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void handleContentOutlineSelection(ISelection selection) {
@@ -1525,7 +1507,7 @@ public class NattableEditor
 	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1537,7 +1519,7 @@ public class NattableEditor
 	 * This is for implementing {@link IEditorPart} and simply saves the model file.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1601,7 +1583,7 @@ public class NattableEditor
 	 * 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
 	 */
 	protected boolean isPersisted(Resource resource) {
@@ -1622,7 +1604,7 @@ public class NattableEditor
 	 * This always returns true because it is not currently supported.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1634,7 +1616,7 @@ public class NattableEditor
 	 * This also changes the editor's input.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1653,7 +1635,7 @@ public class NattableEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void doSaveAs(URI uri, IEditorInput editorInput) {
@@ -1670,7 +1652,7 @@ public class NattableEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1685,7 +1667,7 @@ public class NattableEditor
 	 * This is called during startup.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1701,7 +1683,7 @@ public class NattableEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1718,7 +1700,7 @@ public class NattableEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1730,7 +1712,7 @@ public class NattableEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1742,7 +1724,7 @@ public class NattableEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1755,7 +1737,7 @@ public class NattableEditor
 	 * Calling this result will notify the listeners.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1771,7 +1753,7 @@ public class NattableEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setStatusLineManager(ISelection selection) {
@@ -1807,7 +1789,7 @@ public class NattableEditor
 	 * This looks up a string in the plugin's plugin.properties file.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static String getString(String key) {
@@ -1818,7 +1800,7 @@ public class NattableEditor
 	 * This looks up a string in plugin.properties, making a substitution.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static String getString(String key, Object s1) {
@@ -1829,7 +1811,7 @@ public class NattableEditor
 	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1840,7 +1822,7 @@ public class NattableEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EditingDomainActionBarContributor getActionBarContributor() {
@@ -1850,7 +1832,7 @@ public class NattableEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IActionBars getActionBars() {
@@ -1860,7 +1842,7 @@ public class NattableEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public AdapterFactory getAdapterFactory() {
@@ -1870,7 +1852,7 @@ public class NattableEditor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1902,7 +1884,7 @@ public class NattableEditor
 	 * Returns whether the outline view should be presented to the user.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected boolean showOutlineView() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.java
index df44d5a8824..1c580492e02 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
  * This is the central singleton for the Nattable editor plugin.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public final class NattableEditorPlugin extends EMFPlugin {
@@ -29,7 +29,7 @@ public final class NattableEditorPlugin extends EMFPlugin {
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final NattableEditorPlugin INSTANCE = new NattableEditorPlugin();
@@ -38,7 +38,7 @@ public final class NattableEditorPlugin extends EMFPlugin {
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static Implementation plugin;
@@ -47,7 +47,7 @@ public final class NattableEditorPlugin extends EMFPlugin {
 	 * Create the instance.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NattableEditorPlugin() {
@@ -60,7 +60,7 @@ public final class NattableEditorPlugin extends EMFPlugin {
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -73,7 +73,7 @@ public final class NattableEditorPlugin extends EMFPlugin {
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -85,7 +85,7 @@ public final class NattableEditorPlugin extends EMFPlugin {
 	 * The actual implementation of the Eclipse <b>Plugin</b>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static class Implementation extends EclipseUIPlugin {
@@ -93,7 +93,7 @@ public final class NattableEditorPlugin extends EMFPlugin {
 		 * Creates an instance.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public Implementation() {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java
index d0e4069b35d..49a3f26a9cb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java
@@ -74,7 +74,7 @@ import org.eclipse.ui.part.ISetSelectionTarget;
  * This is a simple wizard for creating a new model file.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class NattableModelWizard extends Wizard implements INewWizard {
@@ -82,7 +82,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * The supported extensions for created files.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final List<String> FILE_EXTENSIONS =
@@ -92,7 +92,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * A formatted list of supported file extensions, suitable for display.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final String FORMATTED_FILE_EXTENSIONS =
@@ -102,7 +102,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattablePackage nattablePackage = NattablePackage.eINSTANCE;
@@ -111,7 +111,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableFactory nattableFactory = nattablePackage.getNattableFactory();
@@ -120,7 +120,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * This is the file creation page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableModelWizardNewFileCreationPage newFileCreationPage;
@@ -129,7 +129,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * This is the initial object creation page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected NattableModelWizardInitialObjectCreationPage initialObjectCreationPage;
@@ -138,7 +138,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * Remember the selection during initialization for populating the default container.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IStructuredSelection selection;
@@ -147,7 +147,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * Remember the workbench during initialization.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IWorkbench workbench;
@@ -156,7 +156,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * Caches the names of the types that can be created as the root object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected List<String> initialObjectNames;
@@ -165,7 +165,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * This just records the information.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -180,7 +180,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * Returns the names of the types that can be created as the root object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<String> getInitialObjectNames() {
@@ -203,7 +203,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * Create a new model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected EObject createInitialModel() {
@@ -216,7 +216,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * Do the work after everything is specified.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -278,7 +278,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 				final ISelection targetSelection = new StructuredSelection(modelFile);
 				getShell().getDisplay().asyncExec
 						(new Runnable() {
-							@Override
 							public void run() {
 								((ISetSelectionTarget) activePart).selectReveal(targetSelection);
 							}
@@ -307,7 +306,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * This is the one page of the wizard.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class NattableModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
@@ -315,7 +314,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public NattableModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
@@ -326,7 +325,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		 * The framework calls this to see if the file is correct.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -346,7 +345,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public IFile getModelFile() {
@@ -358,14 +357,14 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * This is the page where the type of object to create is selected.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public class NattableModelWizardInitialObjectCreationPage extends WizardPage {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Combo initialObjectField;
@@ -380,7 +379,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Combo encodingField;
@@ -389,7 +388,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public NattableModelWizardInitialObjectCreationPage(String pageId) {
@@ -399,7 +398,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -474,12 +473,11 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected ModifyListener validator =
 				new ModifyListener() {
-					@Override
 					public void modifyText(ModifyEvent e) {
 						setPageComplete(validatePage());
 					}
@@ -488,7 +486,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected boolean validatePage() {
@@ -498,7 +496,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -519,7 +517,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public String getInitialObjectName() {
@@ -536,7 +534,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public String getEncoding() {
@@ -547,7 +545,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		 * Returns the label for the specified type name.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected String getLabel(String typeName) {
@@ -562,7 +560,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected Collection<String> getEncodings() {
@@ -581,7 +579,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * The framework calls this to create the contents of the wizard.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -637,7 +635,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * Get the file from the page.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IFile getModelFile() {
author	Vincent Lorenzo	2015-02-16 15:45:10 +0000
committer	Vincent Lorenzo	2015-02-16 15:48:05 +0000
commit	2bdec905ed072e56523099a57311c30d7445576a (patch)
tree	50dd8eec8090de02dc6c735db8e89d84689a6607 /plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor
parent	4c79b652ac8eb94b5d25ef33db9c796737a85016 (diff)
download	org.eclipse.papyrus-2bdec905ed072e56523099a57311c30d7445576a.tar.gz org.eclipse.papyrus-2bdec905ed072e56523099a57311c30d7445576a.tar.xz org.eclipse.papyrus-2bdec905ed072e56523099a57311c30d7445576a.zip