Fix multiple errors and warnings

Change-Id: Icbff274f24661b423662abde490648728d8d0a5e
Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>

27 files changed, 48 insertions, 23 deletions

diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/EEFViewFactory.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/EEFViewFactory.java
index 19f79aca3..ce9614d46 100644
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/EEFViewFactory.java
+++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/EEFViewFactory.java
@@ -33,6 +33,8 @@ public class EEFViewFactory {
 	 *            The variable manager
 	 * @param interpreterProviders
 	 *            The {@link IInterpreterProvider} available
+	 * @param editingDomain
+	 *            The editing domain
 	 * @return The {@link EEFView} fully initialized
 	 */
 	public EEFView createEEFView(EEFViewDescription eefViewDescription, IVariableManager variableManager,
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFContainerImpl.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFContainerImpl.java
index 5dc7b691b..ce62333d3 100644
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFContainerImpl.java
+++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFContainerImpl.java
@@ -45,6 +45,9 @@ public class EEFContainerImpl extends AbstractEEFChildObject implements EEFConta
 	 */
 	private List<EEFWidget> eWidgets = new ArrayList<EEFWidget>();
 
+	/**
+	 * The editing domain.
+	 */
 	private TransactionalEditingDomain editingDomain;
 
 	/**
@@ -59,6 +62,7 @@ public class EEFContainerImpl extends AbstractEEFChildObject implements EEFConta
 	 * @param interpreter
 	 *            The interpreter
 	 * @param editingDomain
+	 *            The editing domain
 	 */
 	public EEFContainerImpl(EEFContainerParent eefContainerParent, EEFContainerDescription eefContainerDescription, IVariableManager variableManager,
 			IInterpreter interpreter, TransactionalEditingDomain editingDomain) {
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFGroupImpl.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFGroupImpl.java
index b22099f1d..0c3a2292a 100644
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFGroupImpl.java
+++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFGroupImpl.java
@@ -41,6 +41,9 @@ public class EEFGroupImpl extends AbstractEEFChildObject implements EEFGroup {
 	 */
 	private EEFContainer eefContainer;
 
+	/**
+	 * The editing domain.
+	 */
 	private TransactionalEditingDomain editingDomain;
 
 	/**
@@ -55,6 +58,7 @@ public class EEFGroupImpl extends AbstractEEFChildObject implements EEFGroup {
 	 * @param interpreter
 	 *            The interpreter
 	 * @param editingDomain
+	 *            The editing domain
 	 */
 	public EEFGroupImpl(EEFPage eefPage, EEFGroupDescription eefGroupDescription, IVariableManager variableManager, IInterpreter interpreter,
 			TransactionalEditingDomain editingDomain) {
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFPageImpl.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFPageImpl.java
index 24ee18342..573a46ecc 100644
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFPageImpl.java
+++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFPageImpl.java
@@ -46,6 +46,9 @@ public class EEFPageImpl extends AbstractEEFChildObject implements EEFPage {
 	 */
 	private List<EEFGroup> eefGroups = new ArrayList<EEFGroup>();
 
+	/**
+	 * The editing domain.
+	 */
 	private TransactionalEditingDomain editingDomain;
 
 	/**
@@ -60,6 +63,7 @@ public class EEFPageImpl extends AbstractEEFChildObject implements EEFPage {
 	 * @param interpreter
 	 *            The interpreter
 	 * @param editingDomain
+	 *            The editing domain
 	 */
 	public EEFPageImpl(EEFView eefView, EEFPageDescription eefPageDescription, IVariableManager variableManager, IInterpreter interpreter,
 			TransactionalEditingDomain editingDomain) {
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFTextImpl.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFTextImpl.java
index 5dc6be99d..639a072ad 100644
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFTextImpl.java
+++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFTextImpl.java
@@ -54,6 +54,9 @@ public class EEFTextImpl extends AbstractEEFWidgetImpl implements EEFText {
 	 */
 	private IConsumer<String> labelExpressionConsumer;
 
+	/**
+	 * The editing domain.
+	 */
 	private TransactionalEditingDomain editingDomain;
 
 	/**
@@ -68,6 +71,7 @@ public class EEFTextImpl extends AbstractEEFWidgetImpl implements EEFText {
 	 * @param interpreter
 	 *            The interpreter
 	 * @param editingDomain
+	 *            The editing domain
 	 */
 	public EEFTextImpl(EEFContainer eefContainer, EEFTextDescription eefTextDescription, IVariableManager variableManager, IInterpreter interpreter,
 			TransactionalEditingDomain editingDomain) {
@@ -147,11 +151,6 @@ public class EEFTextImpl extends AbstractEEFWidgetImpl implements EEFText {
 				}
 			}
 
-			/**
-			 * {@inheritDoc}
-			 *
-			 * @see org.eclipse.emf.common.command.AbstractCommand#canExecute()
-			 */
 			@Override
 			public boolean canExecute() {
 				return true;
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFViewImpl.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFViewImpl.java
index 33211858c..5c526f590 100644
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFViewImpl.java
+++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFViewImpl.java
@@ -47,6 +47,9 @@ public class EEFViewImpl extends AbstractEEFObject implements EEFView {
 	 */
 	private List<EEFPage> eefPages = new ArrayList<EEFPage>();
 
+	/**
+	 * The editing domain.
+	 */
 	private TransactionalEditingDomain editingDomain;
 
 	/**
@@ -59,6 +62,7 @@ public class EEFViewImpl extends AbstractEEFObject implements EEFView {
 	 * @param interpreter
 	 *            The interpreter
 	 * @param editingDomain
+	 *            The editing domain
 	 */
 	public EEFViewImpl(EEFViewDescription eefViewDescription, IVariableManager variableManager, IInterpreter interpreter,
 			TransactionalEditingDomain editingDomain) {
@@ -100,11 +104,6 @@ public class EEFViewImpl extends AbstractEEFObject implements EEFView {
 		};
 
 		this.editingDomain.addResourceSetListener(new ResourceSetListenerImpl(NotificationFilter.NOT_TOUCH) {
-			/**
-			 * {@inheritDoc}
-			 *
-			 * @see org.eclipse.emf.transaction.ResourceSetListenerImpl#resourceSetChanged(org.eclipse.emf.transaction.ResourceSetChangeEvent)
-			 */
 			@Override
 			public void resourceSetChanged(ResourceSetChangeEvent event) {
 				for (EEFPage eefPage : EEFViewImpl.this.eefPages) {
@@ -116,11 +115,6 @@ public class EEFViewImpl extends AbstractEEFObject implements EEFView {
 				}
 			}
 
-			/**
-			 * {@inheritDoc}
-			 *
-			 * @see org.eclipse.emf.transaction.ResourceSetListenerImpl#isPostcommitOnly()
-			 */
 			@Override
 			public boolean isPostcommitOnly() {
 				return true;
diff --git a/plugins/org.eclipse.eef.ide.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.ide.ui/META-INF/MANIFEST.MF
index 7da145326..965390fe6 100644
--- a/plugins/org.eclipse.eef.ide.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.eef.ide.ui/META-INF/MANIFEST.MF
@@ -15,8 +15,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.ui.views.properties.tabbed;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.emf.common;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.swt
+ org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)"
 Export-Package: org.eclipse.eef.ide.ui.api;version="2.0.0",
  org.eclipse.eef.ide.ui.internal;version="2.0.0";x-internal:=true,
  org.eclipse.eef.ide.ui.internal.data;version="2.0.0";x-internal:=true
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/api/TabDescriptorFilter.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/api/TabDescriptorFilter.java
index 03cbe19b5..5cfd652d1 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/api/TabDescriptorFilter.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/api/TabDescriptorFilter.java
@@ -41,6 +41,8 @@ public class TabDescriptorFilter {
 	 *
 	 * @param objects
 	 *            The input objects
+	 * @param editingDomain
+	 *            The editing domain
 	 * @return The {@link ITabDescriptor} to use
 	 */
 	public List<ITabDescriptor> getTabDescriptors(final Object[] objects, TransactionalEditingDomain editingDomain) {
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/data/EEFSection.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/data/EEFSection.java
index 563574c36..8a133193c 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/data/EEFSection.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/data/EEFSection.java
@@ -84,7 +84,9 @@ public class EEFSection implements ISection {
 
 					Text text = widgetFactory.createText(sectionComposite, ""); //$NON-NLS-1$
 					FormData data = new FormData();
-					data.left = new FormAttachment(0, 232);
+
+					final int textOffset = 232;
+					data.left = new FormAttachment(0, textOffset);
 					data.right = new FormAttachment(100, 0);
 					data.top = new FormAttachment(0, ITabbedPropertyConstants.VSPACE);
 
@@ -95,9 +97,11 @@ public class EEFSection implements ISection {
 
 					if (eefText.getDescription().getLabelExpression() != null && eefText.getDescription().getLabelExpression().trim().length() > 0) {
 						CLabel label = widgetFactory.createCLabel(sectionComposite, ""); //$NON-NLS-1$
+
+						final int labelOffset = 20;
 						data = new FormData();
 						data.left = new FormAttachment(0, 0);
-						data.right = new FormAttachment(text, -ITabbedPropertyConstants.HSPACE - 20);
+						data.right = new FormAttachment(text, -ITabbedPropertyConstants.HSPACE - labelOffset);
 						data.top = new FormAttachment(text, 0, SWT.CENTER);
 						label.setLayoutData(data);
 
diff --git a/plugins/org.eclipse.sirius.contentassist/.classpath b/plugins/org.eclipse.sirius.contentassist/.classpath
index 75556083f..e4dad7e73 100644
--- a/plugins/org.eclipse.sirius.contentassist/.classpath
+++ b/plugins/org.eclipse.sirius.contentassist/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.eclipse.sirius.contentassist/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.sirius.contentassist/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..c537b6306
--- /dev/null
+++ b/plugins/org.eclipse.sirius.contentassist/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/plugins/org.eclipse.sirius.contentassist/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.contentassist/META-INF/MANIFEST.MF
index 10018ad86..57cf0060a 100644
--- a/plugins/org.eclipse.sirius.contentassist/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.contentassist/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.1.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.sirius.contentassist,
  org.eclipse.sirius.contentassist.impl,
  org.eclipse.sirius.contentassist.util
diff --git a/plugins/org.eclipse.sirius.expression.dsl.ui/xtend-gen/org/eclipse/sirius/expression/dsl/ui/contentassist/.ExpressionDSLProposalProvider.xtendbin b/plugins/org.eclipse.sirius.expression.dsl.ui/xtend-gen/org/eclipse/sirius/expression/dsl/ui/contentassist/.ExpressionDSLProposalProvider.xtendbin
index ff83f3c5d..d4cc8122c 100644
--- a/plugins/org.eclipse.sirius.expression.dsl.ui/xtend-gen/org/eclipse/sirius/expression/dsl/ui/contentassist/.ExpressionDSLProposalProvider.xtendbin
+++ b/plugins/org.eclipse.sirius.expression.dsl.ui/xtend-gen/org/eclipse/sirius/expression/dsl/ui/contentassist/.ExpressionDSLProposalProvider.xtendbin
diff --git a/plugins/org.eclipse.sirius.expression.dsl.ui/xtend-gen/org/eclipse/sirius/expression/dsl/ui/labeling/.ExpressionDSLDescriptionLabelProvider.xtendbin b/plugins/org.eclipse.sirius.expression.dsl.ui/xtend-gen/org/eclipse/sirius/expression/dsl/ui/labeling/.ExpressionDSLDescriptionLabelProvider.xtendbin
index ee4b1f139..d388bc1c4 100644
--- a/plugins/org.eclipse.sirius.expression.dsl.ui/xtend-gen/org/eclipse/sirius/expression/dsl/ui/labeling/.ExpressionDSLDescriptionLabelProvider.xtendbin
+++ b/plugins/org.eclipse.sirius.expression.dsl.ui/xtend-gen/org/eclipse/sirius/expression/dsl/ui/labeling/.ExpressionDSLDescriptionLabelProvider.xtendbin
diff --git a/plugins/org.eclipse.sirius.expression.dsl.ui/xtend-gen/org/eclipse/sirius/expression/dsl/ui/labeling/.ExpressionDSLLabelProvider.xtendbin b/plugins/org.eclipse.sirius.expression.dsl.ui/xtend-gen/org/eclipse/sirius/expression/dsl/ui/labeling/.ExpressionDSLLabelProvider.xtendbin
index e4ebb35b3..41c5a39b3 100644
--- a/plugins/org.eclipse.sirius.expression.dsl.ui/xtend-gen/org/eclipse/sirius/expression/dsl/ui/labeling/.ExpressionDSLLabelProvider.xtendbin
+++ b/plugins/org.eclipse.sirius.expression.dsl.ui/xtend-gen/org/eclipse/sirius/expression/dsl/ui/labeling/.ExpressionDSLLabelProvider.xtendbin
diff --git a/plugins/org.eclipse.sirius.expression.dsl.ui/xtend-gen/org/eclipse/sirius/expression/dsl/ui/outline/.ExpressionDSLOutlineTreeProvider.xtendbin b/plugins/org.eclipse.sirius.expression.dsl.ui/xtend-gen/org/eclipse/sirius/expression/dsl/ui/outline/.ExpressionDSLOutlineTreeProvider.xtendbin
index bba786551..40d168c40 100644
--- a/plugins/org.eclipse.sirius.expression.dsl.ui/xtend-gen/org/eclipse/sirius/expression/dsl/ui/outline/.ExpressionDSLOutlineTreeProvider.xtendbin
+++ b/plugins/org.eclipse.sirius.expression.dsl.ui/xtend-gen/org/eclipse/sirius/expression/dsl/ui/outline/.ExpressionDSLOutlineTreeProvider.xtendbin
diff --git a/plugins/org.eclipse.sirius.expression.dsl.ui/xtend-gen/org/eclipse/sirius/expression/dsl/ui/quickfix/.ExpressionDSLQuickfixProvider.xtendbin b/plugins/org.eclipse.sirius.expression.dsl.ui/xtend-gen/org/eclipse/sirius/expression/dsl/ui/quickfix/.ExpressionDSLQuickfixProvider.xtendbin
index 96b3dc262..84ccadf98 100644
--- a/plugins/org.eclipse.sirius.expression.dsl.ui/xtend-gen/org/eclipse/sirius/expression/dsl/ui/quickfix/.ExpressionDSLQuickfixProvider.xtendbin
+++ b/plugins/org.eclipse.sirius.expression.dsl.ui/xtend-gen/org/eclipse/sirius/expression/dsl/ui/quickfix/.ExpressionDSLQuickfixProvider.xtendbin
diff --git a/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/formatting/.ExpressionDSLFormatter.xtendbin b/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/formatting/.ExpressionDSLFormatter.xtendbin
index b41553f7e..0882d6066 100644
--- a/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/formatting/.ExpressionDSLFormatter.xtendbin
+++ b/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/formatting/.ExpressionDSLFormatter.xtendbin
diff --git a/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/generator/.ExpressionDSLGenerator.xtendbin b/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/generator/.ExpressionDSLGenerator.xtendbin
index ae7174ac4..93f5356d2 100644
--- a/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/generator/.ExpressionDSLGenerator.xtendbin
+++ b/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/generator/.ExpressionDSLGenerator.xtendbin
diff --git a/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/scoping/.ExpressionDSLContainerState.xtendbin b/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/scoping/.ExpressionDSLContainerState.xtendbin
index a8fdb0c2e..df1d76e93 100644
--- a/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/scoping/.ExpressionDSLContainerState.xtendbin
+++ b/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/scoping/.ExpressionDSLContainerState.xtendbin
diff --git a/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/scoping/.ExpressionDSLScopeProvider.xtendbin b/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/scoping/.ExpressionDSLScopeProvider.xtendbin
index f6397cc6b..1af373a07 100644
--- a/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/scoping/.ExpressionDSLScopeProvider.xtendbin
+++ b/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/scoping/.ExpressionDSLScopeProvider.xtendbin
diff --git a/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/scoping/.ExpressionDSLStateBasedContainer.xtendbin b/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/scoping/.ExpressionDSLStateBasedContainer.xtendbin
index 3a3118fe5..b7d585250 100644
--- a/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/scoping/.ExpressionDSLStateBasedContainer.xtendbin
+++ b/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/scoping/.ExpressionDSLStateBasedContainer.xtendbin
diff --git a/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/scoping/.ExpressionDSLStatedContainerManager.xtendbin b/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/scoping/.ExpressionDSLStatedContainerManager.xtendbin
index f5fdbd912..c954e9fa1 100644
--- a/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/scoping/.ExpressionDSLStatedContainerManager.xtendbin
+++ b/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/scoping/.ExpressionDSLStatedContainerManager.xtendbin
diff --git a/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/validation/.ExpressionDSLValidator.xtendbin b/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/validation/.ExpressionDSLValidator.xtendbin
index 932d2c55d..cb0dd3aea 100644
--- a/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/validation/.ExpressionDSLValidator.xtendbin
+++ b/plugins/org.eclipse.sirius.expression.dsl/xtend-gen/org/eclipse/sirius/expression/dsl/validation/.ExpressionDSLValidator.xtendbin
diff --git a/plugins/org.eclipse.sirius.validation/.classpath b/plugins/org.eclipse.sirius.validation/.classpath
index 75556083f..e4dad7e73 100644
--- a/plugins/org.eclipse.sirius.validation/.classpath
+++ b/plugins/org.eclipse.sirius.validation/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.eclipse.sirius.validation/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.sirius.validation/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..c537b6306
--- /dev/null
+++ b/plugins/org.eclipse.sirius.validation/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/sirius-custom-editor/org.eclipse.sirius.editor.properties/src/org/eclipse/sirius/editor/properties/api/EEFTabDescriptorProvider.java b/samples/sirius-custom-editor/org.eclipse.sirius.editor.properties/src/org/eclipse/sirius/editor/properties/api/EEFTabDescriptorProvider.java
index 6fc0c2e78..b9ddad624 100644
--- a/samples/sirius-custom-editor/org.eclipse.sirius.editor.properties/src/org/eclipse/sirius/editor/properties/api/EEFTabDescriptorProvider.java
+++ b/samples/sirius-custom-editor/org.eclipse.sirius.editor.properties/src/org/eclipse/sirius/editor/properties/api/EEFTabDescriptorProvider.java
@@ -3,7 +3,6 @@ package org.eclipse.sirius.editor.properties.api;
 import java.util.List;
 
 import org.eclipse.eef.ide.ui.api.TabDescriptorFilter;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.sirius.business.api.session.Session;