some cleanups and regeneration with latest Xtend compiler

5 files changed, 13 insertions, 11 deletions

diff --git a/org.eclipse.emf.ecore.xcore.tests/build.properties b/org.eclipse.emf.ecore.xcore.tests/build.properties
index 34d2e4d2d..a6835df7c 100755
--- a/org.eclipse.emf.ecore.xcore.tests/build.properties
+++ b/org.eclipse.emf.ecore.xcore.tests/build.properties
@@ -1,4 +1,6 @@
-source.. = src/
+source.. = src/,\
+           src-gen/,\
+           xtend-gen/
 output.. = bin/
 bin.includes = META-INF/,\
                .
diff --git a/org.eclipse.emf.ecore.xcore.tests/xtend-gen/org/eclipse/emf/ecore/xcore/tests/mapping/XcoreMapperTest.java b/org.eclipse.emf.ecore.xcore.tests/xtend-gen/org/eclipse/emf/ecore/xcore/tests/mapping/XcoreMapperTest.java
index d24182f61..985da51a3 100644
--- a/org.eclipse.emf.ecore.xcore.tests/xtend-gen/org/eclipse/emf/ecore/xcore/tests/mapping/XcoreMapperTest.java
+++ b/org.eclipse.emf.ecore.xcore.tests/xtend-gen/org/eclipse/emf/ecore/xcore/tests/mapping/XcoreMapperTest.java
@@ -101,7 +101,7 @@ public class XcoreMapperTest {
       Assert.assertEquals(pack, _xcoreElement_1);
       EList<XClassifier> _classifiers = pack.getClassifiers();
       Iterable<XClass> _filter = IterableExtensions.<XClass>filter(_classifiers, org.eclipse.emf.ecore.xcore.XClass.class);
-      for (XClass clazz : _filter) {
+      for (final XClass clazz : _filter) {
         {
           XClassMapping _mapping_5 = this.mapper.getMapping(clazz);
           EClass _eclass = _mapping_5.getEclass();
@@ -123,7 +123,7 @@ public class XcoreMapperTest {
           XNamedElement _xcoreElement_3 = _xcoreMapping_3.getXcoreElement();
           Assert.assertEquals(clazz, _xcoreElement_3);
           EList<XMember> _members = clazz.getMembers();
-          for (XMember member : _members) {
+          for (final XMember member : _members) {
             final XMember member_1 = member;
             boolean matched = false;
             if (!matched) {
diff --git a/org.eclipse.emf.ecore.xcore.ui/META-INF/MANIFEST.MF b/org.eclipse.emf.ecore.xcore.ui/META-INF/MANIFEST.MF
index 63decf83c..23c277717 100644
--- a/org.eclipse.emf.ecore.xcore.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.emf.ecore.xcore.ui/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.ecore.edit;bundle-version="2.7.0",

  org.eclipse.emf.codegen.ecore;bundle-version="2.7.0",

  org.eclipse.emf.ecore.editor;bundle-version="2.7.0",

- org.eclipse.jdt.core;bundle-version="3.7.0"

+ org.eclipse.jdt.core

 Bundle-ActivationPolicy: lazy

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 Export-Package: org.eclipse.emf.ecore.xcore.ui,

diff --git a/org.eclipse.emf.ecore.xcore/xtend-gen/org/eclipse/emf/ecore/xcore/generator/XcoreGenerator.java b/org.eclipse.emf.ecore.xcore/xtend-gen/org/eclipse/emf/ecore/xcore/generator/XcoreGenerator.java
index 4eb704ab9..91d53405f 100644
--- a/org.eclipse.emf.ecore.xcore/xtend-gen/org/eclipse/emf/ecore/xcore/generator/XcoreGenerator.java
+++ b/org.eclipse.emf.ecore.xcore/xtend-gen/org/eclipse/emf/ecore/xcore/generator/XcoreGenerator.java
@@ -44,7 +44,7 @@ public class XcoreGenerator implements IGenerator {
       final XPackage pack = ((XPackage) _head);
       Iterable<EObject> _allContentsIterable = EObjectExtensions.allContentsIterable(pack);
       Iterable<XOperation> _filter = IterableExtensions.<XOperation>filter(_allContentsIterable, org.eclipse.emf.ecore.xcore.XOperation.class);
-      for (XOperation op : _filter) {
+      for (final XOperation op : _filter) {
         {
           XOperationMapping _mapping = this.mappings.getMapping(op);
           EOperation _eOperation = _mapping.getEOperation();
diff --git a/org.eclipse.emf.ecore.xcore/xtend-gen/org/eclipse/emf/ecore/xcore/util/XcoreGenmodelBuilder.java b/org.eclipse.emf.ecore.xcore/xtend-gen/org/eclipse/emf/ecore/xcore/util/XcoreGenmodelBuilder.java
index 3a0d7b878..af070c9ce 100644
--- a/org.eclipse.emf.ecore.xcore/xtend-gen/org/eclipse/emf/ecore/xcore/util/XcoreGenmodelBuilder.java
+++ b/org.eclipse.emf.ecore.xcore/xtend-gen/org/eclipse/emf/ecore/xcore/util/XcoreGenmodelBuilder.java
@@ -65,7 +65,7 @@ public class XcoreGenmodelBuilder {
   
   public void buildMap(final GenModel genModel) {
     Iterable<EObject> _allContentsIterable = EObjectExtensions.allContentsIterable(genModel);
-    for (EObject genElement : _allContentsIterable) {
+    for (final EObject genElement : _allContentsIterable) {
       final EObject genElement_1 = genElement;
       boolean matched = false;
       if (!matched) {
@@ -156,12 +156,12 @@ public class XcoreGenmodelBuilder {
       HashSet<EPackage> _hashSet = new HashSet<EPackage>();
       final HashSet<EPackage> referencedEPackages = _hashSet;
       EList<GenPackage> _genPackages = genModel.getGenPackages();
-      for (GenPackage genPackage : _genPackages) {
+      for (final GenPackage genPackage : _genPackages) {
         EPackage _ecorePackage = genPackage.getEcorePackage();
         Iterable<EObject> _allContentsIterable = EObjectExtensions.allContentsIterable(_ecorePackage);
-        for (EObject eObject : _allContentsIterable) {
+        for (final EObject eObject : _allContentsIterable) {
           EList<EObject> _eCrossReferences = eObject.eCrossReferences();
-          for (EObject eCrossReference : _eCrossReferences) {
+          for (final EObject eCrossReference : _eCrossReferences) {
             final EObject eCrossReference_1 = eCrossReference;
             boolean matched = false;
             if (!matched) {
@@ -184,7 +184,7 @@ public class XcoreGenmodelBuilder {
           }
         }
       }
-      for (EPackage referencedEPackage : referencedEPackages) {
+      for (final EPackage referencedEPackage : referencedEPackages) {
         GenPackage _findGenPackage = genModel.findGenPackage(referencedEPackage);
         boolean _operator_equals = ObjectExtensions.operator_equals(_findGenPackage, null);
         if (_operator_equals) {
@@ -201,7 +201,7 @@ public class XcoreGenmodelBuilder {
               Resource _eResource = genModel.eResource();
               ResourceSet _resourceSet = _eResource.getResourceSet();
               EList<Resource> _resources = _resourceSet.getResources();
-              for (Resource resource : _resources) {
+              for (final Resource resource : _resources) {
                 URI _uRI = resource.getURI();
                 String _fileExtension = _uRI.fileExtension();
                 boolean _equals = "genmodel".equals(_fileExtension);